From d6f8bbb45b267065a6907e71ff9c98bb6d161241 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:56:07 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- buildtools/ada/adaglobaloptionsdlg.cpp | 28 +- buildtools/ada/adaglobaloptionsdlg.h | 18 +- buildtools/ada/adaproject_part.cpp | 180 +-- buildtools/ada/adaproject_part.h | 66 +- buildtools/ada/adaproject_widget.cpp | 2 +- buildtools/ada/adaproject_widget.h | 4 +- buildtools/ada/adaprojectoptionsdlg.cpp | 70 +- buildtools/ada/adaprojectoptionsdlg.h | 22 +- buildtools/ada/service.cpp | 26 +- buildtools/ada/service.h | 12 +- buildtools/ant/antprojectpart.cpp | 176 +-- buildtools/ant/antprojectpart.h | 62 +- buildtools/autotools/addapplicationdlg.cpp | 66 +- buildtools/autotools/addapplicationdlg.h | 4 +- buildtools/autotools/addexistingdirectoriesdlg.cpp | 76 +- buildtools/autotools/addexistingdirectoriesdlg.h | 6 +- buildtools/autotools/addexistingfilesdlg.cpp | 70 +- buildtools/autotools/addexistingfilesdlg.h | 8 +- buildtools/autotools/addfiledlg.cpp | 54 +- buildtools/autotools/addfiledlg.h | 4 +- buildtools/autotools/addicondlg.cpp | 28 +- buildtools/autotools/addicondlg.h | 2 +- buildtools/autotools/addprefixdlg.cpp | 36 +- buildtools/autotools/addprefixdlg.h | 12 +- buildtools/autotools/addservicedlg.cpp | 66 +- buildtools/autotools/addservicedlg.h | 6 +- buildtools/autotools/addsubprojectdlg.cpp | 64 +- buildtools/autotools/addsubprojectdlg.h | 4 +- buildtools/autotools/addtargetdlg.cpp | 48 +- buildtools/autotools/addtargetdlg.h | 4 +- buildtools/autotools/addtranslationdlg.cpp | 58 +- buildtools/autotools/addtranslationdlg.h | 6 +- buildtools/autotools/autodetailsview.cpp | 138 +- buildtools/autotools/autodetailsview.h | 14 +- buildtools/autotools/autolistviewitems.cpp | 50 +- buildtools/autotools/autolistviewitems.h | 52 +- buildtools/autotools/autoprojectpart.cpp | 468 +++---- buildtools/autotools/autoprojectpart.h | 100 +- buildtools/autotools/autoprojectwidget.cpp | 222 +-- buildtools/autotools/autoprojectwidget.h | 68 +- buildtools/autotools/autosubprojectview.cpp | 316 ++--- buildtools/autotools/autosubprojectview.h | 40 +- buildtools/autotools/autotoolsaction.cpp | 74 +- buildtools/autotools/autotoolsaction.h | 40 +- buildtools/autotools/choosetargetdialog.cpp | 72 +- buildtools/autotools/choosetargetdialog.h | 6 +- buildtools/autotools/configureoptionswidget.cpp | 124 +- buildtools/autotools/configureoptionswidget.h | 22 +- buildtools/autotools/fileselectorwidget.cpp | 102 +- buildtools/autotools/fileselectorwidget.h | 42 +- buildtools/autotools/kfilednddetailview.cpp | 40 +- buildtools/autotools/kfilednddetailview.h | 34 +- buildtools/autotools/kfiledndiconview.cpp | 42 +- buildtools/autotools/kfiledndiconview.h | 32 +- buildtools/autotools/kimporticonview.cpp | 28 +- buildtools/autotools/kimporticonview.h | 8 +- buildtools/autotools/makefilehandler.cpp | 54 +- buildtools/autotools/makefilehandler.h | 8 +- buildtools/autotools/managecustomcommand.cpp | 6 +- buildtools/autotools/managecustomcommand.h | 2 +- buildtools/autotools/misc.cpp | 258 ++-- buildtools/autotools/misc.h | 26 +- buildtools/autotools/removefiledlg.cpp | 84 +- buildtools/autotools/removefiledlg.h | 12 +- buildtools/autotools/removetargetdlg.cpp | 58 +- buildtools/autotools/removetargetdlg.h | 6 +- buildtools/autotools/subprojectoptionsdlg.cpp | 134 +- buildtools/autotools/subprojectoptionsdlg.h | 8 +- buildtools/autotools/targetoptionsdlg.cpp | 102 +- buildtools/autotools/targetoptionsdlg.h | 2 +- .../custommakefiles/custombuildoptionswidget.cpp | 28 +- .../custommakefiles/custombuildoptionswidget.h | 14 +- .../custommakefiles/custommakeconfigwidget.cpp | 42 +- .../custommakefiles/custommakeconfigwidget.h | 14 +- buildtools/custommakefiles/custommanagerwidget.cpp | 24 +- buildtools/custommakefiles/custommanagerwidget.h | 8 +- .../custommakefiles/customotherconfigwidget.cpp | 46 +- .../custommakefiles/customotherconfigwidget.h | 14 +- buildtools/custommakefiles/customprojectpart.cpp | 586 ++++---- buildtools/custommakefiles/customprojectpart.h | 128 +- .../custommakefiles/selectnewfilesdialog.cpp | 54 +- buildtools/custommakefiles/selectnewfilesdialog.h | 16 +- buildtools/lib/base/kdevbuildtool.cpp | 2 +- buildtools/lib/base/kdevbuildtool.h | 2 +- .../lib/parsers/autotools/autotools_yacc.cpp | 10 +- buildtools/lib/parsers/autotools/autotoolsast.cpp | 24 +- buildtools/lib/parsers/autotools/autotoolsast.h | 44 +- .../lib/parsers/autotools/autotoolsdriver.cpp | 8 +- buildtools/lib/parsers/autotools/autotoolsdriver.h | 6 +- buildtools/lib/parsers/autotools/tests/viewer.cpp | 74 +- buildtools/lib/parsers/autotools/tests/viewer.h | 12 +- .../lib/parsers/autotools/tests/viewer_main.cpp | 4 +- buildtools/lib/parsers/qmake/qmake_lex.cpp | 34 +- buildtools/lib/parsers/qmake/qmake_lex.h | 2 +- buildtools/lib/parsers/qmake/qmake_yacc.cpp | 8 +- buildtools/lib/parsers/qmake/qmake_yacc.hpp | 16 +- buildtools/lib/parsers/qmake/qmakeast.cpp | 22 +- buildtools/lib/parsers/qmake/qmakeast.h | 40 +- buildtools/lib/parsers/qmake/qmakeastvisitor.cpp | 2 +- buildtools/lib/parsers/qmake/qmakedriver.cpp | 10 +- buildtools/lib/parsers/qmake/qmakedriver.h | 2 +- buildtools/lib/parsers/qmake/tests/runner.cpp | 10 +- buildtools/lib/parsers/qmake/tests/viewer.cpp | 70 +- buildtools/lib/parsers/qmake/tests/viewer.h | 10 +- buildtools/lib/parsers/qmake/tests/viewer_main.cpp | 4 +- buildtools/lib/widgets/addenvvardlg.cpp | 34 +- buildtools/lib/widgets/addenvvardlg.h | 14 +- buildtools/lib/widgets/addfilesdialog.cpp | 16 +- buildtools/lib/widgets/addfilesdialog.h | 10 +- .../lib/widgets/environmentdisplaydialog.cpp | 12 +- buildtools/lib/widgets/environmentdisplaydialog.h | 2 +- .../lib/widgets/environmentvariableswidget.cpp | 30 +- .../lib/widgets/environmentvariableswidget.h | 14 +- buildtools/lib/widgets/envvartools.cpp | 8 +- buildtools/lib/widgets/envvartools.h | 4 +- buildtools/lib/widgets/makeoptionswidget.cpp | 12 +- buildtools/lib/widgets/makeoptionswidget.h | 10 +- buildtools/lib/widgets/removesubprojectdialog.cpp | 10 +- buildtools/lib/widgets/removesubprojectdialog.h | 2 +- buildtools/lib/widgets/runoptionswidget.cpp | 40 +- buildtools/lib/widgets/runoptionswidget.h | 14 +- buildtools/lib/widgets/subclassesdlg.cpp | 12 +- buildtools/lib/widgets/subclassesdlg.h | 10 +- buildtools/pascal/pascalglobaloptionsdlg.cpp | 28 +- buildtools/pascal/pascalglobaloptionsdlg.h | 18 +- buildtools/pascal/pascalproject_part.cpp | 188 +-- buildtools/pascal/pascalproject_part.h | 66 +- buildtools/pascal/pascalproject_widget.cpp | 2 +- buildtools/pascal/pascalproject_widget.h | 4 +- buildtools/pascal/pascalprojectoptionsdlg.cpp | 70 +- buildtools/pascal/pascalprojectoptionsdlg.h | 22 +- buildtools/pascal/service.cpp | 26 +- buildtools/pascal/service.h | 12 +- buildtools/qmake/choosesubprojectdlg.cpp | 14 +- buildtools/qmake/choosesubprojectdlg.h | 8 +- buildtools/qmake/createscopedlg.cpp | 18 +- buildtools/qmake/createscopedlg.h | 2 +- buildtools/qmake/disablesubprojectdlg.cpp | 16 +- buildtools/qmake/disablesubprojectdlg.h | 4 +- buildtools/qmake/newwidgetdlg.cpp | 28 +- buildtools/qmake/newwidgetdlg.h | 4 +- buildtools/qmake/projectconfigurationdlg.cpp | 390 +++--- buildtools/qmake/projectconfigurationdlg.h | 24 +- buildtools/qmake/qmakedefaultopts.cpp | 24 +- buildtools/qmake/qmakedefaultopts.h | 16 +- buildtools/qmake/qmakeoptionswidget.cpp | 12 +- buildtools/qmake/qmakeoptionswidget.h | 12 +- buildtools/qmake/qmakescopeitem.cpp | 250 ++-- buildtools/qmake/qmakescopeitem.h | 76 +- buildtools/qmake/scope.cpp | 480 +++---- buildtools/qmake/scope.h | 128 +- buildtools/qmake/trolllistview.cpp | 4 +- buildtools/qmake/trolllistview.h | 4 +- buildtools/qmake/trollprojectpart.cpp | 304 ++--- buildtools/qmake/trollprojectpart.h | 76 +- buildtools/qmake/trollprojectwidget.cpp | 732 +++++----- buildtools/qmake/trollprojectwidget.h | 124 +- buildtools/script/scriptnewfiledlg.cpp | 48 +- buildtools/script/scriptnewfiledlg.h | 6 +- buildtools/script/scriptoptionswidget.cpp | 22 +- buildtools/script/scriptoptionswidget.h | 2 +- buildtools/script/scriptprojectpart.cpp | 156 +-- buildtools/script/scriptprojectpart.h | 46 +- editors/editor-chooser/editorchooser_part.cpp | 10 +- editors/editor-chooser/editorchooser_part.h | 2 +- editors/editor-chooser/editorchooser_widget.cpp | 16 +- editors/editor-chooser/editorchooser_widget.h | 6 +- embedded/visualboyadvance/vbaconfigwidget.cpp | 30 +- embedded/visualboyadvance/vbaconfigwidget.h | 4 +- .../visualboyadvance/visualboyadvance_part.cpp | 32 +- embedded/visualboyadvance/visualboyadvance_part.h | 4 +- kdevdesigner/designer/actiondnd.cpp | 294 ++-- kdevdesigner/designer/actiondnd.h | 156 +-- kdevdesigner/designer/actioneditorimpl.cpp | 128 +- kdevdesigner/designer/actioneditorimpl.h | 20 +- kdevdesigner/designer/actionlistview.cpp | 28 +- kdevdesigner/designer/actionlistview.h | 18 +- kdevdesigner/designer/asciivalidator.cpp | 26 +- kdevdesigner/designer/asciivalidator.h | 12 +- kdevdesigner/designer/command.cpp | 574 ++++---- kdevdesigner/designer/command.h | 504 +++---- kdevdesigner/designer/configtoolboxdialog.ui.h | 60 +- kdevdesigner/designer/connectiondialog.ui.h | 62 +- kdevdesigner/designer/connectionitems.cpp | 220 +-- kdevdesigner/designer/connectionitems.h | 72 +- kdevdesigner/designer/connectiontable.cpp | 6 +- kdevdesigner/designer/connectiontable.h | 4 +- kdevdesigner/designer/customwidgeteditorimpl.cpp | 208 +-- kdevdesigner/designer/customwidgeteditorimpl.h | 40 +- kdevdesigner/designer/database.cpp | 46 +- kdevdesigner/designer/database.h | 36 +- kdevdesigner/designer/dbconnectionimpl.cpp | 12 +- kdevdesigner/designer/dbconnectionimpl.h | 4 +- kdevdesigner/designer/dbconnectionsimpl.cpp | 40 +- kdevdesigner/designer/dbconnectionsimpl.h | 6 +- kdevdesigner/designer/defs.cpp | 52 +- kdevdesigner/designer/defs.h | 10 +- kdevdesigner/designer/designer_pch.h | 48 +- kdevdesigner/designer/designeraction.cpp | 4 +- kdevdesigner/designer/designeraction.h | 26 +- kdevdesigner/designer/designerapp.cpp | 76 +- kdevdesigner/designer/designerapp.h | 12 +- kdevdesigner/designer/designerappiface.cpp | 368 ++--- kdevdesigner/designer/designerappiface.h | 214 +-- kdevdesigner/designer/editfunctionsimpl.cpp | 124 +- kdevdesigner/designer/editfunctionsimpl.h | 58 +- kdevdesigner/designer/filechooser.cpp | 34 +- kdevdesigner/designer/filechooser.h | 16 +- kdevdesigner/designer/finddialog.ui.h | 2 +- kdevdesigner/designer/formfile.cpp | 180 +-- kdevdesigner/designer/formfile.h | 44 +- kdevdesigner/designer/formsettingsimpl.cpp | 26 +- kdevdesigner/designer/formsettingsimpl.h | 2 +- kdevdesigner/designer/formwindow.cpp | 942 ++++++------- kdevdesigner/designer/formwindow.h | 218 +-- kdevdesigner/designer/hierarchyview.cpp | 516 +++---- kdevdesigner/designer/hierarchyview.h | 130 +- kdevdesigner/designer/iconvieweditorimpl.cpp | 36 +- kdevdesigner/designer/iconvieweditorimpl.h | 8 +- kdevdesigner/designer/kdevdesigner_part.cpp | 142 +- kdevdesigner/designer/kdevdesigner_part.h | 36 +- kdevdesigner/designer/layout.cpp | 234 ++-- kdevdesigner/designer/layout.h | 68 +- kdevdesigner/designer/listboxdnd.cpp | 100 +- kdevdesigner/designer/listboxdnd.h | 24 +- kdevdesigner/designer/listboxeditorimpl.cpp | 70 +- kdevdesigner/designer/listboxeditorimpl.h | 8 +- kdevdesigner/designer/listboxrename.cpp | 42 +- kdevdesigner/designer/listboxrename.h | 16 +- kdevdesigner/designer/listdnd.cpp | 52 +- kdevdesigner/designer/listdnd.h | 32 +- kdevdesigner/designer/listeditor.ui.h | 32 +- kdevdesigner/designer/listviewdnd.cpp | 104 +- kdevdesigner/designer/listviewdnd.h | 24 +- kdevdesigner/designer/listvieweditorimpl.cpp | 200 +-- kdevdesigner/designer/listvieweditorimpl.h | 38 +- kdevdesigner/designer/mainwindow.cpp | 1286 +++++++++--------- kdevdesigner/designer/mainwindow.h | 224 +-- kdevdesigner/designer/mainwindowactions.cpp | 610 ++++----- kdevdesigner/designer/menubareditor.cpp | 192 +-- kdevdesigner/designer/menubareditor.h | 84 +- kdevdesigner/designer/metadatabase.cpp | 486 +++---- kdevdesigner/designer/metadatabase.h | 264 ++-- kdevdesigner/designer/multilineeditorimpl.cpp | 164 +-- kdevdesigner/designer/multilineeditorimpl.h | 46 +- kdevdesigner/designer/myiconloader.cpp | 4 +- kdevdesigner/designer/myiconloader.h | 8 +- kdevdesigner/designer/newformimpl.cpp | 118 +- kdevdesigner/designer/newformimpl.h | 64 +- kdevdesigner/designer/orderindicator.cpp | 36 +- kdevdesigner/designer/orderindicator.h | 12 +- kdevdesigner/designer/outputwindow.cpp | 74 +- kdevdesigner/designer/outputwindow.h | 34 +- .../designer/paletteeditoradvancedimpl.cpp | 208 +-- kdevdesigner/designer/paletteeditoradvancedimpl.h | 38 +- kdevdesigner/designer/paletteeditorimpl.cpp | 134 +- kdevdesigner/designer/paletteeditorimpl.h | 20 +- kdevdesigner/designer/pixmapchooser.cpp | 116 +- kdevdesigner/designer/pixmapchooser.h | 32 +- kdevdesigner/designer/pixmapcollection.cpp | 60 +- kdevdesigner/designer/pixmapcollection.h | 28 +- kdevdesigner/designer/pixmapcollectioneditor.ui.h | 36 +- kdevdesigner/designer/popupmenueditor.cpp | 316 ++--- kdevdesigner/designer/popupmenueditor.h | 106 +- kdevdesigner/designer/previewframe.cpp | 18 +- kdevdesigner/designer/previewframe.h | 14 +- kdevdesigner/designer/previewwidgetimpl.cpp | 32 +- kdevdesigner/designer/previewwidgetimpl.h | 6 +- kdevdesigner/designer/project.cpp | 524 +++---- kdevdesigner/designer/project.h | 212 +-- kdevdesigner/designer/projectsettingsimpl.cpp | 26 +- kdevdesigner/designer/projectsettingsimpl.h | 4 +- kdevdesigner/designer/propertyeditor.cpp | 1430 ++++++++++---------- kdevdesigner/designer/propertyeditor.h | 388 +++--- kdevdesigner/designer/propertyobject.cpp | 68 +- kdevdesigner/designer/propertyobject.h | 52 +- kdevdesigner/designer/qcompletionedit.cpp | 68 +- kdevdesigner/designer/qcompletionedit.h | 26 +- kdevdesigner/designer/replacedialog.ui.h | 2 +- kdevdesigner/designer/resource.cpp | 1364 +++++++++---------- kdevdesigner/designer/resource.h | 158 +-- kdevdesigner/designer/richtextfontdialog.ui.h | 12 +- kdevdesigner/designer/sizehandle.cpp | 50 +- kdevdesigner/designer/sizehandle.h | 38 +- kdevdesigner/designer/sourceeditor.cpp | 42 +- kdevdesigner/designer/sourceeditor.h | 30 +- kdevdesigner/designer/sourcefile.cpp | 66 +- kdevdesigner/designer/sourcefile.h | 16 +- kdevdesigner/designer/startdialogimpl.cpp | 114 +- kdevdesigner/designer/startdialogimpl.h | 26 +- kdevdesigner/designer/styledbutton.cpp | 136 +- kdevdesigner/designer/styledbutton.h | 50 +- kdevdesigner/designer/syntaxhighlighter_html.cpp | 20 +- kdevdesigner/designer/syntaxhighlighter_html.h | 2 +- kdevdesigner/designer/tableeditorimpl.cpp | 108 +- kdevdesigner/designer/tableeditorimpl.h | 20 +- kdevdesigner/designer/timestamp.cpp | 24 +- kdevdesigner/designer/timestamp.h | 18 +- kdevdesigner/designer/variabledialogimpl.cpp | 38 +- kdevdesigner/designer/variabledialogimpl.h | 6 +- kdevdesigner/designer/widgetaction.cpp | 22 +- kdevdesigner/designer/widgetaction.h | 30 +- kdevdesigner/designer/widgetfactory.cpp | 960 ++++++------- kdevdesigner/designer/widgetfactory.h | 322 ++--- kdevdesigner/designer/wizardeditorimpl.cpp | 36 +- kdevdesigner/designer/wizardeditorimpl.h | 12 +- kdevdesigner/designer/workspace.cpp | 218 +-- kdevdesigner/designer/workspace.h | 52 +- kdevdesigner/interfaces/actioninterface.h | 8 +- kdevdesigner/interfaces/classbrowserinterface.h | 8 +- kdevdesigner/interfaces/designerinterface.h | 224 +-- kdevdesigner/interfaces/editorinterface.h | 26 +- kdevdesigner/interfaces/filterinterface.h | 4 +- kdevdesigner/interfaces/interpreterinterface.h | 2 +- kdevdesigner/interfaces/languageinterface.h | 86 +- kdevdesigner/interfaces/preferenceinterface.h | 10 +- kdevdesigner/interfaces/projectsettingsiface.h | 12 +- kdevdesigner/interfaces/sourcetemplateiface.h | 12 +- kdevdesigner/interfaces/templatewizardiface.h | 2 +- kdevdesigner/plugins/languageinterfaceimpl.cpp | 74 +- kdevdesigner/plugins/languageinterfaceimpl.h | 62 +- kdevdesigner/shared/domtool.cpp | 166 +-- kdevdesigner/shared/domtool.h | 26 +- kdevdesigner/shared/globaldefs.h | 24 +- kdevdesigner/shared/parser.cpp | 26 +- kdevdesigner/shared/parser.h | 4 +- kdevdesigner/shared/ui2uib.cpp | 352 ++--- kdevdesigner/shared/ui2uib.h | 2 +- kdevdesigner/shared/uib.cpp | 2 +- kdevdesigner/shared/uib.h | 34 +- kdevdesigner/shared/widgetdatabase.cpp | 210 +-- kdevdesigner/shared/widgetdatabase.h | 38 +- kdevdesigner/src/kdevdesigner.cpp | 22 +- kdevdesigner/src/main.cpp | 10 +- kdevdesigner/uilib/database.cpp | 46 +- kdevdesigner/uilib/database2.h | 36 +- kdevdesigner/uilib/qwidgetfactory.cpp | 1376 +++++++++---------- kdevdesigner/uilib/qwidgetfactory.h | 190 +-- languages/ada/AdaStoreWalker.hpp | 28 +- languages/ada/ada_utils.cpp | 44 +- languages/ada/ada_utils.hpp | 10 +- languages/ada/adasupportpart.cpp | 114 +- languages/ada/adasupportpart.h | 18 +- languages/ada/addclass.cpp | 56 +- languages/ada/addclass.h | 22 +- languages/ada/backgroundparser.cpp | 10 +- languages/ada/backgroundparser.h | 12 +- languages/ada/problemreporter.cpp | 108 +- languages/ada/problemreporter.h | 16 +- languages/bash/bashsupport_part.cpp | 128 +- languages/bash/bashsupport_part.h | 24 +- languages/cpp/KDevCppSupportIface.cpp | 2 +- languages/cpp/KDevCppSupportIface.h | 4 +- languages/cpp/addattributedialog.cpp | 92 +- languages/cpp/addattributedialog.h | 10 +- languages/cpp/addmethoddialog.cpp | 156 +-- languages/cpp/addmethoddialog.h | 12 +- .../cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp | 146 +- .../cpp/app_templates/cmakeqt3app/cmakeqt3app.h | 12 +- languages/cpp/app_templates/cmakeqt3app/main.cpp | 6 +- .../cpp/app_templates/dcopservice/dcopservice.cpp | 12 +- .../cpp/app_templates/dcopservice/dcopservice.h | 14 +- languages/cpp/app_templates/kapp/app.cpp | 52 +- languages/cpp/app_templates/kapp/app.h | 8 +- languages/cpp/app_templates/kapp/app_client.cpp | 14 +- languages/cpp/app_templates/kapp/appiface.h | 2 +- languages/cpp/app_templates/kapp/appview.cpp | 28 +- languages/cpp/app_templates/kapp/appview.h | 20 +- languages/cpp/app_templates/kapp/pref.cpp | 22 +- languages/cpp/app_templates/kapp/pref.h | 6 +- .../cpp/app_templates/kateplugin/plugin_app.cpp | 6 +- .../cpp/app_templates/kateplugin/plugin_app.h | 6 +- .../cpp/app_templates/kateplugin2/plugin_app.cpp | 22 +- .../cpp/app_templates/kateplugin2/plugin_app.h | 16 +- languages/cpp/app_templates/kcmodule/module.cpp | 8 +- languages/cpp/app_templates/kcmodule/module.h | 4 +- languages/cpp/app_templates/kconfig35/app.cpp | 24 +- languages/cpp/app_templates/kconfig35/app.h | 4 +- languages/cpp/app_templates/kconfig35/appview.cpp | 6 +- languages/cpp/app_templates/kconfig35/appview.h | 8 +- languages/cpp/app_templates/kde4app/kapp4.cpp | 16 +- languages/cpp/app_templates/kde4app/kapp4view.cpp | 12 +- languages/cpp/app_templates/kde4app/kapp4view.h | 10 +- languages/cpp/app_templates/kdedcop/app.cpp | 2 +- languages/cpp/app_templates/kdedcop/app_iface.h | 4 +- languages/cpp/app_templates/kdedcop/mainclass.cpp | 4 +- languages/cpp/app_templates/kdedcop/mainclass.h | 6 +- .../cpp/app_templates/kdevlang/kdevlang_part.cpp | 46 +- .../cpp/app_templates/kdevlang/kdevlang_part.h | 8 +- .../cpp/app_templates/kdevpart/globalconfig.cpp | 2 +- .../cpp/app_templates/kdevpart/globalconfig.h | 2 +- .../cpp/app_templates/kdevpart/kdevpart_part.cpp | 36 +- .../cpp/app_templates/kdevpart/kdevpart_part.h | 10 +- .../cpp/app_templates/kdevpart/kdevpart_widget.cpp | 2 +- .../cpp/app_templates/kdevpart/kdevpart_widget.h | 4 +- .../cpp/app_templates/kdevpart/projectconfig.cpp | 2 +- .../cpp/app_templates/kdevpart/projectconfig.h | 2 +- .../cpp/app_templates/kdevpart2/globalconfig.cpp | 2 +- .../cpp/app_templates/kdevpart2/globalconfig.h | 2 +- .../cpp/app_templates/kdevpart2/kdevpart_part.cpp | 36 +- .../cpp/app_templates/kdevpart2/kdevpart_part.h | 10 +- .../app_templates/kdevpart2/kdevpart_widget.cpp | 2 +- .../cpp/app_templates/kdevpart2/kdevpart_widget.h | 4 +- .../cpp/app_templates/kdevpart2/projectconfig.cpp | 2 +- .../cpp/app_templates/kdevpart2/projectconfig.h | 2 +- .../cpp/app_templates/kfileplugin/kfile_plugin.cpp | 14 +- .../cpp/app_templates/kfileplugin/kfile_plugin.h | 2 +- languages/cpp/app_templates/khello/app.cpp | 4 +- languages/cpp/app_templates/khello2/widget.cpp | 4 +- languages/cpp/app_templates/khello2/widget.h | 2 +- languages/cpp/app_templates/kicker/applet.cpp | 10 +- languages/cpp/app_templates/kicker/applet.h | 10 +- languages/cpp/app_templates/kioslave/slave.cpp | 18 +- languages/cpp/app_templates/kioslave/slave.h | 6 +- languages/cpp/app_templates/kmake/mainviewimp.cpp | 4 +- languages/cpp/app_templates/kmake/mainviewimp.h | 2 +- .../app_templates/kofficepart/kopart_factory.cpp | 4 +- .../cpp/app_templates/kofficepart/kopart_factory.h | 4 +- .../cpp/app_templates/kofficepart/kopart_part.cpp | 18 +- .../cpp/app_templates/kofficepart/kopart_part.h | 14 +- .../cpp/app_templates/kofficepart/kopart_view.cpp | 14 +- .../cpp/app_templates/kofficepart/kopart_view.h | 4 +- .../app_templates/konqnavpanel/konqnavpanel.cpp | 14 +- .../cpp/app_templates/konqnavpanel/konqnavpanel.h | 10 +- languages/cpp/app_templates/kpartapp/app.cpp | 20 +- languages/cpp/app_templates/kpartapp/app_part.cpp | 54 +- languages/cpp/app_templates/kpartapp/app_part.h | 12 +- .../cpp/app_templates/kpartplugin/plugin_app.cpp | 16 +- .../cpp/app_templates/kpartplugin/plugin_app.h | 4 +- .../cpp/app_templates/kscons_kmdi/app_part.cpp | 46 +- languages/cpp/app_templates/kscons_kmdi/app_part.h | 6 +- .../cpp/app_templates/kscons_kmdi/appkmdi.cpp | 64 +- languages/cpp/app_templates/kscons_kmdi/appkmdi.h | 10 +- .../cpp/app_templates/kscons_kmdi/appkmdiView.cpp | 12 +- .../cpp/app_templates/kscons_kmdi/appkmdiView.h | 2 +- .../cpp/app_templates/kscons_kmdi/kmdikonsole.cpp | 18 +- .../cpp/app_templates/kscons_kmdi/kmdikonsole.h | 8 +- languages/cpp/app_templates/kscons_kxt/app.cpp | 40 +- languages/cpp/app_templates/kscons_kxt/app.h | 4 +- languages/cpp/app_templates/kscons_kxt/appview.cpp | 6 +- languages/cpp/app_templates/kscons_kxt/appview.h | 8 +- .../app_templates/kscreensaver/kscreensaver.cpp | 18 +- .../cpp/app_templates/kscreensaver/kscreensaver.h | 2 +- languages/cpp/app_templates/kxt/app.cpp | 36 +- languages/cpp/app_templates/kxt/app.h | 4 +- languages/cpp/app_templates/kxt/appview.cpp | 6 +- languages/cpp/app_templates/kxt/appview.h | 8 +- .../cpp/app_templates/noatunui/plugin_impl.cpp | 120 +- languages/cpp/app_templates/noatunui/plugin_impl.h | 28 +- languages/cpp/app_templates/opieapp/example.cpp | 6 +- languages/cpp/app_templates/opieapp/example.h | 6 +- .../cpp/app_templates/opieapplet/simpleimpl.cpp | 26 +- .../cpp/app_templates/opieapplet/simpleimpl.h | 18 +- .../cpp/app_templates/opieinput/simpleimpl.cpp | 64 +- languages/cpp/app_templates/opieinput/simpleimpl.h | 18 +- .../cpp/app_templates/opiemenu/simpleimpl.cpp | 22 +- languages/cpp/app_templates/opiemenu/simpleimpl.h | 16 +- .../cpp/app_templates/opienet/simmplemodule.h | 16 +- .../cpp/app_templates/opienet/simpleiface.cpp | 4 +- languages/cpp/app_templates/opienet/simpleiface.h | 2 +- .../cpp/app_templates/opienet/simplemodule.cpp | 14 +- languages/cpp/app_templates/opienet/simplemodule.h | 16 +- .../cpp/app_templates/opietoday/exampleplugin.cpp | 18 +- .../cpp/app_templates/opietoday/exampleplugin.h | 18 +- .../opietoday/examplepluginwidget.cpp | 8 +- .../app_templates/opietoday/examplepluginwidget.h | 8 +- languages/cpp/app_templates/qmakeapp/main.cpp | 6 +- languages/cpp/app_templates/qmakeapp/qmakeapp.cpp | 146 +- languages/cpp/app_templates/qmakeapp/qmakeapp.h | 12 +- languages/cpp/app_templates/qt4makeapp/main.cpp | 4 +- .../cpp/app_templates/qt4makeapp/qt4makeapp.cpp | 124 +- .../cpp/app_templates/qt4makeapp/qt4makeapp.h | 42 +- languages/cpp/app_templates/qtopia4app/example.cpp | 10 +- languages/cpp/app_templates/qtopia4app/example.h | 6 +- languages/cpp/app_templates/qtopiaapp/example.cpp | 6 +- languages/cpp/app_templates/qtopiaapp/example.h | 2 +- languages/cpp/ast_utils.cpp | 50 +- languages/cpp/ast_utils.h | 8 +- languages/cpp/backgroundparser.cpp | 142 +- languages/cpp/backgroundparser.h | 50 +- languages/cpp/ccconfigwidget.cpp | 138 +- languages/cpp/ccconfigwidget.h | 14 +- languages/cpp/classgeneratorconfig.cpp | 48 +- languages/cpp/classgeneratorconfig.h | 46 +- languages/cpp/codeinformationrepository.cpp | 82 +- languages/cpp/codeinformationrepository.h | 24 +- .../cpp/compiler/gccoptions/gccoptionsplugin.cpp | 160 +-- .../cpp/compiler/gccoptions/gccoptionsplugin.h | 14 +- languages/cpp/completiondebug.h | 10 +- languages/cpp/computerecoverypoints.h | 34 +- languages/cpp/configproblemreporter.ui.h | 18 +- languages/cpp/cpp_tags.h | 48 +- languages/cpp/cppcodecompletion.cpp | 774 +++++------ languages/cpp/cppcodecompletion.h | 126 +- languages/cpp/cppcodecompletionconfig.cpp | 8 +- languages/cpp/cppcodecompletionconfig.h | 20 +- languages/cpp/cppevaluation.cpp | 68 +- languages/cpp/cppevaluation.h | 64 +- languages/cpp/cppimplementationwidget.cpp | 56 +- languages/cpp/cppimplementationwidget.h | 4 +- languages/cpp/cppnewclassdlg.cpp | 776 +++++------ languages/cpp/cppnewclassdlg.h | 214 +-- languages/cpp/cppsplitheadersourceconfig.cpp | 10 +- languages/cpp/cppsplitheadersourceconfig.h | 14 +- languages/cpp/cppsupport_events.h | 22 +- languages/cpp/cppsupport_utils.cpp | 42 +- languages/cpp/cppsupport_utils.h | 12 +- languages/cpp/cppsupportpart.cpp | 812 +++++------ languages/cpp/cppsupportpart.h | 232 ++-- languages/cpp/creategettersetterconfiguration.cpp | 8 +- languages/cpp/creategettersetterconfiguration.h | 34 +- languages/cpp/creategettersetterdialog.cpp | 24 +- languages/cpp/creategettersetterdialog.h | 2 +- languages/cpp/createpcsdialog.cpp | 72 +- languages/cpp/createpcsdialog.h | 8 +- languages/cpp/debugger/breakpoint.cpp | 94 +- languages/cpp/debugger/breakpoint.h | 88 +- languages/cpp/debugger/dbgcontroller.h | 14 +- languages/cpp/debugger/dbgpsdlg.cpp | 46 +- languages/cpp/debugger/dbgpsdlg.h | 8 +- languages/cpp/debugger/dbgtoolbar.cpp | 212 +-- languages/cpp/debugger/dbgtoolbar.h | 10 +- languages/cpp/debugger/debuggerconfigwidget.cpp | 14 +- languages/cpp/debugger/debuggerconfigwidget.h | 6 +- languages/cpp/debugger/debuggerdcopinterface.h | 2 +- languages/cpp/debugger/debuggerpart.cpp | 320 ++--- languages/cpp/debugger/debuggerpart.h | 40 +- languages/cpp/debugger/debuggertracingdialog.cpp | 22 +- languages/cpp/debugger/debuggertracingdialog.h | 2 +- languages/cpp/debugger/disassemblewidget.cpp | 32 +- languages/cpp/debugger/disassemblewidget.h | 12 +- languages/cpp/debugger/framestackwidget.cpp | 136 +- languages/cpp/debugger/framestackwidget.h | 36 +- languages/cpp/debugger/gdbbreakpointwidget.cpp | 212 +-- languages/cpp/debugger/gdbbreakpointwidget.h | 54 +- languages/cpp/debugger/gdbcommand.cpp | 16 +- languages/cpp/debugger/gdbcommand.h | 68 +- languages/cpp/debugger/gdbcontroller.cpp | 176 +-- languages/cpp/debugger/gdbcontroller.h | 70 +- languages/cpp/debugger/gdboutputwidget.cpp | 100 +- languages/cpp/debugger/gdboutputwidget.h | 48 +- languages/cpp/debugger/gdbparser.cpp | 24 +- languages/cpp/debugger/gdbparser.h | 8 +- languages/cpp/debugger/gdbtable.cpp | 16 +- languages/cpp/debugger/gdbtable.h | 8 +- languages/cpp/debugger/label_with_double_click.cpp | 6 +- languages/cpp/debugger/label_with_double_click.h | 6 +- languages/cpp/debugger/memviewdlg.cpp | 138 +- languages/cpp/debugger/memviewdlg.h | 30 +- languages/cpp/debugger/mi/gdbmi.cpp | 16 +- languages/cpp/debugger/mi/gdbmi.h | 38 +- languages/cpp/debugger/mi/milexer.cpp | 4 +- languages/cpp/debugger/mi/milexer.h | 24 +- languages/cpp/debugger/mi/miparser.cpp | 10 +- languages/cpp/debugger/mi/miparser.h | 6 +- languages/cpp/debugger/stty.cpp | 30 +- languages/cpp/debugger/stty.h | 14 +- .../tests/print_pointers/print_pointers.cpp | 12 +- .../cpp/debugger/tests/two_module/src/foo.cpp | 4 +- languages/cpp/debugger/variablewidget.cpp | 336 ++--- languages/cpp/debugger/variablewidget.h | 108 +- languages/cpp/declarationinfo.h | 22 +- languages/cpp/doxydoc.cpp | 60 +- languages/cpp/doxydoc.h | 28 +- languages/cpp/expressioninfo.h | 12 +- languages/cpp/includepathresolver.cpp | 120 +- languages/cpp/includepathresolver.h | 40 +- languages/cpp/kdevdeepcopy.h | 8 +- languages/cpp/kdevdriver.cpp | 46 +- languages/cpp/kdevdriver.h | 4 +- languages/cpp/main.cpp | 78 +- .../customimporter/kdevcustomimporter.cpp | 50 +- .../customimporter/kdevcustomimporter.h | 18 +- .../pcsimporter/customimporter/settingsdialog.cpp | 36 +- .../pcsimporter/customimporter/settingsdialog.h | 16 +- .../kdelibsimporter/kdevkdelibsimporter.cpp | 44 +- .../kdelibsimporter/kdevkdelibsimporter.h | 16 +- .../pcsimporter/kdelibsimporter/settingsdialog.cpp | 30 +- .../pcsimporter/kdelibsimporter/settingsdialog.h | 8 +- .../pcsimporter/qt4importer/kdevqt4importer.cpp | 28 +- .../cpp/pcsimporter/qt4importer/kdevqt4importer.h | 14 +- .../cpp/pcsimporter/qt4importer/settingsdialog.cpp | 38 +- .../cpp/pcsimporter/qt4importer/settingsdialog.h | 10 +- .../cpp/pcsimporter/qtimporter/kdevqtimporter.cpp | 26 +- .../cpp/pcsimporter/qtimporter/kdevqtimporter.h | 14 +- .../cpp/pcsimporter/qtimporter/settingsdialog.cpp | 42 +- .../cpp/pcsimporter/qtimporter/settingsdialog.h | 10 +- languages/cpp/problemreporter.cpp | 138 +- languages/cpp/problemreporter.h | 40 +- languages/cpp/qtbuildconfig.cpp | 72 +- languages/cpp/qtbuildconfig.h | 48 +- languages/cpp/qtdesignercppintegration.cpp | 50 +- languages/cpp/qtdesignercppintegration.h | 4 +- languages/cpp/setuphelper.cpp | 26 +- languages/cpp/setuphelper.h | 8 +- languages/cpp/simplecontext.cpp | 6 +- languages/cpp/simplecontext.h | 26 +- languages/cpp/simpletype.cpp | 78 +- languages/cpp/simpletype.h | 110 +- languages/cpp/simpletypecachebinder.h | 18 +- languages/cpp/simpletypecatalog.cpp | 74 +- languages/cpp/simpletypecatalog.h | 24 +- languages/cpp/simpletypefunction.cpp | 102 +- languages/cpp/simpletypefunction.h | 54 +- languages/cpp/simpletypenamespace.cpp | 20 +- languages/cpp/simpletypenamespace.h | 18 +- languages/cpp/store_walker.cpp | 176 +-- languages/cpp/store_walker.h | 44 +- languages/cpp/storeconverter.cpp | 28 +- languages/cpp/storeconverter.h | 4 +- languages/cpp/stringhelpers.cpp | 52 +- languages/cpp/stringhelpers.h | 48 +- .../subclassing_template/subclass_qt4_template.cpp | 2 +- .../subclassing_template/subclass_qt4_template.h | 2 +- .../cpp/subclassing_template/subclass_template.cpp | 2 +- .../cpp/subclassing_template/subclass_template.h | 2 +- languages/cpp/subclassingdlg.cpp | 132 +- languages/cpp/subclassingdlg.h | 58 +- languages/cpp/tag_creator.cpp | 180 +-- languages/cpp/tag_creator.h | 38 +- languages/cpp/typedecoration.h | 22 +- languages/cpp/typedesc.cpp | 56 +- languages/cpp/typedesc.h | 38 +- languages/csharp/csharpconfigwidget.cpp | 6 +- languages/csharp/csharpconfigwidget.h | 6 +- languages/csharp/csharpdoc.cpp | 22 +- languages/csharp/csharpdoc.h | 8 +- languages/csharp/csharpsupportpart.cpp | 100 +- languages/csharp/csharpsupportpart.h | 18 +- .../compiler/pgioptions/pgioptionsfactory.cpp | 6 +- .../compiler/pgioptions/pgioptionsfactory.h | 6 +- .../compiler/pgioptions/pgioptionsplugin.cpp | 130 +- .../fortran/compiler/pgioptions/pgioptionsplugin.h | 10 +- languages/fortran/fixedformparser.cpp | 22 +- languages/fortran/fixedformparser.h | 12 +- languages/fortran/fortransupportpart.cpp | 86 +- languages/fortran/fortransupportpart.h | 8 +- languages/fortran/ftnchekconfigwidget.cpp | 76 +- languages/fortran/ftnchekconfigwidget.h | 12 +- languages/java/JavaLexer.hpp | 10 +- languages/java/JavaRecognizer.hpp | 10 +- languages/java/JavaStoreWalker.cpp | 80 +- languages/java/JavaStoreWalker.hpp | 32 +- languages/java/KDevJavaSupportIface.cpp | 2 +- languages/java/KDevJavaSupportIface.h | 4 +- languages/java/backgroundparser.cpp | 98 +- languages/java/backgroundparser.h | 44 +- languages/java/driver.cpp | 56 +- languages/java/driver.h | 50 +- languages/java/javasupport_events.h | 22 +- languages/java/javasupport_utils.cpp | 18 +- languages/java/javasupport_utils.h | 4 +- languages/java/javasupportpart.cpp | 284 ++-- languages/java/javasupportpart.h | 64 +- languages/java/kdevdeepcopy.h | 8 +- languages/java/kdevdriver.cpp | 12 +- languages/java/problemreporter.cpp | 88 +- languages/java/problemreporter.h | 18 +- languages/kjssupport/jscodecompletion.cpp | 44 +- languages/kjssupport/jscodecompletion.h | 6 +- languages/kjssupport/kjsproblems.cpp | 16 +- languages/kjssupport/kjsproblems.h | 4 +- languages/kjssupport/kjssupport_part.cpp | 114 +- languages/kjssupport/kjssupport_part.h | 30 +- languages/kjssupport/subclassingdlg.cpp | 120 +- languages/kjssupport/subclassingdlg.h | 60 +- languages/lib/debugger/debugger.cpp | 24 +- languages/lib/debugger/debugger.h | 12 +- languages/lib/debugger/kdevdebugger.cpp | 24 +- languages/lib/debugger/kdevdebugger.h | 24 +- .../designer_integration/implementationwidget.cpp | 28 +- .../designer_integration/implementationwidget.h | 14 +- .../designer_integration/qtdesignerintegration.cpp | 48 +- .../designer_integration/qtdesignerintegration.h | 22 +- languages/lib/interfaces/kdevpcsimporter.cpp | 6 +- languages/lib/interfaces/kdevpcsimporter.h | 14 +- languages/pascal/PascalLexer.hpp | 2 +- languages/pascal/PascalParser.hpp | 2 +- languages/pascal/PascalStoreWalker.hpp | 14 +- languages/pascal/PascalStoreWalkerTokenTypes.hpp | 2 +- languages/pascal/PascalTokenTypes.hpp | 2 +- languages/pascal/backgroundparser.cpp | 10 +- languages/pascal/backgroundparser.h | 12 +- .../compiler/dccoptions/dccoptionsplugin.cpp | 28 +- .../pascal/compiler/dccoptions/dccoptionsplugin.h | 12 +- .../pascal/compiler/dccoptions/optiontabs.cpp | 156 +-- languages/pascal/compiler/dccoptions/optiontabs.h | 38 +- .../compiler/fpcoptions/fpcoptionsplugin.cpp | 26 +- .../pascal/compiler/fpcoptions/fpcoptionsplugin.h | 12 +- .../pascal/compiler/fpcoptions/optiontabs.cpp | 246 ++-- languages/pascal/compiler/fpcoptions/optiontabs.h | 62 +- languages/pascal/pascalsupport_part.cpp | 98 +- languages/pascal/pascalsupport_part.h | 22 +- languages/pascal/problemreporter.cpp | 100 +- languages/pascal/problemreporter.h | 16 +- languages/perl/perlconfigwidget.cpp | 8 +- languages/perl/perlconfigwidget.h | 6 +- languages/perl/perldoc.cpp | 22 +- languages/perl/perldoc.h | 8 +- languages/perl/perlparser.cpp | 122 +- languages/perl/perlparser.h | 50 +- languages/perl/perlsupportpart.cpp | 98 +- languages/perl/perlsupportpart.h | 18 +- languages/php/phpcodecompletion.cpp | 174 +-- languages/php/phpcodecompletion.h | 38 +- languages/php/phpconfigdata.cpp | 4 +- languages/php/phpconfigdata.h | 44 +- languages/php/phpconfigwidget.cpp | 30 +- languages/php/phpconfigwidget.h | 8 +- languages/php/phperrorview.cpp | 128 +- languages/php/phperrorview.h | 32 +- languages/php/phpfile.cpp | 142 +- languages/php/phpfile.h | 66 +- languages/php/phpnewclassdlg.cpp | 62 +- languages/php/phpnewclassdlg.h | 8 +- languages/php/phpparser.cpp | 36 +- languages/php/phpparser.h | 26 +- languages/php/phpsupport_event.h | 42 +- languages/php/phpsupportpart.cpp | 164 +-- languages/php/phpsupportpart.h | 38 +- languages/python/pydoc.cpp | 12 +- languages/python/pydoc.h | 14 +- languages/python/pythonconfigwidget.cpp | 6 +- languages/python/pythonconfigwidget.h | 6 +- languages/python/pythonimplementationwidget.cpp | 36 +- languages/python/pythonimplementationwidget.h | 4 +- languages/python/pythonsupportpart.cpp | 120 +- languages/python/pythonsupportpart.h | 20 +- languages/python/qtdesignerpythonintegration.cpp | 10 +- languages/ruby/app_templates/dcopservice/app.cpp | 12 +- languages/ruby/app_templates/kapp/app.cpp | 12 +- languages/ruby/app_templates/kxt/app.cpp | 12 +- languages/ruby/debugger/breakpoint.cpp | 64 +- languages/ruby/debugger/breakpoint.h | 82 +- languages/ruby/debugger/dbgcommand.cpp | 4 +- languages/ruby/debugger/dbgcommand.h | 12 +- languages/ruby/debugger/dbgcontroller.h | 26 +- languages/ruby/debugger/dbgpsdlg.cpp | 42 +- languages/ruby/debugger/dbgpsdlg.h | 10 +- languages/ruby/debugger/dbgtoolbar.cpp | 186 +-- languages/ruby/debugger/dbgtoolbar.h | 10 +- languages/ruby/debugger/debuggerpart.cpp | 250 ++-- languages/ruby/debugger/debuggerpart.h | 34 +- languages/ruby/debugger/framestackwidget.cpp | 50 +- languages/ruby/debugger/framestackwidget.h | 24 +- languages/ruby/debugger/rdbbreakpointwidget.cpp | 178 +-- languages/ruby/debugger/rdbbreakpointwidget.h | 38 +- languages/ruby/debugger/rdbcommand.cpp | 8 +- languages/ruby/debugger/rdbcommand.h | 8 +- languages/ruby/debugger/rdbcontroller.cpp | 210 +-- languages/ruby/debugger/rdbcontroller.h | 70 +- languages/ruby/debugger/rdboutputwidget.cpp | 44 +- languages/ruby/debugger/rdboutputwidget.h | 14 +- languages/ruby/debugger/rdbparser.cpp | 36 +- languages/ruby/debugger/rdbparser.h | 4 +- languages/ruby/debugger/rdbtable.cpp | 16 +- languages/ruby/debugger/rdbtable.h | 8 +- languages/ruby/debugger/stty.cpp | 30 +- languages/ruby/debugger/stty.h | 16 +- languages/ruby/debugger/variablewidget.cpp | 200 +-- languages/ruby/debugger/variablewidget.h | 78 +- languages/ruby/qtdesignerrubyintegration.cpp | 8 +- languages/ruby/rubyconfigwidget.cpp | 6 +- languages/ruby/rubyconfigwidget.h | 4 +- languages/ruby/rubyimplementationwidget.cpp | 34 +- languages/ruby/rubyimplementationwidget.h | 4 +- languages/ruby/rubysupport_part.cpp | 310 ++--- languages/ruby/rubysupport_part.h | 36 +- languages/sql/sqlactions.cpp | 30 +- languages/sql/sqlactions.h | 8 +- languages/sql/sqlconfigwidget.ui.h | 82 +- languages/sql/sqloutputwidget.cpp | 70 +- languages/sql/sqloutputwidget.h | 16 +- languages/sql/sqlsupport_part.cpp | 104 +- languages/sql/sqlsupport_part.h | 16 +- lib/catalog/catalog.cpp | 106 +- lib/catalog/catalog.h | 22 +- lib/catalog/tag.cpp | 10 +- lib/catalog/tag.h | 70 +- lib/cppparser/ast.cpp | 66 +- lib/cppparser/ast.h | 112 +- lib/cppparser/driver.cpp | 180 +-- lib/cppparser/driver.h | 114 +- lib/cppparser/errors.h | 6 +- lib/cppparser/lexer.cpp | 90 +- lib/cppparser/lexer.h | 98 +- lib/cppparser/lexercache.cpp | 24 +- lib/cppparser/lexercache.h | 28 +- lib/cppparser/lookup.h | 4 +- lib/cppparser/macro.h | 78 +- lib/cppparser/parser.cpp | 16 +- lib/cppparser/parser.h | 34 +- lib/cppparser/tree_parser.cpp | 12 +- lib/interfaces/KDevCoreIface.cpp | 12 +- lib/interfaces/KDevCoreIface.h | 4 +- lib/interfaces/KDevPartControllerIface.cpp | 18 +- lib/interfaces/KDevPartControllerIface.h | 6 +- lib/interfaces/codemodel.cpp | 206 +-- lib/interfaces/codemodel.h | 312 ++--- lib/interfaces/codemodel_utils.cpp | 20 +- lib/interfaces/codemodel_utils.h | 24 +- lib/interfaces/extensions/codebrowserfrontend.h | 2 +- .../extensions/dcop/KDevAppFrontendIface.cpp | 10 +- .../extensions/dcop/KDevAppFrontendIface.h | 10 +- .../extensions/dcop/KDevMakeFrontendIface.cpp | 2 +- .../extensions/dcop/KDevMakeFrontendIface.h | 2 +- lib/interfaces/extensions/kdevappfrontend.h | 14 +- lib/interfaces/extensions/kdevcreatefile.h | 22 +- lib/interfaces/extensions/kdevdifffrontend.cpp | 2 +- lib/interfaces/extensions/kdevdifffrontend.h | 4 +- lib/interfaces/extensions/kdevmakefrontend.h | 12 +- lib/interfaces/extensions/kdevquickopen.h | 4 +- lib/interfaces/extensions/kdevsourceformatter.h | 6 +- lib/interfaces/extensions/kdevversioncontrol.h | 40 +- lib/interfaces/external/designer.cpp | 2 +- lib/interfaces/external/designer.h | 24 +- lib/interfaces/extras/kdevcompileroptions.cpp | 4 +- lib/interfaces/extras/kdevcompileroptions.h | 22 +- lib/interfaces/extras/kdevvcsintegrator.cpp | 4 +- lib/interfaces/extras/kdevvcsintegrator.h | 24 +- lib/interfaces/hashedstring.cpp | 22 +- lib/interfaces/hashedstring.h | 24 +- lib/interfaces/katedocumentmanagerinterface.cpp | 6 +- lib/interfaces/katedocumentmanagerinterface.h | 6 +- lib/interfaces/kdevapi.cpp | 6 +- lib/interfaces/kdevapi.h | 6 +- lib/interfaces/kdevcoderepository.cpp | 4 +- lib/interfaces/kdevcoderepository.h | 6 +- lib/interfaces/kdevcore.cpp | 32 +- lib/interfaces/kdevcore.h | 46 +- lib/interfaces/kdevdesignerintegration.cpp | 4 +- lib/interfaces/kdevdesignerintegration.h | 20 +- lib/interfaces/kdevdesignerintegrationiface.cpp | 10 +- lib/interfaces/kdevdesignerintegrationiface.h | 14 +- lib/interfaces/kdevgenericfactory.h | 4 +- lib/interfaces/kdevlanguagesupport.cpp | 30 +- lib/interfaces/kdevlanguagesupport.h | 34 +- lib/interfaces/kdevmainwindow.h | 20 +- lib/interfaces/kdevpartcontroller.cpp | 2 +- lib/interfaces/kdevpartcontroller.h | 8 +- lib/interfaces/kdevplugin.cpp | 16 +- lib/interfaces/kdevplugin.h | 16 +- lib/interfaces/kdevplugincontroller.cpp | 12 +- lib/interfaces/kdevplugincontroller.h | 24 +- lib/interfaces/kdevplugininfo.cpp | 60 +- lib/interfaces/kdevplugininfo.h | 32 +- lib/interfaces/kdevproject.cpp | 60 +- lib/interfaces/kdevproject.h | 60 +- lib/interfaces/kdevprojectiface.cpp | 58 +- lib/interfaces/kdevprojectiface.h | 62 +- lib/util/blockingkprocess.cpp | 46 +- lib/util/blockingkprocess.h | 12 +- lib/util/configwidgetproxy.cpp | 24 +- lib/util/configwidgetproxy.h | 28 +- lib/util/domutil.cpp | 156 +-- lib/util/domutil.h | 82 +- lib/util/execcommand.cpp | 34 +- lib/util/execcommand.h | 20 +- lib/util/filetemplate.cpp | 96 +- lib/util/filetemplate.h | 18 +- lib/util/kdeveditorutil.cpp | 20 +- lib/util/kdeveditorutil.h | 8 +- lib/util/kdevjobtimer.cpp | 10 +- lib/util/kdevjobtimer.h | 6 +- lib/util/kdevshellwidget.cpp | 26 +- lib/util/kdevshellwidget.h | 20 +- lib/util/kscriptactionmanager.cpp | 60 +- lib/util/kscriptactionmanager.h | 52 +- lib/util/rurl.cpp | 78 +- lib/util/rurl.h | 58 +- lib/util/settings.cpp | 18 +- lib/util/settings.h | 4 +- lib/util/urlutil.cpp | 110 +- lib/util/urlutil.h | 50 +- lib/widgets/fancylistviewitem.cpp | 54 +- lib/widgets/fancylistviewitem.h | 56 +- lib/widgets/flagboxes.cpp | 262 ++-- lib/widgets/flagboxes.h | 142 +- lib/widgets/kcomboview.cpp | 18 +- lib/widgets/kcomboview.h | 18 +- lib/widgets/kdevhtmlpart.cpp | 96 +- lib/widgets/kdevhtmlpart.h | 20 +- lib/widgets/kdevtabwidget.cpp | 24 +- lib/widgets/klistviewaction.cpp | 24 +- lib/widgets/klistviewaction.h | 8 +- lib/widgets/ksavealldialog.cpp | 54 +- lib/widgets/ksavealldialog.h | 6 +- lib/widgets/processlinemaker.cpp | 12 +- lib/widgets/processlinemaker.h | 14 +- lib/widgets/processwidget.cpp | 82 +- lib/widgets/processwidget.h | 24 +- lib/widgets/propeditor/childproperty.cpp | 46 +- lib/widgets/propeditor/childproperty.h | 14 +- lib/widgets/propeditor/compat_tools.h | 2 +- lib/widgets/propeditor/multiproperty.cpp | 54 +- lib/widgets/propeditor/multiproperty.h | 30 +- lib/widgets/propeditor/pcheckbox.cpp | 30 +- lib/widgets/propeditor/pcheckbox.h | 10 +- lib/widgets/propeditor/pcolorbutton.cpp | 50 +- lib/widgets/propeditor/pcolorbutton.h | 16 +- lib/widgets/propeditor/pcolorcombo.cpp | 30 +- lib/widgets/propeditor/pcolorcombo.h | 8 +- lib/widgets/propeditor/pcombobox.cpp | 40 +- lib/widgets/propeditor/pcombobox.h | 20 +- lib/widgets/propeditor/pcursoredit.cpp | 8 +- lib/widgets/propeditor/pcursoredit.h | 8 +- lib/widgets/propeditor/pdateedit.cpp | 30 +- lib/widgets/propeditor/pdateedit.h | 12 +- lib/widgets/propeditor/pdatetimeedit.cpp | 30 +- lib/widgets/propeditor/pdatetimeedit.h | 12 +- lib/widgets/propeditor/pdoublenuminput.cpp | 36 +- lib/widgets/propeditor/pdoublenuminput.h | 6 +- lib/widgets/propeditor/pdummywidget.cpp | 10 +- lib/widgets/propeditor/pdummywidget.h | 10 +- lib/widgets/propeditor/pfontbutton.cpp | 36 +- lib/widgets/propeditor/pfontbutton.h | 10 +- lib/widgets/propeditor/pfontcombo.cpp | 36 +- lib/widgets/propeditor/pfontcombo.h | 8 +- lib/widgets/propeditor/plineedit.cpp | 24 +- lib/widgets/propeditor/plineedit.h | 8 +- lib/widgets/propeditor/plinestyleedit.cpp | 56 +- lib/widgets/propeditor/plinestyleedit.h | 10 +- lib/widgets/propeditor/ppixmapedit.cpp | 56 +- lib/widgets/propeditor/ppixmapedit.h | 18 +- lib/widgets/propeditor/ppointedit.cpp | 20 +- lib/widgets/propeditor/ppointedit.h | 12 +- lib/widgets/propeditor/prectedit.cpp | 20 +- lib/widgets/propeditor/prectedit.h | 12 +- lib/widgets/propeditor/property.cpp | 26 +- lib/widgets/propeditor/property.h | 118 +- lib/widgets/propeditor/propertyeditor.cpp | 100 +- lib/widgets/propeditor/propertyeditor.h | 26 +- lib/widgets/propeditor/propertylist.cpp | 56 +- lib/widgets/propeditor/propertylist.h | 38 +- lib/widgets/propeditor/propertymachinefactory.cpp | 26 +- lib/widgets/propeditor/propertymachinefactory.h | 4 +- lib/widgets/propeditor/propertywidget.cpp | 12 +- lib/widgets/propeditor/propertywidget.h | 22 +- lib/widgets/propeditor/propertywidgetproxy.cpp | 24 +- lib/widgets/propeditor/propertywidgetproxy.h | 18 +- lib/widgets/propeditor/psizeedit.cpp | 20 +- lib/widgets/propeditor/psizeedit.h | 12 +- lib/widgets/propeditor/psizepolicyedit.cpp | 26 +- lib/widgets/propeditor/psizepolicyedit.h | 18 +- lib/widgets/propeditor/pspinbox.cpp | 34 +- lib/widgets/propeditor/pspinbox.h | 10 +- lib/widgets/propeditor/pstringlistedit.cpp | 46 +- lib/widgets/propeditor/pstringlistedit.h | 14 +- lib/widgets/propeditor/psymbolcombo.cpp | 60 +- lib/widgets/propeditor/psymbolcombo.h | 14 +- lib/widgets/propeditor/purledit.cpp | 42 +- lib/widgets/propeditor/purledit.h | 12 +- lib/widgets/propeditor/pyesnobutton.cpp | 28 +- lib/widgets/propeditor/pyesnobutton.h | 10 +- lib/widgets/propeditor/qeditlistbox.cpp | 94 +- lib/widgets/propeditor/qeditlistbox.h | 92 +- lib/widgets/propeditor/qfloatinput.cpp | 14 +- lib/widgets/propeditor/qfloatinput.h | 10 +- lib/widgets/propeditor/test.cpp | 10 +- lib/widgets/qcomboview.cpp | 422 +++--- lib/widgets/qcomboview.h | 84 +- lib/widgets/resizablecombo.cpp | 36 +- lib/widgets/resizablecombo.h | 16 +- parts/abbrev/abbrevconfigwidget.cpp | 28 +- parts/abbrev/abbrevconfigwidget.h | 2 +- parts/abbrev/abbrevpart.cpp | 216 +-- parts/abbrev/abbrevpart.h | 48 +- parts/abbrev/addtemplatedlg.cpp | 16 +- parts/abbrev/addtemplatedlg.h | 8 +- parts/appwizard/appwizarddlg.cpp | 368 ++--- parts/appwizard/appwizarddlg.h | 138 +- parts/appwizard/appwizardpart.cpp | 18 +- parts/appwizard/appwizardpart.h | 8 +- parts/appwizard/filepropspage.cpp | 18 +- parts/appwizard/filepropspage.h | 26 +- parts/appwizard/importdlg.cpp | 188 +-- parts/appwizard/importdlg.h | 30 +- parts/appwizard/kdevfile.cpp | 2 +- parts/appwizard/kdevfile.h | 2 +- parts/appwizard/kdevlicense.cpp | 54 +- parts/appwizard/kdevlicense.h | 18 +- parts/appwizard/misc.cpp | 12 +- parts/appwizard/misc.h | 4 +- parts/appwizard/profilesupport.cpp | 6 +- parts/appwizard/profilesupport.h | 4 +- parts/astyle/astyle_adaptor.cpp | 18 +- parts/astyle/astyle_adaptor.h | 22 +- parts/astyle/astyle_part.cpp | 158 +-- parts/astyle/astyle_part.h | 40 +- parts/astyle/astyle_widget.cpp | 92 +- parts/astyle/astyle_widget.h | 4 +- parts/bookmarks/bookmarks_config.cpp | 4 +- parts/bookmarks/bookmarks_config.h | 6 +- parts/bookmarks/bookmarks_part.cpp | 126 +- parts/bookmarks/bookmarks_part.h | 30 +- parts/bookmarks/bookmarks_settings.cpp | 8 +- parts/bookmarks/bookmarks_settings.h | 2 +- parts/bookmarks/bookmarks_widget.cpp | 82 +- parts/bookmarks/bookmarks_widget.h | 18 +- parts/classview/classtooldlg.cpp | 100 +- parts/classview/classtooldlg.h | 32 +- parts/classview/classtoolwidget.cpp | 18 +- parts/classview/classtoolwidget.h | 6 +- parts/classview/classtreebase.cpp | 174 +-- parts/classview/classtreebase.h | 46 +- parts/classview/classviewpart.cpp | 72 +- parts/classview/classviewpart.h | 10 +- parts/classview/classviewwidget.cpp | 182 +-- parts/classview/classviewwidget.h | 118 +- parts/classview/digraphview.cpp | 116 +- parts/classview/digraphview.h | 42 +- parts/classview/hierarchydlg.cpp | 122 +- parts/classview/hierarchydlg.h | 22 +- parts/classview/navigator.cpp | 88 +- parts/classview/navigator.h | 26 +- parts/classview/viewcombos.cpp | 38 +- parts/classview/viewcombos.h | 24 +- parts/ctags2/ctags2_createtagfile.cpp | 8 +- parts/ctags2/ctags2_createtagfile.h | 8 +- parts/ctags2/ctags2_part.cpp | 110 +- parts/ctags2/ctags2_part.h | 24 +- parts/ctags2/ctags2_selecttagfile.cpp | 6 +- parts/ctags2/ctags2_selecttagfile.h | 6 +- parts/ctags2/ctags2_settingswidget.cpp | 32 +- parts/ctags2/ctags2_settingswidget.h | 18 +- parts/ctags2/ctags2_widget.cpp | 54 +- parts/ctags2/ctags2_widget.h | 6 +- parts/ctags2/ctagskinds.cpp | 8 +- parts/ctags2/ctagskinds.h | 4 +- parts/ctags2/tagitem.cpp | 4 +- parts/ctags2/tagitem.h | 12 +- parts/ctags2/tags.cpp | 40 +- parts/ctags2/tags.h | 48 +- parts/diff/diffdlg.cpp | 8 +- parts/diff/diffdlg.h | 4 +- parts/diff/diffpart.cpp | 56 +- parts/diff/diffpart.h | 18 +- parts/diff/diffwidget.cpp | 88 +- parts/diff/diffwidget.h | 32 +- parts/distpart/distpart_part.cpp | 12 +- parts/distpart/distpart_part.h | 8 +- parts/distpart/distpart_widget.cpp | 246 ++-- parts/distpart/distpart_widget.h | 142 +- parts/distpart/lsmsupport.cpp | 2 +- parts/distpart/lsmsupport.h | 2 +- parts/distpart/packagebase.cpp | 54 +- parts/distpart/packagebase.h | 86 +- parts/distpart/specsupport.cpp | 132 +- parts/distpart/specsupport.h | 14 +- parts/documentation/KDevDocumentationIface.cpp | 12 +- parts/documentation/KDevDocumentationIface.h | 14 +- parts/documentation/addcatalogdlg.cpp | 28 +- parts/documentation/addcatalogdlg.h | 18 +- parts/documentation/bookmarkview.cpp | 64 +- parts/documentation/bookmarkview.h | 16 +- parts/documentation/contentsview.cpp | 24 +- parts/documentation/contentsview.h | 8 +- parts/documentation/docconfiglistview.cpp | 20 +- parts/documentation/docconfiglistview.h | 4 +- parts/documentation/docglobalconfigwidget.cpp | 38 +- parts/documentation/docglobalconfigwidget.h | 4 +- parts/documentation/docprojectconfigwidget.cpp | 18 +- parts/documentation/docprojectconfigwidget.h | 6 +- parts/documentation/documentation_part.cpp | 196 +-- parts/documentation/documentation_part.h | 36 +- parts/documentation/documentation_widget.cpp | 20 +- parts/documentation/documentation_widget.h | 12 +- parts/documentation/docutils.cpp | 16 +- parts/documentation/docutils.h | 14 +- parts/documentation/editcatalogdlg.cpp | 16 +- parts/documentation/editcatalogdlg.h | 12 +- parts/documentation/find_documentation.cpp | 64 +- parts/documentation/find_documentation.h | 12 +- parts/documentation/find_documentation_options.cpp | 30 +- parts/documentation/find_documentation_options.h | 22 +- parts/documentation/indexview.cpp | 52 +- parts/documentation/indexview.h | 14 +- .../interfaces/kdevdocumentationplugin.cpp | 176 +-- .../interfaces/kdevdocumentationplugin.h | 106 +- parts/documentation/plugins/chm/docchmplugin.cpp | 46 +- parts/documentation/plugins/chm/docchmplugin.h | 14 +- .../plugins/custom/doccustomplugin.cpp | 18 +- .../documentation/plugins/custom/doccustomplugin.h | 12 +- .../plugins/devhelp/docdevhelpplugin.cpp | 156 +-- .../plugins/devhelp/docdevhelpplugin.h | 22 +- parts/documentation/plugins/djvu/docdjvuplugin.cpp | 18 +- parts/documentation/plugins/djvu/docdjvuplugin.h | 12 +- .../plugins/doxygen/docdoxygenplugin.cpp | 234 ++-- .../plugins/doxygen/docdoxygenplugin.h | 28 +- .../plugins/kdevtoc/dockdevtocplugin.cpp | 120 +- .../plugins/kdevtoc/dockdevtocplugin.h | 18 +- parts/documentation/plugins/pdb/docpdbplugin.cpp | 18 +- parts/documentation/plugins/pdb/docpdbplugin.h | 12 +- parts/documentation/plugins/pdf/docpdfplugin.cpp | 18 +- parts/documentation/plugins/pdf/docpdfplugin.h | 12 +- parts/documentation/plugins/qt/docqtplugin.cpp | 136 +- parts/documentation/plugins/qt/docqtplugin.h | 18 +- parts/documentation/protocols/chm/chm.cpp | 88 +- parts/documentation/protocols/chm/chm.h | 12 +- parts/documentation/protocols/chm/chmfile.cpp | 20 +- parts/documentation/protocols/chm/chmfile.h | 18 +- parts/documentation/protocols/chm/kchmpart.cpp | 20 +- parts/documentation/protocols/chm/kchmpart.h | 16 +- parts/documentation/searchview.cpp | 128 +- parts/documentation/searchview.h | 16 +- parts/documentation/selecttopic.cpp | 4 +- parts/documentation/selecttopic.h | 2 +- parts/documentation/tools/htdig/htdigindex.cpp | 94 +- parts/documentation/tools/htdig/htdigindex.h | 14 +- parts/doxygen/config.cpp | 190 +-- parts/doxygen/config.h | 112 +- parts/doxygen/doxygenconfigwidget.cpp | 92 +- parts/doxygen/doxygenconfigwidget.h | 24 +- parts/doxygen/doxygenpart.cpp | 128 +- parts/doxygen/doxygenpart.h | 10 +- parts/doxygen/input.cpp | 154 +-- parts/doxygen/input.h | 74 +- parts/doxygen/messages.cpp | 8 +- parts/doxygen/messages.h | 4 +- parts/filecreate/addglobaldlg.cpp | 42 +- parts/filecreate/addglobaldlg.h | 18 +- parts/filecreate/fcconfigwidget.cpp | 242 ++-- parts/filecreate/fcconfigwidget.h | 26 +- parts/filecreate/fctemplateedit.cpp | 8 +- parts/filecreate/fctemplateedit.h | 4 +- parts/filecreate/fctemplateeditbase.ui.h | 6 +- parts/filecreate/fctypeedit.cpp | 8 +- parts/filecreate/fctypeedit.h | 2 +- parts/filecreate/fctypeeditbase.ui.h | 6 +- parts/filecreate/filecreate_filedialog.cpp | 18 +- parts/filecreate/filecreate_filedialog.h | 12 +- parts/filecreate/filecreate_filetype.h | 44 +- parts/filecreate/filecreate_listitem.cpp | 20 +- parts/filecreate/filecreate_listitem.h | 10 +- parts/filecreate/filecreate_newfile.cpp | 48 +- parts/filecreate/filecreate_newfile.h | 20 +- parts/filecreate/filecreate_part.cpp | 142 +- parts/filecreate/filecreate_part.h | 36 +- parts/filecreate/filecreate_typechoosersig.h | 6 +- parts/filecreate/filecreate_widget2.cpp | 34 +- parts/filecreate/filecreate_widget2.h | 10 +- parts/filecreate/filecreate_widget3.cpp | 20 +- parts/filecreate/filecreate_widget3.h | 8 +- parts/filelist/fileinfo.h | 6 +- parts/filelist/filelist_item.cpp | 24 +- parts/filelist/filelist_item.h | 14 +- parts/filelist/filelist_widget.cpp | 70 +- parts/filelist/filelist_widget.h | 20 +- parts/filelist/projectviewconfig.cpp | 4 +- parts/filelist/projectviewconfig.h | 2 +- parts/filelist/projectviewpart.cpp | 126 +- parts/filelist/projectviewpart.h | 42 +- parts/filelist/projectviewprojectconfig.cpp | 2 +- parts/filelist/projectviewprojectconfig.h | 2 +- parts/filelist/toolbarguibuilder.cpp | 10 +- parts/filelist/toolbarguibuilder.h | 8 +- parts/fileselector/fileselector_part.cpp | 28 +- parts/fileselector/fileselector_part.h | 6 +- parts/fileselector/fileselector_widget.cpp | 294 ++-- parts/fileselector/fileselector_widget.h | 50 +- parts/fileselector/kactionselector.cpp | 146 +- parts/fileselector/kactionselector.h | 64 +- parts/fileselector/kbookmarkhandler.cpp | 22 +- parts/fileselector/kbookmarkhandler.h | 18 +- parts/fileview/addfilegroupdlg.cpp | 34 +- parts/fileview/addfilegroupdlg.h | 10 +- parts/fileview/filegroupsconfigwidget.cpp | 16 +- parts/fileview/filegroupsconfigwidget.h | 2 +- parts/fileview/filegroupspart.cpp | 36 +- parts/fileview/filegroupspart.h | 8 +- parts/fileview/filegroupswidget.cpp | 146 +- parts/fileview/filegroupswidget.h | 14 +- parts/fileview/fileitemfactory.cpp | 20 +- parts/fileview/fileitemfactory.h | 12 +- parts/fileview/filetreeviewwidgetimpl.cpp | 28 +- parts/fileview/filetreeviewwidgetimpl.h | 18 +- parts/fileview/filetreewidget.cpp | 94 +- parts/fileview/filetreewidget.h | 34 +- parts/fileview/fileviewpart.cpp | 40 +- parts/fileview/fileviewpart.h | 8 +- parts/fileview/partwidget.cpp | 48 +- parts/fileview/partwidget.h | 12 +- parts/fileview/stdfiletreewidgetimpl.cpp | 8 +- parts/fileview/vcscolorsconfigwidget.cpp | 2 +- parts/fileview/vcscolorsconfigwidget.h | 22 +- parts/fileview/vcsfiletreewidgetimpl.cpp | 64 +- parts/fileview/vcsfiletreewidgetimpl.h | 4 +- parts/filter/filterpart.cpp | 10 +- parts/filter/filterpart.h | 2 +- parts/filter/kdevfilterIface.cpp | 2 +- parts/filter/kdevfilterIface.h | 4 +- parts/filter/shellfilterdlg.cpp | 42 +- parts/filter/shellfilterdlg.h | 14 +- parts/filter/shellinsertdlg.cpp | 44 +- parts/filter/shellinsertdlg.h | 14 +- parts/fullscreen/fullscreen_part.cpp | 4 +- parts/fullscreen/fullscreen_part.h | 4 +- parts/grepview/grepdlg.cpp | 118 +- parts/grepview/grepdlg.h | 40 +- parts/grepview/grepviewpart.cpp | 34 +- parts/grepview/grepviewpart.h | 10 +- parts/grepview/grepviewwidget.cpp | 146 +- parts/grepview/grepviewwidget.h | 30 +- parts/konsole/konsoleviewpart.cpp | 10 +- parts/konsole/konsoleviewpart.h | 6 +- parts/konsole/konsoleviewwidget.cpp | 24 +- parts/konsole/konsoleviewwidget.h | 6 +- parts/openwith/openwithpart.cpp | 30 +- parts/openwith/openwithpart.h | 4 +- parts/outputviews/appoutputviewpart.cpp | 32 +- parts/outputviews/appoutputviewpart.h | 16 +- parts/outputviews/appoutputwidget.cpp | 102 +- parts/outputviews/appoutputwidget.h | 24 +- parts/outputviews/commandcontinuationfilter.cpp | 4 +- parts/outputviews/commandcontinuationfilter.h | 6 +- parts/outputviews/compileerrorfilter.cpp | 18 +- parts/outputviews/compileerrorfilter.h | 16 +- parts/outputviews/directorystatusmessagefilter.cpp | 72 +- parts/outputviews/directorystatusmessagefilter.h | 10 +- parts/outputviews/makeactionfilter.cpp | 34 +- parts/outputviews/makeactionfilter.h | 30 +- parts/outputviews/makeitem.cpp | 40 +- parts/outputviews/makeitem.h | 54 +- parts/outputviews/makeviewpart.cpp | 20 +- parts/outputviews/makeviewpart.h | 10 +- parts/outputviews/makewidget.cpp | 210 +-- parts/outputviews/makewidget.h | 54 +- parts/outputviews/otherfilter.cpp | 2 +- parts/outputviews/otherfilter.h | 6 +- parts/outputviews/outputfilter.cpp | 2 +- parts/outputviews/outputfilter.h | 4 +- parts/partexplorer/partexplorer_plugin.cpp | 4 +- parts/partexplorer/partexplorer_plugin.h | 6 +- parts/partexplorer/partexplorerform.cpp | 72 +- parts/partexplorer/partexplorerform.h | 4 +- parts/quickopen/quickopen_part.cpp | 14 +- parts/quickopen/quickopen_part.h | 4 +- parts/quickopen/quickopenclassdialog.cpp | 40 +- parts/quickopen/quickopenclassdialog.h | 22 +- parts/quickopen/quickopendialog.cpp | 42 +- parts/quickopen/quickopendialog.h | 18 +- parts/quickopen/quickopenfiledialog.cpp | 18 +- parts/quickopen/quickopenfiledialog.h | 8 +- parts/quickopen/quickopenfunctionchooseform.cpp | 2 +- parts/quickopen/quickopenfunctionchooseform.h | 8 +- parts/quickopen/quickopenfunctiondialog.cpp | 50 +- parts/quickopen/quickopenfunctiondialog.h | 12 +- parts/regexptest/regexptestdlg.cpp | 40 +- parts/regexptest/regexptestdlg.h | 4 +- parts/regexptest/regexptestpart.cpp | 6 +- parts/regexptest/regexptestpart.h | 4 +- parts/replace/replace_part.cpp | 22 +- parts/replace/replace_part.h | 12 +- parts/replace/replace_widget.cpp | 128 +- parts/replace/replace_widget.h | 28 +- parts/replace/replacedlgimpl.cpp | 58 +- parts/replace/replacedlgimpl.h | 14 +- parts/replace/replaceitem.cpp | 56 +- parts/replace/replaceitem.h | 30 +- parts/replace/replaceview.cpp | 42 +- parts/replace/replaceview.h | 22 +- parts/scripting/scriptingglobalconfig.cpp | 6 +- parts/scripting/scriptingglobalconfig.h | 2 +- parts/scripting/scriptingpart.cpp | 24 +- parts/scripting/scriptingpart.h | 6 +- parts/snippet/snippet_part.cpp | 40 +- parts/snippet/snippet_part.h | 10 +- parts/snippet/snippet_widget.cpp | 292 ++-- parts/snippet/snippet_widget.h | 34 +- parts/snippet/snippetconfig.h | 26 +- parts/snippet/snippetitem.cpp | 28 +- parts/snippet/snippetitem.h | 32 +- parts/snippet/snippetsettings.cpp | 10 +- parts/snippet/snippetsettings.h | 4 +- parts/texttools/texttoolspart.cpp | 12 +- parts/texttools/texttoolspart.h | 6 +- parts/texttools/texttoolswidget.cpp | 114 +- parts/texttools/texttoolswidget.h | 16 +- parts/tipofday/tipofday_part.cpp | 14 +- parts/tipofday/tipofday_part.h | 4 +- parts/tools/addtooldlg.ui.h | 8 +- parts/tools/kapplicationtree.cpp | 76 +- parts/tools/kapplicationtree.h | 36 +- parts/tools/tools_part.cpp | 110 +- parts/tools/tools_part.h | 14 +- parts/tools/toolsconfig.cpp | 62 +- parts/tools/toolsconfig.h | 26 +- parts/tools/toolsconfigwidget.cpp | 50 +- parts/tools/toolsconfigwidget.h | 20 +- parts/uimode/uichooser_part.cpp | 12 +- parts/uimode/uichooser_part.h | 4 +- parts/uimode/uichooser_widget.cpp | 8 +- parts/uimode/uichooser_widget.h | 6 +- parts/valgrind/valgrind_dialog.cpp | 78 +- parts/valgrind/valgrind_dialog.h | 30 +- parts/valgrind/valgrind_part.cpp | 116 +- parts/valgrind/valgrind_part.h | 34 +- parts/valgrind/valgrind_widget.cpp | 74 +- parts/valgrind/valgrind_widget.h | 14 +- parts/valgrind/valgrinditem.cpp | 22 +- parts/valgrind/valgrinditem.h | 24 +- parts/vcsmanager/vcsmanagerpart.cpp | 24 +- parts/vcsmanager/vcsmanagerpart.h | 10 +- parts/vcsmanager/vcsmanagerprojectconfig.cpp | 12 +- parts/vcsmanager/vcsmanagerprojectconfig.h | 4 +- src/core.cpp | 22 +- src/core.h | 8 +- src/editorproxy.cpp | 44 +- src/editorproxy.h | 18 +- src/generalinfowidget.cpp | 88 +- src/generalinfowidget.h | 16 +- .../kdev-gen-settings-kconf_update.cpp | 32 +- src/kdevassistantextension.cpp | 4 +- src/kdevassistantextension.h | 4 +- src/kdevideextension.cpp | 24 +- src/kdevideextension.h | 4 +- src/languageselectwidget.cpp | 78 +- src/languageselectwidget.h | 18 +- src/main.cpp | 12 +- src/main_assistant.cpp | 10 +- src/mainwindowshare.cpp | 110 +- src/mainwindowshare.h | 10 +- src/multibuffer.cpp | 36 +- src/multibuffer.h | 26 +- src/newui/button.cpp | 126 +- src/newui/button.h | 40 +- src/newui/buttonbar.cpp | 40 +- src/newui/buttonbar.h | 16 +- src/newui/ddockwindow.cpp | 76 +- src/newui/ddockwindow.h | 32 +- src/newui/dmainwindow.cpp | 64 +- src/newui/dmainwindow.h | 36 +- src/newui/docksplitter.cpp | 24 +- src/newui/docksplitter.h | 18 +- src/newui/dtabwidget.cpp | 24 +- src/newui/dtabwidget.h | 18 +- src/partcontroller.cpp | 252 ++-- src/partcontroller.h | 44 +- src/plugincontroller.cpp | 78 +- src/plugincontroller.h | 40 +- src/pluginselectdialog.cpp | 60 +- src/pluginselectdialog.h | 8 +- src/profileengine/editor/profileeditor.cpp | 38 +- src/profileengine/editor/profileeditor.h | 6 +- src/profileengine/lib/profile.cpp | 52 +- src/profileengine/lib/profile.h | 46 +- src/profileengine/lib/profileengine.cpp | 78 +- src/profileengine/lib/profileengine.h | 46 +- src/projectmanager.cpp | 110 +- src/projectmanager.h | 32 +- src/projectsession.cpp | 112 +- src/projectsession.h | 32 +- src/shellextension.h | 6 +- src/simplemainwindow.cpp | 202 +-- src/simplemainwindow.h | 48 +- src/splashscreen.cpp | 30 +- src/splashscreen.h | 16 +- src/statusbar.cpp | 32 +- src/statusbar.h | 10 +- vcs/clearcase/clearcasefileinfoprovider.cpp | 12 +- vcs/clearcase/clearcasefileinfoprovider.h | 8 +- vcs/clearcase/clearcasemanipulator.cpp | 16 +- vcs/clearcase/clearcasemanipulator.h | 6 +- vcs/clearcase/clearcasepart.cpp | 140 +- vcs/clearcase/clearcasepart.h | 30 +- vcs/clearcase/commentdlg.cpp | 28 +- vcs/clearcase/commentdlg.h | 12 +- vcs/clearcase/integrator/ccintegratordlg.cpp | 6 +- vcs/clearcase/integrator/ccintegratordlg.h | 6 +- vcs/clearcase/integrator/clearcaseintegrator.cpp | 8 +- vcs/clearcase/integrator/clearcaseintegrator.h | 8 +- vcs/cvsservice/annotatedialog.cpp | 26 +- vcs/cvsservice/annotatedialog.h | 8 +- vcs/cvsservice/annotatepage.cpp | 68 +- vcs/cvsservice/annotatepage.h | 26 +- vcs/cvsservice/annotateview.cpp | 86 +- vcs/cvsservice/annotateview.h | 12 +- vcs/cvsservice/bufferedstringreader.cpp | 6 +- vcs/cvsservice/bufferedstringreader.h | 6 +- vcs/cvsservice/changelog.cpp | 40 +- vcs/cvsservice/changelog.h | 14 +- vcs/cvsservice/checkoutdialog.cpp | 80 +- vcs/cvsservice/checkoutdialog.h | 20 +- vcs/cvsservice/commitdlg.cpp | 26 +- vcs/cvsservice/commitdlg.h | 12 +- vcs/cvsservice/cvsdiffpage.cpp | 34 +- vcs/cvsservice/cvsdiffpage.h | 16 +- vcs/cvsservice/cvsdir.cpp | 122 +- vcs/cvsservice/cvsdir.h | 36 +- vcs/cvsservice/cvsentry.cpp | 52 +- vcs/cvsservice/cvsentry.h | 28 +- vcs/cvsservice/cvsfileinfoprovider.cpp | 64 +- vcs/cvsservice/cvsfileinfoprovider.h | 20 +- vcs/cvsservice/cvsform.cpp | 18 +- vcs/cvsservice/cvsform.h | 14 +- vcs/cvsservice/cvslogdialog.cpp | 30 +- vcs/cvsservice/cvslogdialog.h | 10 +- vcs/cvsservice/cvslogpage.cpp | 80 +- vcs/cvsservice/cvslogpage.h | 26 +- vcs/cvsservice/cvsoptions.cpp | 46 +- vcs/cvsservice/cvsoptions.h | 32 +- vcs/cvsservice/cvsoptionswidget.cpp | 16 +- vcs/cvsservice/cvsoptionswidget.h | 16 +- vcs/cvsservice/cvspart.cpp | 130 +- vcs/cvsservice/cvspart.h | 20 +- vcs/cvsservice/cvspartimpl.cpp | 154 +-- vcs/cvsservice/cvspartimpl.h | 50 +- vcs/cvsservice/cvsprocesswidget.cpp | 80 +- vcs/cvsservice/cvsprocesswidget.h | 24 +- vcs/cvsservice/cvsservicedcopIface.h | 6 +- vcs/cvsservice/diffdialog.cpp | 16 +- vcs/cvsservice/diffdialog.h | 6 +- vcs/cvsservice/diffwidget.cpp | 82 +- vcs/cvsservice/diffwidget.h | 30 +- vcs/cvsservice/editorsdialog.cpp | 36 +- vcs/cvsservice/editorsdialog.h | 10 +- vcs/cvsservice/integrator/cvsserviceintegrator.cpp | 8 +- vcs/cvsservice/integrator/cvsserviceintegrator.h | 8 +- vcs/cvsservice/integrator/integratordlg.cpp | 60 +- vcs/cvsservice/integrator/integratordlg.h | 10 +- vcs/cvsservice/releaseinputdialog.cpp | 12 +- vcs/cvsservice/releaseinputdialog.h | 6 +- vcs/cvsservice/tagdialog.cpp | 8 +- vcs/cvsservice/tagdialog.h | 6 +- vcs/perforce/commitdlg.cpp | 64 +- vcs/perforce/commitdlg.h | 26 +- vcs/perforce/integrator/perforceintegrator.cpp | 8 +- vcs/perforce/integrator/perforceintegrator.h | 8 +- vcs/perforce/integrator/pfintegratordlg.cpp | 6 +- vcs/perforce/integrator/pfintegratordlg.h | 6 +- vcs/perforce/perforcepart.cpp | 112 +- vcs/perforce/perforcepart.h | 32 +- vcs/subversion/commitdlg.cpp | 10 +- vcs/subversion/commitdlg.h | 4 +- vcs/subversion/integrator/subversionintegrator.cpp | 8 +- vcs/subversion/integrator/subversionintegrator.h | 8 +- vcs/subversion/integrator/svnintegratordlg.cpp | 22 +- vcs/subversion/integrator/svnintegratordlg.h | 10 +- vcs/subversion/kdevsvnd.cpp | 122 +- vcs/subversion/kdevsvnd.h | 12 +- vcs/subversion/kdevsvnd_widgets.cpp | 30 +- vcs/subversion/kdevsvnd_widgets.h | 6 +- vcs/subversion/subversion_core.cpp | 232 ++-- vcs/subversion/subversion_core.h | 38 +- vcs/subversion/subversion_fileinfo.cpp | 108 +- vcs/subversion/subversion_fileinfo.h | 18 +- vcs/subversion/subversion_global.h | 8 +- vcs/subversion/subversion_part.cpp | 176 +-- vcs/subversion/subversion_part.h | 26 +- vcs/subversion/subversion_widget.cpp | 30 +- vcs/subversion/subversion_widget.h | 34 +- vcs/subversion/svn_blamewidget.cpp | 64 +- vcs/subversion/svn_blamewidget.h | 46 +- vcs/subversion/svn_copywidget.cpp | 16 +- vcs/subversion/svn_copywidget.h | 4 +- vcs/subversion/svn_fileselectdlg_commit.cpp | 40 +- vcs/subversion/svn_fileselectdlg_commit.h | 8 +- vcs/subversion/svn_kio.cpp | 370 ++--- vcs/subversion/svn_kio.h | 46 +- vcs/subversion/svn_logviewwidget.cpp | 96 +- vcs/subversion/svn_logviewwidget.h | 42 +- vcs/subversion/svn_mergewidget.cpp | 14 +- vcs/subversion/svn_mergewidget.h | 2 +- vcs/subversion/svn_switchwidget.cpp | 14 +- vcs/subversion/svn_switchwidget.h | 6 +- 1465 files changed, 38886 insertions(+), 38886 deletions(-) diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index a8171c81..e44a15be 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -6,10 +6,10 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -21,7 +21,7 @@ #include "adaproject_part.h" #include "adaglobaloptionsdlg.h" -AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, QWidget* parent, const char* name, WFlags fl) +AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) :AdaProjectOptionsDlgBase(parent,name,fl), m_part(part) { delete config_label; @@ -44,7 +44,7 @@ AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, QWidget* parent, if (offers.isEmpty()) options_button->setEnabled(false); - currentCompiler = QString::null; + currentCompiler = TQString::null; /*kdDebug() << ServiceComboBox::defaultCompiler() << endl; kdDebug() << ServiceComboBox::itemForText(ServiceComboBox::defaultCompiler(), service_names) << endl; @@ -60,17 +60,17 @@ AdaGlobalOptionsDlg::~AdaGlobalOptionsDlg() void AdaGlobalOptionsDlg::optionsButtonClicked() { - QString name = ServiceComboBox::currentText(compiler_box, service_names); + TQString name = ServiceComboBox::currentText(compiler_box, service_names); KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, options_edit->text()); + TQString flags = plugin->exec(this, options_edit->text()); options_edit->setText(flags); delete plugin; } } -void AdaGlobalOptionsDlg::compiler_box_activated(const QString& text) +void AdaGlobalOptionsDlg::compiler_box_activated(const TQString& text) { kdDebug() << "text changed from " << currentCompiler << " to " << text << endl; if (currentCompiler == text) @@ -88,14 +88,14 @@ void AdaGlobalOptionsDlg::accept() saveConfigCache(); } -void AdaGlobalOptionsDlg::saveCompilerOpts( QString compiler ) +void AdaGlobalOptionsDlg::saveCompilerOpts( TQString compiler ) { configCache[compiler] = options_edit->text(); } -void AdaGlobalOptionsDlg::readCompilerOpts( QString compiler ) +void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler ) { - QString settings = configCache[compiler]; + TQString settings = configCache[compiler]; if (settings.isEmpty()) { KConfig *config = KGlobal::config(); @@ -111,7 +111,7 @@ void AdaGlobalOptionsDlg::readConfigCache( ) /* KConfig *config = KGlobal::config(); config->setGroup("Ada Compiler"); - QMap settings = config->entryMap("Ada Compiler"); + TQMap settings = config->entryMap("Ada Compiler"); */ } @@ -120,7 +120,7 @@ void AdaGlobalOptionsDlg::saveConfigCache( ) KConfig *config = KGlobal::config(); config->setGroup("Ada Compiler"); - for (QMap::iterator it = configCache.begin(); it != configCache.end(); ++it) + for (TQMap::iterator it = configCache.begin(); it != configCache.end(); ++it) { config->writeEntry(it.key(), it.data()); } diff --git a/buildtools/ada/adaglobaloptionsdlg.h b/buildtools/ada/adaglobaloptionsdlg.h index 92001a1b..1a186ce9 100644 --- a/buildtools/ada/adaglobaloptionsdlg.h +++ b/buildtools/ada/adaglobaloptionsdlg.h @@ -9,7 +9,7 @@ #ifndef ADAGLOBALOPTIONSDLG_H #define ADAGLOBALOPTIONSDLG_H -#include +#include #include @@ -22,7 +22,7 @@ class AdaGlobalOptionsDlg : public AdaProjectOptionsDlgBase Q_OBJECT public: - AdaGlobalOptionsDlg(AdaProjectPart *part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~AdaGlobalOptionsDlg(); public slots: @@ -30,18 +30,18 @@ public slots: protected slots: virtual void optionsButtonClicked(); - virtual void compiler_box_activated(const QString& text); + virtual void compiler_box_activated(const TQString& text); private: AdaProjectPart *m_part; KTrader::OfferList offers; - QString currentCompiler; - QStringList service_names; - QStringList service_execs; - QMap configCache; + TQString currentCompiler; + TQStringList service_names; + TQStringList service_execs; + TQMap configCache; - void saveCompilerOpts(QString compiler); - void readCompilerOpts(QString compiler); + void saveCompilerOpts(TQString compiler); + void readCompilerOpts(TQString compiler); void readConfigCache(); void saveConfigCache(); diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 33ba166b..f226809d 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -8,12 +8,12 @@ */ #include "adaproject_part.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -46,7 +46,7 @@ typedef KDevGenericFactory AdaProjectFactory; static const KDevPluginInfo data("kdevadaproject"); K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) -AdaProjectPart::AdaProjectPart(QObject *parent, const char *name, const QStringList& ) +AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) { setInstance(AdaProjectFactory::instance()); @@ -54,21 +54,21 @@ AdaProjectPart::AdaProjectPart(QObject *parent, const char *name, const QStringL KAction *action; action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8, - this, SLOT(slotBuild()), + this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); action = new KAction( i18n("Execute Program"), "exec", 0, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(configWidget(KDialogBase*)), - this, SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), + this, TQT_SLOT(configWidget(KDialogBase*)) ); // m_widget = new AdaProjectWidget(this); -// QWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); +// TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. @@ -89,11 +89,11 @@ AdaProjectPart::~AdaProjectPart() * This should really be merged with FileTreeWidget::matchesHidePattern() * and put in its own class. Currently this is repeated in scriptprojectpart.cpp, pascalproject_part.cpp, adaproject_part.cpp */ -static bool matchesPattern(const QString &fileName, const QStringList &patternList) +static bool matchesPattern(const TQString &fileName, const TQStringList &patternList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = patternList.begin(); it != patternList.end(); ++it) { - QRegExp re(*it, true, true); + TQRegExp re(*it, true, true); if (re.search(fileName) == 0 && re.matchedLength() == (int)fileName.length()) return true; } @@ -101,13 +101,13 @@ static bool matchesPattern(const QString &fileName, const QStringList &patternLi return false; } -void AdaProjectPart::openProject(const QString &dirName, const QString &projectName) +void AdaProjectPart::openProject(const TQString &dirName, const TQString &projectName) { m_buildDir = dirName; m_projectDir = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if (DomUtil::readEntry(dom, "/kdevadaproject/run/directoryradio") == "" ) { DomUtil::writeEntry(dom, "/kdevadaproject/run/directoryradio", "executable"); @@ -116,11 +116,11 @@ void AdaProjectPart::openProject(const QString &dirName, const QString &projectN loadProjectConfig(); // Put all files from all subdirectories into file list - QValueStack s; + TQValueStack s; int prefixlen = m_projectDir.length()+1; s.push(m_projectDir); - QStringList includepatternList; + TQStringList includepatternList; if ( languageSupport() ) { @@ -132,10 +132,10 @@ void AdaProjectPart::openProject(const QString &dirName, const QString &projectN } } - QString excludepatterns = "*~"; - QStringList excludepatternList = QStringList::split(",", excludepatterns); + TQString excludepatterns = "*~"; + TQStringList excludepatternList = TQStringList::split(",", excludepatterns); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug() << "AdaProjectPart::openProject examining: " << dir.path() << endl; @@ -143,12 +143,12 @@ void AdaProjectPart::openProject(const QString &dirName, const QString &projectN if( !dirEntries ) break; - QPtrListIterator it(*dirEntries); + TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { kdDebug() << "AdaProjectPart::openProject pushing: " << path << endl; s.push(path); @@ -188,9 +188,9 @@ DomUtil::PairList AdaProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString AdaProjectPart::runDirectory() const +TQString AdaProjectPart::runDirectory() const { - QString cwd = defaultRunDirectory("kdevadaproject"); + TQString cwd = defaultRunDirectory("kdevadaproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -206,15 +206,15 @@ QString AdaProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString AdaProjectPart::mainProgram() const +TQString AdaProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevadaproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevadaproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -225,68 +225,68 @@ QString AdaProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -/** Retuns a QString with the run command line arguments */ -QString AdaProjectPart::debugArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString AdaProjectPart::debugArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/globaldebugarguments"); } -/** Retuns a QString with the run command line arguments */ -QString AdaProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString AdaProjectPart::runArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/programargs"); } -QString AdaProjectPart::mainSource() const +TQString AdaProjectPart::mainSource() const { return projectDirectory() + "/" + m_mainSource; } -void AdaProjectPart::setMainSource(QString fullPath) +void AdaProjectPart::setMainSource(TQString fullPath) { - QString olddir = activeDirectory(); - m_mainSource = fullPath.replace(QRegExp(QString(projectDirectory() + QString("/"))),""); + TQString olddir = activeDirectory(); + m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); emit activeDirectoryChanged( olddir, activeDirectory() ); } -QString AdaProjectPart::projectDirectory() const +TQString AdaProjectPart::projectDirectory() const { return m_projectDir; } -QString AdaProjectPart::projectName() const +TQString AdaProjectPart::projectName() const { return m_projectName; } -QString AdaProjectPart::activeDirectory() const +TQString AdaProjectPart::activeDirectory() const { - QFileInfo fi(mainSource()); - return fi.dirPath(true).replace(QRegExp(projectDirectory()),""); + TQFileInfo fi(mainSource()); + return fi.dirPath(true).replace(TQRegExp(projectDirectory()),""); } -QString AdaProjectPart::buildDirectory() const +TQString AdaProjectPart::buildDirectory() const { - QFileInfo fi(mainSource()); + TQFileInfo fi(mainSource()); return fi.dirPath(true); } -void AdaProjectPart::listOfFiles(QStringList &result, QString path) const +void AdaProjectPart::listOfFiles(TQStringList &result, TQString path) const { - QDir d(path); + TQDir d(path); if (!d.exists()) return; - const QFileInfoList *entries = d.entryInfoList(QDir::Dirs | QDir::Files | QDir::Hidden); + const QFileInfoList *entries = d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden); if( !entries ) return; QFileInfoListIterator it( *entries ); - while( const QFileInfo* fileInfo = it.current() ) + while( const TQFileInfo* fileInfo = it.current() ) { ++it; @@ -303,9 +303,9 @@ void AdaProjectPart::listOfFiles(QStringList &result, QString path) const } } -QStringList AdaProjectPart::allFiles() const +TQStringList AdaProjectPart::allFiles() const { -// QStringList files; +// TQStringList files; // listOfFiles(files, projectDirectory()); @@ -313,19 +313,19 @@ QStringList AdaProjectPart::allFiles() const return m_sourceFiles; } -void AdaProjectPart::addFile(const QString& /*fileName*/) +void AdaProjectPart::addFile(const TQString& /*fileName*/) { } -void AdaProjectPart::addFiles(const QStringList& /*fileList*/) +void AdaProjectPart::addFiles(const TQStringList& /*fileList*/) { } -void AdaProjectPart::removeFile(const QString& /*fileName*/) +void AdaProjectPart::removeFile(const TQString& /*fileName*/) { } -void AdaProjectPart::removeFiles(const QStringList& /*fileList*/) +void AdaProjectPart::removeFiles(const TQStringList& /*fileList*/) { } @@ -334,7 +334,7 @@ void AdaProjectPart::slotBuild() if (partController()->saveAllFiles()==false) return; //user cancelled - QString cmdline = m_compilerExec + " " + m_compilerOpts + " "; + TQString cmdline = m_compilerExec + " " + m_compilerOpts + " "; if (cmdline.isEmpty()) { @@ -342,10 +342,10 @@ void AdaProjectPart::slotBuild() return; } - QFileInfo fi(mainSource()); + TQFileInfo fi(mainSource()); cmdline += fi.fileName(); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(buildDirectory()); dircmd += " && "; @@ -355,42 +355,42 @@ void AdaProjectPart::slotBuild() void AdaProjectPart::slotExecute() { partController()->saveAllFiles(); - QString program = "./"; + TQString program = "./"; appFrontend()->startAppCommand(buildDirectory(), mainProgram(), true); } -void AdaProjectPart::changedFiles( const QStringList & fileList ) +void AdaProjectPart::changedFiles( const TQStringList & fileList ) { KDevProject::changedFiles(fileList); } -void AdaProjectPart::changedFile( const QString & fileName ) +void AdaProjectPart::changedFile( const TQString & fileName ) { KDevProject::changedFile(fileName); } void AdaProjectPart::projectConfigWidget( KDialogBase * dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaProjectOptionsDlg *w = new AdaProjectOptionsDlg(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); - connect( dlg, SIGNAL(okClicked()), this, SLOT(loadProjectConfig()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); } void AdaProjectPart::loadProjectConfig( ) { - QDomDocument &dom = *(projectDom()); + TQDomDocument &dom = *(projectDom()); - QString config = DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"); - m_mainSource = DomUtil::readEntry(dom, QString("/kdevadaproject/configurations/") + config + QString("/mainsource") ); - m_compilerOpts = DomUtil::readEntry(dom, QString("/kdevadaproject/configurations/") + config + QString("/compileroptions")); - m_compilerExec = DomUtil::readEntry(dom, QString("/kdevadaproject/configurations/") + config + QString("/compilerexec")); + TQString config = DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"); + m_mainSource = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/mainsource") ); + m_compilerOpts = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compileroptions")); + m_compilerExec = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compilerexec")); if (m_compilerExec.isEmpty()) { KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'"); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { m_compilerExec = (*it)->exec(); @@ -402,13 +402,13 @@ void AdaProjectPart::loadProjectConfig( ) void AdaProjectPart::configWidget( KDialogBase * dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaGlobalOptionsDlg *w = new AdaGlobalOptionsDlg(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } -KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const QString &name) +KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -416,20 +416,20 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const QString &name) return 0; } - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) { - QString errorMessage = KLibLoader::self()->lastErrorMessage(); + TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" "The diagnostics are:\n%2").arg(service->name()).arg(errorMessage)); exit(1); } - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(this, service->name().latin1(), + TQObject *obj = factory->create(this, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { @@ -441,7 +441,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const QString &name) return dlg; } -QString AdaProjectPart::defaultOptions( const QString compiler ) +TQString AdaProjectPart::defaultOptions( const TQString compiler ) { KConfig *config = KGlobal::config(); config->setGroup("Ada Compiler"); @@ -454,12 +454,12 @@ QString AdaProjectPart::defaultOptions( const QString compiler ) /*! \fn AdaProjectPart::distFiles() const */ -QStringList AdaProjectPart::distFiles() const +TQStringList AdaProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QStringList files = dir.entryList( "Makefile"); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQStringList files = dir.entryList( "Makefile"); return sourceList + files; } diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h index 88966ae2..b62cf204 100644 --- a/buildtools/ada/adaproject_part.h +++ b/buildtools/ada/adaproject_part.h @@ -9,7 +9,7 @@ #ifndef __KDEVPART_ADAPROJECT_H__ #define __KDEVPART_ADAPROJECT_H__ -#include +#include #include "kdevbuildtool.h" @@ -21,47 +21,47 @@ class AdaProjectPart : public KDevBuildTool { Q_OBJECT public: - AdaProjectPart(QObject *parent, const char *name, const QStringList &); + AdaProjectPart(TQObject *parent, const char *name, const TQStringList &); ~AdaProjectPart(); - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); /**Returns the name of the main source file without extension. We assume that all Ada compilers call the binary that way. */ - virtual QString mainProgram() const; + virtual TQString mainProgram() const; /**Main source file (like src/main.adb)*/ - virtual QString mainSource() const; - virtual void setMainSource(QString fullPath); + virtual TQString mainSource() const; + virtual void setMainSource(TQString fullPath); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString activeDirectory() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString activeDirectory() const; /**The location of the main source file*/ - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; /**Returns everything in the project directory*/ - virtual QStringList allFiles() const; + virtual TQStringList allFiles() const; /**This does absolutelly nothing*/ - virtual void addFile(const QString &fileName); + virtual void addFile(const TQString &fileName); /**This does absolutelly nothing*/ - virtual void addFiles(const QStringList &fileList); + virtual void addFiles(const TQStringList &fileList); /**This does absolutelly nothing*/ - virtual void removeFile(const QString &fileName); + virtual void removeFile(const TQString &fileName); /**This does absolutelly nothing*/ - virtual void removeFiles(const QStringList &fileList); + virtual void removeFiles(const TQStringList &fileList); - virtual void changedFiles( const QStringList & fileList ); - virtual void changedFile( const QString & fileName ); + virtual void changedFiles( const TQStringList & fileList ); + virtual void changedFile( const TQString & fileName ); - KDevCompilerOptions *createCompilerOptions(const QString &name); + KDevCompilerOptions *createCompilerOptions(const TQString &name); - virtual QString defaultOptions(const QString compiler); - QStringList distFiles() const; + virtual TQString defaultOptions(const TQString compiler); + TQStringList distFiles() const; public slots: /**loads config from project file*/ @@ -74,20 +74,20 @@ private slots: void configWidget(KDialogBase *dlg); private: - QGuardedPtr m_widget; + TQGuardedPtr m_widget; - void listOfFiles(QStringList &result, QString path) const; + void listOfFiles(TQStringList &result, TQString path) const; - QString m_buildDir; - QString m_projectDir; - QString m_projectName; + TQString m_buildDir; + TQString m_projectDir; + TQString m_projectName; - QString m_mainProg; - QString m_mainSource; - QString m_compilerExec; - QString m_compilerOpts; + TQString m_mainProg; + TQString m_mainSource; + TQString m_compilerExec; + TQString m_compilerOpts; - QStringList m_sourceFiles; + TQStringList m_sourceFiles; }; #endif diff --git a/buildtools/ada/adaproject_widget.cpp b/buildtools/ada/adaproject_widget.cpp index d4bdf37b..2e5d818a 100644 --- a/buildtools/ada/adaproject_widget.cpp +++ b/buildtools/ada/adaproject_widget.cpp @@ -10,7 +10,7 @@ AdaProjectWidget::AdaProjectWidget(AdaProjectPart *part) - : QWidget(0, "AdaProject widget") + : TQWidget(0, "AdaProject widget") { Q_UNUSED( part ); } diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h index dc6b4ec4..5e7038f2 100644 --- a/buildtools/ada/adaproject_widget.h +++ b/buildtools/ada/adaproject_widget.h @@ -1,8 +1,8 @@ #ifndef __ADAPROJECT_WIDGET_H__ #define __ADAPROJECT_WIDGET_H__ -#include -#include +#include +#include class KDevProject; class AdaProjectPart; diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index 3eafb082..ee08da6d 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -12,10 +12,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "domutil.h" #include "kdevcompileroptions.h" @@ -24,10 +24,10 @@ #include "adaproject_part.h" #include "adaprojectoptionsdlg.h" -AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, QWidget* parent, const char* name, WFlags fl) +AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) : AdaProjectOptionsDlgBase(parent,name, fl), m_part(part) { - config_combo->setValidator(new QRegExpValidator(QRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'"); @@ -41,8 +41,8 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, QWidget* parent dirty = false; - QDomDocument &dom = *(m_part->projectDom()); - currentConfig = QString::null; + TQDomDocument &dom = *(m_part->projectDom()); + currentConfig = TQString::null; configChanged(DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default")); } @@ -50,17 +50,17 @@ AdaProjectOptionsDlg::~AdaProjectOptionsDlg() { } -QStringList AdaProjectOptionsDlg::allBuildConfigs() +TQStringList AdaProjectOptionsDlg::allBuildConfigs() { - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); - QStringList allConfigs; + TQStringList allConfigs; allConfigs.append("default"); - QDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); - QDomElement childEl = node.firstChild().toElement(); + TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); + TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { - QString config = childEl.tagName(); + TQString config = childEl.tagName(); kdDebug() << "Found config " << config << endl; if (config != "default") allConfigs.append(config); @@ -79,35 +79,35 @@ void AdaProjectOptionsDlg::accept() } } -void AdaProjectOptionsDlg::compiler_box_activated( const QString& /*s*/ ) +void AdaProjectOptionsDlg::compiler_box_activated( const TQString& /*s*/ ) { - QString exec = ServiceComboBox::currentText(compiler_box, service_execs); + TQString exec = ServiceComboBox::currentText(compiler_box, service_execs); exec_edit->setText(exec); } -void AdaProjectOptionsDlg::saveConfig( QString config ) +void AdaProjectOptionsDlg::saveConfig( TQString config ) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevadaproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevadaproject/configurations/" + config + "/"; DomUtil::writeEntry(dom, prefix + "compiler", ServiceComboBox::currentText(compiler_box, service_names)); DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text()); DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text()); - DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(QRegExp(m_part->projectDirectory() + QString("/")),"")); + DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); } -void AdaProjectOptionsDlg::readConfig( QString config ) +void AdaProjectOptionsDlg::readConfig( TQString config ) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevadaproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevadaproject/configurations/" + config + "/"; - QString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); + TQString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); if (compiler.isEmpty()) { offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'"); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { compiler = (*it)->name(); @@ -118,7 +118,7 @@ void AdaProjectOptionsDlg::readConfig( QString config ) } ServiceComboBox::setCurrentText(compiler_box, compiler, service_names); - QString exec = DomUtil::readEntry(dom, prefix + "compilerexec", ""); + TQString exec = DomUtil::readEntry(dom, prefix + "compilerexec", ""); if (exec.isEmpty()) exec = ServiceComboBox::currentText(compiler_box, service_execs); exec_edit->setText(exec); @@ -126,7 +126,7 @@ void AdaProjectOptionsDlg::readConfig( QString config ) mainSourceUrl->setURL(m_part->projectDirectory() + "/" + DomUtil::readEntry(dom, prefix + "mainsource")); } -void AdaProjectOptionsDlg::configComboTextChanged(const QString &config) +void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config) { bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); bool canRemove = allConfigs.contains(config) && config != "default"; @@ -135,7 +135,7 @@ void AdaProjectOptionsDlg::configComboTextChanged(const QString &config) } -void AdaProjectOptionsDlg::configChanged(const QString &config) +void AdaProjectOptionsDlg::configChanged(const TQString &config) { if (config == currentConfig || !allConfigs.contains(config)) return; @@ -155,7 +155,7 @@ void AdaProjectOptionsDlg::configChanged(const QString &config) void AdaProjectOptionsDlg::configAdded() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); allConfigs.append(config); @@ -168,27 +168,27 @@ void AdaProjectOptionsDlg::configAdded() void AdaProjectOptionsDlg::configRemoved() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); - QDomDocument dom = *m_part->projectDom(); - QDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); + TQDomDocument dom = *m_part->projectDom(); + TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = QString::null; + currentConfig = TQString::null; configChanged("default"); } void AdaProjectOptionsDlg::optionsButtonClicked( ) { - QString name = ServiceComboBox::currentText(compiler_box, service_names); + TQString name = ServiceComboBox::currentText(compiler_box, service_names); KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, options_edit->text()); + TQString flags = plugin->exec(this, options_edit->text()); options_edit->setText(flags); delete plugin; } diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h index d91c5266..5e40547d 100644 --- a/buildtools/ada/adaprojectoptionsdlg.h +++ b/buildtools/ada/adaprojectoptionsdlg.h @@ -21,16 +21,16 @@ class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase Q_OBJECT public: - AdaProjectOptionsDlg(AdaProjectPart *part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~AdaProjectOptionsDlg(); public slots: virtual void accept(); protected slots: - virtual void compiler_box_activated(const QString &s); - void configComboTextChanged(const QString &config); - void configChanged(const QString &config); + virtual void compiler_box_activated(const TQString &s); + void configComboTextChanged(const TQString &config); + void configChanged(const TQString &config); void configAdded(); void configRemoved(); void optionsButtonClicked(); @@ -38,19 +38,19 @@ protected slots: void setDefaultOptions(); private: - QStringList allConfigs; - QString currentConfig; + TQStringList allConfigs; + TQString currentConfig; bool dirty; KTrader::OfferList offers; - QStringList service_names; - QStringList service_execs; + TQStringList service_names; + TQStringList service_execs; AdaProjectPart *m_part; - void saveConfig(QString config); - void readConfig(QString config); - QStringList allBuildConfigs(); + void saveConfig(TQString config); + void readConfig(TQString config); + TQStringList allBuildConfigs(); }; #endif diff --git a/buildtools/ada/service.cpp b/buildtools/ada/service.cpp index 02081a58..97b4f2f5 100644 --- a/buildtools/ada/service.cpp +++ b/buildtools/ada/service.cpp @@ -8,8 +8,8 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include -#include +#include +#include #include #include @@ -17,10 +17,10 @@ #include "service.h" -void ServiceComboBox::insertStringList(QComboBox *combo, const QValueList &list, - QStringList *names, QStringList *execs) +void ServiceComboBox::insertStringList(TQComboBox *combo, const TQValueList &list, + TQStringList *names, TQStringList *execs) { - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { combo->insertItem((*it)->comment()); (*names) << (*it)->desktopEntryName(); @@ -29,16 +29,16 @@ void ServiceComboBox::insertStringList(QComboBox *combo, const QValueListcurrentItem() == -1) - return QString::null; + return TQString::null; return names[combo->currentItem()]; } -void ServiceComboBox::setCurrentText(QComboBox *combo, const QString &str, const QStringList &names) +void ServiceComboBox::setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -49,9 +49,9 @@ void ServiceComboBox::setCurrentText(QComboBox *combo, const QString &str, const } } -int ServiceComboBox::itemForText(const QString &str, const QStringList &names) +int ServiceComboBox::itemForText(const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -62,10 +62,10 @@ int ServiceComboBox::itemForText(const QString &str, const QStringList &names) return 0; } -QString ServiceComboBox::defaultCompiler() +TQString ServiceComboBox::defaultCompiler() { KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'"); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { return (*it)->name();; diff --git a/buildtools/ada/service.h b/buildtools/ada/service.h index f9671d0a..f170bb54 100644 --- a/buildtools/ada/service.h +++ b/buildtools/ada/service.h @@ -16,12 +16,12 @@ class ServiceComboBox { public: - static void insertStringList(QComboBox *combo, const QValueList &list, - QStringList *names, QStringList *execs); - static QString currentText(QComboBox *combo, const QStringList &names); - static void setCurrentText(QComboBox *combo, const QString &str, const QStringList &names); - static int itemForText(const QString &str, const QStringList &names); - static QString defaultCompiler(); + static void insertStringList(TQComboBox *combo, const TQValueList &list, + TQStringList *names, TQStringList *execs); + static TQString currentText(TQComboBox *combo, const TQStringList &names); + static void setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names); + static int itemForText(const TQString &str, const TQStringList &names); + static TQString defaultCompiler(); }; #endif diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index a7f0ea25..d6f66b46 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -1,14 +1,14 @@ #include "antprojectpart.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -45,7 +45,7 @@ AntOptions::AntOptions() } -AntProjectPart::AntProjectPart(QObject *parent, const char *name, const QStringList &) +AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") { setInstance(AntProjectFactory::instance()); @@ -53,7 +53,7 @@ AntProjectPart::AntProjectPart(QObject *parent, const char *name, const QStringL setXMLFile("kdevantproject.rc"); m_buildProjectAction = new KAction(i18n("&Build Project"), "make_kdevelop", Key_F8, - this, SLOT(slotBuild()), + this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); m_buildProjectAction->setToolTip(i18n("Build project")); m_buildProjectAction->setWhatsThis(i18n("Build project

Executes ant dist command to build the project.")); @@ -65,9 +65,9 @@ AntProjectPart::AntProjectPart(QObject *parent, const char *name, const QStringL m_targetMenu = menu->popupMenu(); - connect(m_targetMenu, SIGNAL(activated(int)), this, SLOT(slotTargetMenuActivated(int))); - connect(core(), SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(projectConfigWidget(KDialogBase*))); - connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *))); + connect(m_targetMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTargetMenuActivated(int))); + connect(core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*))); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); m_antOptionsWidget = 0; } @@ -78,12 +78,12 @@ AntProjectPart::~AntProjectPart() } -void AntProjectPart::openProject(const QString &dirName, const QString &projectName) +void AntProjectPart::openProject(const TQString &dirName, const TQString &projectName) { m_projectDirectory = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" /// \FIXME there is no kdevantproject so this will not work ! if (DomUtil::readEntry(dom, "/kdevantproject/run/directoryradio") == "" ) { @@ -97,13 +97,13 @@ void AntProjectPart::openProject(const QString &dirName, const QString &projectN fillMenu(); - QFile f(dirName + "/" + projectName.lower() + ".kdevelop" + ".filelist"); + TQFile f(dirName + "/" + projectName.lower() + ".kdevelop" + ".filelist"); if (f.open(IO_ReadOnly)) { - QTextStream stream(&f); + TQTextStream stream(&f); while (!stream.atEnd()) { - QString s = stream.readLine(); + TQString s = stream.readLine(); if (!s.startsWith("#")) m_sourceFiles << s; } @@ -117,25 +117,25 @@ void AntProjectPart::openProject(const QString &dirName, const QString &projectN void AntProjectPart::populateProject() { - QApplication::setOverrideCursor(Qt::waitCursor); + TQApplication::setOverrideCursor(Qt::waitCursor); - QValueStack s; + TQValueStack s; int prefixlen = m_projectDirectory.length()+1; s.push(m_projectDirectory); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug() << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); - QPtrListIterator it(*dirEntries); + TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { kdDebug() << "Pushing: " << path << endl; @@ -150,7 +150,7 @@ void AntProjectPart::populateProject() } while (!s.isEmpty()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } @@ -164,32 +164,32 @@ void AntProjectPart::closeProject() m_antOptions = AntOptions(); - QFile f(m_projectDirectory + "/" + m_projectName.lower() + ".kdevelop" + ".filelist"); + TQFile f(m_projectDirectory + "/" + m_projectName.lower() + ".kdevelop" + ".filelist"); if (!f.open(IO_WriteOnly)) return; - QTextStream stream(&f); + TQTextStream stream(&f); stream << "# KDevelop Ant Project File List" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = m_sourceFiles.begin(); it != m_sourceFiles.end(); ++it) stream << (*it) << endl; f.close(); } -QString AntProjectPart::projectDirectory() const +TQString AntProjectPart::projectDirectory() const { return m_projectDirectory; } -QString AntProjectPart::buildDirectory() const +TQString AntProjectPart::buildDirectory() const { return m_projectDirectory; } -QString AntProjectPart::projectName() const +TQString AntProjectPart::projectName() const { return m_projectName; } @@ -212,16 +212,16 @@ DomUtil::PairList AntProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString AntProjectPart::runDirectory() const +TQString AntProjectPart::runDirectory() const { return buildDirectory(); /// \FIXME put the code below into use! - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); /// \FIXME there is no kdevantproject so this will not work ! - QString directoryRadioString = DomUtil::readEntry(dom, "/kdevantproject/run/directoryradio"); - QString DomMainProgram = DomUtil::readEntry(dom, "/kdevantproject/run/mainprogram"); + TQString directoryRadioString = DomUtil::readEntry(dom, "/kdevantproject/run/directoryradio"); + TQString DomMainProgram = DomUtil::readEntry(dom, "/kdevantproject/run/mainprogram"); if ( directoryRadioString == "build" ) return buildDirectory(); @@ -247,15 +247,15 @@ QString AntProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString AntProjectPart::mainProgram() const +TQString AntProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevantproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevantproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -266,24 +266,24 @@ QString AntProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -QString AntProjectPart::debugArguments() const +TQString AntProjectPart::debugArguments() const { - return QString(""); + return TQString(""); } -/** Retuns a QString with the run command line arguments */ -QString AntProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString AntProjectPart::runArguments() const { /// \FIXME there is no kdevantproject so this will not work ! return DomUtil::readEntry(*projectDom(), "/kdevantproject/run/programargs"); } -QString AntProjectPart::activeDirectory() const +TQString AntProjectPart::activeDirectory() const { /// \FIXME @@ -291,18 +291,18 @@ QString AntProjectPart::activeDirectory() const // returning m_projectDirectory is wrong, the path returned should be _relative_ to the project dir // returning an empty string until antproject supports the idea of an active directory - return QString(""); + return TQString(""); } -QStringList AntProjectPart::allFiles() const +TQStringList AntProjectPart::allFiles() const { -/* QStringList res; +/* TQStringList res; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = m_sourceFiles.begin(); it != m_sourceFiles.end(); ++it) { - QString fileName = *it; + TQString fileName = *it; if (!fileName.startsWith("/")) { fileName.prepend("/"); @@ -318,17 +318,17 @@ QStringList AntProjectPart::allFiles() const } -void AntProjectPart::addFile(const QString &fileName) +void AntProjectPart::addFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->addFiles ( fileList ); } -void AntProjectPart::addFiles ( const QStringList& fileList ) +void AntProjectPart::addFiles ( const TQStringList& fileList ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -339,20 +339,20 @@ void AntProjectPart::addFiles ( const QStringList& fileList ) emit addedFilesToProject(fileList); } -void AntProjectPart::removeFile(const QString &fileName) +void AntProjectPart::removeFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->removeFiles ( fileList ); } -void AntProjectPart::removeFiles ( const QStringList& fileList ) +void AntProjectPart::removeFiles ( const TQStringList& fileList ) { kdDebug() << "Emitting removedFilesFromProject" << endl; emit removedFilesFromProject(fileList); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -367,12 +367,12 @@ void AntProjectPart::parseBuildXML() m_antOptions.m_defineProperties.clear(); // open build file - QFile bf(m_projectDirectory + "/" + m_antOptions.m_buildXML); + TQFile bf(m_projectDirectory + "/" + m_antOptions.m_buildXML); if (!bf.open(IO_ReadOnly)) return; // parse build file - QDomDocument dom; + TQDomDocument dom; if (!dom.setContent(&bf)) { bf.close(); @@ -383,7 +383,7 @@ void AntProjectPart::parseBuildXML() m_projectName = dom.documentElement().attribute("name", m_projectName); m_antOptions.m_defaultTarget = dom.documentElement().attribute("default", ""); - QDomNode node = dom.documentElement().firstChild(); + TQDomNode node = dom.documentElement().firstChild(); while (!node.isNull()) { if (node.toElement().tagName() == "target") @@ -412,7 +412,7 @@ void AntProjectPart::fillMenu() m_targetMenu->clear(); int id = 0; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = m_antOptions.m_targets.begin(); it != m_antOptions.m_targets.end(); ++it) m_targetMenu->insertItem(*it, id++); } @@ -430,11 +430,11 @@ void AntProjectPart::slotTargetMenuActivated(int id) } -void AntProjectPart::ant(const QString &target) +void AntProjectPart::ant(const TQString &target) { - QString cmd = "%0 cd %1 && ant %2 -buildfile %3 %4 %5"; + TQString cmd = "%0 cd %1 && ant %2 -buildfile %3 %4 %5"; - QString verb = ""; + TQString verb = ""; switch (m_antOptions.m_verbosity) { case AntOptions::Quiet: @@ -448,13 +448,13 @@ void AntProjectPart::ant(const QString &target) break; } - QString options = ""; - QMap::Iterator it; + TQString options = ""; + TQMap::Iterator it; for (it = m_antOptions.m_properties.begin(); it != m_antOptions.m_properties.end(); ++it) if (m_antOptions.m_defineProperties[it.key()]) options += "-D" + it.key() + "=\"" + it.data() + "\" "; - QString cp; + TQString cp; if (!m_classPath.count() == 0) cp = "CLASSPATH="+m_classPath.join(":"); @@ -464,7 +464,7 @@ void AntProjectPart::ant(const QString &target) void AntProjectPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Ant Options")); + TQVBox *vbox = dlg->addVBoxPage(i18n("Ant Options")); m_antOptionsWidget = new AntOptionsWidget(vbox); m_antOptionsWidget->BuildXML->setURL(m_antOptions.m_buildXML); @@ -485,19 +485,19 @@ void AntProjectPart::projectConfigWidget(KDialogBase *dlg) m_antOptionsWidget->Properties->setNumRows(m_antOptions.m_properties.count()); m_antOptionsWidget->Properties->setNumCols(2); - QMap::Iterator it; + TQMap::Iterator it; int i=0; for (it = m_antOptions.m_properties.begin(); it != m_antOptions.m_properties.end(); ++it) { - QCheckTableItem *citem = new QCheckTableItem(m_antOptionsWidget->Properties, it.key()); + TQCheckTableItem *citem = new TQCheckTableItem(m_antOptionsWidget->Properties, it.key()); citem->setChecked(m_antOptions.m_defineProperties[it.key()]); m_antOptionsWidget->Properties->setItem(i,0, citem); - QTableItem *item = new QTableItem(m_antOptionsWidget->Properties, QTableItem::WhenCurrent, it.data()); + TQTableItem *item = new TQTableItem(m_antOptionsWidget->Properties, TQTableItem::WhenCurrent, it.data()); m_antOptionsWidget->Properties->setItem(i,1, item); ++i; } - connect(dlg, SIGNAL(okClicked()), this, SLOT(optionsAccepted())); + connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(optionsAccepted())); vbox = dlg->addVBoxPage(i18n("Classpath")); m_classPathWidget = new ClassPathWidget(vbox); @@ -528,11 +528,11 @@ void AntProjectPart::optionsAccepted() for (int i=0; iProperties->numRows(); ++i) { - QString key = m_antOptionsWidget->Properties->text(i,0); + TQString key = m_antOptionsWidget->Properties->text(i,0); m_antOptions.m_properties.replace(key, m_antOptionsWidget->Properties->text(i,1)); kdDebug() << "PROP: " << key << " = " << m_antOptionsWidget->Properties->text(i,1); - QCheckTableItem *item =(QCheckTableItem*) m_antOptionsWidget->Properties->item(i,0); + TQCheckTableItem *item =(TQCheckTableItem*) m_antOptionsWidget->Properties->item(i,0); m_antOptions.m_defineProperties.replace(key, item->isChecked()); } @@ -543,7 +543,7 @@ void AntProjectPart::optionsAccepted() } -void AntProjectPart::contextMenu(QPopupMenu *popup, const Context *context) +void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context) { if (!context->hasType( Context::FileContext )) return; @@ -555,7 +555,7 @@ void AntProjectPart::contextMenu(QPopupMenu *popup, const Context *context) m_contextFileName = url.fileName(); bool inProject = project()->allFiles().contains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) ); - QString popupstr = QFileInfo(m_contextFileName).fileName(); + TQString popupstr = TQFileInfo(m_contextFileName).fileName(); if (m_contextFileName.startsWith(projectDirectory()+ "/")) m_contextFileName.remove(0, projectDirectory().length()+1); @@ -563,13 +563,13 @@ void AntProjectPart::contextMenu(QPopupMenu *popup, const Context *context) if (inProject) { int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr), - this, SLOT(slotRemoveFromProject()) ); + this, TQT_SLOT(slotRemoveFromProject()) ); popup->setWhatsThis(id, i18n("Remove from project

Removes current file from the project.")); } else { int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr), - this, SLOT(slotAddToProject()) ); + this, TQT_SLOT(slotAddToProject()) ); popup->setWhatsThis(id, i18n("Add to project

Adds current file from the project.")); } } @@ -577,7 +577,7 @@ void AntProjectPart::contextMenu(QPopupMenu *popup, const Context *context) void AntProjectPart::slotAddToProject() { - QStringList fileList; + TQStringList fileList; fileList.append ( m_contextFileName ); addFiles ( fileList ); } @@ -585,7 +585,7 @@ void AntProjectPart::slotAddToProject() void AntProjectPart::slotRemoveFromProject() { - QStringList fileList; + TQStringList fileList; fileList.append ( m_contextFileName ); removeFiles ( fileList ); } @@ -597,12 +597,12 @@ void AntProjectPart::slotRemoveFromProject() /*! \fn AntProjectPart::distFiles() const */ -QStringList AntProjectPart::distFiles() const +TQStringList AntProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QStringList files = dir.entryList( "build.xml"); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQStringList files = dir.entryList( "build.xml"); return sourceList + files; } diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index d6540c48..b40740b5 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -2,9 +2,9 @@ #define _ANTPROJECTPART_H_ -#include -#include -#include +#include +#include +#include class QPopupMenu; @@ -30,11 +30,11 @@ public: enum Verbosity { Quiet, Verbose, Debug }; - QString m_buildXML; - QString m_defaultTarget; - QStringList m_targets; - QMap m_properties; - QMap m_defineProperties; + TQString m_buildXML; + TQString m_defaultTarget; + TQStringList m_targets; + TQMap m_properties; + TQMap m_defineProperties; Verbosity m_verbosity; }; @@ -46,31 +46,31 @@ class AntProjectPart : public KDevBuildTool public: - AntProjectPart(QObject *parent, const char *name, const QStringList &args); + AntProjectPart(TQObject *parent, const char *name, const TQStringList &args); ~AntProjectPart(); - QStringList distFiles() const; + TQStringList distFiles() const; protected: - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString mainProgram() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString runArguments() const; - virtual QString debugArguments() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString mainProgram() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString runArguments() const; + virtual TQString debugArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; - virtual void addFile(const QString &fileName); - virtual void addFiles ( const QStringList &fileList ); - virtual void removeFile(const QString &fileName); - virtual void removeFiles ( const QStringList& fileList ); + virtual void addFile(const TQString &fileName); + virtual void addFiles ( const TQStringList &fileList ); + virtual void removeFile(const TQString &fileName); + virtual void removeFiles ( const TQStringList& fileList ); private slots: @@ -79,7 +79,7 @@ private slots: void slotTargetMenuActivated(int id); void projectConfigWidget(KDialogBase *dlg); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void optionsAccepted(); @@ -93,23 +93,23 @@ private: void fillMenu(); void populateProject(); - void ant(const QString &target); + void ant(const TQString &target); - QString m_projectDirectory, m_projectName; - QStringList m_classPath; + TQString m_projectDirectory, m_projectName; + TQStringList m_classPath; - QStringList m_sourceFiles; + TQStringList m_sourceFiles; AntOptions m_antOptions; KAction *m_buildProjectAction; - QPopupMenu *m_targetMenu; + TQPopupMenu *m_targetMenu; AntOptionsWidget *m_antOptionsWidget; ClassPathWidget *m_classPathWidget; - QString m_contextFileName; + TQString m_contextFileName; }; diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp index 04e132dd..f0cd3693 100644 --- a/buildtools/autotools/addapplicationdlg.cpp +++ b/buildtools/autotools/addapplicationdlg.cpp @@ -11,13 +11,13 @@ #include "addapplicationdlg.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -33,7 +33,7 @@ AddApplicationDialog::AddApplicationDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddApplicationDialogBase(parent, name, true) { filename_edit->setText(".desktop"); @@ -41,27 +41,27 @@ AddApplicationDialog::AddApplicationDialog(AutoProjectWidget *widget, Subproject filename_edit->setFocus(); chosentypes_listview->header()->hide(); availtypes_listview->header()->hide(); - QString addApplication = add_button->text(); - QString removeApplication = remove_button->text(); + TQString addApplication = add_button->text(); + TQString removeApplication = remove_button->text(); - add_button->setText( QApplication::reverseLayout() ? removeApplication : addApplication ); - remove_button->setText( QApplication::reverseLayout() ? addApplication : removeApplication ); + add_button->setText( TQApplication::reverseLayout() ? removeApplication : addApplication ); + remove_button->setText( TQApplication::reverseLayout() ? addApplication : removeApplication ); m_widget = widget; subProject = spitem; // Fill the combo box with program names in the directory - QPtrListIterator tit(spitem->targets); + TQPtrListIterator tit(spitem->targets); for (; tit.current(); ++tit) { if ((*tit)->primary == "PROGRAMS") - executable_combo->insertItem(QString((*tit)->name)); + executable_combo->insertItem(TQString((*tit)->name)); } // Fill the list of available mime types KMimeType::List l = KMimeType::allMimeTypes(); KMimeType::List::Iterator it; for (it = l.begin(); it != l.end(); ++it) - new QListViewItem(availtypes_listview, (*it)->name()); + new TQListViewItem(availtypes_listview, (*it)->name()); setIcon ( SmallIcon ( "window_new" ) ); } @@ -74,7 +74,7 @@ AddApplicationDialog::~AddApplicationDialog() void AddApplicationDialog::iconClicked() { KIconLoader *loader = AutoProjectFactory::instance()->iconLoader(); - QString name = KIconDialog::getIcon(KIcon::Desktop); + TQString name = KIconDialog::getIcon(KIcon::Desktop); if (!name.isNull()) { iconName = name; icon_button->setPixmap(loader->loadIcon(name, KIcon::Desktop)); @@ -84,17 +84,17 @@ void AddApplicationDialog::iconClicked() void AddApplicationDialog::addTypeClicked() { - QListViewItem *selitem = availtypes_listview->selectedItem(); + TQListViewItem *selitem = availtypes_listview->selectedItem(); if (!selitem) return; - QListViewItem *olditem = chosentypes_listview->firstChild(); + TQListViewItem *olditem = chosentypes_listview->firstChild(); while (olditem) { if (selitem->text(0) == olditem->text(0)) return; olditem = olditem->nextSibling(); } - new QListViewItem(chosentypes_listview, selitem->text(0)); + new TQListViewItem(chosentypes_listview, selitem->text(0)); } @@ -107,36 +107,36 @@ void AddApplicationDialog::removeTypeClicked() void AddApplicationDialog::accept() { // Create list of mime types - QStringList mimeTypes; - QListViewItem *item = chosentypes_listview->firstChild(); + TQStringList mimeTypes; + TQListViewItem *item = chosentypes_listview->firstChild(); while (item) { mimeTypes.append(item->text(0)); item = item->nextSibling(); } // Some plausibility tests - QString fileName = filename_edit->text(); + TQString fileName = filename_edit->text(); if (fileName.isEmpty() || fileName == ".desktop") { KMessageBox::sorry(this, i18n("You have to enter a file name.")); filename_edit->setFocus(); return; } - QString executable = executable_combo->currentText(); + TQString executable = executable_combo->currentText(); if (executable.isEmpty()) { KMessageBox::sorry(this, i18n("You have to enter the file name of an executable program.")); executable_combo->setFocus(); return; } - QString name = name_edit->text(); + TQString name = name_edit->text(); if (name.isEmpty()) { KMessageBox::sorry(this, i18n("You have to enter an application name.")); name_edit->setFocus(); return; } - QFile f(subProject->path + "/" + fileName); + TQFile f(subProject->path + "/" + fileName); if (f.exists()) { KMessageBox::sorry(this, i18n("A file with this name exists already.")); filename_edit->setFocus(); @@ -147,7 +147,7 @@ void AddApplicationDialog::accept() return; } - QTextStream stream(&f); + TQTextStream stream(&f); stream << "[Desktop Entry]" << endl; stream << "Type=Application" << endl; stream << "Name=" << name << endl; @@ -161,15 +161,15 @@ void AddApplicationDialog::accept() // Find a prefix that points to the applnk directory. // If there is none, use appslnksection - QString section = section_combo->currentText(); - QString appsdir = "$(kde_appsdir)/" + section; - QMap::ConstIterator it; + TQString section = section_combo->currentText(); + TQString appsdir = "$(kde_appsdir)/" + section; + TQMap::ConstIterator it; for (it = subProject->prefixes.begin(); it != subProject->prefixes.end(); ++it) if (it.data() == appsdir) break; - QMap replaceMap; - QString prefix; + TQMap replaceMap; + TQString prefix; if (it == subProject->prefixes.end()) { prefix = "applnk" + section; replaceMap.insert(prefix + "dir", appsdir); @@ -177,7 +177,7 @@ void AddApplicationDialog::accept() } else { prefix = it.key(); } - QString varname = prefix + "_DATA"; + TQString varname = prefix + "_DATA"; // Look if a list view item for this prefix exists already. // Create a new one otherwise @@ -201,7 +201,7 @@ void AddApplicationDialog::accept() replaceMap.insert(varname, subProject->variables[varname]); AutoProjectTool::addToMakefileam(subProject->path + "/Makefile.am", replaceMap); - QDialog::accept(); + TQDialog::accept(); } #include "addapplicationdlg.moc" diff --git a/buildtools/autotools/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h index d9f8e6fc..4ab74ef2 100644 --- a/buildtools/autotools/addapplicationdlg.h +++ b/buildtools/autotools/addapplicationdlg.h @@ -25,7 +25,7 @@ class AddApplicationDialog : public AddApplicationDialogBase public: AddApplicationDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddApplicationDialog(); protected: @@ -37,7 +37,7 @@ protected: private: AutoProjectWidget *m_widget; SubprojectItem *subProject; - QString iconName; + TQString iconName; }; #endif diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 625d6af1..912edc52 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -14,8 +14,8 @@ * * ***************************************************************************/ -#include -#include +#include +#include #include #include @@ -34,7 +34,7 @@ #include "addexistingdirectoriesdlg.h" -AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, QWidget* parent, const char* name, bool modal, WFlags fl ) +AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddExistingDlgBase ( parent, name, modal, fl ) { setIcon ( SmallIcon ( "fileimport.png" ) ); @@ -62,13 +62,13 @@ AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* pa setIcon ( SmallIcon ( "fileimport.png" ) ); - QWidget::setTabOrder(sourceSelector, addAllButton); - QWidget::setTabOrder(addAllButton, addSelectedButton); - QWidget::setTabOrder(addSelectedButton, importView); - QWidget::setTabOrder(importView, removeAllButton); - QWidget::setTabOrder(removeAllButton, removeSelectedButton); - QWidget::setTabOrder(removeSelectedButton, okButton); - QWidget::setTabOrder(okButton, cancelButton); + TQWidget::setTabOrder(sourceSelector, addAllButton); + TQWidget::setTabOrder(addAllButton, addSelectedButton); + TQWidget::setTabOrder(addSelectedButton, importView); + TQWidget::setTabOrder(importView, removeAllButton); + TQWidget::setTabOrder(removeAllButton, removeSelectedButton); + TQWidget::setTabOrder(removeSelectedButton, okButton); + TQWidget::setTabOrder(okButton, cancelButton); sourceSelector->setFocus(); @@ -87,14 +87,14 @@ void AddExistingDirectoriesDialog::init() importView->setMode ( KIconView::Select ); importView->setItemsMovable ( false ); - connect ( okButton, SIGNAL ( clicked () ), this, SLOT ( slotOk () ) ); + connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); - connect ( addSelectedButton, SIGNAL ( clicked () ), this, SLOT ( slotAddSelected() ) ); - connect ( addAllButton, SIGNAL ( clicked () ), this, SLOT ( slotAddAll() ) ); - connect ( removeSelectedButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveSelected() ) ); - connect ( removeAllButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveAll() ) ); + connect ( addSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSelected() ) ); + connect ( addAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddAll() ) ); + connect ( removeSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveSelected() ) ); + connect ( removeAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveAll() ) ); - connect ( importView, SIGNAL ( dropped( QDropEvent* ) ), this, SLOT ( slotDropped ( QDropEvent* ) ) ); + connect ( importView, TQT_SIGNAL ( dropped( TQDropEvent* ) ), this, TQT_SLOT ( slotDropped ( TQDropEvent* ) ) ); importView->setSelectionMode ( KFile::Multi ); @@ -112,7 +112,7 @@ void AddExistingDirectoriesDialog::importItems() // items already added to the importView KFileItemListIterator importedList ( *importView->items() ); - QStringList duplicateList; + TQStringList duplicateList; importedList.toFirst(); @@ -156,11 +156,11 @@ void AddExistingDirectoriesDialog::importItems() void AddExistingDirectoriesDialog::slotOk() { - if ( importView->items()->count() == 0 ) QDialog::reject(); + if ( importView->items()->count() == 0 ) TQDialog::reject(); KFileItemListIterator items ( *importView->items() ); - QStringList dirs; + TQStringList dirs; for ( ; items.current(); ++items ) { @@ -181,17 +181,17 @@ void AddExistingDirectoriesDialog::slotOk() dirs << items.current()->name(); } - for (QStringList::const_iterator it = dirs.begin(); it != dirs.end(); ++it) + for (TQStringList::const_iterator it = dirs.begin(); it != dirs.end(); ++it) { - QString name = *it; + TQString name = *it; // Adjust SUBDIRS variable in containing Makefile.am if (m_spitem->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { - QFile subdirsfile( m_spitem->path + "/subdirs" ); + TQFile subdirsfile( m_spitem->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) { - QTextStream subdirsstream( &subdirsfile ); + TQTextStream subdirsstream( &subdirsfile ); subdirsstream << name << endl; subdirsfile.close(); } @@ -202,7 +202,7 @@ void AddExistingDirectoriesDialog::slotOk() else { m_spitem->variables["SUBDIRS"] += (" " + name); - QMap replaceMap; + TQMap replaceMap; replaceMap.insert("SUBDIRS", m_spitem->variables["SUBDIRS"]); AutoProjectTool::addToMakefileam(m_spitem->path + "/Makefile.am", replaceMap); } @@ -215,7 +215,7 @@ void AddExistingDirectoriesDialog::slotOk() newitem->setOpen(true); // Move to the bottom of the list - QListViewItem *lastItem = m_spitem->firstChild(); + TQListViewItem *lastItem = m_spitem->firstChild(); while (lastItem->nextSibling()) lastItem = lastItem->nextSibling(); if (lastItem != newitem) @@ -223,8 +223,8 @@ void AddExistingDirectoriesDialog::slotOk() // Create a Makefile in the new subdirectory - QDir dir( m_spitem->path + "/" + name ); - QFile f( dir.filePath("Makefile.am") ); + TQDir dir( m_spitem->path + "/" + name ); + TQFile f( dir.filePath("Makefile.am") ); if (f.exists()) { m_widget->getSubprojectView()->parse( newitem ); } else { @@ -232,7 +232,7 @@ void AddExistingDirectoriesDialog::slotOk() // KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); continue; } - QTextStream stream(&f); + TQTextStream stream(&f); stream << "INCLUDES = " << newitem->variables["INCLUDES"] << endl << "METASOURCES = AUTO" << endl; f.close(); } @@ -241,13 +241,13 @@ void AddExistingDirectoriesDialog::slotOk() // if !isKDE: add the new sub-proj to configure.in or configure.ac if ( !m_part->isKDE() ) { - QString projroot = m_part->projectDirectory() + "/"; - QString subdirectory = dir.path(); - QString relpath = subdirectory.replace(0, projroot.length(),""); + TQString projroot = m_part->projectDirectory() + "/"; + TQString subdirectory = dir.path(); + TQString relpath = subdirectory.replace(0, projroot.length(),""); - QString configureFile = m_part->getAutoConfFile(projroot); + TQString configureFile = m_part->getAutoConfFile(projroot); - QStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); + TQStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); if ( !list.isEmpty() ) { list.push_back( relpath + "/Makefile" ); @@ -258,7 +258,7 @@ void AddExistingDirectoriesDialog::slotOk() m_part->needMakefileCvs(); } - QDialog::accept(); + TQDialog::accept(); } void AddExistingDirectoriesDialog::slotAddSelected() @@ -267,7 +267,7 @@ void AddExistingDirectoriesDialog::slotAddSelected() for ( ; it.current(); ++it ) { - QString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); + TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().contains( relPath )) ) @@ -285,7 +285,7 @@ void AddExistingDirectoriesDialog::slotAddAll() for ( ; it.current(); ++it ) { - QString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); + TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) @@ -345,7 +345,7 @@ void AddExistingDirectoriesDialog::slotRemoveSelected() importView->viewport()->update(); } -void AddExistingDirectoriesDialog::slotDropped ( QDropEvent* ev ) +void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev ) { kdDebug ( 9020 ) << "AddExistingDirectoriesDialog::dropped()" << endl; @@ -360,7 +360,7 @@ void AddExistingDirectoriesDialog::slotDropped ( QDropEvent* ev ) for ( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) { //check if this subproject is already in project - QString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it); + TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index c4dd048e..3b8853ee 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -19,7 +19,7 @@ #include "addexistingdlgbase.h" -#include +#include #include #include "misc.h" @@ -39,7 +39,7 @@ class AddExistingDirectoriesDialog : public AddExistingDlgBase public: AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, QWidget* parent = 0, + SubprojectItem* spitem, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingDirectoriesDialog(); @@ -64,7 +64,7 @@ protected slots: void slotAddAll(); void slotRemoveAll(); void slotRemoveSelected(); - void slotDropped ( QDropEvent* ev ); + void slotDropped ( TQDropEvent* ev ); void slotOk(); }; diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 00f3e61b..6d3224df 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -16,15 +16,15 @@ /** Here resides the Import-existing-files-dialog of the Automake Manager (a KDevelop build tool part) **/ -#include -#include -#include -//#include -#include -#include -#include -#include -#include +#include +#include +#include +//#include +#include +#include +#include +#include +#include #include #include @@ -56,7 +56,7 @@ * TRUE to construct a modal dialog. */ -AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, QWidget* parent, const char* name, bool modal, WFlags fl ) +AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddExistingDlgBase ( parent, name, modal, fl ) { m_spitem = spitem; @@ -72,7 +72,7 @@ AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProj if ( titem->name.isEmpty() ) { - QString target = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); + TQString target = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); targetLabel->setText ( target ); } else @@ -89,13 +89,13 @@ AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProj destGroupBoxLayout->addWidget ( importView ); //destGroupBoxLayout->setStretchFactor(dir, 2); - QWidget::setTabOrder(sourceSelector, addAllButton); - QWidget::setTabOrder(addAllButton, addSelectedButton); - QWidget::setTabOrder(addSelectedButton, importView); - QWidget::setTabOrder(importView, removeAllButton); - QWidget::setTabOrder(removeAllButton, removeSelectedButton); - QWidget::setTabOrder(removeSelectedButton, okButton); - QWidget::setTabOrder(okButton, cancelButton); + TQWidget::setTabOrder(sourceSelector, addAllButton); + TQWidget::setTabOrder(addAllButton, addSelectedButton); + TQWidget::setTabOrder(addSelectedButton, importView); + TQWidget::setTabOrder(importView, removeAllButton); + TQWidget::setTabOrder(removeAllButton, removeSelectedButton); + TQWidget::setTabOrder(removeSelectedButton, okButton); + TQWidget::setTabOrder(okButton, cancelButton); sourceSelector->setFocus(); @@ -114,7 +114,7 @@ AddExistingFilesDialog::~AddExistingFilesDialog() } -// void AddExistingFilesDialog::resizeEvent ( QResizeEvent* ev ) +// void AddExistingFilesDialog::resizeEvent ( TQResizeEvent* ev ) // { // AddExistingDlgBase::resizeEvent ( ev ); // //importView->update(); @@ -128,14 +128,14 @@ void AddExistingFilesDialog::init() importView->setMode ( KIconView::Select ); importView->setItemsMovable ( false ); - connect ( okButton, SIGNAL ( clicked () ), this, SLOT ( slotOk () ) ); + connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); - connect ( addSelectedButton, SIGNAL ( clicked () ), this, SLOT ( slotAddSelected() ) ); - connect ( addAllButton, SIGNAL ( clicked () ), this, SLOT ( slotAddAll() ) ); - connect ( removeSelectedButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveSelected() ) ); - connect ( removeAllButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveAll() ) ); + connect ( addSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSelected() ) ); + connect ( addAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddAll() ) ); + connect ( removeSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveSelected() ) ); + connect ( removeAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveAll() ) ); - connect ( importView, SIGNAL ( dropped( QDropEvent* ) ), this, SLOT ( slotDropped ( QDropEvent* ) ) ); + connect ( importView, TQT_SIGNAL ( dropped( TQDropEvent* ) ), this, TQT_SLOT ( slotDropped ( TQDropEvent* ) ) ); importView->setSelectionMode ( KFile::Multi ); @@ -154,9 +154,9 @@ void AddExistingFilesDialog::importItems() // items already added to the importView KFileItemListIterator importedList ( *importView->items() ); - QListViewItem* child = m_titem->firstChild(); + TQListViewItem* child = m_titem->firstChild(); - QStringList duplicateList; + TQStringList duplicateList; while ( child ) { @@ -229,7 +229,7 @@ void AddExistingFilesDialog::importItems() void AddExistingFilesDialog::slotOk() { - if ( importView->items()->count() == 0 ) QDialog::reject(); + if ( importView->items()->count() == 0 ) TQDialog::reject(); progressBar->show(); progressBar->setFormat ( i18n ( "Importing... %p%" ) ); @@ -241,7 +241,7 @@ void AddExistingFilesDialog::slotOk() // contains at the end only the imported files outside the subproject directory KFileItemList outsideList; - QStringList stringList; + TQStringList stringList; for ( ; items.current(); ++items ) { @@ -300,16 +300,16 @@ void AddExistingFilesDialog::slotOk() items.toFirst(); - QString canontargetname = AutoProjectTool::canonicalize ( m_titem->name ); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize ( m_titem->name ); + TQString varname; if( m_titem->primary == "PROGRAMS" || m_titem->primary == "LIBRARIES" || m_titem->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else varname = m_titem->prefix + "_" + m_titem->primary; - QMap replaceMap; + TQMap replaceMap; FileItem* fitem = 0L; - QStringList fileList; + TQStringList fileList; for ( ; items.current(); ++items ) { @@ -329,7 +329,7 @@ void AddExistingFilesDialog::slotOk() AutoProjectTool::addToMakefileam ( m_spitem->path + "/Makefile.am", replaceMap ); - QDialog::accept(); + TQDialog::accept(); } @@ -413,7 +413,7 @@ void AddExistingFilesDialog::slotRemoveSelected() } -void AddExistingFilesDialog::slotDropped ( QDropEvent* ev ) +void AddExistingFilesDialog::slotDropped ( TQDropEvent* ev ) { kdDebug ( 9020 ) << "AddExistingFilesDialog::dropped()" << endl; diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h index 5bee18b6..aa00a99e 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -20,7 +20,7 @@ #ifndef ADDEXISTINGFILESDLG_H #define ADDEXISTINGFILESDLG_H -#include +#include #include #include "addexistingdlgbase.h" @@ -42,7 +42,7 @@ class AddExistingFilesDialog : public AddExistingDlgBase public: AddExistingFilesDialog( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, TargetItem* titem, QWidget* parent = 0, + SubprojectItem* spitem, TargetItem* titem, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingFilesDialog(); @@ -59,7 +59,7 @@ private: KFileItemList m_importList; protected: - // virtual void resizeEvent ( QResizeEvent* ev ); + // virtual void resizeEvent ( TQResizeEvent* ev ); void init(); void importItems (); @@ -68,7 +68,7 @@ protected slots: void slotAddAll(); void slotRemoveAll(); void slotRemoveSelected(); - void slotDropped ( QDropEvent* ev ); + void slotDropped ( TQDropEvent* ev ); void slotOk(); }; diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index 46529086..56df4998 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -11,14 +11,14 @@ #include "addfiledlg.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -40,11 +40,11 @@ AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddFileDlgBase(parent, name, true) { - connect ( createButton, SIGNAL ( clicked() ), this, SLOT ( accept() ) ); - connect ( cancelButton, SIGNAL ( clicked() ), this, SLOT ( reject() ) ); + connect ( createButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); + connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); directoryLabel->setText ( spitem->path ); if ( item->name.isEmpty() ) @@ -67,13 +67,13 @@ AddFileDialog::~AddFileDialog() void AddFileDialog::accept() { - QString name = fileEdit->text(); + TQString name = fileEdit->text(); if (name.find('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; } - QListViewItem *child = target->firstChild(); + TQListViewItem *child = target->firstChild(); while (child) { FileItem *item = static_cast(child); if (name == item->name) { @@ -84,27 +84,27 @@ void AddFileDialog::accept() } if (templateCheckBox->isChecked()) { - QString srcdir = m_part->projectDirectory(); - QString destdir = subProject->path; - QString destpath = destdir + "/" + name; - if (QFileInfo(destpath).exists()) { + TQString srcdir = m_part->projectDirectory(); + TQString destdir = subProject->path; + TQString destpath = destdir + "/" + name; + if (TQFileInfo(destpath).exists()) { KMessageBox::sorry(this, i18n("A file with this name already exists.

Please use the \"Add existing file\" dialog.")); return; } - if( !FileTemplate::copy(m_part, QFileInfo(name).extension(), destpath) ) + if( !FileTemplate::copy(m_part, TQFileInfo(name).extension(), destpath) ) kdDebug(9020) << "cannot create file " << destpath << endl; } else { // create an empty file - QString srcdir = m_part->projectDirectory(); - QString destdir = subProject->path; - QString destpath = destdir + "/" + name; + TQString srcdir = m_part->projectDirectory(); + TQString destdir = subProject->path; + TQString destpath = destdir + "/" + name; - if (QFileInfo(destpath).exists()) { + if (TQFileInfo(destpath).exists()) { KMessageBox::sorry(this, i18n("A file with this name already exists.

Please use the \"Add existing file\" dialog.")); return; } - QFile f( destpath ); + TQFile f( destpath ); if( f.open(IO_WriteOnly) ) f.close(); } @@ -113,15 +113,15 @@ void AddFileDialog::accept() target->sources.append(fitem); target->insertItem(fitem); - QString canontargetname = AutoProjectTool::canonicalize(target->name); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize(target->name); + TQString varname; if( target->primary == "PROGRAMS" || target->primary == "LIBRARIES" || target->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else varname = target->prefix + "_" + target->primary; subProject->variables[varname] += (" " + name); - QMap replaceMap; + TQMap replaceMap; replaceMap.insert(varname, subProject->variables[varname]); AutoProjectTool::addToMakefileam(subProject->path + "/Makefile.am", replaceMap); @@ -129,7 +129,7 @@ void AddFileDialog::accept() m_widget->emitAddedFile( subProject->path.mid ( m_part->project()->projectDirectory().length() + 1 ) + "/" + name ); m_part->partController()->editDocument ( KURL ( subProject->path + "/" + name ) ); - QDialog::accept(); + TQDialog::accept(); } #include "addfiledlg.moc" diff --git a/buildtools/autotools/addfiledlg.h b/buildtools/autotools/addfiledlg.h index 328e3593..4b1b78a0 100644 --- a/buildtools/autotools/addfiledlg.h +++ b/buildtools/autotools/addfiledlg.h @@ -12,7 +12,7 @@ #ifndef _ADDFILEDLG_H_ #define _ADDFILEDLG_H_ -#include +#include #include "addfiledlgbase.h" @@ -31,7 +31,7 @@ class AddFileDialog : public AddFileDlgBase public: AddFileDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddFileDialog(); protected: diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 251601f7..5531c656 100644 --- a/buildtools/autotools/addicondlg.cpp +++ b/buildtools/autotools/addicondlg.cpp @@ -11,8 +11,8 @@ #include "addicondlg.h" -#include -#include +#include +#include #include #include #include @@ -39,7 +39,7 @@ const char *size_map[] = { AddIconDialog::AddIconDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddIconDialogBase(parent, name, true) { type_combo->insertItem(i18n("Application")); @@ -72,9 +72,9 @@ AddIconDialog::~AddIconDialog() void AddIconDialog::somethingChanged() { - QString size = size_map[size_combo->currentItem()]; - QString type = type_map[type_combo->currentItem()]; - QString name = name_edit->text(); + TQString size = size_map[size_combo->currentItem()]; + TQString type = type_map[type_combo->currentItem()]; + TQString name = name_edit->text(); filename_edit->setText(size + "-" + type + "-" + name + ".png"); } @@ -82,15 +82,15 @@ void AddIconDialog::somethingChanged() void AddIconDialog::accept() { - QString name = filename_edit->text(); + TQString name = filename_edit->text(); - QString destdir = m_subProject->subdir; - QString destpath = destdir + "/" + name; + TQString destdir = m_subProject->subdir; + TQString destpath = destdir + "/" + name; - QString size = size_combo->currentText(); - QString unknown = KIconTheme::defaultThemeName()+ "/" + size + "x" + size + "/mimetypes/unknown.png"; + TQString size = size_combo->currentText(); + TQString unknown = KIconTheme::defaultThemeName()+ "/" + size + "x" + size + "/mimetypes/unknown.png"; - QString templateFileName = locate("icon", unknown); + TQString templateFileName = locate("icon", unknown); kdDebug(9020) << "Unknown: " << unknown << ", template: " << templateFileName << endl; if (!templateFileName.isEmpty()) { @@ -105,11 +105,11 @@ void AddIconDialog::accept() m_target->sources.append(fitem); m_target->insertItem(fitem); - m_part->startMakeCommand(destdir, QString::fromLatin1("force-reedit")); + m_part->startMakeCommand(destdir, TQString::fromLatin1("force-reedit")); m_widget->emitAddedFile(destpath); - QDialog::accept(); + TQDialog::accept(); } #include "addicondlg.moc" diff --git a/buildtools/autotools/addicondlg.h b/buildtools/autotools/addicondlg.h index 64fac0a5..8ab8437f 100644 --- a/buildtools/autotools/addicondlg.h +++ b/buildtools/autotools/addicondlg.h @@ -27,7 +27,7 @@ class AddIconDialog : public AddIconDialogBase public: AddIconDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddIconDialog(); diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index d1557114..c4570d8f 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -11,54 +11,54 @@ #include "addprefixdlg.h" -#include -#include -#include +#include +#include +#include #include #include #include #include #include -AddPrefixDialog::AddPrefixDialog( const QString& nameEdit, const QString& pathEdit, - QWidget *parent, const char *name) - : QDialog(parent, name, true) +AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& pathEdit, + TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Prefix")); - QLabel *name_label = new QLabel(i18n("&Name:"), this); + TQLabel *name_label = new TQLabel(i18n("&Name:"), this); name_edit = new KLineEdit(nameEdit, this); name_edit->setFocus(); name_label->setBuddy(name_edit); - connect( name_edit, SIGNAL( textChanged ( const QString & ) ), SLOT( slotPrefixChanged() ) ); + connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); - QLabel *path_label = new QLabel(i18n("&Path:"), this); + TQLabel *path_label = new TQLabel(i18n("&Path:"), this); path_edit = new KLineEdit(pathEdit, this); path_label->setBuddy(path_edit); - QFontMetrics fm(path_edit->fontMetrics()); + TQFontMetrics fm(path_edit->fontMetrics()); path_edit->setMinimumWidth(fm.width('X')*35); - connect( path_edit, SIGNAL( textChanged ( const QString & ) ), SLOT( slotPrefixChanged() ) ); + connect( path_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); - QVBoxLayout *layout = new QVBoxLayout(this, 10); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10); - QGridLayout *grid = new QGridLayout(2, 2); + TQGridLayout *grid = new TQGridLayout(2, 2); layout->addLayout(grid); grid->addWidget(name_label, 0, 0); grid->addWidget(name_edit, 0, 1); grid->addWidget(path_label, 1, 0); grid->addWidget(path_edit, 1, 1); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); layout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); m_pOk = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotPrefixChanged(); diff --git a/buildtools/autotools/addprefixdlg.h b/buildtools/autotools/addprefixdlg.h index a20bc63a..8712f47f 100644 --- a/buildtools/autotools/addprefixdlg.h +++ b/buildtools/autotools/addprefixdlg.h @@ -12,7 +12,7 @@ #ifndef _ADDPREFIXDLG_H_ #define _ADDPREFIXDLG_H_ -#include +#include #include class QPushButton; @@ -21,15 +21,15 @@ class AddPrefixDialog : public QDialog Q_OBJECT public: - AddPrefixDialog( const QString& nameEdit = "", const QString& pathEdit = "", - QWidget *parent = 0, const char *name = 0 ); + AddPrefixDialog( const TQString& nameEdit = "", const TQString& pathEdit = "", + TQWidget *parent = 0, const char *name = 0 ); ~AddPrefixDialog(); - QString name() const + TQString name() const { return name_edit->text(); } - QString path() const + TQString path() const { return path_edit->text(); } @@ -39,7 +39,7 @@ private slots: private: KLineEdit *name_edit; KLineEdit *path_edit; - QPushButton *m_pOk; + TQPushButton *m_pOk; }; #endif diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp index 2dc76e5e..dde34053 100644 --- a/buildtools/autotools/addservicedlg.cpp +++ b/buildtools/autotools/addservicedlg.cpp @@ -11,11 +11,11 @@ #include "addservicedlg.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -32,7 +32,7 @@ AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddServiceDialogBase(parent, name, true) { filename_edit->setText(".desktop"); @@ -45,10 +45,10 @@ AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *sp subProject = spitem; // Fill the combo box with library names in the directory - QPtrListIterator tit(spitem->targets); + TQPtrListIterator tit(spitem->targets); for (; tit.current(); ++tit) { if ((*tit)->primary == "LTLIBRARIES") - library_combo->insertItem(QString((*tit)->name)); + library_combo->insertItem(TQString((*tit)->name)); } // Fill the list of available service types @@ -56,7 +56,7 @@ AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *sp KServiceType::List::Iterator it; for (it = l.begin(); it != l.end(); ++it) if (!(*it)->isType(KST_KMimeType)) - new QListViewItem(availtypes_listview, (*it)->name()); + new TQListViewItem(availtypes_listview, (*it)->name()); setIcon ( SmallIcon ( "servicenew_kdevelop.png" ) ); } @@ -68,14 +68,14 @@ AddServiceDialog::~AddServiceDialog() void AddServiceDialog::updateProperties() { - QStringList props; + TQStringList props; - QListViewItem *item = static_cast(chosentypes_listview->firstChild()); + TQListViewItem *item = static_cast(chosentypes_listview->firstChild()); while (item) { KServiceType::Ptr type = KServiceType::serviceType(item->text(0)); if (type) { - QStringList stprops = type->propertyDefNames(); - QStringList::ConstIterator stit; + TQStringList stprops = type->propertyDefNames(); + TQStringList::ConstIterator stit; for (stit = stprops.begin(); stit != stprops.end(); ++stit) if (props.find(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment" && (*stit) != "Icon") @@ -85,16 +85,16 @@ void AddServiceDialog::updateProperties() } properties_listview->clear(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = props.begin(); it != props.end(); ++it) - new QListViewItem(properties_listview, *it); + new TQListViewItem(properties_listview, *it); } void AddServiceDialog::iconClicked() { KIconLoader *loader = AutoProjectFactory::instance()->iconLoader(); - QString name = KIconDialog::getIcon(KIcon::Desktop); + TQString name = KIconDialog::getIcon(KIcon::Desktop); if (!name.isNull()) { iconName = name; icon_button->setPixmap(loader->loadIcon(name, KIcon::Desktop)); @@ -104,17 +104,17 @@ void AddServiceDialog::iconClicked() void AddServiceDialog::addTypeClicked() { - QListViewItem *selitem = availtypes_listview->selectedItem(); + TQListViewItem *selitem = availtypes_listview->selectedItem(); if (!selitem) return; - QListViewItem *olditem = chosentypes_listview->firstChild(); + TQListViewItem *olditem = chosentypes_listview->firstChild(); while (olditem) { if (selitem->text(0) == olditem->text(0)) return; olditem = olditem->nextSibling(); } - new QListViewItem(chosentypes_listview, selitem->text(0)); + new TQListViewItem(chosentypes_listview, selitem->text(0)); updateProperties(); } @@ -128,13 +128,13 @@ void AddServiceDialog::removeTypeClicked() } -void AddServiceDialog::propertyExecuted(QListViewItem *item) +void AddServiceDialog::propertyExecuted(TQListViewItem *item) { if (!item) return; - QString prop = item->text(0); - QString value = item->text(1); + TQString prop = item->text(0); + TQString value = item->text(1); bool ok; value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this); if (!ok) @@ -147,29 +147,29 @@ void AddServiceDialog::propertyExecuted(QListViewItem *item) void AddServiceDialog::accept() { // Create list of service types - QStringList serviceTypes; - QListViewItem *item = chosentypes_listview->firstChild(); + TQStringList serviceTypes; + TQListViewItem *item = chosentypes_listview->firstChild(); while (item) { serviceTypes.append(item->text(0)); item = item->nextSibling(); } // Some plausibility tests - QString fileName = filename_edit->text(); + TQString fileName = filename_edit->text(); if (fileName.isEmpty() || fileName == ".desktop") { KMessageBox::sorry(this, i18n("You have to enter a file name.")); filename_edit->setFocus(); return; } - QString name = name_edit->text(); + TQString name = name_edit->text(); if (name.isEmpty()) { KMessageBox::sorry(this, i18n("You have to enter a service name.")); name_edit->setFocus(); return; } - QFile f(subProject->path + "/" + fileName); + TQFile f(subProject->path + "/" + fileName); if (f.exists()) { KMessageBox::sorry(this, i18n("A file with this name exists already.")); filename_edit->setFocus(); @@ -180,7 +180,7 @@ void AddServiceDialog::accept() return; } - QTextStream stream(&f); + TQTextStream stream(&f); stream << "[Desktop Entry]" << endl; stream << "Type=Service" << endl; stream << "Name=" << name << endl; @@ -197,12 +197,12 @@ void AddServiceDialog::accept() // Find a prefix that points to the services directory. // If there is none, use kde_services - QMap::ConstIterator it; + TQMap::ConstIterator it; for (it = subProject->prefixes.begin(); it != subProject->prefixes.end(); ++it) if (it.data() == "$(kde_servicesdir)") break; - QString prefix = (it == subProject->prefixes.end())? QString("kde_services") : it.key(); - QString varname = prefix + "_DATA"; + TQString prefix = (it == subProject->prefixes.end())? TQString("kde_services") : it.key(); + TQString varname = prefix + "_DATA"; // Look if a list view item for this prefix exists already. // Create a new one otherwise @@ -223,11 +223,11 @@ void AddServiceDialog::accept() titem->sources.append(fitem); subProject->variables[varname] += (" " + fileName); - QMap replaceMap; + TQMap replaceMap; replaceMap.insert(varname, subProject->variables[varname]); AutoProjectTool::addToMakefileam(subProject->path + "/Makefile.am", replaceMap); - QDialog::accept(); + TQDialog::accept(); } #include "addservicedlg.moc" diff --git a/buildtools/autotools/addservicedlg.h b/buildtools/autotools/addservicedlg.h index c8b694a5..84469e0c 100644 --- a/buildtools/autotools/addservicedlg.h +++ b/buildtools/autotools/addservicedlg.h @@ -25,14 +25,14 @@ class AddServiceDialog : public AddServiceDialogBase public: AddServiceDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddServiceDialog(); protected: virtual void iconClicked(); virtual void addTypeClicked(); virtual void removeTypeClicked(); - virtual void propertyExecuted( QListViewItem *item ); + virtual void propertyExecuted( TQListViewItem *item ); virtual void accept(); private: @@ -40,7 +40,7 @@ private: AutoProjectWidget *m_widget; SubprojectItem *subProject; - QString iconName; + TQString iconName; }; #endif diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index 8011886b..9aeef695 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -11,11 +11,11 @@ #include "addsubprojectdlg.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -32,13 +32,13 @@ AddSubprojectDialog::AddSubprojectDialog(AutoProjectPart *part, AutoSubprojectView *view, - SubprojectItem *item, QWidget *parent, const char *name) + SubprojectItem *item, TQWidget *parent, const char *name) : AddSubprojectDlgBase(parent, name, true) { setIcon(SmallIcon("folder_new.png")); - connect( createButton, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancelButton, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( createButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); m_subProject = item; m_subprojectView = view; @@ -52,14 +52,14 @@ AddSubprojectDialog::~AddSubprojectDialog() void AddSubprojectDialog::accept() { - QString name = spEdit->text().stripWhiteSpace(); + TQString name = spEdit->text().stripWhiteSpace(); if (name.isEmpty()) { KMessageBox::sorry(this, i18n("You have to give the subproject a name.")); return; } - QListViewItem *childItem = m_subProject->firstChild(); + TQListViewItem *childItem = m_subProject->firstChild(); while (childItem) { if (name == static_cast(childItem)->subdir) { KMessageBox::sorry(this, i18n("A subproject with this name already exists.")); @@ -71,47 +71,47 @@ void AddSubprojectDialog::accept() #if 0 // check for config.status - if( !QFileInfo(m_part->projectDirectory(), "config.status").exists() ){ + if( !TQFileInfo(m_part->projectDirectory(), "config.status").exists() ){ KMessageBox::sorry(this, i18n("There is no config.status in the project root directory. Run 'Configure' first")); - QDialog::accept(); + TQDialog::accept(); return; } #endif - QDir dir( m_subProject->path ); - QFileInfo file( dir, name ); + TQDir dir( m_subProject->path ); + TQFileInfo file( dir, name ); if( file.exists() && !file.isDir() ) { KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(name)); - QDialog::accept(); + TQDialog::accept(); return; } else if( file.isDir() ) { if( KMessageBox::warningContinueCancel(this, i18n("A subdirectory %1 already exists. " "Do you wish to add it as a subproject?").arg(name)) == KMessageBox::Cancel ){ - QDialog::accept(); + TQDialog::accept(); return; } } else if (!dir.mkdir(name)) { KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name)); - QDialog::accept(); + TQDialog::accept(); return; } if(!dir.cd(name)) { KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(name)); - QDialog::accept(); + TQDialog::accept(); return; } // Adjust SUBDIRS variable in containing Makefile.am if (m_subProject->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { - QFile subdirsfile( m_subProject->path + "/subdirs" ); + TQFile subdirsfile( m_subProject->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) { - QTextStream subdirsstream( &subdirsfile ); + TQTextStream subdirsstream( &subdirsfile ); subdirsstream << name << endl; subdirsfile.close(); } @@ -122,7 +122,7 @@ void AddSubprojectDialog::accept() else { m_subProject->variables["SUBDIRS"] += (" " + name); - QMap replaceMap; + TQMap replaceMap; replaceMap.insert("SUBDIRS", m_subProject->variables["SUBDIRS"]); AutoProjectTool::addToMakefileam(m_subProject->path + "/Makefile.am", replaceMap); } @@ -135,7 +135,7 @@ void AddSubprojectDialog::accept() newitem->setOpen(true); // Move to the bottom of the list - QListViewItem *lastItem = m_subProject->firstChild(); + TQListViewItem *lastItem = m_subProject->firstChild(); while (lastItem->nextSibling()) lastItem = lastItem->nextSibling(); if (lastItem != newitem) @@ -143,7 +143,7 @@ void AddSubprojectDialog::accept() // Create a Makefile in the new subdirectory - QFile f( dir.filePath("Makefile.am") ); + TQFile f( dir.filePath("Makefile.am") ); if (f.exists()) { m_subprojectView->parse( newitem ); } else { @@ -151,7 +151,7 @@ void AddSubprojectDialog::accept() KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); return; } - QTextStream stream(&f); + TQTextStream stream(&f); stream << "INCLUDES = " << newitem->variables["INCLUDES"] << endl << "METASOURCES = AUTO" << endl; f.close(); } @@ -160,13 +160,13 @@ void AddSubprojectDialog::accept() // if !isKDE: add the new sub-proj to configure.in if ( !m_part->isKDE() ) { - QString projroot = m_part->projectDirectory() + "/"; - QString subdirectory = dir.path(); - QString relpath = subdirectory.replace(0, projroot.length(),""); + TQString projroot = m_part->projectDirectory() + "/"; + TQString subdirectory = dir.path(); + TQString relpath = subdirectory.replace(0, projroot.length(),""); - QString configureFile = m_part->getAutoConfFile(projroot); + TQString configureFile = m_part->getAutoConfFile(projroot); - QStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); + TQStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); if ( !list.isEmpty() ) { list.push_back( relpath + "/Makefile" ); @@ -175,10 +175,10 @@ void AddSubprojectDialog::accept() } #if 0 - QString relmakefile = (m_subProject->path + "/" + name + "/Makefile").mid(m_part->projectDirectory().length()+1); + TQString relmakefile = (m_subProject->path + "/" + name + "/Makefile").mid(m_part->projectDirectory().length()+1); kdDebug(9020) << "Relative makefile path: " << relmakefile << endl; - QString cmdline = "cd "; + TQString cmdline = "cd "; cmdline += KProcess::quote(m_part->projectDirectory()); cmdline += " && automake "; cmdline += KProcess::quote(relmakefile); @@ -192,7 +192,7 @@ void AddSubprojectDialog::accept() m_part->needMakefileCvs(); - QDialog::accept(); + TQDialog::accept(); } #include "addsubprojectdlg.moc" diff --git a/buildtools/autotools/addsubprojectdlg.h b/buildtools/autotools/addsubprojectdlg.h index eabfc0e1..c1d3b7bf 100644 --- a/buildtools/autotools/addsubprojectdlg.h +++ b/buildtools/autotools/addsubprojectdlg.h @@ -12,7 +12,7 @@ #ifndef _ADDSUBPROJECTDLG_H_ #define _ADDSUBPROJECTDLG_H_ -#include +#include #include #include "addsubprojectdlgbase.h" @@ -28,7 +28,7 @@ class AddSubprojectDialog : public AddSubprojectDlgBase public: AddSubprojectDialog( AutoProjectPart *part, AutoSubprojectView *widget, - SubprojectItem *item, QWidget *parent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); ~AddSubprojectDialog(); private: diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp index b01b5b82..5ca96c45 100644 --- a/buildtools/autotools/addtargetdlg.cpp +++ b/buildtools/autotools/addtargetdlg.cpp @@ -11,10 +11,10 @@ #include "addtargetdlg.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -29,7 +29,7 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : AddTargetDialogBase(parent, name, true) { m_subproject = item; @@ -50,11 +50,11 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item if (widget->kdeMode()) ldflagsother_edit->setText("$(all_libraries)"); - connect( filename_edit, SIGNAL( textChanged(const QString&) ), this, SLOT( slotFileNameChanged (const QString&) ) ); + connect( filename_edit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotFileNameChanged (const TQString&) ) ); setIcon ( SmallIcon ( "targetnew_kdevelop.png" ) ); - canonicalLabel->setText ( QString::null ); + canonicalLabel->setText ( TQString::null ); } @@ -64,7 +64,7 @@ AddTargetDialog::~AddTargetDialog() void AddTargetDialog::primaryChanged() { - QStringList list; + TQStringList list; switch (primary_combo->currentItem()) { case 0: // Program list.append("bin"); @@ -108,8 +108,8 @@ void AddTargetDialog::primaryChanged() prefix_combo->clear(); prefix_combo->insertStringList(list); - QStringList prefixes; - QMap::ConstIterator it; + TQStringList prefixes; + TQMap::ConstIterator it; for (it = m_subproject->prefixes.begin(); it != m_subproject->prefixes.end(); ++it) prefix_combo->insertItem(it.key()); @@ -126,10 +126,10 @@ void AddTargetDialog::primaryChanged() void AddTargetDialog::accept() { - QString name = filename_edit->text().stripWhiteSpace(); - QString prefix = prefix_combo->currentText(); + TQString name = filename_edit->text().stripWhiteSpace(); + TQString prefix = prefix_combo->currentText(); - QString primary; + TQString primary; switch (primary_combo->currentItem()) { case 0: primary = "PROGRAMS"; break; case 1: primary = "LIBRARIES"; break; @@ -165,22 +165,22 @@ void AddTargetDialog::accept() #endif if( primary.endsWith("LIBRARIES") && !name.startsWith("lib") && !module_box->isChecked() ) - name.prepend( QString::fromLatin1("lib") ); + name.prepend( TQString::fromLatin1("lib") ); if( primary == "LTLIBRARIES" && !name.endsWith(".la") ) - name.append( QString::fromLatin1(".la") ); + name.append( TQString::fromLatin1(".la") ); if ( primary == "LIBRARIES" && !name.endsWith(".a") ) - name.append ( QString::fromLatin1(".a") ); + name.append ( TQString::fromLatin1(".a") ); - QPtrListIterator it(m_subproject->targets); + TQPtrListIterator it(m_subproject->targets); for (; it.current(); ++it) if (name == (*it)->name) { KMessageBox::sorry(this, i18n("A target with this name already exists.")); return; } - QStringList flagslist; + TQStringList flagslist; if (primary == "LTLIBRARIES") { if (allstatic_box->isChecked()) flagslist.append("-all-static"); @@ -192,18 +192,18 @@ void AddTargetDialog::accept() flagslist.append("-no-undefined"); } flagslist.append(ldflagsother_edit->text()); - QString ldflags = flagslist.join( " " ); + TQString ldflags = flagslist.join( " " ); TargetItem *titem = m_widget->createTargetItem(name, prefix, primary, false); // m_detailsView->insertItem ( titem ); m_subproject->targets.append(titem); - QString canonname = AutoProjectTool::canonicalize(name); + TQString canonname = AutoProjectTool::canonicalize(name); - QMap replaceMap; + TQMap replaceMap; if( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" || primary == "DATA" ){ - QString varname = prefix + "_" + primary; + TQString varname = prefix + "_" + primary; m_subproject->variables[varname] += (" " + name); replaceMap.insert(varname, m_subproject->variables[varname]); if ( primary != "DATA" ){ @@ -215,10 +215,10 @@ void AddTargetDialog::accept() AutoProjectTool::addToMakefileam(m_subproject->path + "/Makefile.am", replaceMap); - QDialog::accept(); + TQDialog::accept(); } -void AddTargetDialog::slotFileNameChanged ( const QString& text ) +void AddTargetDialog::slotFileNameChanged ( const TQString& text ) { canonicalLabel->setText ( AutoProjectTool::canonicalize ( text ) ); } diff --git a/buildtools/autotools/addtargetdlg.h b/buildtools/autotools/addtargetdlg.h index 98708531..8c44aef4 100644 --- a/buildtools/autotools/addtargetdlg.h +++ b/buildtools/autotools/addtargetdlg.h @@ -25,11 +25,11 @@ class AddTargetDialog : public AddTargetDialogBase public: AddTargetDialog( AutoProjectWidget *widget, SubprojectItem *item, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddTargetDialog(); protected slots: - virtual void slotFileNameChanged ( const QString& ); + virtual void slotFileNameChanged ( const TQString& ); private: virtual void primaryChanged(); diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp index 993dee7d..559e1369 100644 --- a/buildtools/autotools/addtranslationdlg.cpp +++ b/buildtools/autotools/addtranslationdlg.cpp @@ -11,15 +11,15 @@ #include "addtranslationdlg.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -31,35 +31,35 @@ #include "autoprojectpart.h" -AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, QWidget *parent, const char *name) - : QDialog(parent, name, true) +AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Translation")); m_part = part; - QHBox *hbox = new QHBox(this); - (void) new QLabel(i18n("Language:"), hbox); - lang_combo = new QComboBox(hbox); + TQHBox *hbox = new TQHBox(this); + (void) new TQLabel(i18n("Language:"), hbox); + lang_combo = new TQComboBox(hbox); - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->addWidget(hbox); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); layout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); - QPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); + TQPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); ok_button->setDefault(true); - connect( ok_button, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel_button, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); - QStringList rawlist, list; + TQStringList rawlist, list; rawlist << "af" << "ar" << "bg" << "bo" << "br" << "bs" << "ca" << "cs" << "cy" << "da" << "de" << "el" << "en_GB" << "eo" << "es" << "et" << "eu" << "fi" << "fr"; rawlist << "ga" << "gl" << "gu" << "he" << "hi" << "hu" << "id" << "is" << "it" << "ja" @@ -68,9 +68,9 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, QWidget *paren << "ta" << "th" << "tr" << "uk" << "wa" << "zh_CN.GB2312" << "zh_TW.Big5"; // Remove already added languages - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = rawlist.begin(); it != rawlist.end(); ++it) { - QFileInfo fi(m_part->projectDirectory() + "/po/" + (*it) + ".po"); + TQFileInfo fi(m_part->projectDirectory() + "/po/" + (*it) + ".po"); if (!fi.exists()) list.append(*it); } @@ -89,10 +89,10 @@ AddTranslationDialog::~AddTranslationDialog() void AddTranslationDialog::accept() { - QString dir = m_part->projectDirectory() + "/po"; - QString fileName = dir + "/" + lang_combo->currentText() + ".po"; + TQString dir = m_part->projectDirectory() + "/po"; + TQString fileName = dir + "/" + lang_combo->currentText() + ".po"; - QFile f(fileName); + TQFile f(fileName); if (f.exists()) { KMessageBox::information(this, i18n("A translation file for the language %1 exists already.")); return; @@ -101,9 +101,9 @@ void AddTranslationDialog::accept() f.close(); dir = m_part->buildDirectory() + "/po"; - m_part->startMakeCommand(dir, QString::fromLatin1("force-reedit")); + m_part->startMakeCommand(dir, TQString::fromLatin1("force-reedit")); - QDialog::accept(); + TQDialog::accept(); } #include "addtranslationdlg.moc" diff --git a/buildtools/autotools/addtranslationdlg.h b/buildtools/autotools/addtranslationdlg.h index cd14ddf2..7ad5cbdb 100644 --- a/buildtools/autotools/addtranslationdlg.h +++ b/buildtools/autotools/addtranslationdlg.h @@ -12,7 +12,7 @@ #ifndef _ADDTRANSLATIONDLG_H_ #define _ADDTRANSLATIONDLG_H_ -#include +#include class QComboBox; class AutoProjectPart; @@ -23,13 +23,13 @@ class AddTranslationDialog : public QDialog Q_OBJECT public: - AddTranslationDialog( AutoProjectPart *part, QWidget *parent = 0, const char *name = 0 ); + AddTranslationDialog( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); ~AddTranslationDialog(); private: virtual void accept(); - QComboBox *lang_combo; + TQComboBox *lang_combo; AutoProjectPart *m_part; }; diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 26255fd3..d3cf3864 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -16,11 +16,11 @@ #include "autodetailsview.h" /** Qt */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /** KDE Libs */ #include @@ -57,21 +57,21 @@ #include "subclassesdlg.h" -AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, QWidget *parent, const char *name) +AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) : AutoProjectViewBase(parent, name) { m_widget = widget; m_part = part; initActions(); - QDomDocument dom = *(m_part->projectDom()); + TQDomDocument dom = *(m_part->projectDom()); m_subclasslist = DomUtil::readPairListEntry(dom, "/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); m_listView->setAllColumnsShowFocus( true ); m_listView->setRootIsDecorated( true ); - m_listView->setResizeMode( QListView::LastColumn ); - m_listView->addColumn( QString::null ); + m_listView->setResizeMode( TQListView::LastColumn ); + m_listView->addColumn( TQString::null ); m_listView->header()->hide(); targetOptionsAction->setEnabled( false ); addNewFileAction->setEnabled( false ); @@ -79,10 +79,10 @@ AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* par buildTargetAction->setEnabled( false ); executeTargetAction->setEnabled( false ); removeDetailAction->setEnabled(false); - connect( m_listView, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotSelectionChanged( QListViewItem* ) ) ); - connect( m_listView, SIGNAL( selectionChanged() ), - this, SLOT( slotSelectionChanged( ) ) ); + connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( m_listView, TQT_SIGNAL( selectionChanged() ), + this, TQT_SLOT( slotSelectionChanged( ) ) ); } @@ -110,7 +110,7 @@ void AutoDetailsView::slotSelectionChanged( ){ * This is never called if nothing is selected.. * @param item */ -void AutoDetailsView::slotSelectionChanged( QListViewItem* item ) +void AutoDetailsView::slotSelectionChanged( TQListViewItem* item ) { bool isTarget = false; bool isRegularTarget = false; @@ -128,7 +128,7 @@ void AutoDetailsView::slotSelectionChanged( QListViewItem* item ) { titem = static_cast ( pvitem->parent() ); - QString primary = titem->primary; + TQString primary = titem->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" || primary == "JAVA" ) { @@ -142,7 +142,7 @@ void AutoDetailsView::slotSelectionChanged( QListViewItem* item ) isTarget = true; } - QString primary = titem->primary; + TQString primary = titem->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" || primary == "JAVA" ) { @@ -177,7 +177,7 @@ void AutoDetailsView::initActions() KActionCollection * actions = new KActionCollection( this ); targetOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, SLOT( slotTargetOptions() ), actions, + this, TQT_SLOT( slotTargetOptions() ), actions, "target options" ); targetOptionsAction->setWhatsThis(i18n("Options

Target options dialog that " "provides settings for linker flags and lists " @@ -186,18 +186,18 @@ void AutoDetailsView::initActions() targetOptionsAction->plug( m_optionsButton ); targetOptionsAction->setEnabled( false ); - QToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); + TQToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "filenew", 0, - this, SLOT( slotAddNewFile() ), actions, + this, TQT_SLOT( slotAddNewFile() ), actions, "add new file" ); addNewFileAction->setWhatsThis(i18n("Create new file

Creates a new file and " "adds it to a currently selected target.")); addNewFileAction->plug( m_button1 ); addNewFileAction->setEnabled( false ); - QToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) ); + TQToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) ); addExistingFileAction = new AutoToolsAction( i18n( "Add Existing Files..." ), "fileimport", 0, - this, SLOT( slotAddExistingFile() ), actions, + this, TQT_SLOT( slotAddExistingFile() ), actions, "add existing file" ); addExistingFileAction->setWhatsThis(i18n("Add existing files

Adds existing " "file to a currently selected target. Header " @@ -208,12 +208,12 @@ void AutoDetailsView::initActions() addExistingFileAction->setEnabled( false ); addIconAction = new KAction( i18n( "Add Icon..." ), "iconadd_kdevelop", 0, - this, SLOT( slotAddIcon() ), actions, "add icon" ); + this, TQT_SLOT( slotAddIcon() ), actions, "add icon" ); addIconAction->setWhatsThis(i18n("Add icon

Adds an icon to a KDEICON target.")); - QToolTip::add( m_button4, tr2i18n( "Build Target")); + TQToolTip::add( m_button4, tr2i18n( "Build Target")); buildTargetAction = new AutoToolsAction( i18n( "Build Target..." ), "launch", 0, - this, SLOT( slotBuildTarget() ), actions, + this, TQT_SLOT( slotBuildTarget() ), actions, "build target" ); buildTargetAction->setWhatsThis(i18n("Build target

Constructs a series of " "make commands to build the selected target. " @@ -221,9 +221,9 @@ void AutoDetailsView::initActions() buildTargetAction->plug( m_button4 ); buildTargetAction->setEnabled( false ); - QToolTip::add( m_button5, tr2i18n( "Execute Target...")); + TQToolTip::add( m_button5, tr2i18n( "Execute Target...")); executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "exec", 0, - this, SLOT( slotExecuteTarget() ), actions, + this, TQT_SLOT( slotExecuteTarget() ), actions, "execute target" ); executeTargetAction->setWhatsThis(i18n("Execute target

Executes the target " "and tries to build in case it is not built.")); @@ -231,7 +231,7 @@ void AutoDetailsView::initActions() executeTargetAction->setEnabled( false ); setActiveTargetAction = new KAction( i18n( "Make Target Active" ), "", 0, - this, SLOT( slotSetActiveTarget() ), actions, + this, TQT_SLOT( slotSetActiveTarget() ), actions, "set active target" ); setActiveTargetAction->setWhatsThis(i18n("Make target active

Marks the " "currently selected target as 'active'. New " @@ -240,9 +240,9 @@ void AutoDetailsView::initActions() "Using the Build Active Target menu " "command builds it.")); - QToolTip::add( m_button3, tr2i18n( "Remove")); + TQToolTip::add( m_button3, tr2i18n( "Remove")); removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, this, - SLOT( slotRemoveDetail() ), actions, + TQT_SLOT( slotRemoveDetail() ), actions, "remove detail" ); removeDetailAction->setWhatsThis(i18n("Remove

Shows a list of targets " "dependent on the selected target or file and " @@ -251,25 +251,25 @@ void AutoDetailsView::initActions() removeDetailAction->plug( m_button3 ); removeDetailAction->setEnabled( false ); - connect( m_listView, SIGNAL( executed( QListViewItem* ) ), - this, SLOT( slotDetailsExecuted( QListViewItem* ) ) ); - connect( m_listView, SIGNAL( returnPressed( QListViewItem* ) ), - this, SLOT( slotDetailsExecuted( QListViewItem* ) ) ); - connect( m_listView, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotDetailsContextMenu( KListView*, QListViewItem*, const QPoint& ) ) ); + connect( m_listView, TQT_SIGNAL( executed( TQListViewItem* ) ), + this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( m_listView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( m_listView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotDetailsContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); } -QString AutoDetailsView::getUiFileLink(const QString& relpath, const QString& filename) +TQString AutoDetailsView::getUiFileLink(const TQString& relpath, const TQString& filename) { DomUtil::PairList::iterator it; for (it=m_subclasslist.begin(); it != m_subclasslist.end(); ++it) { - if ((*it).first == QString("/")+relpath+filename) + if ((*it).first == TQString("/")+relpath+filename) return (*it).second; } - return QString::null; + return TQString::null; } void AutoDetailsView::slotTargetOptions() @@ -298,7 +298,7 @@ void AutoDetailsView::slotAddNewFile() if (createFileSupport) { KDevCreateFile::CreatedFile crFile = - createFileSupport->createNewFile(QString::null, + createFileSupport->createNewFile(TQString::null, m_widget->selectedSubproject()->path); /* if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK) { @@ -310,7 +310,7 @@ void AutoDetailsView::slotAddNewFile() } else { AddFileDialog dlg( m_part, m_widget, m_widget->selectedSubproject(), titem, this, "add file dialog" ); - QString caption; + TQString caption; if ( titem->name.isEmpty() ) caption = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); else @@ -332,7 +332,7 @@ void AutoDetailsView::slotAddExistingFile() AddExistingFilesDialog dlg( m_part, m_widget, m_widget->selectedSubproject(), titem, this, "add existing files" ); - QString caption; + TQString caption; if ( titem->name.isEmpty() ) caption = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); else @@ -369,7 +369,7 @@ void AutoDetailsView::slotBuildTarget() else titem = static_cast ( m_listView->selectedItem() ); - QString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_widget->selectedSubproject()->relativePath(); + TQString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_widget->selectedSubproject()->relativePath(); m_part->buildTarget(relpath, titem); } @@ -387,8 +387,8 @@ void AutoDetailsView::slotExecuteTarget() else titem = static_cast ( m_listView->selectedItem() ); - QString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_part->activeDirectory(); - m_part->executeTarget(QDir( DomUtil::readEntry( *m_part->projectDom(), "/kdevautoproject/run/cwd/"+titem->name )), titem); + TQString relpath = URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + m_part->activeDirectory(); + m_part->executeTarget(TQDir( DomUtil::readEntry( *m_part->projectDom(), "/kdevautoproject/run/cwd/"+titem->name )), titem); } void AutoDetailsView::slotRemoveDetail() @@ -404,7 +404,7 @@ void AutoDetailsView::slotRemoveDetail() return; } - QListViewItem* sibling = fitem->nextSibling(); + TQListViewItem* sibling = fitem->nextSibling(); if ( !fitem ) return; @@ -414,7 +414,7 @@ void AutoDetailsView::slotRemoveDetail() RemoveFileDialog dlg( m_widget, m_part, m_widget->selectedSubproject(), titem, fitem->text( 0 ), this, "remove file dialog" ); - QString caption; + TQString caption; if ( titem->name.isEmpty() ) caption = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); else @@ -439,7 +439,7 @@ void AutoDetailsView::slotRemoveDetail() if ( pvitem && ( pvitem->type() == ProjectItem::Target ) ) { TargetItem* titem = static_cast ( m_listView->selectedItem() ); - QListViewItem* sibling = titem->nextSibling(); + TQListViewItem* sibling = titem->nextSibling(); if ( !titem ) return; @@ -469,7 +469,7 @@ void AutoDetailsView::slotRemoveDetail() } -void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return; @@ -493,7 +493,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, return; } - QString caption; + TQString caption; if ( titem->name.isEmpty() ) caption = i18n ( "%1 in %2" ).arg ( titem->primary ).arg ( titem->prefix ); else @@ -587,7 +587,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, popup.setWhatsThis(idViewUIH, i18n("Open ui.h file

Opens .ui.h file " "associated with the selected .ui.")); - if (!fitem->name.contains(QRegExp("ui$")) || fitem->is_subst == true) + if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true) { popup.removeItem(idUISubclasses); popup.removeItem(idViewUIH); @@ -605,27 +605,27 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, if(r == idViewUIH) { m_part->partController()->editDocument(KURL(m_widget->selectedSubproject()->path - + "/" + QString(fitem->name + ".h"))); + + "/" + TQString(fitem->name + ".h"))); } else if (r == idSubclassWidget) { - QStringList newFileNames; + TQStringList newFileNames; newFileNames = m_part->languageSupport()->subclassWidget(m_widget->selectedSubproject()->path + "/" + fitem->name); if (!newFileNames.empty()) { - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); for (uint i=0; iprojectDirectory().length()); - QString uifile_relpath = QString(m_widget->selectedSubproject()->path + "/" + fitem->name).remove(0,m_part->projectDirectory().length()); + TQString uifile_relpath = TQString(m_widget->selectedSubproject()->path + "/" + fitem->name).remove(0,m_part->projectDirectory().length()); DomUtil::PairList list = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); list << DomUtil::Pair(srcfile_relpath,uifile_relpath); DomUtil::writePairListEntry(dom, "/kdevautoproject/subclassing", "subclass", "sourcefile", "uifile", list); - newFileNames[i] = newFileNames[i].replace(QRegExp(m_part->projectDirectory()+"/"),""); + newFileNames[i] = newFileNames[i].replace(TQRegExp(m_part->projectDirectory()+"/"),""); } m_subclasslist = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); @@ -634,17 +634,17 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, } else if (r == idUpdateWidgetclass) { - QString noext = m_widget->selectedSubproject()->path + "/" + fitem->name; + TQString noext = m_widget->selectedSubproject()->path + "/" + fitem->name; if (noext.findRev('.')>-1) noext = noext.left(noext.findRev('.')); - QStringList dummy; - QString uifile = fitem->uiFileLink; + TQStringList dummy; + TQString uifile = fitem->uiFileLink; if (uifile.findRev('/')>-1) { - QStringList uisplit = QStringList::split('/',uifile); + TQStringList uisplit = TQStringList::split('/',uifile); uifile=uisplit[uisplit.count()-1]; } @@ -653,16 +653,16 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, } else if (r == idUISubclasses) { - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); DomUtil::PairList list = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); - SubclassesDlg *sbdlg = new SubclassesDlg( QString(m_widget->selectedSubproject()->path + "/" +fitem->name).remove(0,m_part->projectDirectory().length()), + SubclassesDlg *sbdlg = new SubclassesDlg( TQString(m_widget->selectedSubproject()->path + "/" +fitem->name).remove(0,m_part->projectDirectory().length()), list, m_part->projectDirectory()); if (sbdlg->exec()) { - QDomElement el = DomUtil::elementByPath( dom, "/kdevautoproject"); - QDomElement el2 = DomUtil::elementByPath( dom, "/kdevautoproject/subclassing"); + TQDomElement el = DomUtil::elementByPath( dom, "/kdevautoproject"); + TQDomElement el2 = DomUtil::elementByPath( dom, "/kdevautoproject/subclassing"); if ( (!el.isNull()) && (!el2.isNull()) ) { el.removeChild(el2); @@ -679,7 +679,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, QListViewItem *item, } -void AutoDetailsView::slotDetailsExecuted( QListViewItem *item ) +void AutoDetailsView::slotDetailsExecuted( TQListViewItem *item ) { if ( !item ) return ; @@ -691,7 +691,7 @@ void AutoDetailsView::slotDetailsExecuted( QListViewItem *item ) if ( !m_widget->selectedSubproject() ) return; - QString dirName = m_widget->selectedSubproject()->path; + TQString dirName = m_widget->selectedSubproject()->path; FileItem *fitem = static_cast( item ); if(fitem->is_subst) { @@ -710,15 +710,15 @@ void AutoDetailsView::slotSetActiveTarget() SubprojectItem * subpitem = m_widget->selectedSubproject(); if ( !subpitem ) return; - QString targetPath = subpitem->path + "/" + titem->name; + TQString targetPath = subpitem->path + "/" + titem->name; targetPath = targetPath.mid( m_part->projectDirectory().length() + 1 ); kdDebug( 9020 ) << "Setting active " << targetPath << endl; m_widget->setActiveTarget( targetPath ); - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); DomUtil::writeEntry( dom, "/kdevautoproject/general/activetarget", targetPath ); } -void AutoDetailsView::focusOutEvent(QFocusEvent */*e*/) +void AutoDetailsView::focusOutEvent(TQFocusEvent */*e*/) { m_widget->setLastFocusedView(AutoProjectWidget::DetailsView); } diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h index ee67558d..60f10738 100644 --- a/buildtools/autotools/autodetailsview.h +++ b/buildtools/autotools/autodetailsview.h @@ -34,29 +34,29 @@ class AutoDetailsView : protected AutoProjectViewBase Q_OBJECT public: - AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, QWidget *parent, const char *name ); + AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); virtual ~AutoDetailsView(); - QString getUiFileLink( const QString &path, const QString& filename ); + TQString getUiFileLink( const TQString &path, const TQString& filename ); KListView* listView() { return m_listView; } public slots: - void slotSelectionChanged( QListViewItem* item ); + void slotSelectionChanged( TQListViewItem* item ); void slotSelectionChanged(); signals: - void selectionChanged( QListViewItem* ); + void selectionChanged( TQListViewItem* ); protected: void initActions (); - virtual void focusOutEvent( QFocusEvent *e ); + virtual void focusOutEvent( TQFocusEvent *e ); private slots: - void slotDetailsExecuted( QListViewItem *item ); - void slotDetailsContextMenu( KListView *, QListViewItem *item, const QPoint &p ); + void slotDetailsExecuted( TQListViewItem *item ); + void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); void slotTargetOptions (); void slotAddNewFile(); diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp index 454d12f5..865e82d0 100644 --- a/buildtools/autotools/autolistviewitems.cpp +++ b/buildtools/autotools/autolistviewitems.cpp @@ -12,9 +12,9 @@ * * ***************************************************************************/ -#include -#include -#include +#include +#include +#include #include #include "misc.h" @@ -27,30 +27,30 @@ * Class ProjectItem */ -ProjectItem::ProjectItem( Type type, QListView *parent, const QString &text ) - : QListViewItem( parent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, TQListView *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) { bld = false; } -ProjectItem::ProjectItem( Type type, ProjectItem *parent, const QString &text ) - : QListViewItem( parent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) { bld = false; } -void ProjectItem::paintCell( QPainter *p, const QColorGroup &cg, +void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { if ( isBold() ) { - QFont font( p->font() ); + TQFont font( p->font() ); font.setBold( true ); p->setFont( font ); } - QListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); } @@ -58,14 +58,14 @@ void ProjectItem::paintCell( QPainter *p, const QColorGroup &cg, * Class SubprojectItem */ -SubprojectItem::SubprojectItem( QListView *parent, const QString &text ) +SubprojectItem::SubprojectItem( TQListView *parent, const TQString &text ) : ProjectItem( Subproject, parent, text ) { init(); } -SubprojectItem::SubprojectItem( SubprojectItem *parent, const QString &text ) +SubprojectItem::SubprojectItem( SubprojectItem *parent, const TQString &text ) : ProjectItem( Subproject, parent, text ) { init(); @@ -79,9 +79,9 @@ void SubprojectItem::init() } -QString SubprojectItem::relativePath() +TQString SubprojectItem::relativePath() { - QString relpath = subdir; + TQString relpath = subdir; SubprojectItem *it = this; while ( (it= dynamic_cast(it->parent())) ) @@ -98,7 +98,7 @@ QString SubprojectItem::relativePath() * Class TargetItem */ -TargetItem::TargetItem( QListView *lv, bool group, const QString &text ) +TargetItem::TargetItem( TQListView *lv, bool group, const TQString &text ) : ProjectItem( Target, lv, text ) { sources.setAutoDelete( true ); @@ -110,7 +110,7 @@ TargetItem::TargetItem( QListView *lv, bool group, const QString &text ) * Class FileItem */ -FileItem::FileItem( QListView *lv, const QString &text, bool set_is_subst ) +FileItem::FileItem( TQListView *lv, const TQString &text, bool set_is_subst ) : ProjectItem( File, lv, text ) , is_subst(set_is_subst) { if(!is_subst) @@ -130,13 +130,13 @@ if(!is_subst) return; bool ok; - QString text = QInputDialog::getText( - i18n("Edit Substitution"), i18n("Substitution:"), QLineEdit::Normal, + TQString text = QInputDialog::getText( + i18n("Edit Substitution"), i18n("Substitution:"), TQLineEdit::Normal, name, &ok ); if ( ok && !text.isEmpty() ) { // user entered something and pressed OK - QString new_name = text; + TQString new_name = text; if(new_name == name) return; setText(0,new_name); @@ -150,14 +150,14 @@ return; } } -void FileItem::changeMakefileEntry(const QString& new_name) +void FileItem::changeMakefileEntry(const TQString& new_name) { TargetItem* target = dynamic_cast(parent()); - QMap replaceMap; + TQMap replaceMap; - QString canontargetname = AutoProjectTool::canonicalize(target->name); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize(target->name); + TQString varname; if( target->primary == "PROGRAMS" || target->primary == "LIBRARIES" || target->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else @@ -166,8 +166,8 @@ void FileItem::changeMakefileEntry(const QString& new_name) { if ( SubprojectItem* subProject = lv->m_part->m_widget->selectedSubproject() ) { - QStringList sources = QStringList::split(QRegExp("[ \t\n]"), subProject->variables[varname]); - QStringList::iterator it = sources.find(name); + TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]); + TQStringList::iterator it = sources.find(name); (*it) = new_name; subProject->variables[varname] = sources.join(" "); replaceMap.insert(varname, subProject->variables[varname]); diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h index 0dece2a2..008fecc4 100644 --- a/buildtools/autotools/autolistviewitems.h +++ b/buildtools/autotools/autolistviewitems.h @@ -15,9 +15,9 @@ #ifndef AUTOLISTVIEWITEMS_H #define AUTOLISTVIEWITEMS_H -#include +#include -#include +#include class TargetItem; class FileItem; @@ -31,10 +31,10 @@ class ProjectItem : public QListViewItem public: enum Type { Subproject, Target, File }; - ProjectItem( Type type, QListView *parent, const QString &text ); - ProjectItem( Type type, ProjectItem *parent, const QString &text ); + ProjectItem( Type type, TQListView *parent, const TQString &text ); + ProjectItem( Type type, ProjectItem *parent, const TQString &text ); - void paintCell( QPainter *p, const QColorGroup &cg, + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); void setBold( bool b ) { @@ -62,21 +62,21 @@ private: class SubprojectItem : public ProjectItem { public: - SubprojectItem( QListView *parent, const QString &text ); - SubprojectItem( SubprojectItem *parent, const QString &text ); + SubprojectItem( TQListView *parent, const TQString &text ); + SubprojectItem( SubprojectItem *parent, const TQString &text ); /** name of the directory */ - QString subdir; + TQString subdir; /** absolute path */ - QString path; + TQString path; /** mapping from prefix to path */ - QMap prefixes; + TQMap prefixes; /** mapping from variable name to value */ - QMap variables; + TQMap variables; /** list of targets */ - QPtrList targets; + TQPtrList targets; - QString relativePath(); + TQString relativePath(); private: void init(); @@ -99,28 +99,28 @@ class TargetItem : public ProjectItem public: //enum TargetKind { Program, Library, DataGroup, IconGroup, DocGroup }; - TargetItem( QListView *lv, bool group, const QString &text ); + TargetItem( TQListView *lv, bool group, const TQString &text ); // Target kind - not used currently //TargetKind kind; //! Name of target, e.g. foo - QString name; + TQString name; //! One of PROGRAMS, LIBRARIES, LTLIBRARIES, SCRIPTS, HEADERS, DATA, JAVA //! In addition to these automake primaries, we use KDEICON and KDEDOCS //! for am_edit magic - QString primary; + TQString primary; //! May be bin, pkglib, noinst, check, sbin, pkgdata, java... - QString prefix; + TQString prefix; //! Content of foo_SOURCES (or java_JAVA) assignment - QPtrList sources; + TQPtrList sources; //! Content of foo_LDFLAGS assignment - QString ldflags; + TQString ldflags; //! Content of foo_LDADD assignment - QString ldadd; + TQString ldadd; //! Content of foo_LIBADD assignment - QString libadd; + TQString libadd; //! Content of foo_DEPENDENCIES assignment - QString dependencies; + TQString dependencies; }; @@ -129,12 +129,12 @@ class FileItem : public ProjectItem { public: - FileItem( QListView *lv, const QString &text, bool set_is_subst = false ); + FileItem( TQListView *lv, const TQString &text, bool set_is_subst = false ); void changeSubstitution(); - void changeMakefileEntry( const QString& ); + void changeMakefileEntry( const TQString& ); - QString name; - QString uiFileLink; + TQString name; + TQString uiFileLink; const bool is_subst; }; diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index ea0b6896..38604ee0 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -21,14 +21,14 @@ #include "addicondlg.h" #include "autoprojectwidget.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -65,7 +65,7 @@ static const KDevPluginInfo data("kdevautoproject"); K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) -AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStringList &args) +AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") , m_lastCompilationFailed(false) { @@ -80,7 +80,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin m_widget = new AutoProjectWidget(this, m_isKDE); m_widget->setIcon(SmallIcon( info()->icon() )); m_widget->setCaption(i18n("Automake Manager")); - QWhatsThis::add(m_widget, i18n("Automake manager

" + TQWhatsThis::add(m_widget, i18n("Automake manager

" "The project tree consists of two parts. The 'overview' " "in the upper half shows the subprojects, each one having a " "Makefile.am. The 'details' view in the lower half shows the " @@ -90,7 +90,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin KAction *action; action = new KAction( i18n("Add Translation..."), 0, - this, SLOT(slotAddTranslation()), + this, TQT_SLOT(slotAddTranslation()), actionCollection(), "project_addtranslation" ); action->setToolTip(i18n("Add translation")); action->setWhatsThis(i18n("Add translation

Creates .po file for the selected language.")); @@ -101,7 +101,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setEnabled(false); action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8, - this, SLOT(slotBuild()), + this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("Build project

Runs make from the project directory.
" @@ -110,7 +110,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Build &Active Target"), "make_kdevelop", Key_F7, - this, SLOT(slotBuildActiveTarget()), + this, TQT_SLOT(slotBuildActiveTarget()), actionCollection(), "build_buildactivetarget" ); action->setToolTip(i18n("Build active target")); action->setWhatsThis(i18n("Build active target

Constructs a series of make commands to build an active target. " @@ -120,7 +120,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Compile &File"), "make_kdevelop", - this, SLOT(slotCompileFile()), + this, TQT_SLOT(slotCompileFile()), actionCollection(), "build_compilefile" ); action->setToolTip(i18n("Compile file")); action->setWhatsThis(i18n("Compile file

Runs make filename.o command from the directory where 'filename' is the name of currently opened file.
" @@ -129,7 +129,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Run Configure"), 0, - this, SLOT(slotConfigure()), + this, TQT_SLOT(slotConfigure()), actionCollection(), "build_configure" ); action->setToolTip(i18n("Run configure")); action->setWhatsThis(i18n("Run configure

Executes configure with flags, arguments " @@ -138,14 +138,14 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Run automake && friends"), 0, - this, SLOT(slotMakefilecvs()), + this, TQT_SLOT(slotMakefilecvs()), actionCollection(), "build_makefilecvs" ); action->setToolTip(i18n("Run automake && friends")); action->setWhatsThis(i18n("Run automake && friends

Executes
make -f Makefile.cvs
./configure
commands from the project directory.")); action->setGroup("autotools"); action = new KAction( i18n("Install"), 0, - this, SLOT(slotInstall()), + this, TQT_SLOT(slotInstall()), actionCollection(), "build_install" ); action->setToolTip(i18n("Install")); action->setWhatsThis(i18n("Install

Runs make install command from the project directory.
" @@ -154,7 +154,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Install (as root user)"), 0, - this, SLOT(slotInstallWithKdesu()), + this, TQT_SLOT(slotInstallWithKdesu()), actionCollection(), "build_install_kdesu" ); action->setToolTip(i18n("Install as root user")); action->setWhatsThis(i18n("Install

Runs make install command from the project directory with root privileges.
" @@ -164,7 +164,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("&Clean Project"), 0, - this, SLOT(slotClean()), + this, TQT_SLOT(slotClean()), actionCollection(), "build_clean" ); action->setToolTip(i18n("Clean project")); action->setWhatsThis(i18n("Clean project

Runs make clean command from the project directory.
" @@ -173,7 +173,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("&Distclean"), 0, - this, SLOT(slotDistClean()), + this, TQT_SLOT(slotDistClean()), actionCollection(), "build_distclean" ); action->setToolTip(i18n("Distclean")); action->setWhatsThis(i18n("Distclean

Runs make distclean command from the project directory.
" @@ -182,7 +182,7 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin action->setGroup("autotools"); action = new KAction( i18n("Make Messages && Merge"), 0, - this, SLOT(slotMakeMessages()), + this, TQT_SLOT(slotMakeMessages()), actionCollection(), "build_messages" ); action->setToolTip(i18n("Make messages && merge")); action->setWhatsThis(i18n("Make messages && merge

Runs make package-messages command from the project directory.
" @@ -202,36 +202,36 @@ AutoProjectPart::AutoProjectPart(QObject *parent, const char *name, const QStrin "Modify build configurations in project settings dialog, Configure Options tab.")); buildConfigAction->setGroup("autotools"); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if (!DomUtil::readBoolEntry(dom, "/kdevautoproject/run/disable_default")) { //ok we handle the execute in this kpart action = new KAction( i18n("Execute Program"), "exec", SHIFT+Key_F9, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); action->setWhatsThis(i18n("Execute program

Executes the currently active target or the main program specified in project settings, Run Options tab.")); action->setGroup("autotools"); } - connect( buildConfigAction, SIGNAL(activated(const QString&)), - this, SLOT(slotBuildConfigChanged(const QString&)) ); - connect( buildConfigAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotBuildConfigAboutToShow()) ); + connect( buildConfigAction, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(slotBuildConfigChanged(const TQString&)) ); + connect( buildConfigAction->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotBuildConfigAboutToShow()) ); -// connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(projectConfigWidget(KDialogBase*)) ); +// connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Configure Options"), CONFIGURE_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("Run Options"), RUN_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("Make Options"), MAKE_OPTIONS, info()->icon() ); - connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) ); + connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect( makeFrontend(), SIGNAL(commandFinished(const QString&)), - this, SLOT(slotCommandFinished(const QString&)) ); - connect( makeFrontend(), SIGNAL(commandFailed(const QString&)), - this, SLOT(slotCommandFailed(const QString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), + this, TQT_SLOT(slotCommandFinished(const TQString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), + this, TQT_SLOT(slotCommandFailed(const TQString&)) ); setWantautotools(); @@ -250,25 +250,25 @@ AutoProjectPart::~AutoProjectPart() } -void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int pagenumber ) +void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int pagenumber ) { switch ( pagenumber ) { case CONFIGURE_OPTIONS: { ConfigureOptionsWidget *w2 = new ConfigureOptionsWidget(this, page ); - connect( dlg, SIGNAL(okClicked()), w2, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept()) ); } break; case RUN_OPTIONS: { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if (!DomUtil::readBoolEntry(dom, "/kdevautoproject/run/disable_default")) { //ok we handle the execute in this kpart RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevautoproject", buildDirectory(), page ); - connect( dlg, SIGNAL(okClicked()), w3, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); } } break; @@ -276,21 +276,21 @@ void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, QWidget * page case MAKE_OPTIONS: { MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevautoproject", page ); - connect( dlg, SIGNAL(okClicked()), w4, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); } break; } } -void AutoProjectPart::openProject(const QString &dirName, const QString &projectName) +void AutoProjectPart::openProject(const TQString &dirName, const TQString &projectName) { m_projectName = projectName; m_projectPath =dirName; m_widget->openProject(dirName); - QDomDocument &dom = *projectDom(); - QString activeTarget = DomUtil::readEntry(dom, "/kdevautoproject/general/activetarget"); + TQDomDocument &dom = *projectDom(); + TQString activeTarget = DomUtil::readEntry(dom, "/kdevautoproject/general/activetarget"); kdDebug(9020) << k_funcinfo << "activeTarget " << activeTarget << endl; if (!activeTarget.isEmpty()) m_widget->setActiveTarget(activeTarget); @@ -312,13 +312,13 @@ void AutoProjectPart::closeProject() } -QString AutoProjectPart::projectDirectory() const +TQString AutoProjectPart::projectDirectory() const { return m_projectPath; } -QString AutoProjectPart::projectName() const +TQString AutoProjectPart::projectName() const { return m_projectName; } @@ -342,12 +342,12 @@ DomUtil::PairList AutoProjectPart::runEnvironmentVars() const * if /kdevautoproject/run/directoryradio == custom * The custom directory absolute path */ -QString AutoProjectPart::runDirectory() const +TQString AutoProjectPart::runDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString cwd; + TQString cwd; if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() ) { cwd = defaultRunDirectory("kdevautoproject"); @@ -374,17 +374,17 @@ QString AutoProjectPart::runDirectory() const * The absolute path to executable */ -QString AutoProjectPart::mainProgram() const +TQString AutoProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); if( DomUtil::readBoolEntry(*dom, "/kdevautoproject/run/useglobalprogram", false) ) { - QString DomMainProgram = DomUtil::readEntry(*dom, "/kdevautoproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry(*dom, "/kdevautoproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -392,7 +392,7 @@ QString AutoProjectPart::mainProgram() const } else // assume builddir relative path { - QString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); + TQString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); if( !relprojectpath.isEmpty() ) relprojectpath = "/" + relprojectpath; return buildDirectory() + relprojectpath + "/" + DomMainProgram; @@ -407,7 +407,7 @@ QString AutoProjectPart::mainProgram() const KMessageBox::error( m_widget, i18n("There is no active target.\n" "Unable to determine the main program."), i18n("No active target found") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : There's no active target! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; - return QString::null; + return TQString::null; } if ( titem->primary != "PROGRAMS" ) { @@ -416,10 +416,10 @@ QString AutoProjectPart::mainProgram() const "to be the active target, set a main program under\n" "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; - return QString::null; + return TQString::null; } - QString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); + TQString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); if( !relprojectpath.isEmpty() ) relprojectpath = "/" + relprojectpath; return buildDirectory() + relprojectpath + "/" + activeDirectory() + "/" + titem->name; @@ -427,10 +427,10 @@ QString AutoProjectPart::mainProgram() const } -/** Retuns a QString with the debug command line arguments */ -QString AutoProjectPart::debugArguments() const +/** Retuns a TQString with the debug command line arguments */ +TQString AutoProjectPart::debugArguments() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() ) { @@ -442,10 +442,10 @@ QString AutoProjectPart::debugArguments() const } -/** Retuns a QString with the run command line arguments */ -QString AutoProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString AutoProjectPart::runArguments() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() ) { @@ -457,13 +457,13 @@ QString AutoProjectPart::runArguments() const } -QString AutoProjectPart::activeDirectory() const +TQString AutoProjectPart::activeDirectory() const { return m_widget->activeDirectory(); } -QStringList AutoProjectPart::allFiles() const +TQStringList AutoProjectPart::allFiles() const { return m_widget->allFiles(); } @@ -471,8 +471,8 @@ QStringList AutoProjectPart::allFiles() const void AutoProjectPart::setWantautotools() { - QDomDocument &dom = *projectDom(); - QDomElement el = DomUtil::elementByPath(dom, "/kdevautoproject/make"); + TQDomDocument &dom = *projectDom(); + TQDomElement el = DomUtil::elementByPath(dom, "/kdevautoproject/make"); if ( el.namedItem("envvars").isNull() ) { DomUtil::PairList list; list << DomUtil::Pair("WANT_AUTOCONF_2_5", "1"); @@ -482,7 +482,7 @@ void AutoProjectPart::setWantautotools() } -QString AutoProjectPart::makeEnvironment() const +TQString AutoProjectPart::makeEnvironment() const { // Get the make environment variables pairs into the environstr string // in the form of: "ENV_VARIABLE=ENV_VALUE" @@ -491,7 +491,7 @@ QString AutoProjectPart::makeEnvironment() const DomUtil::PairList envvars = DomUtil::readPairListEntry(*projectDom(), "/kdevautoproject/make/envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = envvars.begin(); it != envvars.end(); ++it) { @@ -509,18 +509,18 @@ QString AutoProjectPart::makeEnvironment() const } -void AutoProjectPart::addFile(const QString &fileName) +void AutoProjectPart::addFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->addFiles ( fileList ); } -void AutoProjectPart::addFiles ( const QStringList& fileList ) +void AutoProjectPart::addFiles ( const TQStringList& fileList ) { - QString directory, name; - QStringList::ConstIterator it; + TQString directory, name; + TQStringList::ConstIterator it; bool messageBoxShown = false; for ( it = fileList.begin(); it != fileList.end(); ++it ) @@ -554,15 +554,15 @@ void AutoProjectPart::addFiles ( const QStringList& fileList ) m_widget->addFiles(fileList); } -void AutoProjectPart::removeFile(const QString &fileName) +void AutoProjectPart::removeFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->removeFiles ( fileList ); } -void AutoProjectPart::removeFiles ( const QStringList& fileList ) +void AutoProjectPart::removeFiles ( const TQStringList& fileList ) { /// \FIXME m_widget->removeFiles does nothing! m_widget->removeFiles ( fileList ); @@ -570,18 +570,18 @@ void AutoProjectPart::removeFiles ( const QStringList& fileList ) emit removedFilesFromProject ( fileList ); } -QStringList AutoProjectPart::allBuildConfigs() const +TQStringList AutoProjectPart::allBuildConfigs() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QStringList allConfigs; + TQStringList allConfigs; allConfigs.append("default"); - QDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); - QDomElement childEl = node.firstChild().toElement(); + TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); + TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { - QString config = childEl.tagName(); + TQString config = childEl.tagName(); kdDebug(9020) << k_funcinfo << "Found config " << config << endl; if (config != "default") allConfigs.append(config); @@ -592,11 +592,11 @@ QStringList AutoProjectPart::allBuildConfigs() const } -QString AutoProjectPart::currentBuildConfig() const +TQString AutoProjectPart::currentBuildConfig() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration"); + TQString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration"); if (config.isEmpty() || !allBuildConfigs().contains(config)) config = "default"; @@ -604,11 +604,11 @@ QString AutoProjectPart::currentBuildConfig() const } -QString AutoProjectPart::buildDirectory() const +TQString AutoProjectPart::buildDirectory() const { - QString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; + TQString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; - QString builddir = DomUtil::readEntry(*projectDom(), prefix + "builddir"); + TQString builddir = DomUtil::readEntry(*projectDom(), prefix + "builddir"); if (builddir.isEmpty()) return topsourceDirectory(); else if (builddir.startsWith("/")) @@ -617,11 +617,11 @@ QString AutoProjectPart::buildDirectory() const return projectDirectory() + "/" + builddir; } -QString AutoProjectPart::topsourceDirectory() const +TQString AutoProjectPart::topsourceDirectory() const { - QString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; + TQString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; - QString topsourcedir = DomUtil::readEntry(*projectDom(), prefix + "topsourcedir"); + TQString topsourcedir = DomUtil::readEntry(*projectDom(), prefix + "topsourcedir"); if (topsourcedir.isEmpty()) return projectDirectory(); else if (topsourcedir.startsWith("/")) @@ -630,45 +630,45 @@ QString AutoProjectPart::topsourceDirectory() const return projectDirectory() + "/" + topsourcedir; } -QString AutoProjectPart::constructMakeCommandLine(const QString &dir, const QString &target) const +TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQString &target) const { - QString preCommand; - QFileInfo fi1(); + TQString preCommand; + TQFileInfo fi1(); kdDebug(9020) << k_funcinfo << "Looking for Makefile in " << dir << endl; - if ( !QFile::exists(dir + "/GNUmakefile") && !QFile::exists(dir + "/makefile") - && ! QFile::exists(dir + "/Makefile") ) + if ( !TQFile::exists(dir + "/GNUmakefile") && !TQFile::exists(dir + "/makefile") + && ! TQFile::exists(dir + "/Makefile") ) { - if (!QFile::exists(buildDirectory() + "/configure")) + if (!TQFile::exists(buildDirectory() + "/configure")) { int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n" "and no configure script for this project.\n" - "Run automake & friends and configure first?").arg(buildDirectory()), QString::null, i18n("Run Them"), i18n("Do Not Run")); + "Run automake & friends and configure first?").arg(buildDirectory()), TQString::null, i18n("Run Them"), i18n("Do Not Run")); if (r == KMessageBox::No) - return QString::null; + return TQString::null; preCommand = makefileCvsCommand(); if (preCommand.isNull()) - return QString::null; + return TQString::null; preCommand += " && "; preCommand += configureCommand() + " && "; } else { - int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), QString::null, i18n("Run configure"), i18n("Do Not Run")); + int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString::null, i18n("Run configure"), i18n("Do Not Run")); if (r == KMessageBox::No) - return QString::null; + return TQString::null; preCommand = configureCommand() + " && "; } } - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString cmdline = DomUtil::readEntry(dom, "/kdevautoproject/make/makebin"); + TQString cmdline = DomUtil::readEntry(dom, "/kdevautoproject/make/makebin"); int prio = DomUtil::readIntEntry(dom, "/kdevautoproject/make/prio"); - QString nice; + TQString nice; kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl; if (prio != 0) { - nice = QString("nice -n%1 ").arg(prio); + nice = TQString("nice -n%1 ").arg(prio); } if (cmdline.isEmpty()) @@ -680,7 +680,7 @@ QString AutoProjectPart::constructMakeCommandLine(const QString &dir, const QStr if (runmultiple && jobs != 0) { cmdline += " -j"; - cmdline += QString::number(jobs); + cmdline += TQString::number(jobs); } if (DomUtil::readBoolEntry(dom, "/kdevautoproject/make/dontact")) cmdline += " -n"; @@ -690,7 +690,7 @@ QString AutoProjectPart::constructMakeCommandLine(const QString &dir, const QStr cmdline.prepend(nice); cmdline.prepend(makeEnvironment()); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(dir); dircmd += " && "; @@ -698,7 +698,7 @@ QString AutoProjectPart::constructMakeCommandLine(const QString &dir, const QStr } -void AutoProjectPart::startMakeCommand(const QString &dir, const QString &target, bool withKdesu) +void AutoProjectPart::startMakeCommand(const TQString &dir, const TQString &target, bool withKdesu) { if (partController()->saveAllFiles()==false) return; //user cancelled @@ -715,18 +715,18 @@ void AutoProjectPart::startMakeCommand(const QString &dir, const QString &target /** Adds the make command for the libraries that the target depends on * to the make frontend queue (this is a recursive function) */ -bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, QStringList& alreadyScheduledDeps) +bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStringList& alreadyScheduledDeps) { - QString addstr = (titem->primary == "PROGRAMS")? titem->ldadd : titem->libadd; - QStringList l2 = QStringList::split(QRegExp("[ \t]"), addstr); // list of dependencies - QString tdir; // temp target directory - QString tname; // temp target name - QString tcmd; // temp command line - QStringList::Iterator l2it; + TQString addstr = (titem->primary == "PROGRAMS")? titem->ldadd : titem->libadd; + TQStringList l2 = TQStringList::split(TQRegExp("[ \t]"), addstr); // list of dependencies + TQString tdir; // temp target directory + TQString tname; // temp target name + TQString tcmd; // temp command line + TQStringList::Iterator l2it; for (l2it = l2.begin(); l2it != l2.end(); ++l2it) { - QString dependency = *l2it; + TQString dependency = *l2it; if (dependency.startsWith("$(top_builddir)/")) { // These are the internal libraries @@ -753,7 +753,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, QStri SubprojectItem *spi = m_widget->subprojectItemForPath( dependency.left(pos) ); if (spi) { - QPtrList< TargetItem > tl = spi->targets; + TQPtrList< TargetItem > tl = spi->targets; // Cycle through the list of targets to find the one we're looking for TargetItem *ti = tl.first(); do @@ -812,11 +812,11 @@ void AutoProjectPart::slotBuild() m_needMakefileCvs = false; } - startMakeCommand(buildDirectory(), QString::fromLatin1("")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("")); } -void AutoProjectPart::buildTarget(QString relpath, TargetItem* titem) +void AutoProjectPart::buildTarget(TQString relpath, TargetItem* titem) { if ( !titem ) @@ -825,12 +825,12 @@ void AutoProjectPart::buildTarget(QString relpath, TargetItem* titem) //m_lastCompilationFailed = false; // Calculate the complete name of the target and store it in name - QString name = titem->name; + TQString name = titem->name; if ( titem->primary == "KDEDOCS" ) name = "index.cache.bz2"; // Calculate the full path of the target and store it in path - QString path = buildDirectory(); + TQString path = buildDirectory(); if (!path.endsWith("/") && !path.isEmpty()) path += "/"; if (relpath.at(0) == '/') @@ -843,16 +843,16 @@ void AutoProjectPart::buildTarget(QString relpath, TargetItem* titem) // Add the make command for the libraries that the target depends on to the make frontend queue // if this recursive behavour is un-wanted comment the next line - QStringList deps; + TQStringList deps; if( !queueInternalLibDependenciesBuild(titem, deps) ) return; // Calculate the "make" command line for the target - //QString relpath = dir.path().mid( projectDirectory().length() ); + //TQString relpath = dir.path().mid( projectDirectory().length() ); m_runProg=buildDirectory() + "/" + relpath+"/"+name; kdDebug(9020) << "buildTarget:" << buildDirectory()<< endl; kdDebug(9020) << "buildTarget:" << relpath << " " << path << ": "<< name << " : " << m_runProg << endl; - QString tcmd = constructMakeCommandLine( path, name ); + TQString tcmd = constructMakeCommandLine( path, name ); // Call make if (!tcmd.isNull()) @@ -882,60 +882,60 @@ void AutoProjectPart::slotCompileFile() if (!part || !part->url().isLocalFile()) return; - QString fileName = part->url().path(); - QFileInfo fi(fileName); - QString sourceDir = fi.dirPath(); - QString baseName = fi.baseName(true); + TQString fileName = part->url().path(); + TQFileInfo fi(fileName); + TQString sourceDir = fi.dirPath(); + TQString baseName = fi.baseName(true); kdDebug(9020) << "Compiling " << fileName << " in dir " << sourceDir << " with baseName " << baseName << endl; - QString projectDir = projectDirectory(); + TQString projectDir = projectDirectory(); if (!sourceDir.startsWith(projectDir)) { KMessageBox::sorry(m_widget, i18n("Can only compile files in directories which belong to the project.")); return; } - QString buildDir = buildDirectory() + sourceDir.mid(projectDir.length()); - QString target = baseName + ".lo"; + TQString buildDir = buildDirectory() + sourceDir.mid(projectDir.length()); + TQString target = baseName + ".lo"; kdDebug(9020) << "builddir " << buildDir << ", target " << target << endl; startMakeCommand(buildDir, target); } -QString AutoProjectPart::configureCommand() const +TQString AutoProjectPart::configureCommand() const { - QDomDocument &dom = *projectDom(); - QString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; + TQDomDocument &dom = *projectDom(); + TQString prefix = "/kdevautoproject/configurations/" + currentBuildConfig() + "/"; - QString cmdline = "\"" + topsourceDirectory(); + TQString cmdline = "\"" + topsourceDirectory(); cmdline += "/configure\""; - QString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary"); + TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary"); if (!cc.isEmpty()) - cmdline.prepend(QString("CC=%1 ").arg(cc)); - QString cflags = DomUtil::readEntry(dom, prefix + "cflags"); + cmdline.prepend(TQString("CC=%1 ").arg(cc)); + TQString cflags = DomUtil::readEntry(dom, prefix + "cflags"); if (!cflags.isEmpty()) - cmdline.prepend(QString("CFLAGS=\"%1\" ").arg(cflags)); - QString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary"); + cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags)); + TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary"); if (!cxx.isEmpty()) - cmdline.prepend(QString("CXX=%1 ").arg(cxx)); - QString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags"); + cmdline.prepend(TQString("CXX=%1 ").arg(cxx)); + TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags"); if (!cxxflags.isEmpty()) - cmdline.prepend(QString("CXXFLAGS=\"%1\" ").arg(cxxflags)); - QString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary"); + cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags)); + TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary"); if (!f77.isEmpty()) - cmdline.prepend(QString("F77=%1 ").arg(f77)); - QString fflags = DomUtil::readEntry(dom, prefix + "f77flags"); + cmdline.prepend(TQString("F77=%1 ").arg(f77)); + TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags"); if (!fflags.isEmpty()) - cmdline.prepend(QString("FFLAGS=\"%1\" ").arg(fflags)); - QString cppflags = DomUtil::readEntry(dom, prefix + "cppflags"); + cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags)); + TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags"); if (!cppflags.isEmpty()) - cmdline.prepend(QString("CPPFLAGS=\"%1\" ").arg(cppflags)); - QString ldflags = DomUtil::readEntry(dom, prefix + "ldflags"); + cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags)); + TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags"); if (!ldflags.isEmpty()) - cmdline.prepend(QString("LDFLAGS=\"%1\" ").arg(ldflags)); + cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(ldflags)); - QString configargs = DomUtil::readEntry(dom, prefix + "configargs"); + TQString configargs = DomUtil::readEntry(dom, prefix + "configargs"); if (!configargs.isEmpty()) { cmdline += " "; cmdline += configargs; @@ -944,7 +944,7 @@ QString AutoProjectPart::configureCommand() const DomUtil::PairList envvars = DomUtil::readPairListEntry(*projectDom(), prefix + "envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = envvars.begin(); it != envvars.end(); ++it) { environstr += (*it).first; @@ -954,11 +954,11 @@ QString AutoProjectPart::configureCommand() const } cmdline.prepend(environstr); - QString builddir = buildDirectory(); - QString dircmd; + TQString builddir = buildDirectory(); + TQString dircmd; // if the build directory doesn't exist, add it's creation to the configureCommand - if ( !QFile::exists(builddir)) { + if ( !TQFile::exists(builddir)) { dircmd = "mkdir "; dircmd += KProcess::quote(builddir); dircmd += " && "; @@ -974,14 +974,14 @@ QString AutoProjectPart::configureCommand() const void AutoProjectPart::slotConfigure() { - QString cmdline = configureCommand(); + TQString cmdline = configureCommand(); if (cmdline.isNull()) return; makeFrontend()->queueCommand(buildDirectory(), cmdline); } -QString AutoProjectPart::makefileCvsCommand() const +TQString AutoProjectPart::makefileCvsCommand() const { kdDebug(9020) << "makefileCvsCommand: runDirectory :" << runDirectory() << ":" <saveAllFiles(); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); m_runProg=m_runProg.isEmpty()?mainProgram():m_runProg; @@ -1103,7 +1103,7 @@ void AutoProjectPart::slotExecute() if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autokdesu", false) ){ //slotInstallWithKdesu assumes that it hasn't just been build... kdDebug(9020) << "slotExecute: before startMakeCommand" << endl; - _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), QString::fromLatin1("install"), true); + _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true); } else{ kdDebug(9020) << "slotExecute: before slotInstall" << endl; @@ -1120,7 +1120,7 @@ void AutoProjectPart::slotExecute() if (appFrontend()->isRunning()) { if (KMessageBox::questionYesNo(m_widget, i18n("Your application is currently running. Do you want to restart it?"), i18n("Application Already Running"), i18n("&Restart Application"), i18n("Do &Nothing")) == KMessageBox::No) return; - connect(appFrontend(), SIGNAL(processExited()), SLOT(slotExecute2())); + connect(appFrontend(), TQT_SIGNAL(processExited()), TQT_SLOT(slotExecute2())); appFrontend()->stopApplication(); return; } @@ -1128,30 +1128,30 @@ void AutoProjectPart::slotExecute() slotExecute2(); } -void AutoProjectPart::executeTarget(const QDir& dir, const TargetItem* titem) +void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem) { m_executeAfterBuild=true; partController()->saveAllFiles(); bool is_dirty = false; - QDateTime t = QFileInfo(dir , titem->name ).lastModified(); - QPtrListIterator it( titem->sources ); + TQDateTime t = TQFileInfo(dir , titem->name ).lastModified(); + TQPtrListIterator it( titem->sources ); for( ; it.current() ; ++it ) { - if( t < QFileInfo(dir , (*it)->name).lastModified()) + if( t < TQFileInfo(dir , (*it)->name).lastModified()) is_dirty = true; } if( DomUtil::readBoolEntry(*projectDom(), "/kdevautoproject/run/autocompile", true) && is_dirty ) { - connect( makeFrontend(), SIGNAL(commandFinished(const QString&)), this, SLOT(slotExecuteTargetAfterBuild(const QString&)) ); - connect( makeFrontend(), SIGNAL(commandFailed(const QString&)), this, SLOT(slotNotExecuteTargetAfterBuildFailed(const QString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild(const TQString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed(const TQString&)) ); m_runProg=titem->name; m_executeTargetAfterBuild.first = dir; m_executeTargetAfterBuild.second = const_cast(titem); - QString relpath = "/" + URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ) + "/" + m_widget->selectedSubproject()->subdir; + TQString relpath = "/" + URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ) + "/" + m_widget->selectedSubproject()->subdir; kdDebug(9020) << "executeTarget: before buildTarget " << relpath << endl; buildTarget(relpath, const_cast(titem)); return; @@ -1160,7 +1160,7 @@ void AutoProjectPart::executeTarget(const QDir& dir, const TargetItem* titem) bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevautoproject/run/terminal"); - QString program = environString(); + TQString program = environString(); if ( !titem ) { KMessageBox::error( m_widget, i18n("There is no active target.\n" @@ -1177,7 +1177,7 @@ void AutoProjectPart::executeTarget(const QDir& dir, const TargetItem* titem) }else program += buildDirectory() + "/" + URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ) + "/" + m_widget->selectedSubproject()->relativePath()+ "/" + titem->name; - QString args = DomUtil::readEntry(*projectDom(), "/kdevautoproject/run/runarguments/" + titem->name); + TQString args = DomUtil::readEntry(*projectDom(), "/kdevautoproject/run/runarguments/" + titem->name); program += " " + args; kdDebug(9020) << "executeTarget:cmd=" << dir.path() << " " << program << endl; @@ -1186,27 +1186,27 @@ void AutoProjectPart::executeTarget(const QDir& dir, const TargetItem* titem) } -void AutoProjectPart::slotExecuteTargetAfterBuild(const QString& command) +void AutoProjectPart::slotExecuteTargetAfterBuild(const TQString& command) { kdDebug(9020) << "slotExecuteTargetAfterBuild " << command << endl; if ( m_executeAfterBuild && constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { - disconnect( makeFrontend(), SIGNAL(commandFinished(const QString&)), this, SLOT(slotExecuteAfterTargetBuild()) ); - disconnect( makeFrontend(), SIGNAL(commandFailed(const QString&)), this, SLOT(slotExecuteAfterTargetBuildFailed()) ); + disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuild()) ); + disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuildFailed()) ); kdDebug(9020) << "slotExecuteTargetAfterBuild " << endl; executeTarget(m_executeTargetAfterBuild.first, m_executeTargetAfterBuild.second); } } -void AutoProjectPart::slotNotExecuteTargetAfterBuildFailed(const QString& command) +void AutoProjectPart::slotNotExecuteTargetAfterBuildFailed(const TQString& command) { kdDebug(9020) << "executeTargetAfterBuildFailed" << endl; if ( constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { m_executeAfterBuild=false; - disconnect( makeFrontend(), SIGNAL(commandFinished(const QString&)), this, SLOT(slotExecuteTargetAfterBuild()) ); - disconnect( makeFrontend(), SIGNAL(commandFailed(const QString&)), this, SLOT(slotNotExecuteTargetAfterBuildFailed()) ); + disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild()) ); + disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed()) ); } } @@ -1215,10 +1215,10 @@ void AutoProjectPart::slotNotExecuteTargetAfterBuildFailed(const QString& comman * in the form of: "ENV_VARIABLE=ENV_VALUE" * Note that we quote the variable value due to the possibility of * embedded spaces. */ -QString AutoProjectPart::environString() const +TQString AutoProjectPart::environString() const { DomUtil::PairList envvars = runEnvironmentVars(); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = envvars.begin(); it != envvars.end(); ++it) { environstr += (*it).first; @@ -1235,14 +1235,14 @@ QString AutoProjectPart::environString() const */ void AutoProjectPart::slotExecute2() { - disconnect(appFrontend(), SIGNAL(processExited()), this, SLOT(slotExecute2())); + disconnect(appFrontend(), TQT_SIGNAL(processExited()), this, TQT_SLOT(slotExecute2())); if (m_runProg.isEmpty()){ // Do not execute non executable targets return; } - QString program = environString(); + TQString program = environString(); // Adds the ./ that is necessary to execute the program in bash shells if (!m_runProg.startsWith("/")){ program += "./"; @@ -1271,7 +1271,7 @@ void AutoProjectPart::slotAddTranslation() } -void AutoProjectPart::slotBuildConfigChanged(const QString &config) +void AutoProjectPart::slotBuildConfigChanged(const TQString &config) { DomUtil::writeEntry(*projectDom(), "/kdevautoproject/general/useconfiguration", config); kdDebug(9020) << "Changed used configuration to " << config << endl; @@ -1280,19 +1280,19 @@ void AutoProjectPart::slotBuildConfigChanged(const QString &config) void AutoProjectPart::slotBuildConfigAboutToShow() { - QStringList l = allBuildConfigs(); + TQStringList l = allBuildConfigs(); buildConfigAction->setItems(l); buildConfigAction->setCurrentItem(l.findIndex(currentBuildConfig())); } -void AutoProjectPart::restorePartialProjectSession ( const QDomElement* el ) +void AutoProjectPart::restorePartialProjectSession ( const TQDomElement* el ) { m_widget->restoreSession ( el ); } -void AutoProjectPart::savePartialProjectSession ( QDomElement* el ) +void AutoProjectPart::savePartialProjectSession ( TQDomElement* el ) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); KMessageBox::information ( 0, "Hallo, Welt!" ); @@ -1309,23 +1309,23 @@ void AutoProjectPart::savePartialProjectSession ( QDomElement* el ) m_widget->saveSession ( el ); } -void AutoProjectPart::slotCommandFinished( const QString& command ) +void AutoProjectPart::slotCommandFinished( const TQString& command ) { kdDebug(9020) << k_funcinfo << endl; if( m_buildCommand != command ) return; - m_buildCommand = QString::null; + m_buildCommand = TQString::null; m_timestamp.clear(); - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while( it != fileList.end() ){ - QString fileName = *it; + TQString fileName = *it; ++it; - m_timestamp[ fileName ] = QFileInfo( projectDirectory(), fileName ).lastModified(); + m_timestamp[ fileName ] = TQFileInfo( projectDirectory(), fileName ).lastModified(); } emit projectCompiled(); @@ -1338,7 +1338,7 @@ void AutoProjectPart::slotCommandFinished( const QString& command ) } } -void AutoProjectPart::slotCommandFailed( const QString& /*command*/ ) +void AutoProjectPart::slotCommandFailed( const TQString& /*command*/ ) { kdDebug(9020) << "slotCommandFinished " << k_funcinfo << endl; @@ -1350,14 +1350,14 @@ bool AutoProjectPart::isDirty() { if (m_lastCompilationFailed) return true; - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while( it != fileList.end() ){ - QString fileName = *it; + TQString fileName = *it; ++it; - QMap::Iterator it = m_timestamp.find( fileName ); - QDateTime t = QFileInfo( projectDirectory(), fileName ).lastModified(); + TQMap::Iterator it = m_timestamp.find( fileName ); + TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if( it == m_timestamp.end() || *it != t ){ return true; } @@ -1381,25 +1381,25 @@ KDevProject::Options AutoProjectPart::options() const return UsesAutotoolsBuildSystem; } -QStringList recursiveATFind( const QString &currDir, const QString &baseDir ) +TQStringList recursiveATFind( const TQString &currDir, const TQString &baseDir ) { kdDebug(9020) << "Dir " << currDir << endl; - QStringList fileList; + TQStringList fileList; if( !currDir.contains( "/..") && !currDir.contains("/.") ) { - QDir dir(currDir); - QStringList dirList = dir.entryList(QDir::Dirs ); - QStringList::Iterator idx = dirList.begin(); + TQDir dir(currDir); + TQStringList dirList = dir.entryList(TQDir::Dirs ); + TQStringList::Iterator idx = dirList.begin(); for( ; idx != dirList.end(); ++idx ) { fileList += recursiveATFind( currDir + "/" + (*idx),baseDir ); } - QStringList newFiles = dir.entryList("*.am *.in"); + TQStringList newFiles = dir.entryList("*.am *.in"); idx = newFiles.begin(); for( ; idx != newFiles.end(); ++idx ) { - QString file = currDir + "/" + (*idx); + TQString file = currDir + "/" + (*idx); fileList.append( file.remove( baseDir ) ); } } @@ -1411,21 +1411,21 @@ QStringList recursiveATFind( const QString &currDir, const QString &baseDir ) /*! \fn AutoProjectPart::distFiles() const */ -QStringList AutoProjectPart::distFiles() const +TQStringList AutoProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QDir admin(projectDir +"/admin"); - QStringList files = dir.entryList( "Makefile.cvs Makefile.am configure* INSTALL README NEWS TODO ChangeLog COPYING AUTHORS stamp-h.in acinclude.m4 config.h.in Makefile.in install-sh config.sub config.guess mkinstalldirs missing ltmain.sh depcomp"); - QStringList adminFiles = admin.entryList(QDir::Files); - QStringList::Iterator idx = adminFiles.begin(); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQDir admin(projectDir +"/admin"); + TQStringList files = dir.entryList( "Makefile.cvs Makefile.am configure* INSTALL README NEWS TODO ChangeLog COPYING AUTHORS stamp-h.in acinclude.m4 config.h.in Makefile.in install-sh config.sub config.guess mkinstalldirs missing ltmain.sh depcomp"); + TQStringList adminFiles = admin.entryList(TQDir::Files); + TQStringList::Iterator idx = adminFiles.begin(); for( ; idx != adminFiles.end(); ++idx) { files.append( "admin/" + (*idx) ); } - QStringList srcDirs = dir.entryList(QDir::Dirs); + TQStringList srcDirs = dir.entryList(TQDir::Dirs); idx = srcDirs.begin(); for(; idx != srcDirs.end(); ++idx) { @@ -1434,17 +1434,17 @@ QStringList AutoProjectPart::distFiles() const return sourceList + files; } -void AutoProjectPart::startSimpleMakeCommand( const QString & dir, const QString & command, bool withKdesu ) +void AutoProjectPart::startSimpleMakeCommand( const TQString & dir, const TQString & command, bool withKdesu ) { if (partController()->saveAllFiles()==false) return; //user cancelled // m_buildCommand = constructMakeCommandLine(dir, target); - QString cmdline = command; + TQString cmdline = command; cmdline.prepend(makeEnvironment()); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(dir); dircmd += " && "; @@ -1457,10 +1457,10 @@ void AutoProjectPart::startSimpleMakeCommand( const QString & dir, const QString makeFrontend()->queueCommand(dir, m_buildCommand); } -QString AutoProjectPart::getAutoConfFile(const QString& dir){ +TQString AutoProjectPart::getAutoConfFile(const TQString& dir){ - QFile inFile(dir + "/configure.in"); - QFile acFile(dir + "/configure.ac"); + TQFile inFile(dir + "/configure.in"); + TQFile acFile(dir + "/configure.ac"); if ( inFile.exists()){ return inFile.name(); }else if (acFile.exists()){ diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index d0862cc3..c48e2fe7 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -15,11 +15,11 @@ #ifndef _AUTOPROJECTPART_H_ #define _AUTOPROJECTPART_H_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "kdevbuildtool.h" @@ -36,58 +36,58 @@ class AutoProjectPart : public KDevBuildTool Q_OBJECT public: - AutoProjectPart( QObject *parent, const char *name, const QStringList &args ); + AutoProjectPart( TQObject *parent, const char *name, const TQStringList &args ); virtual ~AutoProjectPart(); /** * Implementation of the KDevProject interface. */ - virtual QString projectDirectory() const; - virtual QString projectName() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; virtual DomUtil::PairList runEnvironmentVars() const; - virtual QString runDirectory() const; - virtual QString mainProgram() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; - virtual QString environString() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual void addFile( const QString &fileName ); - virtual void addFiles ( const QStringList& fileList ); - virtual void removeFile( const QString &fileName ); - virtual void removeFiles ( const QStringList& fileList ); - virtual QString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString mainProgram() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; + virtual TQString environString() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual void addFile( const TQString &fileName ); + virtual void addFiles ( const TQStringList& fileList ); + virtual void removeFile( const TQString &fileName ); + virtual void removeFiles ( const TQStringList& fileList ); + virtual TQString buildDirectory() const; virtual Options options() const; /** * Implementation of the KDevPlugin interface. */ - virtual void restorePartialProjectSession ( const QDomElement* el ); - virtual void savePartialProjectSession ( QDomElement* el ); + virtual void restorePartialProjectSession ( const TQDomElement* el ); + virtual void savePartialProjectSession ( TQDomElement* el ); /** * automake specific methods. */ - QStringList allBuildConfigs() const; - QString currentBuildConfig() const; - QString topsourceDirectory() const; - void startMakeCommand( const QString &dir, const QString &target, bool withKdesu = false ); - void startSimpleMakeCommand( const QString &dir, const QString &command, bool withKdesu = false ); - void buildTarget( QString relpath, TargetItem* titem ); - void executeTarget( const QDir& dir, const TargetItem* titem ); + TQStringList allBuildConfigs() const; + TQString currentBuildConfig() const; + TQString topsourceDirectory() const; + void startMakeCommand( const TQString &dir, const TQString &target, bool withKdesu = false ); + void startSimpleMakeCommand( const TQString &dir, const TQString &command, bool withKdesu = false ); + void buildTarget( TQString relpath, TargetItem* titem ); + void executeTarget( const TQDir& dir, const TargetItem* titem ); void needMakefileCvs(); bool isDirty(); bool isKDE() const; - QStringList distFiles() const; - QString getAutoConfFile(const QString& dir); + TQStringList distFiles() const; + TQString getAutoConfFile(const TQString& dir); protected: /** * Reimplemented from KDevProject. These methods are only * for use by the application core. */ - virtual void openProject( const QString &dirName, const QString &projectName ); + virtual void openProject( const TQString &dirName, const TQString &projectName ); virtual void closeProject(); private slots: @@ -105,35 +105,35 @@ private slots: void slotConfigure(); void slotExecute(); void slotExecute2(); - void slotExecuteTargetAfterBuild( const QString& command ); - void slotNotExecuteTargetAfterBuildFailed( const QString& command ); - void slotBuildConfigChanged( const QString &config ); + void slotExecuteTargetAfterBuild( const TQString& command ); + void slotNotExecuteTargetAfterBuildFailed( const TQString& command ); + void slotBuildConfigChanged( const TQString &config ); void slotBuildConfigAboutToShow(); - void slotCommandFinished( const QString& command ); - void slotCommandFailed( const QString& command ); + void slotCommandFinished( const TQString& command ); + void slotCommandFailed( const TQString& command ); //void slotImportExisting(); - void insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int ); + void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int ); private: - QGuardedPtr m_widget; - QString m_projectName; - QString m_projectPath; + TQGuardedPtr m_widget; + TQString m_projectName; + TQString m_projectPath; KSelectAction *buildConfigAction; - QString makeEnvironment() const; + TQString makeEnvironment() const; void setWantautotools(); - QString makefileCvsCommand() const; - QString configureCommand() const; + TQString makefileCvsCommand() const; + TQString configureCommand() const; - QMap m_timestamp; + TQMap m_timestamp; bool m_executeAfterBuild; - QString m_buildCommand; + TQString m_buildCommand; bool m_needMakefileCvs; bool m_lastCompilationFailed; bool m_isKDE; - QPair m_executeTargetAfterBuild; - QString m_runProg; + QPair m_executeTargetAfterBuild; + TQString m_runProg; ConfigWidgetProxy * _configProxy; @@ -143,8 +143,8 @@ private: friend class FileItem; // For make commands queuing - QString constructMakeCommandLine( const QString &dir, const QString &target ) const; - bool queueInternalLibDependenciesBuild( TargetItem* titem, QStringList& list ); + TQString constructMakeCommandLine( const TQString &dir, const TQString &target ) const; + bool queueInternalLibDependenciesBuild( TargetItem* titem, TQStringList& list ); }; typedef KDevGenericFactory AutoProjectFactory; diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index c3248504..321aa349 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -17,20 +17,20 @@ #include "autoprojectwidget.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -55,7 +55,7 @@ #include "urlutil.h" #include "makefilehandler.h" -static QString nicePrimary( const QString &primary ) +static TQString nicePrimary( const TQString &primary ) { if ( primary == "PROGRAMS" ) return i18n( "Program" ); @@ -72,12 +72,12 @@ static QString nicePrimary( const QString &primary ) else if ( primary == "JAVA" ) return i18n( "Java" ); else - return QString::null; + return TQString::null; } AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde ) - : QVBox( 0, "auto project widget" ) + : TQVBox( 0, "auto project widget" ) { m_part = part; m_kdeMode = kde; @@ -87,7 +87,7 @@ AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde ) m_choosenTarget = 0; m_makefileHandler = new MakefileHandler(); - QSplitter *splitter = new QSplitter(Vertical, this); + TQSplitter *splitter = new TQSplitter(Vertical, this); initOverview ( splitter ); initDetailview ( splitter ); @@ -101,20 +101,20 @@ AutoProjectWidget::~AutoProjectWidget() delete m_makefileHandler; } -void AutoProjectWidget::initOverview ( QWidget* parent ) +void AutoProjectWidget::initOverview ( TQWidget* parent ) { m_subprojectView = new AutoSubprojectView( this, m_part, parent, "project overview widget" ); } -void AutoProjectWidget::initDetailview ( QWidget* parent ) +void AutoProjectWidget::initDetailview ( TQWidget* parent ) { m_detailView = new AutoDetailsView( this, m_part, parent, "project details widget" ); } void AutoProjectWidget::initActions() { - connect( m_subprojectView, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotOverviewSelectionChanged( QListViewItem* ) ) ); + connect( m_subprojectView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); } AutoSubprojectView* AutoProjectWidget::getSubprojectView () @@ -127,7 +127,7 @@ AutoDetailsView* AutoProjectWidget::getDetailsView () return m_detailView; } -void AutoProjectWidget::openProject( const QString &dirName ) +void AutoProjectWidget::openProject( const TQString &dirName ) { m_subprojectView->loadMakefileams ( dirName ); MakefileHandler mfh; @@ -153,29 +153,29 @@ TargetItem* AutoProjectWidget::activeTarget () return m_activeTarget; } -QStringList AutoProjectWidget::allSubprojects() +TQStringList AutoProjectWidget::allSubprojects() { int prefixlen = m_part->projectDirectory().length() + 1; - QStringList res; + TQStringList res; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for ( ; it.current(); ++it ) { // Skip root subproject // if ( it.current() == m_subprojectView->firstChild() ) // continue; - QString path = static_cast( it.current() ) ->path; + TQString path = static_cast( it.current() ) ->path; res.append( path.mid( prefixlen ) ); } return res; } -QPtrList AutoProjectWidget::allSubprojectItems() +TQPtrList AutoProjectWidget::allSubprojectItems() { - QPtrList res; + TQPtrList res; - QListViewItemIterator it ( m_subprojectView->listView() ); + TQListViewItemIterator it ( m_subprojectView->listView() ); for ( ; it.current(); ++it ) { @@ -190,16 +190,16 @@ QPtrList AutoProjectWidget::allSubprojectItems() return res; } -SubprojectItem* AutoProjectWidget::subprojectItemForPath(const QString & path, bool pathIsAbsolute) +SubprojectItem* AutoProjectWidget::subprojectItemForPath(const TQString & path, bool pathIsAbsolute) { kdDebug(9020) << "Looking for path " << path << endl; int prefixLen = m_part->projectDirectory().length() + 1; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for(; it.current(); ++it) { SubprojectItem* spitem = static_cast(it.current() ); - QString relpath = (spitem->path).mid(prefixLen); + TQString relpath = (spitem->path).mid(prefixLen); kdDebug(9020) << " ... checking -" << spitem->path << "-" << endl; kdDebug(9020) << " ... (tailored: -" << relpath << "- against -" << (pathIsAbsolute ? path.mid(prefixLen) : path) << "- )" << endl; if ( relpath == (pathIsAbsolute ? path.mid(prefixLen) : path)) @@ -212,15 +212,15 @@ SubprojectItem* AutoProjectWidget::subprojectItemForPath(const QString & path, b return NULL; } -QString AutoProjectWidget::pathForTarget(const TargetItem *titem) const +TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const { if (!titem) - return QString::null; + return TQString::null; kdDebug(9020) << "Looking for target " << titem->name << endl; int prefixLen = m_part->projectDirectory().length() + 1; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for(; it.current(); ++it) { SubprojectItem* spitem = static_cast(it.current() ); @@ -228,31 +228,31 @@ QString AutoProjectWidget::pathForTarget(const TargetItem *titem) const if (spitem->targets.containsRef(titem)) { kdDebug(9020) << "Found it!" << endl; - QString relpath = (spitem->path).mid(prefixLen); + TQString relpath = (spitem->path).mid(prefixLen); return relpath; } } kdDebug(9020) << "Not found" << endl; - return QString::null; + return TQString::null; } -QStringList AutoProjectWidget::allLibraries() +TQStringList AutoProjectWidget::allLibraries() { int prefixlen = m_part->projectDirectory().length() + 1; - QStringList res; + TQStringList res; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for ( ; it.current(); ++it ) { SubprojectItem *spitem = static_cast( it.current() ); - QString path = spitem->path; - QPtrListIterator tit( spitem->targets ); + TQString path = spitem->path; + TQPtrListIterator tit( spitem->targets ); for ( ; tit.current(); ++tit ) { - QString primary = ( *tit ) ->primary; + TQString primary = ( *tit ) ->primary; if ( primary == "LIBRARIES" || primary == "LTLIBRARIES" ) { - QString fullname = path + "/" + ( *tit ) ->name; + TQString fullname = path + "/" + ( *tit ) ->name; res.append( fullname.mid( prefixlen ) ); } } @@ -262,12 +262,12 @@ QStringList AutoProjectWidget::allLibraries() } -QStringList AutoProjectWidget::allFiles() +TQStringList AutoProjectWidget::allFiles() { - QPtrStack s; - QMap dict; + TQPtrStack s; + TQMap dict; - for ( QListViewItem * item = m_subprojectView->listView()->firstChild(); item; + for ( TQListViewItem * item = m_subprojectView->listView()->firstChild(); item; item = item->nextSibling() ? item->nextSibling() : s.pop() ) { if ( item->firstChild() ) @@ -275,18 +275,18 @@ QStringList AutoProjectWidget::allFiles() SubprojectItem *spitem = static_cast( item ); // use URLUtil so paths in root project dir are worked out correctly - QString relPath = URLUtil::relativePath(m_part->projectDirectory(), spitem->path, URLUtil::SLASH_SUFFIX); - QPtrListIterator tit( spitem->targets ); + TQString relPath = URLUtil::relativePath(m_part->projectDirectory(), spitem->path, URLUtil::SLASH_SUFFIX); + TQPtrListIterator tit( spitem->targets ); for ( ; tit.current(); ++tit ) { - QPtrListIterator fit( tit.current() ->sources ); + TQPtrListIterator fit( tit.current() ->sources ); for ( ; fit.current(); ++fit ) { if((*fit)->is_subst) continue; - QFileInfo fileInfo( (*fit)->name ); + TQFileInfo fileInfo( (*fit)->name ); if( fileInfo.extension() == "ui" ) { dict.insert( relPath + fileInfo.baseName() + ".h", true ); @@ -300,8 +300,8 @@ QStringList AutoProjectWidget::allFiles() // Files may be in multiple targets, so we have to remove // duplicates - QStringList res; - QMap::Iterator it = dict.begin(); + TQStringList res; + TQMap::Iterator it = dict.begin(); while( it != dict.end() ){ res << it.key(); ++it; @@ -311,36 +311,36 @@ QStringList AutoProjectWidget::allFiles() } -QString AutoProjectWidget::subprojectDirectory() +TQString AutoProjectWidget::subprojectDirectory() { if ( !selectedSubproject() ) - return QString::null; + return TQString::null; return selectedSubproject()->path; } -void AutoProjectWidget::setActiveTarget( const QString &targetPath ) +void AutoProjectWidget::setActiveTarget( const TQString &targetPath ) { int prefixlen = m_part->projectDirectory().length() + 1; - QString olddir = m_part->activeDirectory(); + TQString olddir = m_part->activeDirectory(); m_activeSubproject = 0; m_activeTarget = 0; - QListViewItemIterator it( m_subprojectView->listView() ); + TQListViewItemIterator it( m_subprojectView->listView() ); for ( ; it.current(); ++it ) { SubprojectItem *spitem = static_cast( it.current() ); - QString path = spitem->path; - QPtrListIterator tit( spitem->targets ); + TQString path = spitem->path; + TQPtrListIterator tit( spitem->targets ); for ( ; tit.current(); ++tit ) { - QString primary = ( *tit ) ->primary; + TQString primary = ( *tit ) ->primary; if ( primary != "PROGRAMS" && primary != "LIBRARIES" && primary != "LTLIBRARIES" && primary != "JAVA" ) continue; - QString currentTargetPath = ( path + "/" + ( *tit ) ->name ).mid( prefixlen ); + TQString currentTargetPath = ( path + "/" + ( *tit ) ->name ).mid( prefixlen ); bool hasTarget = ( targetPath == currentTargetPath ); ( *tit )->setBold( hasTarget ); @@ -378,7 +378,7 @@ void AutoProjectWidget::setActiveTarget( const QString &targetPath ) } -QString AutoProjectWidget::activeDirectory() +TQString AutoProjectWidget::activeDirectory() { if ( m_activeSubproject ) return m_activeSubproject->path.mid( m_part->projectDirectory().length() + 1 ); @@ -387,21 +387,21 @@ QString AutoProjectWidget::activeDirectory() /* if ( selectedSubproject() ) return selectedSubproject()->path; else*/ - return QString::null; + return TQString::null; } } -void AutoProjectWidget::addFiles( const QStringList &list ) +void AutoProjectWidget::addFiles( const TQStringList &list ) { - QDomDocument &dom = *m_part->projectDom(); - QStringList fileList = list; + TQDomDocument &dom = *m_part->projectDom(); + TQStringList fileList = list; if ( DomUtil::readBoolEntry( dom, "/kdevautoproject/general/useactivetarget" ) ) { - QStringList::iterator it; + TQStringList::iterator it; - QString fileName; + TQString fileName; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -422,7 +422,7 @@ void AutoProjectWidget::addFiles( const QStringList &list ) { TargetItem *titem = dynamic_cast ( m_detailView->listView()->selectedItem() ); SubprojectItem * subitem = dynamic_cast ( m_subprojectView->listView()->selectedItem() ); - QString relativeDir = URLUtil::directory(*it); + TQString relativeDir = URLUtil::directory(*it); SubprojectItem* spitem = subprojectItemForPath(relativeDir); if( titem && subitem && subitem == spitem ) @@ -437,11 +437,11 @@ void AutoProjectWidget::addFiles( const QStringList &list ) addToTarget(fileName, m_activeSubproject, m_activeTarget); } -// QString canontargetname = AutoProjectTool::canonicalize( m_activeTarget->name ); -// QString varname = canontargetname + "_SOURCES"; +// TQString canontargetname = AutoProjectTool::canonicalize( m_activeTarget->name ); +// TQString varname = canontargetname + "_SOURCES"; // m_activeSubproject->variables[ varname ] += ( " " + fileName ); // -// QMap replaceMap; +// TQMap replaceMap; // replaceMap.insert( varname, m_activeSubproject->variables[ varname ] ); // // AutoProjectTool::addToMakefileam( m_activeSubproject->path + "/Makefile.am", replaceMap ); @@ -451,18 +451,18 @@ void AutoProjectWidget::addFiles( const QStringList &list ) } else { - QStringList doManually, doneAutomatically; + TQStringList doManually, doneAutomatically; // First check wether the detail view has a selected target and the subproject // view selected subproject matches the path of the new file. Then // we can assume the user used the right-click option on the target - for( QStringList::iterator it = fileList.begin(); it != fileList.end(); ++it) + for( TQStringList::iterator it = fileList.begin(); it != fileList.end(); ++it) { bool autoAdded = false; if( m_detailView->listView()->selectedItem() && m_subprojectView->listView()->selectedItem() ) { TargetItem *titem = dynamic_cast ( m_detailView->listView()->selectedItem() ); SubprojectItem * subitem = dynamic_cast ( m_subprojectView->listView()->selectedItem() ); - QString relativeDir = URLUtil::directory(*it); + TQString relativeDir = URLUtil::directory(*it); SubprojectItem* spitem = subprojectItemForPath(relativeDir); if( titem && subitem && subitem == spitem ) { @@ -477,16 +477,16 @@ void AutoProjectWidget::addFiles( const QStringList &list ) // See if we can figure out the target for each file without asking the user // I think it's a valid assumption that if a directory contains only one target // the file can be added to that target (Julian Rockey linux at jrockey.com) - QStringList temp = doManually; + TQStringList temp = doManually; doManually.clear(); - for(QStringList::iterator it = temp.begin();it!=temp.end();++it) + for(TQStringList::iterator it = temp.begin();it!=temp.end();++it) { bool autoAdded = false; - QString relativeDir = URLUtil::directory(*it); + TQString relativeDir = URLUtil::directory(*it); SubprojectItem* spitem = subprojectItemForPath(relativeDir); if (spitem) { - QPtrList titemList = spitem->targets; + TQPtrList titemList = spitem->targets; if (titemList.count()==1) { addToTarget( URLUtil::filename(*it), spitem, titemList.first() ); doneAutomatically.append(*it); @@ -511,9 +511,9 @@ void AutoProjectWidget::addFiles( const QStringList &list ) } } -void AutoProjectWidget::addToTarget(const QString & fileName, SubprojectItem* spitem, TargetItem* titem) +void AutoProjectWidget::addToTarget(const TQString & fileName, SubprojectItem* spitem, TargetItem* titem) { - QString varname; + TQString varname; /// \FIXME a quick hack to prevent adding header files to _SOURCES and display them in noinst_HEADERS if (AutoProjectPrivate::isHeader(fileName) && ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES" || titem->primary == "LTLIBRARIES" ) ) @@ -531,12 +531,12 @@ void AutoProjectWidget::addToTarget(const QString & fileName, SubprojectItem* sp titem->sources.append( fitem ); titem->insertItem( fitem ); - QString canontargetname = AutoProjectTool::canonicalize( titem->name ); + TQString canontargetname = AutoProjectTool::canonicalize( titem->name ); varname = canontargetname + "_SOURCES"; } spitem->variables[ varname ] += ( " " + fileName ); - QMap replaceMap; + TQMap replaceMap; replaceMap.insert( varname, spitem->variables[ varname ] ); AutoProjectTool::addToMakefileam( spitem->path + "/Makefile.am", replaceMap ); @@ -544,12 +544,12 @@ void AutoProjectWidget::addToTarget(const QString & fileName, SubprojectItem* sp m_detailView->slotSelectionChanged( spitem ); } -void AutoProjectWidget::removeFiles( const QStringList &list ) +void AutoProjectWidget::removeFiles( const TQStringList &list ) { Q_UNUSED( list ) } -void AutoProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) +void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item ) { if ( !item ) return; @@ -560,10 +560,10 @@ void AutoProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) // Remove all TargetItems and all of their children from the view kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl; - QListViewItem* i = m_detailView->listView()->firstChild(); + TQListViewItem* i = m_detailView->listView()->firstChild(); while( i ) { - QListViewItem* o = i; + TQListViewItem* o = i; i = i->nextSibling(); m_detailView->listView()->takeItem(o); } @@ -576,15 +576,15 @@ void AutoProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()): " << selectedSubproject()->subdir << endl; // Insert all TargetItems and all of their children into the view - QPtrListIterator it2( selectedSubproject()->targets ); + TQPtrListIterator it2( selectedSubproject()->targets ); for ( ; it2.current(); ++it2 ) { kdDebug ( 9020 ) << "insertItem in detail " << ( *it2 )->name << endl; m_detailView->listView()->insertItem( *it2 ); - QPtrListIterator it3( ( *it2 ) ->sources ); + TQPtrListIterator it3( ( *it2 ) ->sources ); for ( ; it3.current(); ++it3 ) ( *it2 )->insertItem( *it3 ); - QString primary = ( *it2 ) ->primary; + TQString primary = ( *it2 ) ->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" || primary == "JAVA" ) ( *it2 ) ->setOpen( true ); @@ -620,15 +620,15 @@ SubprojectItem* AutoProjectWidget::selectedSubproject() return static_cast ( pvitem ); } -TargetItem *AutoProjectWidget::createTargetItem( const QString &name, - const QString &prefix, const QString &primary, +TargetItem *AutoProjectWidget::createTargetItem( const TQString &name, + const TQString &prefix, const TQString &primary, bool take ) { bool docgroup = ( primary == "KDEDOCS" ); bool icongroup = ( primary == "KDEICON" ); bool group = !(docgroup || icongroup); - QString text; + TQString text; if ( docgroup ) text = i18n( "Documentation data" ); else if ( icongroup ) @@ -636,7 +636,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const QString &name, else text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( prefix ); - // Workaround because of QListView not being able to create + // Workaround because of TQListView not being able to create // items without actually inserting them TargetItem *titem = new TargetItem( m_detailView->listView(), group, text ); titem->name = name; @@ -649,7 +649,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const QString &name, } -FileItem *AutoProjectWidget::createFileItem( const QString &name, SubprojectItem *subproject ) +FileItem *AutoProjectWidget::createFileItem( const TQString &name, SubprojectItem *subproject ) { bool is_subst; if(name.find("$(") == 0 || name.find("${") == 0) @@ -666,45 +666,45 @@ FileItem *AutoProjectWidget::createFileItem( const QString &name, SubprojectItem } -void AutoProjectWidget::emitAddedFiles( const QStringList &fileList ) +void AutoProjectWidget::emitAddedFiles( const TQStringList &fileList ) { emit m_part->addedFilesToProject( fileList ); } -void AutoProjectWidget::emitAddedFile( const QString &name ) +void AutoProjectWidget::emitAddedFile( const TQString &name ) { - QStringList fileList; + TQStringList fileList; fileList.append ( name ); emit m_part->addedFilesToProject( fileList ); } -void AutoProjectWidget::emitRemovedFiles( const QStringList &fileList ) +void AutoProjectWidget::emitRemovedFiles( const TQStringList &fileList ) { emit m_part->removedFilesFromProject( fileList ); } -void AutoProjectWidget::emitRemovedFile( const QString &name ) +void AutoProjectWidget::emitRemovedFile( const TQString &name ) { - QStringList fileList; + TQStringList fileList; fileList.append ( name ); emit m_part->removedFilesFromProject( fileList ); } -void AutoProjectWidget::restoreSession ( const QDomElement* el ) +void AutoProjectWidget::restoreSession ( const TQDomElement* el ) { Q_UNUSED( el ); } -void AutoProjectWidget::saveSession ( QDomElement* el ) +void AutoProjectWidget::saveSession ( TQDomElement* el ) { if ( m_activeTarget && m_activeSubproject ) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); - QString activeTargetPath = m_activeSubproject->path.mid ( m_part->project()->projectDirectory().length() + 1 ); + TQString activeTargetPath = m_activeSubproject->path.mid ( m_part->project()->projectDirectory().length() + 1 ); activeTargetPath = activeTargetPath + "/" + m_activeTarget->name; - QDomElement generalEl = domDoc.createElement("general"); + TQDomElement generalEl = domDoc.createElement("general"); kdDebug ( 9020 ) << k_funcinfo << "Saving session data of AutoProjectWidget: " << activeTargetPath << endl; @@ -715,12 +715,12 @@ void AutoProjectWidget::saveSession ( QDomElement* el ) void AutoProjectWidget::setActiveSubproject( SubprojectItem * spitem ) { - QString olddir = m_part->activeDirectory(); + TQString olddir = m_part->activeDirectory(); m_activeSubproject = spitem; emit m_part->activeDirectoryChanged( olddir, m_part->activeDirectory() ); } -void AutoProjectWidget::focusInEvent( QFocusEvent */*e*/ ) +void AutoProjectWidget::focusInEvent( TQFocusEvent */*e*/ ) { switch (m_lastFocusedView) { diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index 0f4a8b13..6c578506 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -17,13 +17,13 @@ #ifndef _AUTOPROJECTWIDGET_H_ #define _AUTOPROJECTWIDGET_H_ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -54,33 +54,33 @@ public: AutoProjectWidget( AutoProjectPart *part, bool kde ); ~AutoProjectWidget(); - void openProject( const QString &dirName ); + void openProject( const TQString &dirName ); void closeProject(); /** * A list of the (relative) names of all subprojects (== subdirectories) */ - QStringList allSubprojects(); + TQStringList allSubprojects(); /** * A list of all Subproject items in the overview KListView */ - QPtrList allSubprojectItems(); + TQPtrList allSubprojectItems(); /** * A list of the (relative) names of all libraries */ - QStringList allLibraries(); + TQStringList allLibraries(); /** * A list of all files that belong to the project **/ - QStringList allFiles(); + TQStringList allFiles(); /** * The top level directory of the project. **/ - QString projectDirectory() const; + TQString projectDirectory() const; /** * The directory of the currently shown subproject. */ - QString subprojectDirectory(); + TQString subprojectDirectory(); /** * Are we in KDE mode? */ @@ -93,12 +93,12 @@ public: * Sets the given target active. The argument is given * relative to the project directory. */ - void setActiveTarget( const QString &targetPath ); + void setActiveTarget( const TQString &targetPath ); /** * Returns the active target as path relative to * the project directory. */ - QString activeDirectory(); + TQString activeDirectory(); /** * Adds a file to the active target. @@ -106,12 +106,12 @@ public: * to the active target. * If it does contain "/" character(s), ... @todo .. add to appropriate target */ - void addFiles( const QStringList &list ); + void addFiles( const TQStringList &list ); /** * Removes the file fileName from the directory directory. * (not implemented currently) */ - void removeFiles( const QStringList &list ); + void removeFiles( const TQStringList &list ); /** * Returns the currently selected target. Returns 0 if @@ -134,13 +134,13 @@ public: /** * Creates a TargetItem instance without a parent item. */ - TargetItem *createTargetItem( const QString &name, - const QString &prefix, const QString &primary, + TargetItem *createTargetItem( const TQString &name, + const TQString &prefix, const TQString &primary, bool take = true ); /** * Creates a FileItem instance without a parent item. */ - FileItem *createFileItem( const QString &name, SubprojectItem *subproject ); + FileItem *createFileItem( const TQString &name, SubprojectItem *subproject ); /** * Returns the Subproject that contains the Active Target. The Active Target is a special target @@ -160,36 +160,36 @@ public: * absolute, or relative to the project directory. If no subproject item is found for the * path, null is returned. */ - SubprojectItem* subprojectItemForPath( const QString & path, bool pathIsAbsolute = false ); + SubprojectItem* subprojectItemForPath( const TQString & path, bool pathIsAbsolute = false ); /** * Returns the projectdir-relative path for a target item */ - QString pathForTarget( const TargetItem *item ) const; + TQString pathForTarget( const TargetItem *item ) const; /** * Adds file fileName to target titem in subproject spitem */ - void addToTarget( const QString & fileName, SubprojectItem* spitem, TargetItem* titem ); + void addToTarget( const TQString & fileName, SubprojectItem* spitem, TargetItem* titem ); /** * Restores the last settings of the AutoProjectWidget */ - void restoreSession ( const QDomElement* el ); + void restoreSession ( const TQDomElement* el ); /** * Saves the latest changes of the AutoProjectWidget to the session file. */ - void saveSession ( QDomElement* el ); + void saveSession ( TQDomElement* el ); AutoSubprojectView* getSubprojectView (); AutoDetailsView* getDetailsView (); - void emitAddedFile ( const QString& name ); - void emitAddedFiles( const QStringList &fileList ); - void emitRemovedFile ( const QString& name ); - void emitRemovedFiles( const QStringList &fileList ); + void emitAddedFile ( const TQString& name ); + void emitAddedFiles( const TQStringList &fileList ); + void emitRemovedFile ( const TQString& name ); + void emitRemovedFiles( const TQStringList &fileList ); void parse( SubprojectItem *item ); @@ -199,14 +199,14 @@ public: MakefileHandler* makefileHandler(); public slots: - void slotOverviewSelectionChanged( QListViewItem *item ); + void slotOverviewSelectionChanged( TQListViewItem *item ); protected: - void initOverview ( QWidget* parent ); - void initDetailview ( QWidget* parent ); + void initOverview ( TQWidget* parent ); + void initDetailview ( TQWidget* parent ); void initActions (); - virtual void focusInEvent( QFocusEvent *e ); + virtual void focusInEvent( TQFocusEvent *e ); private: diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index efa3a358..9e1f9735 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -14,11 +14,11 @@ */ /** Qt */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /** KDE Libs */ #include @@ -58,17 +58,17 @@ namespace AutoProjectPrivate { -bool isHeader( const QString& fileName ) +bool isHeader( const TQString& fileName ) { - return QStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( QFileInfo(fileName).extension(false) ); + return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( TQFileInfo(fileName).extension(false) ); } -static QString cleanWhitespace( const QString &str ) +static TQString cleanWhitespace( const TQString &str ) { - QString res; + TQString res; - QStringList l = QStringList::split( QRegExp( "[ \t]" ), str ); - QStringList::ConstIterator it; + TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), str ); + TQStringList::ConstIterator it; for ( it = l.begin(); it != l.end(); ++it ) { res += *it; @@ -78,16 +78,16 @@ static QString cleanWhitespace( const QString &str ) return res.left( res.length() - 1 ); } -static void removeDir( const QString& dirName ) +static void removeDir( const TQString& dirName ) { - QDir d( dirName ); + TQDir d( dirName ); const QFileInfoList* fileList = d.entryInfoList(); if( !fileList ) return; QFileInfoListIterator it( *fileList ); while( it.current() ){ - const QFileInfo* fileInfo = it.current(); + const TQFileInfo* fileInfo = it.current(); ++it; if( fileInfo->fileName() == "." || fileInfo->fileName() == ".." ) @@ -107,7 +107,7 @@ static void removeDir( const QString& dirName ) } -AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, QWidget *parent, const char *name) +AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) : AutoProjectViewBase(parent, name) { @@ -116,10 +116,10 @@ AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPar m_listView->setSorting(-1); m_listView->header()->hide(); - m_listView->addColumn( QString::null ); + m_listView->addColumn( TQString::null ); - connect( m_listView, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotSelectionChanged( QListViewItem* ) ) ); + connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); initActions(); } @@ -129,7 +129,7 @@ AutoSubprojectView::~AutoSubprojectView() { } -void AutoSubprojectView::slotSelectionChanged( QListViewItem* item ) +void AutoSubprojectView::slotSelectionChanged( TQListViewItem* item ) { if ( m_listView->selectedItems().count() <= 0 ) { @@ -153,7 +153,7 @@ void AutoSubprojectView::slotSelectionChanged( QListViewItem* item ) emit selectionChanged( item ); } -void AutoSubprojectView::loadMakefileams ( const QString& dir ) +void AutoSubprojectView::loadMakefileams ( const TQString& dir ) { SubprojectItem * item = new SubprojectItem( m_listView, m_part->projectName() ); item->setPixmap ( 0, SmallIcon ( "kdevelop" ) ); @@ -173,53 +173,53 @@ void AutoSubprojectView::initActions() KActionCollection * actions = new KActionCollection( this ); subProjectOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, SLOT( slotSubprojectOptions() ), actions, "subproject options" ); + this, TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); subProjectOptionsAction->setWhatsThis(i18n("Options

Shows subproject options dialog " "that provides settings for compiler, include paths, " "prefixes and build order.")); subProjectOptionsAction->plug( m_optionsButton ); - QToolTip::add( m_button1, tr2i18n( "Add new subproject...")); + TQToolTip::add( m_button1, tr2i18n( "Add new subproject...")); addSubprojectAction = new AutoToolsAction( i18n( "Add new subproject..." ), "folder_new", 0, - this, SLOT( slotAddSubproject() ), actions, "add subproject" ); + this, TQT_SLOT( slotAddSubproject() ), actions, "add subproject" ); addSubprojectAction->setWhatsThis(i18n("Add new subproject

Creates a new " "subproject in currently selected subproject.")); addSubprojectAction->plug( m_button1 ); removeSubprojectAction = new KAction( i18n( "Remove Subproject..." ), "remove_subdir", 0, - this, SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); + this, TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); removeSubprojectAction->setWhatsThis(i18n("Remove subproject

Removes the subproject. Asks if the " "subproject should be also removed from disk. Only subprojects " "which do not hold other subprojects can be removed.")); addExistingSubprojectAction = new KAction( i18n( "Add Existing Subprojects..." ), "fileimport", 0, - this, SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); + this, TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); addExistingSubprojectAction->setWhatsThis(i18n("Add existing subprojects

Imports existing " "subprojects containing Makefile.am.")); - QToolTip::add( m_button2, tr2i18n( "Add Target...")); + TQToolTip::add( m_button2, tr2i18n( "Add Target...")); addTargetAction = new AutoToolsAction( i18n( "Add Target..." ), "targetnew_kdevelop", 0, - this, SLOT( slotAddTarget() ), actions, "add target" ); + this, TQT_SLOT( slotAddTarget() ), actions, "add target" ); addTargetAction->setWhatsThis(i18n( "Add target

Adds a new target to " "the currently selected subproject. Target can be a " "binary program, library, script, also a collection of " "data or header files.")); addTargetAction->plug( m_button2 ); - QToolTip::add( m_button3, tr2i18n( "Add Service...")); + TQToolTip::add( m_button3, tr2i18n( "Add Service...")); addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_kdevelop", 0, this, - SLOT( slotAddService() ), actions, "add service" ); + TQT_SLOT( slotAddService() ), actions, "add service" ); addServiceAction->setWhatsThis(i18n("Add service

Creates a .desktop file describing the service.")); addServiceAction->plug( m_button3 ); - QToolTip::add( m_button4, tr2i18n( "Add Application...")); + TQToolTip::add( m_button4, tr2i18n( "Add Application...")); addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window_new", 0, this, - SLOT( slotAddApplication() ), actions, "add application" ); + TQT_SLOT( slotAddApplication() ), actions, "add application" ); addApplicationAction->setWhatsThis(i18n("Add application

Creates an application .desktop file.")); addApplicationAction->plug( m_button4 ); - QToolTip::add( m_button5, tr2i18n( "Build")); + TQToolTip::add( m_button5, tr2i18n( "Build")); buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, this, - SLOT( slotBuildSubproject() ), actions, "build subproject" ); + TQT_SLOT( slotBuildSubproject() ), actions, "build subproject" ); buildSubprojectAction->setWhatsThis(i18n("Build

Runs make from the directory of " "the selected subproject.
Environment variables and " "make arguments can be specified in the project settings " @@ -227,7 +227,7 @@ void AutoSubprojectView::initActions() buildSubprojectAction->plug( m_button5 ); forceReeditSubprojectAction = new KAction( i18n( "Force Reedit" ), 0, 0, this, - SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); + TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); forceReeditSubprojectAction->setWhatsThis(i18n("Force Reedit

Runs make force-reedit " "from the directory of the selected subproject.
This " "recreates makefile (tip: and solves most of .moc related " @@ -239,20 +239,20 @@ void AutoSubprojectView::initActions() forceReeditSubprojectAction->setEnabled(false); cleanSubprojectAction = new KAction( i18n( "Clean" ), 0, 0, this, - SLOT( slotCleanSubproject() ), actions, "clean subproject" ); + TQT_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); cleanSubprojectAction->setWhatsThis(i18n("Clean

Runs make clean from the directory of " "the selected subproject.
Environment variables and make " "arguments can be specified in the project settings dialog, " "Make Options tab.")); installSubprojectAction = new KAction( i18n( "Install" ), 0, 0, this, - SLOT( slotInstallSubproject() ), actions, "install subproject" ); + TQT_SLOT( slotInstallSubproject() ), actions, "install subproject" ); installSubprojectAction->setWhatsThis(i18n("Install

Runs make install from the directory " "of the selected subproject.
Environment variables and " "make arguments can be specified in the project settings " "dialog, Make Options tab.")); installSuSubprojectAction = new KAction( i18n( "Install (as root user)" ), 0, 0, - this, SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); + this, TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); installSuSubprojectAction->setWhatsThis(i18n("Install as root user

Runs make install " "command from the directory of the selected subproject " "with root privileges.
It is executed via kdesu " @@ -261,21 +261,21 @@ void AutoSubprojectView::initActions() "Make Options tab.")); expandAction = new KAction( i18n( "Expand Subtree" ), 0, 0, this, - SLOT(slotExpandTree()), actions, "expandAction" ); + TQT_SLOT(slotExpandTree()), actions, "expandAction" ); collapseAction = new KAction( i18n( "Collapse Subtree" ), 0, 0, this, - SLOT(slotCollapseTree()), actions, "collapseAction" ); + TQT_SLOT(slotCollapseTree()), actions, "collapseAction" ); otherAction = new KAction( i18n( "Manage Custom Commands..." ), 0, 0, this, - SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); + TQT_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); otherAction->setWhatsThis(i18n("Manage custom commands

Allows to create, edit and " "delete custom build commands which appears in the subproject " "context menu.
")); - connect( m_listView, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotContextMenu( KListView*, QListViewItem*, const QPoint& ) ) ); + connect( m_listView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); } -void AutoSubprojectView::slotContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; @@ -306,8 +306,8 @@ void AutoSubprojectView::slotContextMenu( KListView *, QListViewItem *item, cons KConfig *config = m_part->instance()->config(); bool separate = true; - QMap customBuildCommands = config->entryMap("CustomCommands"); - for (QMap::const_iterator it = customBuildCommands.constBegin(); + TQMap customBuildCommands = config->entryMap("CustomCommands"); + for (TQMap::const_iterator it = customBuildCommands.constBegin(); it != customBuildCommands.constEnd(); ++it) { if (separate) @@ -315,7 +315,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, QListViewItem *item, cons popup.insertSeparator(); separate = false; } - int id = popup.insertItem(it.key(), this, SLOT(slotCustomBuildCommand(int))); + int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int))); m_commandList.append(it.data()); popup.setItemParameter(id, m_commandList.findIndex(it.data())); } @@ -420,9 +420,9 @@ void AutoSubprojectView::slotBuildSubproject() SubprojectItem* spitem = dynamic_cast( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); - m_part->startMakeCommand( m_part->buildDirectory() + relpath, QString::fromLatin1( "" ) ); + m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::fromLatin1( "" ) ); } void AutoSubprojectView::slotRemoveSubproject() @@ -439,9 +439,9 @@ void AutoSubprojectView::slotRemoveSubproject() return; } - QStringList list = QStringList::split( QRegExp("[ \t]"), parent->variables["SUBDIRS"] ); - QStringList::Iterator it = list.find( spitem->subdir ); - QString subdirToRemove = spitem->subdir; + TQStringList list = TQStringList::split( TQRegExp("[ \t]"), parent->variables["SUBDIRS"] ); + TQStringList::Iterator it = list.find( spitem->subdir ); + TQString subdirToRemove = spitem->subdir; bool topsubdirs = true; if ((parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1) && (parent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1)) @@ -481,19 +481,19 @@ void AutoSubprojectView::slotRemoveSubproject() // Adjust AC_OUTPUT in configure.in if ( !m_part->isKDE() ) { - QString projroot = m_part->projectDirectory() + "/"; - QString subdirectory = spitem->path; - QString relpath = subdirectory.replace(0, projroot.length(),""); + TQString projroot = m_part->projectDirectory() + "/"; + TQString subdirectory = spitem->path; + TQString relpath = subdirectory.replace(0, projroot.length(),""); - QString configureFile = m_part->getAutoConfFile(projroot); + TQString configureFile = m_part->getAutoConfFile(projroot); - QStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); + TQStringList list = AutoProjectTool::configureinLoadMakefiles(configureFile); - QStringList::iterator it; + TQStringList::iterator it; for ( it = list.begin(); it != list.end(); it++ ) { - QString current = (QString) (*it); - QRegExp path_regex(relpath); + TQString current = (TQString) (*it); + TQRegExp path_regex(relpath); if ( path_regex.search(current) >= 0) { list.remove(it); break; @@ -513,11 +513,11 @@ void AutoSubprojectView::slotRemoveSubproject() if (parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { - QFile subdirsfile( parent->path + "/subdirs" ); - QStringList topdirs; + TQFile subdirsfile( parent->path + "/subdirs" ); + TQStringList topdirs; if ( subdirsfile.open( IO_ReadOnly ) ) { - QTextStream subdirsstream( &subdirsfile ); + TQTextStream subdirsstream( &subdirsfile ); while (!subdirsstream.atEnd()) topdirs.append(subdirsstream.readLine()); subdirsfile.close(); @@ -525,26 +525,26 @@ void AutoSubprojectView::slotRemoveSubproject() topdirs.remove(subdirToRemove); if ( subdirsfile.open( IO_WriteOnly | IO_Truncate ) ) { - QTextStream subdirsstream( &subdirsfile ); - for (QStringList::const_iterator it = topdirs.begin(); it != topdirs.end(); ++it) + TQTextStream subdirsstream( &subdirsfile ); + for (TQStringList::const_iterator it = topdirs.begin(); it != topdirs.end(); ++it) subdirsstream << *it << endl; subdirsfile.close(); } } - QMap replaceMap; + TQMap replaceMap; replaceMap.insert( "SUBDIRS", subdirToRemove ); AutoProjectTool::removeFromMakefileam( parent->path + "/Makefile.am", replaceMap ); - QString relmakefile = ( parent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); + TQString relmakefile = ( parent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); kdDebug(9020) << "Relative makefile path: " << relmakefile << endl; // check for config.status - if( !QFileInfo(m_part->buildDirectory(), "config.status").exists() ){ + if( !TQFileInfo(m_part->buildDirectory(), "config.status").exists() ){ return; } - QString cmdline = "cd "; + TQString cmdline = "cd "; cmdline += KProcess::quote(m_part->projectDirectory()); cmdline += " && automake "; cmdline += KProcess::quote(relmakefile); @@ -559,26 +559,26 @@ void AutoSubprojectView::slotRemoveSubproject() void AutoSubprojectView::parsePrimary( SubprojectItem *item, - const QString &lhs, const QString &rhs ) + const TQString &lhs, const TQString &rhs ) { // Parse line foo_bar = bla bla int pos = lhs.findRev( '_' ); - QString prefix = lhs.left( pos ); - QString primary = lhs.right( lhs.length() - pos - 1 ); + TQString prefix = lhs.left( pos ); + TQString primary = lhs.right( lhs.length() - pos - 1 ); // kdDebug(9020) << "Prefix:" << prefix << ",Primary:" << primary << endl; #if 0 - QStrList prefixes; + TQStrList prefixes; prefixes.append( "bin" ); prefixes.append( "pkglib" ); prefixes.append( "pkgdata" ); prefixes.append( "noinst" ); prefixes.append( "check" ); prefixes.append( "sbin" ); - QStrList primaries; + TQStrList primaries; primaries.append( "PROGRAMS" ); primaries.append( "LIBRARIES" ); primaries.append( "LTLIBRARIES" ); @@ -592,31 +592,31 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, // possible prefixes can be extended dynamically (see below) if ( primary == "PROGRAMS" || primary == "LIBRARIES" || primary == "LTLIBRARIES" ) { - QStringList l = QStringList::split( QRegExp( "[ \t\n]" ), rhs ); - QStringList::Iterator it1; + TQStringList l = TQStringList::split( TQRegExp( "[ \t\n]" ), rhs ); + TQStringList::Iterator it1; for ( it1 = l.begin(); it1 != l.end(); ++it1 ) { TargetItem *titem = m_widget->createTargetItem( *it1, prefix, primary ); item->targets.append( titem ); - QString canonname = AutoProjectTool::canonicalize( *it1 ); + TQString canonname = AutoProjectTool::canonicalize( *it1 ); titem->ldflags = AutoProjectPrivate::cleanWhitespace( item->variables[ canonname + "_LDFLAGS" ] ); titem->ldadd = AutoProjectPrivate::cleanWhitespace( item->variables[ canonname + "_LDADD" ] ); titem->libadd = AutoProjectPrivate::cleanWhitespace( item->variables[ canonname + "_LIBADD" ] ); titem->dependencies = AutoProjectPrivate::cleanWhitespace( item->variables[ canonname + "_DEPENDENCIES" ] ); - QString sources = item->variables[ canonname + "_SOURCES" ]; - QStringList sourceList = QStringList::split( QRegExp( "[ \t\n]" ), sources ); - QMap dict; - QStringList::Iterator it = sourceList.begin(); + TQString sources = item->variables[ canonname + "_SOURCES" ]; + TQStringList sourceList = TQStringList::split( TQRegExp( "[ \t\n]" ), sources ); + TQMap dict; + TQStringList::Iterator it = sourceList.begin(); while( it != sourceList.end() ){ dict.insert( *it, true ); ++it; } - QMap::Iterator dictIt = dict.begin(); + TQMap::Iterator dictIt = dict.begin(); while( dictIt != dict.end() ){ - QString fname = dictIt.key(); + TQString fname = dictIt.key(); ++dictIt; FileItem *fitem = m_widget->createFileItem( fname, item ); @@ -643,11 +643,11 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, TargetItem *titem = m_widget->createTargetItem( "", prefix, primary ); item->targets.append( titem ); - QStringList l = QStringList::split( QRegExp( "[ \t]" ), rhs ); - QStringList::Iterator it3; + TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), rhs ); + TQStringList::Iterator it3; for ( it3 = l.begin(); it3 != l.end(); ++it3 ) { - QString fname = *it3; + TQString fname = *it3; FileItem *fitem = m_widget->createFileItem( fname, item ); titem->sources.append( fitem ); @@ -658,8 +658,8 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, } else if ( primary == "JAVA" ) { - QStringList l = QStringList::split( QRegExp( "[ \t\n]" ), rhs ); - QStringList::Iterator it1; + TQStringList l = TQStringList::split( TQRegExp( "[ \t\n]" ), rhs ); + TQStringList::Iterator it1; TargetItem *titem = m_widget->createTargetItem( "", prefix, primary ); item->targets.append( titem ); @@ -673,28 +673,28 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, void AutoSubprojectView::parseKDEDOCS( SubprojectItem *item, - const QString & /*lhs*/, const QString & /*rhs*/ ) + const TQString & /*lhs*/, const TQString & /*rhs*/ ) { // Handle the line KDE_ICON = // (actually, no parsing is involved here) - QString prefix = "kde_docs"; - QString primary = "KDEDOCS"; + TQString prefix = "kde_docs"; + TQString primary = "KDEDOCS"; TargetItem *titem = m_widget->createTargetItem( "", prefix, primary ); item->targets.append( titem ); - QDir d( item->path ); - QStringList l = d.entryList( QDir::Files ); + TQDir d( item->path ); + TQStringList l = d.entryList( TQDir::Files ); - QRegExp re( "Makefile.*|\\..*|.*~|index.cache.bz2" ); + TQRegExp re( "Makefile.*|\\..*|.*~|index.cache.bz2" ); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = l.begin(); it != l.end(); ++it ) { if ( !re.exactMatch( *it ) ) { - QString fname = *it; + TQString fname = *it; FileItem * fitem = m_widget->createFileItem( fname, item ); titem->sources.append( fitem ); } @@ -703,24 +703,24 @@ void AutoSubprojectView::parseKDEDOCS( SubprojectItem *item, void AutoSubprojectView::parseKDEICON( SubprojectItem *item, - const QString &lhs, const QString &rhs ) + const TQString &lhs, const TQString &rhs ) { // Parse a line foo_ICON = bla bla int pos = lhs.find( "_ICON" ); - QString prefix = lhs.left( pos ); + TQString prefix = lhs.left( pos ); if ( prefix == "KDE" ) prefix = "kde_icon"; - QString primary = "KDEICON"; + TQString primary = "KDEICON"; TargetItem *titem = m_widget->createTargetItem( "", prefix, primary ); item->targets.append( titem ); - QDir d( item->path ); - QStringList l = d.entryList( QDir::Files ); + TQDir d( item->path ); + TQStringList l = d.entryList( TQDir::Files ); - QString regexp; + TQString regexp; if ( rhs == "AUTO" ) { @@ -728,13 +728,13 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item, } else { - QStringList appNames = QStringList::split( QRegExp( "[ \t\n]" ), rhs ); + TQStringList appNames = TQStringList::split( TQRegExp( "[ \t\n]" ), rhs ); regexp = ".*(-" + appNames.join( "|-" ) + ")\\.(png|mng|xpm)"; } - QRegExp re( regexp ); + TQRegExp re( regexp ); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = l.begin(); it != l.end(); ++it ) { if ( re.exactMatch( *it ) ) @@ -747,20 +747,20 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item, void AutoSubprojectView::parsePrefix( SubprojectItem *item, - const QString &lhs, const QString &rhs ) + const TQString &lhs, const TQString &rhs ) { // Parse a line foodir = bla bla - QString name = lhs.left( lhs.length() - 3 ); - QString dir = rhs; + TQString name = lhs.left( lhs.length() - 3 ); + TQString dir = rhs; item->prefixes.insert( name, dir ); } void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, - const QString & /*lhs*/, const QString &rhs ) + const TQString & /*lhs*/, const TQString &rhs ) { // Parse a line SUBDIRS = bla bla - QString subdirs = rhs; + TQString subdirs = rhs; kdDebug( 9020 ) << "subdirs are " << subdirs << endl; // Take care of KDE hacks: @@ -768,26 +768,26 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // listed in the subdirs file if ( subdirs.find( "$(TOPSUBDIRS)" ) != -1 ) { - QStringList dirs; - QFile subdirsfile( item->path + "/subdirs" ); + TQStringList dirs; + TQFile subdirsfile( item->path + "/subdirs" ); if( subdirsfile.exists() ) { if ( subdirsfile.open( IO_ReadOnly ) ) { - QTextStream subdirsstream( &subdirsfile ); + TQTextStream subdirsstream( &subdirsfile ); while ( !subdirsstream.atEnd() ) dirs.append( subdirsstream.readLine() ); subdirsfile.close(); } } else { - QDir d( item->path ); - QStringList l = d.entryList( QDir::Dirs ); - for( QStringList::const_iterator it = l.begin(); it != l.end(); ++it ) + TQDir d( item->path ); + TQStringList l = d.entryList( TQDir::Dirs ); + for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it ) { if( (*it) != "CVS" && (*it) != "admin" && (*it) != ".svn" && (*it) != "." && (*it) != ".." ) { - QDir subdir = d; + TQDir subdir = d; subdir.cd( *it, false ); if( subdir.exists( "Makefile.am" ) ) dirs.append( *it ); @@ -795,34 +795,34 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, } } - subdirs.replace( QRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); + subdirs.replace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); } // AUTODIRS is an alias for all subdirectories if ( subdirs.find( "$(AUTODIRS)" ) != -1 ) { - QDir d( item->path ); - QStringList dirs = d.entryList( QDir::Dirs ); + TQDir d( item->path ); + TQStringList dirs = d.entryList( TQDir::Dirs ); dirs.remove( "." ); dirs.remove( ".." ); dirs.remove( "CVS" ); - subdirs.replace( QRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); + subdirs.replace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); } // If there are any variables in the subdirs line then search // the Makefile(.am?) for its definition. Unfortunately, it may be // defined outside this file in which case those dirs won't be added. - QRegExp varre( "\\$\\(\\s*(.*)\\s*\\)" ); + TQRegExp varre( "\\$\\(\\s*(.*)\\s*\\)" ); varre.setMinimal( true ); while ( varre.search( subdirs ) != -1 ) { - QString varname = varre.cap( 1 ); - QString varvalue; + TQString varname = varre.cap( 1 ); + TQString varvalue; // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - QMap::ConstIterator varit = item->variables.find( varname ); + TQMap::ConstIterator varit = item->variables.find( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -832,22 +832,22 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.replace( QRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); + subdirs.replace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); } //search for AC_SUBST variables and try to replace them with variables //that have been already defined e.g. in a "kdevelop hint" - varre = QRegExp( "\\@(.*)\\@" ); + varre = TQRegExp( "\\@(.*)\\@" ); varre.setMinimal( true ); while ( varre.search( subdirs ) != -1 ) { - QString varname = varre.cap( 1 ); - QString varvalue; + TQString varname = varre.cap( 1 ); + TQString varvalue; // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - QMap::ConstIterator varit = item->variables.find( varname ); + TQMap::ConstIterator varit = item->variables.find( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -857,12 +857,12 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.replace( QRegExp( "\\@" + varname + "\\@" ), varvalue ); + subdirs.replace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); } - QStringList l = QStringList::split( QRegExp( "[ \t]" ), subdirs ); + TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), subdirs ); l.sort(); - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = l.begin(); it != l.end(); ++it ) { if ( *it == "." ) @@ -891,7 +891,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, newitem->setOpen( open ); // Move to the bottom of the list - QListViewItem *lastItem = item->firstChild(); + TQListViewItem *lastItem = item->firstChild(); while ( lastItem->nextSibling() ) lastItem = lastItem->nextSibling(); @@ -905,11 +905,11 @@ void AutoSubprojectView::parse( SubprojectItem *item ) headers.clear(); AutoProjectTool::parseMakefileam( item->path + "/Makefile.am", &item->variables ); - QMap::ConstIterator it; + TQMap::ConstIterator it; for ( it = item->variables.begin(); it != item->variables.end(); ++it ) { - QString lhs = it.key(); - QString rhs = it.data(); + TQString lhs = it.key(); + TQString rhs = it.data(); if ( lhs == "KDE_DOCS" ) parseKDEDOCS( item, lhs, rhs ); else if ( lhs.right( 5 ) == "_ICON" ) @@ -925,16 +925,16 @@ void AutoSubprojectView::parse( SubprojectItem *item ) /// @todo only if in a c++ project TargetItem* noinst_HEADERS_item = findNoinstHeaders(item); - QDir dir( item->path ); - QStringList headersList = QStringList::split( QRegExp("[ \t]"), item->variables[ "noinst_HEADERS" ] ); + TQDir dir( item->path ); + TQStringList headersList = TQStringList::split( TQRegExp("[ \t]"), item->variables[ "noinst_HEADERS" ] ); - headersList += dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tcc", QDir::Files ); + headersList += dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tcc", TQDir::Files ); headersList.sort(); - headersList = QStringList::split(QRegExp("[ \t]"), headersList.join( " " )); + headersList = TQStringList::split(TQRegExp("[ \t]"), headersList.join( " " )); - QStringList::Iterator fileIt = headersList.begin(); + TQStringList::Iterator fileIt = headersList.begin(); while( fileIt != headersList.end() ){ - QString fname = *fileIt; + TQString fname = *fileIt; ++fileIt; if( AutoProjectPrivate::isHeader(fname) && !headers.contains(fname) ){ @@ -949,7 +949,7 @@ void AutoSubprojectView::slotForceReeditSubproject( ) SubprojectItem* spitem = dynamic_cast ( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); m_part->startMakeCommand( m_part->buildDirectory() + relpath, "force-reedit" ); } @@ -959,7 +959,7 @@ void AutoSubprojectView::slotInstallSubproject( ) SubprojectItem* spitem = dynamic_cast( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); m_part->startMakeCommand( m_part->buildDirectory() + relpath, "install" ); } @@ -969,7 +969,7 @@ void AutoSubprojectView::slotInstallSuSubproject( ) SubprojectItem* spitem = dynamic_cast( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); m_part->startMakeCommand( m_part->buildDirectory() + relpath, "install", true ); } @@ -977,7 +977,7 @@ void AutoSubprojectView::slotInstallSuSubproject( ) TargetItem * AutoSubprojectView::findNoinstHeaders( SubprojectItem *item ) { TargetItem* noinst_HEADERS_item = 0; - QPtrListIterator itemIt( item->targets ); + TQPtrListIterator itemIt( item->targets ); while( itemIt.current() ){ TargetItem* titem = itemIt.current(); ++itemIt; @@ -1001,12 +1001,12 @@ void AutoSubprojectView::slotCleanSubproject( ) SubprojectItem* spitem = dynamic_cast( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); m_part->startMakeCommand( m_part->buildDirectory() + relpath, "clean" ); } -void AutoSubprojectView::focusOutEvent( QFocusEvent */* e*/ ) +void AutoSubprojectView::focusOutEvent( TQFocusEvent */* e*/ ) { m_widget->setLastFocusedView(AutoProjectWidget::SubprojectView); } @@ -1015,15 +1015,15 @@ void AutoSubprojectView::slotManageBuildCommands( ) { KConfig *config = m_part->instance()->config(); //menu item name <-> command - QMap customBuildCommands = config->entryMap("CustomCommands"); + TQMap customBuildCommands = config->entryMap("CustomCommands"); KDialogBase dlg(KDialogBase::Plain, i18n("Manage Custom Commands"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok); dlg.plainPage()->setMargin(0); - (new QVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true); + (new TQVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true); ManageCustomCommand *widget = new ManageCustomCommand(dlg.plainPage()); - for (QMap::const_iterator it = customBuildCommands.constBegin(); + for (TQMap::const_iterator it = customBuildCommands.constBegin(); it != customBuildCommands.constEnd(); ++it) { widget->commandsTable->insertRows(widget->commandsTable->numRows()); @@ -1031,13 +1031,13 @@ void AutoSubprojectView::slotManageBuildCommands( ) widget->commandsTable->setText(widget->commandsTable->numRows() - 1, 0, it.key()); widget->commandsTable->setText(widget->commandsTable->numRows() - 1, 1, it.data().section(":::", 0, 0)); - static_cast(widget->commandsTable-> + static_cast(widget->commandsTable-> item(widget->commandsTable->numRows() - 1, 2))-> setCurrentItem(it.data().section(":::", 1, 1).toInt()); } widget->commandsTable->setFocus(); - if (dlg.exec() == QDialog::Accepted) + if (dlg.exec() == TQDialog::Accepted) { config->deleteGroup("CustomCommands"); config->setGroup("CustomCommands"); @@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( ) { config->writeEntry(widget->commandsTable->text(i, 0), widget->commandsTable->text(i, 1)+":::"+ - QString("%1").arg(static_cast(widget-> + TQString("%1").arg(static_cast(widget-> commandsTable->item(i, 2))->currentItem())); } config->sync(); @@ -1055,13 +1055,13 @@ void AutoSubprojectView::slotManageBuildCommands( ) void AutoSubprojectView::slotCustomBuildCommand(int val) { - QString cmd = m_commandList[val].section(":::", 0, 0); + TQString cmd = m_commandList[val].section(":::", 0, 0); int type = m_commandList[val].section(":::", 1, 1).toInt(); SubprojectItem* spitem = dynamic_cast( m_listView->selectedItem() ); if ( !spitem ) return; - QString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); + TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); switch (type) { case 0: //make target @@ -1099,7 +1099,7 @@ void AutoSubprojectView::slotCollapseTree() expandCollapseFirst( m_listView->currentItem(), false ); } -void AutoSubprojectView::expandCollapseFirst( QListViewItem * item, bool expand ) +void AutoSubprojectView::expandCollapseFirst( TQListViewItem * item, bool expand ) { if ( !item ) return; @@ -1118,7 +1118,7 @@ void AutoSubprojectView::expandCollapseFirst( QListViewItem * item, bool expand } } -void AutoSubprojectView::expandCollapse( QListViewItem * item, bool expand ) +void AutoSubprojectView::expandCollapse( TQListViewItem * item, bool expand ) { if ( !item ) return; diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index e49caddd..81c772dc 100644 --- a/buildtools/autotools/autosubprojectview.h +++ b/buildtools/autotools/autosubprojectview.h @@ -16,7 +16,7 @@ #ifndef AUTOSUBPROJECTVIEW_H #define AUTOSUBPROJECTVIEW_H -#include +#include #include "autoprojectviewbase.h" @@ -31,23 +31,23 @@ class KListView; namespace AutoProjectPrivate { - bool isHeader( const QString& fileName ); + bool isHeader( const TQString& fileName ); } //with protected inheritance gcc 3.2.3 complains in autoprojectwidget.cpp, line 116 -//that it cannot access the base class QObject (for the connect() call), +//that it cannot access the base class TQObject (for the connect() call), //so in order to be able to compile this file I made the inheritance public again, Alex class AutoSubprojectView : public AutoProjectViewBase { Q_OBJECT public: - AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, QWidget *parent, const char *name ); + AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); virtual ~AutoSubprojectView(); public: - void loadMakefileams ( const QString& dir ); + void loadMakefileams ( const TQString& dir ); void parse( SubprojectItem *item ); KListView* listView() const @@ -58,29 +58,29 @@ public: TargetItem *findNoinstHeaders( SubprojectItem *item ); signals: - void selectionChanged( QListViewItem* ); + void selectionChanged( TQListViewItem* ); protected: void initActions (); void parseKDEDOCS( SubprojectItem *item, - const QString &lhs, const QString &rhs ); + const TQString &lhs, const TQString &rhs ); void parseKDEICON( SubprojectItem *item, - const QString &lhs, const QString &rhs ); + const TQString &lhs, const TQString &rhs ); void parsePrimary( SubprojectItem *item, - const QString &lhs, const QString &rhs ); + const TQString &lhs, const TQString &rhs ); void parsePrefix( SubprojectItem *item, - const QString &lhs, const QString &rhs ); + const TQString &lhs, const TQString &rhs ); void parseSUBDIRS( SubprojectItem *item, - const QString &lhs, const QString &rhs ); - virtual void focusOutEvent( QFocusEvent *e ); - void expandCollapse( QListViewItem * item, bool expand ); - void expandCollapseFirst( QListViewItem * item, bool expand ); + const TQString &lhs, const TQString &rhs ); + virtual void focusOutEvent( TQFocusEvent *e ); + void expandCollapse( TQListViewItem * item, bool expand ); + void expandCollapseFirst( TQListViewItem * item, bool expand ); private: AutoProjectWidget* m_widget; AutoProjectPart* m_part; - QStringList headers; + TQStringList headers; bool m_kdeMode; @@ -100,13 +100,13 @@ private: KAction* expandAction; KAction* collapseAction; - QStringList m_commandList; - QValueList m_commandTypeList; + TQStringList m_commandList; + TQValueList m_commandTypeList; private slots: - void slotContextMenu( KListView *, QListViewItem *item, const QPoint &p ); - //void slotSubprojectExecuted(QListViewItem* item); - void slotSelectionChanged( QListViewItem* item ); + void slotContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + //void slotSubprojectExecuted(TQListViewItem* item); + void slotSelectionChanged( TQListViewItem* item ); void slotAddApplication(); void slotSubprojectOptions(); void slotAddSubproject(); diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index 63b38762..b5191b37 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -13,9 +13,9 @@ */ #include "autotoolsaction.h" -#include -#include -#include +#include +#include +#include #include #include #include @@ -24,79 +24,79 @@ AutoToolsAction::~AutoToolsAction() { } -AutoToolsAction::AutoToolsAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, +AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ) : KAction( text, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QIconSet& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, +AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ) : KAction( text, pix, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QString& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, +AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ) : KAction( text, pix, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const KGuiItem& item, const KShortcut & cut, - const QObject* receiver, const char* slot, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ) : KAction( item, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const KShortcut& cut, - QObject* parent, const char* name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, + TQObject* parent, const char* name ) : KAction( text, cut, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, - QObject* parent, const char* name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, + TQObject* parent, const char* name ) : KAction( text, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QIconSet& pix, - const KShortcut& cut, QObject* parent, const char* name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, + const KShortcut& cut, TQObject* parent, const char* name ) : KAction( text, pix, cut, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QString& pix, - const KShortcut& cut, QObject* parent, const char* name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, + const KShortcut& cut, TQObject* parent, const char* name ) : KAction( text, pix, cut, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QIconSet& pix, - const KShortcut& cut, const QObject* receiver, - const char* slot, QObject* parent, const char * name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, + const KShortcut& cut, const TQObject* receiver, + const char* slot, TQObject* parent, const char * name ) : KAction( text, pix, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const QString& text, const QString& pix, - const KShortcut & cut, const QObject* receiver, - const char* slot, QObject* parent, const char * name ) +AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, + const KShortcut & cut, const TQObject* receiver, + const char* slot, TQObject* parent, const char * name ) : KAction( text, pix, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( QObject * parent, const char * name ) +AutoToolsAction::AutoToolsAction( TQObject * parent, const char * name ) : KAction( parent, name ) { } -int AutoToolsAction::plug( QWidget* w, int index ) +int AutoToolsAction::plug( TQWidget* w, int index ) { if ( !w ) { kdWarning(129) << "KAction::plug called with 0 argument\n"; @@ -107,10 +107,10 @@ int AutoToolsAction::plug( QWidget* w, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( ::qt_cast( w ) ) + if ( ::qt_cast( w ) ) { - QToolButton* tb = static_cast( w ); - connect( tb, SIGNAL( clicked() ), this, SLOT( activate() ) ); + TQToolButton* tb = static_cast( w ); + connect( tb, TQT_SIGNAL( clicked() ), this, TQT_SLOT( activate() ) ); int id = getToolButtonID(); if ( !icon().isEmpty() ) @@ -123,14 +123,14 @@ int AutoToolsAction::plug( QWidget* w, int index ) if ( !whatsThis().isEmpty() ) { - QWhatsThis::remove( tb ); - QWhatsThis::add( tb, whatsThisWithIcon() ); + TQWhatsThis::remove( tb ); + TQWhatsThis::add( tb, whatsThisWithIcon() ); } if ( !toolTip().isEmpty() ) { - QToolTip::remove( tb ); - QToolTip::add( tb, toolTip() ); + TQToolTip::remove( tb ); + TQToolTip::add( tb, toolTip() ); } addContainer( tb, id ); @@ -143,10 +143,10 @@ int AutoToolsAction::plug( QWidget* w, int index ) void AutoToolsAction::updateEnabled( int i ) { - QWidget* w = container( i ); + TQWidget* w = container( i ); - if ( ::qt_cast( w ) ) - static_cast( w )->setEnabled( isEnabled() ); + if ( ::qt_cast( w ) ) + static_cast( w )->setEnabled( isEnabled() ); else KAction::updateEnabled( i ) ; } diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h index 97c8e79e..52f32f26 100644 --- a/buildtools/autotools/autotoolsaction.h +++ b/buildtools/autotools/autotoolsaction.h @@ -30,37 +30,37 @@ class AutoToolsAction : public KAction public: virtual ~AutoToolsAction(); - AutoToolsAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, + AutoToolsAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ); - AutoToolsAction( const QString& text, const QIconSet& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, + AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ); - AutoToolsAction( const QString& text, const QString& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, + AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ); AutoToolsAction( const KGuiItem& item, const KShortcut& cut, - const QObject* receiver, const char* slot, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name ); - AutoToolsAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0, const char* name = 0 ); - AutoToolsAction( const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); - AutoToolsAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(), - QObject* parent = 0, const char* name = 0 ); - AutoToolsAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(), - QObject* parent = 0, const char* name = 0 ); - AutoToolsAction( const QString& text, const QIconSet& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); - AutoToolsAction( const QString& text, const QString& pix, const KShortcut& cut, - const QObject* receiver, const char* slot, QObject* parent, + AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), + TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), + TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - AutoToolsAction( QObject* parent = 0, const char* name = 0 ); + AutoToolsAction( TQObject* parent = 0, const char* name = 0 ); - virtual int plug( QWidget *widget, int index = -1 ); + virtual int plug( TQWidget *widget, int index = -1 ); virtual void updateEnabled( int i ); }; diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index b35c5c75..4ffc326b 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -16,15 +16,15 @@ #include "choosetargetdialog.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -50,15 +50,15 @@ class ChooseTargetDialog::Private public: AutoProjectWidget* widget; AutoProjectPart* part; - QStringList fileList; - QPtrList subprojectList; + TQStringList fileList; + TQPtrList subprojectList; SubprojectItem* chosenSubproject; TargetItem* chosenTarget; ChooseTargetDlgBase* baseUI; }; ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectPart* part, - QStringList fileList, QWidget* parent, const char* name ) + TQStringList fileList, TQWidget* parent, const char* name ) : KDialogBase( parent, name, false, i18n("Automake Manager - Choose Target"), Ok | Cancel, KDialogBase::Ok, true /* seperator */ ) @@ -76,22 +76,22 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP d->baseUI->subprojectComboBox->setAutoCompletion( true ); d->baseUI->targetComboBox->setAutoCompletion( true ); d->baseUI->newFileList->header()->hide(); - d->baseUI->newFileList->addColumn( QString::null ); + d->baseUI->newFileList->addColumn( TQString::null ); d->baseUI->newFileList->setSorting(-1); setIcon ( SmallIcon ( "target_kdevelop" ) ); - QPtrListIterator sit(d->subprojectList); + TQPtrListIterator sit(d->subprojectList); for ( ; (*sit); ++sit ) { - QPtrList targetList = (*sit)->targets; - QPtrListIterator targetIt(targetList); + TQPtrList targetList = (*sit)->targets; + TQPtrListIterator targetIt(targetList); // Only insert Subproject which have a "regular" target for ( ; (*targetIt); ++targetIt ) { - QString titemPrimary = (*targetIt)->primary; + TQString titemPrimary = (*targetIt)->primary; if ( titemPrimary == "PROGRAMS" || titemPrimary == "LIBRARIES" || titemPrimary == "LTLIBRARIES" || titemPrimary == "JAVA" ) { @@ -123,8 +123,8 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP slotSubprojectChanged ( d->baseUI->subprojectComboBox->text(0) ); } - QStringList::iterator it; - QString fileName; + TQStringList::iterator it; + TQString fileName; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -135,13 +135,13 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP fileName = ( *it ); - d->baseUI->newFileList->insertItem( new QListViewItem( d->baseUI->newFileList, fileName ) ); + d->baseUI->newFileList->insertItem( new TQListViewItem( d->baseUI->newFileList, fileName ) ); } - connect ( d->baseUI->subprojectComboBox, SIGNAL ( activated ( const QString& ) ), - this, SLOT( slotSubprojectChanged ( const QString& ) ) ); - connect ( d->baseUI->targetComboBox, SIGNAL ( activated ( const QString& ) ), - this, SLOT( slotTargetChanged ( const QString& ) ) ); + connect ( d->baseUI->subprojectComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), + this, TQT_SLOT( slotSubprojectChanged ( const TQString& ) ) ); + connect ( d->baseUI->targetComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), + this, TQT_SLOT( slotTargetChanged ( const TQString& ) ) ); } @@ -149,7 +149,7 @@ ChooseTargetDialog::~ChooseTargetDialog() { } -void ChooseTargetDialog::slotSubprojectChanged ( const QString& name ) +void ChooseTargetDialog::slotSubprojectChanged ( const TQString& name ) { d->chosenTarget = 0; SubprojectItem* spitem = d->subprojectList.first(); @@ -158,7 +158,7 @@ void ChooseTargetDialog::slotSubprojectChanged ( const QString& name ) { if ( spitem->subdir == name ) { - QPtrList targetList = spitem->targets; + TQPtrList targetList = spitem->targets; TargetItem* titem = targetList.first(); d->baseUI->targetComboBox->clear(); @@ -206,12 +206,12 @@ void ChooseTargetDialog::slotSubprojectChanged ( const QString& name ) } } -void ChooseTargetDialog::slotTargetChanged( const QString& name ) +void ChooseTargetDialog::slotTargetChanged( const TQString& name ) { d->baseUI->chosenTargetLabel->setText( ( d->chosenSubproject->path + "/" + name + "" ) .mid( d->part->projectDirectory().length() + 1 ) ); - QPtrList targetList = d->chosenSubproject->targets; + TQPtrList targetList = d->chosenSubproject->targets; TargetItem* titem = targetList.first(); for ( ; titem; titem = targetList.next() ) @@ -238,9 +238,9 @@ void ChooseTargetDialog::slotOk() //kdDebug ( 9020 ) << "3) Chosen target is " << d->chosenTarget->name << endl; - QStringList newFileList; - QStringList::iterator it; - QString directory, fileName; + TQStringList newFileList; + TQStringList::iterator it; + TQString directory, fileName; for ( it = d->fileList.begin(); it != d->fileList.end(); ++it ) { @@ -282,10 +282,10 @@ void ChooseTargetDialog::slotOk() noinst_HEADERS_item->sources.append( fitem ); noinst_HEADERS_item->insertItem( fitem ); - QString varname = "noinst_HEADERS"; + TQString varname = "noinst_HEADERS"; d->chosenSubproject->variables[ varname ] += ( " " + fileName ); - QMap replaceMap; + TQMap replaceMap; replaceMap.insert( varname, d->chosenSubproject->variables[ varname ] ); AutoProjectTool::addToMakefileam( d->chosenSubproject->path + "/Makefile.am", replaceMap ); @@ -296,11 +296,11 @@ void ChooseTargetDialog::slotOk() d->chosenTarget->sources.append( fitem ); d->chosenTarget->insertItem( fitem ); - QString canontargetname = AutoProjectTool::canonicalize( d->chosenTarget->name ); - QString varname = canontargetname + "_SOURCES"; + TQString canontargetname = AutoProjectTool::canonicalize( d->chosenTarget->name ); + TQString varname = canontargetname + "_SOURCES"; d->chosenSubproject->variables[ varname ] += ( " " + fileName ); - QMap replaceMap; + TQMap replaceMap; replaceMap.insert( varname, d->chosenSubproject->variables[ varname ] ); AutoProjectTool::addToMakefileam( d->chosenSubproject->path + "/Makefile.am", replaceMap ); diff --git a/buildtools/autotools/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h index 44825ce5..0d431b4d 100644 --- a/buildtools/autotools/choosetargetdialog.h +++ b/buildtools/autotools/choosetargetdialog.h @@ -31,7 +31,7 @@ class ChooseTargetDialog : public KDialogBase Q_OBJECT public: ChooseTargetDialog( AutoProjectWidget* widget, AutoProjectPart* part, - QStringList fileList, QWidget* parent = 0, + TQStringList fileList, TQWidget* parent = 0, const char* name = 0 ); ~ChooseTargetDialog(); @@ -42,8 +42,8 @@ public: bool alwaysUseActiveTarget() const; public slots: - void slotSubprojectChanged ( const QString& ); - void slotTargetChanged ( const QString& ); + void slotSubprojectChanged ( const TQString& ); + void slotTargetChanged ( const TQString& ); protected: virtual void slotOk(); diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index 7e2db214..0be8903b 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -11,15 +11,15 @@ #include "configureoptionswidget.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -37,10 +37,10 @@ class ServiceComboBox { public: - static void insertStringList(QComboBox *combo, const QValueList &list, - QStringList *names, QStringList *execs) + static void insertStringList(TQComboBox *combo, const TQValueList &list, + TQStringList *names, TQStringList *execs) { - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { combo->insertItem((*it)->comment()); (*names) << (*it)->desktopEntryName(); @@ -48,15 +48,15 @@ public: kdDebug(9020) << "insertStringList item " << (*it)->name() << "," << (*it)->exec() << endl; } } - static QString currentText(QComboBox *combo, const QStringList &names) + static TQString currentText(TQComboBox *combo, const TQStringList &names) { if (combo->currentItem() == -1) - return QString::null; + return TQString::null; return names[combo->currentItem()]; } - static void setCurrentText(QComboBox *combo, const QString &str, const QStringList &names) + static void setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -69,14 +69,14 @@ public: }; -ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, QWidget *parent, const char *name) +ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *parent, const char *name) : ConfigureOptionsWidgetBase(parent, name) { - config_combo->setValidator(new QRegExpValidator(QRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); m_part = part; env_groupBox->setColumnLayout( 1, Qt::Vertical ); - QDomDocument &dom = *part->projectDom(); + TQDomDocument &dom = *part->projectDom(); m_environmentVariablesWidget = new EnvironmentVariablesWidget(dom, "/kdevautoproject/general/envvars", env_groupBox); coffers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'C'"); @@ -98,7 +98,7 @@ ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, QWidget *p config_combo->insertStringList(allConfigs); dirty = false; - currentConfig = QString::null; + currentConfig = TQString::null; configChanged(part->currentBuildConfig()); fixLayout(); @@ -132,14 +132,14 @@ void ConfigureOptionsWidget::fixLayout() } -void ConfigureOptionsWidget::readSettings(const QString &config) +void ConfigureOptionsWidget::readSettings(const TQString &config) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevautoproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevautoproject/configurations/" + config + "/"; kdDebug(9020) << "Reading config from " << prefix << endl; configargs_edit->setText(DomUtil::readEntry(dom, prefix + "configargs")); - QString builddir = DomUtil::readEntry(dom, prefix + "builddir"); + TQString builddir = DomUtil::readEntry(dom, prefix + "builddir"); if (builddir.isEmpty() && config != "default") builddir = config; builddir_edit->setText(builddir); @@ -149,13 +149,13 @@ void ConfigureOptionsWidget::readSettings(const QString &config) cppflags_edit->setText(DomUtil::readEntry(dom, prefix + "cppflags")); ldflags_edit->setText(DomUtil::readEntry(dom, prefix + "ldflags")); - QString ccompiler = DomUtil::readEntry(dom, prefix + "ccompiler"); - QString cxxcompiler = DomUtil::readEntry(dom, prefix + "cxxcompiler"); - QString f77compiler = DomUtil::readEntry(dom, prefix + "f77compiler"); + TQString ccompiler = DomUtil::readEntry(dom, prefix + "ccompiler"); + TQString cxxcompiler = DomUtil::readEntry(dom, prefix + "cxxcompiler"); + TQString f77compiler = DomUtil::readEntry(dom, prefix + "f77compiler"); if (ccompiler.isEmpty()) { kdDebug(9020) << "No c compiler set" << endl; - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = coffers.begin(); it != coffers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { kdDebug(9020) << "Found default " << (*it)->name() << endl; @@ -166,7 +166,7 @@ void ConfigureOptionsWidget::readSettings(const QString &config) } if (cxxcompiler.isEmpty()) { kdDebug(9020) << "No cxx compiler set" << endl; - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = cxxoffers.begin(); it != cxxoffers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { kdDebug(9020) << "Found default " << (*it)->name() << endl; @@ -177,7 +177,7 @@ void ConfigureOptionsWidget::readSettings(const QString &config) } if (f77compiler.isEmpty()) { kdDebug(9020) << "No c compiler set" << endl; - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = f77offers.begin(); it != f77offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { kdDebug(9020) << "Found default " << (*it)->name() << endl; @@ -203,11 +203,11 @@ void ConfigureOptionsWidget::readSettings(const QString &config) } -void ConfigureOptionsWidget::saveSettings(const QString &config) +void ConfigureOptionsWidget::saveSettings(const TQString &config) { m_environmentVariablesWidget->accept(); - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevautoproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevautoproject/configurations/" + config + "/"; kdDebug(9020) << "Saving config under " << prefix << endl; DomUtil::writeEntry(dom, prefix + "configargs", configargs_edit->text()); @@ -217,8 +217,8 @@ void ConfigureOptionsWidget::saveSettings(const QString &config) DomUtil::writeEntry(dom, prefix + "cppflags", cppflags_edit->text()); DomUtil::writeEntry(dom, prefix + "ldflags", ldflags_edit->text()); - QFileInfo fi(m_part->buildDirectory()); - QDir dir(fi.dir()); + TQFileInfo fi(m_part->buildDirectory()); + TQDir dir(fi.dir()); dir.mkdir(fi.fileName()); DomUtil::writeEntry(dom, prefix + "ccompiler", @@ -236,8 +236,8 @@ void ConfigureOptionsWidget::saveSettings(const QString &config) DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text()); DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text()); - if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), QString::null, i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) - QTimer::singleShot(0, m_part, SLOT(slotConfigure())); + if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString::null, i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) + TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure())); } @@ -251,7 +251,7 @@ void ConfigureOptionsWidget::setDirty() void ConfigureOptionsWidget::builddirClicked() { - QString dir = builddir_edit->text(); + TQString dir = builddir_edit->text(); dir = KFileDialog::getExistingDirectory(dir, this); if (!dir.isNull()) builddir_edit->setText(dir); @@ -259,13 +259,13 @@ void ConfigureOptionsWidget::builddirClicked() void ConfigureOptionsWidget::topsourcedirClicked() { - QString dir = topsourcedir_edit->text(); + TQString dir = topsourcedir_edit->text(); dir = KFileDialog::getExistingDirectory(dir, this); if (!dir.isNull()) topsourcedir_edit->setText(dir); } -void ConfigureOptionsWidget::configComboTextChanged(const QString &config) +void ConfigureOptionsWidget::configComboTextChanged(const TQString &config) { bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); bool canRemove = allConfigs.contains(config) && config != "default"; @@ -274,7 +274,7 @@ void ConfigureOptionsWidget::configComboTextChanged(const QString &config) } -void ConfigureOptionsWidget::configChanged(const QString &config) +void ConfigureOptionsWidget::configChanged(const TQString &config) { if (config == currentConfig || !allConfigs.contains(config)) return; @@ -294,7 +294,7 @@ void ConfigureOptionsWidget::configChanged(const QString &config) void ConfigureOptionsWidget::configAdded() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); allConfigs.append(config); @@ -307,24 +307,24 @@ void ConfigureOptionsWidget::configAdded() void ConfigureOptionsWidget::configRemoved() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); - QDomDocument dom = *m_part->projectDom(); - QDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); + TQDomDocument dom = *m_part->projectDom(); + TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = QString::null; + currentConfig = TQString::null; configChanged("default"); } void ConfigureOptionsWidget::cserviceChanged() { - QString exec = ServiceComboBox::currentText(cservice_combo, cservice_execs); + TQString exec = ServiceComboBox::currentText(cservice_combo, cservice_execs); cbinary_edit->setText(exec); kdDebug(9020) << "exec: " << exec << endl; } @@ -332,14 +332,14 @@ void ConfigureOptionsWidget::cserviceChanged() void ConfigureOptionsWidget::cxxserviceChanged() { - QString exec = ServiceComboBox::currentText(cxxservice_combo, cxxservice_execs); + TQString exec = ServiceComboBox::currentText(cxxservice_combo, cxxservice_execs); cxxbinary_edit->setText(exec); } void ConfigureOptionsWidget::f77serviceChanged() { - QString exec = ServiceComboBox::currentText(f77service_combo, f77service_execs); + TQString exec = ServiceComboBox::currentText(f77service_combo, f77service_execs); f77binary_edit->setText(exec); kdDebug(9020) << "exec: " << exec << endl; } @@ -347,11 +347,11 @@ void ConfigureOptionsWidget::f77serviceChanged() void ConfigureOptionsWidget::cflagsClicked() { - QString name = ServiceComboBox::currentText(cservice_combo, cservice_names); + TQString name = ServiceComboBox::currentText(cservice_combo, cservice_names); KDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, cflags_edit->text()); + TQString flags = plugin->exec(this, cflags_edit->text()); cflags_edit->setText(flags); delete plugin; } @@ -360,11 +360,11 @@ void ConfigureOptionsWidget::cflagsClicked() void ConfigureOptionsWidget::cxxflagsClicked() { - QString name = ServiceComboBox::currentText(cxxservice_combo, cxxservice_names); + TQString name = ServiceComboBox::currentText(cxxservice_combo, cxxservice_names); KDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, cxxflags_edit->text()); + TQString flags = plugin->exec(this, cxxflags_edit->text()); cxxflags_edit->setText(flags); delete plugin; } @@ -373,18 +373,18 @@ void ConfigureOptionsWidget::cxxflagsClicked() void ConfigureOptionsWidget::f77flagsClicked() { - QString name = ServiceComboBox::currentText(f77service_combo, f77service_names); + TQString name = ServiceComboBox::currentText(f77service_combo, f77service_names); KDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, f77flags_edit->text()); + TQString flags = plugin->exec(this, f77flags_edit->text()); f77flags_edit->setText(flags); delete plugin; } } -KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const QString &name) +KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -392,20 +392,20 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const QString return 0; } - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) { - QString errorMessage = KLibLoader::self()->lastErrorMessage(); + TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); exit(1); } - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(this, service->name().latin1(), + TQObject *obj = factory->create(this, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index a973ce7d..9272b3f2 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -27,7 +27,7 @@ class ConfigureOptionsWidget : public ConfigureOptionsWidgetBase Q_OBJECT public: - ConfigureOptionsWidget( AutoProjectPart *part, QWidget *parent = 0, const char *name = 0 ); + ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); ~ConfigureOptionsWidget(); public slots: @@ -37,8 +37,8 @@ private: virtual void builddirClicked(); virtual void topsourcedirClicked(); virtual void setDirty(); - virtual void configChanged( const QString &config ); - virtual void configComboTextChanged( const QString &config ); + virtual void configChanged( const TQString &config ); + virtual void configComboTextChanged( const TQString &config ); virtual void configAdded(); virtual void configRemoved(); virtual void cflagsClicked(); @@ -49,16 +49,16 @@ private: virtual void f77serviceChanged(); void fixLayout(); - void readSettings( const QString &config ); - void saveSettings( const QString &config ); + void readSettings( const TQString &config ); + void saveSettings( const TQString &config ); - KDevCompilerOptions *createCompilerOptions( const QString &lang ); + KDevCompilerOptions *createCompilerOptions( const TQString &lang ); KTrader::OfferList coffers, cxxoffers, f77offers; - QStringList cservice_names, cservice_execs; - QStringList cxxservice_names, cxxservice_execs; - QStringList f77service_names, f77service_execs; - QStringList allConfigs; - QString currentConfig; + TQStringList cservice_names, cservice_execs; + TQStringList cxxservice_names, cxxservice_execs; + TQStringList f77service_names, f77service_execs; + TQStringList allConfigs; + TQString currentConfig; bool dirty; AutoProjectPart *m_part; diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 65b87bf7..2235f357 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -14,13 +14,13 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -48,12 +48,12 @@ #include "kfilednddetailview.h" #include "kfiledndiconview.h" -KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, QWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name ) +KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name ) { } -KFileView* KDnDDirOperator::createView( QWidget* parent, KFile::FileView view ) +KFileView* KDnDDirOperator::createView( TQWidget* parent, KFile::FileView view ) { KFileView* new_view = 0L; @@ -69,36 +69,36 @@ KFileView* KDnDDirOperator::createView( QWidget* parent, KFile::FileView view ) } -FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, QWidget* parent, const char* name ) : QWidget(parent, name) +FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* parent, const char* name ) : TQWidget(parent, name) { m_part = part; // widgets and layout - QVBoxLayout* lo = new QVBoxLayout(this); + TQVBoxLayout* lo = new TQVBoxLayout(this); - QHBox *hlow = new QHBox (this); + TQHBox *hlow = new TQHBox (this); lo->addWidget(hlow); - home = new QPushButton( hlow ); + home = new TQPushButton( hlow ); home->setPixmap(SmallIcon("gohome")); - QToolTip::add(home, i18n("Home directory")); - up = new QPushButton( /*i18n("&Up"),*/ hlow ); + TQToolTip::add(home, i18n("Home directory")); + up = new TQPushButton( /*i18n("&Up"),*/ hlow ); up->setPixmap(SmallIcon("up")); - QToolTip::add(up, i18n("Up one level")); - back = new QPushButton( /*i18n("&Back"),*/ hlow ); + TQToolTip::add(up, i18n("Up one level")); + back = new TQPushButton( /*i18n("&Back"),*/ hlow ); back->setPixmap(SmallIcon("back")); - QToolTip::add(back, i18n("Previous directory")); - forward = new QPushButton( /*i18n("&Next"),*/ hlow ); + TQToolTip::add(back, i18n("Previous directory")); + forward = new TQPushButton( /*i18n("&Next"),*/ hlow ); forward->setPixmap(SmallIcon("forward")); - QToolTip::add(forward, i18n("Next directory")); + TQToolTip::add(forward, i18n("Next directory")); // HACK - QWidget* spacer = new QWidget(hlow); + TQWidget* spacer = new TQWidget(hlow); hlow->setStretchFactor(spacer, 1); hlow->setMaximumHeight(up->height()); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); @@ -110,45 +110,45 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, lo->addWidget(dir); lo->setStretchFactor(dir, 2); - QHBox* filterBox = new QHBox(this); - filterIcon = new QLabel(filterBox); + TQHBox* filterBox = new TQHBox(this); + filterIcon = new TQLabel(filterBox); filterIcon->setPixmap( BarIcon("filter") ); filter = new KHistoryCombo(filterBox, "filter"); - filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); lo->addWidget(filterBox); // slots and signals - connect( filter, SIGNAL( textChanged(const QString&) ), SLOT( slotFilterChanged(const QString&) ) ); - connect( filter, SIGNAL( activated(const QString&) ), SLOT( slotFilterChanged(const QString&) ) ); - connect( filter, SIGNAL( returnPressed(const QString&) ), SLOT( filterReturnPressed(const QString&) ) ); + connect( filter, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotFilterChanged(const TQString&) ) ); + connect( filter, TQT_SIGNAL( activated(const TQString&) ), TQT_SLOT( slotFilterChanged(const TQString&) ) ); + connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), TQT_SLOT( filterReturnPressed(const TQString&) ) ); - connect( home, SIGNAL( clicked() ), dir, SLOT( home() ) ); - connect( up, SIGNAL( clicked() ), dir, SLOT( cdUp() ) ); - connect( back, SIGNAL( clicked() ), dir, SLOT( back() ) ); - connect( forward, SIGNAL( clicked() ), dir, SLOT( forward() ) ); + connect( home, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( home() ) ); + connect( up, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( cdUp() ) ); + connect( back, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( back() ) ); + connect( forward, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( forward() ) ); - connect( cmbPath, SIGNAL( urlActivated( const KURL& )), this, SLOT( cmbPathActivated( const KURL& ) )); - //connect( cmbPath, SIGNAL( returnPressed( const QString& )), this, SLOT( cmbPathReturnPressed( const QString& ) )); - connect( dir, SIGNAL(urlEntered(const KURL&)), this, SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), this, TQT_SLOT( cmbPathActivated( const KURL& ) )); + //connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect( dir, TQT_SIGNAL(urlEntered(const KURL&)), this, TQT_SLOT(dirUrlEntered(const KURL&)) ); - connect( dir, SIGNAL(finishedLoading()), this, SLOT(dirFinishedLoading()) ); + connect( dir, TQT_SIGNAL(finishedLoading()), this, TQT_SLOT(dirFinishedLoading()) ); // dirUrlEntered( dir->url() ); - QStringList list; + TQStringList list; /* read the file patterns from the project DOM */ - QDomElement docEl = m_part->projectDom()->documentElement(); - QDomElement fileviewEl = docEl.namedItem("kdevfileview").toElement(); - QDomElement groupsEl = fileviewEl.namedItem("groups").toElement(); - QDomElement groupEl = groupsEl.firstChild().toElement(); + TQDomElement docEl = m_part->projectDom()->documentElement(); + TQDomElement fileviewEl = docEl.namedItem("kdevfileview").toElement(); + TQDomElement groupsEl = fileviewEl.namedItem("groups").toElement(); + TQDomElement groupEl = groupsEl.firstChild().toElement(); while ( !groupEl.isNull() ) { if (groupEl.tagName() == "group") { - list << groupEl.attribute("pattern").replace ( QRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; + list << groupEl.attribute("pattern").replace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; } groupEl = groupEl.nextSibling().toElement(); } @@ -162,27 +162,27 @@ FileSelectorWidget::~FileSelectorWidget() { } -void FileSelectorWidget::dragEnterEvent ( QDragEnterEvent* /*ev*/ ) +void FileSelectorWidget::dragEnterEvent ( TQDragEnterEvent* /*ev*/ ) { } -void FileSelectorWidget::dropEvent ( QDropEvent* /*ev*/ ) +void FileSelectorWidget::dropEvent ( TQDropEvent* /*ev*/ ) { kdDebug ( 9020 ) << "Dropped" << endl; - QString path = "Something was dropped in the Destination directory file-selector"; + TQString path = "Something was dropped in the Destination directory file-selector"; emit dropped ( path ); } -void FileSelectorWidget::filterReturnPressed ( const QString& nf ) +void FileSelectorWidget::filterReturnPressed ( const TQString& nf ) { // KURL u ( m_part->project()->projectDirectory() ); setDir ( nf ); } -void FileSelectorWidget::slotFilterChanged( const QString & nf ) +void FileSelectorWidget::slotFilterChanged( const TQString & nf ) { dir->setNameFilter( nf ); dir->updateDir(); @@ -193,7 +193,7 @@ void FileSelectorWidget::cmbPathActivated( const KURL& u ) dir->setURL( u, true ); } -void FileSelectorWidget::cmbPathReturnPressed( const QString& u ) +void FileSelectorWidget::cmbPathReturnPressed( const TQString& u ) { dir->setFocus(); dir->setURL( KURL(u), true ); @@ -203,7 +203,7 @@ void FileSelectorWidget::cmbPathReturnPressed( const QString& u ) void FileSelectorWidget::dirUrlEntered( const KURL& u ) { cmbPath->removeURL( u ); - QStringList urls = cmbPath->urls(); + TQStringList urls = cmbPath->urls(); urls.prepend( u.url() ); while ( urls.count() >= (uint)cmbPath->maxItems() ) urls.remove( urls.last() ); @@ -222,7 +222,7 @@ void FileSelectorWidget::dirFinishedLoading() } -void FileSelectorWidget::focusInEvent(QFocusEvent*) +void FileSelectorWidget::focusInEvent(TQFocusEvent*) { dir->setFocus(); } @@ -232,7 +232,7 @@ void FileSelectorWidget::setDir( KURL u ) dir->setURL(u, true); } -void FileSelectorWidget::setDir(const QString& path) +void FileSelectorWidget::setDir(const TQString& path) { KURL u ( path ); dir->setURL ( u, true ); diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index 7a981194..636cec87 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -12,16 +12,16 @@ #ifndef _FILESELECTORWIDGET_H_ #define _FILESELECTORWIDGET_H_ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include @@ -42,10 +42,10 @@ class KDnDDirOperator : public KDirOperator Q_OBJECT public: - KDnDDirOperator ( const KURL& urlName = KURL(), QWidget *parent = 0, const char* name = 0 ); + KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *parent = 0, const char* name = 0 ); protected: - virtual KFileView* createView( QWidget* parent, KFile::FileView view ); + virtual KFileView* createView( TQWidget* parent, KFile::FileView view ); }; class FileSelectorWidget : public QWidget @@ -53,7 +53,7 @@ class FileSelectorWidget : public QWidget Q_OBJECT public: - FileSelectorWidget( AutoProjectPart* part, KFile::Mode, QWidget* parent = 0, const char* name = 0 ); + FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* parent = 0, const char* name = 0 ); ~FileSelectorWidget(); KDnDDirOperator * dirOperator() @@ -62,32 +62,32 @@ public: } public slots: - void slotFilterChanged( const QString& ); + void slotFilterChanged( const TQString& ); void setDir( KURL ); - void setDir( const QString& ); + void setDir( const TQString& ); private slots: void cmbPathActivated( const KURL& u ); - void cmbPathReturnPressed( const QString& u ); + void cmbPathReturnPressed( const TQString& u ); void dirUrlEntered( const KURL& u ); void dirFinishedLoading(); - void filterReturnPressed( const QString& nf ); + void filterReturnPressed( const TQString& nf ); protected: - void focusInEvent( QFocusEvent* ); - void dragEnterEvent ( QDragEnterEvent* ev ); - void dropEvent ( QDropEvent* ev ); + void focusInEvent( TQFocusEvent* ); + void dragEnterEvent ( TQDragEnterEvent* ev ); + void dropEvent ( TQDropEvent* ev ); private: KURLComboBox *cmbPath; KHistoryCombo * filter; - QLabel* filterIcon; + TQLabel* filterIcon; KDnDDirOperator * dir; - QPushButton *home, *up, *back, *forward; + TQPushButton *home, *up, *back, *forward; AutoProjectPart* m_part; signals: - void dropped ( const QString& ); + void dropped ( const TQString& ); }; diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp index c75022fb..098d975f 100644 --- a/buildtools/autotools/kfilednddetailview.cpp +++ b/buildtools/autotools/kfilednddetailview.cpp @@ -17,8 +17,8 @@ ////////////////////////////////////////////////////// // Qt specific includes -#include -#include +#include +#include ////////////////////////////////////////////////////// // KDE specific includes #include @@ -33,7 +33,7 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDDetailView::KFileDnDDetailView(QWidget *parent, const char *name ) +KFileDnDDetailView::KFileDnDDetailView(TQWidget *parent, const char *name ) : KFileDetailView(parent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) @@ -46,14 +46,14 @@ KFileDnDDetailView::KFileDnDDetailView(QWidget *parent, const char *name ) KFileDnDDetailView::~KFileDnDDetailView(){ } //----------------------------------------------- -void KFileDnDDetailView::readConfig( KConfig* config, const QString& group ) { +void KFileDnDDetailView::readConfig( KConfig* config, const TQString& group ) { KConfigGroupSaver cs( config, group ); bool dnd = config->readBoolEntry("DragAndDrop", true ); setDnDEnabled( dnd ); KFileDetailView::readConfig( config, group ); } //----------------------------------------------- -void KFileDnDDetailView::writeConfig( KConfig* config, const QString& group ) { +void KFileDnDDetailView::writeConfig( KConfig* config, const TQString& group ) { KConfigGroupSaver cs( config, group ); config->writeEntry("DragAndDrop", m_dndEnabled ); KFileDetailView::writeConfig( config, group ); @@ -78,7 +78,7 @@ void KFileDnDDetailView::slotOpenFolder(){ } } //----------------------------------------------- -void KFileDnDDetailView::contentsDragEnterEvent( QDragEnterEvent *e ) { +void KFileDnDDetailView::contentsDragEnterEvent( TQDragEnterEvent *e ) { kdDebug (9020) << "KFileDnDDetailView::contentsDragEnterEvent" << endl; @@ -87,14 +87,14 @@ void KFileDnDDetailView::contentsDragEnterEvent( QDragEnterEvent *e ) { return; } e->acceptAction(); - QListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); + TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); if ( i && m_useAutoOpenTimer ) { m_dropItem = i; m_autoOpenTimer.start( m_autoOpenTime ); } } //----------------------------------------------- -void KFileDnDDetailView::contentsDragMoveEvent( QDragMoveEvent *e ) { +void KFileDnDDetailView::contentsDragMoveEvent( TQDragMoveEvent *e ) { kdDebug (9020) << "KFileDnDDetailView::contentsDragMoveEvent" << endl; @@ -103,7 +103,7 @@ void KFileDnDDetailView::contentsDragMoveEvent( QDragMoveEvent *e ) { return; } e->acceptAction(); - QListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); + TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); if( ! m_useAutoOpenTimer ) return; if ( i ) { @@ -117,7 +117,7 @@ void KFileDnDDetailView::contentsDragMoveEvent( QDragMoveEvent *e ) { m_autoOpenTimer.stop(); } //----------------------------------------------- -void KFileDnDDetailView::contentsDragLeaveEvent( QDragLeaveEvent* ) { +void KFileDnDDetailView::contentsDragLeaveEvent( TQDragLeaveEvent* ) { kdDebug (9020) << "KFileDnDDetailView::contentsDragLeaveEvent" << endl; @@ -127,7 +127,7 @@ void KFileDnDDetailView::contentsDragLeaveEvent( QDragLeaveEvent* ) { } } //----------------------------------------------- -void KFileDnDDetailView::contentsDropEvent( QDropEvent* e ) { +void KFileDnDDetailView::contentsDropEvent( TQDropEvent* e ) { kdDebug (9020) << "KFileDndDetailView::contentsDropEvent" << endl; @@ -158,13 +158,13 @@ void KFileDnDDetailView::startDrag(){ for ( ; it.current(); ++it ){ urls.append( (*it)->url() ); } - QPixmap pixmap; + TQPixmap pixmap; if( urls.count() > 1 ){ pixmap = DesktopIcon( "kmultiple", 16 ); } if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( 16 ); - QPoint hotspot; + TQPoint hotspot; hotspot.setX( pixmap.width() / 2 ); hotspot.setY( pixmap.height() / 2 ); m_dragObject = KURLDrag::newDrag( urls, widget() ); @@ -172,15 +172,15 @@ void KFileDnDDetailView::startDrag(){ m_dragObject->drag(); // start the drag } //----------------------------------------------- -QDragObject* KFileDnDDetailView::dragObject() const { +TQDragObject* KFileDnDDetailView::dragObject() const { return m_dragObject; } //----------------------------------------------- -bool KFileDnDDetailView::acceptDrag(QDropEvent* e ) const { +bool KFileDnDDetailView::acceptDrag(TQDropEvent* e ) const { return KURLDrag::canDecode( e ) && - ( e->action() == QDropEvent::Copy - || e->action() == QDropEvent::Move - || e->action() == QDropEvent::Link ); + ( e->action() == TQDropEvent::Copy + || e->action() == TQDropEvent::Move + || e->action() == TQDropEvent::Link ); } //----------------------------------------------- void KFileDnDDetailView::setAutoOpenTime( const int& time ){ @@ -191,9 +191,9 @@ void KFileDnDDetailView::setAutoOpenTime( const int& time ){ void KFileDnDDetailView::useAutoOpenTimer( bool use ){ m_useAutoOpenTimer = use; if( use ) - connect( &m_autoOpenTimer, SIGNAL( timeout() ),this, SLOT( slotOpenFolder() ) ); + connect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); else { - disconnect( &m_autoOpenTimer, SIGNAL( timeout() ),this, SLOT( slotOpenFolder() ) ); + disconnect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); m_dropItem = 0L; m_autoOpenTimer.stop(); } diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/kfilednddetailview.h index ecb232c6..0cf13f7e 100644 --- a/buildtools/autotools/kfilednddetailview.h +++ b/buildtools/autotools/kfilednddetailview.h @@ -20,8 +20,8 @@ ////////////////////////////////////////////////////////////////////// // Qt specific include files -#include -#include +#include +#include ////////////////////////////////////////////////////////////////////// // KDE specific include files #include @@ -42,7 +42,7 @@ class KFileDnDDetailView : public KFileDetailView Q_OBJECT public: /** */ - KFileDnDDetailView( QWidget *parent = 0, const char *name = 0 ); + KFileDnDDetailView( TQWidget *parent = 0, const char *name = 0 ); /** */ virtual ~KFileDnDDetailView(); /** @@ -78,20 +78,20 @@ public: return m_useAutoOpenTimer; } /** */ - virtual void readConfig( KConfig*, const QString& group = QString::null ); + virtual void readConfig( KConfig*, const TQString& group = TQString::null ); /** */ - virtual void writeConfig( KConfig*, const QString& group = QString::null ); + virtual void writeConfig( KConfig*, const TQString& group = TQString::null ); signals: // Signals /** * Emitted whenever an decodable item is dropped in the view. - * Note: The @ref QDropEvent contains a @ref KURLDrag object. + * Note: The @ref TQDropEvent contains a @ref KURLDrag object. */ - void dropped( QDropEvent* ); + void dropped( TQDropEvent* ); /** * Emitted whenever an decodable item is dropped in the view - * Note: The @ref QDropEvent contains a @ref KURLDrag object. + * Note: The @ref TQDropEvent contains a @ref KURLDrag object. */ - void dropped( KFileView*, QDropEvent* ); + void dropped( KFileView*, TQDropEvent* ); /** * Emitted whenever an decodable item is dropped in the view. *@param urls contains a list of all dropped @ref KURL @@ -104,13 +104,13 @@ protected slots: // Protected slots void slotOpenFolder(); protected: //Protected Methods /** */ - virtual void contentsDragEnterEvent( QDragEnterEvent *e ); + virtual void contentsDragEnterEvent( TQDragEnterEvent *e ); /** */ - virtual void contentsDragMoveEvent( QDragMoveEvent *e ); + virtual void contentsDragMoveEvent( TQDragMoveEvent *e ); /** */ - virtual void contentsDragLeaveEvent( QDragLeaveEvent *e ); + virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e ); /** */ - virtual void contentsDropEvent( QDropEvent* e ); + virtual void contentsDropEvent( TQDropEvent* e ); /** * Create dragobject encoding the current selection and starts the drag */ @@ -118,16 +118,16 @@ protected: //Protected Methods /** * @returns the dragObject */ - virtual QDragObject* dragObject() const; + virtual TQDragObject* dragObject() const; /** * @returns true if we can decode the drag and support the action */ - virtual bool acceptDrag( QDropEvent* event ) const; + virtual bool acceptDrag( TQDropEvent* event ) const; protected: // Private attributes - QTimer m_autoOpenTimer; + TQTimer m_autoOpenTimer; int m_autoOpenTime; bool m_useAutoOpenTimer; - QListViewItem* m_dropItem; + TQListViewItem* m_dropItem; KURLDrag* m_dragObject; bool m_dndEnabled; }; diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp index 47bb32a9..1a491c62 100644 --- a/buildtools/autotools/kfiledndiconview.cpp +++ b/buildtools/autotools/kfiledndiconview.cpp @@ -17,8 +17,8 @@ ////////////////////////////////////////////////////// // Qt specific includes -#include -#include +#include +#include ////////////////////////////////////////////////////// // KDE specific includes #include @@ -33,7 +33,7 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDIconView::KFileDnDIconView( QWidget *parent, const char *name ) +KFileDnDIconView::KFileDnDIconView( TQWidget *parent, const char *name ) : KFileIconView(parent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) @@ -46,14 +46,14 @@ KFileDnDIconView::KFileDnDIconView( QWidget *parent, const char *name ) KFileDnDIconView::~KFileDnDIconView(){ } //----------------------------------------------- -void KFileDnDIconView::readConfig( KConfig* config, const QString& group ) { +void KFileDnDIconView::readConfig( KConfig* config, const TQString& group ) { KConfigGroupSaver cs( config, group ); bool dnd = config->readBoolEntry("EnableDND", true ); setDnDEnabled( dnd ); KFileIconView::readConfig( config, group ); } //----------------------------------------------- -void KFileDnDIconView::writeConfig( KConfig* config, const QString& group ) { +void KFileDnDIconView::writeConfig( KConfig* config, const TQString& group ) { KConfigGroupSaver cs( config, group ); config->writeEntry("EnableDND", m_dndEnabled ); KFileIconView::writeConfig( config, group ); @@ -78,26 +78,26 @@ void KFileDnDIconView::slotOpenFolder(){ } } //----------------------------------------------- -void KFileDnDIconView::contentsDragEnterEvent( QDragEnterEvent *e ) { +void KFileDnDIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) { if ( ! acceptDrag( e ) ) { // can we decode this ? e->accept( false ); // No return; } e->acceptAction(); // Yes - QIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); if ( i && m_useAutoOpenTimer) { // are we over an item ? m_dropItem = i; // set new m_dropItem m_autoOpenTimer.start( m_autoOpenTime ); // restart timer } } //----------------------------------------------- -void KFileDnDIconView::contentsDragMoveEvent( QDragMoveEvent *e ) { +void KFileDnDIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) { if ( ! acceptDrag( e ) ) { // can we decode this ? e->accept( false ); // No return; } e->acceptAction(); // Yes - QIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); if( ! m_useAutoOpenTimer ) return; if ( i ) { // are we over an item ? @@ -111,14 +111,14 @@ void KFileDnDIconView::contentsDragMoveEvent( QDragMoveEvent *e ) { m_autoOpenTimer.stop(); // stop timer } //----------------------------------------------- -void KFileDnDIconView::contentsDragLeaveEvent( QDragLeaveEvent* ) { +void KFileDnDIconView::contentsDragLeaveEvent( TQDragLeaveEvent* ) { if( m_useAutoOpenTimer ) { m_autoOpenTimer.stop(); m_dropItem = 0L; } } //----------------------------------------------- -void KFileDnDIconView::contentsDropEvent( QDropEvent* e ) { +void KFileDnDIconView::contentsDropEvent( TQDropEvent* e ) { if( m_useAutoOpenTimer ) { m_autoOpenTimer.stop(); m_dropItem = 0L; @@ -140,22 +140,22 @@ void KFileDnDIconView::startDrag(){ dragObject()->dragCopy(); // start the drag } //----------------------------------------------- -QDragObject* KFileDnDIconView::dragObject() { +TQDragObject* KFileDnDIconView::dragObject() { // create a list of the URL:s that we want to drag KURL::List urls; KFileItemListIterator it( * KFileView::selectedItems() ); for ( ; it.current(); ++it ){ urls.append( (*it)->url() ); } - QPixmap pixmap; + TQPixmap pixmap; if( urls.count() > 1 ) pixmap = DesktopIcon( "kmultiple", iconSize() ); if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( iconSize() ); - QPoint hotspot; + TQPoint hotspot; hotspot.setX( pixmap.width() / 2 ); hotspot.setY( pixmap.height() / 2 ); - QDragObject* myDragObject = KURLDrag::newDrag( urls, widget() ); + TQDragObject* myDragObject = KURLDrag::newDrag( urls, widget() ); myDragObject->setPixmap( pixmap, hotspot ); return myDragObject; } @@ -168,9 +168,9 @@ void KFileDnDIconView::setAutoOpenTime( const int& time ){ void KFileDnDIconView::useAutoOpenTimer( bool use ){ m_useAutoOpenTimer = use; if ( use ) - connect( &m_autoOpenTimer, SIGNAL( timeout() ),this, SLOT( slotOpenFolder() ) ); + connect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); else { - disconnect( &m_autoOpenTimer, SIGNAL( timeout() ),this, SLOT( slotOpenFolder() ) ); + disconnect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); m_dropItem = 0L; m_autoOpenTimer.stop(); } @@ -182,11 +182,11 @@ void KFileDnDIconView::setDnDEnabled( bool useDnD ){ viewport()->setAcceptDrops( useDnD ); } //----------------------------------------------- -bool KFileDnDIconView::acceptDrag(QDropEvent* e ) const { +bool KFileDnDIconView::acceptDrag(TQDropEvent* e ) const { return KURLDrag::canDecode( e ) && - ( e->action() == QDropEvent::Copy - || e->action() == QDropEvent::Move - || e->action() == QDropEvent::Link ); + ( e->action() == TQDropEvent::Copy + || e->action() == TQDropEvent::Move + || e->action() == TQDropEvent::Link ); } //----------------------------------------------- #ifndef NO_INCLUDE_MOCFILES diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/kfiledndiconview.h index 65edd91a..e2b3402e 100644 --- a/buildtools/autotools/kfiledndiconview.h +++ b/buildtools/autotools/kfiledndiconview.h @@ -18,8 +18,8 @@ #ifndef KFILEDNDICONVIEW_H #define KFILEDNDICONVIEW_H -#include -#include +#include +#include #include #include @@ -37,7 +37,7 @@ class KFileDnDIconView : public KFileIconView Q_OBJECT public: // Public methods - KFileDnDIconView( QWidget *parent = 0, const char *name = 0 ); + KFileDnDIconView( TQWidget *parent = 0, const char *name = 0 ); virtual ~KFileDnDIconView(); /** @@ -77,15 +77,15 @@ public: // Public methods return m_useAutoOpenTimer; } - virtual void readConfig( KConfig*, const QString& group = QString::null ); - virtual void writeConfig( KConfig*, const QString& group = QString::null ); + virtual void readConfig( KConfig*, const TQString& group = TQString::null ); + virtual void writeConfig( KConfig*, const TQString& group = TQString::null ); signals: /** * Emitted whenever an decodable item is dropped in the view. - * Note: The @ref QDropEvent contains a @ref KURLDrag object. + * Note: The @ref TQDropEvent contains a @ref KURLDrag object. */ - void dropped( QDropEvent* ); + void dropped( TQDropEvent* ); protected slots: /** @@ -94,16 +94,16 @@ protected slots: void slotOpenFolder(); protected: - virtual void contentsDragEnterEvent( QDragEnterEvent *e ); - virtual void contentsDragMoveEvent( QDragMoveEvent *e ); - virtual void contentsDragLeaveEvent( QDragLeaveEvent *e ); - virtual void contentsDropEvent( QDropEvent* e ); + virtual void contentsDragEnterEvent( TQDragEnterEvent *e ); + virtual void contentsDragMoveEvent( TQDragMoveEvent *e ); + virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e ); + virtual void contentsDropEvent( TQDropEvent* e ); /** - * Creates a @ref QDragObject containing all urls of the selected @ref KFileItem of the view, + * Creates a @ref TQDragObject containing all urls of the selected @ref KFileItem of the view, * @returns the @ref QDragObject */ - virtual QDragObject* dragObject(); + virtual TQDragObject* dragObject(); /** *Creates the drag item and starts the drag @@ -113,14 +113,14 @@ protected: /** *@returns true if we can decode the drag and support the action */ - virtual bool acceptDrag( QDropEvent* event ) const; + virtual bool acceptDrag( TQDropEvent* event ) const; protected: - QTimer m_autoOpenTimer; + TQTimer m_autoOpenTimer; int m_autoOpenTime; bool m_useAutoOpenTimer; - QIconViewItem* m_dropItem; + TQIconViewItem* m_dropItem; bool m_dndEnabled; }; #endif diff --git a/buildtools/autotools/kimporticonview.cpp b/buildtools/autotools/kimporticonview.cpp index 9b64d3ee..3634886a 100644 --- a/buildtools/autotools/kimporticonview.cpp +++ b/buildtools/autotools/kimporticonview.cpp @@ -14,10 +14,10 @@ * * ***************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -26,7 +26,7 @@ #include "kimporticonview.h" -KImportIconView::KImportIconView(const QString& strIntro, QWidget *parent, const char *name) +KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *parent, const char *name) : KFileDnDIconView(parent, name) { m_strIntro = strIntro; @@ -40,22 +40,22 @@ KImportIconView::~KImportIconView() { } -void KImportIconView::drawContents ( QPainter *p, int cx, int cy, int cw, int ch ) +void KImportIconView::drawContents ( TQPainter *p, int cx, int cy, int cw, int ch ) { if ( !m_bDropped) { - QIconView::drawContents ( p, cx, cy, cw, ch ); + TQIconView::drawContents ( p, cx, cy, cw, ch ); p->save(); - QFont font ( p->font() ); + TQFont font ( p->font() ); font.setBold ( true ); font.setFamily ( "Helvetica [Adobe]" ); font.setPointSize ( 10 ); p->setFont ( font ); - p->setPen ( QPen ( KGlobalSettings::highlightColor() ) ); + p->setPen ( TQPen ( KGlobalSettings::highlightColor() ) ); - QRect rect = frameRect(); - QFontMetrics fm ( p->font() ); + TQRect rect = frameRect(); + TQFontMetrics fm ( p->font() ); rect.setLeft ( rect.left() + 30 ); rect.setRight ( rect.right() - 30 ); @@ -65,8 +65,8 @@ void KImportIconView::drawContents ( QPainter *p, int cx, int cy, int cw, int ch KWordWrap* wordWrap1 = KWordWrap::formatText( fm, rect, AlignHCenter | WordBreak, m_strIntro ); KWordWrap* wordWrap2 = KWordWrap::formatText( fm, rect, AlignHCenter | WordBreak, i18n("Or just use the buttons.") ); - QRect introRect1 = wordWrap1->boundingRect(); - QRect introRect2 = wordWrap2->boundingRect(); + TQRect introRect1 = wordWrap1->boundingRect(); + TQRect introRect2 = wordWrap2->boundingRect(); wordWrap1->drawText ( p, ( ( frameRect().right() - introRect1.right() ) / 2 ), ( ( frameRect().bottom() - introRect1.bottom() ) / 2 ) - 20, AlignHCenter | AlignVCenter ); wordWrap2->drawText ( p, ( ( frameRect().right() - introRect2.right() ) / 2 ), ( ( frameRect().bottom() - introRect2.bottom() ) / 2 ) + introRect1.bottom(), AlignHCenter | AlignVCenter ); @@ -75,7 +75,7 @@ void KImportIconView::drawContents ( QPainter *p, int cx, int cy, int cw, int ch } else { - QIconView::drawContents ( p, cx, cy, cw, ch ); + TQIconView::drawContents ( p, cx, cy, cw, ch ); } } diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index 100fc33e..3cfd5745 100644 --- a/buildtools/autotools/kimporticonview.h +++ b/buildtools/autotools/kimporticonview.h @@ -17,7 +17,7 @@ #ifndef KIMPORTICONVIEW_H #define KIMPORTICONVIEW_H -#include +#include #include "kfiledndiconview.h" @@ -26,16 +26,16 @@ class KImportIconView : public KFileDnDIconView Q_OBJECT public: - KImportIconView( const QString& strIntro, QWidget *parent, const char *name ); + KImportIconView( const TQString& strIntro, TQWidget *parent, const char *name ); virtual ~KImportIconView(); void somethingDropped ( bool dropped ); protected: - void drawContents ( QPainter *p, int cx, int cy, int cw, int ch ); + void drawContents ( TQPainter *p, int cx, int cy, int cw, int ch ); private: - QString m_strIntro; + TQString m_strIntro; bool m_bDropped; }; diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp index 03ad5277..db30508d 100644 --- a/buildtools/autotools/makefilehandler.cpp +++ b/buildtools/autotools/makefilehandler.cpp @@ -12,12 +12,12 @@ *************************************************************************** */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -26,13 +26,13 @@ #include "makefilehandler.h" -typedef QValueList ASTList; +typedef TQValueList ASTList; class MakefileHandler::Private { public: - QMap projects; - QMap folderToFileMap; + TQMap projects; + TQMap folderToFileMap; }; MakefileHandler::MakefileHandler() @@ -45,23 +45,23 @@ MakefileHandler::~MakefileHandler() delete d; } -void MakefileHandler::parse( const QString& folder, bool recursive ) +void MakefileHandler::parse( const TQString& folder, bool recursive ) { //look for either Makefile.am.in, Makefile.am, or Makefile.in, in that order AutoTools::ProjectAST* ast; int ret = -1; - QString filePath = folder + "/Makefile.am.in"; - if ( QFile::exists( filePath ) ) + TQString filePath = folder + "/Makefile.am.in"; + if ( TQFile::exists( filePath ) ) ret = AutoTools::Driver::parseFile( filePath, &ast ); else { filePath = folder + "/Makefile.am"; - if ( QFile::exists( filePath ) ) + if ( TQFile::exists( filePath ) ) ret = AutoTools::Driver::parseFile( filePath, &ast ); else { filePath = folder + "/Makefile.in"; - if ( QFile::exists( filePath ) ) + if ( TQFile::exists( filePath ) ) ret = AutoTools::Driver::parseFile( filePath, &ast ); else kdDebug(9020) << k_funcinfo << "no appropriate file to parse in " @@ -81,8 +81,8 @@ void MakefileHandler::parse( const QString& folder, bool recursive ) if ( recursive && ast && ast->hasChildren() ) { - QValueList astChildList = ast->children(); - QValueList::iterator it(astChildList.begin()), clEnd(astChildList.end()); + TQValueList astChildList = ast->children(); + TQValueList::iterator it(astChildList.begin()), clEnd(astChildList.end()); for ( ; it != clEnd; ++it ) { if ( (*it)->nodeType() == AutoTools::AST::AssignmentAST ) @@ -90,14 +90,14 @@ void MakefileHandler::parse( const QString& folder, bool recursive ) AutoTools::AssignmentAST* assignment = static_cast( (*it) ); if ( assignment->scopedID == "SUBDIRS" ) { - QString list = assignment->values.join( QString::null ); + TQString list = assignment->values.join( TQString::null ); list.simplifyWhiteSpace(); kdDebug(9020) << k_funcinfo << "subdirs is " << list << endl; - QStringList subdirList = QStringList::split( " ", list ); - QStringList::iterator vit = subdirList.begin(); + TQStringList subdirList = TQStringList::split( " ", list ); + TQStringList::iterator vit = subdirList.begin(); for ( ; vit != subdirList.end(); ++vit ) { - QString realDir = ( *vit ); + TQString realDir = ( *vit ); if ( realDir.startsWith( "\\" ) ) realDir.remove( 0, 1 ); @@ -120,26 +120,26 @@ void MakefileHandler::parse( const QString& folder, bool recursive ) } } -AutoTools::ProjectAST* MakefileHandler::astForFolder( const QString& folderPath ) +AutoTools::ProjectAST* MakefileHandler::astForFolder( const TQString& folderPath ) { if ( d->folderToFileMap.contains( folderPath ) ) { - QString filePath = d->folderToFileMap[folderPath]; + TQString filePath = d->folderToFileMap[folderPath]; return d->projects[filePath]; } else return 0; } -bool MakefileHandler::isVariable( const QString& item ) const +bool MakefileHandler::isVariable( const TQString& item ) const { - if ( item.contains( QRegExp( "(\\$\\([a-zA-Z0-9_-]*\\)|@[a-zA-Z0-9_-]*@)" ) ) ) + if ( item.contains( TQRegExp( "(\\$\\([a-zA-Z0-9_-]*\\)|@[a-zA-Z0-9_-]*@)" ) ) ) return true; else return false; } -QString MakefileHandler::resolveVariable( const QString& variable, AutoTools::ProjectAST* ast ) +TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::ProjectAST* ast ) { if ( !ast ) return variable; @@ -155,8 +155,8 @@ QString MakefileHandler::resolveVariable( const QString& variable, AutoTools::Pr if ( variable.find( assignment->scopedID ) != -1 ) { kdDebug(9020) << k_funcinfo << "Resolving variable '" << variable << "' to '" - << assignment->values.join( QString::null ).stripWhiteSpace() << "'" << endl; - return assignment->values.join( QString::null ).stripWhiteSpace(); + << assignment->values.join( TQString::null ).stripWhiteSpace() << "'" << endl; + return assignment->values.join( TQString::null ).stripWhiteSpace(); } } } diff --git a/buildtools/autotools/makefilehandler.h b/buildtools/autotools/makefilehandler.h index 77045fe9..a104774c 100644 --- a/buildtools/autotools/makefilehandler.h +++ b/buildtools/autotools/makefilehandler.h @@ -40,20 +40,20 @@ public: * \param folder, the folder to parse * \param recursive if true, subfolders will be parsed - defaults to true */ - void parse( const QString& folder, bool recursive = true ); + void parse( const TQString& folder, bool recursive = true ); /** * Get the AST for a certain path * \param folderPath the path of the folder to get an AST for * \return the AST that represents a particular folder */ - AutoTools::ProjectAST* astForFolder( const QString& folderPath ); + AutoTools::ProjectAST* astForFolder( const TQString& folderPath ); /** * Check if a string is an automake variable * \return true if it is an automake variable, false otherwise */ - bool isVariable( const QString& item ) const; + bool isVariable( const TQString& item ) const; /** * Find the value for the variable specified by \p variable @@ -61,7 +61,7 @@ public: * \param ast the AST to use to look for the variable in * \return the value to substitute for the variable */ - QString resolveVariable( const QString& variable, + TQString resolveVariable( const TQString& variable, AutoTools::ProjectAST* ast ); diff --git a/buildtools/autotools/managecustomcommand.cpp b/buildtools/autotools/managecustomcommand.cpp index 31d1d534..a602a3a9 100644 --- a/buildtools/autotools/managecustomcommand.cpp +++ b/buildtools/autotools/managecustomcommand.cpp @@ -18,11 +18,11 @@ ***************************************************************************/ #include "managecustomcommand.h" -#include +#include #include -ManageCustomCommand::ManageCustomCommand(QWidget *parent, const char *name) +ManageCustomCommand::ManageCustomCommand(TQWidget *parent, const char *name) :ManageCustomBuildCommandsBase(parent, name) { } @@ -41,7 +41,7 @@ void ManageCustomCommand::removeButton_clicked() void ManageCustomCommand::setRowProperties(int row) { commandsTable->setItem(row, 2, - new QComboTableItem(commandsTable, QStringList::split(",", + new TQComboTableItem(commandsTable, TQStringList::split(",", i18n("this is a list of items in the combobox", "Make target,Make target (as root),Make command,Make command (as root),Command,Command (as root)")))); } diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h index 12ddeae7..b4e4af49 100644 --- a/buildtools/autotools/managecustomcommand.h +++ b/buildtools/autotools/managecustomcommand.h @@ -25,7 +25,7 @@ class ManageCustomCommand: public ManageCustomBuildCommandsBase { Q_OBJECT public: - ManageCustomCommand( QWidget *parent = 0, const char *name = 0 ); + ManageCustomCommand( TQWidget *parent = 0, const char *name = 0 ); void setRowProperties( int row ); public slots: diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index 97c449e7..e44a32c3 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -24,7 +24,7 @@ #include "kdevcompileroptions.h" -static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject *parent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -34,20 +34,20 @@ static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject } - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) { - QString errorMessage = KLibLoader::self()->lastErrorMessage(); + TQString errorMessage = KLibLoader::self()->lastErrorMessage(); kdDebug(9020) << "There was an error loading the module " << service->name() << endl << "The diagnostics is:" << endl << errorMessage << endl; exit(1); } - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(parent, service->name().latin1(), + TQObject *obj = factory->create(parent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { @@ -59,10 +59,10 @@ static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject return dlg; /* - QStringList args; - QVariant prop = service->property( "X-KDevelop-Args" ); + TQStringList args; + TQVariant prop = service->property( "X-KDevelop-Args" ); if ( prop.isValid() ) - args = QStringList::split( " ", prop.toString() ); + args = TQStringList::split( " ", prop.toString() ); return KParts::ComponentFactory ::createInstanceFromService( service, parent, @@ -70,25 +70,25 @@ static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject } -QString AutoProjectTool::execFlagsDialog( const QString &compiler, const QString &flags, QWidget *parent ) +TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) { KDevCompilerOptions * plugin = createCompilerOptions( compiler, parent ); if ( plugin ) { - QString newflags = plugin->exec( parent, flags ); + TQString newflags = plugin->exec( parent, flags ); delete plugin; return newflags; } - return QString::null; + return TQString::null; } -QString AutoProjectTool::canonicalize( const QString &str ) +TQString AutoProjectTool::canonicalize( const TQString &str ) { - QString res; + TQString res; for ( uint i = 0; i < str.length(); ++i ) - res += ( str[ i ].isLetterOrNumber() || str[ i ] == '@' ) ? str[ i ] : QChar( '_' ); + res += ( str[ i ].isLetterOrNumber() || str[ i ] == '@' ) ? str[ i ] : TQChar( '_' ); kdDebug(9020) << k_funcinfo << "normalized '" << str << "' to '" << res << "'" << endl; return res; @@ -101,26 +101,26 @@ QString AutoProjectTool::canonicalize( const QString &str ) * @param fileName * @param variables */ -void AutoProjectTool::parseMakefileam(const QString &fileName, QMap *variables) +void AutoProjectTool::parseMakefileam(const TQString &fileName, TQMap *variables) { - QFile f(fileName); + TQFile f(fileName); if (!f.open(IO_ReadOnly)) { return ; } - QTextStream stream(&f); + TQTextStream stream(&f); - QRegExp re("^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$"); + TQRegExp re("^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$"); - QString last; + TQString last; bool multiLine = false; while (!stream.atEnd()) { - QString s = stream.readLine().stripWhiteSpace(); + TQString s = stream.readLine().stripWhiteSpace(); if (re.exactMatch(s)) { - QString lhs = re.cap(2); - QString rhs = re.cap(4); + TQString lhs = re.cap(2); + TQString rhs = re.cap(4); if (rhs[ rhs.length() - 1 ] == '\\') { multiLine = true; @@ -130,7 +130,7 @@ void AutoProjectTool::parseMakefileam(const QString &fileName, QMap list; + TQMap list; - for (QMap::iterator iter = variables->begin();iter != variables->end();iter++) + for (TQMap::iterator iter = variables->begin();iter != variables->end();iter++) { - QStringList items = QStringList::split(" ", iter.data()); - QMap unique; + TQStringList items = TQStringList::split(" ", iter.data()); + TQMap unique; for (uint i = 0;i < items.size();i++) { unique.insert(items[i], ""); } - QString line; - for (QMap::iterator it = unique.begin();it != unique.end();it++) + TQString line; + for (TQMap::iterator it = unique.begin();it != unique.end();it++) { line += it.key() + ' '; } @@ -189,7 +189,7 @@ void AutoProjectTool::parseMakefileam(const QString &fileName, QMap variables) +void AutoProjectTool::addToMakefileam(const TQString &fileName, TQMap variables) { AutoProjectTool::addRemoveMakefileam(fileName, variables, true); } @@ -202,42 +202,42 @@ void AutoProjectTool::addToMakefileam(const QString &fileName, QMap variables ) +void AutoProjectTool::setMakefileam ( const TQString &fileName, TQMap variables ) { - for ( QMap::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0 ) + for ( TQMap::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0 ) { kdDebug ( 9020 ) << "key (set): " << it0.key() << "=" << it0.data() << endl; } // input file reading - QFile fin ( fileName ); + TQFile fin ( fileName ); if ( !fin.open ( IO_ReadOnly ) ) { return ; } - QTextStream ins ( &fin ); + TQTextStream ins ( &fin ); // output file writing. - QFile fout ( fileName + "#" ); + TQFile fout ( fileName + "#" ); if ( !fout.open ( IO_WriteOnly ) ) { fin.close(); return ; } - QTextStream outs ( &fout ); + TQTextStream outs ( &fout ); // variables - QRegExp re ( "^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$" ); + TQRegExp re ( "^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$" ); bool multiLine = false; - QString lastLhs; - QMap seenLhs; + TQString lastLhs; + TQMap seenLhs; while ( !fin.atEnd() ) { - QString s = ins.readLine(); + TQString s = ins.readLine(); if ( re.exactMatch ( s ) ) { - QString lhs = re.cap ( 2 ); + TQString lhs = re.cap ( 2 ); bool notFound = ( variables.find ( lhs ) == variables.end() ); if ( notFound ) @@ -254,7 +254,7 @@ void AutoProjectTool::setMakefileam ( const QString &fileName, QMap::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0 ) + for ( TQMap::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0 ) { - QString newLine ( it0.key() ); + TQString newLine ( it0.key() ); newLine += " = "; bool added = false; int len = newLine.length(); - QStringList variableList = QStringList::split ( ' ', it0.data() ); + TQStringList variableList = TQStringList::split ( ' ', it0.data() ); for ( uint count = 0; count < variableList.size(); count++ ) { len += variableList[count].length() + 1; @@ -381,7 +381,7 @@ void AutoProjectTool::setMakefileam ( const QString &fileName, QMap variables, bool add) +void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap variables, bool add) { // input file reading - QFile fin(fileName); + TQFile fin(fileName); if (!fin.open(IO_ReadOnly)) { return ; } - QTextStream ins(&fin); + TQTextStream ins(&fin); // output file writing. - QFile fout(fileName + "#"); + TQFile fout(fileName + "#"); if (!fout.open(IO_WriteOnly)) { fin.close(); return ; } - QTextStream outs(&fout); + TQTextStream outs(&fout); // variables - QRegExp re("^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$"); + TQRegExp re("^(#kdevelop:[ \t]*)?([A-Za-z][@A-Za-z0-9_]*)[ \t]*([:\\+]?=)[ \t]*(.*)$"); // build key=map of values to add // map can be empty.we never add an empty key, but do remove empty keys from the file.. - QDict< QMap > interest; - for (QMap::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0) + TQDict< TQMap > interest; + for (TQMap::Iterator it0 = variables.begin(); it0 != variables.end(); ++it0) { kdDebug(9020) << "key (" << add<<"): " << it0.key() << "="<< it0.data() << endl; - QMap* set = new QMap(); + TQMap* set = new TQMap(); if (!it0.data().stripWhiteSpace().isEmpty()) { - QStringList variableList = QStringList::split(' ', it0.data()); + TQStringList variableList = TQStringList::split(' ', it0.data()); for (uint i = 0; i < variableList.count(); i++) { @@ -437,16 +437,16 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap seenLhs; + TQString lastLhs; + TQStringList lastRhs; + TQMap seenLhs; while (!fin.atEnd()) { - QString s = ins.readLine(); + TQString s = ins.readLine(); if (re.exactMatch(s)) { - QString lhs = re.cap(2); - QMap* ourRhs = interest.find(lhs); + TQString lhs = re.cap(2); + TQMap* ourRhs = interest.find(lhs); if (!ourRhs) { @@ -457,20 +457,20 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap::iterator findEntry = ourRhs->find(bits[index]); + TQMap::iterator findEntry = ourRhs->find(bits[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -489,7 +489,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap keys = ourRhs->keys(); + TQValueList keys = ourRhs->keys(); for (uint count = 0; count < keys.size(); count++) { // if out entry is true, add it.. @@ -536,7 +536,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMapempty()) { // check if any of these values are down to remove. - QString newLine(lhs); + TQString newLine(lhs); if (seenLhs.find(lhs) == seenLhs.end()) { newLine += " = "; @@ -549,9 +549,9 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap::iterator findEntry = ourRhs->find(*posIter); + TQMap::iterator findEntry = ourRhs->find(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -592,13 +592,13 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap* ourRhs = interest.find(lastLhs); + TQMap* ourRhs = interest.find(lastLhs); if (add) { @@ -607,7 +607,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap::iterator findEntry = ourRhs->find(lastRhs[index]); + TQMap::iterator findEntry = ourRhs->find(lastRhs[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -618,7 +618,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap keys = ourRhs->keys(); + TQValueList keys = ourRhs->keys(); for (uint count = 0; count < keys.size(); count++) { // if out entry is true, add it.. @@ -664,7 +664,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMapempty()) { // check if any of these values are down to remove. - QString newLine(lastLhs); + TQString newLine(lastLhs); if (seenLhs.find(lastLhs) == seenLhs.end()) { newLine += " = "; @@ -676,9 +676,9 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap::iterator findEntry = ourRhs->find(*posIter); + TQMap::iterator findEntry = ourRhs->find(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -717,13 +717,13 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap > it(interest); + TQDictIterator > it(interest); for (; it.current(); ++it) { - QString lhs = it.currentKey(); - QMap* ourRhs = it.current(); + TQString lhs = it.currentKey(); + TQMap* ourRhs = it.current(); - QString newLine(lhs); + TQString newLine(lhs); if (seenLhs.find(lhs) == seenLhs.end()) { newLine += " = "; @@ -735,7 +735,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap keys = ourRhs->keys(); + TQValueList keys = ourRhs->keys(); for (uint count = 0; count < keys.size(); count++) { if ((*ourRhs)[keys[count]]) @@ -767,7 +767,7 @@ void AutoProjectTool::addRemoveMakefileam(const QString &fileName, QMap variables) +void AutoProjectTool::removeFromMakefileam(const TQString &fileName, TQMap variables) { AutoProjectTool::addRemoveMakefileam(fileName, variables, false); } @@ -787,35 +787,35 @@ void AutoProjectTool::removeFromMakefileam(const QString &fileName, QMap = 0) { line = line.replace(close.search(line), 1, ""); - list += QStringList::split(" ", line); + list += TQStringList::split(" ", line); break; } else @@ -824,7 +824,7 @@ QStringList AutoProjectTool::configureinLoadMakefiles(QString configureinpath) { line.setLength(line.length() - 1); } - list += QStringList::split(" ", line); + list += TQStringList::split(" ", line); } } else if (ac_regex.search(line) >= 0) @@ -849,7 +849,7 @@ QStringList AutoProjectTool::configureinLoadMakefiles(QString configureinpath) } } - list = QStringList::split(" ", line); + list = TQStringList::split(" ", line); if (!multiLine) { @@ -870,42 +870,42 @@ QStringList AutoProjectTool::configureinLoadMakefiles(QString configureinpath) * @param configureinpath * @param makefiles */ -void AutoProjectTool::configureinSaveMakefiles(QString fileName, QStringList makefiles) +void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList makefiles) { // input file reading - QFile fin(fileName); + TQFile fin(fileName); if (!fin.open(IO_ReadOnly)) { return ; } - QTextStream ins(&fin); + TQTextStream ins(&fin); // output file writing. - QFile fout(fileName + "#"); + TQFile fout(fileName + "#"); if (!fout.open(IO_WriteOnly)) { fin.close(); return ; } - QTextStream outs(&fout); + TQTextStream outs(&fout); // remove duplicates if any.. - QMap toAdd; + TQMap toAdd; for (uint i = 0; i < makefiles.size();i++) { toAdd.insert(makefiles[i].stripWhiteSpace(), ""); } - QString ac_match("^AC_OUTPUT"); - QRegExp ac_regex(ac_match); + TQString ac_match("^AC_OUTPUT"); + TQRegExp ac_regex(ac_match); bool multiLine = false; - QChar cont('\\'); - QRegExp close("\\)"); - QRegExp open("\\("); + TQChar cont('\\'); + TQRegExp close("\\)"); + TQRegExp open("\\("); bool done = false; while (!fin.atEnd()) { - QString line = ins.readLine(); + TQString line = ins.readLine(); if (done) { outs << line << endl; @@ -918,8 +918,8 @@ void AutoProjectTool::configureinSaveMakefiles(QString fileName, QStringList mak if (close.search(line) >= 0) { int len = 10; - QString acline("AC_OUTPUT("); - for (QMap::iterator iter = toAdd.begin();iter != toAdd.end();iter++) + TQString acline("AC_OUTPUT("); + for (TQMap::iterator iter = toAdd.begin();iter != toAdd.end();iter++) { len += iter.key().length(); if (len > 80) @@ -964,8 +964,8 @@ void AutoProjectTool::configureinSaveMakefiles(QString fileName, QStringList mak if (!multiLine) { int len = 10; - QString acline("AC_OUTPUT("); - for (QMap::iterator iter = toAdd.begin();iter != toAdd.end();iter++) + TQString acline("AC_OUTPUT("); + for (TQMap::iterator iter = toAdd.begin();iter != toAdd.end();iter++) { len += iter.key().length(); if (len > 80) @@ -992,7 +992,7 @@ void AutoProjectTool::configureinSaveMakefiles(QString fileName, QStringList mak fin.close(); fout.close(); - QDir().rename(fileName + "#", fileName); + TQDir().rename(fileName + "#", fileName); } diff --git a/buildtools/autotools/misc.h b/buildtools/autotools/misc.h index 9db9919e..2f8a092d 100644 --- a/buildtools/autotools/misc.h +++ b/buildtools/autotools/misc.h @@ -12,9 +12,9 @@ #ifndef _MISC_H_ #define _MISC_H_ -#include -#include -#include +#include +#include +#include /** * Very small helper class. It has just static methods. @@ -27,36 +27,36 @@ public: * Loads the compiler options plugin for the given compiler, executes the dialog * with some initial flags, and returns the new flags. */ - static QString execFlagsDialog( const QString &compiler, const QString &flags, QWidget *parent ); + static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ); /** * Returns the canonicalized version of a file name, i.e. * the file name with special characters replaced by underscores */ - static QString canonicalize( const QString &str ); + static TQString canonicalize( const TQString &str ); /** * Parses a Makefile.am and stores its variable assignments * in a map. */ - static void parseMakefileam( const QString &filename, QMap *variables ); + static void parseMakefileam( const TQString &filename, TQMap *variables ); - static void addToMakefileam( const QString &filename, QMap variables ); - static void removeFromMakefileam( const QString &filename, QMap variables ); - static void setMakefileam ( const QString &fileName, QMap variables ); + static void addToMakefileam( const TQString &filename, TQMap variables ); + static void removeFromMakefileam( const TQString &filename, TQMap variables ); + static void setMakefileam ( const TQString &fileName, TQMap variables ); - static void addRemoveMakefileam(const QString &fileName, QMap variables, bool add); + static void addRemoveMakefileam(const TQString &fileName, TQMap variables, bool add); /** * Parses configure.in and splits AC_OUTPUT into a QStringList */ - static QStringList configureinLoadMakefiles( QString configureinpath ); + static TQStringList configureinLoadMakefiles( TQString configureinpath ); /** - * Receives a QStringList and puts it into + * Receives a TQStringList and puts it into * configure.in as arguments to AC_OUTPUT */ - static void configureinSaveMakefiles( QString configureinpath, QStringList makefiles ); + static void configureinSaveMakefiles( TQString configureinpath, TQStringList makefiles ); }; diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index 2c3bc37f..e265a969 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -11,13 +11,13 @@ #include "removefiledlg.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -31,9 +31,9 @@ #include "autoprojectwidget.h" #include "autodetailsview.h" -static bool fileListContains(const QPtrList &list, const QString &name) +static bool fileListContains(const TQPtrList &list, const TQString &name) { - QPtrListIterator it(list); + TQPtrListIterator it(list); for (; it.current(); ++it) if ((*it)->text(0) == name) return true; @@ -42,29 +42,29 @@ static bool fileListContains(const QPtrList &list, const QString &name RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *item, const QString &filename, - QWidget *parent, const char *name) + TargetItem *item, const TQString &filename, + TQWidget *parent, const char *name) : RemoveFileDlgBase(parent, name, true) { removeFromTargetsCheckBox = 0; - QStringList targets; + TQStringList targets; - QPtrListIterator it(spitem->targets); + TQPtrListIterator it(spitem->targets); for (; it.current(); ++it) if (fileListContains((*it)->sources, filename)) targets.append((*it)->name); if (targets.count() > 1) { - removeFromTargetsCheckBox = new QCheckBox( fileGroupBox, "removeFromTargetsCheckBox" ); - removeFromTargetsCheckBox->setMinimumSize( QSize( 0, 45 ) ); + removeFromTargetsCheckBox = new TQCheckBox( fileGroupBox, "removeFromTargetsCheckBox" ); + removeFromTargetsCheckBox->setMinimumSize( TQSize( 0, 45 ) ); fileLayout->addWidget( removeFromTargetsCheckBox ); - QString joinedtargets = " *" + targets.join("\n *"); + TQString joinedtargets = " *" + targets.join("\n *"); removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n" "Remove it from all of them?").arg(filename).arg(joinedtargets) ); - setMinimumSize(QSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) ); + setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) ); } removeLabel->setText ( i18n ( "Do you really want to remove %1?" ).arg ( filename ) ); @@ -75,8 +75,8 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p else targetLabel->setText ( item->name ); - connect ( removeButton, SIGNAL ( clicked() ), this, SLOT ( accept() ) ); - connect ( cancelButton, SIGNAL ( clicked() ), this, SLOT ( reject() ) ); + connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); + connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); setIcon ( SmallIcon ( "editdelete.png" ) ); @@ -96,29 +96,29 @@ void RemoveFileDialog::accept() { m_widget->emitRemovedFile ( subProject->path.mid ( m_part->projectDirectory().length() + 1 ) + "/" + fileName ); - QMap replaceMap; + TQMap replaceMap; if (removeFromTargetsCheckBox && removeFromTargetsCheckBox->isChecked()) { - QPtrListIterator it(subProject->targets); + TQPtrListIterator it(subProject->targets); for (; it.current(); ++it) { if ((*it) != target && fileListContains((*it)->sources, fileName)) { FileItem *fitem = static_cast((*it)->firstChild()); while (fitem) { FileItem *nextitem = static_cast(fitem->nextSibling()); if (fitem->text(0) == fileName) { - QListView *lv = fitem->listView(); + TQListView *lv = fitem->listView(); lv->setSelected(fitem, false); (*it)->sources.remove(fitem); } fitem = nextitem; } - QString canontargetname = AutoProjectTool::canonicalize((*it)->name); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize((*it)->name); + TQString varname; if( (*it)->primary == "PROGRAMS" || (*it)->primary == "LIBRARIES" || (*it)->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else varname = (*it)->prefix + "_" + (*it)->primary; - QStringList sources = QStringList::split(QRegExp("[ \t\n]"), subProject->variables[varname]); + TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]); sources.remove(fileName); subProject->variables[varname] = sources.join(" "); replaceMap.insert(varname, fileName); @@ -126,11 +126,11 @@ void RemoveFileDialog::accept() } } - QString fileItemName; + TQString fileItemName; FileItem *fitem = static_cast(target->firstChild()); while (fitem) { if (fitem->text(0) == fileName) { - QListView *lv = fitem->listView(); + TQListView *lv = fitem->listView(); lv->setSelected(fitem, false); fileItemName = fitem->name; target->sources.remove(fitem); @@ -138,13 +138,13 @@ void RemoveFileDialog::accept() } fitem = static_cast(fitem->nextSibling()); } - QString canontargetname = AutoProjectTool::canonicalize(target->name); - QString varname; + TQString canontargetname = AutoProjectTool::canonicalize(target->name); + TQString varname; if( target->primary == "PROGRAMS" || target->primary == "LIBRARIES" || target->primary == "LTLIBRARIES" ) varname = canontargetname + "_SOURCES"; else varname = target->prefix + "_" + target->primary; - QStringList sources = QStringList::split(QRegExp("[ \t\n]"), subProject->variables[varname]); + TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]); sources.remove(fileName); subProject->variables[varname] = sources.join(" "); replaceMap.insert(varname, fileName); @@ -152,31 +152,31 @@ void RemoveFileDialog::accept() AutoProjectTool::removeFromMakefileam(subProject->path + "/Makefile.am", replaceMap); // review configuration cleanup in the project file after removing subclassing related source - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); - QDomElement el = dom.documentElement(); - QDomNode el2 = el.namedItem("kdevautoproject"); - QDomNode el3 = el2.namedItem("subclassing"); + TQDomElement el = dom.documentElement(); + TQDomNode el2 = el.namedItem("kdevautoproject"); + TQDomNode el3 = el2.namedItem("subclassing"); - QDomNode n = el3.firstChild(); - QValueList nodesToRemove; + TQDomNode n = el3.firstChild(); + TQValueList nodesToRemove; while ( !n.isNull() ) { - QDomNamedNodeMap attr = n.attributes(); - QString fpath = subProject->path + QString("/") + fileItemName; - QString relpath = fpath.remove(0, m_part->projectDirectory().length()); + TQDomNamedNodeMap attr = n.attributes(); + TQString fpath = subProject->path + TQString("/") + fileItemName; + TQString relpath = fpath.remove(0, m_part->projectDirectory().length()); if ((attr.item(0).nodeValue() == relpath) || (attr.item(1).nodeValue() == relpath) ) nodesToRemove.append(n); n = n.nextSibling(); } - QValueList::iterator it; + TQValueList::iterator it; for ( it = nodesToRemove.begin(); it != nodesToRemove.end(); ++it ) el3.removeChild(*it); if (removeCheckBox->isChecked()) - QFile::remove(subProject->path + "/" + fileName); + TQFile::remove(subProject->path + "/" + fileName); - QDialog::accept(); + TQDialog::accept(); } #include "removefiledlg.moc" diff --git a/buildtools/autotools/removefiledlg.h b/buildtools/autotools/removefiledlg.h index ab843dda..58836da3 100644 --- a/buildtools/autotools/removefiledlg.h +++ b/buildtools/autotools/removefiledlg.h @@ -12,7 +12,7 @@ #ifndef _REMOVEFILEDLG_H_ #define _REMOVEFILEDLG_H_ -#include +#include #include "removefiledlgbase.h" @@ -29,22 +29,22 @@ class RemoveFileDialog : public RemoveFileDlgBase public: RemoveFileDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *item, const QString &filename, - QWidget *parent = 0, const char *name = 0 ); + TargetItem *item, const TQString &filename, + TQWidget *parent = 0, const char *name = 0 ); ~RemoveFileDialog(); protected: virtual void accept(); private: - QCheckBox *removeFromTargetsCheckBox; - //QCheckBox *removefromdisk_box; + TQCheckBox *removeFromTargetsCheckBox; + //TQCheckBox *removefromdisk_box; AutoProjectWidget* m_widget; AutoProjectPart *m_part; SubprojectItem *subProject; TargetItem *target; - QString fileName; + TQString fileName; }; #endif diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index 6104e404..5783900c 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -16,14 +16,14 @@ #include "removetargetdlg.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -42,7 +42,7 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, QWidget* parent, const char* name ) + TargetItem *titem, TQWidget* parent, const char* name ) : RemoveTargetDlgBase ( parent, name, true, 0 ) { removeLabel->setText ( i18n ( "Do you really want to remove %1
with all files that are attached to it
and all dependencies?" ).arg ( titem->name ) ); @@ -53,8 +53,8 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPa else targetLabel->setText ( titem->name ); - connect ( removeButton, SIGNAL ( clicked() ), this, SLOT ( accept() ) ); - connect ( cancelButton, SIGNAL ( clicked() ), this, SLOT ( reject() ) ); + connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); + connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); setIcon ( SmallIcon ( "editdelete" ) ); @@ -77,7 +77,7 @@ RemoveTargetDialog::~RemoveTargetDialog() void RemoveTargetDialog::init() { - QPtrList subprojectItems = m_widget->allSubprojectItems(); + TQPtrList subprojectItems = m_widget->allSubprojectItems(); TargetItem* titem = 0; @@ -94,7 +94,7 @@ void RemoveTargetDialog::init() if ( titem->primary == "LTLIBRARIES" || titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES" || titem->primary == "JAVA" ) { - QString canonname = AutoProjectTool::canonicalize ( titem->name ); + TQString canonname = AutoProjectTool::canonicalize ( titem->name ); if ( spitem->variables[canonname + "_LIBADD"].contains ( m_titem->name ) > 0 || spitem->variables[canonname + "_LDADD"].contains ( m_titem->name ) > 0 ) @@ -118,36 +118,36 @@ void RemoveTargetDialog::accept () qApp->processEvents(); - QString canonname = AutoProjectTool::canonicalize ( m_titem->name ); - QString varname = m_titem->prefix + "_" + m_titem->primary; + TQString canonname = AutoProjectTool::canonicalize ( m_titem->name ); + TQString varname = m_titem->prefix + "_" + m_titem->primary; SubprojectItem* spitem = 0; TargetItem* titem = 0; - QMap removeMap; - QMap replaceMap; + TQMap removeMap; + TQMap replaceMap; // Remove dependencies to other targets first (stored by init() in 'dependentTargets') for ( spitem = dependentSubprojects.first(); spitem; spitem = dependentSubprojects.next() ) { for ( titem = spitem->targets.first(); titem; titem = spitem->targets.next() ) { - QString curVarname; - QString curCanonname = AutoProjectTool::canonicalize ( titem->name ); - QStringList dependencies; + TQString curVarname; + TQString curCanonname = AutoProjectTool::canonicalize ( titem->name ); + TQStringList dependencies; if ( spitem->variables[curCanonname + "_LIBADD"].contains ( m_titem->name ) ) curVarname = curCanonname + "_LIBADD"; else curVarname = curCanonname + "_LDADD"; - dependencies = QStringList::split(QRegExp("[ \t\n]"), spitem->variables[curVarname]); + dependencies = TQStringList::split(TQRegExp("[ \t\n]"), spitem->variables[curVarname]); - //QStringList::Iterator it = dependencies.begin(); + //TQStringList::Iterator it = dependencies.begin(); for ( uint i = 0; i < dependencies.size(); ++i ) { - QString s = dependencies[i]; + TQString s = dependencies[i]; if ( s.contains ( m_titem->name ) > 0 ) dependencies.remove ( s ); } @@ -178,7 +178,7 @@ void RemoveTargetDialog::accept () { // if we have bin_PROGRAMS = [target to be deleted] [other target] // delete only the [target to be deleted], not the whole line! - QStringList targets = QStringList::split(QRegExp("[ \t\n]"), m_spitem->variables[varname]); + TQStringList targets = TQStringList::split(TQRegExp("[ \t\n]"), m_spitem->variables[varname]); if ( targets.count() > 1 ) { @@ -222,7 +222,7 @@ void RemoveTargetDialog::accept () //kdDebug (9020) << "******** " << m_spitem->subdir << endl; if ( titem->primary == "PROGRAMS" || titem->primary == "LTLIBRARIES" ) { - QString curCanonname = AutoProjectTool::canonicalize ( titem->name ); + TQString curCanonname = AutoProjectTool::canonicalize ( titem->name ); if ( m_spitem->variables[curCanonname + "_LIBADD"].isEmpty() ) { @@ -241,14 +241,14 @@ void RemoveTargetDialog::accept () progressBar->setTotalSteps ( m_titem->sources.count() ); - QStringList fileList; + TQStringList fileList; for ( FileItem* fitem = m_titem->sources.first(); fitem; fitem = m_titem->sources.next() ) { if (removeCheckBox->isChecked()) { // before removing the files, check if they are mentioned in "noinst_HEADERS = blabla1.h blabla2.h" - QStringList noInstHeaders = QStringList::split ( QRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] ); + TQStringList noInstHeaders = TQStringList::split ( TQRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] ); if ( noInstHeaders.contains ( fitem->name ) ) { @@ -260,7 +260,7 @@ void RemoveTargetDialog::accept () replaceMap.clear(); } - QFile::remove(m_spitem->path + "/" + fitem->name); + TQFile::remove(m_spitem->path + "/" + fitem->name); } fileList.append ( m_spitem->path.mid ( m_part->projectDirectory().length() + 1 ) + "/" + fitem->name ); @@ -275,5 +275,5 @@ void RemoveTargetDialog::accept () m_spitem->targets.remove ( m_titem ); - QDialog::accept(); + TQDialog::accept(); } diff --git a/buildtools/autotools/removetargetdlg.h b/buildtools/autotools/removetargetdlg.h index 6953d2bf..a9981007 100644 --- a/buildtools/autotools/removetargetdlg.h +++ b/buildtools/autotools/removetargetdlg.h @@ -19,7 +19,7 @@ #include "removetargetdlgbase.h" -#include +#include class AutoProjectWidget; class AutoProjectPart; @@ -35,7 +35,7 @@ class RemoveTargetDialog : public RemoveTargetDlgBase public: RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, QWidget* parent = 0, const char* name = 0 ); + TargetItem *titem, TQWidget* parent = 0, const char* name = 0 ); ~RemoveTargetDialog(); private: @@ -44,7 +44,7 @@ private: AutoProjectWidget* m_widget; AutoProjectPart* m_part; - QPtrList dependentSubprojects; + TQPtrList dependentSubprojects; protected: void init (); diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index 5ad6bf10..a7fd2c11 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -11,14 +11,14 @@ #include "subprojectoptionsdlg.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -42,7 +42,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, QWidget *parent, const char *name) + SubprojectItem *item, TQWidget *parent, const char *name) : SubprojectOptionsDialogBase(parent, name, true) { setCaption(i18n("Subproject Options for '%1'").arg(item->subdir)); @@ -50,14 +50,14 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj subProject = item; m_part = part; - QFontMetrics fm(cflags_edit->fontMetrics()); + TQFontMetrics fm(cflags_edit->fontMetrics()); int wid = fm.width('X')*35; cflags_edit->setMinimumWidth(wid); cxxflags_edit->setMinimumWidth(wid); fflags_edit->setMinimumWidth(wid); - QDomDocument &dom = *part->projectDom(); - QString prefix = "/kdevautoproject/configurations/" + m_part->currentBuildConfig() + "/"; + TQDomDocument &dom = *part->projectDom(); + TQString prefix = "/kdevautoproject/configurations/" + m_part->currentBuildConfig() + "/"; ccompiler = DomUtil::readEntry(dom, prefix + "ccompiler", "kdevgccoptions"); cxxcompiler = DomUtil::readEntry(dom, prefix + "cxxcompiler", "kdevgppoptions"); @@ -79,20 +79,20 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj prefix_listview->setSorting(-1); buildorder_listview->setSorting(-1); - connect( prefix_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ), this, SLOT( editPrefixClicked() ) ); + connect( prefix_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editPrefixClicked() ) ); // Insert all subdirectories as possible include directories - QStringList l = widget->allSubprojects(); - QCheckListItem *lastItem = 0; - QStringList::ConstIterator it; + TQStringList l = widget->allSubprojects(); + TQCheckListItem *lastItem = 0; + TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) { kdDebug(9020) << "----------> subproject = " << (*it) << endl; - QString subProjectName = *it; + TQString subProjectName = *it; if( subProjectName.isEmpty() ){ - subProjectName = QString::fromLatin1( "." ); + subProjectName = TQString::fromLatin1( "." ); } - QCheckListItem *clitem = new QCheckListItem(insideinc_listview, subProjectName, QCheckListItem::CheckBox); + TQCheckListItem *clitem = new TQCheckListItem(insideinc_listview, subProjectName, TQCheckListItem::CheckBox); if (lastItem) clitem->moveItem(lastItem); lastItem = clitem; @@ -117,38 +117,38 @@ void SubprojectOptionsDialog::readConfig() metasources_checkbox->setChecked(subProject->variables["METASOURCES"].stripWhiteSpace() == "AUTO"); - QString includes = subProject->variables["INCLUDES"]; - QStringList includeslist = QStringList::split(QRegExp("[ \t]"), QString(includes)); + TQString includes = subProject->variables["INCLUDES"]; + TQStringList includeslist = TQStringList::split(TQRegExp("[ \t]"), TQString(includes)); - QListViewItem *lastItem = 0; - QStringList::Iterator it; + TQListViewItem *lastItem = 0; + TQStringList::Iterator it; for (it = includeslist.begin(); it != includeslist.end(); ++it) { - QCheckListItem *clitem = static_cast(insideinc_listview->firstChild()); + TQCheckListItem *clitem = static_cast(insideinc_listview->firstChild()); while (clitem) { if (*it == ("-I$(top_srcdir)/" + clitem->text())) { clitem->setOn(true); break; } - clitem = static_cast(clitem->nextSibling()); + clitem = static_cast(clitem->nextSibling()); } if (!clitem) { - QListViewItem *item = new QListViewItem(outsideinc_listview, *it); + TQListViewItem *item = new TQListViewItem(outsideinc_listview, *it); if (lastItem) item->moveItem(lastItem); lastItem = item; } } - QMap::ConstIterator it2; + TQMap::ConstIterator it2; for (it2 = subProject->prefixes.begin(); it2 != subProject->prefixes.end(); ++it2) - new QListViewItem(prefix_listview, it2.key(), it2.data()); + new TQListViewItem(prefix_listview, it2.key(), it2.data()); - QString subdirs = subProject->variables["SUBDIRS"]; + TQString subdirs = subProject->variables["SUBDIRS"]; kdDebug(9020) << "Subdirs variable: " << subdirs << endl; - QStringList subdirslist = QStringList::split(QRegExp("[ \t]"), QString(subdirs)); + TQStringList subdirslist = TQStringList::split(TQRegExp("[ \t]"), TQString(subdirs)); lastItem = 0; for (it = subdirslist.begin(); it != subdirslist.end(); ++it) { - QListViewItem *item = new QListViewItem(buildorder_listview, *it); + TQListViewItem *item = new TQListViewItem(buildorder_listview, *it); if (lastItem) item->moveItem(lastItem); lastItem = item; @@ -158,67 +158,67 @@ void SubprojectOptionsDialog::readConfig() void SubprojectOptionsDialog::storeConfig() { - QMap replaceMap; + TQMap replaceMap; - QString old_cflags = subProject->variables["AM_CFLAGS"]; - QString new_cflags = cflags_edit->text(); + TQString old_cflags = subProject->variables["AM_CFLAGS"]; + TQString new_cflags = cflags_edit->text(); if (new_cflags != old_cflags) { subProject->variables["AM_CFLAGS"] = new_cflags; replaceMap.insert("AM_CFLAGS", new_cflags); } - QString old_cxxflags = subProject->variables["AM_CXXFLAGS"]; - QString new_cxxflags = cxxflags_edit->text(); + TQString old_cxxflags = subProject->variables["AM_CXXFLAGS"]; + TQString new_cxxflags = cxxflags_edit->text(); if (new_cxxflags != old_cxxflags) { subProject->variables["AM_CXXFLAGS"] = new_cxxflags; replaceMap.insert("AM_CXXFLAGS", new_cxxflags); } - QString old_fflags = subProject->variables["AM_FFLAGS"]; - QString new_fflags = fflags_edit->text(); + TQString old_fflags = subProject->variables["AM_FFLAGS"]; + TQString new_fflags = fflags_edit->text(); if (new_fflags != old_fflags) { subProject->variables["AM_FFLAGS"] = new_fflags; replaceMap.insert("AM_FFLAGS", new_fflags); } - QString old_metasources = subProject->variables["METASOURCES"]; - QString new_metasources = metasources_checkbox->isChecked() ? QString::fromLatin1("AUTO") : QString::null; + TQString old_metasources = subProject->variables["METASOURCES"]; + TQString new_metasources = metasources_checkbox->isChecked() ? TQString::fromLatin1("AUTO") : TQString::null; if (new_metasources != old_metasources) { subProject->variables["METASOURCES"] = new_metasources; replaceMap.insert("METASOURCES", new_metasources); } - QStringList includeslist; - QCheckListItem *clitem = static_cast(insideinc_listview->firstChild()); + TQStringList includeslist; + TQCheckListItem *clitem = static_cast(insideinc_listview->firstChild()); while (clitem) { if (clitem->isOn()) includeslist.append("-I$(top_srcdir)/" + clitem->text()); - clitem = static_cast(clitem->nextSibling()); + clitem = static_cast(clitem->nextSibling()); } - clitem = static_cast(outsideinc_listview->firstChild()); + clitem = static_cast(outsideinc_listview->firstChild()); while (clitem) { includeslist.append(clitem->text()); - clitem = static_cast(clitem->nextSibling()); + clitem = static_cast(clitem->nextSibling()); } - QString includes = includeslist.join(" "); + TQString includes = includeslist.join(" "); subProject->variables["INCLUDES"] = includes; replaceMap.insert("INCLUDES", includes); subProject->prefixes.clear(); - for (QListViewItem *item = prefix_listview->firstChild(); + for (TQListViewItem *item = prefix_listview->firstChild(); item; item = item->nextSibling()) { - QString key = item->text(0); - QString data = item->text(1); + TQString key = item->text(0); + TQString data = item->text(1); subProject->prefixes[key] = data; replaceMap.insert(key + "dir", data); } /// \FIXME take removed prefixes into account - QStringList subdirslist; - for (QListViewItem *item = buildorder_listview->firstChild(); + TQStringList subdirslist; + for (TQListViewItem *item = buildorder_listview->firstChild(); item; item = item->nextSibling()) subdirslist.append(item->text(0)); - QString subdirs = subdirslist.join(" "); + TQString subdirs = subdirslist.join(" "); kdDebug() << "New subdirs variable: " << subdirs << endl; subProject->variables["SUBDIRS"] = subdirs; replaceMap.insert("SUBDIRS", subdirs); @@ -229,7 +229,7 @@ void SubprojectOptionsDialog::storeConfig() void SubprojectOptionsDialog::cflagsClicked() { - QString new_cflags = AutoProjectTool::execFlagsDialog(ccompiler, cflags_edit->text(), this); + TQString new_cflags = AutoProjectTool::execFlagsDialog(ccompiler, cflags_edit->text(), this); // if (!new_cflags.isNull()) cflags_edit->setText(new_cflags); } @@ -237,7 +237,7 @@ void SubprojectOptionsDialog::cflagsClicked() void SubprojectOptionsDialog::cxxFlagsClicked() { - QString new_cxxflags = AutoProjectTool::execFlagsDialog(cxxcompiler, cxxflags_edit->text(), this); + TQString new_cxxflags = AutoProjectTool::execFlagsDialog(cxxcompiler, cxxflags_edit->text(), this); // if (!new_cxxflags.isNull()) cxxflags_edit->setText(new_cxxflags); } @@ -245,7 +245,7 @@ void SubprojectOptionsDialog::cxxFlagsClicked() void SubprojectOptionsDialog::fflagsClicked() { - QString new_fflags = AutoProjectTool::execFlagsDialog(f77compiler, fflags_edit->text(), this); + TQString new_fflags = AutoProjectTool::execFlagsDialog(f77compiler, fflags_edit->text(), this); // if (!new_fflags.isNull()) fflags_edit->setText(new_fflags); } @@ -258,7 +258,7 @@ void SubprojectOptionsDialog::insideMoveUpClicked() return; } - QListViewItem *item = insideinc_listview->firstChild(); + TQListViewItem *item = insideinc_listview->firstChild(); while (item->nextSibling() != insideinc_listview->currentItem()) item = item->nextSibling(); item->moveItem(insideinc_listview->currentItem()); @@ -283,7 +283,7 @@ void SubprojectOptionsDialog::outsideMoveUpClicked() return; } - QListViewItem *item = outsideinc_listview->firstChild(); + TQListViewItem *item = outsideinc_listview->firstChild(); while (item->nextSibling() != outsideinc_listview->currentItem()) item = item->nextSibling(); item->moveItem(outsideinc_listview->currentItem()); @@ -304,19 +304,19 @@ void SubprojectOptionsDialog::outsideAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add Include directory: Choose directory, give -Idirectory or use a variable with -I$(FOOBAR)" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); - if ( dialog.exec() != QDialog::Accepted ) + dialog.urlRequester() ->setURL( TQString::null ); + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if ( !file.isEmpty() ) { if( file.startsWith("-I") ) - new QListViewItem( outsideinc_listview, file ); + new TQListViewItem( outsideinc_listview, file ); else { - new QListViewItem( outsideinc_listview, "-I"+file ); + new TQListViewItem( outsideinc_listview, "-I"+file ); } } } @@ -328,7 +328,7 @@ void SubprojectOptionsDialog::outsideEditClicked() if ( (outsideinc_listview->childCount()==0) || (outsideinc_listview->currentItem() == 0) ) return; bool ok; - QString dir = KInputDialog::getText(i18n("Edit Include Directory"), i18n("Edit include directory:"), + TQString dir = KInputDialog::getText(i18n("Edit Include Directory"), i18n("Edit include directory:"), outsideinc_listview->currentItem()-> text(0), &ok, 0); if (ok && !dir.isEmpty()) outsideinc_listview->currentItem()-> setText(0, dir); @@ -347,13 +347,13 @@ void SubprojectOptionsDialog::addPrefixClicked() if (!dlg.exec() || dlg.name().isEmpty() || dlg.path().isEmpty() ) return; - new QListViewItem(prefix_listview, dlg.name(), dlg.path()); + new TQListViewItem(prefix_listview, dlg.name(), dlg.path()); } void SubprojectOptionsDialog::editPrefixClicked() { - QListViewItem* lvItem = prefix_listview->currentItem(); + TQListViewItem* lvItem = prefix_listview->currentItem(); if ( (prefix_listview->childCount()==0) || (lvItem == 0) ) return; AddPrefixDialog dlg(lvItem-> text(0), lvItem-> text(1)); @@ -377,7 +377,7 @@ void SubprojectOptionsDialog::buildorderMoveUpClicked() return; } - QListViewItem *item = buildorder_listview->firstChild(); + TQListViewItem *item = buildorder_listview->firstChild(); while (item->nextSibling() != buildorder_listview->currentItem()) item = item->nextSibling(); item->moveItem(buildorder_listview->currentItem()); @@ -398,7 +398,7 @@ void SubprojectOptionsDialog::buildorderMoveDownClicked() void SubprojectOptionsDialog::accept() { storeConfig(); - QDialog::accept(); + TQDialog::accept(); } #include "subprojectoptionsdlg.moc" diff --git a/buildtools/autotools/subprojectoptionsdlg.h b/buildtools/autotools/subprojectoptionsdlg.h index 7ec1fbf0..648c007d 100644 --- a/buildtools/autotools/subprojectoptionsdlg.h +++ b/buildtools/autotools/subprojectoptionsdlg.h @@ -25,7 +25,7 @@ class SubprojectOptionsDialog : public SubprojectOptionsDialogBase public: SubprojectOptionsDialog( AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, QWidget *parent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); ~SubprojectOptionsDialog(); private: @@ -53,9 +53,9 @@ private: AutoProjectWidget *m_widget; AutoProjectPart *m_part; - QString ccompiler; - QString cxxcompiler; - QString f77compiler; + TQString ccompiler; + TQString cxxcompiler; + TQString f77compiler; }; #endif diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index c8d49c55..39cd35f2 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -11,11 +11,11 @@ #include "targetoptionsdlg.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -34,7 +34,7 @@ #include "urlutil.h" TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *item, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : TargetOptionsDialogBase(parent, name, true) { setCaption( i18n("Target Options for '%1'").arg(item->name) ); @@ -61,13 +61,13 @@ TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem * m_cwdEdit->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); // Insert all convenience libraries as possible linked libraries - QStringList l = widget->allLibraries(); - QStringList::ConstIterator it; - QString fulltargetname = m_widget->subprojectDirectory() + "/" + item->name; + TQStringList l = widget->allLibraries(); + TQStringList::ConstIterator it; + TQString fulltargetname = m_widget->subprojectDirectory() + "/" + item->name; for (it = l.begin(); it != l.end(); ++it) // Do not list the target itself (a target can not link with itself) if ( !fulltargetname.endsWith(*it) ) - (void) new QCheckListItem(insidelib_listview, *it, QCheckListItem::CheckBox); + (void) new TQCheckListItem(insidelib_listview, *it, TQCheckListItem::CheckBox); readConfig(); } @@ -78,10 +78,10 @@ TargetOptionsDialog::~TargetOptionsDialog() void TargetOptionsDialog::readConfig() { - QString flagsstr = target->ldflags; - flagsstr.replace(QRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); - QStringList l1 = QStringList::split(QRegExp("[ \t]"), flagsstr); - QStringList::Iterator l1it; + TQString flagsstr = target->ldflags; + flagsstr.replace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); + TQStringList l1 = TQStringList::split(TQRegExp("[ \t]"), flagsstr); + TQStringList::Iterator l1it; l1it = l1.find("-all-static"); if (l1it != l1.end()) { @@ -106,18 +106,18 @@ void TargetOptionsDialog::readConfig() ldflagsother_edit->setText(l1.join(" ")); dependencies_edit->setText(target->dependencies); - QString addstr = (target->primary == "PROGRAMS")? target->ldadd : target->libadd; - QStringList l2 = QStringList::split(QRegExp("[ \t]"), addstr); + TQString addstr = (target->primary == "PROGRAMS")? target->ldadd : target->libadd; + TQStringList l2 = TQStringList::split(TQRegExp("[ \t]"), addstr); kdDebug(9020) << "ls=: " << addstr << endl; bool inlistItem; - QListViewItem *lastItem = 0; - QStringList::Iterator l2it; - QCheckListItem *flitem = static_cast(insidelib_listview->firstChild()); + TQListViewItem *lastItem = 0; + TQStringList::Iterator l2it; + TQCheckListItem *flitem = static_cast(insidelib_listview->firstChild()); for (l2it = l2.begin(); l2it != l2.end(); ++l2it) { inlistItem = false; - QCheckListItem *clitem = static_cast(insidelib_listview->firstChild()); + TQCheckListItem *clitem = static_cast(insidelib_listview->firstChild()); if (flitem) { while (clitem) { if (*l2it == ("$(top_builddir)/" + clitem->text())) { @@ -126,15 +126,15 @@ void TargetOptionsDialog::readConfig() if (flitem != clitem) clitem->moveItem(flitem); // move the "top of the list" one item down - flitem = static_cast(flitem->nextSibling()); + flitem = static_cast(flitem->nextSibling()); inlistItem = true; break; } - clitem = static_cast(clitem->nextSibling()); + clitem = static_cast(clitem->nextSibling()); } } if ( inlistItem == false ) { - QListViewItem *item = new QListViewItem(outsidelib_listview, *l2it); + TQListViewItem *item = new TQListViewItem(outsidelib_listview, *l2it); if (lastItem) item->moveItem(lastItem); lastItem = item; @@ -160,7 +160,7 @@ void TargetOptionsDialog::readConfig() void TargetOptionsDialog::storeConfig() { - QStringList flagslist; + TQStringList flagslist; if (allstatic_box->isChecked()) flagslist.append("-all-static"); if (avoidversion_box->isChecked()) @@ -170,27 +170,27 @@ void TargetOptionsDialog::storeConfig() if (noundefined_box->isChecked()) flagslist.append("-no-undefined"); flagslist.append(ldflagsother_edit->text()); - QString new_ldflags = flagslist.join(" "); + TQString new_ldflags = flagslist.join(" "); - QStringList liblist; - QCheckListItem *clitem = static_cast(insidelib_listview->firstChild()); + TQStringList liblist; + TQCheckListItem *clitem = static_cast(insidelib_listview->firstChild()); while (clitem) { if( clitem->isOn() ) liblist.append("$(top_builddir)/" + clitem->text()); - clitem = static_cast(clitem->nextSibling()); + clitem = static_cast(clitem->nextSibling()); } - clitem = static_cast(outsidelib_listview->firstChild()); + clitem = static_cast(outsidelib_listview->firstChild()); while (clitem) { liblist.append(clitem->text()); - clitem = static_cast(clitem->nextSibling()); + clitem = static_cast(clitem->nextSibling()); } - QString new_addstr = liblist.join(" "); + TQString new_addstr = liblist.join(" "); - QString canonname = AutoProjectTool::canonicalize(target->name); - QMap replaceMap; + TQString canonname = AutoProjectTool::canonicalize(target->name); + TQMap replaceMap; if (target->primary == "PROGRAMS") { - QString old_ldadd = target->ldadd; + TQString old_ldadd = target->ldadd; if (new_addstr != old_ldadd) { target->ldadd = new_addstr; replaceMap.insert(canonname + "_LDADD", new_addstr); @@ -198,21 +198,21 @@ void TargetOptionsDialog::storeConfig() } if (target->primary == "LIBRARIES" || target->primary == "LTLIBRARIES") { - QString old_libadd = target->libadd; + TQString old_libadd = target->libadd; if (new_addstr != old_libadd) { target->libadd = new_addstr; replaceMap.insert(canonname + "_LIBADD", new_addstr); } } - QString old_ldflags = target->ldflags; + TQString old_ldflags = target->ldflags; if (new_ldflags != old_ldflags) { target->ldflags = new_ldflags; replaceMap.insert(canonname + "_LDFLAGS", new_ldflags); } - QString new_dependencies = dependencies_edit->text(); - QString old_dependencies = target->dependencies; + TQString new_dependencies = dependencies_edit->text(); + TQString old_dependencies = target->dependencies; if (new_dependencies != old_dependencies) { target->dependencies = new_dependencies; if (!new_dependencies.isEmpty()) @@ -240,7 +240,7 @@ void TargetOptionsDialog::insideMoveUpClicked() return; } - QListViewItem *item = insidelib_listview->firstChild(); + TQListViewItem *item = insidelib_listview->firstChild(); while (item->nextSibling() != insidelib_listview->currentItem()) item = item->nextSibling(); item->moveItem(insidelib_listview->currentItem()); @@ -270,7 +270,7 @@ void TargetOptionsDialog::outsideMoveUpClicked() return; } - QListViewItem *item = outsidelib_listview->firstChild(); + TQListViewItem *item = outsidelib_listview->firstChild(); while (item->nextSibling() != outsidelib_listview->currentItem()) item = item->nextSibling(); item->moveItem(outsidelib_listview->currentItem()); @@ -295,33 +295,33 @@ void TargetOptionsDialog::outsideAddClicked() KURLRequesterDlg dialog( "", i18n( "Add Library: Choose the .a/.so file, give -l or use a variable with $(FOOBAR)" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( m_widget->selectedSubproject()->path ); dialog.urlRequester() ->fileDialog() ->setURL( KURL::fromPathOrURL( m_widget->selectedSubproject()->path ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if ( !file.isEmpty() ) { if( file.startsWith("-l") ) - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); else { - QFileInfo fi(file); + TQFileInfo fi(file); if( !fi.exists() ) - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); if( fi.extension(false) == "a" ) { - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); }else if ( fi.extension(false) == "so" ) { - QString name = fi.fileName(); + TQString name = fi.fileName(); if( name.startsWith( "lib" ) ) name = name.mid(3); name = "-l"+name.left( name.length() - 3 ); - new QListViewItem( outsidelib_listview, name ); + new TQListViewItem( outsidelib_listview, name ); } } } @@ -334,7 +334,7 @@ void TargetOptionsDialog::outsideEditClicked() if ( (outsidelib_listview->childCount()==0) || (outsidelib_listview->currentItem() == 0) ) return; bool ok; - QString dir = KInputDialog::getText(i18n("Edit External Library"), i18n("Edit external library:"), + TQString dir = KInputDialog::getText(i18n("Edit External Library"), i18n("Edit external library:"), outsidelib_listview->currentItem()-> text(0), &ok, 0); if (ok && !dir.isEmpty()) outsidelib_listview->currentItem()-> setText(0, dir); @@ -350,7 +350,7 @@ void TargetOptionsDialog::outsideRemoveClicked() void TargetOptionsDialog::accept() { storeConfig(); - QDialog::accept(); + TQDialog::accept(); } #include "targetoptionsdlg.moc" diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h index c1dea20a..3b938046 100644 --- a/buildtools/autotools/targetoptionsdlg.h +++ b/buildtools/autotools/targetoptionsdlg.h @@ -24,7 +24,7 @@ class TargetOptionsDialog : public TargetOptionsDialogBase public: TargetOptionsDialog( AutoProjectWidget *widget, TargetItem *item, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~TargetOptionsDialog(); private: diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index 37b087b2..e979df61 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -11,43 +11,43 @@ #include "custombuildoptionswidget.h" -#include +#include #include #include #include #include -#include -#include +#include +#include #include "domutil.h" -CustomBuildOptionsWidget::CustomBuildOptionsWidget(QDomDocument &dom, - QWidget *parent, const char *name) +CustomBuildOptionsWidget::CustomBuildOptionsWidget(TQDomDocument &dom, + TQWidget *parent, const char *name) : CustomBuildOptionsWidgetBase(parent, name), m_dom(dom) { ant_button->setChecked(DomUtil::readEntry(dom, "/kdevcustomproject/build/buildtool") == "ant"); other_button->setChecked(DomUtil::readEntry(dom, "/kdevcustomproject/build/buildtool") == "other"); if( !DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir").isEmpty() - && QFileInfo( DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir") ).exists() ) + && TQFileInfo( DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir") ).exists() ) { builddir_edit->setURL(DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir")); builddir_edit->fileDialog()->setURL( DomUtil::readEntry(dom, "/kdevcustomproject/build/builddir") ); } else { - builddir_edit->setURL( QString() ); - builddir_edit->fileDialog()->setURL( QString() ); + builddir_edit->setURL( TQString() ); + builddir_edit->fileDialog()->setURL( TQString() ); } builddir_edit->completionObject()->setMode(KURLCompletion::DirCompletion); builddir_edit->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); // This connection must not be made before the ant->setChecked() line, // because at this time makeToggled() would crash - connect( make_button, SIGNAL(toggled(bool)), - this, SLOT(makeToggled(bool)) ); - connect( other_button, SIGNAL(toggled(bool)), - this, SLOT(otherToggled(bool)) ); + connect( make_button, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(makeToggled(bool)) ); + connect( other_button, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(otherToggled(bool)) ); } @@ -57,7 +57,7 @@ CustomBuildOptionsWidget::~CustomBuildOptionsWidget() void CustomBuildOptionsWidget::accept() { - QString buildtool; + TQString buildtool; if (ant_button->isChecked()) { buildtool = "ant"; @@ -75,7 +75,7 @@ void CustomBuildOptionsWidget::accept() } -void CustomBuildOptionsWidget::setMakeOptionsWidget(QTabWidget *tw, QWidget *mow, QWidget* oow) +void CustomBuildOptionsWidget::setMakeOptionsWidget(TQTabWidget *tw, TQWidget *mow, TQWidget* oow) { m_tabWidget = tw; m_makeOptions = mow; diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h index 1b049574..c89d6f23 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.h +++ b/buildtools/custommakefiles/custombuildoptionswidget.h @@ -13,7 +13,7 @@ #define _CUSTOMBUILDOPTIONSWIDGET_H_ #include "custombuildoptionswidgetbase.h" -#include +#include class QTabWidget; @@ -23,10 +23,10 @@ class CustomBuildOptionsWidget : public CustomBuildOptionsWidgetBase Q_OBJECT public: - CustomBuildOptionsWidget( QDomDocument &dom, QWidget *parent=0, const char *name=0 ); + CustomBuildOptionsWidget( TQDomDocument &dom, TQWidget *parent=0, const char *name=0 ); ~CustomBuildOptionsWidget(); - void setMakeOptionsWidget(QTabWidget *tw, QWidget *mow, QWidget *oow); + void setMakeOptionsWidget(TQTabWidget *tw, TQWidget *mow, TQWidget *oow); public slots: void accept(); @@ -35,10 +35,10 @@ private: virtual void makeToggled(bool b); virtual void otherToggled(bool b); - QDomDocument &m_dom; - QTabWidget *m_tabWidget; - QWidget *m_makeOptions; - QWidget *m_otherOptions; + TQDomDocument &m_dom; + TQTabWidget *m_tabWidget; + TQWidget *m_makeOptions; + TQWidget *m_otherOptions; }; #endif diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp index 2af0d137..b47ef3ff 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.cpp +++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp @@ -11,24 +11,24 @@ #include "custommakeconfigwidget.h" #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const QString& configGroup, QWidget* parent) +CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent) : CustomMakeConfigWidgetBase(parent), m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() ) { @@ -43,7 +43,7 @@ CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const QS defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/defaulttarget")); makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/makeoptions")); - envs_combo->setValidator(new QRegExpValidator(QRegExp("^\\D[^\\s]*"), this)); + envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), this)); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); env_var_group->setColumnLayout( 1, Qt::Vertical ); @@ -58,9 +58,9 @@ CustomMakeConfigWidget::~CustomMakeConfigWidget() } -void CustomMakeConfigWidget::envNameChanged(const QString& envName) +void CustomMakeConfigWidget::envNameChanged(const TQString& envName) { - QStringList allEnvNames = m_part->allMakeEnvironments(); + TQStringList allEnvNames = m_part->allMakeEnvironments(); bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty(); bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1; addenvs_button->setEnabled(canAdd); @@ -68,7 +68,7 @@ void CustomMakeConfigWidget::envNameChanged(const QString& envName) removeenvs_button->setEnabled(canRemove); } -void CustomMakeConfigWidget::envChanged(const QString& envName) +void CustomMakeConfigWidget::envChanged(const TQString& envName) { if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName)) return; @@ -84,7 +84,7 @@ void CustomMakeConfigWidget::envChanged(const QString& envName) void CustomMakeConfigWidget::envAdded() { - QString env = envs_combo->currentText(); + TQString env = envs_combo->currentText(); m_allEnvironments.append(env); envs_combo->clear(); @@ -94,19 +94,19 @@ void CustomMakeConfigWidget::envAdded() void CustomMakeConfigWidget::envRemoved() { - QString env = envs_combo->currentText(); - QDomNode node = DomUtil::elementByPath(m_dom, m_configGroup + "/make/environments"); + TQString env = envs_combo->currentText(); + TQDomNode node = DomUtil::elementByPath(m_dom, m_configGroup + "/make/environments"); node.removeChild(node.namedItem(env)); m_allEnvironments.remove(env); envs_combo->clear(); envs_combo->insertStringList(m_allEnvironments); - m_currentEnvironment = QString::null; + m_currentEnvironment = TQString::null; envChanged( m_allEnvironments[0] ); } void CustomMakeConfigWidget::envCopied() { - QString env = envs_combo->currentText(); + TQString env = envs_combo->currentText(); m_allEnvironments.append(env); envs_combo->clear(); envs_combo->insertStringList(m_allEnvironments); diff --git a/buildtools/custommakefiles/custommakeconfigwidget.h b/buildtools/custommakefiles/custommakeconfigwidget.h index ae8376c1..5a94e669 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.h +++ b/buildtools/custommakefiles/custommakeconfigwidget.h @@ -26,7 +26,7 @@ class CustomMakeConfigWidget : public CustomMakeConfigWidgetBase Q_OBJECT public: - CustomMakeConfigWidget(CustomProjectPart* part, const QString& configGroup, QWidget* parent); + CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent); ~CustomMakeConfigWidget(); @@ -35,16 +35,16 @@ public slots: protected: CustomProjectPart* m_part; - QString m_configGroup; - QDomDocument& m_dom; + TQString m_configGroup; + TQDomDocument& m_dom; - QStringList m_allEnvironments; - QString m_currentEnvironment; + TQStringList m_allEnvironments; + TQString m_currentEnvironment; EnvironmentVariablesWidget* m_envWidget; - virtual void envNameChanged(const QString& envName); - virtual void envChanged(const QString& envName); + virtual void envNameChanged(const TQString& envName); + virtual void envChanged(const TQString& envName); virtual void envAdded(); virtual void envRemoved(); virtual void envCopied(); diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 9001480e..84278a69 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -11,11 +11,11 @@ #include "custommanagerwidget.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -28,13 +28,13 @@ #include "customprojectpart.h" #include "domutil.h" -CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, QWidget* parent ) +CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* parent ) : CustomManagerWidgetBase( parent ), m_part( part), m_dom( *part->projectDom() ) { m_filetypes->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/filetypes", "filetype" ) ); KURLRequester* urlselector = new KURLRequester( ); urlselector->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); - urlselector->setURL( QString::null ); + urlselector->setURL( TQString::null ); urlselector->completionObject() ->setDir( part->projectDirectory() ); urlselector->fileDialog() ->setURL( KURL( part->projectDirectory() ) ); m_blacklistBox = new KEditListBox( i18n("blacklisted files and directories are not" @@ -44,17 +44,17 @@ CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, QWidget* pare m_blacklistBox->setButtons( KEditListBox::Add | KEditListBox::Remove ); m_blacklistBox->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/blacklist","path") ); grid->addWidget( m_blacklistBox, 0, 1 ); - connect(m_blacklistBox, SIGNAL(added(const QString&)), this, SLOT(checkUrl(const QString&))); + connect(m_blacklistBox, TQT_SIGNAL(added(const TQString&)), this, TQT_SLOT(checkUrl(const TQString&))); } -void CustomManagerWidget::checkUrl(const QString& url) +void CustomManagerWidget::checkUrl(const TQString& url) { kdDebug(9025) << "got file:" << url << endl; - if( !QFileInfo(url).isRelative() ) + if( !TQFileInfo(url).isRelative() ) { kdDebug(9025) << "seems to be non-relative" << endl; - QString relpath = m_part->relativeToProject( url ); - QListBoxItem* item = m_blacklistBox->listBox()->findItem( url ); + TQString relpath = m_part->relativeToProject( url ); + TQListBoxItem* item = m_blacklistBox->listBox()->findItem( url ); m_blacklistBox->listBox()->takeItem( item ); kdDebug(9025) << "relative path:" << relpath << endl; if( !relpath.isEmpty() ) diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h index 4f15f156..ce12805b 100644 --- a/buildtools/custommakefiles/custommanagerwidget.h +++ b/buildtools/custommakefiles/custommanagerwidget.h @@ -15,7 +15,7 @@ #include "custommanagerwidgetbase.h" -#include +#include class CustomProjectPart; class KEditListBox; @@ -25,14 +25,14 @@ class CustomManagerWidget : public CustomManagerWidgetBase Q_OBJECT public: - CustomManagerWidget( CustomProjectPart* part, QWidget* parent ); + CustomManagerWidget( CustomProjectPart* part, TQWidget* parent ); ~CustomManagerWidget(); public slots: - void checkUrl(const QString& url); + void checkUrl(const TQString& url); void accept(); private: CustomProjectPart* m_part; - QDomDocument& m_dom; + TQDomDocument& m_dom; KEditListBox* m_blacklistBox; }; diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index 47fe4b4d..d40c55d2 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -11,25 +11,25 @@ #include "customotherconfigwidget.h" #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const QString& configGroup, QWidget* parent) +CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent) : CustomOtherConfigWidgetBase(parent), m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() ) { @@ -38,7 +38,7 @@ CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/defaulttarget")); makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/otheroptions")); - envs_combo->setValidator(new QRegExpValidator(QRegExp("^\\D.*"), this)); + envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); env_var_group->setColumnLayout( 1, Qt::Vertical ); @@ -53,9 +53,9 @@ CustomOtherConfigWidget::~CustomOtherConfigWidget() } -void CustomOtherConfigWidget::envNameChanged(const QString& envName) +void CustomOtherConfigWidget::envNameChanged(const TQString& envName) { - QStringList allEnvNames = m_part->allMakeEnvironments(); + TQStringList allEnvNames = m_part->allMakeEnvironments(); bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty(); bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1; addenvs_button->setEnabled(canAdd); @@ -63,7 +63,7 @@ void CustomOtherConfigWidget::envNameChanged(const QString& envName) removeenvs_button->setEnabled(canRemove); } -void CustomOtherConfigWidget::envChanged(const QString& envName) +void CustomOtherConfigWidget::envChanged(const TQString& envName) { if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName)) return; @@ -79,7 +79,7 @@ void CustomOtherConfigWidget::envChanged(const QString& envName) void CustomOtherConfigWidget::envAdded() { - QString env = envs_combo->currentText(); + TQString env = envs_combo->currentText(); m_allEnvironments.append(env); envs_combo->clear(); @@ -89,19 +89,19 @@ void CustomOtherConfigWidget::envAdded() void CustomOtherConfigWidget::envRemoved() { - QString env = envs_combo->currentText(); - QDomNode node = DomUtil::elementByPath(m_dom, m_configGroup + "/other/environments"); + TQString env = envs_combo->currentText(); + TQDomNode node = DomUtil::elementByPath(m_dom, m_configGroup + "/other/environments"); node.removeChild(node.namedItem(env)); m_allEnvironments.remove(env); envs_combo->clear(); envs_combo->insertStringList(m_allEnvironments); - m_currentEnvironment = QString::null; + m_currentEnvironment = TQString::null; envChanged( m_allEnvironments[0] ); } void CustomOtherConfigWidget::envCopied() { - QString env = envs_combo->currentText(); + TQString env = envs_combo->currentText(); m_allEnvironments.append(env); envs_combo->clear(); envs_combo->insertStringList(m_allEnvironments); diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h index 755df98b..c786635c 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.h +++ b/buildtools/custommakefiles/customotherconfigwidget.h @@ -26,7 +26,7 @@ class CustomOtherConfigWidget : public CustomOtherConfigWidgetBase Q_OBJECT public: - CustomOtherConfigWidget(CustomProjectPart* part, const QString& configGroup, QWidget* parent); + CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent); ~CustomOtherConfigWidget(); @@ -35,16 +35,16 @@ public slots: protected: CustomProjectPart* m_part; - QString m_configGroup; - QDomDocument& m_dom; + TQString m_configGroup; + TQDomDocument& m_dom; - QStringList m_allEnvironments; - QString m_currentEnvironment; + TQStringList m_allEnvironments; + TQString m_currentEnvironment; EnvironmentVariablesWidget* m_envWidget; - virtual void envNameChanged(const QString& envName); - virtual void envChanged(const QString& envName); + virtual void envNameChanged(const TQString& envName); + virtual void envChanged(const TQString& envName); virtual void envAdded(); virtual void envRemoved(); virtual void envCopied(); diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index f061dadc..b25a69d7 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -13,18 +13,18 @@ #include "customprojectpart.h" -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -65,7 +65,7 @@ typedef KDevGenericFactory CustomProjectFactory; static const KDevPluginInfo data( "kdevcustomproject" ); K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) -CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const QStringList & ) +CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) { @@ -76,12 +76,12 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q KAction *action; - action = new KAction( i18n( "Re-Populate Project" ), 0, this, SLOT( populateProject() ), actionCollection(), "repopulate_project" ); + action = new KAction( i18n( "Re-Populate Project" ), 0, this, TQT_SLOT( populateProject() ), actionCollection(), "repopulate_project" ); action->setToolTip( i18n( "Re-Populate Project" ) ); action->setWhatsThis( i18n( "Re-Populate Project

Re-Populates the project, searching through the project directory and adding all files that match one of the wildcards set in the custom manager options of the project filelist." ) ); action = new KAction( i18n( "&Build Project" ), "make_kdevelop", Key_F8, - this, SLOT( slotBuild() ), + this, TQT_SLOT( slotBuild() ), actionCollection(), "build_build" ); action->setToolTip( i18n( "Build project" ) ); action->setWhatsThis( i18n( "Build project

Runs make from the project directory.
" @@ -89,7 +89,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, Build Options tab." ) ); action = new KAction( i18n( "&Build Active Directory" ), "make_kdevelop", Key_F7, - this, SLOT( slotBuildActiveDir() ), + this, TQT_SLOT( slotBuildActiveDir() ), actionCollection(), "build_buildactivetarget" ); action->setToolTip( i18n( "Build active directory" ) ); action->setWhatsThis( i18n( "Build active directory

Constructs a series of make commands to build the active directory. " @@ -97,7 +97,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, Make Options tab." ) ); action = new KAction( i18n( "Compile &File" ), "make_kdevelop", - this, SLOT( slotCompileFile() ), + this, TQT_SLOT( slotCompileFile() ), actionCollection(), "build_compilefile" ); action->setToolTip( i18n( "Compile file" ) ); action->setWhatsThis( i18n( "Compile file

Runs make filename.o command from the directory where 'filename' is the name of currently opened file.
" @@ -105,7 +105,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, Build Options tab." ) ); action = new KAction( i18n( "Install" ), 0, - this, SLOT( slotInstall() ), + this, TQT_SLOT( slotInstall() ), actionCollection(), "build_install" ); action->setToolTip( i18n( "Install" ) ); action->setWhatsThis( i18n( "Install

Runs make install command from the project directory.
" @@ -113,7 +113,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, Make Options tab." ) ); action = new KAction( i18n( "Install Active Directory" ), 0, - this, SLOT( slotInstallActiveDir() ), + this, TQT_SLOT( slotInstallActiveDir() ), actionCollection(), "build_installactivetarget" ); action->setToolTip( i18n( "Install active directory" ) ); action->setWhatsThis( i18n( "Install active directory

Runs make install command from the active directory.
" @@ -121,7 +121,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, Make Options tab." ) ); action = new KAction( i18n( "Install (as root user)" ), 0, - this, SLOT( slotInstallWithKdesu() ), + this, TQT_SLOT( slotInstallWithKdesu() ), actionCollection(), "build_install_kdesu" ); action->setToolTip( i18n( "Install as root user" ) ); action->setWhatsThis( i18n( "Install

Runs make install command from the project directory with root privileges.
" @@ -130,7 +130,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, Make Options tab." ) ); action = new KAction( i18n( "&Clean Project" ), 0, - this, SLOT( slotClean() ), + this, TQT_SLOT( slotClean() ), actionCollection(), "build_clean" ); action->setToolTip( i18n( "Clean project" ) ); action->setWhatsThis( i18n( "Clean project

Runs make clean command from the project directory.
" @@ -138,7 +138,7 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "in the project settings dialog, Build Options tab." ) ); action = new KAction( i18n( "Execute Program" ), "exec", 0, - this, SLOT( slotExecute() ), + this, TQT_SLOT( slotExecute() ), actionCollection(), "build_execute" ); action->setToolTip( i18n( "Execute program" ) ); action->setWhatsThis( i18n( "Execute program

Executes the main program specified in project settings, Run Options tab. " @@ -152,8 +152,8 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "Environment variables and make arguments can be specified " "in the project settings dialog, Build Options tab." ) ); - m_targetObjectFilesMenu = new QPopupMenu(); - m_targetOtherFilesMenu = new QPopupMenu(); + m_targetObjectFilesMenu = new TQPopupMenu(); + m_targetOtherFilesMenu = new TQPopupMenu(); m_makeEnvironmentsSelector = new KSelectAction( i18n( "Make &Environment" ), 0, actionCollection(), "build_make_environment" ); @@ -162,27 +162,27 @@ CustomProjectPart::CustomProjectPart( QObject *parent, const char *name, const Q "Environment variables can be specified in the project " "settings dialog, Build Options tab." ) ); - connect( m_targetMenu, SIGNAL( aboutToShow() ), - this, SLOT( updateTargetMenu() ) ); - connect( m_targetMenu, SIGNAL( activated( int ) ), - this, SLOT( targetMenuActivated( int ) ) ); - connect( m_targetObjectFilesMenu, SIGNAL( activated( int ) ), - this, SLOT( targetObjectFilesMenuActivated( int ) ) ); - connect( m_targetOtherFilesMenu, SIGNAL( activated( int ) ), - this, SLOT( targetOtherFilesMenuActivated( int ) ) ); - connect( m_makeEnvironmentsSelector->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( updateMakeEnvironmentsMenu() ) ); - connect( m_makeEnvironmentsSelector->popupMenu(), SIGNAL( activated( int ) ), - this, SLOT( makeEnvironmentsMenuActivated( int ) ) ); - connect( core(), SIGNAL( projectConfigWidget( KDialogBase* ) ), - this, SLOT( projectConfigWidget( KDialogBase* ) ) ); - connect( core(), SIGNAL( contextMenu( QPopupMenu *, const Context * ) ), - this, SLOT( contextMenu( QPopupMenu *, const Context * ) ) ); - - connect( makeFrontend(), SIGNAL( commandFinished( const QString& ) ), - this, SLOT( slotCommandFinished( const QString& ) ) ); - connect( makeFrontend(), SIGNAL( commandFailed( const QString& ) ), - this, SLOT( slotCommandFailed( const QString& ) ) ); + connect( m_targetMenu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( updateTargetMenu() ) ); + connect( m_targetMenu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( targetMenuActivated( int ) ) ); + connect( m_targetObjectFilesMenu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( targetObjectFilesMenuActivated( int ) ) ); + connect( m_targetOtherFilesMenu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( targetOtherFilesMenuActivated( int ) ) ); + connect( m_makeEnvironmentsSelector->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( updateMakeEnvironmentsMenu() ) ); + connect( m_makeEnvironmentsSelector->popupMenu(), TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( makeEnvironmentsMenuActivated( int ) ) ); + connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), + this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), + this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); + + connect( makeFrontend(), TQT_SIGNAL( commandFinished( const TQString& ) ), + this, TQT_SLOT( slotCommandFinished( const TQString& ) ) ); + connect( makeFrontend(), TQT_SIGNAL( commandFailed( const TQString& ) ), + this, TQT_SLOT( slotCommandFailed( const TQString& ) ) ); } @@ -192,34 +192,34 @@ CustomProjectPart::~CustomProjectPart() void CustomProjectPart::projectConfigWidget( KDialogBase *dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "make", KIcon::SizeMedium ) ); CustomManagerWidget *w0 = new CustomManagerWidget( this, vbox ); - connect( dlg, SIGNAL( okClicked() ), w0, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w0, TQT_SLOT( accept() ) ); vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "make", KIcon::SizeMedium ) ); RunOptionsWidget *w1 = new RunOptionsWidget( *projectDom(), "/kdevcustomproject", buildDirectory(), vbox ); - connect( dlg, SIGNAL( okClicked() ), w1, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w1, TQT_SLOT( accept() ) ); vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "make", KIcon::SizeMedium ) ); - QTabWidget *buildtab = new QTabWidget( vbox ); + TQTabWidget *buildtab = new TQTabWidget( vbox ); CustomBuildOptionsWidget *w2 = new CustomBuildOptionsWidget( *projectDom(), buildtab ); - connect( dlg, SIGNAL( okClicked() ), w2, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w2, TQT_SLOT( accept() ) ); buildtab->addTab( w2, i18n( "&Build" ) ); CustomOtherConfigWidget *w4 = new CustomOtherConfigWidget( this, "/kdevcustomproject", buildtab ); - connect( dlg, SIGNAL( okClicked() ), w4, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w4, TQT_SLOT( accept() ) ); buildtab->addTab( w4, i18n( "&Other" ) ); CustomMakeConfigWidget *w3 = new CustomMakeConfigWidget( this, "/kdevcustomproject", buildtab ); buildtab->addTab( w3, i18n( "Ma&ke" ) ); w2->setMakeOptionsWidget( buildtab, w3, w4 ); - connect( dlg, SIGNAL( okClicked() ), w3, SLOT( accept() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w3, TQT_SLOT( accept() ) ); } -void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) +void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context ) { if ( !context->hasType( Context::FileContext ) ) return; @@ -229,9 +229,9 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) m_contextAddFiles.clear(); m_contextRemoveFiles.clear(); - QString popupstr = fcontext->urls().first().fileName(); + TQString popupstr = fcontext->urls().first().fileName(); - if ( popupstr == QString::null ) + if ( popupstr == TQString::null ) popupstr = "."; if ( fcontext->urls().size() == 1 && URLUtil::isDirectory( fcontext->urls().first() ) && !isInBlacklist( fcontext->urls().first().path() ) ) @@ -241,7 +241,7 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) m_contextDirName = fcontext->urls().first().path(); m_contextDirName = m_contextDirName.mid( project()->projectDirectory().length() + 1 ); int id = popup->insertItem( i18n( "Make Active Directory" ), - this, SLOT( slotChooseActiveDirectory() ) ); + this, TQT_SLOT( slotChooseActiveDirectory() ) ); popup->setWhatsThis( id, i18n( "Make active directory

" "Chooses this directory as the destination for new files created using wizards " "like the New Class wizard." ) ); @@ -257,7 +257,7 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( isInBlacklist( m_contextDirName ) ) { id = popup->insertItem( i18n( "Remove from blacklist" ), - this, SLOT( slotChangeBlacklist() ) ); + this, TQT_SLOT( slotChangeBlacklist() ) ); popup->setWhatsThis( id, i18n( "Remove from blacklist

" "Removes the given file or directory from the " "blacklist if it is already in it.
The blacklist contains files and" @@ -267,7 +267,7 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) else { id = popup->insertItem( i18n( "Add to blacklist" ), - this, SLOT( slotChangeBlacklist() ) ); + this, TQT_SLOT( slotChangeBlacklist() ) ); popup->setWhatsThis( id, i18n( "Add to blacklist

" "Adds the given file or directory to the blacklist.
The blacklist contains files and" " directories that should be ignored even if they match a project filetype " @@ -283,8 +283,8 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) for ( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) { kdDebug( 9025 ) << "Checking URL: " << *it << endl; - QString canPath( URLUtil::canonicalPath(( *it ).path() ) ); - QString relPath = relativeToProject( canPath ); + TQString canPath( URLUtil::canonicalPath(( *it ).path() ) ); + TQString relPath = relativeToProject( canPath ); kdDebug( 9025 ) << "relpath: " << relPath << "|canpath: " << canPath << endl; if ( isInBlacklist( relPath ) ) continue; @@ -295,7 +295,7 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( !project()->isProjectFile( canPath ) ) m_contextAddFiles << relPath; } - if ( QFileInfo(( *it ).path() ).isDir() ) + if ( TQFileInfo(( *it ).path() ).isDir() ) { if ( containsProjectFiles( canPath ) || project()->isProjectFile( canPath ) ) { @@ -317,13 +317,13 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( m_contextAddFiles.size() > 0 ) { int id = popup->insertItem( i18n( "Add Selected File/Dir(s) to Project" ), - this, SLOT( slotAddToProject() ) ); + this, TQT_SLOT( slotAddToProject() ) ); popup->setWhatsThis( id, i18n( "Add to project

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, SLOT( slotAddToProjectRecursive() ) ); + this, TQT_SLOT( slotAddToProjectRecursive() ) ); popup->setWhatsThis( id, i18n( "Add to project

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." ) ); } @@ -332,14 +332,14 @@ void CustomProjectPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( m_contextRemoveFiles.size() > 0 ) { int id = popup->insertItem( i18n( "Remove Selected File/Dir(s) From Project" ), - this, SLOT( slotRemoveFromProject() ) ); + this, TQT_SLOT( slotRemoveFromProject() ) ); popup->setWhatsThis( id, i18n( "Remove from project

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, SLOT( slotRemoveFromProjectRecursive() ) ); + this, TQT_SLOT( slotRemoveFromProjectRecursive() ) ); popup->setWhatsThis( id, i18n( "Remove from project

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." ) ); } @@ -385,19 +385,19 @@ void CustomProjectPart::slotChangeBlacklist() void CustomProjectPart::slotChooseActiveDirectory() { - QString olddir = activeDirectory(); - QDomDocument &dom = *projectDom(); + TQString olddir = activeDirectory(); + TQDomDocument &dom = *projectDom(); DomUtil::writeEntry( dom, "/kdevcustomproject/general/activedir", m_contextDirName ); emit activeDirectoryChanged( olddir, activeDirectory() ); } -void CustomProjectPart::openProject( const QString &dirName, const QString &projectName ) +void CustomProjectPart::openProject( const TQString &dirName, const TQString &projectName ) { m_projectDirectory = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if ( DomUtil::readEntry( dom, "/kdevcustomproject/run/directoryradio" ) == "" ) { @@ -406,7 +406,7 @@ void CustomProjectPart::openProject( const QString &dirName, const QString &proj if ( filetypes().isEmpty() ) { - QStringList types; + TQStringList types; types << "*.java" << "*.h" << "*.H" << "*.hh" << "*.hxx" << "*.hpp" << "*.c" << "*.C" << "*.cc" << "*.cpp" << "*.c++" << "*.cxx" << "Makefile" << "CMakeLists.txt"; DomUtil::writeListEntry( dom, "/kdevcustomproject/filetypes", "filetype", types ); @@ -420,33 +420,33 @@ void CustomProjectPart::openProject( const QString &dirName, const QString &proj if ( m_filelistDir.isEmpty() ) m_filelistDir = dirName; - if ( QFileInfo( m_filelistDir + "/" + projectName.lower() + + if ( TQFileInfo( m_filelistDir + "/" + projectName.lower() + ".kdevelop.filelist" ).exists() ) { - QDir( m_filelistDir ).rename( + TQDir( m_filelistDir ).rename( projectName.lower() + ".kdevelop.filelist", projectName + ".kdevelop.filelist" ); } - QFile f( m_filelistDir + "/" + projectName + ".kdevelop.filelist" ); + TQFile f( m_filelistDir + "/" + projectName + ".kdevelop.filelist" ); if ( f.open( IO_ReadOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); while ( !stream.atEnd() ) { - QString s = stream.readLine(); + TQString s = stream.readLine(); // Skip comments. if ( s.isEmpty() || s.startsWith( "#" ) ) continue; // Skip non-existent files. - if ( ! QFileInfo( projectDirectory() + "/" + s ).exists() ) + if ( ! TQFileInfo( projectDirectory() + "/" + s ).exists() ) continue; // Do not bother with files already in project or on blacklist. if ( isInProject( s ) || isInBlacklist( s ) ) continue; addToProject( s ); } - QStringList newfiles; + TQStringList newfiles; findNewFiles( dirName, newfiles ); if ( newfiles.count() > 0 ) @@ -460,19 +460,19 @@ void CustomProjectPart::openProject( const QString &dirName, const QString &proj int r = KMessageBox::questionYesNo( mainWindow()->main(), i18n( "This project does not contain any files yet.\n" "Populate it with all C/C++/Java files below " - "the project directory?" ), QString::null, i18n( "Populate" ), i18n( "Do Not Populate" ) ); + "the project directory?" ), TQString::null, i18n( "Populate" ), i18n( "Do Not Populate" ) ); if ( r == KMessageBox::Yes ) populateProject(); } // check if there is an old envvars entry (from old project file with single make environment) - QString buildtool = DomUtil::readEntry( dom , "/kdevcustomproject/build/buildtool" ); - QDomElement el = + TQString buildtool = DomUtil::readEntry( dom , "/kdevcustomproject/build/buildtool" ); + TQDomElement el = DomUtil::elementByPath( dom , "/kdevcustomproject/" + buildtool + "/envvars" ); if ( !el.isNull() ) { - QDomElement envs = DomUtil::createElementByPath( dom , "/kdevcustomproject/" + buildtool + "/environments" ); + TQDomElement envs = DomUtil::createElementByPath( dom , "/kdevcustomproject/" + buildtool + "/environments" ); DomUtil::makeEmpty( envs ); el.setTagName( "default" ); envs.appendChild( el ); @@ -490,23 +490,23 @@ void CustomProjectPart::openProject( const QString &dirName, const QString &proj * @param dir directory to scan (and recurse) for potential project files. * @param[out] fileList the list of files found. */ -void CustomProjectPart::findNewFiles( const QString& dir, QStringList& filelist ) const +void CustomProjectPart::findNewFiles( const TQString& dir, TQStringList& filelist ) const { if ( dir.isEmpty() ) return; - QStringList fileentries = QDir( dir ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( dir ).entryList( QDir::Dirs ); - QStringList entries = fileentries + dirs; - QString relpath = relativeToProject( dir ); + TQStringList fileentries = TQDir( dir ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( dir ).entryList( TQDir::Dirs ); + TQStringList entries = fileentries + dirs; + TQString relpath = relativeToProject( dir ); if ( !relpath.isEmpty() ) relpath += "/"; - for ( QStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) + for ( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) { // Only process genuine entries - files and directories. if (( *it == "." ) || ( *it == ".." ) ) continue; // If the entry (be it a file or a directory) is already part of this project, proceed to next one. - const QString relativeEntry( relpath + *it ); + const TQString relativeEntry( relpath + *it ); if ( isInProject( relativeEntry ) ) continue; // If the entry is blacklisted, proceed to next one. @@ -519,24 +519,24 @@ void CustomProjectPart::findNewFiles( const QString& dir, QStringList& filelist continue; // We have a new, non-blacklisted entry. // Recurse into it (a directory) or add it to the potential list of new project files. - const QString absoluteEntry( dir + "/" + *it ); - if ( QFileInfo( absoluteEntry ).isFile() ) + const TQString absoluteEntry( dir + "/" + *it ); + if ( TQFileInfo( absoluteEntry ).isFile() ) { filelist << relativeEntry; } - else if ( QFileInfo( absoluteEntry ).isDir() ) + else if ( TQFileInfo( absoluteEntry ).isDir() ) { bool searchRecursive = true; - QFileInfo fi( absoluteEntry ); + TQFileInfo fi( absoluteEntry ); if( fi.isSymLink() ) { - QString realDir = fi.readLink(); - if( QFileInfo( realDir ).exists() ) + TQString realDir = fi.readLink(); + if( TQFileInfo( realDir ).exists() ) { - for( QStringList::const_iterator it = filelist.constBegin(); it != filelist.constEnd(); ++it ) + for( TQStringList::const_iterator it = filelist.constBegin(); it != filelist.constEnd(); ++it ) { - if( QFileInfo(projectDirectory()+"/"+*it).absFilePath().startsWith( realDir ) ) + if( TQFileInfo(projectDirectory()+"/"+*it).absFilePath().startsWith( realDir ) ) { searchRecursive = false; } @@ -559,24 +559,24 @@ void CustomProjectPart::populateProject() KDialogBase* dlg = new KDialogBase( mainWindow()->main(), "typeselector", true, "Select filetypes of project", KDialogBase::Ok | KDialogBase::Cancel ); - QVBox* box = dlg->makeVBoxMainWidget(); + TQVBox* box = dlg->makeVBoxMainWidget(); KEditListBox* lb = new KEditListBox( "Filetypes in the project", box, "selecttypes", false, KEditListBox::Add | KEditListBox::Remove ); lb->setItems( filetypes() ); - if ( dlg->exec() == QDialog::Accepted ) + if ( dlg->exec() == TQDialog::Accepted ) { setFiletypes( lb->items() ); } - QApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( Qt::waitCursor ); removeFiles( allFiles() ); - updateBlacklist( QStringList() ); + updateBlacklist( TQStringList() ); - QStringList newlist; + TQStringList newlist; findNewFiles( projectDirectory(), newlist ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); addNewFilesToProject( newlist ); } @@ -588,11 +588,11 @@ void CustomProjectPart::closeProject() void CustomProjectPart::saveProject() { - QFile f( m_filelistDir + "/" + m_projectName + ".kdevelop.filelist" ); + TQFile f( m_filelistDir + "/" + m_projectName + ".kdevelop.filelist" ); if ( !f.open( IO_WriteOnly ) ) return; - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << "# KDevelop Custom Project File List" << endl; ProjectFilesSet::ConstIterator it; @@ -602,13 +602,13 @@ void CustomProjectPart::saveProject() } -QString CustomProjectPart::projectDirectory() const +TQString CustomProjectPart::projectDirectory() const { return m_projectDirectory; } -QString CustomProjectPart::projectName() const +TQString CustomProjectPart::projectName() const { return m_projectName; } @@ -630,9 +630,9 @@ DomUtil::PairList CustomProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString CustomProjectPart::runDirectory() const +TQString CustomProjectPart::runDirectory() const { - QString cwd = defaultRunDirectory( "kdevcustomproject" ); + TQString cwd = defaultRunDirectory( "kdevcustomproject" ); if ( cwd.isEmpty() ) cwd = buildDirectory(); return cwd; @@ -648,15 +648,15 @@ QString CustomProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString CustomProjectPart::mainProgram() const +TQString CustomProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevcustomproject/run/mainprogram" ); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevcustomproject/run/mainprogram" ); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith( "/" ) ) // assume absolute path { @@ -667,48 +667,48 @@ QString CustomProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -/** Retuns a QString with the debug command line arguments */ -QString CustomProjectPart::debugArguments() const +/** Retuns a TQString with the debug command line arguments */ +TQString CustomProjectPart::debugArguments() const { return DomUtil::readEntry( *projectDom(), "/kdevcustomproject/run/globaldebugarguments" ); } -/** Retuns a QString with the run command line arguments */ -QString CustomProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString CustomProjectPart::runArguments() const { return DomUtil::readEntry( *projectDom(), "/kdevcustomproject/run/programargs" ); } -QString CustomProjectPart::activeDirectory() const +TQString CustomProjectPart::activeDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); return DomUtil::readEntry( dom, "/kdevcustomproject/general/activedir", "." ); } -QStringList CustomProjectPart::allFiles() const +TQStringList CustomProjectPart::allFiles() const { return m_sourceFilesSet.keys(); } -void CustomProjectPart::addFile( const QString &fileName ) +void CustomProjectPart::addFile( const TQString &fileName ) { - QStringList fileList; + TQStringList fileList; fileList.append( fileName ); this->addFiles( fileList ); } -void CustomProjectPart::addFiles( const QStringList& fileList ) +void CustomProjectPart::addFiles( const TQStringList& fileList ) { - QStringList::ConstIterator it; - QStringList addedFiles; - QStringList myfileList = fileList; + TQStringList::ConstIterator it; + TQStringList addedFiles; + TQStringList myfileList = fileList; kdDebug( 9025 ) << "Adding files: " << myfileList << endl; myfileList.remove( "." ); myfileList.remove( "" ); @@ -717,9 +717,9 @@ void CustomProjectPart::addFiles( const QStringList& fileList ) { if ( isInBlacklist( *it ) ) continue; - QString relpath; + TQString relpath; kdDebug( 9025 ) << "Checking path: " << *it << endl; - if ( QDir::isRelativePath( *it ) ) + if ( TQDir::isRelativePath( *it ) ) { kdDebug( 9025 ) << *it << " is relative" << endl; relpath = *it; @@ -730,17 +730,17 @@ void CustomProjectPart::addFiles( const QStringList& fileList ) relpath = relativeToProject( *it ); } - if ( !QFileInfo( projectDirectory() + "/" + relpath ).exists() ) + if ( !TQFileInfo( projectDirectory() + "/" + relpath ).exists() ) continue; - if ( QFileInfo( projectDirectory() + "/" + relpath ).isDir() && ( m_recursive || m_first_recursive ) ) + if ( TQFileInfo( projectDirectory() + "/" + relpath ).isDir() && ( m_recursive || m_first_recursive ) ) { kdDebug( 9025 ) << "is a dir and " << m_recursive << "|" << m_first_recursive << endl; m_first_recursive = false; - QStringList fileentries = QDir( projectDirectory() + "/" + relpath ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( projectDirectory() + "/" + relpath ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; - for ( QStringList::iterator subit = subentries.begin(); subit != subentries.end(); ++subit ) + TQStringList fileentries = TQDir( projectDirectory() + "/" + relpath ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( projectDirectory() + "/" + relpath ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; + for ( TQStringList::iterator subit = subentries.begin(); subit != subentries.end(); ++subit ) { if ( *subit != "." && *subit != ".." ) *subit = relpath + "/" + ( *subit ); @@ -752,12 +752,12 @@ void CustomProjectPart::addFiles( const QStringList& fileList ) addToProject( relpath ); m_first_recursive = true; } - else if ( isProjectFileType( QFileInfo( relpath ).fileName() ) && ( ! isInProject( relpath ) ) ) + else if ( isProjectFileType( TQFileInfo( relpath ).fileName() ) && ( ! isInProject( relpath ) ) ) { - QStringList paths = QStringList::split( "/", relpath ); + TQStringList paths = TQStringList::split( "/", relpath ); paths.pop_back(); - QString path; - for ( QStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) + TQString path; + for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) { path += *it; if ( ! isInProject( path ) ) @@ -782,39 +782,39 @@ void CustomProjectPart::addFiles( const QStringList& fileList ) emit addedFilesToProject( addedFiles ); } -void CustomProjectPart::removeFile( const QString &fileName ) +void CustomProjectPart::removeFile( const TQString &fileName ) { - QStringList fileList; + TQStringList fileList; fileList.append( fileName ); this->removeFiles( fileList ); } -void CustomProjectPart::removeFiles( const QStringList& fileList ) +void CustomProjectPart::removeFiles( const TQStringList& fileList ) { kdDebug( 9025 ) << "Emitting removedFilesFromProject" << fileList << endl; - QStringList removedFiles; - QStringList myfileList = fileList; - QStringList::ConstIterator it; + TQStringList removedFiles; + TQStringList myfileList = fileList; + TQStringList::ConstIterator it; myfileList.remove( "." ); myfileList.remove( ".." ); myfileList.remove( "" ); for ( it = myfileList.begin(); it != myfileList.end(); ++it ) { - QString relpath; - if ( QDir::isRelativePath( *it ) ) + TQString relpath; + if ( TQDir::isRelativePath( *it ) ) relpath = *it; else relpath = relativeToProject( *it ); - if ( QFileInfo( projectDirectory() + "/" + relpath ).isDir() && ( m_recursive || m_first_recursive ) ) + if ( TQFileInfo( projectDirectory() + "/" + relpath ).isDir() && ( m_recursive || m_first_recursive ) ) { m_first_recursive = false; - QStringList fileentries = QDir( projectDirectory() + "/" + relpath ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( projectDirectory() + "/" + relpath ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; - for ( QStringList::iterator subit = subentries.begin(); subit != subentries.end(); ++subit ) + TQStringList fileentries = TQDir( projectDirectory() + "/" + relpath ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( projectDirectory() + "/" + relpath ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; + for ( TQStringList::iterator subit = subentries.begin(); subit != subentries.end(); ++subit ) if ( *subit != "." && *subit != ".." ) *subit = relpath + "/" + ( *subit ); removeFiles( subentries ); @@ -829,13 +829,13 @@ void CustomProjectPart::removeFiles( const QStringList& fileList ) { removedFiles << relpath; removeFromProject( relpath ); - QStringList paths = QStringList::split( "/", relpath ); - QString lastsubentry = paths[paths.size()-1]; + TQStringList paths = TQStringList::split( "/", relpath ); + TQString lastsubentry = paths[paths.size()-1]; paths.pop_back(); while ( paths.size() > 0 ) { - QString dir = paths.join( "/" ); - QStringList projectentries = projectFilesInDir( dir ); + TQString dir = paths.join( "/" ); + TQStringList projectentries = projectFilesInDir( dir ); if ( projectentries.size() == 0 ) { removedFiles << dir; @@ -853,28 +853,28 @@ void CustomProjectPart::removeFiles( const QStringList& fileList ) emit removedFilesFromProject( removedFiles ); } -QString CustomProjectPart::buildDirectory() const +TQString CustomProjectPart::buildDirectory() const { - QString dir = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/builddir" ); + TQString dir = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/builddir" ); if ( dir.isEmpty() ) return projectDirectory(); - if ( QFileInfo( dir ).isRelative() ) - return QDir::cleanDirPath( projectDirectory() + "/" + dir ); + if ( TQFileInfo( dir ).isRelative() ) + return TQDir::cleanDirPath( projectDirectory() + "/" + dir ); return dir; } -QString CustomProjectPart::makeEnvironment() const +TQString CustomProjectPart::makeEnvironment() const { // Get the make environment variables pairs into the environstr string // in the form of: "ENV_VARIABLE=ENV_VALUE" // Note that we quote the variable value due to the possibility of // embedded spaces - QString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); + TQString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); DomUtil::PairList envvars = DomUtil::readPairListEntry( *projectDom(), "/kdevcustomproject/" + buildtool + "/environments/" + currentMakeEnvironment(), "envvar", "name", "value" ); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for ( it = envvars.begin(); it != envvars.end(); ++it ) { @@ -892,15 +892,15 @@ QString CustomProjectPart::makeEnvironment() const } -void CustomProjectPart::startMakeCommand( const QString &dir, const QString &target, bool withKdesu ) +void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &target, bool withKdesu ) { if ( partController()->saveAllFiles() == false ) return; //user cancelled - QDomDocument &dom = *projectDom(); - QString buildtool = DomUtil::readEntry( dom, "/kdevcustomproject/build/buildtool" ); + TQDomDocument &dom = *projectDom(); + TQString buildtool = DomUtil::readEntry( dom, "/kdevcustomproject/build/buildtool" ); - QString cmdline; + TQString cmdline; if ( buildtool == "ant" ) { cmdline = "ant"; @@ -925,7 +925,7 @@ void CustomProjectPart::startMakeCommand( const QString &dir, const QString &tar if ( jobs != 0 ) { cmdline += " -j"; - cmdline += QString::number( jobs ); + cmdline += TQString::number( jobs ); } if ( DomUtil::readBoolEntry( dom, "/kdevcustomproject/make/dontact" ) ) cmdline += " -n"; @@ -936,15 +936,15 @@ void CustomProjectPart::startMakeCommand( const QString &dir, const QString &tar if ( !target.isEmpty() ) cmdline += KProcess::quote( target ); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote( dir ); dircmd += " && "; int prio = DomUtil::readIntEntry( dom, "/kdevcustomproject/" + buildtool + "/prio" ); - QString nice; + TQString nice; if ( prio != 0 ) { - nice = QString( "nice -n%1 " ).arg( prio ); + nice = TQString( "nice -n%1 " ).arg( prio ); } cmdline.prepend( nice ); @@ -963,7 +963,7 @@ void CustomProjectPart::startMakeCommand( const QString &dir, const QString &tar void CustomProjectPart::slotBuild() { m_lastCompilationFailed = false; - QString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); + TQString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); startMakeCommand( buildDirectory(), DomUtil::readEntry( *projectDom(), "/kdevcustomproject/" + buildtool + "/defaulttarget" ) ); } @@ -971,7 +971,7 @@ void CustomProjectPart::slotBuild() void CustomProjectPart::slotBuildActiveDir() { m_lastCompilationFailed = false; - QString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); + TQString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); startMakeCommand( buildDirectory() + "/" + activeDirectory(), DomUtil::readEntry( *projectDom(), "/kdevcustomproject/" + buildtool + "/defaulttarget" ) ); } @@ -983,10 +983,10 @@ void CustomProjectPart::slotCompileFile() if ( !part || !part->url().isLocalFile() ) return; - QString fileName = part->url().path(); - QFileInfo fi( fileName ); - QString sourceDir = fi.dirPath(); - QString baseName = fi.baseName( true ); + TQString fileName = part->url().path(); + TQFileInfo fi( fileName ); + TQString sourceDir = fi.dirPath(); + TQString baseName = fi.baseName( true ); kdDebug( 9025 ) << "Compiling " << fileName << "in dir " << sourceDir << " with baseName " << baseName << endl; @@ -994,16 +994,16 @@ void CustomProjectPart::slotCompileFile() // What would be nice: In case of non-recursive build system, climb up from // the source dir until a Makefile is found - QString buildDir = sourceDir; - QString target = baseName + ".o"; + TQString buildDir = sourceDir; + TQString target = baseName + ".o"; - QString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); + TQString buildtool = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/buildtool" ); //if there is no Makefile in the directory of the source file //try to build it from the main build dir //this works e.g. for non-recursive cmake Makefiles, Alex - if ( buildtool == "make" && ( QFile::exists( sourceDir + "/Makefile" ) == false ) - && ( QFile::exists( sourceDir + "/makefile" ) == false ) ) + if ( buildtool == "make" && ( TQFile::exists( sourceDir + "/Makefile" ) == false ) + && ( TQFile::exists( sourceDir + "/makefile" ) == false ) ) { buildDir = buildDirectory(); } @@ -1013,12 +1013,12 @@ void CustomProjectPart::slotCompileFile() void CustomProjectPart::slotInstallActiveDir() { - startMakeCommand( buildDirectory() + "/" + activeDirectory(), QString::fromLatin1( "install" ) ); + startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::fromLatin1( "install" ) ); } void CustomProjectPart::slotInstall() { - startMakeCommand( buildDirectory(), QString::fromLatin1( "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(), QString::fromLatin1( "install" ), true ); + startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true ); } void CustomProjectPart::slotClean() { - startMakeCommand( buildDirectory(), QString::fromLatin1( "clean" ) ); + startMakeCommand( buildDirectory(), TQString::fromLatin1( "clean" ) ); } @@ -1043,20 +1043,20 @@ void CustomProjectPart::slotExecute() partController()->saveAllFiles(); bool _auto = false; - if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autocompile", true ) && ( isDirty() || !QFileInfo( mainProgram() ).exists() ) ) + if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autocompile", true ) && ( isDirty() || !TQFileInfo( mainProgram() ).exists() ) ) { m_executeAfterBuild = true; slotBuild(); _auto = true; } - if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autoinstall", false ) && ( isDirty() || !QFileInfo( mainProgram() ).exists() ) ) + if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autoinstall", false ) && ( isDirty() || !TQFileInfo( mainProgram() ).exists() ) ) { m_executeAfterBuild = true; // Use kdesu?? if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autokdesu", false ) ) //slotInstallWithKdesu assumes that it hasn't just been build... - _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), QString::fromLatin1( "install" ), true ); + _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true ); else slotInstall(); _auto = true; @@ -1070,7 +1070,7 @@ void CustomProjectPart::slotExecute() // Note that we quote the variable value due to the possibility of // embedded spaces DomUtil::PairList envvars = runEnvironmentVars(); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for ( it = envvars.begin(); it != envvars.end(); ++it ) { @@ -1084,7 +1084,7 @@ void CustomProjectPart::slotExecute() // Do not execute non executable targets return; - QString program = environstr; + TQString program = environstr; program += mainProgram(); program += " " + runArguments(); @@ -1107,18 +1107,18 @@ void CustomProjectPart::updateTargetMenu() m_targetObjectFilesMenu->clear(); m_targetOtherFilesMenu->clear(); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); bool ant = DomUtil::readEntry( dom, "/kdevcustomproject/build/buildtool" ) == "ant"; if ( ant ) { - QFile f( buildDirectory() + "/build.xml" ); + TQFile f( buildDirectory() + "/build.xml" ); if ( !f.open( IO_ReadOnly ) ) { kdDebug( 9025 ) << "No build file" << endl; return; } - QDomDocument dom; + TQDomDocument dom; if ( !dom.setContent( &f ) ) { kdDebug( 9025 ) << "Build script not valid xml" << endl; @@ -1127,7 +1127,7 @@ void CustomProjectPart::updateTargetMenu() } f.close(); - QDomNode node = dom.documentElement().firstChild(); + TQDomNode node = dom.documentElement().firstChild(); while ( !node.isNull() ) { if ( node.toElement().tagName() == "target" ) @@ -1162,7 +1162,7 @@ void CustomProjectPart::updateTargetMenu() m_targetMenu->insertItem( i18n( "Other Files" ), m_targetOtherFilesMenu ); int id = 0; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = m_targets.begin(); it != m_targets.end(); ++it ) m_targetMenu->insertItem( *it, id++ ); @@ -1184,31 +1184,31 @@ void CustomProjectPart::putEnvVarsInVarMap() m_makefileVars[( *it ).first] = ( *it ).second; //is qouting here required as in makeEnvironment() ?? } -void CustomProjectPart::parseMakefile( const QString& filename ) +void CustomProjectPart::parseMakefile( const TQString& filename ) { if ( m_parsedMakefiles.contains( filename ) ) return; m_parsedMakefiles.insert( filename, 1 ); - QString absFilename = filename; + TQString absFilename = filename; if ( !filename.startsWith( "/" ) ) absFilename = buildDirectory() + "/" + filename; - QFile f( absFilename ); + TQFile f( absFilename ); if ( !f.open( IO_ReadOnly ) ) { kdDebug( 9025 ) << "could not open " << absFilename << endl; return; } - QRegExp targetRe( "^ *([^\\t$.#]\\S+) *:.*$" ); + TQRegExp targetRe( "^ *([^\\t$.#]\\S+) *:.*$" ); targetRe.setMinimal( true ); - QRegExp variablesRe( "\\$\\(\\s*([^\\)\\s]+)\\s*\\)" ); - QRegExp assignmentRe( "^\\s*(\\S+)\\s*[:\\?]?=\\s*(\\S+)\\s*(#.*)?$" ); + TQRegExp variablesRe( "\\$\\(\\s*([^\\)\\s]+)\\s*\\)" ); + TQRegExp assignmentRe( "^\\s*(\\S+)\\s*[:\\?]?=\\s*(\\S+)\\s*(#.*)?$" ); - QRegExp includedMakefilesRe( "^include\\s+(\\S+)" ); - QString str = ""; + TQRegExp includedMakefilesRe( "^include\\s+(\\S+)" ); + TQString str = ""; while ( !f.atEnd() ) { f.readLine( str, 200 ); @@ -1217,7 +1217,7 @@ void CustomProjectPart::parseMakefile( const QString& filename ) int offset = -1; while (( offset = variablesRe.search( str, offset + 1 ) ) != -1 ) { - QString variableName = variablesRe.cap( 1 ).simplifyWhiteSpace(); + TQString variableName = variablesRe.cap( 1 ).simplifyWhiteSpace(); if ( m_makefileVars.contains( variableName ) ) { str.replace( variablesRe.cap( 0 ), m_makefileVars[variableName] ); @@ -1237,12 +1237,12 @@ void CustomProjectPart::parseMakefile( const QString& filename ) } else if ( includedMakefilesRe.search( str ) != -1 ) { - QString includedMakefile = includedMakefilesRe.cap( 1 ).simplifyWhiteSpace(); + TQString includedMakefile = includedMakefilesRe.cap( 1 ).simplifyWhiteSpace(); m_makefilesToParse.push( includedMakefile ); } else if ( targetRe.search( str ) != -1 ) { - QString tmpTarget = targetRe.cap( 1 ).simplifyWhiteSpace(); + TQString tmpTarget = targetRe.cap( 1 ).simplifyWhiteSpace(); if ( tmpTarget.endsWith( ".o" ) ) { if ( m_targetsObjectFiles.find( tmpTarget ) == m_targetsObjectFiles.end() ) @@ -1265,29 +1265,29 @@ void CustomProjectPart::parseMakefile( const QString& filename ) void CustomProjectPart::targetMenuActivated( int id ) { - QString target = m_targets[id]; + TQString target = m_targets[id]; startMakeCommand( buildDirectory(), target ); } void CustomProjectPart::targetObjectFilesMenuActivated( int id ) { - QString target = m_targetsObjectFiles[id]; + TQString target = m_targetsObjectFiles[id]; startMakeCommand( buildDirectory(), target ); } void CustomProjectPart::targetOtherFilesMenuActivated( int id ) { - QString target = m_targetsOtherFiles[id]; + TQString target = m_targetsOtherFiles[id]; startMakeCommand( buildDirectory(), target ); } void CustomProjectPart::updateMakeEnvironmentsMenu() { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); bool makeUsed = ( DomUtil::readEntry( dom, "/kdevcustomproject/build/buildtool" ) == "make" ); if ( makeUsed ) { - QStringList l = allMakeEnvironments(); + TQStringList l = allMakeEnvironments(); m_makeEnvironmentsSelector->setItems( l ); m_makeEnvironmentsSelector->setCurrentItem( l.findIndex( currentMakeEnvironment() ) ); } @@ -1297,10 +1297,10 @@ void CustomProjectPart::updateMakeEnvironmentsMenu() } /* m_makeEnvironmentsMenu->clear(); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QStringList environments = allMakeEnvironments(); - QStringList::ConstIterator it; + TQStringList environments = allMakeEnvironments(); + TQStringList::ConstIterator it; int id = 0; for (it = environments.begin(); it != environments.end(); ++it) m_makeEnvironmentsMenu->insertItem(*it, id++); @@ -1310,29 +1310,29 @@ void CustomProjectPart::updateMakeEnvironmentsMenu() void CustomProjectPart::makeEnvironmentsMenuActivated( int id ) { - QDomDocument &dom = *projectDom(); - QString environment = allMakeEnvironments()[id]; + TQDomDocument &dom = *projectDom(); + TQString environment = allMakeEnvironments()[id]; DomUtil::writeEntry( dom, "/kdevcustomproject/make/selectedenvironment", environment ); } -void CustomProjectPart::slotCommandFinished( const QString& command ) +void CustomProjectPart::slotCommandFinished( const TQString& command ) { kdDebug( 9025 ) << "CustomProjectPart::slotProcessFinished()" << endl; if ( m_buildCommand != command ) return; - m_buildCommand = QString::null; + m_buildCommand = TQString::null; m_timestamp.clear(); - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { - QString fileName = *it; + TQString fileName = *it; ++it; - m_timestamp[ fileName ] = QFileInfo( projectDirectory(), fileName ).lastModified(); + m_timestamp[ fileName ] = TQFileInfo( projectDirectory(), fileName ).lastModified(); } emit projectCompiled(); @@ -1344,7 +1344,7 @@ void CustomProjectPart::slotCommandFinished( const QString& command ) } } -void CustomProjectPart::slotCommandFailed( const QString& /*command*/ ) +void CustomProjectPart::slotCommandFailed( const TQString& /*command*/ ) { m_lastCompilationFailed = true; m_executeAfterBuild = false; @@ -1354,15 +1354,15 @@ bool CustomProjectPart::isDirty() { if ( m_lastCompilationFailed ) return true; - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { - QString fileName = *it; + TQString fileName = *it; ++it; - QMap::Iterator it = m_timestamp.find( fileName ); - QDateTime t = QFileInfo( projectDirectory(), fileName ).lastModified(); + TQMap::Iterator it = m_timestamp.find( fileName ); + TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if ( it == m_timestamp.end() || *it != t ) { return true; @@ -1373,19 +1373,19 @@ bool CustomProjectPart::isDirty() } -QStringList CustomProjectPart::allMakeEnvironments() const +TQStringList CustomProjectPart::allMakeEnvironments() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QStringList allConfigs; + TQStringList allConfigs; - QDomNode node = + TQDomNode node = DomUtil::elementByPath( dom , "/kdevcustomproject/make/environments" ); // extract the names of the different make environments - QDomElement childEl = node.firstChild().toElement(); + TQDomElement childEl = node.firstChild().toElement(); while ( !childEl.isNull() ) { - QString config = childEl.tagName(); + TQString config = childEl.tagName(); allConfigs.append( config ); childEl = childEl.nextSibling().toElement(); } @@ -1396,11 +1396,11 @@ QStringList CustomProjectPart::allMakeEnvironments() const } -QString CustomProjectPart::currentMakeEnvironment() const +TQString CustomProjectPart::currentMakeEnvironment() const { - QStringList allEnvs = allMakeEnvironments(); - QDomDocument &dom = *projectDom(); - QString environment = DomUtil::readEntry( dom, "/kdevcustomproject/make/selectedenvironment" ); + TQStringList allEnvs = allMakeEnvironments(); + TQDomDocument &dom = *projectDom(); + TQString environment = DomUtil::readEntry( dom, "/kdevcustomproject/make/selectedenvironment" ); if ( environment.isEmpty() || !allEnvs.contains( environment ) ) environment = allEnvs[0]; return environment; @@ -1409,30 +1409,30 @@ QString CustomProjectPart::currentMakeEnvironment() const /*! \fn CustomProjectPart::distFiles() const */ -QStringList CustomProjectPart::distFiles() const +TQStringList CustomProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir( projectDir ); - QStringList files = dir.entryList( "*README*" ); + TQString projectDir = projectDirectory(); + TQDir dir( projectDir ); + TQStringList files = dir.entryList( "*README*" ); return sourceList + files; } -bool CustomProjectPart::containsNonProjectFiles( const QString& dir ) +bool CustomProjectPart::containsNonProjectFiles( const TQString& dir ) { if ( isInBlacklist( dir ) ) return false; - QStringList fileentries = QDir( dir ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( dir ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; + TQStringList fileentries = TQDir( dir ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( dir ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; subentries.remove( "." ); subentries.remove( ".." ); - for ( QStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) + for ( TQStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) { if ( isInBlacklist( *it ) ) continue; - if ( QFileInfo( dir + "/" + *it ).isDir() && !isInBlacklist( *it ) ) + if ( TQFileInfo( dir + "/" + *it ).isDir() && !isInBlacklist( *it ) ) { if ( containsNonProjectFiles( dir + "/" + *it ) ) { @@ -1448,22 +1448,22 @@ bool CustomProjectPart::containsNonProjectFiles( const QString& dir ) return false; } -bool CustomProjectPart::containsProjectFiles( const QString& dir ) +bool CustomProjectPart::containsProjectFiles( const TQString& dir ) { if ( isInBlacklist( dir ) ) return false; - QStringList fileentries = QDir( dir ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( dir ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; + TQStringList fileentries = TQDir( dir ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( dir ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; subentries.remove( "." ); subentries.remove( ".." ); - for ( QStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) + for ( TQStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) { if ( isInBlacklist( *it ) ) continue; - if ( QFileInfo( dir + "/" + *it ).isDir() && !isInBlacklist( *it ) ) + if ( TQFileInfo( dir + "/" + *it ).isDir() && !isInBlacklist( *it ) ) { if ( containsProjectFiles( dir + "/" + *it ) ) { @@ -1478,15 +1478,15 @@ bool CustomProjectPart::containsProjectFiles( const QString& dir ) return false; } -QStringList CustomProjectPart::projectFilesInDir( const QString& dir ) +TQStringList CustomProjectPart::projectFilesInDir( const TQString& dir ) { - QStringList result; - QStringList fileentries = QDir( projectDirectory() + "/" + dir ).entryList( filetypes().join( ";" ) ); - QStringList dirs = QDir( projectDirectory() + "/" + dir ).entryList( QDir::Dirs ); - QStringList subentries = fileentries + dirs; + TQStringList result; + TQStringList fileentries = TQDir( projectDirectory() + "/" + dir ).entryList( filetypes().join( ";" ) ); + TQStringList dirs = TQDir( projectDirectory() + "/" + dir ).entryList( TQDir::Dirs ); + TQStringList subentries = fileentries + dirs; subentries.remove( "." ); subentries.remove( ".." ); - for ( QStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) + for ( TQStringList::const_iterator it = subentries.begin(); it != subentries.end(); ++it ) { if ( isInProject( dir + "/" + *it ) ) { @@ -1496,16 +1496,16 @@ QStringList CustomProjectPart::projectFilesInDir( const QString& dir ) return result; } -QStringList CustomProjectPart::filetypes( ) const +TQStringList CustomProjectPart::filetypes( ) const { return DomUtil::readListEntry( *projectDom(), "/kdevcustomproject/filetypes", "filetype" ); } -bool CustomProjectPart::isProjectFileType( const QString& filename ) const +bool CustomProjectPart::isProjectFileType( const TQString& filename ) const { - QStringList types = filetypes(); - QRegExp re( "", true, true ); - for ( QStringList::const_iterator it = types.begin(); it != types.end(); ++it ) + TQStringList types = filetypes(); + TQRegExp re( "", true, true ); + for ( TQStringList::const_iterator it = types.begin(); it != types.end(); ++it ) { re.setPattern( *it ); int pos = re.search( filename ); @@ -1520,9 +1520,9 @@ bool CustomProjectPart::isProjectFileType( const QString& filename ) const return false; } -void CustomProjectPart::switchBlacklistEntry( const QString& path ) +void CustomProjectPart::switchBlacklistEntry( const TQString& path ) { - QStringList blacklist = this->blacklist(); + TQStringList blacklist = this->blacklist(); kdDebug( 9025 ) << "Switching path " << path << endl; if ( !isInBlacklist( path ) ) { @@ -1538,9 +1538,9 @@ void CustomProjectPart::switchBlacklistEntry( const QString& path ) updateBlacklist( blacklist ); } -QString CustomProjectPart::relativeToProject( const QString& abspath ) const +TQString CustomProjectPart::relativeToProject( const TQString& abspath ) const { - QString path = abspath.mid( projectDirectory().length() + 1 ); + TQString path = abspath.mid( projectDirectory().length() + 1 ); kdDebug( 9025 ) << "abspath: " << "|project dir: " << projectDirectory() << "|path: " << path << endl; if ( path.endsWith( "/" ) ) path = path.mid( 0, path.length() - 1 ); @@ -1549,17 +1549,17 @@ QString CustomProjectPart::relativeToProject( const QString& abspath ) const return path; } -bool CustomProjectPart::isInBlacklist( const QString& path ) const +bool CustomProjectPart::isInBlacklist( const TQString& path ) const { - QString relpath = path; - QStringList blacklist = this->blacklist(); - if ( !QFileInfo( relpath ).isRelative() ) + TQString relpath = path; + TQStringList blacklist = this->blacklist(); + if ( !TQFileInfo( relpath ).isRelative() ) relpath = relativeToProject( path ); if ( blacklist.find( relpath ) != blacklist.end() ) return true; - QStringList paths = QStringList::split( "/", relpath ); - QString parentpath; - for ( QStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) + TQStringList paths = TQStringList::split( "/", relpath ); + TQString parentpath; + for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) { parentpath += *it; if ( blacklist.find( parentpath ) != blacklist.end() ) @@ -1569,22 +1569,22 @@ bool CustomProjectPart::isInBlacklist( const QString& path ) const return false; } -void CustomProjectPart::updateBlacklist( const QStringList& l ) +void CustomProjectPart::updateBlacklist( const TQStringList& l ) { DomUtil::writeListEntry( *projectDom(), "kdevcustomproject/blacklist", "path", l ); } -QStringList CustomProjectPart::blacklist() const +TQStringList CustomProjectPart::blacklist() const { return DomUtil::readListEntry( *projectDom(), "kdevcustomproject/blacklist", "path" ); } -void CustomProjectPart::addNewFilesToProject( const QStringList& filelist ) +void CustomProjectPart::addNewFilesToProject( const TQStringList& filelist ) { - QStringList addfiles; - for ( QStringList::const_iterator it = filelist.begin(); it != filelist.end(); ++it ) + TQStringList addfiles; + for ( TQStringList::const_iterator it = filelist.begin(); it != filelist.end(); ++it ) { - if (( ! isInProject( *it ) ) && ( isProjectFileType( *it ) || QFileInfo( projectDirectory() + "/" + *it ).isDir() ) && !isInBlacklist( *it ) ) + if (( ! isInProject( *it ) ) && ( isProjectFileType( *it ) || TQFileInfo( projectDirectory() + "/" + *it ).isDir() ) && !isInBlacklist( *it ) ) { addfiles << *it; } @@ -1598,12 +1598,12 @@ void CustomProjectPart::addNewFilesToProject( const QStringList& filelist ) { m_first_recursive = false; m_recursive = false; - QStringList blacklist = this->blacklist(); - QStringList excludelist = dlg->excludedPaths(); - QStringList removeFromExcludes; - for ( QStringList::const_iterator it = excludelist.begin(); it != excludelist.end(); ++it ) + TQStringList blacklist = this->blacklist(); + TQStringList excludelist = dlg->excludedPaths(); + TQStringList removeFromExcludes; + for ( TQStringList::const_iterator it = excludelist.begin(); it != excludelist.end(); ++it ) { - if ( QFileInfo( projectDirectory() + "/" + *it ).isDir() ) + if ( TQFileInfo( projectDirectory() + "/" + *it ).isDir() ) { for ( ProjectFilesSet::ConstIterator it2 = m_sourceFilesSet.constBegin(); it2 != m_sourceFilesSet.constEnd(); ++it2 ) { @@ -1614,7 +1614,7 @@ void CustomProjectPart::addNewFilesToProject( const QStringList& filelist ) } } } - for ( QStringList::const_iterator it = removeFromExcludes.begin(); it != removeFromExcludes.end(); ++it ) + for ( TQStringList::const_iterator it = removeFromExcludes.begin(); it != removeFromExcludes.end(); ++it ) { excludelist.remove( *it ); } @@ -1624,7 +1624,7 @@ void CustomProjectPart::addNewFilesToProject( const QStringList& filelist ) } } -void CustomProjectPart::setFiletypes( const QStringList& l ) +void CustomProjectPart::setFiletypes( const TQStringList& l ) { DomUtil::writeListEntry( *projectDom(), "kdevcustomproject/filetypes", "filetype", l ); } @@ -1635,7 +1635,7 @@ void CustomProjectPart::setFiletypes( const QStringList& l ) * * @param fileName */ -bool CustomProjectPart::isInProject( const QString& fileName ) const +bool CustomProjectPart::isInProject( const TQString& fileName ) const { return m_sourceFilesSet.contains( fileName ); } @@ -1648,7 +1648,7 @@ bool CustomProjectPart::isInProject( const QString& fileName ) const * * @see removeFromProject() */ -void CustomProjectPart::addToProject( const QString& fileName ) +void CustomProjectPart::addToProject( const TQString& fileName ) { m_sourceFilesSet.insert( fileName, false ); } @@ -1659,7 +1659,7 @@ void CustomProjectPart::addToProject( const QString& fileName ) * * @param fileName */ -void CustomProjectPart::removeFromProject( const QString& fileName ) +void CustomProjectPart::removeFromProject( const TQString& fileName ) { m_sourceFilesSet.remove( fileName ); } diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index f3fb9ec4..67b5088b 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -14,11 +14,11 @@ #ifndef _CUSTOMPROJECTPART_H_ #define _CUSTOMPROJECTPART_H_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -35,44 +35,44 @@ class CustomProjectPart : public KDevBuildTool Q_OBJECT public: - CustomProjectPart( QObject *parent, const char *name, const QStringList & ); + CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ); ~CustomProjectPart(); - QStringList allMakeEnvironments() const; - QString currentMakeEnvironment() const; + TQStringList allMakeEnvironments() const; + TQString currentMakeEnvironment() const; bool isDirty(); - QStringList distFiles() const; + TQStringList distFiles() const; - virtual void openProject( const QString &dirName, const QString &projectName ); + virtual void openProject( const TQString &dirName, const TQString &projectName ); virtual void closeProject(); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString mainProgram() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual void addFile( const QString &fileName ); - virtual void addFiles( const QStringList& fileList ); - virtual void removeFile( const QString &fileName ); - virtual void removeFiles( const QStringList &fileList ); - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString mainProgram() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual void addFile( const TQString &fileName ); + virtual void addFiles( const TQStringList& fileList ); + virtual void removeFile( const TQString &fileName ); + virtual void removeFiles( const TQStringList &fileList ); + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; - QString relativeToProject( const QString& ) const; + TQString relativeToProject( const TQString& ) const; private slots: void populateProject(); void projectConfigWidget( KDialogBase *dlg ); - void contextMenu( QPopupMenu *popup, const Context *context ); + void contextMenu( TQPopupMenu *popup, const Context *context ); void slotAddToProject(); void slotRemoveFromProject(); void slotAddToProjectRecursive(); void slotRemoveFromProjectRecursive(); - void addNewFilesToProject( const QStringList& ); + void addNewFilesToProject( const TQStringList& ); void slotChangeBlacklist(); void slotChooseActiveDirectory(); void slotBuild(); @@ -89,32 +89,32 @@ private slots: void targetOtherFilesMenuActivated( int id ); void updateMakeEnvironmentsMenu(); void makeEnvironmentsMenuActivated( int id ); - void slotCommandFinished( const QString& command ); - void slotCommandFailed( const QString& command ); + void slotCommandFinished( const TQString& command ); + void slotCommandFailed( const TQString& command ); private: - bool containsNonProjectFiles( const QString& url ); - QStringList projectFilesInDir( const QString& dir ); - bool containsProjectFiles( const QString& url ); - bool isProjectFileType( const QString& absFile ) const; - bool isInBlacklist( const QString& ) const; + bool containsNonProjectFiles( const TQString& url ); + TQStringList projectFilesInDir( const TQString& dir ); + bool containsProjectFiles( const TQString& url ); + bool isProjectFileType( const TQString& absFile ) const; + bool isInBlacklist( const TQString& ) const; void cleanFileList(); - void setFiletypes( const QStringList& ); - void findNewFiles( const QString& dir, QStringList& list) const; + void setFiletypes( const TQStringList& ); + void findNewFiles( const TQString& dir, TQStringList& list) const; - QStringList filetypes() const; - QStringList blacklist() const; - void updateBlacklist( const QStringList& ); + TQStringList filetypes() const; + TQStringList blacklist() const; + void updateBlacklist( const TQStringList& ); void saveProject(); - void startMakeCommand( const QString &dir, const QString &target, bool withKdesu = false ); - void parseMakefile( const QString& file ); - QString makeEnvironment() const; + void startMakeCommand( const TQString &dir, const TQString &target, bool withKdesu = false ); + void parseMakefile( const TQString& file ); + TQString makeEnvironment() const; void putEnvVarsInVarMap(); - void switchBlacklistEntry(const QString& ); + void switchBlacklistEntry(const TQString& ); - bool isInProject( const QString& fileName ) const; - void addToProject( const QString& fileName ); - void removeFromProject( const QString& fileName ); + bool isInProject( const TQString& fileName ) const; + void addToProject( const TQString& fileName ); + void removeFromProject( const TQString& fileName ); /** * @brief Set of all the project's files. @@ -125,31 +125,31 @@ private: * keyed by the file name, * as a set-container replacement. */ - typedef QMap ProjectFilesSet; + typedef TQMap ProjectFilesSet; - QString m_projectDirectory; - QString m_projectName; - QString m_filelistDir; + TQString m_projectDirectory; + TQString m_projectName; + TQString m_filelistDir; /** All the sources (files and directories) of this project. */ ProjectFilesSet m_sourceFilesSet; - QPopupMenu *m_targetMenu; - QPopupMenu *m_targetObjectFilesMenu; - QPopupMenu *m_targetOtherFilesMenu; + TQPopupMenu *m_targetMenu; + TQPopupMenu *m_targetObjectFilesMenu; + TQPopupMenu *m_targetOtherFilesMenu; KSelectAction *m_makeEnvironmentsSelector; - QStringList m_targets; - QStringList m_targetsObjectFiles; - QStringList m_targetsOtherFiles; - QStringList m_contextAddFiles; - QStringList m_contextRemoveFiles; - QString m_contextDirName; - - QMap m_timestamp; + TQStringList m_targets; + TQStringList m_targetsObjectFiles; + TQStringList m_targetsOtherFiles; + TQStringList m_contextAddFiles; + TQStringList m_contextRemoveFiles; + TQString m_contextDirName; + + TQMap m_timestamp; bool m_executeAfterBuild; - QString m_buildCommand; + TQString m_buildCommand; bool m_lastCompilationFailed; - QMap m_parsedMakefiles; - QValueStack m_makefilesToParse; - QMap m_makefileVars; + TQMap m_parsedMakefiles; + TQValueStack m_makefilesToParse; + TQMap m_makefileVars; bool m_recursive; bool m_first_recursive; }; diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp index cfcb84e6..a4c0db99 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.cpp +++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp @@ -12,21 +12,21 @@ #include "selectnewfilesdialog.h" -#include +#include #include -#include -#include +#include +#include #include #include #include "selectnewfilesdialogbase.h" -SelectNewFilesDialog::SelectNewFilesDialog( QStringList paths, QWidget* parent, const char* name ) +SelectNewFilesDialog::SelectNewFilesDialog( TQStringList paths, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n("Add newly created files to project"), KDialogBase::Ok|KDialogBase::Cancel ) { m_widget = new SelectNewFilesDialogBase(this); m_widget->fileView->header()->hide(); m_widget->fileView->addColumn(i18n("Path") ); - for( QStringList::const_iterator it = paths.begin(); it != paths.end(); ++it) + for( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it) { addPath(0, *it); } @@ -44,84 +44,84 @@ void SelectNewFilesDialog::slotCancel() KDialogBase::slotCancel(); } -void SelectNewFilesDialog::checkItem( QCheckListItem* item, const QString& curpath ) +void SelectNewFilesDialog::checkItem( TQCheckListItem* item, const TQString& curpath ) { if( !item ) return; - QString path = curpath + item->text(); - if( item->state() != QCheckListItem::Off ) + TQString path = curpath + item->text(); + if( item->state() != TQCheckListItem::Off ) includePaths << path; else excludePaths << path; if( item->firstChild() ) { - checkItem( static_cast(item->firstChild()), path+"/" ); + checkItem( static_cast(item->firstChild()), path+"/" ); } if( item->nextSibling() ) { - checkItem( static_cast(item->nextSibling()), curpath ); + checkItem( static_cast(item->nextSibling()), curpath ); } } void SelectNewFilesDialog::slotOk() { - QCheckListItem* item = static_cast (m_widget->fileView->firstChild()); + TQCheckListItem* item = static_cast (m_widget->fileView->firstChild()); checkItem( item, "" ); kdDebug(9025) << "Inc List:" << includePaths << endl; kdDebug(9025) << "Exc List:" << excludePaths << endl; KDialogBase::slotOk(); } -void SelectNewFilesDialog::addPath( QCheckListItem* item, const QString& path ) +void SelectNewFilesDialog::addPath( TQCheckListItem* item, const TQString& path ) { if( path.isEmpty() ) return; - QStringList parts = QStringList::split("/", path ); - QString name = parts.first(); + TQStringList parts = TQStringList::split("/", path ); + TQString name = parts.first(); parts.pop_front(); - QCheckListItem* i = createItem( item, name, parts.size() ); - i->setState( QCheckListItem::On ); + TQCheckListItem* i = createItem( item, name, parts.size() ); + i->setState( TQCheckListItem::On ); i->setTristate( true ); addPath(i, parts.join("/") ); } -QCheckListItem* SelectNewFilesDialog::createItem( QCheckListItem* parent, const QString& name, int count ) +TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* parent, const TQString& name, int count ) { - QCheckListItem::Type t = QCheckListItem::CheckBox; + TQCheckListItem::Type t = TQCheckListItem::CheckBox; if( count > 0 ) - t = QCheckListItem::CheckBoxController; + t = TQCheckListItem::CheckBoxController; if( parent == 0 ) { - QListViewItem* item = m_widget->fileView->firstChild(); + TQListViewItem* item = m_widget->fileView->firstChild(); while( item ) { if( item->text( 0 ) == name ) - return static_cast(item); + return static_cast(item); item = item->nextSibling(); } - return new QCheckListItem( m_widget->fileView, name, t ); + return new TQCheckListItem( m_widget->fileView, name, t ); }else { - QListViewItem* item = parent->firstChild(); + TQListViewItem* item = parent->firstChild(); while( item ) { if( item->text( 0 ) == name ) - return static_cast(item); + return static_cast(item); item = item->nextSibling(); } - return new QCheckListItem( parent, name, t ); + return new TQCheckListItem( parent, name, t ); } } -QStringList SelectNewFilesDialog::excludedPaths() const +TQStringList SelectNewFilesDialog::excludedPaths() const { return excludePaths; } -QStringList SelectNewFilesDialog::includedPaths() const +TQStringList SelectNewFilesDialog::includedPaths() const { return includePaths; } diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h index b970dc7d..966cfaa4 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.h +++ b/buildtools/custommakefiles/selectnewfilesdialog.h @@ -23,11 +23,11 @@ class SelectNewFilesDialog : public KDialogBase Q_OBJECT public: - SelectNewFilesDialog( QStringList paths, QWidget* parent = 0, const char* name = 0 ); + SelectNewFilesDialog( TQStringList paths, TQWidget* parent = 0, const char* name = 0 ); ~SelectNewFilesDialog(); - QStringList excludedPaths() const; - QStringList includedPaths() const; + TQStringList excludedPaths() const; + TQStringList includedPaths() const; public slots: /*$PUBLIC_SLOTS$*/ @@ -40,12 +40,12 @@ protected slots: virtual void slotCancel(); virtual void slotOk(); private: - void addPath( QCheckListItem* , const QString& ); - void checkItem( QCheckListItem* item, const QString& curpath ); - QCheckListItem* createItem( QCheckListItem*, const QString&, int ); + void addPath( TQCheckListItem* , const TQString& ); + void checkItem( TQCheckListItem* item, const TQString& curpath ); + TQCheckListItem* createItem( TQCheckListItem*, const TQString&, int ); SelectNewFilesDialogBase* m_widget; - QStringList excludePaths; - QStringList includePaths; + TQStringList excludePaths; + TQStringList includePaths; }; #endif diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp index 27ddf692..2dfc3d84 100644 --- a/buildtools/lib/base/kdevbuildtool.cpp +++ b/buildtools/lib/base/kdevbuildtool.cpp @@ -21,7 +21,7 @@ #include #include -KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, QObject* parent, const char* name) +KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name) :KDevProject(info, parent, name) { } diff --git a/buildtools/lib/base/kdevbuildtool.h b/buildtools/lib/base/kdevbuildtool.h index 79db5f6e..ff1abcc0 100644 --- a/buildtools/lib/base/kdevbuildtool.h +++ b/buildtools/lib/base/kdevbuildtool.h @@ -29,7 +29,7 @@ class KDevAppFrontend; class KDevBuildTool: public KDevProject { public: - KDevBuildTool(const KDevPluginInfo* info, QObject* parent, const char* name); + KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name); /**@return The make frontend.*/ KDevMakeFrontend *makeFrontend(); diff --git a/buildtools/lib/parsers/autotools/autotools_yacc.cpp b/buildtools/lib/parsers/autotools/autotools_yacc.cpp index 827cf4bc..93cdb733 100644 --- a/buildtools/lib/parsers/autotools/autotools_yacc.cpp +++ b/buildtools/lib/parsers/autotools/autotools_yacc.cpp @@ -150,7 +150,7 @@ noinst_HEADERS = foo.h #regognize me @fixme 1 shift/reduce conflict in "line_body" rule */ -#include +#include #include "autotoolsast.h" #define YYSTYPE_IS_DECLARED @@ -164,7 +164,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. @@ -183,7 +183,7 @@ struct Result { foo3.cpp foo4.cpp */ - QStringList values; + TQStringList values; }; typedef Result YYSTYPE; @@ -206,7 +206,7 @@ When a scope or function scope statement is parsed, the child ProjectAST is crea and pushed onto the stack. Therefore all statements which belong to the scope or function scope are added as childs to their direct parent (scope or function scope). */ -QValueStack projects; +TQValueStack projects; /** The current depth of AST node is stored here. @@ -1381,7 +1381,7 @@ yyreduce: { AssignmentAST *node = new AssignmentAST(); node->scopedID = yyvsp[-1].value; - node->values = QStringList(yyvsp[0].value); + node->values = TQStringList(yyvsp[0].value); yyval.node = node; ;} break; diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index 757f4699..ddcbddc3 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp @@ -28,7 +28,7 @@ namespace AutoTools { AST::~AST() { - for (QValueList::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList::iterator it = m_children.begin(); it != m_children.end(); ++it) { AST *node = *it; delete node; @@ -40,9 +40,9 @@ void AST::addChildAST(AST *node) m_children.append(node); } -void AST::writeBack(QString &buffer) +void AST::writeBack(TQString &buffer) { - for (QValueList::const_iterator it = m_children.constBegin(); + for (TQValueList::const_iterator it = m_children.constBegin(); it != m_children.constEnd(); ++it) { if (*it) @@ -50,9 +50,9 @@ void AST::writeBack(QString &buffer) } } -QString AST::indentation() +TQString AST::indentation() { - QString result; + TQString result; for (int i = 0; i < depth(); i++) result += '\t'; return result; @@ -63,14 +63,14 @@ bool AST::hasChildren() const return !m_children.isEmpty(); } -QValueList AST::children() const +TQValueList AST::children() const { return m_children; } //ProjectAST -void ProjectAST::writeBack(QString &buffer) +void ProjectAST::writeBack(TQString &buffer) { if ( isRule() ) buffer += scopedID; @@ -87,27 +87,27 @@ void ProjectAST::addChildAST(AST *node) AST::addChildAST(node); } -void AssignmentAST::writeBack(QString &buffer) +void AssignmentAST::writeBack(TQString &buffer) { buffer += indentation() + scopedID + " " + op + values.join(""); } -void AutomakeTargetAST::writeBack( QString& buffer ) +void AutomakeTargetAST::writeBack( TQString& buffer ) { buffer += target + ":" + deps.join(""); } -void ConditionAST::writeBack( QString& buffer ) +void ConditionAST::writeBack( TQString& buffer ) { buffer += indentation() + type + " " + conditionName; } -void NewLineAST::writeBack(QString &buffer) +void NewLineAST::writeBack(TQString &buffer) { buffer += "\n"; } -void CommentAST::writeBack(QString &buffer) +void CommentAST::writeBack(TQString &buffer) { buffer += indentation() + comment; } diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index 9c7ae66a..768e3e07 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.h +++ b/buildtools/lib/parsers/autotools/autotoolsast.h @@ -23,7 +23,7 @@ #ifndef AUTOTOOLSAST_H #define AUTOTOOLSAST_H -#include +#include /** @file autotools.h @@ -71,7 +71,7 @@ public: * This is a default implementation which iterates over child nodes * and calls writeBack for each child node. */ - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /** @return The type of the node.*/ virtual NodeType nodeType() const { return m_nodeType; } @@ -83,7 +83,7 @@ public: int depth() const { return m_depth; } /** @return The indentation string based on node depth.*/ - virtual QString indentation(); + virtual TQString indentation(); //! \return true if this AST has children bool hasChildren() const; @@ -92,13 +92,13 @@ public: * Get the children of this ast * \return the list of this ast's childre */ - QValueList children() const; + TQValueList children() const; protected: NodeType m_nodeType; - QValueList m_children; + TQValueList m_children; private: int m_depth; @@ -135,7 +135,7 @@ public: /** Constructs a project node of given @p kind. */ ProjectAST(Kind kind = Project): AST(AST::ProjectAST), m_kind(kind) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); virtual void addChildAST(AST *node); /** @return true if this node is a project.*/ @@ -150,16 +150,16 @@ public: bool isEmpty() const { return m_kind == Empty; } /**Scoped identifier (scope name or rule).*/ - QString scopedID; + TQString scopedID; /**Function arguments. Empty for other kinds of projects.*/ - QString args; + TQString args; /** The automake conditional has an else attached */ bool hasElse; /**List of statements.*/ - QValueList statements; + TQValueList statements; private: Kind m_kind; @@ -192,16 +192,16 @@ class AssignmentAST: public AST public: AssignmentAST(): AST(AST::AssignmentAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Scoped name of the variable.*/ - QString scopedID; + TQString scopedID; /**Operator.*/ - QString op; + TQString op; /**List of values.*/ - QStringList values; + TQStringList values; }; class AutomakeTargetAST : public AST @@ -209,13 +209,13 @@ class AutomakeTargetAST : public AST public: AutomakeTargetAST() : AST(AST::TargetAST) {} - virtual void writeBack( QString& buffer ); + virtual void writeBack( TQString& buffer ); /// The name of the target - QString target; + TQString target; /// The dependencies for the target, if any - QStringList deps; + TQStringList deps; }; class ConditionAST : public AST @@ -223,13 +223,13 @@ class ConditionAST : public AST public: ConditionAST() : AST( AST::MakefileConditionalAST ) {} - virtual void writeBack( QString& buffer ); + virtual void writeBack( TQString& buffer ); /// The keyword for the condition (if, else, endif) - QString type; + TQString type; /// The name of the condition - QString conditionName; + TQString conditionName; }; /** @@ -241,7 +241,7 @@ class NewLineAST: public AST public: NewLineAST(): AST(AST::NewLineAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); }; @@ -255,10 +255,10 @@ class CommentAST: public AST public: CommentAST(): AST(AST::CommentAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Comment text.*/ - QString comment; + TQString comment; }; diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp index a3d53151..05734c3f 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp @@ -24,13 +24,13 @@ #include "autotoolsast.h" #include -#include +#include #include extern FILE *yyin, *yyout; extern int yyparse(); //extern int yydebug; -extern QValueStack projects; +extern TQValueStack projects; namespace AutoTools { @@ -49,14 +49,14 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast) return ret; } -int Driver::parseFile(QString fileName, ProjectAST **ast) +int Driver::parseFile(TQString fileName, ProjectAST **ast) { return parseFile(fileName.ascii(), ast); } int Driver::parseFile(KURL fileName, ProjectAST **ast) { - QString tmpFile; + TQString tmpFile; int ret = 0; if (KIO::NetAccess::download(fileName, tmpFile, 0)) ret = parseFile(tmpFile, ast); diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.h b/buildtools/lib/parsers/autotools/autotoolsdriver.h index 4e52c6ec..5f6ac7e7 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.h +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.h @@ -23,7 +23,7 @@ #ifndef QMAKEQMAKEDRIVER_H #define QMAKEQMAKEDRIVER_H -#include +#include #include namespace AutoTools { @@ -49,14 +49,14 @@ public: * @return The result of parsing. Result is 0 on success and <> 0 on failure. */ static int parseFile(const char *fileName, ProjectAST **ast); - static int parseFile(QString fileName, ProjectAST **ast); + static int parseFile(TQString fileName, ProjectAST **ast); static int parseFile(KURL fileName, ProjectAST **ast); /* template static void walkAST(Op &op, const ProjectAST *ast) { // op(ast); - for (QValueList::const_iterator it = ast->statements.constBegin(); + for (TQValueList::const_iterator it = ast->statements.constBegin(); it != ast->statements.constEnd(); ++it) { const AST *child = *it; diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 24d6aea4..0dc8e733 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp @@ -19,61 +19,61 @@ ***************************************************************************/ #include "viewer.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include using namespace AutoTools; -Viewer::Viewer(QWidget *parent, const char *name) +Viewer::Viewer(TQWidget *parent, const char *name) :ViewerBase(parent, name) { - if (QFile::exists(QDir::currentDirPath() + "/" + "qtlist")) + if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { - QFile f(QDir::currentDirPath() + "/" + "qtlist"); + TQFile f(TQDir::currentDirPath() + "/" + "qtlist"); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); while (!str.eof()) files->insertItem(str.readLine()); } ast->setSorting(-1); - parentProject.push((QListViewItem*)0); + parentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() { if (allLocation->text().isEmpty()) return; - QDir d(allLocation->text()); - QStringList l = d.entryList("*.am"); - for (QStringList::iterator it = l.begin(); it != l.end(); ++it) - (*it) = QDir::cleanDirPath(allLocation->text() + "/" + (*it)); + TQDir d(allLocation->text()); + TQStringList l = d.entryList("*.am"); + for (TQStringList::iterator it = l.begin(); it != l.end(); ++it) + (*it) = TQDir::cleanDirPath(allLocation->text() + "/" + (*it)); files->insertStringList(l); } void Viewer::choose_clicked() { - QString fileName = QFileDialog::getOpenFileName(QDir::currentDirPath(), "*.am", this); + TQString fileName = TQFileDialog::getOpenFileName(TQDir::currentDirPath(), "*.am", this); if (!fileName.isEmpty()) files->insertItem(fileName); } -void Viewer::files_currentChanged(QListBoxItem* item) +void Viewer::files_currentChanged(TQListBoxItem* item) { ast->clear(); - QFile f(item->text()); + TQFile f(item->text()); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); source->setText(str.read()); f.close(); @@ -86,30 +86,30 @@ void Viewer::files_currentChanged(QListBoxItem* item) tabWidget2_selected("Source to be written back"); } -void Viewer::tabWidget2_selected(const QString& text) +void Viewer::tabWidget2_selected(const TQString& text) { if ((text == "Source to be written back") && projectAST) { - QString buffer; + TQString buffer; projectAST->writeBack(buffer); writeBack->setText(buffer); } } -void Viewer::processAST(ProjectAST *projectAST, QListViewItem *globAfter) +void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { - QListViewItem *projectIt; + TQListViewItem *projectIt; if (!parentProject.top()) - projectIt = new QListViewItem(ast, "Project"); + projectIt = new TQListViewItem(ast, "Project"); else { if ( projectAST->isConditionalScope() || projectAST->isRule() ) - projectIt = new QListViewItem(parentProject.top(), globAfter, projectAST->scopedID); + projectIt = new TQListViewItem(parentProject.top(), globAfter, projectAST->scopedID); } projectIt->setOpen(true); - QListViewItem *after = 0; - for (QValueList::const_iterator it = projectAST->statements.constBegin(); + TQListViewItem *after = 0; + for (TQValueList::const_iterator it = projectAST->statements.constBegin(); it != projectAST->statements.constEnd(); ++it) { AST *ast = *it; @@ -118,7 +118,7 @@ void Viewer::processAST(ProjectAST *projectAST, QListViewItem *globAfter) switch (ast->nodeType()) { case AST::AssignmentAST: { AssignmentAST *assignmentAST = static_cast(ast); - QListViewItem *item = new QListViewItem(projectIt, after, + TQListViewItem *item = new TQListViewItem(projectIt, after, assignmentAST->scopedID, assignmentAST->op, assignmentAST->values.join("")); item->setMultiLinesEnabled(true); after = item; } @@ -127,25 +127,25 @@ void Viewer::processAST(ProjectAST *projectAST, QListViewItem *globAfter) case AST::TargetAST: { AutomakeTargetAST* ata = static_cast(ast); - QListViewItem* item = new QListViewItem(projectIt, after, - ata->target, QString::null, ata->deps.join("")); + TQListViewItem* item = new TQListViewItem(projectIt, after, + ata->target, TQString::null, ata->deps.join("")); after = item; } break; case AST::NewLineAST: -// after = new QListViewItem(projectIt, after, ""); +// after = new TQListViewItem(projectIt, after, ""); break; case AST::CommentAST: -// after = new QListViewItem(projectIt, after, ""); +// after = new TQListViewItem(projectIt, after, ""); break; case AST::MakefileConditionalAST: { ConditionAST* ata = static_cast(ast); - QListViewItem* item = new QListViewItem(projectIt, after, - ata->type, ata->conditionName, QString::null ); + TQListViewItem* item = new TQListViewItem(projectIt, after, + ata->type, ata->conditionName, TQString::null ); after = item; } case AST::ProjectAST: { diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h index f46cec46..3b0443f7 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.h +++ b/buildtools/lib/parsers/autotools/tests/viewer.h @@ -20,7 +20,7 @@ #ifndef VIEWER_H #define VIEWER_H -#include +#include #include "viewerbase.h" @@ -31,16 +31,16 @@ class QListViewItem; class Viewer: public ViewerBase { Q_OBJECT public: - Viewer(QWidget *parent = 0, const char *name = 0); - void processAST(AutoTools::ProjectAST *projectAST, QListViewItem *globAfter = 0); + Viewer(TQWidget *parent = 0, const char *name = 0); + void processAST(AutoTools::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: - virtual void tabWidget2_selected(const QString&); - virtual void files_currentChanged(QListBoxItem*); + virtual void tabWidget2_selected(const TQString&); + virtual void files_currentChanged(TQListBoxItem*); virtual void choose_clicked(); virtual void addAll_clicked(); private: AutoTools::ProjectAST *projectAST; - QValueStack parentProject; + TQValueStack parentProject; }; #endif diff --git a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp index 707a1364..380767a9 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include "viewer.h" int main(int argc, char **argv) { - QApplication app(argc, argv); + TQApplication app(argc, argv); Viewer viewer; app.setMainWidget(&viewer); diff --git a/buildtools/lib/parsers/qmake/qmake_lex.cpp b/buildtools/lib/parsers/qmake/qmake_lex.cpp index a428b163..9fe37664 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.cpp +++ b/buildtools/lib/parsers/qmake/qmake_lex.cpp @@ -953,7 +953,7 @@ case 2: YY_RULE_SETUP #line 83 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::LIST_WS; } YY_BREAK @@ -963,7 +963,7 @@ YY_RULE_SETUP #line 88 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::CONT; } YY_BREAK @@ -973,7 +973,7 @@ YY_RULE_SETUP #line 94 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COMMENT_CONT; } YY_BREAK @@ -981,7 +981,7 @@ case 5: YY_RULE_SETUP #line 100 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::ID_SIMPLE); } YY_BREAK @@ -989,7 +989,7 @@ case 6: YY_RULE_SETUP #line 105 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); mylval->value = mylval->value.mid(0, mylval->value.length()-1); unput(')'); BEGIN(INITIAL); @@ -1001,7 +1001,7 @@ YY_RULE_SETUP #line 113 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::VARIABLE_VALUE; } YY_BREAK @@ -1010,7 +1010,7 @@ YY_RULE_SETUP #line 119 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::QUOTED_VARIABLE_VALUE; } YY_BREAK @@ -1019,7 +1019,7 @@ YY_RULE_SETUP #line 125 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::EQ; } YY_BREAK @@ -1028,7 +1028,7 @@ YY_RULE_SETUP #line 131 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::PLUSEQ; } YY_BREAK @@ -1037,7 +1037,7 @@ YY_RULE_SETUP #line 137 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::MINUSEQ; } YY_BREAK @@ -1046,7 +1046,7 @@ YY_RULE_SETUP #line 143 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::STAREQ; } YY_BREAK @@ -1055,7 +1055,7 @@ YY_RULE_SETUP #line 149 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::TILDEEQ; } YY_BREAK @@ -1100,7 +1100,7 @@ case 19: YY_RULE_SETUP #line 177 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COLON; } YY_BREAK @@ -1110,7 +1110,7 @@ YY_RULE_SETUP #line 183 "qmake.ll" { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } @@ -1121,7 +1121,7 @@ YY_RULE_SETUP #line 190 "qmake.ll" { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } @@ -1132,7 +1132,7 @@ YY_RULE_SETUP #line 197 "qmake.ll" { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::COMMENT); } YY_BREAK @@ -2215,7 +2215,7 @@ namespace QMake return yylex(); } - void Lexer::setLineEndingFromString( const QString& str ) + void Lexer::setLineEndingFromString( const TQString& str ) { if( str.endsWith("\r\n") && m_lineEnding == None ) m_lineEnding = Windows; diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h index 1b91e747..242cec2a 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.h +++ b/buildtools/lib/parsers/qmake/qmake_lex.h @@ -36,7 +36,7 @@ namespace QMake Lexer( std::istream* argin = 0, std::ostream* argout = 0 ); int yylex( QMake::Parser::semantic_type* yylval ); int yylex(); - void setLineEndingFromString( const QString& ); + void setLineEndingFromString( const TQString& ); LineEnding lineending(); private: QMake::Parser::semantic_type* mylval; diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp index 9cd09ebe..32722979 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp @@ -144,7 +144,7 @@ namespace QMake #endif /// Build a parser object. - Parser::Parser (QMake::Lexer* lexer_yyarg, QValueStack& projects_yyarg, int depth_yyarg) + Parser::Parser (QMake::Lexer* lexer_yyarg, TQValueStack& projects_yyarg, int depth_yyarg) : yydebug_ (false), yycdebug_ (&std::cerr), lexer (lexer_yyarg), @@ -584,7 +584,7 @@ namespace QMake case 26: #line 293 "qmake.yy" { - (yyval.values) = QStringList(); + (yyval.values) = TQStringList(); (yyval.values).append( (yysemantic_stack_[(2) - (1)].value) ); (yyval.values).append( (yysemantic_stack_[(2) - (2)].value) ); ;} @@ -611,8 +611,8 @@ namespace QMake case 30: #line 312 "qmake.yy" { - (yyval.value) = QString(); - (yyval.indent) = QString(); + (yyval.value) = TQString(); + (yyval.indent) = TQString(); ;} break; diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp index 60030b3c..91583cd3 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp @@ -85,9 +85,9 @@ SOURCES = foo #regognize me @fixme 1 shift/reduce conflict in "line_body" rule */ -#include +#include #include "qmakeast.h" -#include +#include #define YYSTYPE_IS_DECLARED @@ -102,7 +102,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. @@ -121,8 +121,8 @@ struct Result { foo3.cpp foo4.cpp */ - QStringList values; - QString indent; + TQStringList values; + TQString indent; }; #define YYSTYPE Result @@ -143,7 +143,7 @@ When a scope or function scope statement is parsed, the child ProjectAST is crea and pushed onto the stack. Therefore all statements which belong to the scope or function scope are added as childs to their direct parent (scope or function scope). */ -//QValueStack projects; +//TQValueStack projects; /** The current depth of AST node is stored here. @@ -249,7 +249,7 @@ namespace QMake typedef token::yytokentype token_type; /// Build a parser object. - Parser (QMake::Lexer* lexer_yyarg, QValueStack& projects_yyarg, int depth_yyarg); + Parser (QMake::Lexer* lexer_yyarg, TQValueStack& projects_yyarg, int depth_yyarg); virtual ~Parser (); /// Parse. @@ -409,7 +409,7 @@ namespace QMake /* User arguments. */ QMake::Lexer* lexer; - QValueStack& projects; + TQValueStack& projects; int depth; }; } diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index a60e9a53..91e48d2d 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -27,7 +27,7 @@ namespace QMake { AST::~AST() { - for (QValueList::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList::iterator it = m_children.begin(); it != m_children.end(); ++it) { AST *node = *it; delete node; @@ -45,9 +45,9 @@ void AST::removeChildAST(AST *node) m_children.remove(node); } -void AST::writeBack(QString &buffer) +void AST::writeBack(TQString &buffer) { - for (QValueList::const_iterator it = m_children.constBegin(); + for (TQValueList::const_iterator it = m_children.constBegin(); it != m_children.constEnd(); ++it) { if (*it) @@ -57,9 +57,9 @@ void AST::writeBack(QString &buffer) } } -QString AST::indentation() +TQString AST::indentation() { - QString result; + TQString result; for (int i = 0; i < depth(); i++) result += " "; return result; @@ -67,10 +67,10 @@ QString AST::indentation() //ProjectAST -void ProjectAST::writeBack(QString &buffer) +void ProjectAST::writeBack(TQString &buffer) { bool hasActualStatements = false; - for (QValueList::const_iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList::const_iterator it = m_children.begin(); it != m_children.end(); ++it) { if ((*it)->nodeType() != AST::IncludeAST) { @@ -128,7 +128,7 @@ AssignmentAST::~AssignmentAST() { } -void AssignmentAST::writeBack(QString &buffer) +void AssignmentAST::writeBack(TQString &buffer) { if( !buffer.endsWith(": ") ) buffer += indentation(); @@ -141,7 +141,7 @@ void AssignmentAST::writeBack(QString &buffer) //NewLineAST -void NewLineAST::writeBack(QString &buffer) +void NewLineAST::writeBack(TQString &buffer) { buffer += "\n"; } @@ -149,7 +149,7 @@ void NewLineAST::writeBack(QString &buffer) //CommentAST -void CommentAST::writeBack(QString &buffer) +void CommentAST::writeBack(TQString &buffer) { if( !buffer.endsWith(": ") ) buffer += indentation(); @@ -159,7 +159,7 @@ void CommentAST::writeBack(QString &buffer) //IncludeAST -void IncludeAST::writeBack(QString &/*buffer*/) +void IncludeAST::writeBack(TQString &/*buffer*/) { } diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h index 35612fc1..45aedb2e 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.h +++ b/buildtools/lib/parsers/qmake/qmakeast.h @@ -20,7 +20,7 @@ #ifndef QMAKEQMAKEAST_H #define QMAKEQMAKEAST_H -#include +#include /** @file qmakeast.h @@ -66,7 +66,7 @@ public: /**Writes information stored in the AST into the @p buffer. This is a default implementation which iterates over child nodes and calls writeBack for each child node.*/ - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**@return The type of the node.*/ virtual NodeType nodeType() const { return m_nodeType; } @@ -76,10 +76,10 @@ public: /**@return The depth of the node in AST.*/ int depth() const { return m_depth; } /**@return The indentation string based on node depth.*/ - virtual QString indentation(); + virtual TQString indentation(); /**The list of child AST nodes.*/ - QValueList m_children; + TQValueList m_children; protected: NodeType m_nodeType; @@ -122,7 +122,7 @@ public: /**Constructs a project node of given @p kind.*/ ProjectAST(Kind kind = Project): AST(AST::ProjectAST), m_kind(kind) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**@return true if this node is a project.*/ bool isProject() const { return m_kind == Project; } @@ -133,20 +133,20 @@ public: /**@return true if this node is empty.*/ bool isEmpty() const { return m_kind == Empty; } - void setFileName(const QString& fileName) { m_fileName = fileName; } - QString fileName() const { return m_fileName; } + void setFileName(const TQString& fileName) { m_fileName = fileName; } + TQString fileName() const { return m_fileName; } void setLineEnding( LineEnding ); LineEnding lineEnding(); /**Scoped identifier (scope name or function name).*/ - QString scopedID; + TQString scopedID; /**Function arguments. Empty for other kinds of projects.*/ - QString args; + TQString args; private: Kind m_kind; - QString m_fileName; + TQString m_fileName; LineEnding m_lineEnding; }; @@ -176,16 +176,16 @@ public: AssignmentAST(): AST(AST::AssignmentAST){} ~AssignmentAST(); - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Scoped name of the variable.*/ - QString scopedID; + TQString scopedID; /**Operator.*/ - QString op; + TQString op; /**List of values.*/ - QStringList values; + TQStringList values; /**Indentation of multiline values*/ - QString indent; + TQString indent; }; @@ -197,7 +197,7 @@ class NewLineAST: public AST { public: NewLineAST(): AST(AST::NewLineAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); }; @@ -210,10 +210,10 @@ class CommentAST: public AST { public: CommentAST(): AST(AST::CommentAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Comment text.*/ - QString comment; + TQString comment; }; @@ -226,9 +226,9 @@ class IncludeAST: public AST { public: IncludeAST(): AST(AST::IncludeAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); - QString projectName; + TQString projectName; }; } diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp index 052f5f00..1f7e6cb6 100644 --- a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp +++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp @@ -29,7 +29,7 @@ void ASTVisitor::processProject(ProjectAST *project) enterScope(project); else if (project->isFunctionScope()) enterFunctionScope(project); - for (QValueList::const_iterator it = project->m_children.constBegin(); + for (TQValueList::const_iterator it = project->m_children.constBegin(); it != project->m_children.constEnd(); ++it) { AST *ast = *it; diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp index 1b7aece6..e2d93ef8 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.cpp +++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp @@ -20,7 +20,7 @@ #include "qmakedriver.h" #include "qmakeast.h" -#include +#include #include #include @@ -44,7 +44,7 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) Lexer l(&inf); l.set_debug(debug); int depth = 0; - QValueStack stack; + TQValueStack stack; Parser p(&l, stack, depth); p.set_debug_level(debug); int ret = p.parse(); @@ -66,14 +66,14 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) return ret; } -int Driver::parseFile(QString fileName, ProjectAST **ast, int debug) +int Driver::parseFile(TQString fileName, ProjectAST **ast, int debug) { return parseFile(fileName.ascii(), ast, debug); } int Driver::parseFile(KURL fileName, ProjectAST **ast, int debug) { - QString tmpFile; + TQString tmpFile; int ret = 0; if (KIO::NetAccess::download(fileName, tmpFile, 0)) ret = parseFile(tmpFile, ast, debug); @@ -88,7 +88,7 @@ int Driver::parseString( const char* string, ProjectAST **ast, int debug ) Lexer l(&ins); l.set_debug(debug); int depth = 0; - QValueStack stack; + TQValueStack stack; Parser p(&l, stack, depth); p.set_debug_level(debug); int ret = p.parse(); diff --git a/buildtools/lib/parsers/qmake/qmakedriver.h b/buildtools/lib/parsers/qmake/qmakedriver.h index 37441bf8..daa06057 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.h +++ b/buildtools/lib/parsers/qmake/qmakedriver.h @@ -44,7 +44,7 @@ public: @return The result of parsing. Result is 0 on success and <> 0 on failure. */ static int parseFile(const char *fileName, ProjectAST **ast, int debug); - static int parseFile(QString fileName, ProjectAST **ast, int debug); + static int parseFile(TQString fileName, ProjectAST **ast, int debug); static int parseFile(KURL fileName, ProjectAST **ast, int debug); static int parseString(const char* string, ProjectAST **ast, int debug); diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp index 140b39f4..6f1d5956 100644 --- a/buildtools/lib/parsers/qmake/tests/runner.cpp +++ b/buildtools/lib/parsers/qmake/tests/runner.cpp @@ -24,7 +24,7 @@ #include "qmakedriver.h" #include "qmakeastvisitor.h" -#include +#include #include #include @@ -93,7 +93,7 @@ private: QMake::ASTVisitor::leaveFunctionScope(p); } - QString replaceWs(QString s) + TQString replaceWs(TQString s) { return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); } @@ -122,9 +122,9 @@ private: QMake::ASTVisitor::processInclude(a); } - QString getIndent() + TQString getIndent() { - QString ind; + TQString ind; for( int i = 0 ; i < indent ; i++) ind += " "; return ind; @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) if ( !silent ) { pa.processProject(projectAST); - QString profile; + TQString profile; projectAST->writeBack(profile); kdDebug(9024) << "QMake file written back:\n" << profile << endl; } diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp index a550a426..4583ab11 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp @@ -19,15 +19,15 @@ ***************************************************************************/ #include "viewer.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -35,46 +35,46 @@ using namespace QMake; -Viewer::Viewer(QWidget *parent, const char *name) +Viewer::Viewer(TQWidget *parent, const char *name) :ViewerBase(parent, name), projectAST(0) { - if (QFile::exists(QDir::currentDirPath() + "/" + "qtlist")) + if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { - QFile f(QDir::currentDirPath() + "/" + "qtlist"); + TQFile f(TQDir::currentDirPath() + "/" + "qtlist"); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); while (!str.eof()) files->insertItem(str.readLine()); } ast->setSorting(-1); -// parentProject.push((QListViewItem*)0); +// parentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() { if (allLocation->text().isEmpty()) return; - QDir d(allLocation->text()); - QStringList l = d.entryList("*.pro *.pri"); - for (QStringList::iterator it = l.begin(); it != l.end(); ++it) - (*it) = QDir::cleanDirPath(allLocation->text() + "/" + (*it)); + TQDir d(allLocation->text()); + TQStringList l = d.entryList("*.pro *.pri"); + for (TQStringList::iterator it = l.begin(); it != l.end(); ++it) + (*it) = TQDir::cleanDirPath(allLocation->text() + "/" + (*it)); files->insertStringList(l); } void Viewer::choose_clicked() { - QString fileName = QFileDialog::getOpenFileName(QDir::currentDirPath(), "*.pro *.pri", this); + TQString fileName = TQFileDialog::getOpenFileName(TQDir::currentDirPath(), "*.pro *.pri", this); if (!fileName.isEmpty()) files->insertItem(fileName); } -void Viewer::files_currentChanged(QListBoxItem* item) +void Viewer::files_currentChanged(TQListBoxItem* item) { ast->clear(); - QFile f(item->text()); + TQFile f(item->text()); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); source->setText(str.read()); f.close(); @@ -87,11 +87,11 @@ void Viewer::files_currentChanged(QListBoxItem* item) tabWidget2_selected("Source to be written back"); } -void Viewer::tabWidget2_selected(const QString& text) +void Viewer::tabWidget2_selected(const TQString& text) { if ((text == "Source to Be Written Back") && projectAST) { - QString buffer; + TQString buffer; projectAST->writeBack(buffer); writeBack->setText(buffer); } @@ -102,7 +102,7 @@ public: ViewerVisitor(Viewer *v): ASTVisitor() { this->v = v; - parentProject.push((QListViewItem*)0); + parentProject.push((TQListViewItem*)0); } virtual void processProject(ProjectAST *project) @@ -112,10 +112,10 @@ public: virtual void enterRealProject(ProjectAST *project) { - QListViewItem *projectIt; + TQListViewItem *projectIt; if (!parentProject.top()) { - projectIt = new QListViewItem(v->ast, "Project"); + projectIt = new TQListViewItem(v->ast, "Project"); projectIt->setOpen(true); parentProject.push(projectIt); } @@ -124,7 +124,7 @@ public: } virtual void enterScope(ProjectAST *scope) { - QListViewItem *projectIt = new QListViewItem(parentProject.top(), scope->scopedID, "scope"); + TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), scope->scopedID, "scope"); parentProject.push(projectIt); ASTVisitor::enterScope(scope); } @@ -134,7 +134,7 @@ public: } virtual void enterFunctionScope(ProjectAST *fscope) { - QListViewItem *projectIt = new QListViewItem(parentProject.top(), + TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), fscope->scopedID + "(" + fscope->args + ")", "function scope"); parentProject.push(projectIt); ASTVisitor::enterFunctionScope(fscope); @@ -145,7 +145,7 @@ public: } virtual void processAssignment(AssignmentAST *assignment) { - QListViewItem *item = new QListViewItem(parentProject.top(), + TQListViewItem *item = new TQListViewItem(parentProject.top(), assignment->scopedID, assignment->op, assignment->values.join("|"), "assignment"); item->setMultiLinesEnabled(true); @@ -154,26 +154,26 @@ public: } virtual void processNewLine(NewLineAST *newline) { - new QListViewItem(parentProject.top(), ""); + new TQListViewItem(parentProject.top(), ""); ASTVisitor::processNewLine(newline); } virtual void processComment(CommentAST *comment) { - new QListViewItem(parentProject.top(), ""); + new TQListViewItem(parentProject.top(), ""); ASTVisitor::processComment(comment); } virtual void processInclude(IncludeAST *include) { - new QListViewItem(parentProject.top(), "", include->projectName); + new TQListViewItem(parentProject.top(), "", include->projectName); QMake::ASTVisitor::processInclude(include); } Viewer *v; - QValueStack parentProject; + TQValueStack parentProject; }; -void Viewer::processAST(QMake::ProjectAST *projectAST, QListViewItem *globAfter) +void Viewer::processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter) { ViewerVisitor visitor(this); visitor.processProject(projectAST); diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h index b22632a1..07e91da1 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.h +++ b/buildtools/lib/parsers/qmake/tests/viewer.h @@ -20,7 +20,7 @@ #ifndef VIEWER_H #define VIEWER_H -#include +#include #include "viewerbase.h" @@ -33,11 +33,11 @@ class QListViewItem; class Viewer: public ViewerBase { Q_OBJECT public: - Viewer(QWidget *parent = 0, const char *name = 0); - void processAST(QMake::ProjectAST *projectAST, QListViewItem *globAfter = 0); + Viewer(TQWidget *parent = 0, const char *name = 0); + void processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: - virtual void tabWidget2_selected(const QString&); - virtual void files_currentChanged(QListBoxItem*); + virtual void tabWidget2_selected(const TQString&); + virtual void files_currentChanged(TQListBoxItem*); virtual void choose_clicked(); virtual void addAll_clicked(); private: diff --git a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp index d2a8a1ad..c31ea02c 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include "viewer.h" int main(int argc, char **argv) { - QApplication app(argc, argv); + TQApplication app(argc, argv); Viewer viewer; app.setMainWidget(&viewer); diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index 2264d5f2..89d7f655 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include +#include +#include +#include #include #include #include @@ -28,45 +28,45 @@ #include "addenvvardlg.h" -AddEnvvarDialog::AddEnvvarDialog(QWidget *parent, const char *name) - : QDialog(parent, name, true) +AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Environment Variable")); - QLabel *varname_label = new QLabel(i18n("&Name:"), this); + TQLabel *varname_label = new TQLabel(i18n("&Name:"), this); varname_edit = new KLineEdit(this); varname_edit->setFocus(); varname_label->setBuddy(varname_edit); - connect( varname_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) ); - QLabel *value_label = new QLabel(i18n("&Value:"), this); + connect( varname_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + TQLabel *value_label = new TQLabel(i18n("&Value:"), this); value_edit = new KLineEdit(this); value_label->setBuddy(value_edit); - QFontMetrics fm(value_edit->fontMetrics()); + TQFontMetrics fm(value_edit->fontMetrics()); value_edit->setMinimumWidth(fm.width('X')*35); - connect( value_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) ); + connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - QVBoxLayout *layout = new QVBoxLayout(this, 10); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10); - QGridLayout *grid = new QGridLayout(2, 2); + TQGridLayout *grid = new TQGridLayout(2, 2); layout->addLayout(grid); grid->addWidget(varname_label, 0, 0); grid->addWidget(varname_edit, 0, 1); grid->addWidget(value_label, 1, 0); grid->addWidget(value_edit, 1, 1); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); layout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); m_pOk = buttonbox->addButton( KStdGuiItem::ok()); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotTextChanged(); diff --git a/buildtools/lib/widgets/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h index 06daa33b..5f2a5ea6 100644 --- a/buildtools/lib/widgets/addenvvardlg.h +++ b/buildtools/lib/widgets/addenvvardlg.h @@ -20,7 +20,7 @@ #ifndef _ADDENVVARDLG_H_ #define _ADDENVVARDLG_H_ -#include +#include #include class QPushButton; @@ -32,23 +32,23 @@ class AddEnvvarDialog : public QDialog Q_OBJECT public: - AddEnvvarDialog( QWidget *parent=0, const char *name=0 ); + AddEnvvarDialog( TQWidget *parent=0, const char *name=0 ); ~AddEnvvarDialog(); - QString varname() const + TQString varname() const { return varname_edit->text(); } - QString value() const + TQString value() const { return value_edit->text(); } - void setvarname(const QString name) const + void setvarname(const TQString name) const { varname_edit->setText(name); } - void setvalue(const QString value) const + void setvalue(const TQString value) const { value_edit->setText(value); } private slots: void slotTextChanged(); private: KLineEdit *varname_edit; KLineEdit *value_edit; - QPushButton *m_pOk; + TQPushButton *m_pOk; }; #endif diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index 569b822f..f5a1fa92 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -19,24 +19,24 @@ #include #include -#include +#include #include "addfilesdialog.h" #include "addfilesdialog.moc" -AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal): +AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal): KFileDialog(startDir, filter, parent, name, modal) { KConfig *config = kapp->config(); config->setGroup("Add Files Dialog"); - m_extraWidget = new QComboBox(false, this); + m_extraWidget = new TQComboBox(false, this); m_extraWidget->insertItem(i18n("Copy File(s)"), 0); m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, SIGNAL(activated(int)), this, SLOT(storePreferred(int))); + connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); setPreviewWidget(m_extraWidget); @@ -44,8 +44,8 @@ AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, } -AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal, QComboBox *extraWidget): +AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget): KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget) { KConfig *config = kapp->config(); @@ -55,7 +55,7 @@ AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, SIGNAL(activated(int)), this, SLOT(storePreferred(int))); + connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); setOperationMode(Opening); } diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h index ddc6dd60..51415cc6 100644 --- a/buildtools/lib/widgets/addfilesdialog.h +++ b/buildtools/lib/widgets/addfilesdialog.h @@ -37,18 +37,18 @@ class AddFilesDialog : public KFileDialog public: enum Mode { Copy, Link, Relative }; - AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal); + AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal); - AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal, QComboBox *extraWidget); + AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget); virtual ~AddFilesDialog(); virtual AddFilesDialog::Mode mode(); private: - QComboBox * m_extraWidget; + TQComboBox * m_extraWidget; private slots: void storePreferred(int index); diff --git a/buildtools/lib/widgets/environmentdisplaydialog.cpp b/buildtools/lib/widgets/environmentdisplaydialog.cpp index dcec00d7..1a809459 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.cpp +++ b/buildtools/lib/widgets/environmentdisplaydialog.cpp @@ -19,16 +19,16 @@ #include #include -#include +#include #include "environmentdisplaydialog.h" extern char **environ; -EnvironmentDisplayDialog::EnvironmentDisplayDialog(QWidget* parent, const char* name, bool modal, WFlags fl) +EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* parent, const char* name, bool modal, WFlags fl) : EnvironmentDisplayDialogBase(parent,name, modal,fl) { - QStringList environment; + TQStringList environment; char ** e = ::environ; while ( *e ) @@ -37,13 +37,13 @@ EnvironmentDisplayDialog::EnvironmentDisplayDialog(QWidget* parent, const char* e++; } - QStringList::ConstIterator it = environment.begin(); + TQStringList::ConstIterator it = environment.begin(); while( it !=environment.end() ) { - QStringList pair = QStringList::split( QChar('='), *it ); + TQStringList pair = TQStringList::split( TQChar('='), *it ); if ( pair.count() == 2 ) { - new QListViewItem( environmentListView, pair.first(), pair.last() ); + new TQListViewItem( environmentListView, pair.first(), pair.last() ); } ++it; } diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h index 277919c2..3458ba78 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.h +++ b/buildtools/lib/widgets/environmentdisplaydialog.h @@ -28,7 +28,7 @@ class EnvironmentDisplayDialog : public EnvironmentDisplayDialogBase Q_OBJECT public: - EnvironmentDisplayDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + EnvironmentDisplayDialog(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); }; #endif diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp index e47142f5..3c3e448f 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.cpp +++ b/buildtools/lib/widgets/environmentvariableswidget.cpp @@ -21,10 +21,10 @@ #include "environmentvariableswidget.h" #include "environmentdisplaydialog.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "domutil.h" #include "addenvvardlg.h" @@ -32,7 +32,7 @@ void EnvironmentVariablesWidget::addVarClicked() { AddEnvvarDialog dlg( this, "add env dialog" ) ; - if (QListViewItem *Item = listview->selectedItem()) + if (TQListViewItem *Item = listview->selectedItem()) { dlg.setvarname(Item->text(0)); dlg.setvalue(Item->text(1)); @@ -40,14 +40,14 @@ void EnvironmentVariablesWidget::addVarClicked() if (!dlg.exec()) return; - (void) new QListViewItem(listview, dlg.varname(), dlg.value()); + (void) new TQListViewItem(listview, dlg.varname(), dlg.value()); } void EnvironmentVariablesWidget::editVarClicked() { AddEnvvarDialog dlg( this, "edit env dialog" ); - QListViewItem *item = listview->selectedItem(); + TQListViewItem *item = listview->selectedItem(); if ( !item ) return; dlg.setvarname(item->text(0)); @@ -66,20 +66,20 @@ void EnvironmentVariablesWidget::removeVarClicked() } -EnvironmentVariablesWidget::EnvironmentVariablesWidget(QDomDocument &dom, const QString &configGroup, - QWidget *parent, const char *name) +EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent, const char *name) : EnvironmentVariablesWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { readEnvironment(dom, configGroup); - connect( listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ), this, SLOT( editVarClicked() ) ); + connect( listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editVarClicked() ) ); } EnvironmentVariablesWidget::~EnvironmentVariablesWidget() {} -void EnvironmentVariablesWidget::readEnvironment(QDomDocument &dom, const QString &configGroup) +void EnvironmentVariablesWidget::readEnvironment(TQDomDocument &dom, const TQString &configGroup) { m_dom = dom; m_configGroup = configGroup; @@ -89,18 +89,18 @@ void EnvironmentVariablesWidget::readEnvironment(QDomDocument &dom, const QStrin DomUtil::PairList list = DomUtil::readPairListEntry(dom, m_configGroup, "envvar", "name", "value"); - QListViewItem *lastItem = 0; + TQListViewItem *lastItem = 0; DomUtil::PairList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { - QListViewItem *newItem = new QListViewItem(listview, (*it).first, (*it).second); + TQListViewItem *newItem = new TQListViewItem(listview, (*it).first, (*it).second); if (lastItem) newItem->moveItem(lastItem); lastItem = newItem; } } -void EnvironmentVariablesWidget::changeConfigGroup( const QString &configGroup) +void EnvironmentVariablesWidget::changeConfigGroup( const TQString &configGroup) { m_configGroup = configGroup; } @@ -108,7 +108,7 @@ void EnvironmentVariablesWidget::changeConfigGroup( const QString &configGroup) void EnvironmentVariablesWidget::accept() { DomUtil::PairList list; - QListViewItem *item = listview->firstChild(); + TQListViewItem *item = listview->firstChild(); while (item) { list << DomUtil::Pair(item->text(0), item->text(1)); item = item->nextSibling(); diff --git a/buildtools/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h index c42076a8..f2c00b52 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.h +++ b/buildtools/lib/widgets/environmentvariableswidget.h @@ -23,7 +23,7 @@ #include "environmentvariableswidgetbase.h" -#include +#include /** Environment variables widget. @@ -33,15 +33,15 @@ class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase Q_OBJECT public: - EnvironmentVariablesWidget( QDomDocument &dom, const QString &configGroup, - QWidget *parent=0, const char *name=0 ); + EnvironmentVariablesWidget( TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent=0, const char *name=0 ); ~EnvironmentVariablesWidget(); /// read in a set of environment variables from the DOM document - void readEnvironment(QDomDocument &dom, const QString &configGroup); + void readEnvironment(TQDomDocument &dom, const TQString &configGroup); /// changes the path in the DOM structure where the environment variables are stored - void changeConfigGroup( const QString &configGroup); + void changeConfigGroup( const TQString &configGroup); public slots: void accept(); @@ -52,8 +52,8 @@ private: virtual void editVarClicked(); virtual void environmentClicked(); - QDomDocument &m_dom; - QString m_configGroup; + TQDomDocument &m_dom; + TQString m_configGroup; }; #endif diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp index 8f69e93c..71c44377 100644 --- a/buildtools/lib/widgets/envvartools.cpp +++ b/buildtools/lib/widgets/envvartools.cpp @@ -18,12 +18,12 @@ */ #include "envvartools.h" -#include +#include -QString EnvVarTools::quote( const QString & arg ) +TQString EnvVarTools::quote( const TQString & arg ) { - QString res = arg; - res.replace(QRegExp(QString::fromLatin1("'")), QString::fromLatin1("'\\''")); + TQString res = arg; + res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''")); res.prepend("\""); res.append("\""); return res; diff --git a/buildtools/lib/widgets/envvartools.h b/buildtools/lib/widgets/envvartools.h index 042fe326..3a4802c6 100644 --- a/buildtools/lib/widgets/envvartools.h +++ b/buildtools/lib/widgets/envvartools.h @@ -16,13 +16,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include /**Environment support functions.*/ namespace EnvVarTools{ /**Quotes the argument using double quotes ("). Created as a replacement for KShellProcess::quote.*/ - QString quote(const QString &arg); + TQString quote(const TQString &arg); } diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp index 834e275c..ef901cc8 100644 --- a/buildtools/lib/widgets/makeoptionswidget.cpp +++ b/buildtools/lib/widgets/makeoptionswidget.cpp @@ -19,17 +19,17 @@ #include "makeoptionswidget.h" -#include +#include #include -#include -#include -#include +#include +#include +#include #include "domutil.h" #include "environmentvariableswidget.h" -MakeOptionsWidget::MakeOptionsWidget(QDomDocument &dom, const QString &configGroup, - QWidget *parent, const char *name) +MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent, const char *name) : MakeOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h index 1754cd91..0cd962c3 100644 --- a/buildtools/lib/widgets/makeoptionswidget.h +++ b/buildtools/lib/widgets/makeoptionswidget.h @@ -22,7 +22,7 @@ #include "makeoptionswidgetbase.h" -#include +#include class EnvironmentVariablesWidget; @@ -34,16 +34,16 @@ class MakeOptionsWidget : public MakeOptionsWidgetBase Q_OBJECT public: - MakeOptionsWidget( QDomDocument &dom, const QString &configGroup, - QWidget *parent=0, const char *name=0 ); + MakeOptionsWidget( TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent=0, const char *name=0 ); ~MakeOptionsWidget(); public slots: void accept(); private: - QDomDocument &m_dom; - QString m_configGroup; + TQDomDocument &m_dom; + TQString m_configGroup; EnvironmentVariablesWidget* m_environmentVariablesWidget; }; diff --git a/buildtools/lib/widgets/removesubprojectdialog.cpp b/buildtools/lib/widgets/removesubprojectdialog.cpp index aef16a0c..4a41ff88 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.cpp +++ b/buildtools/lib/widgets/removesubprojectdialog.cpp @@ -16,11 +16,11 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "removesubprojectdialog.h" -RemoveSubprojectDialog::RemoveSubprojectDialog(QString caption, QString question, QWidget* parent, const char* name, bool modal, WFlags fl) +RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent, const char* name, bool modal, WFlags fl) : RemoveSubprojectDlgBase(parent,name, modal,fl) { setCaption(caption); @@ -34,12 +34,12 @@ RemoveSubprojectDialog::~RemoveSubprojectDialog() /*$SPECIALIZATION$*/ void RemoveSubprojectDialog::reject() { - QDialog::reject(); + TQDialog::reject(); } void RemoveSubprojectDialog::accept() { - QDialog::accept(); + TQDialog::accept(); } bool RemoveSubprojectDialog::removeFromDisk( ) diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h index 0a20b4ad..593309fe 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.h +++ b/buildtools/lib/widgets/removesubprojectdialog.h @@ -30,7 +30,7 @@ class RemoveSubprojectDialog : public RemoveSubprojectDlgBase Q_OBJECT public: - RemoveSubprojectDialog(QString caption, QString question, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~RemoveSubprojectDialog(); /*$PUBLIC_FUNCTIONS$*/ bool removeFromDisk(); diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index f0cb94b4..9aecbe17 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -26,20 +26,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "domutil.h" #include "environmentvariableswidget.h" -RunOptionsWidget::RunOptionsWidget(QDomDocument &dom, const QString &configGroup, - const QString &buildDirectory, QWidget *parent, const char *name) +RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGroup, + const TQString &buildDirectory, TQWidget *parent, const char *name) : RunOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { @@ -49,37 +49,37 @@ RunOptionsWidget::RunOptionsWidget(QDomDocument &dom, const QString &configGroup mainprogram_edit->completionObject()->setMode(KURLCompletion::FileCompletion); mainprogram_edit->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); - if( DomUtil::readEntry(dom, configGroup + "/run/mainprogram").isEmpty() && QFileInfo( buildDirectory ).exists() ) + if( DomUtil::readEntry(dom, configGroup + "/run/mainprogram").isEmpty() && TQFileInfo( buildDirectory ).exists() ) { mainprogram_edit->setURL( buildDirectory ); mainprogram_edit->fileDialog()->setURL( KURL::fromPathOrURL(buildDirectory) ); - }else if ( QFileInfo( DomUtil::readEntry(dom, configGroup + "/run/mainprogram") ).exists() ) + }else if ( TQFileInfo( DomUtil::readEntry(dom, configGroup + "/run/mainprogram") ).exists() ) { - QString program = DomUtil::readEntry(dom, configGroup + "/run/mainprogram"); - if( QDir::isRelativePath(program) ) + TQString program = DomUtil::readEntry(dom, configGroup + "/run/mainprogram"); + if( TQDir::isRelativePath(program) ) program = buildDirectory + "/" + program; mainprogram_edit->setURL(program); mainprogram_edit->fileDialog()->setURL( program ); }else { - mainprogram_edit->setURL(QString()); - mainprogram_edit->fileDialog()->setURL(QString()); + mainprogram_edit->setURL(TQString()); + mainprogram_edit->fileDialog()->setURL(TQString()); } cwd_edit->completionObject()->setMode(KURLCompletion::DirCompletion); cwd_edit->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - if( DomUtil::readEntry(dom, configGroup + "/run/globalcwd").isEmpty() && QFileInfo( buildDirectory ).exists() ) + if( DomUtil::readEntry(dom, configGroup + "/run/globalcwd").isEmpty() && TQFileInfo( buildDirectory ).exists() ) { cwd_edit->setURL( buildDirectory ); cwd_edit->fileDialog()->setURL( KURL::fromPathOrURL(buildDirectory) ); - }else if( QFileInfo( DomUtil::readEntry(dom, configGroup + "/run/globalcwd") ).exists() ) + }else if( TQFileInfo( DomUtil::readEntry(dom, configGroup + "/run/globalcwd") ).exists() ) { cwd_edit->setURL(DomUtil::readEntry(dom, configGroup + "/run/globalcwd")); cwd_edit->fileDialog()->setURL( KURL::fromPathOrURL( DomUtil::readEntry(dom, configGroup + "/run/globalcwd") ) ); }else { - cwd_edit->setURL(QString()); - cwd_edit->fileDialog()->setURL(QString()); + cwd_edit->setURL(TQString()); + cwd_edit->fileDialog()->setURL(TQString()); } if( configGroup == "/kdevautoproject" || configGroup == "/kdevtrollproject" ) @@ -127,7 +127,7 @@ void RunOptionsWidget::mainProgramChanged( ) if( mainProgramGroupBox->isChecked() && mainprogram_edit->url().isEmpty() ) { - mainprogram_label->setPaletteForegroundColor(QColor("#ff0000")); + mainprogram_label->setPaletteForegroundColor(TQColor("#ff0000")); } else { diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h index df27079d..02c38f35 100644 --- a/buildtools/lib/widgets/runoptionswidget.h +++ b/buildtools/lib/widgets/runoptionswidget.h @@ -22,7 +22,7 @@ #include "runoptionswidgetbase.h" -#include +#include #include class EnvironmentVariablesWidget; @@ -35,10 +35,10 @@ class RunOptionsWidget : public RunOptionsWidgetBase Q_OBJECT public: - RunOptionsWidget( QDomDocument &dom, //!< document DOM - const QString &configGroup, //!< configuration group - const QString &buildDirectory, //!< project build directory - QWidget *parent=0, //!< parent widget + RunOptionsWidget( TQDomDocument &dom, //!< document DOM + const TQString &configGroup, //!< configuration group + const TQString &buildDirectory, //!< project build directory + TQWidget *parent=0, //!< parent widget const char *name=0 //!< widget's name ); ~RunOptionsWidget(); @@ -49,8 +49,8 @@ public slots: private: virtual void mainProgramChanged( ); - QDomDocument &m_dom; - QString m_configGroup; + TQDomDocument &m_dom; + TQString m_configGroup; EnvironmentVariablesWidget* m_environmentVariablesWidget; }; diff --git a/buildtools/lib/widgets/subclassesdlg.cpp b/buildtools/lib/widgets/subclassesdlg.cpp index 2ec12f48..4dde898b 100644 --- a/buildtools/lib/widgets/subclassesdlg.cpp +++ b/buildtools/lib/widgets/subclassesdlg.cpp @@ -16,12 +16,12 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include "subclassesdlg.h" #include "subclassesdlg.moc" -SubclassesDlg::SubclassesDlg(QString form, DomUtil::PairList &config, QString projectDir, QWidget* parent, const char* name, bool modal, WFlags fl) +SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent, const char* name, bool modal, WFlags fl) : SubclassesDlgBase(parent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir) { subclass_url->setEnabled(false); @@ -41,7 +41,7 @@ SubclassesDlg::~SubclassesDlg() /*$SPECIALIZATION$*/ void SubclassesDlg::accept() { - QPtrList pairsToRemove; + TQPtrList pairsToRemove; DomUtil::PairList::iterator it; for ( it = m_config.begin(); it != m_config.end(); ++it ) @@ -81,7 +81,7 @@ void SubclassesDlg::removeRelation() { if (subclasses_box->currentItem() > -1) { - QListBoxItem *item = subclasses_box->item(subclasses_box->currentItem()); + TQListBoxItem *item = subclasses_box->item(subclasses_box->currentItem()); int itemIdx = subclasses_box->currentItem(); if (item->prev()) @@ -103,7 +103,7 @@ void SubclassesDlg::removeRelation() } } -void SubclassesDlg::changeCurrentURL(const QString &str) +void SubclassesDlg::changeCurrentURL(const TQString &str) { if ( subclasses_box->currentItem() > -1 ) { @@ -111,7 +111,7 @@ void SubclassesDlg::changeCurrentURL(const QString &str) } } -void SubclassesDlg::currentRelationChanged( QListBoxItem * item ) +void SubclassesDlg::currentRelationChanged( TQListBoxItem * item ) { if (item) { diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h index ed799b85..adfdc7d4 100644 --- a/buildtools/lib/widgets/subclassesdlg.h +++ b/buildtools/lib/widgets/subclassesdlg.h @@ -30,7 +30,7 @@ class SubclassesDlg : public SubclassesDlgBase Q_OBJECT public: - SubclassesDlg(QString form, DomUtil::PairList &config, QString projectDir, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassesDlg(); /*$PUBLIC_FUNCTIONS$*/ @@ -45,13 +45,13 @@ protected slots: /*$PROTECTED_SLOTS$*/ virtual void newRelation(); virtual void removeRelation(); - virtual void changeCurrentURL(const QString &str); - virtual void currentRelationChanged(QListBoxItem *item); + virtual void changeCurrentURL(const TQString &str); + virtual void currentRelationChanged(TQListBoxItem *item); private: - QString m_form; + TQString m_form; DomUtil::PairList &m_config; - QString m_projectDir; + TQString m_projectDir; }; #endif diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index a710db19..c2c32f9e 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -8,10 +8,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -23,7 +23,7 @@ #include "pascalproject_part.h" #include "pascalglobaloptionsdlg.h" -PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, QWidget* parent, const char* name, WFlags fl) +PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) :PascalProjectOptionsDlgBase(parent,name,fl), m_part(part) { delete config_label; @@ -47,7 +47,7 @@ PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, QWidget* if (offers.isEmpty()) options_button->setEnabled(false); - currentCompiler = QString::null; + currentCompiler = TQString::null; /*kdDebug() << ServiceComboBox::defaultCompiler() << endl; kdDebug() << ServiceComboBox::itemForText(ServiceComboBox::defaultCompiler(), service_names) << endl; @@ -63,17 +63,17 @@ PascalGlobalOptionsDlg::~PascalGlobalOptionsDlg() void PascalGlobalOptionsDlg::optionsButtonClicked() { - QString name = ServiceComboBox::currentText(compiler_box, service_names); + TQString name = ServiceComboBox::currentText(compiler_box, service_names); KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, options_edit->text()); + TQString flags = plugin->exec(this, options_edit->text()); options_edit->setText(flags); delete plugin; } } -void PascalGlobalOptionsDlg::compiler_box_activated(const QString& text) +void PascalGlobalOptionsDlg::compiler_box_activated(const TQString& text) { kdDebug() << "text changed from " << currentCompiler << " to " << text << endl; if (currentCompiler == text) @@ -91,14 +91,14 @@ void PascalGlobalOptionsDlg::accept() saveConfigCache(); } -void PascalGlobalOptionsDlg::saveCompilerOpts( QString compiler ) +void PascalGlobalOptionsDlg::saveCompilerOpts( TQString compiler ) { configCache[compiler] = options_edit->text(); } -void PascalGlobalOptionsDlg::readCompilerOpts( QString compiler ) +void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler ) { - QString settings = configCache[compiler]; + TQString settings = configCache[compiler]; if (settings.isEmpty()) { KConfig *config = KGlobal::config(); @@ -114,7 +114,7 @@ void PascalGlobalOptionsDlg::readConfigCache( ) /* KConfig *config = KGlobal::config(); config->setGroup("Pascal Compiler"); - QMap settings = config->entryMap("Pascal Compiler"); + TQMap settings = config->entryMap("Pascal Compiler"); */ } @@ -123,7 +123,7 @@ void PascalGlobalOptionsDlg::saveConfigCache( ) KConfig *config = KGlobal::config(); config->setGroup("Pascal Compiler"); - for (QMap::iterator it = configCache.begin(); it != configCache.end(); ++it) + for (TQMap::iterator it = configCache.begin(); it != configCache.end(); ++it) { config->writeEntry(it.key(), it.data()); } diff --git a/buildtools/pascal/pascalglobaloptionsdlg.h b/buildtools/pascal/pascalglobaloptionsdlg.h index 14da2221..b0c19e0e 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.h +++ b/buildtools/pascal/pascalglobaloptionsdlg.h @@ -11,7 +11,7 @@ #ifndef PASCALGLOBALOPTIONSDLG_H #define PASCALGLOBALOPTIONSDLG_H -#include +#include #include @@ -24,7 +24,7 @@ class PascalGlobalOptionsDlg : public PascalProjectOptionsDlgBase Q_OBJECT public: - PascalGlobalOptionsDlg(PascalProjectPart *part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PascalGlobalOptionsDlg(); public slots: @@ -32,18 +32,18 @@ public slots: protected slots: virtual void optionsButtonClicked(); - virtual void compiler_box_activated(const QString& text); + virtual void compiler_box_activated(const TQString& text); private: PascalProjectPart *m_part; KTrader::OfferList offers; - QString currentCompiler; - QStringList service_names; - QStringList service_execs; - QMap configCache; + TQString currentCompiler; + TQStringList service_names; + TQStringList service_execs; + TQMap configCache; - void saveCompilerOpts(QString compiler); - void readCompilerOpts(QString compiler); + void saveCompilerOpts(TQString compiler); + void readCompilerOpts(TQString compiler); void readConfigCache(); void saveConfigCache(); diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 3fe09420..2ed25fc0 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -10,13 +10,13 @@ ***************************************************************************/ #include "pascalproject_part.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -52,7 +52,7 @@ typedef KDevGenericFactory PascalProjectFactory; static const KDevPluginInfo data("kdevpascalproject"); K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) -PascalProjectPart::PascalProjectPart(QObject *parent, const char *name, const QStringList& ) +PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) { setInstance(PascalProjectFactory::instance()); @@ -60,27 +60,27 @@ PascalProjectPart::PascalProjectPart(QObject *parent, const char *name, const QS KAction *action; action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8, - this, SLOT(slotBuild()), + this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("Build project

Runs the compiler on a main source file of the project. " "The compiler and the main source file can be set in project settings, Pascal Compiler tab.")); action = new KAction( i18n("Execute Program"), "exec", 0, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); action->setWhatsThis(i18n("Execute program

Executes the main program specified in project settings, Run options tab. " "If nothing is set, the binary file with the same name as the main source file name is executed.")); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(configWidget(KDialogBase*)), - this, SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), + this, TQT_SLOT(configWidget(KDialogBase*)) ); // m_widget = new PascalProjectWidget(this); -// QWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); +// TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. @@ -101,11 +101,11 @@ PascalProjectPart::~PascalProjectPart() * @todo This should really be merged with FileTreeWidget::matchesHidePattern() * and put in its own class. Currently this is repeated in scriptprojectpart.cpp, pascalproject_part.cpp, adaproject_part.cpp */ -static bool matchesPattern(const QString &fileName, const QStringList &patternList) +static bool matchesPattern(const TQString &fileName, const TQStringList &patternList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = patternList.begin(); it != patternList.end(); ++it) { - QRegExp re(*it, true, true); + TQRegExp re(*it, true, true); if (re.search(fileName) == 0 && re.matchedLength() == (int)fileName.length()) return true; } @@ -113,13 +113,13 @@ static bool matchesPattern(const QString &fileName, const QStringList &patternLi return false; } -void PascalProjectPart::openProject(const QString &dirName, const QString &projectName) +void PascalProjectPart::openProject(const TQString &dirName, const TQString &projectName) { m_buildDir = dirName; m_projectDir = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if (DomUtil::readEntry(dom, "/kdevpascalproject/run/directoryradio") == "" ) { DomUtil::writeEntry(dom, "/kdevpascalproject/run/directoryradio", "executable"); @@ -128,11 +128,11 @@ void PascalProjectPart::openProject(const QString &dirName, const QString &proje loadProjectConfig(); // Put all files from all subdirectories into file list - QValueStack s; + TQValueStack s; int prefixlen = m_projectDir.length()+1; s.push(m_projectDir); - QStringList includepatternList; + TQStringList includepatternList; if ( languageSupport() ) { KMimeType::List list = languageSupport()->mimeTypes(); @@ -142,20 +142,20 @@ void PascalProjectPart::openProject(const QString &dirName, const QString &proje ++it; } } - QString excludepatterns = "*~"; - QStringList excludepatternList = QStringList::split(",", excludepatterns); + TQString excludepatterns = "*~"; + TQStringList excludepatternList = TQStringList::split(",", excludepatterns); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug(9033) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); - QPtrListIterator it(*dirEntries); + TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { kdDebug(9033) << "Pushing: " << path << endl; s.push(path); @@ -195,9 +195,9 @@ DomUtil::PairList PascalProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString PascalProjectPart::runDirectory() const +TQString PascalProjectPart::runDirectory() const { - QString cwd = defaultRunDirectory("kdevpascalproject"); + TQString cwd = defaultRunDirectory("kdevpascalproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -213,15 +213,15 @@ QString PascalProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString PascalProjectPart::mainProgram() const +TQString PascalProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevpascalproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevpascalproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -232,63 +232,63 @@ QString PascalProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -/** Retuns a QString with the debug command line arguments */ -QString PascalProjectPart::debugArguments() const +/** Retuns a TQString with the debug command line arguments */ +TQString PascalProjectPart::debugArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevpascalproject/run/globaldebugarguments"); } -/** Retuns a QString with the run command line arguments */ -QString PascalProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString PascalProjectPart::runArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevpascalproject/run/programargs"); } -QString PascalProjectPart::mainSource() const +TQString PascalProjectPart::mainSource() const { return projectDirectory() + "/" + m_mainSource; } -void PascalProjectPart::setMainSource(QString fullPath) +void PascalProjectPart::setMainSource(TQString fullPath) { - QString olddir = activeDirectory(); - m_mainSource = fullPath.replace(QRegExp(QString(projectDirectory() + QString("/"))),""); + TQString olddir = activeDirectory(); + m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); emit activeDirectoryChanged( olddir, activeDirectory() ); } -QString PascalProjectPart::projectDirectory() const +TQString PascalProjectPart::projectDirectory() const { return m_projectDir; } -QString PascalProjectPart::projectName() const +TQString PascalProjectPart::projectName() const { return m_projectName; } -QString PascalProjectPart::activeDirectory() const +TQString PascalProjectPart::activeDirectory() const { - QFileInfo fi(mainSource()); - return fi.dirPath(true).replace(QRegExp(projectDirectory()),""); + TQFileInfo fi(mainSource()); + return fi.dirPath(true).replace(TQRegExp(projectDirectory()),""); } -QString PascalProjectPart::buildDirectory() const +TQString PascalProjectPart::buildDirectory() const { - QFileInfo fi(mainSource()); + TQFileInfo fi(mainSource()); return fi.dirPath(true); } -void PascalProjectPart::listOfFiles(QStringList &result, QString path) const +void PascalProjectPart::listOfFiles(TQStringList &result, TQString path) const { - QDir d(path); + TQDir d(path); if (!d.exists()) return; - QFileInfoList *entries = const_cast(d.entryInfoList(QDir::Dirs | QDir::Files | QDir::Hidden)); - for (QFileInfo *it = entries->first(); it; it = entries->next()) + QFileInfoList *entries = const_cast(d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden)); + for (TQFileInfo *it = entries->first(); it; it = entries->next()) { if ((it->isDir()) && (it->filePath() != path)) { @@ -303,9 +303,9 @@ void PascalProjectPart::listOfFiles(QStringList &result, QString path) const } } -QStringList PascalProjectPart::allFiles() const +TQStringList PascalProjectPart::allFiles() const { -// QStringList files; +// TQStringList files; // listOfFiles(files, projectDirectory()); @@ -313,19 +313,19 @@ QStringList PascalProjectPart::allFiles() const return m_sourceFiles; } -void PascalProjectPart::addFile(const QString& /*fileName*/) +void PascalProjectPart::addFile(const TQString& /*fileName*/) { } -void PascalProjectPart::addFiles(const QStringList& /*fileList*/) +void PascalProjectPart::addFiles(const TQStringList& /*fileList*/) { } -void PascalProjectPart::removeFile(const QString& /*fileName*/) +void PascalProjectPart::removeFile(const TQString& /*fileName*/) { } -void PascalProjectPart::removeFiles(const QStringList& /*fileList*/) +void PascalProjectPart::removeFiles(const TQStringList& /*fileList*/) { } @@ -334,7 +334,7 @@ void PascalProjectPart::slotBuild() if (partController()->saveAllFiles()==false) return; //user cancelled - QString cmdline = m_compilerExec + " " + m_compilerOpts + " "; + TQString cmdline = m_compilerExec + " " + m_compilerOpts + " "; if (cmdline.isEmpty()) { @@ -342,10 +342,10 @@ void PascalProjectPart::slotBuild() return; } - QFileInfo fi(mainSource()); + TQFileInfo fi(mainSource()); cmdline += fi.fileName(); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(buildDirectory()); dircmd += " && "; @@ -356,7 +356,7 @@ void PascalProjectPart::slotExecute() { partController()->saveAllFiles(); - QDomDocument &dom = *(projectDom()); + TQDomDocument &dom = *(projectDom()); bool runInTerminal = DomUtil::readBoolEntry(dom, "/kdevpascalproject/run/terminal", true); // Get the run environment variables pairs into the environstr string @@ -366,7 +366,7 @@ void PascalProjectPart::slotExecute() DomUtil::PairList envvars = DomUtil::readPairListEntry(*projectDom(), "/kdevpascalproject/run/envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = envvars.begin(); it != envvars.end(); ++it) { environstr += (*it).first; @@ -375,50 +375,50 @@ void PascalProjectPart::slotExecute() environstr += " "; } - QString program = mainProgram(); + TQString program = mainProgram(); program.prepend(environstr); program += " " + DomUtil::readEntry(*projectDom(), "/kdevpascalproject/run/programargs"); appFrontend()->startAppCommand(buildDirectory(), program, runInTerminal); } -void PascalProjectPart::changedFiles( const QStringList & fileList ) +void PascalProjectPart::changedFiles( const TQStringList & fileList ) { KDevProject::changedFiles(fileList); } -void PascalProjectPart::changedFile( const QString & fileName ) +void PascalProjectPart::changedFile( const TQString & fileName ) { KDevProject::changedFile(fileName); } void PascalProjectPart::projectConfigWidget( KDialogBase * dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalProjectOptionsDlg *w = new PascalProjectOptionsDlg(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); - connect( dlg, SIGNAL(okClicked()), this, SLOT(loadProjectConfig()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium )); RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevpascalproject", buildDirectory(), vbox); - connect( dlg, SIGNAL(okClicked()), w3, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); } void PascalProjectPart::loadProjectConfig( ) { - QDomDocument &dom = *(projectDom()); + TQDomDocument &dom = *(projectDom()); - QString config = DomUtil::readEntry(dom, "/kdevpascalproject/general/useconfiguration", "default"); - m_mainSource = DomUtil::readEntry(dom, QString("/kdevpascalproject/configurations/") + config + QString("/mainsource") ); - m_compilerOpts = DomUtil::readEntry(dom, QString("/kdevpascalproject/configurations/") + config + QString("/compileroptions")); - m_compilerExec = DomUtil::readEntry(dom, QString("/kdevpascalproject/configurations/") + config + QString("/compilerexec")); + TQString config = DomUtil::readEntry(dom, "/kdevpascalproject/general/useconfiguration", "default"); + m_mainSource = DomUtil::readEntry(dom, TQString("/kdevpascalproject/configurations/") + config + TQString("/mainsource") ); + m_compilerOpts = DomUtil::readEntry(dom, TQString("/kdevpascalproject/configurations/") + config + TQString("/compileroptions")); + m_compilerExec = DomUtil::readEntry(dom, TQString("/kdevpascalproject/configurations/") + config + TQString("/compilerexec")); if (m_compilerExec.isEmpty()) { KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'"); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { m_compilerExec = (*it)->exec(); @@ -430,13 +430,13 @@ void PascalProjectPart::loadProjectConfig( ) void PascalProjectPart::configWidget( KDialogBase * dlg ) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalGlobalOptionsDlg *w = new PascalGlobalOptionsDlg(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } -KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const QString &name) +KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -444,20 +444,20 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const QString &nam return 0; } - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) { - QString errorMessage = KLibLoader::self()->lastErrorMessage(); + TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); exit(1); } - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(this, service->name().latin1(), + TQObject *obj = factory->create(this, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { @@ -469,7 +469,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const QString &nam return dlg; } -QString PascalProjectPart::defaultOptions( const QString compiler ) const +TQString PascalProjectPart::defaultOptions( const TQString compiler ) const { KConfig *config = KGlobal::config(); config->setGroup("Pascal Compiler"); @@ -482,12 +482,12 @@ QString PascalProjectPart::defaultOptions( const QString compiler ) const /*! \fn PascalProjectPart::distFiles() const */ -QStringList PascalProjectPart::distFiles() const +TQStringList PascalProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QStringList files = dir.entryList( "Makefile"); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQStringList files = dir.entryList( "Makefile"); return sourceList + files; } diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h index 3273011d..944250e4 100644 --- a/buildtools/pascal/pascalproject_part.h +++ b/buildtools/pascal/pascalproject_part.h @@ -11,7 +11,7 @@ #ifndef __KDEVPART_PASCALPROJECT_H__ #define __KDEVPART_PASCALPROJECT_H__ -#include +#include #include "kdevbuildtool.h" @@ -23,47 +23,47 @@ class PascalProjectPart : public KDevBuildTool { Q_OBJECT public: - PascalProjectPart(QObject *parent, const char *name, const QStringList &); + PascalProjectPart(TQObject *parent, const char *name, const TQStringList &); ~PascalProjectPart(); - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); /**Returns the name of the main source file without extension. All pascal compilers call the binary by that way*/ - virtual QString mainProgram() const; + virtual TQString mainProgram() const; /**Main source file (like src/main.pp)*/ - virtual QString mainSource() const; - virtual void setMainSource(QString fullPath); + virtual TQString mainSource() const; + virtual void setMainSource(TQString fullPath); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString activeDirectory() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString activeDirectory() const; /**The location of the main source file*/ - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; /**Returns everything in the project directory*/ - virtual QStringList allFiles() const; + virtual TQStringList allFiles() const; /**This does absolutelly nothing*/ - virtual void addFile(const QString &fileName); + virtual void addFile(const TQString &fileName); /**This does absolutelly nothing*/ - virtual void addFiles(const QStringList &fileList); + virtual void addFiles(const TQStringList &fileList); /**This does absolutelly nothing*/ - virtual void removeFile(const QString &fileName); + virtual void removeFile(const TQString &fileName); /**This does absolutelly nothing*/ - virtual void removeFiles(const QStringList &fileList); + virtual void removeFiles(const TQStringList &fileList); - virtual void changedFiles( const QStringList & fileList ); - virtual void changedFile( const QString & fileName ); + virtual void changedFiles( const TQStringList & fileList ); + virtual void changedFile( const TQString & fileName ); - KDevCompilerOptions *createCompilerOptions(const QString &name); + KDevCompilerOptions *createCompilerOptions(const TQString &name); - virtual QString defaultOptions(const QString compiler) const; - QStringList distFiles() const; + virtual TQString defaultOptions(const TQString compiler) const; + TQStringList distFiles() const; public slots: /**loads config from project file*/ @@ -76,20 +76,20 @@ private slots: void configWidget(KDialogBase *dlg); private: - QGuardedPtr m_widget; + TQGuardedPtr m_widget; - void listOfFiles(QStringList &result, QString path) const; + void listOfFiles(TQStringList &result, TQString path) const; - QString m_buildDir; - QString m_projectDir; - QString m_projectName; + TQString m_buildDir; + TQString m_projectDir; + TQString m_projectName; - QString m_mainProg; - QString m_mainSource; - QString m_compilerExec; - QString m_compilerOpts; + TQString m_mainProg; + TQString m_mainSource; + TQString m_compilerExec; + TQString m_compilerOpts; - QStringList m_sourceFiles; + TQStringList m_sourceFiles; }; #endif diff --git a/buildtools/pascal/pascalproject_widget.cpp b/buildtools/pascal/pascalproject_widget.cpp index 039c97e6..9e0c533c 100644 --- a/buildtools/pascal/pascalproject_widget.cpp +++ b/buildtools/pascal/pascalproject_widget.cpp @@ -12,7 +12,7 @@ PascalProjectWidget::PascalProjectWidget(PascalProjectPart *part) - : QWidget(0, "PascalProject widget") + : TQWidget(0, "PascalProject widget") { Q_UNUSED( part ); } diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h index 198cf794..bfd9c328 100644 --- a/buildtools/pascal/pascalproject_widget.h +++ b/buildtools/pascal/pascalproject_widget.h @@ -2,8 +2,8 @@ #define __PASCALPROJECT_WIDGET_H__ -#include -#include +#include +#include class KDevProject; diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index 7a97cea3..6bbff084 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -14,10 +14,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "domutil.h" #include "kdevcompileroptions.h" @@ -26,10 +26,10 @@ #include "pascalproject_part.h" #include "pascalprojectoptionsdlg.h" -PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, QWidget* parent, const char* name, WFlags fl) +PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) : PascalProjectOptionsDlgBase(parent,name, fl), m_part(part) { - config_combo->setValidator(new QRegExpValidator(QRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'"); @@ -43,8 +43,8 @@ PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, QWidge dirty = false; - QDomDocument &dom = *(m_part->projectDom()); - currentConfig = QString::null; + TQDomDocument &dom = *(m_part->projectDom()); + currentConfig = TQString::null; configChanged(DomUtil::readEntry(dom, "/kdevpascalproject/general/useconfiguration", "default")); } @@ -52,17 +52,17 @@ PascalProjectOptionsDlg::~PascalProjectOptionsDlg() { } -QStringList PascalProjectOptionsDlg::allBuildConfigs() +TQStringList PascalProjectOptionsDlg::allBuildConfigs() { - QDomDocument &dom = *(m_part->projectDom()); + TQDomDocument &dom = *(m_part->projectDom()); - QStringList allConfigs; + TQStringList allConfigs; allConfigs.append("default"); - QDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); - QDomElement childEl = node.firstChild().toElement(); + TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); + TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { - QString config = childEl.tagName(); + TQString config = childEl.tagName(); kdDebug() << "Found config " << config << endl; if (config != "default") allConfigs.append(config); @@ -81,35 +81,35 @@ void PascalProjectOptionsDlg::accept() } } -void PascalProjectOptionsDlg::compiler_box_activated( const QString& /*s*/ ) +void PascalProjectOptionsDlg::compiler_box_activated( const TQString& /*s*/ ) { - QString exec = ServiceComboBox::currentText(compiler_box, service_execs); + TQString exec = ServiceComboBox::currentText(compiler_box, service_execs); exec_edit->setText(exec); } -void PascalProjectOptionsDlg::saveConfig( QString config ) +void PascalProjectOptionsDlg::saveConfig( TQString config ) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevpascalproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevpascalproject/configurations/" + config + "/"; DomUtil::writeEntry(dom, prefix + "compiler", ServiceComboBox::currentText(compiler_box, service_names)); DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text()); DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text()); - DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(QRegExp(m_part->projectDirectory() + QString("/")),"")); + DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); } -void PascalProjectOptionsDlg::readConfig( QString config ) +void PascalProjectOptionsDlg::readConfig( TQString config ) { - QDomDocument dom = *m_part->projectDom(); - QString prefix = "/kdevpascalproject/configurations/" + config + "/"; + TQDomDocument dom = *m_part->projectDom(); + TQString prefix = "/kdevpascalproject/configurations/" + config + "/"; - QString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); + TQString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); if (compiler.isEmpty()) { offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'"); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { compiler = (*it)->name(); @@ -120,7 +120,7 @@ void PascalProjectOptionsDlg::readConfig( QString config ) } ServiceComboBox::setCurrentText(compiler_box, compiler, service_names); - QString exec = DomUtil::readEntry(dom, prefix + "compilerexec", ""); + TQString exec = DomUtil::readEntry(dom, prefix + "compilerexec", ""); if (exec.isEmpty()) exec = ServiceComboBox::currentText(compiler_box, service_execs); exec_edit->setText(exec); @@ -128,7 +128,7 @@ void PascalProjectOptionsDlg::readConfig( QString config ) mainSourceUrl->setURL(m_part->projectDirectory() + "/" + DomUtil::readEntry(dom, prefix + "mainsource")); } -void PascalProjectOptionsDlg::configComboTextChanged(const QString &config) +void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config) { bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); bool canRemove = allConfigs.contains(config) && config != "default"; @@ -137,7 +137,7 @@ void PascalProjectOptionsDlg::configComboTextChanged(const QString &config) } -void PascalProjectOptionsDlg::configChanged(const QString &config) +void PascalProjectOptionsDlg::configChanged(const TQString &config) { if (config == currentConfig || !allConfigs.contains(config)) return; @@ -157,7 +157,7 @@ void PascalProjectOptionsDlg::configChanged(const QString &config) void PascalProjectOptionsDlg::configAdded() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); allConfigs.append(config); @@ -170,27 +170,27 @@ void PascalProjectOptionsDlg::configAdded() void PascalProjectOptionsDlg::configRemoved() { - QString config = config_combo->currentText(); + TQString config = config_combo->currentText(); - QDomDocument dom = *m_part->projectDom(); - QDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); + TQDomDocument dom = *m_part->projectDom(); + TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = QString::null; + currentConfig = TQString::null; configChanged("default"); } void PascalProjectOptionsDlg::optionsButtonClicked( ) { - QString name = ServiceComboBox::currentText(compiler_box, service_names); + TQString name = ServiceComboBox::currentText(compiler_box, service_names); KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { - QString flags = plugin->exec(this, options_edit->text()); + TQString flags = plugin->exec(this, options_edit->text()); options_edit->setText(flags); delete plugin; } diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h index 70e911de..6e483338 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.h +++ b/buildtools/pascal/pascalprojectoptionsdlg.h @@ -23,16 +23,16 @@ class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase Q_OBJECT public: - PascalProjectOptionsDlg(PascalProjectPart *part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PascalProjectOptionsDlg(); public slots: virtual void accept(); protected slots: - virtual void compiler_box_activated(const QString &s); - void configComboTextChanged(const QString &config); - void configChanged(const QString &config); + virtual void compiler_box_activated(const TQString &s); + void configComboTextChanged(const TQString &config); + void configChanged(const TQString &config); void configAdded(); void configRemoved(); void optionsButtonClicked(); @@ -40,19 +40,19 @@ protected slots: void setDefaultOptions(); private: - QStringList allConfigs; - QString currentConfig; + TQStringList allConfigs; + TQString currentConfig; bool dirty; KTrader::OfferList offers; - QStringList service_names; - QStringList service_execs; + TQStringList service_names; + TQStringList service_execs; PascalProjectPart *m_part; - void saveConfig(QString config); - void readConfig(QString config); - QStringList allBuildConfigs(); + void saveConfig(TQString config); + void readConfig(TQString config); + TQStringList allBuildConfigs(); }; #endif diff --git a/buildtools/pascal/service.cpp b/buildtools/pascal/service.cpp index c678f916..ea3846b2 100644 --- a/buildtools/pascal/service.cpp +++ b/buildtools/pascal/service.cpp @@ -10,8 +10,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include +#include +#include #include #include @@ -19,10 +19,10 @@ #include "service.h" -void ServiceComboBox::insertStringList(QComboBox *combo, const QValueList &list, - QStringList *names, QStringList *execs) +void ServiceComboBox::insertStringList(TQComboBox *combo, const TQValueList &list, + TQStringList *names, TQStringList *execs) { - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { combo->insertItem((*it)->comment()); (*names) << (*it)->desktopEntryName(); @@ -31,16 +31,16 @@ void ServiceComboBox::insertStringList(QComboBox *combo, const QValueListcurrentItem() == -1) - return QString::null; + return TQString::null; return names[combo->currentItem()]; } -void ServiceComboBox::setCurrentText(QComboBox *combo, const QString &str, const QStringList &names) +void ServiceComboBox::setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -51,9 +51,9 @@ void ServiceComboBox::setCurrentText(QComboBox *combo, const QString &str, const } } -int ServiceComboBox::itemForText(const QString &str, const QStringList &names) +int ServiceComboBox::itemForText(const TQString &str, const TQStringList &names) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = 0; for (it = names.begin(); it != names.end(); ++it) { if (*it == str) { @@ -64,10 +64,10 @@ int ServiceComboBox::itemForText(const QString &str, const QStringList &names) return 0; } -QString ServiceComboBox::defaultCompiler() +TQString ServiceComboBox::defaultCompiler() { KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'"); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-KDevelop-Default").toBool()) { return (*it)->name();; diff --git a/buildtools/pascal/service.h b/buildtools/pascal/service.h index 30bb142b..26c302fd 100644 --- a/buildtools/pascal/service.h +++ b/buildtools/pascal/service.h @@ -18,12 +18,12 @@ class ServiceComboBox { public: - static void insertStringList(QComboBox *combo, const QValueList &list, - QStringList *names, QStringList *execs); - static QString currentText(QComboBox *combo, const QStringList &names); - static void setCurrentText(QComboBox *combo, const QString &str, const QStringList &names); - static int itemForText(const QString &str, const QStringList &names); - static QString defaultCompiler(); + static void insertStringList(TQComboBox *combo, const TQValueList &list, + TQStringList *names, TQStringList *execs); + static TQString currentText(TQComboBox *combo, const TQStringList &names); + static void setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names); + static int itemForText(const TQString &str, const TQStringList &names); + static TQString defaultCompiler(); }; #endif diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 20264144..63da84f8 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -15,10 +15,10 @@ #include "choosesubprojectdlg.h" #include "scope.h" -ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, QWidget* parent, const char* name, bool modal, WFlags fl) +ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent, const char* name, bool modal, WFlags fl) : ChooseSubprojectDlgBase(parent,name, modal,fl), m_widget(widget) { - connect(subprojects_view, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(itemSelected(QListViewItem *))); + connect(subprojects_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(itemSelected(TQListViewItem *))); if( m_widget->m_rootSubproject) { ChooseItem *it = new ChooseItem(m_widget->m_rootSubproject, subprojects_view, m_widget->m_rootSubproject->text(0)); @@ -44,15 +44,15 @@ void ChooseSubprojectDlg::accept() if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) return; - QDialog::accept(); + TQDialog::accept(); } -ChooseItem::ChooseItem( QMakeScopeItem * spitem, QListViewItem * parent, QString text ) +ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListViewItem * parent, TQString text ) :KListViewItem(parent, text), m_spitem(spitem) { } -ChooseItem::ChooseItem( QMakeScopeItem * spitem, QListView * parent, QString text ) +ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListView * parent, TQString text ) :KListViewItem(parent, text), m_spitem(spitem) { } @@ -67,7 +67,7 @@ void ChooseSubprojectDlg::fillSubprojectsView( ChooseItem *item ) if (!item->subproject()) return; - QListViewItem * sub_spitem = item->subproject()->firstChild(); + TQListViewItem * sub_spitem = item->subproject()->firstChild(); while( sub_spitem ) { QMakeScopeItem *spitem = dynamic_cast(sub_spitem); if ( spitem && spitem->scope->scopeType() == Scope::ProjectScope ) @@ -82,7 +82,7 @@ void ChooseSubprojectDlg::fillSubprojectsView( ChooseItem *item ) } } -void ChooseSubprojectDlg::itemSelected( QListViewItem * it ) +void ChooseSubprojectDlg::itemSelected( TQListViewItem * it ) { if (!it) return; diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index 689fe8b3..2101d3cd 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -22,8 +22,8 @@ class TrollProjectWidget; class ChooseItem: public KListViewItem { public: - ChooseItem(QMakeScopeItem *spitem, QListViewItem *parent, QString text); - ChooseItem(QMakeScopeItem *spitem, QListView *parent, QString text); + ChooseItem(QMakeScopeItem *spitem, TQListViewItem *parent, TQString text); + ChooseItem(QMakeScopeItem *spitem, TQListView *parent, TQString text); QMakeScopeItem *subproject(); @@ -36,7 +36,7 @@ class ChooseSubprojectDlg : public ChooseSubprojectDlgBase Q_OBJECT public: - ChooseSubprojectDlg(TrollProjectWidget *widget, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ChooseSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ @@ -52,7 +52,7 @@ protected: protected slots: /*$PROTECTED_SLOTS$*/ virtual void accept(); - virtual void itemSelected(QListViewItem *it); + virtual void itemSelected(TQListViewItem *it); private: void fillSubprojectsView(ChooseItem *item); diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index 439ddd70..4f65dd17 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include @@ -26,12 +26,12 @@ #include "scope.h" #include "trollprojectwidget.h" -CreateScopeDlg::CreateScopeDlg( QMakeScopeItem* item, QWidget* parent, const char* name, bool modal, WFlags fl ) +CreateScopeDlg::CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent, const char* name, bool modal, WFlags fl ) : CreateScopeDlgBase( parent, name, modal, fl ), m_item( item ) { incUrl->setMode( KFile::File | KFile::LocalOnly ); incUrl->setCaption( i18n( "Choose existing .pri file or give a new filename for creation" ) ); - incUrl->setURL( QString("") ); + incUrl->setURL( TQString("") ); incUrl->completionObject() ->setDir( item->scope->projectDir() ); incUrl->fileDialog()->setURL( KURL::fromPathOrURL( item->scope->projectDir() ) ); } @@ -55,15 +55,15 @@ void CreateScopeDlg::accept() case 2: if ( !incUrl->url().isEmpty() ) { - QString file = incUrl->url(); + TQString file = incUrl->url(); if ( !incUrl->url().endsWith( ".pri" ) ) file += ".pri"; if( file.find("/") == -1 ) file = m_item->scope->projectDir()+"/"+file; // We need to create the file, because getRelativePath checks for existent paths - if( !QFile::exists(file) ) + if( !TQFile::exists(file) ) { - QFile temp(file); + TQFile temp(file); if( temp.open(IO_WriteOnly) ) temp.close(); } @@ -78,20 +78,20 @@ void CreateScopeDlg::accept() new QMakeScopeItem( m_item, s->scopeName(), s ); else { - QListViewItem* item = m_item->firstChild(); + TQListViewItem* item = m_item->firstChild(); while( item->nextSibling() ) item = item->nextSibling(); QMakeScopeItem* newitem = new QMakeScopeItem( m_item, s->scopeName(), s ); newitem->moveItem( item ); } - QDialog::accept(); + TQDialog::accept(); } else { if ( KMessageBox::warningYesNo( this, i18n( "You did not specify all needed information. " "The scope will not be created.
Do you want to abort the scope creation?" ), i18n( "Missing information" ) ) == KMessageBox:: Yes ) - QDialog::reject(); + TQDialog::reject(); } } diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index c8ed86ef..675143b1 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -22,7 +22,7 @@ class CreateScopeDlg : public CreateScopeDlgBase Q_OBJECT public: - CreateScopeDlg( QMakeScopeItem* item, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreateScopeDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index 335bf33f..c05c70c9 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -11,16 +11,16 @@ #include "disablesubprojectdlg.h" #include -#include +#include #include "scope.h" #include "qmakescopeitem.h" -DisableSubprojectDlg::DisableSubprojectDlg( const QStringList& projects, QWidget* parent, const char* name, WFlags fl ) +DisableSubprojectDlg::DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent, const char* name, WFlags fl ) : DisableSubprojectDlgBase( parent, name, fl ) { - for( QStringList::const_iterator it = projects.begin(); it != projects.end(); ++it ) + for( TQStringList::const_iterator it = projects.begin(); it != projects.end(); ++it ) { - new QCheckListItem(subprojects_view, *it, QCheckListItem::CheckBox); + new TQCheckListItem(subprojects_view, *it, TQCheckListItem::CheckBox); } } @@ -28,13 +28,13 @@ DisableSubprojectDlg::~DisableSubprojectDlg() { } -QStringList DisableSubprojectDlg::selectedProjects() +TQStringList DisableSubprojectDlg::selectedProjects() { - QStringList result; - QListViewItem* item = subprojects_view->firstChild(); + TQStringList result; + TQListViewItem* item = subprojects_view->firstChild(); while( item ) { - QCheckListItem* ci = dynamic_cast(item); + TQCheckListItem* ci = dynamic_cast(item); if( ci && ci->isOn() ) { result << ci->text(0); diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 13a27468..00602f28 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -19,11 +19,11 @@ class DisableSubprojectDlg : public DisableSubprojectDlgBase Q_OBJECT public: - DisableSubprojectDlg( const QStringList& projects, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~DisableSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ - QStringList selectedProjects(); + TQStringList selectedProjects(); public slots: /*$PUBLIC_SLOTS$*/ diff --git a/buildtools/qmake/newwidgetdlg.cpp b/buildtools/qmake/newwidgetdlg.cpp index 7be62acd..44dd7588 100644 --- a/buildtools/qmake/newwidgetdlg.cpp +++ b/buildtools/qmake/newwidgetdlg.cpp @@ -10,22 +10,22 @@ ***************************************************************************/ #include "newwidgetdlg.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include #define WIDGET_CAPTION_NAME "widget/property|name=caption/string" #define WIDGET_CLASS_NAME "class" #define WIDGET_SLOTS "slots" -NewWidgetDlg::NewWidgetDlg(QStringList &newFileNames,QWidget* parent, const char* name, bool modal, WFlags fl) +NewWidgetDlg::NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent, const char* name, bool modal, WFlags fl) : NewWidgetDlgBase(parent,name,modal,fl), m_newFileNames(newFileNames) //================================================= @@ -45,34 +45,34 @@ NewWidgetDlg::~NewWidgetDlg() void NewWidgetDlg::subclassingPressed() //===================================== { - QMessageBox::information(0,"subclassing",""); + TQMessageBox::information(0,"subclassing",""); } void NewWidgetDlg::templateSelChanged() //===================================== { - QMessageBox::information(0,"template",""); + TQMessageBox::information(0,"template",""); } void NewWidgetDlg::accept() //========================= { - QDomDocument doc; + TQDomDocument doc; DomUtil::openDOMFile(doc,"/home/jsgaarde/programming/kdevelop/domapp/clean_dialog.ui"); DomUtil::replaceText(doc,WIDGET_CLASS_NAME,"TestClass"); DomUtil::replaceText(doc,WIDGET_CAPTION_NAME,"Test Dialog"); - QDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); - QDomNodeList slotnodes = slotsElem.childNodes(); + TQDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); + TQDomNodeList slotnodes = slotsElem.childNodes(); for (unsigned int i=0; i -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -31,15 +31,15 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -51,17 +51,17 @@ #include "scope.h" #include "urlutil.h" -InsideCheckListItem::InsideCheckListItem( QListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - QCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), QCheckListItem::CheckBox ) +InsideCheckListItem::InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox ) { prjItem = item; m_config = config; } -InsideCheckListItem::InsideCheckListItem( QListView *parent, QListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - QCheckListItem( parent, +InsideCheckListItem::InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( parent, after, - item->relativePath(), QCheckListItem::CheckBox ) + item->relativePath(), TQCheckListItem::CheckBox ) { prjItem = item; m_config = config; @@ -72,7 +72,7 @@ void InsideCheckListItem::stateChange( bool state ) { if ( listView() == m_config->insidelib_listview ) { - QListViewItemIterator it( m_config->intDeps_view ); + TQListViewItemIterator it( m_config->intDeps_view ); while ( it.current() ) { InsideCheckListItem * chi = dynamic_cast( it.current() ); @@ -84,7 +84,7 @@ void InsideCheckListItem::stateChange( bool state ) } } -CustomVarListItem::CustomVarListItem(QListView* parent, unsigned int id, QMap var) +CustomVarListItem::CustomVarListItem(TQListView* parent, unsigned int id, TQMap var) : KListViewItem(parent), m_key(id) { setText(0, var["var"]); @@ -92,21 +92,21 @@ CustomVarListItem::CustomVarListItem(QListView* parent, unsigned int id, QMapsetValidator( new QRegExpValidator( - QRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); + m_targetLibraryVersion->setValidator( new TQRegExpValidator( + TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); customVariables->setSortColumn(0); customVariables->setSortOrder(Qt::Ascending); mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); @@ -170,7 +170,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" ); myProjectItem->setPixmap( 0, SmallIcon( "qmake_app" ) ); - QString targetname = prjWidget->getCurrentOutputFilename(); + TQString targetname = prjWidget->getCurrentOutputFilename(); if( targetname.findRev("/") != -1 ) targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); DomUtil::writeEntry( *prjWidget->m_part->projectDom(), @@ -410,9 +410,9 @@ void ProjectConfigurationDlg::updateProjectConfiguration() myProjectItem->removeValue( "QT", "phonon" ); } - QStringList confValues = myProjectItem->scope->variableValues( "CONFIG" ); - QStringList extraValues = QStringList::split( " ", editConfigExtra->text() ); - for ( QStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) + TQStringList confValues = myProjectItem->scope->variableValues( "CONFIG" ); + TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() ); + for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) { if ( Scope::KnownConfigValues.findIndex( *it ) == -1 && extraValues.findIndex( *it ) == -1 ) { @@ -420,51 +420,51 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } } - for ( QStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it ) + for ( TQStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it ) { if ( confValues.findIndex( *it ) == -1 ) myProjectItem->scope->addToPlusOp( "CONFIG", *it ); } - QString targetpath = m_targetPath->url(); -// if( !QFileInfo( targetpath ).isRelative() ) + TQString targetpath = m_targetPath->url(); +// if( !TQFileInfo( targetpath ).isRelative() ) // targetpath = URLUtil::getRelativePath( myProjectItem->scope->projectDir(), targetpath ); if( myProjectItem->scope->scopeType() == Scope::FunctionScope || myProjectItem->scope->scopeType() == Scope::SimpleScope ) { if( myProjectItem->scope->variableValues("TARGET").findIndex( m_targetOutputFile->text() ) == -1 ) - myProjectItem->scope->setEqualOp( "TARGET", QStringList( m_targetOutputFile->text() ) ); + myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) ); if( myProjectItem->scope->variableValues("DESTDIR").findIndex( targetpath ) == -1 ) - myProjectItem->scope->setEqualOp( "DESTDIR", QStringList( targetpath ) ); + myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) ); }else { - myProjectItem->scope->setEqualOp( "TARGET", QStringList( m_targetOutputFile->text() ) ); - myProjectItem->scope->setEqualOp( "DESTDIR", QStringList( targetpath ) ); + myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) ); + myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) ); } - myProjectItem->updateValues( "DEFINES", QStringList::split( " ", m_defines->text() ) ); - myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", QStringList::split( " ", m_debugFlags->text() ) ); - myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", QStringList::split( " ", m_releaseFlags->text() ) ); + myProjectItem->updateValues( "DEFINES", TQStringList::split( " ", m_defines->text() ) ); + myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) ); + myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) ); //add selected includes - QStringList values; + TQStringList values; InsideCheckListItem *insideItem = ( InsideCheckListItem * ) insideinc_listview->firstChild(); while ( insideItem ) { if ( insideItem->isOn() ) { - QString tmpInc = insideItem->prjItem->getIncAddPath( myProjectItem->scope->projectDir() ); - tmpInc = QDir::cleanDirPath( tmpInc ); + TQString tmpInc = insideItem->prjItem->getIncAddPath( myProjectItem->scope->projectDir() ); + tmpInc = TQDir::cleanDirPath( tmpInc ); values << tmpInc; } insideItem = ( InsideCheckListItem* ) insideItem->itemBelow(); } - QCheckListItem *outsideItem = ( QCheckListItem * ) outsideinc_listview->firstChild(); + TQCheckListItem *outsideItem = ( TQCheckListItem * ) outsideinc_listview->firstChild(); while ( outsideItem ) { values << outsideItem->text( 0 ); - outsideItem = ( QCheckListItem* ) outsideItem->itemBelow(); + outsideItem = ( TQCheckListItem* ) outsideItem->itemBelow(); } // myProjectItem->removeValues( "INCLUDEPATH", values ); myProjectItem->updateValues( "INCLUDEPATH", values ); @@ -473,7 +473,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if ( checkInstallTarget->isChecked() == true ) { myProjectItem->addValue( "INSTALLS", "target" ); - myProjectItem->scope->setEqualOp( "target.path", QStringList( m_InstallTargetPath->text() ) ); + myProjectItem->scope->setEqualOp( "target.path", TQStringList( m_InstallTargetPath->text() ) ); } else { @@ -482,12 +482,12 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } //makefile - myProjectItem->scope->setEqualOp( "MAKEFILE", QStringList( makefile_url->url() ) ); + myProjectItem->scope->setEqualOp( "MAKEFILE", TQStringList( makefile_url->url() ) ); //add libs to link values.clear(); - QStringList libPaths; + TQStringList libPaths; //inside libs to link insideItem = ( InsideCheckListItem * ) insidelib_listview->firstChild(); @@ -496,11 +496,11 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if ( insideItem->isOn() ) { - QString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); + TQString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { //add path if shared lib is linked - QString tmpPath = insideItem->prjItem->getLibAddPath( + TQString tmpPath = insideItem->prjItem->getLibAddPath( myProjectItem->scope->projectDir() ); if ( tmpPath != "" ) { @@ -514,7 +514,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } //extra lib paths - QListViewItem *lvItem = outsidelibdir_listview->firstChild(); + TQListViewItem *lvItem = outsidelibdir_listview->firstChild(); while ( lvItem ) { values << ( "-L"+lvItem->text( 0 ) ); @@ -523,11 +523,11 @@ void ProjectConfigurationDlg::updateProjectConfiguration() //outside libs to link - outsideItem = ( QCheckListItem * ) outsidelib_listview->firstChild(); + outsideItem = ( TQCheckListItem * ) outsidelib_listview->firstChild(); while ( outsideItem ) { values << outsideItem->text( 0 ); - outsideItem = ( QCheckListItem* ) outsideItem->itemBelow(); + outsideItem = ( TQCheckListItem* ) outsideItem->itemBelow(); } @@ -537,7 +537,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() values.clear(); //external project dependencies - QListViewItem *depItem = extDeps_view->firstChild(); + TQListViewItem *depItem = extDeps_view->firstChild(); while ( depItem ) { values << depItem->text( 0 ); @@ -601,19 +601,19 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } // intermediate locations - myProjectItem->scope->setEqualOp( "OBJECTS_DIR", QStringList( objdir_url->url() ) ); - myProjectItem->scope->setEqualOp( "UI_DIR", QStringList( uidir_url->url() ) ); - myProjectItem->scope->setEqualOp( "MOC_DIR", QStringList( mocdir_url->url() ) ); - myProjectItem->scope->setEqualOp( "RCC_DIR", QStringList( rccdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "OBJECTS_DIR", TQStringList( objdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "UI_DIR", TQStringList( uidir_url->url() ) ); + myProjectItem->scope->setEqualOp( "MOC_DIR", TQStringList( mocdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "RCC_DIR", TQStringList( rccdir_url->url() ) ); //CORBA - myProjectItem->scope->setEqualOp( "IDL_COMPILER", QStringList( idlCmdEdit->url() ) ); - myProjectItem->updateValues( "IDL_OPTIONS", QStringList::split( " ", idlCmdOptionsEdit->text() ) ); + myProjectItem->scope->setEqualOp( "IDL_COMPILER", TQStringList( idlCmdEdit->url() ) ); + myProjectItem->updateValues( "IDL_OPTIONS", TQStringList::split( " ", idlCmdOptionsEdit->text() ) ); - QListViewItemIterator iter(customVariables); + TQListViewItemIterator iter(customVariables); for( ; iter.current() ; iter++ ) { - QListViewItem* item = iter.current(); + TQListViewItem* item = iter.current(); myProjectItem->scope->updateCustomVariable( item->key(0, true).toUInt(), item->text(0), item->text(1), item->text(2) ); } } @@ -623,13 +623,13 @@ void ProjectConfigurationDlg::accept() if( buttonApply->isEnabled() ) apply(); myProjectItem = 0; - QDialog::accept(); + TQDialog::accept(); } void ProjectConfigurationDlg::reject() { myProjectItem = 0; - QDialog::reject(); + TQDialog::reject(); } @@ -644,8 +644,8 @@ void ProjectConfigurationDlg::updateControls() groupTemplate->setEnabled( true ); //cache the value of the some variables - QStringList configValues = myProjectItem->scope->variableValues( "CONFIG" ); - QStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" ); + TQStringList configValues = myProjectItem->scope->variableValues( "CONFIG" ); + TQStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" ); //if( !myProjectItem->isScope ) //{ if ( templateValues.findIndex( "lib" ) != -1 ) @@ -708,13 +708,13 @@ void ProjectConfigurationDlg::updateControls() { checkConsole->setChecked( true ); } - QString targetname = prjWidget->getCurrentOutputFilename(); + TQString targetname = prjWidget->getCurrentOutputFilename(); if( targetname.findRev("/") != -1 ) targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); m_editRunArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, "" ) ); - QString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" ); - if( QFileInfo(dir).isRelative() ) + TQString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" ); + if( TQFileInfo(dir).isRelative() ) { m_CWDEdit->completionObject()->setDir( myProjectItem->scope->projectDir() ); m_CWDEdit->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -728,7 +728,7 @@ void ProjectConfigurationDlg::updateControls() if( m_CWDEdit->url().isEmpty() ) { - QString destdir = myProjectItem->m_widget->getCurrentDestDir(); + TQString destdir = myProjectItem->m_widget->getCurrentDestDir(); if( !destdir.startsWith( "/" ) ) destdir = myProjectItem->m_widget->projectDirectory()+"/"+destdir; m_CWDEdit->setURL( destdir.left( destdir.findRev("/") ) ); @@ -834,7 +834,7 @@ void ProjectConfigurationDlg::updateControls() else checkQtHelp->setChecked( false ); - QStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); + TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); if ( qtLibs.findIndex( "core" ) != -1 ) checkQt4Core->setChecked( true ); else @@ -892,8 +892,8 @@ void ProjectConfigurationDlg::updateControls() } //fill the custom config edit - QStringList extraValues; - for ( QStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) + TQStringList extraValues; + for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) { if ( Scope::KnownConfigValues.findIndex( *it ) == -1 ) { @@ -902,8 +902,8 @@ void ProjectConfigurationDlg::updateControls() } editConfigExtra->setText( extraValues.join( " " ) ); - QString dir = myProjectItem->scope->variableValues( "MAKEFILE" ).front(); - if( QFileInfo(dir).isRelative() ) + TQString dir = myProjectItem->scope->variableValues( "MAKEFILE" ).front(); + if( TQFileInfo(dir).isRelative() ) { makefile_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); makefile_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -929,7 +929,7 @@ void ProjectConfigurationDlg::updateControls() m_targetOutputFile->setText( myProjectItem->scope->variableValues( "TARGET" ).front() ); dir = myProjectItem->scope->variableValues( "DESTDIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { m_targetPath->completionObject()->setDir( myProjectItem->scope->projectDir() ); m_targetPath->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -950,7 +950,7 @@ void ProjectConfigurationDlg::updateControls() updateDependenciesControl(); dir = myProjectItem->scope->variableValues( "OBJECTS_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { objdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); objdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -961,7 +961,7 @@ void ProjectConfigurationDlg::updateControls() } objdir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "UI_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { uidir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); uidir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -972,7 +972,7 @@ void ProjectConfigurationDlg::updateControls() } uidir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "MOC_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { mocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); mocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -983,7 +983,7 @@ void ProjectConfigurationDlg::updateControls() } mocdir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "RC_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { rccdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); rccdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -996,7 +996,7 @@ void ProjectConfigurationDlg::updateControls() dir = myProjectItem->scope->variableValues( "IDL_COMPILER" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { idlCmdEdit->completionObject()->setDir( myProjectItem->scope->projectDir() ); idlCmdEdit->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -1012,8 +1012,8 @@ void ProjectConfigurationDlg::updateControls() customVariableName->setText(""); customVariableData->setText(""); customVariableOp->setCurrentItem( 0 ); - QMap > customvars = myProjectItem->scope->customVariables(); - QMap >::iterator idx = customvars.begin(); + TQMap > customvars = myProjectItem->scope->customVariables(); + TQMap >::iterator idx = customvars.begin(); for ( ; idx != customvars.end(); ++idx ) { CustomVarListItem* item = new CustomVarListItem( customVariables, idx.key(), idx.data() ); @@ -1023,9 +1023,9 @@ void ProjectConfigurationDlg::updateControls() groupTemplateChanged(0); } -QPtrList ProjectConfigurationDlg::getAllProjects() +TQPtrList ProjectConfigurationDlg::getAllProjects() { - QPtrList tmpPrjList; + TQPtrList tmpPrjList; QMakeScopeItem *item = static_cast( prjList->firstChild() ); while ( item ) { @@ -1040,7 +1040,7 @@ QPtrList ProjectConfigurationDlg::getAllProjects() return ( tmpPrjList ); } -void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, QPtrList *itemList ) +void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, TQPtrList *itemList ) { QMakeScopeItem * subItem = static_cast( item->firstChild() ); @@ -1063,18 +1063,18 @@ void ProjectConfigurationDlg::updateIncludeControl() insideinc_listview->clear(); outsideinc_listview->clear(); - QStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" ); - QStringList intIncList = incList; - QMap items; - QPtrList itemList = getAllProjects(); + TQStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" ); + TQStringList intIncList = incList; + TQMap items; + TQPtrList itemList = getAllProjects(); QMakeScopeItem *item = itemList.first(); while ( item ) { if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 || item->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) != -1 ) { - QString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() ); - tmpInc = QDir::cleanDirPath( tmpInc ); + TQString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() ); + tmpInc = TQDir::cleanDirPath( tmpInc ); InsideCheckListItem *newItem = new InsideCheckListItem( insideinc_listview, insideinc_listview->lastItem(), item, this ); @@ -1092,18 +1092,18 @@ void ProjectConfigurationDlg::updateIncludeControl() //all other in incList are outside incs outsideinc_listview->clear(); - QStringList::Iterator it1 = incList.begin(); + TQStringList::Iterator it1 = incList.begin(); for ( ;it1 != incList.end();++it1 ) { intIncList.remove(*it1); - new QListViewItem( outsideinc_listview, outsideinc_listview->lastItem(), ( *it1 ) ); + new TQListViewItem( outsideinc_listview, outsideinc_listview->lastItem(), ( *it1 ) ); } - for( QStringList::const_iterator it = intIncList.begin(); it != intIncList.end(); ++it ) + for( TQStringList::const_iterator it = intIncList.begin(); it != intIncList.end(); ++it ) { insideinc_listview->insertItem( items[*it] ); items.remove(*it); } - for( QMap::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) + for( TQMap::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) { insideinc_listview->insertItem( it3.data() ); } @@ -1112,7 +1112,7 @@ void ProjectConfigurationDlg::updateIncludeControl() void ProjectConfigurationDlg::updateLibControls() { - QPtrList itemList = getAllProjects(); + TQPtrList itemList = getAllProjects(); insidelib_listview->setSorting( -1, false ); outsidelib_listview->setSorting( -1, false ); @@ -1122,9 +1122,9 @@ void ProjectConfigurationDlg::updateLibControls() outsidelibdir_listview->clear(); //update librarys //temp strlist - QStringList libList = myProjectItem->scope->variableValues( "LIBS" ); - QStringList intLibList = libList; - QMap items; + TQStringList libList = myProjectItem->scope->variableValues( "LIBS" ); + TQStringList intLibList = libList; + TQMap items; QMakeScopeItem* item = itemList.first(); while ( item ) { @@ -1133,13 +1133,13 @@ void ProjectConfigurationDlg::updateLibControls() if ( item != myProjectItem ) { // create lib string - QString tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() ); + TQString tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() ); InsideCheckListItem * newItem = new InsideCheckListItem( insidelib_listview, insidelib_listview->lastItem(), item, this ); insidelib_listview->takeItem( newItem ); items[tmpLib] = newItem; - QString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() ); + TQString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() ); kdDebug(9024) << "lib:" << tmpLib << " dir:" << tmpLibDir << "|" << libList << endl; if ( libList.findIndex( "-L" + tmpLibDir ) != -1 ) { @@ -1156,28 +1156,28 @@ void ProjectConfigurationDlg::updateLibControls() } //all other in libList are outside libs - QStringList::Iterator it1 = libList.begin(); + TQStringList::Iterator it1 = libList.begin(); for ( ;it1 != libList.end();++it1 ) { intLibList.remove( *it1 ); if ( ( *it1 ).startsWith( "-L" ) ) - new QListViewItem( outsidelibdir_listview, outsidelibdir_listview->lastItem(), ( *it1 ).mid( 2 ) ); + new TQListViewItem( outsidelibdir_listview, outsidelibdir_listview->lastItem(), ( *it1 ).mid( 2 ) ); else { - new QListViewItem( outsidelib_listview, outsidelib_listview->lastItem(), ( *it1 ) ); + new TQListViewItem( outsidelib_listview, outsidelib_listview->lastItem(), ( *it1 ) ); } } - for( QStringList::const_iterator it = intLibList.begin(); it != intLibList.end(); ++it ) + for( TQStringList::const_iterator it = intLibList.begin(); it != intLibList.end(); ++it ) { - QString lib = *it; + TQString lib = *it; if( !lib.startsWith( "-L" ) ) { insidelib_listview->insertItem( items[lib] ); items.remove(lib); } } - for( QMap::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) + for( TQMap::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) { insidelib_listview->insertItem( it3.data() ); } @@ -1185,25 +1185,25 @@ void ProjectConfigurationDlg::updateLibControls() void ProjectConfigurationDlg::updateDependenciesControl( ) { - QPtrList itemList = getAllProjects(); + TQPtrList itemList = getAllProjects(); intDeps_view->setSorting( -1, false ); extDeps_view->setSorting( -1, false ); intDeps_view->clear(); extDeps_view->clear(); - QStringList depsList = myProjectItem->scope->variableValues( "TARGETDEPS" ); - QStringList intDepList = depsList; - QMap items; + TQStringList depsList = myProjectItem->scope->variableValues( "TARGETDEPS" ); + TQStringList intDepList = depsList; + TQMap items; QMakeScopeItem *item = itemList.first(); while ( item ) { - QStringList templateval = item->scope->variableValues( "TEMPLATE" ); + TQStringList templateval = item->scope->variableValues( "TEMPLATE" ); if ( templateval.findIndex( "lib" ) != -1 || templateval.findIndex( "app" ) != -1 ) { - QString tmpLib; - QStringList values = item->scope->variableValues( "CONFIG" ); + TQString tmpLib; + TQStringList values = item->scope->variableValues( "CONFIG" ); if ( templateval.findIndex( "lib" ) != -1 && values.findIndex( "dll" ) != -1 ) tmpLib = item->getSharedLibAddObject( myProjectItem->scope->projectDir() ); else if ( templateval.findIndex( "lib" ) != -1 ) @@ -1225,20 +1225,20 @@ void ProjectConfigurationDlg::updateDependenciesControl( ) //add all other prj in itemList unchecked extDeps_view->clear(); - for ( QStringList::Iterator it1 = depsList.begin();it1 != depsList.end();++it1 ) + for ( TQStringList::Iterator it1 = depsList.begin();it1 != depsList.end();++it1 ) { intDepList << *it1; - new QListViewItem( extDeps_view, extDeps_view->lastItem(), ( *it1 ) ); + new TQListViewItem( extDeps_view, extDeps_view->lastItem(), ( *it1 ) ); } - for( QStringList::const_iterator it = intDepList.begin(); it != intDepList.end(); ++it ) + for( TQStringList::const_iterator it = intDepList.begin(); it != intDepList.end(); ++it ) { intDeps_view->insertItem( items[*it] ); items.remove(*it); } - for( QMap::ConstIterator it2 = items.begin(); it2 != items.end(); it2++ ) + for( TQMap::ConstIterator it2 = items.begin(); it2 != items.end(); it2++ ) { intDeps_view->insertItem( it2.data() ); } @@ -1251,7 +1251,7 @@ void ProjectConfigurationDlg::updateBuildOrderControl() if ( myProjectItem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 ) { - QPtrList itemList; + TQPtrList itemList; QMakeScopeItem *item = static_cast( myProjectItem->firstChild() ); while ( item ) @@ -1263,8 +1263,8 @@ void ProjectConfigurationDlg::updateBuildOrderControl() incaddTab->setEnabled( false ); buildorder_listview->setSorting( -1, false ); buildorder_listview->clear(); - QStringList buildList = myProjectItem->scope->variableValues( "SUBDIRS" ); - QStringList::Iterator it1 = buildList.begin(); + TQStringList buildList = myProjectItem->scope->variableValues( "SUBDIRS" ); + TQStringList::Iterator it1 = buildList.begin(); for ( ;it1 != buildList.end();++it1 ) { item = itemList.first(); @@ -1274,7 +1274,7 @@ void ProjectConfigurationDlg::updateBuildOrderControl() { if ( item->text( 0 ) == ( *it1 ) ) { - new QListViewItem( buildorder_listview, buildorder_listview->lastItem(), item->text( 0 ) ); + new TQListViewItem( buildorder_listview, buildorder_listview->lastItem(), item->text( 0 ) ); itemList.take(); break; } @@ -1295,7 +1295,7 @@ void ProjectConfigurationDlg::buildorderMoveUpClicked() return ; } - QListViewItem *item = buildorder_listview->firstChild(); + TQListViewItem *item = buildorder_listview->firstChild(); while ( item->nextSibling() != buildorder_listview->currentItem() ) item = item->nextSibling(); item->moveItem( buildorder_listview->currentItem() ); @@ -1325,7 +1325,7 @@ void ProjectConfigurationDlg::insideIncMoveUpClicked() return ; } - QListViewItem *item = insideinc_listview->firstChild(); + TQListViewItem *item = insideinc_listview->firstChild(); while ( item->nextSibling() != insideinc_listview->currentItem() ) item = item->nextSibling(); item->moveItem( insideinc_listview->currentItem() ); @@ -1354,7 +1354,7 @@ void ProjectConfigurationDlg::outsideIncMoveUpClicked() return ; } - QListViewItem *item = outsideinc_listview->firstChild(); + TQListViewItem *item = outsideinc_listview->firstChild(); while ( item->nextSibling() != outsideinc_listview->currentItem() ) item = item->nextSibling(); item->moveItem( outsideinc_listview->currentItem() ); @@ -1379,15 +1379,15 @@ void ProjectConfigurationDlg::outsideIncAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add include directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { - new QListViewItem( outsideinc_listview, dir ); + new TQListViewItem( outsideinc_listview, dir ); activateApply( 0 ); } } @@ -1408,7 +1408,7 @@ void ProjectConfigurationDlg::insideLibMoveUpClicked() return ; } - QListViewItem *item = insidelib_listview->firstChild(); + TQListViewItem *item = insidelib_listview->firstChild(); while ( item->nextSibling() != insidelib_listview->currentItem() ) item = item->nextSibling(); item->moveItem( insidelib_listview->currentItem() ); @@ -1437,7 +1437,7 @@ void ProjectConfigurationDlg::outsideLibMoveUpClicked() return ; } - QListViewItem *item = outsidelib_listview->firstChild(); + TQListViewItem *item = outsidelib_listview->firstChild(); while ( item->nextSibling() != outsidelib_listview->currentItem() ) item = item->nextSibling(); item->moveItem( outsidelib_listview->currentItem() ); @@ -1463,40 +1463,40 @@ void ProjectConfigurationDlg::outsideLibAddClicked() KURLRequesterDlg dialog( "", i18n( "Add Library: Either choose the .a/.so file or give -l" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if( file.startsWith("-l") ) { - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); activateApply( 0 ); } else { - QFileInfo fi(file); + TQFileInfo fi(file); if( !fi.exists() ) { - new QListViewItem( outsidelib_listview, file );; + new TQListViewItem( outsidelib_listview, file );; activateApply( 0 ); } if( fi.extension(false) == "a" ) { - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); activateApply( 0 ); }else if ( fi.extension(false) == "so" ) { - QString path = fi.dirPath( true ); - QString name = fi.fileName(); + TQString path = fi.dirPath( true ); + TQString name = fi.fileName(); if( name.startsWith( "lib" ) ) name = name.mid(3); name = "-l"+name.left( name.length() - 3 ); - new QListViewItem( outsidelib_listview, name ); - new QListViewItem( outsidelibdir_listview, path ); + new TQListViewItem( outsidelib_listview, name ); + new TQListViewItem( outsidelibdir_listview, path ); activateApply( 0 ); }else return; @@ -1521,7 +1521,7 @@ void ProjectConfigurationDlg::outsideLibDirMoveUpClicked() return ; } - QListViewItem *item = outsidelibdir_listview->firstChild(); + TQListViewItem *item = outsidelibdir_listview->firstChild(); while ( item->nextSibling() != outsidelibdir_listview->currentItem() ) item = item->nextSibling(); item->moveItem( outsidelibdir_listview->currentItem() ); @@ -1546,15 +1546,15 @@ void ProjectConfigurationDlg::outsideLibDirAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add library directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { - new QListViewItem( outsidelibdir_listview, dir ); + new TQListViewItem( outsidelibdir_listview, dir ); activateApply( 0 ); } } @@ -1568,13 +1568,13 @@ void ProjectConfigurationDlg::outsideLibDirRemoveClicked() void ProjectConfigurationDlg::outsideIncEditClicked() { - QListViewItem * item = outsideinc_listview->currentItem(); + TQListViewItem * item = outsideinc_listview->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change include directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1585,9 +1585,9 @@ void ProjectConfigurationDlg::outsideIncEditClicked() dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { item->setText( 0, dir ); @@ -1597,13 +1597,13 @@ void ProjectConfigurationDlg::outsideIncEditClicked() void ProjectConfigurationDlg::outsideLibEditClicked() { - QListViewItem *item = outsidelib_listview->currentItem(); + TQListViewItem *item = outsidelib_listview->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change Library:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1613,9 +1613,9 @@ void ProjectConfigurationDlg::outsideLibEditClicked() dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if( file.startsWith("-l") ) @@ -1625,7 +1625,7 @@ void ProjectConfigurationDlg::outsideLibEditClicked() } else { - QFileInfo fi(file); + TQFileInfo fi(file); if( !fi.exists() ) { item->setText( 0, file ); @@ -1637,13 +1637,13 @@ void ProjectConfigurationDlg::outsideLibEditClicked() activateApply( 0 ); }else if ( fi.extension(false) == "so" ) { - QString path = fi.dirPath( true ); - QString name = fi.fileName(); + TQString path = fi.dirPath( true ); + TQString name = fi.fileName(); if( name.startsWith( "lib" ) ) name = name.mid(3); name = "-l"+name.left( name.length() - 3 ); item->setText( 0, name ); - new QListViewItem( outsidelibdir_listview, path ); + new TQListViewItem( outsidelibdir_listview, path ); activateApply( 0 ); }else return; @@ -1653,14 +1653,14 @@ void ProjectConfigurationDlg::outsideLibEditClicked() void ProjectConfigurationDlg::outsideLibDirEditClicked() { - QListViewItem * item = outsidelibdir_listview->currentItem(); + TQListViewItem * item = outsidelibdir_listview->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change library directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1671,9 +1671,9 @@ void ProjectConfigurationDlg::outsideLibDirEditClicked() dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { item->setText( 0, dir ); @@ -1686,28 +1686,28 @@ void ProjectConfigurationDlg::extAdd_button_clicked( ) { KURLRequesterDlg dialog( "", i18n( "Add target:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString path = dialog.urlRequester() ->url(); + TQString path = dialog.urlRequester() ->url(); if ( !path.isEmpty() ) { - new QListViewItem( extDeps_view, path ); + new TQListViewItem( extDeps_view, path ); activateApply( 0 ); } } void ProjectConfigurationDlg::extEdit_button_clicked( ) { - QListViewItem * item = extDeps_view->currentItem(); + TQListViewItem * item = extDeps_view->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change target:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1718,9 +1718,9 @@ void ProjectConfigurationDlg::extEdit_button_clicked( ) dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString path = dialog.urlRequester() ->url(); + TQString path = dialog.urlRequester() ->url(); if ( !path.isEmpty() ) { item->setText( 0, path ); @@ -1748,7 +1748,7 @@ void ProjectConfigurationDlg::extMoveUp_button_clicked( ) return ; } - QListViewItem *item = extDeps_view->firstChild(); + TQListViewItem *item = extDeps_view->firstChild(); while ( item->nextSibling() != extDeps_view->currentItem() ) item = item->nextSibling(); item->moveItem( extDeps_view->currentItem() ); @@ -1781,7 +1781,7 @@ void ProjectConfigurationDlg::intMoveUp_button_clicked( ) return ; } - QListViewItem *item = intDeps_view->firstChild(); + TQListViewItem *item = intDeps_view->firstChild(); while ( item->nextSibling() != intDeps_view->currentItem() ) item = item->nextSibling(); item->moveItem( intDeps_view->currentItem() ); @@ -1790,7 +1790,7 @@ void ProjectConfigurationDlg::intMoveUp_button_clicked( ) void ProjectConfigurationDlg::addCustomValueClicked() { - QMap customvar; + TQMap customvar; customvar["var"] = i18n("Name"); customvar["op"] = "="; customvar["values"] = i18n("Value"); @@ -1804,7 +1804,7 @@ void ProjectConfigurationDlg::addCustomValueClicked() } void ProjectConfigurationDlg::removeCustomValueClicked() { - QListViewItem * item = customVariables->currentItem(); + TQListViewItem * item = customVariables->currentItem(); if ( item ) { myProjectItem->scope->removeCustomVariable( item->key(0, true).toUInt() ); @@ -1829,7 +1829,7 @@ void ProjectConfigurationDlg::removeCustomValueClicked() void ProjectConfigurationDlg::upCustomValueClicked() { // custom vars - QListViewItem * item = customVariables->firstChild(); + TQListViewItem * item = customVariables->firstChild(); if ( customVariables->currentItem() == item ) { KNotifyClient::beep(); @@ -1857,7 +1857,7 @@ void ProjectConfigurationDlg::newCustomVariableActive( ) customVariableOp->blockSignals(true); customVariableName->blockSignals(true); customVariableData->blockSignals(true); - QListViewItem * item = customVariables->currentItem(); + TQListViewItem * item = customVariables->currentItem(); if ( item ) { customVariableName->setText( item->text( 0 ) ); @@ -2021,26 +2021,26 @@ void ProjectConfigurationDlg::activateApply( int ) { buttonApply->setEnabled( true ); } -void ProjectConfigurationDlg::activateApply( const QString& ) +void ProjectConfigurationDlg::activateApply( const TQString& ) { buttonApply->setEnabled( true ); } -void ProjectConfigurationDlg::activateApply( QListViewItem* ) +void ProjectConfigurationDlg::activateApply( TQListViewItem* ) { buttonApply->setEnabled( true ); } void ProjectConfigurationDlg::removeSharedLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["shared_lib"]); @@ -2057,14 +2057,14 @@ void ProjectConfigurationDlg::removeSharedLibDeps() void ProjectConfigurationDlg::addStaticLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 ) @@ -2078,7 +2078,7 @@ void ProjectConfigurationDlg::addStaticLibDeps() void ProjectConfigurationDlg::removeStaticLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast( it.current() ); @@ -2086,7 +2086,7 @@ void ProjectConfigurationDlg::removeStaticLibDeps() continue; - QMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("LIBS").findIndex(infos["static_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["static_lib"]); @@ -2100,14 +2100,14 @@ void ProjectConfigurationDlg::removeStaticLibDeps() void ProjectConfigurationDlg::addSharedLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) { @@ -2121,14 +2121,14 @@ void ProjectConfigurationDlg::addSharedLibDeps() void ProjectConfigurationDlg::removeAppDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 ) { @@ -2140,14 +2140,14 @@ void ProjectConfigurationDlg::removeAppDeps() void ProjectConfigurationDlg::addAppDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) @@ -2161,7 +2161,7 @@ void ProjectConfigurationDlg::addAppDeps() void ProjectConfigurationDlg::customVarChanged() { - QListViewItem * item = customVariables->currentItem(); + TQListViewItem * item = customVariables->currentItem(); if ( item ) { item->setText( 0, customVariableName->text() ); diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index 246fb388..313882c4 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -21,9 +21,9 @@ #include "projectconfigurationdlgbase.h" //#include "trollprojectwidget.h" #include -#include +#include #include -#include +#include class QMakeScopeItem; class KListViewItem; @@ -34,9 +34,9 @@ class TrollProjectWidget; class InsideCheckListItem : public QCheckListItem { public: - InsideCheckListItem( QListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ); + InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ); - InsideCheckListItem( QListView *parent, QListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ); + InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ); QMakeScopeItem *prjItem; ProjectConfigurationDlg *m_config; @@ -47,8 +47,8 @@ protected: class CustomVarListItem : public KListViewItem { public: - CustomVarListItem( QListView*, unsigned int, QMap ); - QString key(int column, bool ascending) const; + CustomVarListItem( TQListView*, unsigned int, TQMap ); + TQString key(int column, bool ascending) const; private: unsigned int m_key; }; @@ -56,7 +56,7 @@ class CustomVarListItem : public KListViewItem class ProjectConfigurationDlg : public ProjectConfigurationDlgBase { public: - ProjectConfigurationDlg( QListView *_prjList, TrollProjectWidget* _prjWidget, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ProjectConfigurationDlg(); void updateControls(); void updateSubproject( QMakeScopeItem* _item ); @@ -114,22 +114,22 @@ public slots: virtual void reject(); virtual void apply(); virtual void activateApply( int ); - virtual void activateApply( const QString& ); + virtual void activateApply( const TQString& ); void updateIncludeControl(); void updateLibControls(); void updateBuildOrderControl(); void updateDependenciesControl(); - virtual void activateApply(QListViewItem*); + virtual void activateApply(TQListViewItem*); virtual void customVarChanged(); protected: - QListView *prjList; + TQListView *prjList; QMakeScopeItem *myProjectItem; - QPtrList getAllProjects(); + TQPtrList getAllProjects(); TrollProjectWidget* prjWidget; - void getAllSubProjects( QMakeScopeItem *item, QPtrList *itemList ); + void getAllSubProjects( QMakeScopeItem *item, TQPtrList *itemList ); private: void removeSharedLibDeps(); diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index 14ca7aa0..fa7711c9 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include @@ -23,7 +23,7 @@ QMakeDefaultOpts::QMakeDefaultOpts() } -void QMakeDefaultOpts::readVariables( const QString& qmake, const QString& projdir ) +void QMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& projdir ) { KTempFile makefile (projdir+"/", ".mf"); KTempFile qmakefile(projdir+"/", ".pro"); @@ -53,16 +53,16 @@ void QMakeDefaultOpts::readVariables( const QString& qmake, const QString& projd { makefile.unlink(); qmakefile.unlink(); - QStringList lines = QStringList::split( "\n", proc.stdErr() ); + TQStringList lines = TQStringList::split( "\n", proc.stdErr() ); kdDebug(9024) << "Got " << lines.count() << " lines" << endl; - for ( QStringList::const_iterator it = lines.begin(); it != lines.end(); ++it) + for ( TQStringList::const_iterator it = lines.begin(); it != lines.end(); ++it) { - QString line = *it; - QRegExp re( "DEBUG 1: ([^ =:]+) === (.*)" ); + TQString line = *it; + TQRegExp re( "DEBUG 1: ([^ =:]+) === (.*)" ); if ( re.exactMatch( line ) ) { - QString var = re.cap( 1 ); - QStringList values = QStringList::split( " :: ", re.cap( 2 ) ); + TQString var = re.cap( 1 ); + TQStringList values = TQStringList::split( " :: ", re.cap( 2 ) ); m_variables[var] = values; m_keys.append( var ); } @@ -75,15 +75,15 @@ QMakeDefaultOpts::~QMakeDefaultOpts() { } -const QStringList QMakeDefaultOpts::variableValues( const QString& var ) const +const TQStringList QMakeDefaultOpts::variableValues( const TQString& var ) const { -// QStringList result; +// TQStringList result; if ( m_variables.contains(var) ) return m_variables[var]; - return QStringList(); + return TQStringList(); } -const QStringList& QMakeDefaultOpts::variables() const +const TQStringList& QMakeDefaultOpts::variables() const { return m_keys; } diff --git a/buildtools/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h index 63bab54b..f95d5608 100644 --- a/buildtools/qmake/qmakedefaultopts.h +++ b/buildtools/qmake/qmakedefaultopts.h @@ -12,9 +12,9 @@ #ifndef QMAKEDEFAULTOPTS_H #define QMAKEDEFAULTOPTS_H -#include -#include -// #include +#include +#include +// #include // class KTempFile; // class BlockingKProcess; @@ -26,10 +26,10 @@ public: ~QMakeDefaultOpts(); - void readVariables( const QString& qtdir, const QString& projdir ); + void readVariables( const TQString& qtdir, const TQString& projdir ); - const QStringList variableValues( const QString& ) const; - const QStringList& variables() const; + const TQStringList variableValues( const TQString& ) const; + const TQStringList& variables() const; // signals: // void variablesRead(); @@ -39,8 +39,8 @@ public: // void slotFinished( KProcess* ); private: - QMap m_variables; - QStringList m_keys; + TQMap m_variables; + TQStringList m_keys; }; #endif diff --git a/buildtools/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp index 89f63c1e..c2f4cfdd 100644 --- a/buildtools/qmake/qmakeoptionswidget.cpp +++ b/buildtools/qmake/qmakeoptionswidget.cpp @@ -11,16 +11,16 @@ #include "qmakeoptionswidget.h" -#include +#include #include -#include +#include #include #include #include -QMakeOptionsWidget::QMakeOptionsWidget( const QString& projectdir, QDomDocument &dom, const QString &configGroup, - QWidget *parent, const char *name ) +QMakeOptionsWidget::QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent, const char *name ) : QMakeOptionsWidgetBase( parent, name ), m_dom( dom ), m_configGroup( configGroup ), m_projectDir( projectdir ) { @@ -53,8 +53,8 @@ void QMakeOptionsWidget::accept() DomUtil::writeBoolEntry( m_dom, m_configGroup + "/qmake/enableFilenamesOnly", checkFilenamesOnly->isChecked() ); DomUtil::writeBoolEntry( m_dom, m_configGroup + "/qmake/showVariablesInTree", showVariablesInTree->isChecked() ); DomUtil::writeBoolEntry( m_dom, m_configGroup + "/qmake/showParseErrors", checkShowParseErrors->isChecked() ); - QString projfile = qmakeProjectFile->url(); - if( projfile != m_projectDir && QFileInfo( projfile ).isFile() && ( projfile.endsWith( ".pro" ) || projfile.endsWith( ".pri" ) ) ) + TQString projfile = qmakeProjectFile->url(); + if( projfile != m_projectDir && TQFileInfo( projfile ).isFile() && ( projfile.endsWith( ".pro" ) || projfile.endsWith( ".pri" ) ) ) DomUtil::writeEntry( m_dom, m_configGroup + "/qmake/projectfile", projfile ); } diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index c50e4b44..ee50fde6 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -14,22 +14,22 @@ #include "qmakeoptionswidgetbase.h" -#include +#include class QMakeOptionsWidget : public QMakeOptionsWidgetBase { Q_OBJECT public: - QMakeOptionsWidget( const QString& projectdir, QDomDocument &dom, const QString &configGroup, - QWidget *parent = 0, const char *name = 0 ); + QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent = 0, const char *name = 0 ); ~QMakeOptionsWidget(); public slots: void accept(); private: - QDomDocument &m_dom; - QString m_configGroup; - QString m_projectDir; + TQDomDocument &m_dom; + TQString m_configGroup; + TQString m_projectDir; }; #endif diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 66fa3c3f..73edf730 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -13,8 +13,8 @@ #include "qmakescopeitem.h" -#include -#include +#include +#include #include #include @@ -28,13 +28,13 @@ * Class qProjectItem */ -qProjectItem::qProjectItem( Type type, QListView *parent, const QString &text ) - : QListViewItem( parent, text ), typ( type ) +qProjectItem::qProjectItem( Type type, TQListView *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) {} -qProjectItem::qProjectItem( Type type, qProjectItem *parent, const QString &text ) - : QListViewItem( parent, text ), typ( type ) +qProjectItem::qProjectItem( Type type, qProjectItem *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) {} @@ -43,7 +43,7 @@ qProjectItem::qProjectItem( Type type, qProjectItem *parent, const QString &text * Class GroupItem */ -GroupItem::GroupItem( QListView *lv, GroupType type, const QString &text, QMakeScopeItem* spitem ) +GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem ) : qProjectItem( Group, lv, text ) { this->owner = spitem; @@ -52,7 +52,7 @@ GroupItem::GroupItem( QListView *lv, GroupType type, const QString &text, QMakeS setPixmap( 0, SmallIcon( "tar" ) ); } -GroupItem::GroupType GroupItem::groupTypeForExtension( const QString &ext ) +GroupItem::GroupType GroupItem::groupTypeForExtension( const TQString &ext ) { if ( ext == "cpp" || ext == "cc" || ext == "c" || ext == "C" || ext == "c++" || ext == "cxx" || ext == "ocl" ) return Sources; @@ -76,7 +76,7 @@ GroupItem::GroupType GroupItem::groupTypeForExtension( const QString &ext ) return Distfiles; } -void GroupItem::groupTypeMeanings( GroupItem::GroupType type, QString& title, QString& ext ) +void GroupItem::groupTypeMeanings( GroupItem::GroupType type, TQString& title, TQString& ext ) { switch ( type ) { @@ -135,22 +135,22 @@ void GroupItem::groupTypeMeanings( GroupItem::GroupType type, QString& title, QS } } -void GroupItem::paintCell( QPainter* p, const QColorGroup& c, int column, int width, int align ) +void GroupItem::paintCell( TQPainter* p, const TQColorGroup& c, int column, int width, int align ) { - QColorGroup cg( c ); + TQColorGroup cg( c ); if ( !firstChild() ) { - cg.setColor( QColorGroup::Text, cg.mid() ); + cg.setColor( TQColorGroup::Text, cg.mid() ); } qProjectItem::paintCell( p, cg, column, width, align ); } -void GroupItem::addFileToScope( const QString& filename ) +void GroupItem::addFileToScope( const TQString& filename ) { - QString file = filename; + TQString file = filename; - QPtrListIterator it( files ); + TQPtrListIterator it( files ); while ( it.current() != 0 ) { if ( it.current() ->text( 0 ) == file ) //File already exists in this subproject @@ -160,7 +160,7 @@ void GroupItem::addFileToScope( const QString& filename ) FileItem *fitem = owner->createFileItem( file ); - fitem->uiFileLink = owner->m_widget->getUiFileLink( owner->relativePath() + QString( QChar( QDir::separator() ) ), owner->scope->resolveVariables( filename ) ); + fitem->uiFileLink = owner->m_widget->getUiFileLink( owner->relativePath() + TQString( TQChar( TQDir::separator() ) ), owner->scope->resolveVariables( filename ) ); files.append( fitem ); switch ( groupType ) { @@ -206,11 +206,11 @@ void GroupItem::addFileToScope( const QString& filename ) owner->scope->saveToFile(); } -void GroupItem::removeFileFromScope( const QString& filename ) +void GroupItem::removeFileFromScope( const TQString& filename ) { - QString filePath; + TQString filePath; - QPtrListIterator it( files ); + TQPtrListIterator it( files ); while ( it.current() != 0 ) { if ( it.current() ->text( 0 ) == filename ) //File already exists in this subproject @@ -271,7 +271,7 @@ void GroupItem::removeFileFromScope( const QString& filename ) owner->scope->saveToFile(); } -void GroupItem::addInstallObject( const QString& objectname ) +void GroupItem::addInstallObject( const TQString& objectname ) { GroupItem * objitem = owner->createGroupItem( GroupItem::InstallObject, objectname, owner ); owner->addValue( "INSTALLS", objectname ); @@ -291,7 +291,7 @@ void GroupItem::removeInstallObject( GroupItem* item ) * Class FileItem */ -FileItem::FileItem( QListView *lv, const QString &text ) +FileItem::FileItem( TQListView *lv, const TQString &text ) : qProjectItem( File, lv, text ), uiFileLink( "" ) { // if excluded is set the file is excluded in the subproject/project. @@ -305,7 +305,7 @@ FileItem::FileItem( QListView *lv, const QString &text ) * Class QMakeScopeItem */ -QMakeScopeItem::QMakeScopeItem( QListView *parent, const QString &text, Scope* s, TrollProjectWidget* widget ) +QMakeScopeItem::QMakeScopeItem( TQListView *parent, const TQString &text, Scope* s, TrollProjectWidget* widget ) : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( widget ) { // configuration.m_template = QTMP_APPLICATION; @@ -313,7 +313,7 @@ QMakeScopeItem::QMakeScopeItem( QListView *parent, const QString &text, Scope* s } -QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const QString &text, Scope* s ) +QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* s ) : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( parent->m_widget ) { init(); @@ -321,7 +321,7 @@ QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const QString &text, Sco QMakeScopeItem::~QMakeScopeItem() { - QMap::iterator it; + TQMap::iterator it; for ( it = groups.begin() ; it != groups.end() ; ++it ) { GroupItem* s = it.data(); @@ -331,7 +331,7 @@ QMakeScopeItem::~QMakeScopeItem() } -QString QMakeScopeItem::relativePath() +TQString QMakeScopeItem::relativePath() { if( !scope || !scope->parent() ) return ""; @@ -352,39 +352,39 @@ QString QMakeScopeItem::relativePath() // return scope->scopeName(); // else if ( scope->scopeType() == Scope::ProjectScope ) // return ( static_cast( parent() ) ->relativePath() -// + QString( QChar( QDir::separator() ) ) + scope->scopeName() ); +// + TQString( TQChar( TQDir::separator() ) ) + scope->scopeName() ); // else // return ( static_cast( parent() ) ->relativePath() ); } -QString QMakeScopeItem::getSharedLibAddObject( QString basePath ) +TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath ) { if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() ) { - if ( QDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front(); + if ( TQDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front(); else tmpPath = scope->variableValues( "DESTDIR" ).front(); } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); - QString libString; + TQString libString; if ( !scope->variableValues( "TARGET" ).front().isEmpty() ) { - libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + scope->variableValues( "TARGET" ).front() + ".so"; + libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + scope->variableValues( "TARGET" ).front() + ".so"; } else { - libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + scope->projectName() + ".so"; + libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + scope->projectName() + ".so"; } return ( libString ); @@ -392,38 +392,38 @@ QString QMakeScopeItem::getSharedLibAddObject( QString basePath ) return ""; } -QString QMakeScopeItem::getApplicationObject( QString basePath ) +TQString QMakeScopeItem::getApplicationObject( TQString basePath ) { - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); - QString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); if ( !destdir.isEmpty() ) { - if ( QDir::isRelativePath( destdir ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + destdir; + if ( TQDir::isRelativePath( destdir ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + destdir; else tmpPath = destdir; } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); - QString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); + TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); if ( target.isEmpty() ) - return tmpPath + QString( QChar( QDir::separator() ) ) + scope->projectName(); + return tmpPath + TQString( TQChar( TQDir::separator() ) ) + scope->projectName(); else - return tmpPath + QString( QChar( QDir::separator() ) ) + target; + return tmpPath + TQString( TQChar( TQDir::separator() ) ) + target; } -QString QMakeScopeItem::getLibAddObject( QString basePath ) +TQString QMakeScopeItem::getLibAddObject( TQString basePath ) { if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { - QString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); + TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); if ( !target.isEmpty() ) { return ( "-l" + target ); @@ -436,32 +436,32 @@ QString QMakeScopeItem::getLibAddObject( QString basePath ) else if ( scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 || scope->variableValues("TEMPLATE").findIndex("lib") != -1 ) { - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); - QString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); if ( !destdir.isEmpty() ) { - if ( QDir::isRelativePath( destdir ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + destdir; + if ( TQDir::isRelativePath( destdir ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + destdir; else tmpPath = destdir; } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); - QString libString; - QString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); + TQString libString; + TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); if ( !target.isEmpty() ) { - libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + target + ".a"; + libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + target + ".a"; } else { - libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + scope->projectName() + ".a"; + libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + scope->projectName() + ".a"; } return ( libString ); @@ -469,47 +469,47 @@ QString QMakeScopeItem::getLibAddObject( QString basePath ) return ( "" ); } -QString QMakeScopeItem::getLibAddPath( QString basePath ) +TQString QMakeScopeItem::getLibAddPath( TQString basePath ) { //PATH only add if shared lib if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) == -1 ) return ( "" ); - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); - QString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); if ( !destdir.isEmpty() ) { - if ( QDir::isRelativePath( destdir ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + destdir; + if ( TQDir::isRelativePath( destdir ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + destdir; else tmpPath = destdir; } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); return ( tmpPath ); } -QString QMakeScopeItem::getIncAddPath( QString basePath ) +TQString QMakeScopeItem::getIncAddPath( TQString basePath ) { - QString tmpPath = URLUtil::getRelativePath( basePath, scope->projectDir() ); - tmpPath = QDir::cleanDirPath( tmpPath ); + TQString tmpPath = URLUtil::getRelativePath( basePath, scope->projectDir() ); + tmpPath = TQDir::cleanDirPath( tmpPath ); return ( tmpPath ); } void QMakeScopeItem::buildSubTree() { - QValueList::const_iterator it; + TQValueList::const_iterator it; sortChildItems( 0, false ); - QValueList scopes = scope->scopesInOrder(); + TQValueList scopes = scope->scopesInOrder(); for ( it = scopes.begin(); it != scopes.end(); ++it ) { @@ -537,7 +537,7 @@ void QMakeScopeItem::init() } else { - QStringList tmp = scope->variableValues( "TEMPLATE" ); + TQStringList tmp = scope->variableValues( "TEMPLATE" ); if( scope->isEnabled() ) { if ( tmp.findIndex( "subdirs" ) != -1 ) @@ -565,19 +565,19 @@ void QMakeScopeItem::init() } } -GroupItem* QMakeScopeItem::createGroupItem( GroupItem::GroupType type, const QString& label, QMakeScopeItem* scopeitem ) +GroupItem* QMakeScopeItem::createGroupItem( GroupItem::GroupType type, const TQString& label, QMakeScopeItem* scopeitem ) { GroupItem * item = new GroupItem( scopeitem->listView(), type, label, scopeitem ); scopeitem->listView() ->takeItem( item ); return item; } -FileItem* QMakeScopeItem::createFileItem( const QString& name ) +FileItem* QMakeScopeItem::createFileItem( const TQString& name ) { - QString display = name; + TQString display = name; if( m_widget->showFilenamesOnly() ) { - int dirSepPos = name.findRev( QChar( QDir::separator() ) ); + int dirSepPos = name.findRev( TQChar( TQDir::separator() ) ); if ( dirSepPos != - 1 ) display = name.mid( dirSepPos + 1 ); } @@ -597,10 +597,10 @@ void QMakeScopeItem::buildGroups() { if( scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) return; - QStringList values; + TQStringList values; GroupItem* item; - QStringList::iterator it; + TQStringList::iterator it; values = scope->variableValues( "INSTALLS" ); item = createGroupItem( GroupItem::InstallRoot, "INSTALLS", this ); @@ -610,13 +610,13 @@ void QMakeScopeItem::buildGroups() if ( ( *it ) == "target" ) continue; - QString path = scope->variableValues( *it + ".path" ).front(); + TQString path = scope->variableValues( *it + ".path" ).front(); GroupItem* installitem = createGroupItem( GroupItem::InstallObject, *it, this ); item->installs.append( installitem ); - QStringList files = scope -> variableValues( *it + ".files" ); + TQStringList files = scope -> variableValues( *it + ".files" ); if ( !files.isEmpty() ) { - QStringList::iterator filesit = files.begin(); + TQStringList::iterator filesit = files.begin(); for ( ;filesit != files.end(); ++filesit ) { installitem->files.append( createFileItem( *filesit ) ); @@ -704,7 +704,7 @@ void QMakeScopeItem::buildGroups() for ( it = values.begin(); it != values.end(); ++it ) { FileItem* fitem = createFileItem( *it ); - fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + QString( QChar( QDir::separator() ) ), scope->resolveVariables( *it ) ); + fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + TQString( TQChar( TQDir::separator() ) ), scope->resolveVariables( *it ) ); item->files.append( fitem ); } @@ -714,78 +714,78 @@ void QMakeScopeItem::buildGroups() for ( it = values.begin(); it != values.end(); ++it ) { FileItem* fitem = createFileItem( *it ); - fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + QString( QChar( QDir::separator() ) ), scope->resolveVariables( *it ) ); + fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + TQString( TQChar( TQDir::separator() ) ), scope->resolveVariables( *it ) ); item->files.append( fitem ); } } -void QMakeScopeItem::removeValues( const QString& var, const QStringList& values ) +void QMakeScopeItem::removeValues( const TQString& var, const TQStringList& values ) { - for( QStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) + for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) { removeValue( var, *it ); } } -void QMakeScopeItem::addValues( const QString& var, const QStringList& values ) +void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values ) { - for( QStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) + for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) { addValue( var, *it ); } } -void QMakeScopeItem::removeValue( const QString& var, const QString& value ) +void QMakeScopeItem::removeValue( const TQString& var, const TQString& value ) { if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) != -1 ) { if( scope->variableValuesForOp( var, "+=" ).findIndex(value) != -1 ) { - scope->removeFromPlusOp( var, QStringList( value ) ); + scope->removeFromPlusOp( var, TQStringList( value ) ); if( scope->variableValues( var ).findIndex( value ) != -1 ) { - scope->addToMinusOp( var, QStringList( value ) ); + scope->addToMinusOp( var, TQStringList( value ) ); } }else - scope->addToMinusOp( var, QStringList( value ) ); + scope->addToMinusOp( var, TQStringList( value ) ); }else if( scope->scopeType() == Scope::IncludeScope ) { - scope->addToMinusOp( var, QStringList( value ) ); + scope->addToMinusOp( var, TQStringList( value ) ); } } -void QMakeScopeItem::addValue( const QString& var, const QString& value ) +void QMakeScopeItem::addValue( const TQString& var, const TQString& value ) { if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) == -1 ) { if( scope->variableValuesForOp( var, "-=" ).findIndex(value) != -1 ) - scope->removeFromMinusOp( var, QStringList( value ) ); + scope->removeFromMinusOp( var, TQStringList( value ) ); else - scope->addToPlusOp( var, QStringList( value ) ); + scope->addToPlusOp( var, TQStringList( value ) ); }else if( scope->scopeType() == Scope::IncludeScope ) { - scope->addToPlusOp( var, QStringList( value ) ); + scope->addToPlusOp( var, TQStringList( value ) ); } } -void QMakeScopeItem::updateValues( const QString& var, const QStringList& values ) +void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& values ) { - QStringList curValues = scope->variableValues( var, (scope->scopeType() != Scope::IncludeScope) ); - QStringList scopeValues = scope->variableValuesForOp( var, "+=" ); - for( QStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it ) + TQStringList curValues = scope->variableValues( var, (scope->scopeType() != Scope::IncludeScope) ); + TQStringList scopeValues = scope->variableValuesForOp( var, "+=" ); + for( TQStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it ) { if ( values.findIndex( *it ) == -1 ) { if( scopeValues.findIndex( *it ) != -1 ) { - scope->removeFromPlusOp( var, QStringList( *it ) ); + scope->removeFromPlusOp( var, TQStringList( *it ) ); scopeValues.remove( *it ); }else - scope->addToMinusOp( var, QStringList( *it ) ); + scope->addToMinusOp( var, TQStringList( *it ) ); } } - for( QStringList::const_iterator it = values.begin(); it != values.end(); ++it ) + for( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it ) { if ( scopeValues.findIndex( *it ) != -1 ) { @@ -797,7 +797,7 @@ void QMakeScopeItem::updateValues( const QString& var, const QStringList& values scopeValues += values; // kdDebug(9024) << "values: " << values << "| scope:" << scopeValues << endl; scope->setPlusOp( var, scopeValues ); -// QStringList tmp = scope->variableValuesForOp( var, "+=" ); +// TQStringList tmp = scope->variableValuesForOp( var, "+=" ); // kdDebug(9024) << "result:" << tmp << endl; // kdDebug(9024) << "---------------------------------------" << endl; } @@ -816,18 +816,18 @@ QMakeScopeItem* QMakeScopeItem::projectFileItem() void QMakeScopeItem::reloadProject() { kdDebug(9024) << "Reloading Project" << endl; - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); while( item ) { - QListViewItem* olditem = item; + TQListViewItem* olditem = item; item = olditem->nextSibling(); delete olditem; } - QMap::iterator it; + TQMap::iterator it; for ( it = groups.begin() ; it != groups.end() ; ++it ) { GroupItem* s = it.data(); - QListView* l = s->listView(); + TQListView* l = s->listView(); if(l) l->removeItem(s); delete s; @@ -837,9 +837,9 @@ void QMakeScopeItem::reloadProject() init(); } -void QMakeScopeItem::disableSubprojects( const QStringList& dirs ) +void QMakeScopeItem::disableSubprojects( const TQStringList& dirs ) { - QStringList::const_iterator it = dirs.begin(); + TQStringList::const_iterator it = dirs.begin(); for( ; it != dirs.end() ; ++it) { if( scope->variableValues("SUBDIRS").findIndex(*it) != -1 ) @@ -850,7 +850,7 @@ void QMakeScopeItem::disableSubprojects( const QStringList& dirs ) else { QMakeScopeItem* newitem = new QMakeScopeItem( this, s->scopeName(), s ); - QListViewItem* lastitem = firstChild(); + TQListViewItem* lastitem = firstChild(); while( lastitem && lastitem->nextSibling() ) lastitem = lastitem->nextSibling(); if( lastitem ) @@ -861,7 +861,7 @@ void QMakeScopeItem::disableSubprojects( const QStringList& dirs ) } -int QMakeScopeItem::compare( QListViewItem* i, int , bool ) const +int QMakeScopeItem::compare( TQListViewItem* i, int , bool ) const { QMakeScopeItem* other = dynamic_cast(i); if( !i ) @@ -874,52 +874,52 @@ int QMakeScopeItem::compare( QListViewItem* i, int , bool ) const return 0; } -QMap QMakeScopeItem::getLibInfos( QString basePath ) +TQMap QMakeScopeItem::getLibInfos( TQString basePath ) { - QMap result; + TQMap result; if ( scope->variableValues( "TARGET" ).front().isEmpty() ) result["shared_lib"] = "-l"+scope->projectName(); else result["shared_lib"] = "-l"+scope->variableValues( "TARGET" ).front(); - QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); + TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() ) { - if ( QDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) ) - tmpPath += QString( QChar( QDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front(); + if ( TQDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) ) + tmpPath += TQString( TQChar( TQDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front(); else tmpPath = scope->variableValues( "DESTDIR" ).front(); } else { - tmpPath += QString( QChar( QDir::separator() ) ); + tmpPath += TQString( TQChar( TQDir::separator() ) ); } - tmpPath = QDir::cleanDirPath( tmpPath ); + tmpPath = TQDir::cleanDirPath( tmpPath ); result["shared_libdir"] = "-L"+tmpPath; if ( scope->variableValues( "TARGET" ).front().isEmpty() ) - result["shared_depend"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->projectName()+".so"; + result["shared_depend"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->projectName()+".so"; else - result["shared_depend"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".so"; + result["shared_depend"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".so"; if ( scope->variableValues( "TARGET" ).front().isEmpty() ) - result["static_lib"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->projectName()+".a"; + result["static_lib"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->projectName()+".a"; else - result["static_lib"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".a"; + result["static_lib"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".a"; result["static_depend"] = result["static_lib"]; if ( scope->variableValues( "TARGET" ).front().isEmpty() ) - result["app_depend"] = tmpPath + QString( QChar( QDir::separator() ) ) + scope->projectName(); + result["app_depend"] = tmpPath + TQString( TQChar( TQDir::separator() ) ) + scope->projectName(); else - result["app_depend"] = tmpPath + QString( QChar( QDir::separator() ) ) + scope->variableValues( "TARGET" ).front(); + result["app_depend"] = tmpPath + TQString( TQChar( TQDir::separator() ) ) + scope->variableValues( "TARGET" ).front(); - QString map; - for( QMap::const_iterator it = result.begin(); it != result.end(); ++it ) + TQString map; + for( TQMap::const_iterator it = result.begin(); it != result.end(); ++it ) map += "["+it.key() + "=>" +it.data() + "],"; kdDebug(9024) << "Running getLibInfo for" << scope->projectName() << "|" << map << endl; return result; diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h index b2c84345..7c02a33a 100644 --- a/buildtools/qmake/qmakescopeitem.h +++ b/buildtools/qmake/qmakescopeitem.h @@ -12,8 +12,8 @@ #ifndef _QMAKESCOPEITEM_H_ #define _QMAKESCOPEITEM_H_ -#include -#include +#include +#include class Scope; class QMakeScopeItem; @@ -28,10 +28,10 @@ class qProjectItem : public QListViewItem public: enum Type { Subproject, Group, File }; - qProjectItem( Type type, QListView *parent, const QString &text ); - qProjectItem( Type type, qProjectItem *parent, const QString &text ); + qProjectItem( Type type, TQListView *parent, const TQString &text ); + qProjectItem( Type type, qProjectItem *parent, const TQString &text ); - QString scopeString; + TQString scopeString; Type type() { return typ; } @@ -47,28 +47,28 @@ class GroupItem : public qProjectItem public: enum GroupType {NoType, Sources, Headers, Forms, Distfiles, Images, Resources, Lexsources, Yaccsources, Translations, IDLs, InstallRoot, InstallObject, MaxTypeEnum }; - static GroupType groupTypeForExtension( const QString &ext ); - static void groupTypeMeanings( GroupItem::GroupType type, QString& title, QString& ext ); + static GroupType groupTypeForExtension( const TQString &ext ); + static void groupTypeMeanings( GroupItem::GroupType type, TQString& title, TQString& ext ); - GroupItem( QListView *lv, GroupType type, const QString &text, QMakeScopeItem* spitem ); + GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem ); - void removeFileFromScope( const QString& filename); - void addFileToScope( const QString& filename); - void addInstallObject( const QString& objectname); + void removeFileFromScope( const TQString& filename); + void addFileToScope( const TQString& filename); + void addInstallObject( const TQString& objectname); void removeInstallObject( GroupItem* item ); // qmake INSTALLS support - QPtrList installs; - QPtrList files; + TQPtrList installs; + TQPtrList files; -// QStringList str_files; -// QStringList str_files_exclude; +// TQStringList str_files; +// TQStringList str_files_exclude; // end qmake INSTALLS support GroupType groupType; QMakeScopeItem* owner; protected: - void paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align ); + void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ); }; @@ -76,10 +76,10 @@ protected: class FileItem : public qProjectItem { public: - FileItem( QListView *lv, const QString &text ); + FileItem( TQListView *lv, const TQString &text ); - QString uiFileLink; - QString localFilePath; + TQString uiFileLink; + TQString localFilePath; }; /** @@ -88,30 +88,30 @@ public: class QMakeScopeItem : public qProjectItem { public: - QMakeScopeItem( QListView *parent, const QString &text, Scope *s, TrollProjectWidget* widget ); - QMakeScopeItem( QMakeScopeItem *parent, const QString &text, Scope* ); - void updateValues( const QString& var, const QStringList& values ); - void addValue( const QString& var, const QString& value ); - void removeValue( const QString& var, const QString& value ); - void addValues( const QString& var, const QStringList& values ); - void removeValues( const QString& var, const QStringList& values ); - void disableSubprojects( const QStringList& ); + QMakeScopeItem( TQListView *parent, const TQString &text, Scope *s, TrollProjectWidget* widget ); + QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* ); + void updateValues( const TQString& var, const TQStringList& values ); + void addValue( const TQString& var, const TQString& value ); + void removeValue( const TQString& var, const TQString& value ); + void addValues( const TQString& var, const TQStringList& values ); + void removeValues( const TQString& var, const TQStringList& values ); + void disableSubprojects( const TQStringList& ); void reloadProject(); - int compare( QListViewItem* i, int col, bool ascending ) const; + int compare( TQListViewItem* i, int col, bool ascending ) const; ~QMakeScopeItem(); - QMap groups; + TQMap groups; Scope* scope; - QString relativePath(); - QString getLibAddPath( QString ); - QString getLibAddObject( QString ); - QString getSharedLibAddObject( QString ); - QString getApplicationObject( QString ); - QString getIncAddPath( QString downDirs ); - FileItem* createFileItem(const QString& file); - GroupItem* createGroupItem(GroupItem::GroupType type, const QString& name, QMakeScopeItem* scopeitem); - QMap getLibInfos( QString ); + TQString relativePath(); + TQString getLibAddPath( TQString ); + TQString getLibAddObject( TQString ); + TQString getSharedLibAddObject( TQString ); + TQString getApplicationObject( TQString ); + TQString getIncAddPath( TQString downDirs ); + FileItem* createFileItem(const TQString& file); + GroupItem* createGroupItem(GroupItem::GroupType type, const TQString& name, QMakeScopeItem* scopeitem); + TQMap getLibInfos( TQString ); QMakeScopeItem* projectFileItem(); diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index c090861b..3f182ded 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -13,13 +13,13 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include @@ -31,16 +31,16 @@ #include "trollprojectpart.h" #include "qmakedefaultopts.h" -const QStringList Scope::KnownVariables = QStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "QMAKE_CXXFLAGS_DEBUG" << "QMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "MOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ; +const TQStringList Scope::KnownVariables = TQStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "QMAKE_CXXFLAGS_DEBUG" << "QMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "MOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ; -const QStringList Scope::KnownConfigValues = QStringList() << "debug" << "release" << "debug_and_release" << "warn_on" << "warn_off" << "staticlib" << "dll" << "plugin" << "designer" << "create_pkgconf" << "create_libtool" << "qt" << "console" << "windows" << "x11" << "thread" << "exceptions" << "stl" << "rtti" << "opengl" << "thread" << "ordered" << "precompile_header" << "qtestlib" << "uitools" << "dbus" << "assistant" << "build_all" << "help"; +const TQStringList Scope::KnownConfigValues = TQStringList() << "debug" << "release" << "debug_and_release" << "warn_on" << "warn_off" << "staticlib" << "dll" << "plugin" << "designer" << "create_pkgconf" << "create_libtool" << "qt" << "console" << "windows" << "x11" << "thread" << "exceptions" << "stl" << "rtti" << "opengl" << "thread" << "ordered" << "precompile_header" << "qtestlib" << "uitools" << "dbus" << "assistant" << "build_all" << "help"; -Scope::Scope( const QMap& env, const QString &filename, TrollProjectPart* part ) +Scope::Scope( const TQMap& env, const TQString &filename, TrollProjectPart* part ) : m_root( 0 ), m_incast( 0 ), m_parent( 0 ), m_num(0), m_isEnabled( true ), m_part(part), m_defaultopts(0), m_environment( env ) { if ( !loadFromFile( filename ) ) { - if( !QFileInfo( filename ).exists() ) + if( !TQFileInfo( filename ).exists() ) { m_root = new QMake::ProjectAST(); m_root->setFileName( filename ); @@ -60,7 +60,7 @@ Scope::Scope( const QMap& env, const QString &filename, TrollP Scope::~Scope() { - QMap::iterator it; + TQMap::iterator it; for ( it = m_scopes.begin() ; it != m_scopes.end() ; ++it ) { Scope* s = it.data(); @@ -80,7 +80,7 @@ Scope::~Scope() } // Simple/Function Scopes -Scope::Scope( const QMap& env, unsigned int num, Scope* parent, QMake::ProjectAST* scope, +Scope::Scope( const TQMap& env, unsigned int num, Scope* parent, QMake::ProjectAST* scope, QMakeDefaultOpts* defaultopts, TrollProjectPart* part ) : m_root( scope ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( true ), m_part(part), m_defaultopts(defaultopts), m_environment( env ) @@ -89,14 +89,14 @@ Scope::Scope( const QMap& env, unsigned int num, Scope* parent } //Subdirs -Scope::Scope( const QMap& env, unsigned int num, Scope* parent, const QString& filename, +Scope::Scope( const TQMap& env, unsigned int num, Scope* parent, const TQString& filename, TrollProjectPart* part, bool isEnabled ) : m_root( 0 ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( isEnabled ), m_part(part), m_defaultopts(0), m_environment( env ) { if ( !loadFromFile( filename ) ) { - if( !QFileInfo( filename ).exists() && QFileInfo( QFileInfo( filename ).dirPath( true ) ).exists() ) + if( !TQFileInfo( filename ).exists() && TQFileInfo( TQFileInfo( filename ).dirPath( true ) ).exists() ) { m_root = new QMake::ProjectAST(); m_root->setFileName( filename ); @@ -114,27 +114,27 @@ Scope::Scope( const QMap& env, unsigned int num, Scope* parent } //Include Scope -Scope::Scope( const QMap& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const QString& path, - const QString& incfile, QMakeDefaultOpts* defaultopts, TrollProjectPart* part ) +Scope::Scope( const TQMap& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const TQString& path, + const TQString& incfile, QMakeDefaultOpts* defaultopts, TrollProjectPart* part ) : m_root( 0 ), m_incast( incast ), m_parent( parent ), m_num(num), m_isEnabled( true ), m_part(part), m_defaultopts(defaultopts), m_environment( env ) { - QString absfilename; - QString tmp = incfile.stripWhiteSpace(); + TQString absfilename; + TQString tmp = incfile.stripWhiteSpace(); if( tmp.contains(")" ) ) tmp = tmp.mid(0, tmp.find(")") ); if( tmp.startsWith( "\"" ) ) tmp = tmp.mid( 1, tmp.length()-2 ); - if( QFileInfo(tmp).isRelative() ) + if( TQFileInfo(tmp).isRelative() ) { - absfilename = QDir::cleanDirPath( path + QString( QChar( QDir::separator() ) ) + tmp ); + absfilename = TQDir::cleanDirPath( path + TQString( TQChar( TQDir::separator() ) ) + tmp ); }else - absfilename = QDir::cleanDirPath( tmp ); + absfilename = TQDir::cleanDirPath( tmp ); if ( !loadFromFile( absfilename ) ) { - if( !QFileInfo( absfilename ).exists() && QFileInfo( QFileInfo( absfilename ).dirPath( true ) ).exists() ) + if( !TQFileInfo( absfilename ).exists() && TQFileInfo( TQFileInfo( absfilename ).dirPath( true ) ).exists() ) { m_root = new QMake::ProjectAST(); m_root->setFileName( absfilename ); @@ -150,9 +150,9 @@ Scope::Scope( const QMap& env, unsigned int num, Scope* parent init(); } -bool Scope::loadFromFile( const QString& filename ) +bool Scope::loadFromFile( const TQString& filename ) { - if ( !QFileInfo(filename).exists() || QMake::Driver::parseFile( filename, &m_root, 0 ) != 0 ) + if ( !TQFileInfo(filename).exists() || QMake::Driver::parseFile( filename, &m_root, 0 ) != 0 ) { kdDebug( 9024 ) << "Couldn't parse project: " << filename << endl; if( DomUtil::readBoolEntry( *m_part->projectDom(), @@ -179,20 +179,20 @@ void Scope::saveToFile() const return; } - QString filename; + TQString filename; if ( scopeType() == ProjectScope ) filename = m_root->fileName() ; else if ( scopeType() == IncludeScope ) - filename = m_parent->projectDir() + QString( QChar( QDir::separator() ) ) + m_incast->projectName; + filename = m_parent->projectDir() + TQString( TQChar( TQDir::separator() ) ) + m_incast->projectName; if ( filename.isEmpty() ) return ; m_part->dirWatch()->stopScan(); - QFile file( filename ); + TQFile file( filename ); if ( file.open( IO_WriteOnly ) ) { - QTextStream out( &file ); - QString astbuffer; + TQTextStream out( &file ); + TQString astbuffer; m_root->writeBack( astbuffer ); out << astbuffer; file.close(); @@ -208,7 +208,7 @@ void Scope::saveToFile() const m_part->dirWatch()->startScan(); } -void Scope::addToPlusOp( const QString& variable, const QStringList& values ) +void Scope::addToPlusOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -216,7 +216,7 @@ void Scope::addToPlusOp( const QString& variable, const QStringList& values ) updateVariable( variable, "+=", values, false ); } -void Scope::removeFromPlusOp( const QString& variable, const QStringList& values ) +void Scope::removeFromPlusOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -225,7 +225,7 @@ void Scope::removeFromPlusOp( const QString& variable, const QStringList& values } -void Scope::addToMinusOp( const QString& variable, const QStringList& values ) +void Scope::addToMinusOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -233,7 +233,7 @@ void Scope::addToMinusOp( const QString& variable, const QStringList& values ) updateVariable( variable, "-=", values, false ); } -void Scope::removeFromMinusOp( const QString& variable, const QStringList& values ) +void Scope::removeFromMinusOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -241,7 +241,7 @@ void Scope::removeFromMinusOp( const QString& variable, const QStringList& value updateVariable( variable, "-=", values, true ); } -void Scope::addToEqualOp( const QString& variable, const QStringList& values ) +void Scope::addToEqualOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -249,7 +249,7 @@ void Scope::addToEqualOp( const QString& variable, const QStringList& values ) updateVariable( variable, "=", values, false ); } -void Scope::removeFromEqualOp( const QString& variable, const QStringList& values ) +void Scope::removeFromEqualOp( const TQString& variable, const TQStringList& values ) { if ( !m_root ) return ; @@ -257,7 +257,7 @@ void Scope::removeFromEqualOp( const QString& variable, const QStringList& value updateVariable( variable, "=", values, true ); } -void Scope::setPlusOp( const QString& variable, const QStringList& values ) +void Scope::setPlusOp( const TQString& variable, const TQStringList& values ) { if( !m_root || Scope::listsEqual(values, variableValuesForOp(variable, "+=") ) ) return; @@ -266,7 +266,7 @@ void Scope::setPlusOp( const QString& variable, const QStringList& values ) updateVariable( variable, "+=", values, false ); } -void Scope::setEqualOp( const QString& variable, const QStringList& values ) +void Scope::setEqualOp( const TQString& variable, const TQStringList& values ) { if( !m_root || Scope::listsEqual(values, variableValuesForOp(variable, "=") ) ) return; @@ -275,7 +275,7 @@ void Scope::setEqualOp( const QString& variable, const QStringList& values ) updateVariable( variable, "=", values, false ); } -void Scope::setMinusOp( const QString& variable, const QStringList& values ) +void Scope::setMinusOp( const TQString& variable, const TQStringList& values ) { if( !m_root || Scope::listsEqual(values, variableValuesForOp(variable, "-=") ) ) return; @@ -284,14 +284,14 @@ void Scope::setMinusOp( const QString& variable, const QStringList& values ) updateVariable( variable, "-=", values, false ); } -QStringList Scope::variableValuesForOp( const QString& variable , const QString& op ) const +TQStringList Scope::variableValuesForOp( const TQString& variable , const TQString& op ) const { - QStringList result; + TQStringList result; if( !m_root ) return result; - QValueList::const_iterator it; + TQValueList::const_iterator it; for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) { QMake::AST* ast = *it; @@ -308,9 +308,9 @@ QStringList Scope::variableValuesForOp( const QString& variable , const QString& return result; } -QStringList Scope::variableValues( const QString& variable, bool checkIncParent, bool fetchFromParent, bool evaluateSubScopes ) +TQStringList Scope::variableValues( const TQString& variable, bool checkIncParent, bool fetchFromParent, bool evaluateSubScopes ) { - QStringList result; + TQStringList result; if ( !m_root ) return result; @@ -329,7 +329,7 @@ QStringList Scope::variableValues( const QString& variable, bool checkIncParent, return result; } -void Scope::calcValuesFromStatements( const QString& variable, QStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent, bool setDefault, bool evaluateSubScopes ) const +void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent, bool setDefault, bool evaluateSubScopes ) const { if( !m_root ) return; @@ -351,7 +351,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu m_parent->calcValuesFromStatements( variable, result, true, this->m_incast, fetchFromParent, setDefault, evaluateSubScopes ); } - QValueList::const_iterator it; + TQValueList::const_iterator it; for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) { if ( stopHere && *it == stopHere ) @@ -368,7 +368,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu } else if ( assign->op == "+=" ) { - for ( QStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) + for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { if ( result.findIndex( *sit ) == -1 ) result.append( *sit ); @@ -376,7 +376,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu } else if ( assign->op == "-=" ) { - for ( QStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) + for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { if ( result.findIndex( *sit ) != -1 ) result.remove( *sit ); @@ -388,7 +388,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu if( ast->nodeType() == QMake::AST::IncludeAST ) { QMake::IncludeAST* iast = static_cast(ast); - QValueList l = m_scopes.keys(); + TQValueList l = m_scopes.keys(); for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; @@ -408,7 +408,7 @@ void Scope::calcValuesFromStatements( const QString& variable, QStringList& resu QMake::ProjectAST* past = static_cast(ast); if( past->isFunctionScope() || past->isScope() ) { - QValueList l = m_scopes.keys(); + TQValueList l = m_scopes.keys(); for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; @@ -445,7 +445,7 @@ Scope::ScopeType Scope::scopeType() const return InvalidScope; } -QString Scope::scopeName() const +TQString Scope::scopeName() const { if ( !m_root ) return ""; @@ -457,31 +457,31 @@ QString Scope::scopeName() const return m_root->scopedID; else if ( m_root->isProject() ) { - if( m_parent && QDir::cleanDirPath( m_parent->projectDir() ) != QDir::cleanDirPath( projectDir() ) ) + if( m_parent && TQDir::cleanDirPath( m_parent->projectDir() ) != TQDir::cleanDirPath( projectDir() ) ) { return URLUtil::getRelativePath( m_parent->projectDir(), projectDir() ); - }else if ( m_parent && QDir::cleanDirPath( m_parent->projectDir() ) == QDir::cleanDirPath( projectDir() ) ) + }else if ( m_parent && TQDir::cleanDirPath( m_parent->projectDir() ) == TQDir::cleanDirPath( projectDir() ) ) { return fileName(); }else - return QFileInfo( projectDir() ).fileName() ; + return TQFileInfo( projectDir() ).fileName() ; } - return QString(); + return TQString(); } -QString Scope::fileName() const +TQString Scope::fileName() const { if( !m_root ) return ""; if ( m_incast ) return m_incast->projectName; else if ( m_root->isProject() ) - return QFileInfo( m_root->fileName() ).fileName(); + return TQFileInfo( m_root->fileName() ).fileName(); else return m_parent->fileName(); } -Scope* Scope::createFunctionScope( const QString& funcName, const QString& args ) +Scope* Scope::createFunctionScope( const TQString& funcName, const TQString& args ) { if ( !m_root ) return 0; @@ -503,7 +503,7 @@ Scope* Scope::createFunctionScope( const QString& funcName, const QString& args return 0; } -Scope* Scope::createSimpleScope( const QString& scopename ) +Scope* Scope::createSimpleScope( const TQString& scopename ) { if ( !m_root ) return 0; @@ -516,7 +516,7 @@ Scope* Scope::createSimpleScope( const QString& scopename ) m_root->addChildAST( new QMake::NewLineAST() ); /* We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows. if ( m_part->isQt4Project() ) - addToPlusOp( "CONFIG", QStringList( scopename ) ); + addToPlusOp( "CONFIG", TQStringList( scopename ) ); */ Scope* simpleScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part ); @@ -530,7 +530,7 @@ Scope* Scope::createSimpleScope( const QString& scopename ) } -Scope* Scope::createIncludeScope( const QString& includeFile, bool negate ) +Scope* Scope::createIncludeScope( const TQString& includeFile, bool negate ) { if ( !m_root ) return 0; @@ -566,7 +566,7 @@ Scope* Scope::createIncludeScope( const QString& includeFile, bool negate ) } -Scope* Scope::createSubProject( const QString& projname ) +Scope* Scope::createSubProject( const TQString& projname ) { if( !m_root ) return 0; @@ -574,30 +574,30 @@ Scope* Scope::createSubProject( const QString& projname ) if( variableValuesForOp( "SUBDIRS", "-=").findIndex( projname ) != -1 ) removeFromMinusOp( "SUBDIRS", projname ); - QString realprojname = resolveVariables(projname); + TQString realprojname = resolveVariables(projname); if( variableValuesForOp( "SUBDIRS", "-=").findIndex( realprojname ) != -1 ) removeFromMinusOp( "SUBDIRS", realprojname ); - QDir curdir( projectDir() ); + TQDir curdir( projectDir() ); if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { - QString filename; + TQString filename; if( !realprojname.endsWith(".pro") ) { if ( !curdir.exists( realprojname ) ) if ( !curdir.mkdir( realprojname ) ) return 0; curdir.cd( realprojname ); - QStringList entries = curdir.entryList("*.pro", QDir::Files); + TQStringList entries = curdir.entryList("*.pro", TQDir::Files); if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) == -1 ) - filename = curdir.absPath() + QString(QChar(QDir::separator()))+entries.first(); + filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else - filename = curdir.absPath() + QString(QChar(QDir::separator()))+curdir.dirName()+".pro"; + filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; }else - filename = curdir.absPath() + QString(QChar(QDir::separator())) + realprojname; + filename = curdir.absPath() + TQString(TQChar(TQDir::separator())) + realprojname; kdDebug( 9024 ) << "Creating subproject with filename:" << filename << endl; @@ -606,9 +606,9 @@ Scope* Scope::createSubProject( const QString& projname ) if ( s->scopeType() != InvalidScope ) { if( s->variableValues("TEMPLATE").isEmpty() ) - s->setEqualOp("TEMPLATE", QStringList("app")); + s->setEqualOp("TEMPLATE", TQStringList("app")); s->saveToFile(); - addToPlusOp( "SUBDIRS", QStringList( realprojname ) ); + addToPlusOp( "SUBDIRS", TQStringList( realprojname ) ); m_scopes.insert( getNextScopeNum(), s ); return s; } else @@ -685,7 +685,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) if ( !m_root || !m_scopes.contains( num ) ) return false; - QValueList::iterator it = findExistingVariable( "TEMPLATE" ); + TQValueList::iterator it = findExistingVariable( "TEMPLATE" ); if ( it != m_root->m_children.end() ) { QMake::AssignmentAST * tempast = static_cast( *it ); @@ -695,18 +695,18 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) if( !project ) return false; - QString projdir = project->scopeName(); + TQString projdir = project->scopeName(); if ( deleteSubdir ) { - QDir projdir = QDir( projectDir() ); - QString dir = project->scopeName(); + TQDir projdir = TQDir( projectDir() ); + TQString dir = project->scopeName(); if( !dir.endsWith(".pro") ) { - QDir subdir = QDir( projectDir() + QString( QChar( QDir::separator() ) ) + dir ); + TQDir subdir = TQDir( projectDir() + TQString( TQChar( TQDir::separator() ) ) + dir ); if ( subdir.exists() ) { - QStringList entries = subdir.entryList(); - for ( QStringList::iterator eit = entries.begin() ; eit != entries.end() ; ++eit ) + TQStringList entries = subdir.entryList(); + for ( TQStringList::iterator eit = entries.begin() ; eit != entries.end() ; ++eit ) { if( *eit == "." || *eit == ".." ) continue; @@ -718,15 +718,15 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) } }else { - QDir d( project->projectDir() ); + TQDir d( project->projectDir() ); kdDebug(9024) << "removed subproject?:" << d.remove( dir ) << endl; } } - QValueList::iterator foundit = findExistingVariable( "SUBDIRS" ); + TQValueList::iterator foundit = findExistingVariable( "SUBDIRS" ); if ( foundit != m_root->m_children.end() ) { QMake::AssignmentAST * ast = static_cast( *foundit ); - updateValues( ast->values, QStringList( projdir ), true, ast->indent ); + updateValues( ast->values, TQStringList( projdir ), true, ast->indent ); if( m_varCache.contains( "SUBDIRS" ) ) m_varCache.erase( "SUBDIRS" ); }else @@ -739,12 +739,12 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) return false; } -void Scope::updateValues( QStringList& origValues, const QStringList& newValues, bool remove, QString indent ) +void Scope::updateValues( TQStringList& origValues, const TQStringList& newValues, bool remove, TQString indent ) { if( !m_root ) return; - for ( QStringList::const_iterator it = newValues.begin(); it != newValues.end() ; ++it ) + for ( TQStringList::const_iterator it = newValues.begin(); it != newValues.end() ; ++it ) { if ( origValues.findIndex( *it ) == -1 && !remove ) { @@ -767,8 +767,8 @@ void Scope::updateValues( QStringList& origValues, const QStringList& newValues, origValues.append( indent ); }else if ( origValues.isEmpty() ) origValues.append(" "); - QString newval = *it; - QRegExp re("([^$])\\$([^$\\(\\)\\{\\} /]*)( |\\)|/)"); + TQString newval = *it; + TQRegExp re("([^$])\\$([^$\\(\\)\\{\\} /]*)( |\\)|/)"); newval.replace(re, "\\1$(\\2)\\3"); if( (newval).contains(" ") || (newval).contains("\t") || (newval).contains( getLineEndingString() ) || (newval).contains("#") ) origValues.append( "\""+newval+"\"" ); @@ -777,9 +777,9 @@ void Scope::updateValues( QStringList& origValues, const QStringList& newValues, origValues.append( getLineEndingString() ); } else if ( origValues.findIndex( *it ) != -1 && remove ) { - QStringList::iterator posit = origValues.find( *it ); + TQStringList::iterator posit = origValues.find( *it ); posit = origValues.remove( posit ); - while( posit != origValues.end() && ( (*posit).find( QRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 + while( posit != origValues.end() && ( (*posit).find( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 || (*posit).stripWhiteSpace() == "" ) ) { posit = origValues.remove( posit ); @@ -790,13 +790,13 @@ void Scope::updateValues( QStringList& origValues, const QStringList& newValues, || origValues.last() == getLineEndingString() || origValues.last().stripWhiteSpace() == "" ) && !origValues.isEmpty() ) origValues.pop_back(); - if( !origValues.isEmpty() && origValues.last().find( QRegExp("\\\\[ \t]*#") ) != -1 ) + if( !origValues.isEmpty() && origValues.last().find( TQRegExp("\\\\[ \t]*#") ) != -1 ) origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].find( "#") ); if( !origValues.isEmpty() && origValues.last().find( getLineEndingString() ) == -1 ) origValues.append(getLineEndingString()); } -void Scope::updateVariable( const QString& variable, const QString& op, const QStringList& values, bool removeFromOp ) +void Scope::updateVariable( const TQString& variable, const TQString& op, const TQStringList& values, bool removeFromOp ) { if ( !m_root || listIsEmpty( values ) ) return ; @@ -821,7 +821,7 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } else if ( assignment->scopedID == variable && !Scope::isCompatible( assignment->op, op ) ) { - for ( QStringList::const_iterator it = values.begin() ; it != values.end() ; ++it ) + for ( TQStringList::const_iterator it = values.begin() ; it != values.end() ; ++it ) { if ( op == "+=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) { @@ -832,7 +832,7 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } else if ( assignment->op == "-=" ) { - updateValues( assignment->values, QStringList( *it ), true, assignment->indent ); + updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) { m_root->removeChildAST( assignment ); @@ -843,7 +843,7 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } else if ( op == "-=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) { - updateValues( assignment->values, QStringList( *it ), true, assignment->indent ); + updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) { m_root->removeChildAST( assignment ); @@ -860,7 +860,7 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } else if ( assignment->op == "+=" && assignment->values.findIndex( *it ) != -1 ) { - updateValues( assignment->values, QStringList( *it ), true, assignment->indent ); + updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) { m_root->removeChildAST( assignment ); @@ -892,10 +892,10 @@ void Scope::updateVariable( const QString& variable, const QString& op, const QS } } -QValueList::iterator Scope::findExistingVariable( const QString& variable ) +TQValueList::iterator Scope::findExistingVariable( const TQString& variable ) { - QValueList::iterator it; - QStringList ops; + TQValueList::iterator it; + TQStringList ops; ops << "=" << "+="; for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it ) @@ -920,7 +920,7 @@ void Scope::init() kdDebug(9024) << "Initializing Scope: " << scopeName() << this << endl; m_maxCustomVarNum = 1; - QValueList::const_iterator it; + TQValueList::const_iterator it; for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) { if ( ( *it ) ->nodeType() == QMake::AST::ProjectAST ) @@ -931,7 +931,7 @@ void Scope::init() else if ( ( *it ) ->nodeType() == QMake::AST::IncludeAST ) { QMake::IncludeAST * i = static_cast( *it ); - QString filename = i->projectName; + TQString filename = i->projectName; if( i->projectName.stripWhiteSpace().startsWith("$") ) { filename = resolveVariables(i->projectName, *it); @@ -944,36 +944,36 @@ void Scope::init() // Check wether TEMPLATE==subdirs here too! if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { - for ( QStringList::const_iterator sit = m->values.begin() ; sit != m->values.end(); ++sit ) + for ( TQStringList::const_iterator sit = m->values.begin() ; sit != m->values.end(); ++sit ) { - QString str = *sit; + TQString str = *sit; if ( containsContinue( str ) || isComment( str ) || str == getLineEndingString() || str == "." || str == "./" || (str).stripWhiteSpace() == "" ) continue; - QDir subproject; - QString projectfile; + TQDir subproject; + TQString projectfile; kdDebug(9024) << "reading subproject: " << str << endl; if( str.startsWith("$") ) str = resolveVariables(str, *it); if( str.endsWith(".pro") ) { - subproject = QDir( projectDir(), "*.pro", QDir::Name | QDir::IgnoreCase, QDir::Files ); + subproject = TQDir( projectDir(), "*.pro", TQDir::Name | TQDir::IgnoreCase, TQDir::Files ); projectfile = str; }else { - QString dir = str; - if( QFileInfo( dir ).isRelative() ) - dir = projectDir() + QString( QChar( QDir::separator() ) ) + dir; - subproject = QDir( dir, - "*.pro", QDir::Name | QDir::IgnoreCase, QDir::Files ); + TQString dir = str; + if( TQFileInfo( dir ).isRelative() ) + dir = projectDir() + TQString( TQChar( TQDir::separator() ) ) + dir; + subproject = TQDir( dir, + "*.pro", TQDir::Name | TQDir::IgnoreCase, TQDir::Files ); if( !subproject.exists() ) { kdDebug(9024) << "Project Dir doesn't exist, trying to find name.subdir variable:" << str << endl; if( !variableValues(str+".subdir").isEmpty() ) { kdDebug(9024) << "Found name.subdir variable for " << str << endl; - subproject = QDir( projectDir() + QString( QChar( QDir::separator() ) ) + subproject = TQDir( projectDir() + TQString( TQChar( TQDir::separator() ) ) + variableValues(str+".subdir").first(), - "*.pro", QDir::Name | QDir::IgnoreCase, QDir::Files ); + "*.pro", TQDir::Name | TQDir::IgnoreCase, TQDir::Files ); }else continue; } @@ -1012,21 +1012,21 @@ void Scope::init() } } -QString Scope::projectName() const +TQString Scope::projectName() const { if( !m_root ) return ""; - return QFileInfo( projectDir() ).fileName(); + return TQFileInfo( projectDir() ).fileName(); } -QString Scope::projectDir() const +TQString Scope::projectDir() const { if( !m_root ) return ""; if ( m_root->isProject() ) { - return QFileInfo( m_root->fileName() ).dirPath( true ); + return TQFileInfo( m_root->fileName() ).dirPath( true ); } else { @@ -1034,16 +1034,16 @@ QString Scope::projectDir() const } } -const QMap > Scope::customVariables() const +const TQMap > Scope::customVariables() const { - QMap > result; + TQMap > result; if( !m_root ) return result; - QMap::const_iterator it = m_customVariables.begin(); + TQMap::const_iterator it = m_customVariables.begin(); for ( ; it != m_customVariables.end(); ++it ) { - QMap temp; + TQMap temp; temp[ "var" ] = it.data()->scopedID; temp[ "op" ] = it.data()->op; temp[ "values" ] = it.data()->values.join("").stripWhiteSpace(); @@ -1052,7 +1052,7 @@ const QMap > Scope::customVariables() const return result; } -void Scope::updateCustomVariable( unsigned int id, const QString& name, const QString& newop, const QString& newvalues ) +void Scope::updateCustomVariable( unsigned int id, const TQString& name, const TQString& newop, const TQString& newvalues ) { if( !m_root ) return; @@ -1067,7 +1067,7 @@ void Scope::updateCustomVariable( unsigned int id, const QString& name, const QS } } -unsigned int Scope::addCustomVariable( const QString& var, const QString& op, const QString& values ) +unsigned int Scope::addCustomVariable( const TQString& var, const TQString& op, const TQString& values ) { QMake::AssignmentAST* newast = new QMake::AssignmentAST(); newast->scopedID = var; @@ -1092,12 +1092,12 @@ void Scope::removeCustomVariable( unsigned int id ) } } -bool Scope::isVariableReset( const QString& var ) +bool Scope::isVariableReset( const TQString& var ) { bool result = false; if( !m_root ) return result; - QValueList::const_iterator it = m_root->m_children.begin(); + TQValueList::const_iterator it = m_root->m_children.begin(); for ( ; it != m_root->m_children.end(); ++it ) { if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST ) @@ -1113,14 +1113,14 @@ bool Scope::isVariableReset( const QString& var ) return result; } -void Scope::removeVariable( const QString& var, const QString& op ) +void Scope::removeVariable( const TQString& var, const TQString& op ) { if ( !m_root ) return ; QMake::AssignmentAST* ast = 0; - QValueList::iterator it = m_root->m_children.begin(); + TQValueList::iterator it = m_root->m_children.begin(); for ( ; it != m_root->m_children.end(); ++it ) { if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST ) @@ -1135,11 +1135,11 @@ void Scope::removeVariable( const QString& var, const QString& op ) } } -bool Scope::listIsEmpty( const QStringList& values ) +bool Scope::listIsEmpty( const TQStringList& values ) { if ( values.size() < 1 ) return true; - for ( QStringList::const_iterator it = values.begin(); it != values.end(); ++it ) + for ( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it ) { if ( ( *it ).stripWhiteSpace() != "" && ( *it ).stripWhiteSpace() != "\\" ) return false; @@ -1147,7 +1147,7 @@ bool Scope::listIsEmpty( const QStringList& values ) return true; } -bool Scope::isCompatible( const QString& op1, const QString& op2) +bool Scope::isCompatible( const TQString& op1, const TQString& op2) { if( op1 == "+=" ) return ( op2 == "+=" || op2 == "=" ); @@ -1158,21 +1158,21 @@ bool Scope::isCompatible( const QString& op1, const QString& op2) return false; } -bool Scope::listsEqual(const QStringList& l1, const QStringList& l2) +bool Scope::listsEqual(const TQStringList& l1, const TQStringList& l2) { - QStringList left = l1; - QStringList right = l2; + TQStringList left = l1; + TQStringList right = l2; // left.sort(); // right.sort(); return (left == right); } -QStringList Scope::cleanStringList(const QStringList& list) const +TQStringList Scope::cleanStringList(const TQStringList& list) const { - QStringList result; - for( QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) + TQStringList result; + for( TQStringList::const_iterator it = list.begin(); it != list.end(); ++it ) { - QString s = *it; + TQString s = *it; if( s.stripWhiteSpace() != "" && !containsContinue(s) && s.stripWhiteSpace() != getLineEndingString() @@ -1192,8 +1192,8 @@ void Scope::reloadProject() if ( !m_root || !m_root->isProject() ) return; - QString filename = m_root->fileName(); - QMap::iterator it; + TQString filename = m_root->fileName(); + TQMap::iterator it; for ( it = m_scopes.begin() ; it != m_scopes.end() ; ++it ) { Scope* s = it.data(); @@ -1207,7 +1207,7 @@ void Scope::reloadProject() if ( m_root->isProject() ) delete m_root; - if ( !loadFromFile( filename ) && !QFileInfo( filename ).exists() ) + if ( !loadFromFile( filename ) && !TQFileInfo( filename ).exists() ) { m_root = new QMake::ProjectAST(); m_root->setFileName( filename ); @@ -1215,7 +1215,7 @@ void Scope::reloadProject() init(); } -Scope* Scope::disableSubproject( const QString& dir) +Scope* Scope::disableSubproject( const TQString& dir) { if( !m_root || ( m_root->isProject() && !m_incast ) ) return 0; @@ -1225,23 +1225,23 @@ Scope* Scope::disableSubproject( const QString& dir) else if( scopeType() != Scope::IncludeScope ) removeFromPlusOp( "SUBDIRS", dir ); - QDir curdir( projectDir() ); + TQDir curdir( projectDir() ); if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { curdir.cd(dir); - QString filename; - QStringList entries = curdir.entryList("*.pro", QDir::Files); + TQString filename; + TQStringList entries = curdir.entryList("*.pro", TQDir::Files); if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) != -1 ) - filename = curdir.absPath() + QString(QChar(QDir::separator()))+entries.first(); + filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else - filename = curdir.absPath() + QString(QChar(QDir::separator()))+curdir.dirName()+".pro"; + filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; kdDebug( 9024 ) << "Disabling subproject with filename:" << filename << endl; Scope* s = new Scope( m_environment, getNextScopeNum(), this, filename, m_part, false ); - addToMinusOp( "SUBDIRS", QStringList( dir ) ); + addToMinusOp( "SUBDIRS", TQStringList( dir ) ); m_scopes.insert( getNextScopeNum(), s ); return s; } @@ -1249,20 +1249,20 @@ Scope* Scope::disableSubproject( const QString& dir) return 0; } -QString Scope::resolveVariables( const QString& value ) const +TQString Scope::resolveVariables( const TQString& value ) const { - return resolveVariables(QStringList(value), 0).front(); + return resolveVariables(TQStringList(value), 0).front(); } -QString Scope::resolveVariables( const QString& value, QMake::AST* stopHere ) const +TQString Scope::resolveVariables( const TQString& value, QMake::AST* stopHere ) const { - return resolveVariables(QStringList(value), stopHere).front(); + return resolveVariables(TQStringList(value), stopHere).front(); } -QStringList Scope::variableValues( const QString& variable, QMake::AST* stopHere, bool fetchFromParent ) const +TQStringList Scope::variableValues( const TQString& variable, QMake::AST* stopHere, bool fetchFromParent ) const { - QStringList result; + TQStringList result; if ( !m_root ) return result; @@ -1272,13 +1272,13 @@ QStringList Scope::variableValues( const QString& variable, QMake::AST* stopHere return result; } -QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stopHere ) const +TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* stopHere ) const { - QStringList result = values; - QMap variables; - for( QStringList::iterator it = result.begin(); it != result.end(); ++it ) + TQStringList result = values; + TQMap variables; + for( TQStringList::iterator it = result.begin(); it != result.end(); ++it ) { - QRegExp re("\\$\\$([^{}\\) /]*)( |\\)|/|$)"); + TQRegExp re("\\$\\$([^{}\\) /]*)( |\\)|/|$)"); int pos = 0; while( pos >= 0 ) { @@ -1290,13 +1290,13 @@ QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stop variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) { - variables[re.cap(1)] = QFileInfo( fileName() ).baseName(); + variables[re.cap(1)] = TQFileInfo( fileName() ).baseName(); } } pos += re.matchedLength(); } } - re = QRegExp("\\$\\$\\{([^\\)\\}]*)\\}"); + re = TQRegExp("\\$\\$\\{([^\\)\\}]*)\\}"); pos = 0; while( pos >= 0 ) { @@ -1308,15 +1308,15 @@ QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stop variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) { - variables[re.cap(1)] = QFileInfo( fileName() ).baseName(); + variables[re.cap(1)] = TQFileInfo( fileName() ).baseName(); } } pos += re.matchedLength(); } } - re = QRegExp("\\$\\$\\(([^\\)\\}]*)\\)"); + re = TQRegExp("\\$\\$\\(([^\\)\\}]*)\\)"); pos = 0; - QMap envvars; + TQMap envvars; while( pos >= 0 ) { pos = re.search( (*it), pos ); @@ -1326,17 +1326,17 @@ QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stop if( m_environment.contains( re.cap(1) ) != -1 ) envvars[re.cap(1)] = m_environment[ re.cap(1) ]; else if ( ::getenv( re.cap(1).local8Bit() ) != 0 ) - envvars[re.cap(1)] = QString::fromLocal8Bit( ::getenv( re.cap(1).local8Bit() ) ); + envvars[re.cap(1)] = TQString::fromLocal8Bit( ::getenv( re.cap(1).local8Bit() ) ); pos += re.matchedLength(); } } - for( QMap::const_iterator it2 = envvars.begin(); it2 != envvars.end(); ++it2 ) + for( TQMap::const_iterator it2 = envvars.begin(); it2 != envvars.end(); ++it2 ) { (*it).replace("$$("+it2.key()+")", it2.data() ); } - for( QMap::const_iterator it2 = variables.begin(); it2 != variables.end(); ++it2 ) + for( TQMap::const_iterator it2 = variables.begin(); it2 != variables.end(); ++it2 ) { - for( QStringList::const_iterator it3 = it2.data().begin(); it3 != it2.data().end(); ++it3 ) + for( TQStringList::const_iterator it3 = it2.data().begin(); it3 != it2.data().end(); ++it3 ) { (*it).replace("$$"+it2.key(), *it3 ); (*it).replace("$${"+it2.key()+"}", *it3 ); @@ -1346,43 +1346,43 @@ QStringList Scope::resolveVariables( const QStringList& values, QMake::AST* stop return result; } -void Scope::allFiles( const QString& projectDirectory, std::set& res ) +void Scope::allFiles( const TQString& projectDirectory, std::set& res ) { - QString myRelPath = URLUtil::getRelativePath( projectDirectory, projectDir() ); - QString file; - QStringList values; - QString header = ""; + TQString myRelPath = URLUtil::getRelativePath( projectDirectory, projectDir() ); + TQString file; + TQStringList values; + TQString header = ""; if( variableValues("TEMPLATE",false ).findIndex("subdirs") == -1 ) { values = variableValues( "INSTALLS" ,false, false ); - QStringList::const_iterator it; + TQStringList::const_iterator it; for ( it = values.begin(); it != values.end(); ++it ) { if ( ( *it ) == "target" ) continue; - QStringList files = variableValues( *it + ".files" ,false, false ); - QStringList::iterator filesit = files.begin(); + TQStringList files = variableValues( *it + ".files" ,false, false ); + TQStringList::iterator filesit = files.begin(); for ( ;filesit != files.end(); ++filesit ) { - file = myRelPath + QString(QChar(QDir::separator())) + *filesit; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *filesit; file = resolveVariables( file ); if( file.contains("*") ) { - QFileInfo fi( projectDirectory + QString( QChar( QDir::separator() ) ) + file ); - QDir absDir = fi.dir( true ); + TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); + TQDir absDir = fi.dir( true ); absDir.setNameFilter( fi.fileName() ); - absDir.setFilter( QDir::Files | QDir::Readable | QDir::NoSymLinks ); - QStringList list = absDir.entryList(); - for( QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) + absDir.setFilter( TQDir::Files | TQDir::Readable | TQDir::NoSymLinks ); + TQStringList list = absDir.entryList(); + for( TQStringList::const_iterator it = list.begin(); it != list.end(); ++it ) { - res.insert( QDir::cleanDirPath( URLUtil::getRelativePath( projectDirectory, absDir.path()+QString( QChar( QDir::separator() ) )+*it ) ) ); + res.insert( TQDir::cleanDirPath( URLUtil::getRelativePath( projectDirectory, absDir.path()+TQString( TQChar( TQDir::separator() ) )+*it ) ) ); } } else { - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } } } @@ -1390,39 +1390,39 @@ void Scope::allFiles( const QString& projectDirectory, std::set& res ) values = variableValues( "LEXSOURCES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "YACCSOURCES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "DISTFILES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); if( file.contains("*") ) { - QFileInfo fi( projectDirectory + QString( QChar( QDir::separator() ) ) + file ); - QDir absDir = fi.dir( true ); + TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); + TQDir absDir = fi.dir( true ); absDir.setNameFilter( fi.fileName() ); - absDir.setFilter( QDir::Files | QDir::Readable | QDir::NoSymLinks ); - QStringList list = absDir.entryList(); - for( QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) + absDir.setFilter( TQDir::Files | TQDir::Readable | TQDir::NoSymLinks ); + TQStringList list = absDir.entryList(); + for( TQStringList::const_iterator it = list.begin(); it != list.end(); ++it ) { - res.insert( QDir::cleanDirPath( URLUtil::getRelativePath( projectDirectory, absDir.path()+QString( QChar( QDir::separator() ) )+*it ) ) ); + res.insert( TQDir::cleanDirPath( URLUtil::getRelativePath( projectDirectory, absDir.path()+TQString( TQChar( TQDir::separator() ) )+*it ) ) ); } } else { - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } } @@ -1431,33 +1431,33 @@ void Scope::allFiles( const QString& projectDirectory, std::set& res ) values = variableValues( "RESOURCES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } } values = variableValues( "IMAGES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "TRANSLATIONS" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "IDLS" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } if ( m_part->isTMakeProject() ) @@ -1465,11 +1465,11 @@ void Scope::allFiles( const QString& projectDirectory, std::set& res ) values = variableValues( "INTERFACES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); - if( QFileInfo(projectDir()+QString(QChar(QDir::separator())) + *it+".h").exists() ) - res.insert( QDir::cleanDirPath( file+".h" ) ); + res.insert( TQDir::cleanDirPath( file ) ); + if( TQFileInfo(projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h").exists() ) + res.insert( TQDir::cleanDirPath( file+".h" ) ); } } else @@ -1477,25 +1477,25 @@ void Scope::allFiles( const QString& projectDirectory, std::set& res ) values = variableValues( "FORMS" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); if( !m_part->isQt4Project()) { - header = projectDir()+QString(QChar(QDir::separator())) + *it+".h"; - if( QFileInfo(header).exists() ) - res.insert( QDir::cleanDirPath( header ) ); - header = projectDir()+QString(QChar(QDir::separator())) + *it+".cpp"; - if( QFileInfo(header).exists() ) - res.insert( QDir::cleanDirPath( header ) ); + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); } else { - header = projectDir()+QString(QChar(QDir::separator())) + "ui_" +*it; - header.replace(QRegExp("\\.ui$"),".h"); - if( QFileInfo(header).exists() ) - res.insert( QDir::cleanDirPath( header ) ); + header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it; + header.replace(TQRegExp("\\.ui$"),".h"); + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); } } } @@ -1504,44 +1504,44 @@ void Scope::allFiles( const QString& projectDirectory, std::set& res ) kdDebug(9024) << "scope:" << scopeType() << " found values: " << values << endl; for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } values = variableValues( "HEADERS" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { - file = myRelPath + QString(QChar(QDir::separator())) + *it; + file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - res.insert( QDir::cleanDirPath( file ) ); + res.insert( TQDir::cleanDirPath( file ) ); } } - QMap::const_iterator it = m_scopes.begin(); + TQMap::const_iterator it = m_scopes.begin(); for( ; it != m_scopes.end(); ++it ) { it.data()->allFiles( projectDirectory, res ); } } -QStringList Scope::allFiles( const QString& projectDir ) +TQStringList Scope::allFiles( const TQString& projectDir ) { - QStringList result; - std::set files; + TQStringList result; + std::set files; allFiles( projectDir, files ); - for( std::set::const_iterator it = files.begin(); it != files.end() ; ++it ) + for( std::set::const_iterator it = files.begin(); it != files.end() ; ++it ) result.append( *it ); kdDebug(9024) << "all files: " << result << endl; return result; } -QString Scope::findCustomVarForPath( const QString& path ) +TQString Scope::findCustomVarForPath( const TQString& path ) { - QString result; + TQString result; if( !m_root ) return result; - QMap::const_iterator it = m_customVariables.begin(); + TQMap::const_iterator it = m_customVariables.begin(); for( ; it != m_customVariables.end(); ++it ) { kdDebug(9024) << "Checking " << path << " against " << cleanStringList(it.data()->values) << endl; @@ -1564,12 +1564,12 @@ void Scope::loadDefaultOpts() m_defaultopts = new QMakeDefaultOpts(); if( DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/disableDefaultOpts", true ) ) { - m_defaultopts->readVariables( m_part->qmakePath(), QFileInfo( m_root->fileName() ).dirPath( true ) ); + m_defaultopts->readVariables( m_part->qmakePath(), TQFileInfo( m_root->fileName() ).dirPath( true ) ); } } } -QString Scope::getLineEndingString() const +TQString Scope::getLineEndingString() const { if( scopeType() == ProjectScope ) @@ -1577,13 +1577,13 @@ QString Scope::getLineEndingString() const switch( m_root->lineEnding() ) { case QMake::ProjectAST::Windows: - return QString("\r\n"); + return TQString("\r\n"); break; case QMake::ProjectAST::MacOS: - return QString("\r"); + return TQString("\r"); break; case QMake::ProjectAST::Unix: - return QString("\n"); + return TQString("\n"); break; } }else if( m_parent ) @@ -1593,18 +1593,18 @@ QString Scope::getLineEndingString() const return "\n"; } -QString Scope::replaceWs(QString s) +TQString Scope::replaceWs(TQString s) { return s.replace( getLineEndingString(), "%nl").replace("\t", "%tab").replace(" ", "%spc"); } -bool Scope::containsContinue(const QString& s ) const +bool Scope::containsContinue(const TQString& s ) const { - return( s.find( QRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 - || s.find( QRegExp( "\\\\\\s*#" ) ) != -1 ); + return( s.find( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 + || s.find( TQRegExp( "\\\\\\s*#" ) ) != -1 ); } -bool Scope::isComment( const QString& s) const +bool Scope::isComment( const TQString& s) const { return s.startsWith("#"); } @@ -1668,7 +1668,7 @@ void Scope::PrintAST::leaveFunctionScope( QMake::ProjectAST* p ) QMake::ASTVisitor::leaveFunctionScope(p); } -QString Scope::PrintAST::replaceWs(QString s) +TQString Scope::PrintAST::replaceWs(TQString s) { return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); } @@ -1698,9 +1698,9 @@ void Scope::PrintAST::processInclude( QMake::IncludeAST* a) QMake::ASTVisitor::processInclude(a); } -QString Scope::PrintAST::getIndent() +TQString Scope::PrintAST::getIndent() { - QString ind; + TQString ind; for( int i = 0 ; i < indent ; i++) ind += " "; return ind; diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h index e8f40eb9..5cc609ce 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -12,9 +12,9 @@ #ifndef _SCOPE_H_ #define _SCOPE_H_ -#include -#include -#include +#include +#include +#include #include #include "qmakeast.h" @@ -38,68 +38,68 @@ public: IncludeScope, InvalidScope }; - static const QStringList KnownVariables; - static const QStringList KnownConfigValues; + static const TQStringList KnownVariables; + static const TQStringList KnownConfigValues; - Scope( const QMap& env, const QString &filename, TrollProjectPart* part ); + Scope( const TQMap& env, const TQString &filename, TrollProjectPart* part ); ~Scope(); void saveToFile() const; // Changing variable values - void addToPlusOp( const QString& variable, const QStringList& values ); - void removeFromPlusOp( const QString& variable, const QStringList& values ); - void addToMinusOp( const QString& variable, const QStringList& values ); - void removeFromMinusOp( const QString& variable, const QStringList& values ); - void addToEqualOp( const QString& variable, const QStringList& values ); - void removeFromEqualOp( const QString& variable, const QStringList& values ); - void setPlusOp( const QString& variable, const QStringList& values ); - void setEqualOp( const QString& variable, const QStringList& values ); - void setMinusOp( const QString& variable, const QStringList& values ); + void addToPlusOp( const TQString& variable, const TQStringList& values ); + void removeFromPlusOp( const TQString& variable, const TQStringList& values ); + void addToMinusOp( const TQString& variable, const TQStringList& values ); + void removeFromMinusOp( const TQString& variable, const TQStringList& values ); + void addToEqualOp( const TQString& variable, const TQStringList& values ); + void removeFromEqualOp( const TQString& variable, const TQStringList& values ); + void setPlusOp( const TQString& variable, const TQStringList& values ); + void setEqualOp( const TQString& variable, const TQStringList& values ); + void setMinusOp( const TQString& variable, const TQStringList& values ); // Checks wether a line like VAR = exists in this subscope - bool isVariableReset( const QString& var ); + bool isVariableReset( const TQString& var ); // Fetch the valuelist for the variable op combination inside this scope - QStringList variableValuesForOp( const QString& variable, const QString& op ) const; + TQStringList variableValuesForOp( const TQString& variable, const TQString& op ) const; // Fetch the variable values by running over the statements and adding/removing/setting // as the encountered op's say, begin with the parent projects variableValues list - QStringList variableValues( const QString& variable, bool checkIncParent = true, bool fetchFromParent = true, bool evaluateSubScopes = false ); + TQStringList variableValues( const TQString& variable, bool checkIncParent = true, bool fetchFromParent = true, bool evaluateSubScopes = false ); // Remove a variable+Op combination from the scope, if existant - void removeVariable( const QString& var, const QString& op ); + void removeVariable( const TQString& var, const TQString& op ); // Getting to know what type of scope this is ScopeType scopeType() const; // This returns the function+args, the scopename or the pro/pri file // depending on the type of scope - QString scopeName() const; + TQString scopeName() const; // Returns the projectName for this scope, this is equal to the last part of the projectDir() - QString projectName() const; + TQString projectName() const; // Returns just the filename of this project's .pro file - QString fileName() const; + TQString fileName() const; // Returns the absolute path of the dir containing the .pro file - QString projectDir() const; + TQString projectDir() const; // get the parent Scope Scope* parent() const { return m_parent; } // Fetching sub-scopes - const QValueList scopesInOrder() const { return m_scopes.values(); } + const TQValueList scopesInOrder() const { return m_scopes.values(); } // Working on SubScopes /* * creates a new function scope at the end of this (Sub-)AST and returns the Scope wrapping it */ - Scope* createFunctionScope( const QString& funcName, const QString& args ); + Scope* createFunctionScope( const TQString& funcName, const TQString& args ); /* * creates a new simple scope at the end of this (Sub-)AST and returns the Scope wrapping it */ - Scope* createSimpleScope( const QString& scopename ); + Scope* createSimpleScope( const TQString& scopename ); /* * creates a new function scope at the end of this (Sub-)AST @@ -107,14 +107,14 @@ public: * It returns the Scope wrapping the include-AST, the function scope AST * can be accessed easily using the parent() method. */ - Scope* createIncludeScope( const QString& includeFile, bool negate = false ); + Scope* createIncludeScope( const TQString& includeFile, bool negate = false ); /* * creates a new subproject in dir (create's dir if necessary) * If this scope is not a project scope the subproject will be added to this * Scope only, i.e. it is not seen in the project-files list of subdirs */ - Scope* createSubProject( const QString& dir ); + Scope* createSubProject( const TQString& dir ); /* delete the given function scope */ bool deleteFunctionScope( unsigned int ); @@ -129,38 +129,38 @@ public: bool isQt4Project() const ; /* Provide a Map of Custom variables */ - const QMap > customVariables() const; + const TQMap > customVariables() const; - unsigned int addCustomVariable( const QString& var, const QString& op, const QString& values ); + unsigned int addCustomVariable( const TQString& var, const TQString& op, const TQString& values ); /* Removes the variable with the given id if it exists */ void removeCustomVariable( unsigned int ); /* Update the values of the variable/operation combo var+op to values */ - void updateCustomVariable( unsigned int, const QString&, const QString& , const QString& ); + void updateCustomVariable( unsigned int, const TQString&, const TQString& , const TQString& ); - // Checks wether a QStringList contains any values that are not whitespace or \\n - static bool listIsEmpty( const QStringList& values ); + // Checks wether a TQStringList contains any values that are not whitespace or \\n + static bool listIsEmpty( const TQStringList& values ); /* returns wether this is an enabled subproject or a disabled one */ bool isEnabled() { return m_isEnabled; } - QStringList cleanStringList(const QStringList& list) const; + TQStringList cleanStringList(const TQStringList& list) const; /* Reload a project scope */ void reloadProject(); /* creates a new disabled Scope child and add SUBDIRS -= dir to this scope */ - Scope* disableSubproject( const QString& ); + Scope* disableSubproject( const TQString& ); /* return the "position" of this scope in the list of scopes */ unsigned int getNum() { return m_num; } - QStringList allFiles( const QString& ); + TQStringList allFiles( const TQString& ); - QString resolveVariables( const QString& ) const; + TQString resolveVariables( const TQString& ) const; - QString findCustomVarForPath( const QString& ); + TQString findCustomVarForPath( const TQString& ); #ifdef DEBUG void printTree(); @@ -183,77 +183,77 @@ private: * if op is -= removes values from any occurence of = and += * if op is = removes values frmo any occurence of -= */ - void updateVariable( const QString& variable, const QString& op, const QStringList& values, bool removeFromOp ); + void updateVariable( const TQString& variable, const TQString& op, const TQStringList& values, bool removeFromOp ); /* * Helper Function to change the origValues list with the values from newValues * depending on the state of "remove" either adds or removes all entries from newValues * to origValues if they didn't exist there yet */ - void updateValues( QStringList& origValues, const QStringList& newValues, bool remove = false, QString indent = " " ); + void updateValues( TQStringList& origValues, const TQStringList& newValues, bool remove = false, TQString indent = " " ); /* * Finds an existing variable, returns the end() of the statemenst if it is not found */ - QValueList::iterator findExistingVariable( const QString& variable ); + TQValueList::iterator findExistingVariable( const TQString& variable ); // Private constructors for easier subscope creation /* * just initializes the lists from the scope */ - Scope( const QMap& env, unsigned int num, Scope* parent, QMake::ProjectAST* root, QMakeDefaultOpts*, TrollProjectPart* part ); + Scope( const TQMap& env, unsigned int num, Scope* parent, QMake::ProjectAST* root, QMakeDefaultOpts*, TrollProjectPart* part ); /* * reads the given filename and parses it. If it doesn't exist creates an empty * ProjectAST with the given filename */ - Scope( const QMap& env, unsigned int num, Scope* parent, const QString& filename, TrollProjectPart* part, bool isEnabled = true ); + Scope( const TQMap& env, unsigned int num, Scope* parent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true ); /* * Creates a scope for an include statement, parses the file and initializes the Scope * Create an empty ProjectAST if the file cannot be found or parsed. */ - Scope( const QMap& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const QString& path, const QString& incfile, QMakeDefaultOpts*, TrollProjectPart* part ); + Scope( const TQMap& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const TQString& path, const TQString& incfile, QMakeDefaultOpts*, TrollProjectPart* part ); // runs through the statements until stopHere is found (or the end is reached, if stopHere is 0), // using the given list as startvalue // Changes the list using the +=, -=, = operations accordingly - void calcValuesFromStatements( const QString& variable, QStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true, bool evaluateSubScopes = false ) const; + void calcValuesFromStatements( const TQString& variable, TQStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true, bool evaluateSubScopes = false ) const; // Check wether the two operators are compatible - static bool isCompatible( const QString& op1, const QString& op2); + static bool isCompatible( const TQString& op1, const TQString& op2); // Check wether the 2 lists are equal, regardless of element order. - static bool listsEqual(const QStringList& , const QStringList& ); + static bool listsEqual(const TQStringList& , const TQStringList& ); // Load and Save project files, these only work on ProjectScope's - bool loadFromFile( const QString& filename ); + bool loadFromFile( const TQString& filename ); - QString funcScopeKey( QMake::ProjectAST* funcast ) const { return funcast->scopedID + "(" + funcast->args + ")"; } + TQString funcScopeKey( QMake::ProjectAST* funcast ) const { return funcast->scopedID + "(" + funcast->args + ")"; } unsigned int getNextScopeNum() { if( m_scopes.isEmpty() ) return 0; else return (m_scopes.keys().last()+1); } - QStringList lookupVariable( const QString& var ); + TQStringList lookupVariable( const TQString& var ); - QStringList resolveVariables( const QStringList&, QMake::AST* = 0 ) const; - QStringList variableValues( const QString& variable, QMake::AST*, bool fetchFromParent = true ) const; - QString resolveVariables( const QString& , QMake::AST* ) const; + TQStringList resolveVariables( const TQStringList&, QMake::AST* = 0 ) const; + TQStringList variableValues( const TQString& variable, QMake::AST*, bool fetchFromParent = true ) const; + TQString resolveVariables( const TQString& , QMake::AST* ) const; // This function determines the currently used String for fileending, it can be \n, \r or \r\n - QString getLineEndingString() const; - bool isComment( const QString& ) const; - bool containsContinue( const QString& ) const; - void allFiles( const QString&, std::set& ); + TQString getLineEndingString() const; + bool isComment( const TQString& ) const; + bool containsContinue( const TQString& ) const; + void allFiles( const TQString&, std::set& ); void loadDefaultOpts(); QMake::ProjectAST* m_root; QMake::IncludeAST* m_incast; - QMap m_customVariables; - QMap m_scopes; + TQMap m_customVariables; + TQMap m_scopes; Scope* m_parent; unsigned int m_maxCustomVarNum; - QString replaceWs(QString); + TQString replaceWs(TQString); // The "position" inside the parent scope that this scope starts at @@ -261,8 +261,8 @@ private: bool m_isEnabled; TrollProjectPart* m_part; QMakeDefaultOpts* m_defaultopts; - QMap m_varCache; - QMap m_environment; + TQMap m_varCache; + TQMap m_environment; #ifdef DEBUG class PrintAST : QMake::ASTVisitor @@ -291,10 +291,10 @@ private: virtual void processInclude( QMake::IncludeAST* a); - QString replaceWs(QString); + TQString replaceWs(TQString); private: - QString getIndent(); + TQString getIndent(); int indent; }; diff --git a/buildtools/qmake/trolllistview.cpp b/buildtools/qmake/trolllistview.cpp index 2c91251b..3bf99a0e 100644 --- a/buildtools/qmake/trolllistview.cpp +++ b/buildtools/qmake/trolllistview.cpp @@ -20,7 +20,7 @@ #include "trolllistview.h" -TrollListView::TrollListView(TrollProjectWidget *widget, QWidget *parent, +TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name) :KListView(parent, name), m_widget(widget), m_view(view) { @@ -30,7 +30,7 @@ TrollListView::~TrollListView() { } -void TrollListView::focusOutEvent( QFocusEvent */* e*/ ) +void TrollListView::focusOutEvent( TQFocusEvent */* e*/ ) { m_widget->setLastFocusedView(m_view); } diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 66f70960..5fd79b30 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -28,10 +28,10 @@ class TrollListView : public KListView { Q_OBJECT public: - TrollListView(TrollProjectWidget *widget, QWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0); + TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0); ~TrollListView(); protected: - virtual void focusOutEvent(QFocusEvent *e); + virtual void focusOutEvent(TQFocusEvent *e); private: TrollProjectWidget *m_widget; diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 6d2f5b3a..d59c5b4b 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -15,9 +15,9 @@ #include "trollprojectpart.h" -#include -#include -#include +#include +#include +#include #include #include #include @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -60,7 +60,7 @@ typedef KDevGenericFactory TrollProjectFactory; static const KDevPluginInfo data("kdevtrollproject"); K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) -TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStringList& args ) +TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); @@ -80,7 +80,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr m_widget = new TrollProjectWidget(this); m_widget->setIcon(SmallIcon("qmakerun")); m_widget->setCaption(i18n("QMake Manager")); - QWhatsThis::add(m_widget, i18n("QMake manager

" + TQWhatsThis::add(m_widget, i18n("QMake manager

" "The QMake manager project tree consists of two parts. The 'overview' " "in the upper half shows the subprojects, each one having a " ".pro file. The 'details' view in the lower half shows the " @@ -90,9 +90,9 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr KAction *action; - const QIconSet icon(SmallIcon("compfile")); + const TQIconSet icon(SmallIcon("compfile")); action = new KAction( i18n("Compile &File"), "compfile", 0, - m_widget, SLOT(slotBuildOpenFile()), + m_widget, TQT_SLOT(slotBuildOpenFile()), actionCollection(),"build_compilefile" ); action->setToolTip(i18n("Compile file")); action->setWhatsThis(i18n("Compile file

Runs make filename.o command from the directory where 'filename' is the name of currently opened file.
" @@ -101,7 +101,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8, - m_widget, SLOT(slotBuildProject()), + m_widget, TQT_SLOT(slotBuildProject()), actionCollection(), "build_build_project" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("Build project

Runs make from the project directory.
" @@ -109,7 +109,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("&Rebuild Project"),"rebuild" , 0, - m_widget, SLOT(slotRebuildProject()), + m_widget, TQT_SLOT(slotRebuildProject()), actionCollection(),"build_rebuild_project" ); action->setToolTip(i18n("Rebuild project")); action->setWhatsThis(i18n("Rebuild project

Runs make clean and then make from the project directory.
" @@ -117,7 +117,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("&Install Project"),"install" , 0, - m_widget, SLOT(slotInstallProject()), + m_widget, TQT_SLOT(slotInstallProject()), actionCollection(),"build_install_project" ); action->setToolTip(i18n("Install project")); action->setWhatsThis(i18n("Install project

Runs make install from the project directory.
" @@ -125,7 +125,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("&Clean Project"), 0, - m_widget, SLOT(slotCleanProject()), + m_widget, TQT_SLOT(slotCleanProject()), actionCollection(), "build_clean_project" ); action->setToolTip(i18n("Clean project")); action->setWhatsThis(i18n("Clean project

Runs make clean command from the project directory.
" @@ -133,7 +133,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("&Dist-Clean Project"), 0, - m_widget, SLOT(slotDistCleanProject()), + m_widget, TQT_SLOT(slotDistCleanProject()), actionCollection(), "build_distclean_project" ); action->setToolTip(i18n("Dist-Clean project")); action->setWhatsThis(i18n("Dist-Clean project

Runs make distclean command from the " @@ -141,13 +141,13 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("Execute Main Program"), "exec", SHIFT+Key_F9, - this, SLOT(slotBuildAndExecuteProject()), + this, TQT_SLOT(slotBuildAndExecuteProject()), actionCollection(), "build_execute_project" ); action->setToolTip(i18n("Execute main program")); action->setWhatsThis(i18n("Execute program

Executes the currently selected subproject if it is an application or the program specified in project settings, Run Options tab.")); action = new KAction( i18n("&Build Subproject"), "make_kdevelop", Key_F7, - m_widget, SLOT(slotBuildTarget()), + m_widget, TQT_SLOT(slotBuildTarget()), actionCollection(), "build_build_target" ); action->setToolTip(i18n("Build subproject")); action->setWhatsThis(i18n("Build subproject

Runs make from the current subproject directory. " @@ -156,7 +156,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("&Rebuild Subproject"), "rebuild", 0, - m_widget, SLOT(slotRebuildTarget()), + m_widget, TQT_SLOT(slotRebuildTarget()), actionCollection(),"build_rebuild_target" ); action->setToolTip(i18n("Rebuild subproject")); action->setWhatsThis(i18n("Rebuild subproject

Runs make clean and then make from the current subproject directory. " @@ -165,7 +165,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("&Install Subproject"), "install", 0, - m_widget, SLOT(slotInstallTarget()), + m_widget, TQT_SLOT(slotInstallTarget()), actionCollection(),"build_install_target" ); action->setToolTip(i18n("Install subproject")); action->setWhatsThis(i18n("Install subproject

Runs make install from the current subproject directory. " @@ -174,7 +174,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("&Clean Subproject"), 0, - m_widget, SLOT(slotCleanTarget()), + m_widget, TQT_SLOT(slotCleanTarget()), actionCollection(), "build_clean_target" ); action->setToolTip(i18n("Clean subproject")); action->setWhatsThis(i18n("Clean subproject

Runs make clean from the current subproject directory. " @@ -183,7 +183,7 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("&Dist-Clean Subproject"), 0, - m_widget, SLOT(slotDistCleanTarget()), + m_widget, TQT_SLOT(slotDistCleanTarget()), actionCollection(), "build_distclean_target" ); action->setToolTip(i18n("Dist-Clean subproject")); action->setWhatsThis(i18n("Dist-Clean subproject

Runs make distclean from the current" @@ -192,22 +192,22 @@ TrollProjectPart::TrollProjectPart(QObject *parent, const char *name, const QStr "in the project settings dialog, Make Options tab.")); action = new KAction( i18n("Execute Subproject"), "exec", 0, - this, SLOT(slotBuildAndExecuteTarget()), + this, TQT_SLOT(slotBuildAndExecuteTarget()), actionCollection(), "build_execute_target" ); action->setToolTip(i18n("Execute subproject")); action->setWhatsThis(i18n("Execute subproject

Executes the target program for the currently selected subproject. " "This action is allowed only if a type of the subproject is 'application'. The type of the subproject can be " "defined in Subproject Settings dialog (open it from the subproject context menu).")); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( makeFrontend(), SIGNAL(commandFinished(const QString&)), - this, SLOT(slotCommandFinished(const QString&)) ); + connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), + this, TQT_SLOT(slotCommandFinished(const TQString&)) ); - QString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); - QString m_qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); - QString qtversion = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/version", "3"); + TQString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + TQString m_qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); + TQString qtversion = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/version", "3"); if( m_defaultQtDir.isEmpty() || !isValidQtDir( m_defaultQtDir ) ) { @@ -233,7 +233,7 @@ TrollProjectPart::~TrollProjectPart() delete m_widget; } -QString TrollProjectPart::makeEnvironment() +TQString TrollProjectPart::makeEnvironment() { // Get the make environment variables pairs into the environstr string // in the form of: "ENV_VARIABLE=ENV_VALUE" @@ -242,7 +242,7 @@ QString TrollProjectPart::makeEnvironment() DomUtil::PairList envvars = DomUtil::readPairListEntry(*projectDom(), "/kdevtrollproject/make/envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; bool hasQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { @@ -257,7 +257,7 @@ QString TrollProjectPart::makeEnvironment() if( !hasQtDir && !isQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { - environstr += QString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + QString( " PATH=$QTDIR/bin:$PATH " ); + environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$QTDIR/bin:$PATH " ); } KConfigGroup grp( kapp->config(), "MakeOutputView" ); @@ -269,7 +269,7 @@ QString TrollProjectPart::makeEnvironment() void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium )); RunOptionsWidget *optdlg = new RunOptionsWidget(*projectDom(), "/kdevtrollproject", buildDirectory(), vbox); @@ -280,32 +280,32 @@ void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox); - connect( dlg, SIGNAL(okClicked()), w4, SLOT(accept()) ); - connect( dlg, SIGNAL(okClicked()), qm, SLOT(accept()) ); - connect( dlg, SIGNAL(okClicked()), optdlg, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), qm, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), optdlg, TQT_SLOT(accept()) ); } -void TrollProjectPart::openProject(const QString &dirName, const QString &projectName) +void TrollProjectPart::openProject(const TQString &dirName, const TQString &projectName) { mainWindow()->statusBar()->message( i18n("Loading Project...") ); - QString defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + TQString defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); if( !isQt4Project() && ( defaultQtDir.isEmpty() || !isValidQtDir( defaultQtDir ) ) ) { bool doask = true; while( doask ) { KURLRequesterDlg dlg( i18n("Choose Qt3 directory"), - i18n("Choose the Qt3 directory to use. This directory needs to have an include directory containing qt.h.") + i18n("Choose the Qt3 directory to use. This directory needs to have an include directory containing tqt.h.") , m_widget, 0); dlg.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dlg.urlRequester() ->setURL( QString::null ); + dlg.urlRequester() ->setURL( TQString::null ); dlg.urlRequester() ->completionObject() ->setDir( "/" ); - if ( dlg.exec() == QDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) + if ( dlg.exec() == TQDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) { - QString qtdir = dlg.urlRequester()->url(); + TQString qtdir = dlg.urlRequester()->url(); if( !isValidQtDir( qtdir ) ) { if( KMessageBox::warningYesNo( m_widget, @@ -313,7 +313,7 @@ void TrollProjectPart::openProject(const QString &dirName, const QString &projec "project might not work properly without one.\nPlease make " "sure you give a directory that contains a bin with the " "qmake binary in it and for Qt3 project also contains an " - "include directory with qt.h in it.\nDo you want to try " + "include directory with tqt.h in it.\nDo you want to try " "setting a Qt directory again?"), i18n("Wrong Qt directory given")) == KMessageBox::Yes @@ -342,7 +342,7 @@ void TrollProjectPart::openProject(const QString &dirName, const QString &projec } } } - QString qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); + TQString qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); if( qmakePath.isEmpty() || !isExecutable( qmakePath ) ) { bool doask = true; @@ -351,12 +351,12 @@ void TrollProjectPart::openProject(const QString &dirName, const QString &projec KURLRequesterDlg dlg( i18n("Choose QMake executable"), i18n("Choose the QMake binary to use. QMake is used to generate Makefiles from the project files."), m_widget, 0); dlg.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dlg.urlRequester() ->setURL( QString::null ); + dlg.urlRequester() ->setURL( TQString::null ); dlg.urlRequester() ->completionObject() ->setDir( "/" ); - if ( dlg.exec() == QDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) + if ( dlg.exec() == TQDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) { - QString qmake = dlg.urlRequester()->url(); + TQString qmake = dlg.urlRequester()->url(); if( !isExecutable( qmake ) ) { if( KMessageBox::warningYesNo( m_widget, @@ -399,7 +399,7 @@ void TrollProjectPart::openProject(const QString &dirName, const QString &projec m_widget->openProject(dirName); - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if (DomUtil::readEntry(dom, "/kdevtrollproject/run/directoryradio") == "" ) { DomUtil::writeEntry(dom, "/kdevtrollproject/run/directoryradio", "executable"); @@ -415,18 +415,18 @@ void TrollProjectPart::closeProject() } -QString TrollProjectPart::projectDirectory() const +TQString TrollProjectPart::projectDirectory() const { return m_widget->projectDirectory(); } -QString TrollProjectPart::buildDirectory() const +TQString TrollProjectPart::buildDirectory() const { return m_widget->projectDirectory(); } -QString TrollProjectPart::projectName() const +TQString TrollProjectPart::projectName() const { return m_projectName; } @@ -468,27 +468,27 @@ void TrollProjectPart::slotBuildAndExecuteTarget() * if run/directoryradio == custom * The custom directory absolute path */ -QString TrollProjectPart::runDirectory() const +TQString TrollProjectPart::runDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString cwd; + TQString cwd; if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", true) ) { cwd = defaultRunDirectory("kdevtrollproject"); }else { - QString name = m_widget->getCurrentOutputFilename(); + TQString name = m_widget->getCurrentOutputFilename(); if( name.findRev("/") != -1 ) name = name.right( name.length()-name.findRev("/")-1 ); cwd = DomUtil::readEntry( dom, "/kdevtrollproject/run/cwd/" + name ); } if( cwd.isEmpty() ) { - QString destpath = m_widget->getCurrentTarget(); - if( QDir::isRelativePath( destpath ) ) + TQString destpath = m_widget->getCurrentTarget(); + if( TQDir::isRelativePath( destpath ) ) { - destpath = m_widget->subprojectDirectory() + QString( QChar( QDir::separator() ) ) + destpath; + destpath = m_widget->subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + destpath; } destpath = destpath.left( destpath.findRev("/") ); cwd = destpath; @@ -509,16 +509,16 @@ QString TrollProjectPart::runDirectory() const */ -QString TrollProjectPart::mainProgram() const +TQString TrollProjectPart::mainProgram() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", false) ) { - QString DomMainProgram = DomUtil::readEntry(dom, "/kdevtrollproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry(dom, "/kdevtrollproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -535,7 +535,7 @@ QString TrollProjectPart::mainProgram() const KMessageBox::error( m_widget, "There's no selected subproject!\n" "Unable to determine the main program", "No selected subproject found" ); kdDebug ( 9020 ) << k_funcinfo << "Error! : There's no active target! -> Unable to determine the main program in TrollProjectPart::mainProgram()" << endl; - return QString::null; + return TQString::null; } if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").findIndex("app") == -1 ) @@ -545,19 +545,19 @@ QString TrollProjectPart::mainProgram() const "to be the selected subproject, set a main program under\n" "Project -> Project Options -> Run Options", "Selected subproject is not a library" ); kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << m_widget->currentSubproject()->scope->variableValues("TEMPLATE").join(" ") << ") ! -> Unable to determine the main program in TrollProjectPart::mainProgram()" << endl; - return QString::null; + return TQString::null; } - QString destpath = m_widget->getCurrentTarget(); - if( QDir::isRelativePath( destpath ) ) + TQString destpath = m_widget->getCurrentTarget(); + if( TQDir::isRelativePath( destpath ) ) { - destpath = m_widget->subprojectDirectory() + QString( QChar( QDir::separator() ) ) + destpath; + destpath = m_widget->subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + destpath; } return destpath; } } -QString TrollProjectPart::debugArguments() const +TQString TrollProjectPart::debugArguments() const { if( DomUtil::readBoolEntry(*projectDom(), "/kdevtrollproject/run/useglobalprogram", true ) ) { @@ -568,8 +568,8 @@ QString TrollProjectPart::debugArguments() const } } -/** Retuns a QString with the run command line arguments */ -QString TrollProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString TrollProjectPart::runArguments() const { if( DomUtil::readBoolEntry(*projectDom(), "/kdevtrollproject/run/useglobalprogram", true) ) { @@ -581,34 +581,34 @@ QString TrollProjectPart::runArguments() const } -QString TrollProjectPart::activeDirectory() const +TQString TrollProjectPart::activeDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); return DomUtil::readEntry(dom, "/kdevtrollproject/general/activedir"); } -QStringList TrollProjectPart::allFiles() const +TQStringList TrollProjectPart::allFiles() const { return m_widget->allFiles(); } -void TrollProjectPart::addFile(const QString &fileName) +void TrollProjectPart::addFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); - this->addFiles ( QStringList( fileName ) ); + this->addFiles ( TQStringList( fileName ) ); } -void TrollProjectPart::addFiles ( const QStringList &fileList ) +void TrollProjectPart::addFiles ( const TQStringList &fileList ) { - QStringList files = fileList; - for (QStringList::iterator it = files.begin(); it != files.end(); ++it) + TQStringList files = fileList; + for (TQStringList::iterator it = files.begin(); it != files.end(); ++it) { - if( !QFileInfo( *it ).isRelative() ) + if( !TQFileInfo( *it ).isRelative() ) { *it = URLUtil::relativePathToFile( projectDirectory(), *it ); } @@ -617,19 +617,19 @@ void TrollProjectPart::addFiles ( const QStringList &fileList ) } -void TrollProjectPart::removeFile(const QString & /* fileName */) +void TrollProjectPart::removeFile(const TQString & /* fileName */) { /// \FIXME -/* QStringList fileList; +/* TQStringList fileList; fileList.append ( fileName ); this->removeFiles ( fileList );*/ } -void TrollProjectPart::removeFiles ( const QStringList& fileList ) +void TrollProjectPart::removeFiles ( const TQStringList& fileList ) { /// \FIXME missing remove files functionality -// QStringList::ConstIterator it; +// TQStringList::ConstIterator it; // // it = fileList.begin(); // @@ -641,33 +641,33 @@ void TrollProjectPart::removeFiles ( const QStringList& fileList ) emit removedFilesFromProject ( fileList ); } /* -void TrollProjectPart::startMakeCommand(const QString &dir, const QString &target) +void TrollProjectPart::startMakeCommand(const TQString &dir, const TQString &target) { partController()->saveAllFiles(); - QFileInfo fi(dir + "/Makefile"); + TQFileInfo fi(dir + "/Makefile"); if (!fi.exists()) { - int r = KMessageBox::questionYesNo(m_widget, i18n("There is no Makefile in this directory. Run qmake first?"), QString::null, i18n("Run qmake"), i18n("Do Not Run")); + int r = KMessageBox::questionYesNo(m_widget, i18n("There is no Makefile in this directory. Run qmake first?"), TQString::null, i18n("Run qmake"), i18n("Do Not Run")); if (r == KMessageBox::No) return; startQMakeCommand(dir); } - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); if (target=="clean") { - QString cmdline = DomUtil::readEntry(dom, "/kdevtrollproject/make/makebin"); + TQString cmdline = DomUtil::readEntry(dom, "/kdevtrollproject/make/makebin"); if (cmdline.isEmpty()) cmdline = MAKE_COMMAND; cmdline += " clean"; - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += dir; dircmd += " && "; cmdline.prepend(makeEnvironment()); makeFrontend()->queueCommand(dir, dircmd + cmdline); } - QString cmdline = DomUtil::readEntry(dom, "/kdevtrollproject/make/makebin"); + TQString cmdline = DomUtil::readEntry(dom, "/kdevtrollproject/make/makebin"); if (cmdline.isEmpty()) cmdline = MAKE_COMMAND; if (!DomUtil::readBoolEntry(dom, "/kdevtrollproject/make/abortonerror")) @@ -675,7 +675,7 @@ void TrollProjectPart::startMakeCommand(const QString &dir, const QString &targe int jobs = DomUtil::readIntEntry(dom, "/kdevtrollproject/make/numberofjobs"); if (jobs != 0) { cmdline += " -j"; - cmdline += QString::number(jobs); + cmdline += TQString::number(jobs); } if (DomUtil::readBoolEntry(dom, "/kdevtrollproject/make/dontact")) cmdline += " -n"; @@ -683,7 +683,7 @@ void TrollProjectPart::startMakeCommand(const QString &dir, const QString &targe cmdline += " "; cmdline += target; - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += dir; dircmd += " && "; @@ -692,10 +692,10 @@ void TrollProjectPart::startMakeCommand(const QString &dir, const QString &targe } */ -void TrollProjectPart::startQMakeCommand(const QString &dir, bool recursive) +void TrollProjectPart::startQMakeCommand(const TQString &dir, bool recursive) { - QFileInfo fi(dir); - QString cmdline; + TQFileInfo fi(dir); + TQString cmdline; if ( isTMakeProject() ) { @@ -710,10 +710,10 @@ void TrollProjectPart::startQMakeCommand(const QString &dir, bool recursive) cmdline += " -recursive "; } - //QString cmdline = QString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " ); + //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " ); // cmdline += fi.baseName() + ".pro"; - QDir d(dir); - QStringList l = d.entryList("*.pro"); + TQDir d(dir); + TQStringList l = d.entryList("*.pro"); if( l.isEmpty() || ( l.count() && l.findIndex( projectName() + ".pro" ) != -1 ) ) cmdline += projectName()+".pro"; @@ -722,9 +722,9 @@ void TrollProjectPart::startQMakeCommand(const QString &dir, bool recursive) else cmdline += l[0]; -// cmdline += QString::fromLatin1( " -o Makefile" ); +// cmdline += TQString::fromLatin1( " -o Makefile" ); - QString dircmd = "cd "; + TQString dircmd = "cd "; dircmd += KProcess::quote(dir); dircmd += " && "; @@ -732,28 +732,28 @@ void TrollProjectPart::startQMakeCommand(const QString &dir, bool recursive) makeFrontend()->queueCommand(dir, dircmd + cmdline); } -void TrollProjectPart::queueCmd(const QString &dir, const QString &cmd) +void TrollProjectPart::queueCmd(const TQString &dir, const TQString &cmd) { makeFrontend()->queueCommand(dir, cmd); } -void TrollProjectPart::slotCommandFinished( const QString& command ) +void TrollProjectPart::slotCommandFinished( const TQString& command ) { Q_UNUSED( command ); // if( m_buildCommand != command ) // return; // -// m_buildCommand = QString::null; +// m_buildCommand = TQString::null; m_timestamp.clear(); - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while( it != fileList.end() ){ - QString fileName = *it; + TQString fileName = *it; ++it; - m_timestamp[ fileName ] = QFileInfo( projectDirectory(), fileName ).lastModified(); + m_timestamp[ fileName ] = TQFileInfo( projectDirectory(), fileName ).lastModified(); } emit projectCompiled(); @@ -772,14 +772,14 @@ void TrollProjectPart::slotCommandFinished( const QString& command ) bool TrollProjectPart::isDirty() { - QStringList fileList = allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = allFiles(); + TQStringList::Iterator it = fileList.begin(); while( it != fileList.end() ){ - QString fileName = *it; + TQString fileName = *it; ++it; - QMap::Iterator it = m_timestamp.find( fileName ); - QDateTime t = QFileInfo( projectDirectory(), fileName ).lastModified(); + TQMap::Iterator it = m_timestamp.find( fileName ); + TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if( it == m_timestamp.end() || *it != t ){ return true; } @@ -793,46 +793,46 @@ KDevProject::Options TrollProjectPart::options( ) const return UsesQMakeBuildSystem; } -bool TrollProjectPart::isValidQtDir( const QString& path ) const +bool TrollProjectPart::isValidQtDir( const TQString& path ) const { - QFileInfo inc( path + QString( QChar( QDir::separator() ) )+ - "include"+QString( QChar( QDir::separator() ) )+ - "qt.h" ); + TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+ + "include"+TQString( TQChar( TQDir::separator() ) )+ + "tqt.h" ); return ( isQt4Project() || ( !isQt4Project() && inc.exists() ) ); } -void TrollProjectPart::buildBinDirs( QStringList & dirs ) const +void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const { if( !isQt4Project() ) { - QString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + TQString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); if( !m_defaultQtDir.isEmpty() ) - dirs << (m_defaultQtDir + QString( QChar( QDir::separator() ) ) + "bin" ); - dirs << ( ::getenv("QTDIR") + QString( QChar( QDir::separator() ) ) + "bin" ); + dirs << (m_defaultQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); + dirs << ( ::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); } - QStringList paths = QStringList::split(":",::getenv("PATH")); + TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; - QString binpath = QDir::rootDirPath() + "bin"; + TQString binpath = TQDir::rootDirPath() + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; - binpath = QDir::rootDirPath() + "usr" + QString( QChar( QDir::separator() ) ) + "bin"; + binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; - binpath = QDir::rootDirPath() + "usr" + QString( QChar( QDir::separator() ) ) + "local" + QString( QChar( QDir::separator() ) ) + "bin"; + binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; } -QString TrollProjectPart::findExecutable( const QString& execname ) const +TQString TrollProjectPart::findExecutable( const TQString& execname ) const { - QStringList dirs; + TQStringList dirs; buildBinDirs( dirs ); - for( QStringList::Iterator it=dirs.begin(); it!=dirs.end(); ++it ) + for( TQStringList::Iterator it=dirs.begin(); it!=dirs.end(); ++it ) { - QString designer = *it + QString( QChar( QDir::separator() ) ) + execname; + TQString designer = *it + TQString( TQChar( TQDir::separator() ) ) + execname; if( !designer.isEmpty() && isExecutable( designer ) ) { return designer; @@ -841,26 +841,26 @@ QString TrollProjectPart::findExecutable( const QString& execname ) const return ""; } -bool TrollProjectPart::isExecutable( const QString& path ) const +bool TrollProjectPart::isExecutable( const TQString& path ) const { - QFileInfo fi(path); + TQFileInfo fi(path); return( fi.exists() && fi.isExecutable() ); } -QString TrollProjectPart::findQtDir() +TQString TrollProjectPart::findQtDir() { - QStringList qtdirs; + TQStringList qtdirs; if( !isQt4Project() ) qtdirs.push_back( ::getenv("QTDIR") ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt"+QString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt"+QString( QChar( QDir::separator() ) )+QString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"share"+QString( QChar( QDir::separator() ) )+"qt"+QString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr" ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt" ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr" ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" ); - for( QStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) + for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) { - QString qtdir = *it; + TQString qtdir = *it; if( !qtdir.isEmpty() && isValidQtDir(qtdir) ) { return qtdir; @@ -870,25 +870,25 @@ QString TrollProjectPart::findQtDir() } -QStringList recursiveProFind( const QString &currDir, const QString &baseDir ) +TQStringList recursiveProFind( const TQString &currDir, const TQString &baseDir ) { - QStringList fileList; + TQStringList fileList; - if( !currDir.contains( QString( QChar ( QDir::separator() ) ) +".." ) - && !currDir.contains( QString( QChar( QDir::separator() ) )+".") ) + if( !currDir.contains( TQString( TQChar ( TQDir::separator() ) ) +".." ) + && !currDir.contains( TQString( TQChar( TQDir::separator() ) )+".") ) { - QDir dir(currDir); - QStringList dirList = dir.entryList(QDir::Dirs ); - QStringList::Iterator idx = dirList.begin(); + TQDir dir(currDir); + TQStringList dirList = dir.entryList(TQDir::Dirs ); + TQStringList::Iterator idx = dirList.begin(); for( ; idx != dirList.end(); ++idx ) { - fileList += recursiveProFind( currDir + QString( QChar( QDir::separator() ) ) + (*idx),baseDir ); + fileList += recursiveProFind( currDir + TQString( TQChar( TQDir::separator() ) ) + (*idx),baseDir ); } - QStringList newFiles = dir.entryList("*.pro *.PRO"); + TQStringList newFiles = dir.entryList("*.pro *.PRO"); idx = newFiles.begin(); for( ; idx != newFiles.end(); ++idx ) { - QString file = currDir + QString( QChar( QDir::separator() ) ) + (*idx); + TQString file = currDir + TQString( TQChar( TQDir::separator() ) ) + (*idx); fileList.append( file.remove( baseDir ) ); } } @@ -900,12 +900,12 @@ QStringList recursiveProFind( const QString &currDir, const QString &baseDir ) /*! \fn TrollProjectPart::distFiles() const */ -QStringList TrollProjectPart::distFiles() const +TQStringList TrollProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QStringList files = recursiveProFind( projectDir, projectDir + QString( QChar( QDir::separator() ) ) ); + TQString projectDir = projectDirectory(); + TQStringList files = recursiveProFind( projectDir, projectDir + TQString( TQChar( TQDir::separator() ) ) ); return sourceList + files; } diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index 3e571e85..945fb10a 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -16,10 +16,10 @@ #ifndef _TROLLPROJECTPART_H_ #define _TROLLPROJECTPART_H_ -#include -#include -#include -#include +#include +#include +#include +#include #include "kdevbuildtool.h" @@ -33,7 +33,7 @@ class TrollProjectPart : public KDevBuildTool Q_OBJECT public: - TrollProjectPart( QObject *parent, const char *name, const QStringList &args ); + TrollProjectPart( TQObject *parent, const char *name, const TQStringList &args ); ~TrollProjectPart(); bool isTMakeProject() const { return m_tmakeProject; } @@ -41,26 +41,26 @@ public: bool isDirty(); KDirWatch* dirWatch(); virtual Options options() const; - QStringList distFiles() const; - inline QString qmakePath() const { return DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "");; } + TQStringList distFiles() const; + inline TQString qmakePath() const { return DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "");; } protected: - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString mainProgram() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual void addFile(const QString &fileName); - virtual void addFiles ( const QStringList &fileList ); - virtual void removeFile(const QString &fileName); - virtual void removeFiles ( const QStringList &fileList ); - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString mainProgram() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual void addFile(const TQString &fileName); + virtual void addFiles ( const TQStringList &fileList ); + virtual void removeFile(const TQString &fileName); + virtual void removeFiles ( const TQStringList &fileList ); + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; private slots: @@ -68,31 +68,31 @@ private slots: void slotBuild(); // void slotClean(); // void slotExecute(); - void slotCommandFinished( const QString& command ); + void slotCommandFinished( const TQString& command ); void slotBuildAndExecuteProject(); void slotBuildAndExecuteTarget(); private: -// void startMakeCommand(const QString &dir, const QString &target); - void startQMakeCommand(const QString &dir, bool recursive = false ); -// void execute(const QString &directory, const QString &command); - void queueCmd(const QString &dir, const QString &cmd); - QString makeEnvironment(); - - QString findQtDir(); - QString findExecutable( const QString& path ) const; - void buildBinDirs( QStringList& ) const; - bool isValidQtDir( const QString& path ) const; - bool isExecutable( const QString& path ) const; - - QGuardedPtr m_widget; - QString m_projectName; +// void startMakeCommand(const TQString &dir, const TQString &target); + void startQMakeCommand(const TQString &dir, bool recursive = false ); +// void execute(const TQString &directory, const TQString &command); + void queueCmd(const TQString &dir, const TQString &cmd); + TQString makeEnvironment(); + + TQString findQtDir(); + TQString findExecutable( const TQString& path ) const; + void buildBinDirs( TQStringList& ) const; + bool isValidQtDir( const TQString& path ) const; + bool isExecutable( const TQString& path ) const; + + TQGuardedPtr m_widget; + TQString m_projectName; bool m_tmakeProject; - QMap m_timestamp; + TQMap m_timestamp; bool m_executeProjectAfterBuild; bool m_executeTargetAfterBuild; - QString m_buildCommand; + TQString m_buildCommand; KDirWatch* m_dirWatch; diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 7668dbd7..087367bd 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -25,29 +25,29 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include @@ -80,105 +80,105 @@ #include TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) - : QVBox( 0, "troll project widget" ), m_shownSubproject( 0 ), m_rootSubproject( 0 ), + : TQVBox( 0, "troll project widget" ), m_shownSubproject( 0 ), m_rootSubproject( 0 ), m_rootScope ( 0 ), m_part ( part ), m_configDlg( 0 ), m_filesCached(false) { - QSplitter * splitter = new QSplitter( Vertical, this ); + TQSplitter * splitter = new TQSplitter( Vertical, this ); ////////////////// // PROJECT VIEW // ////////////////// - overviewContainer = new QVBox( splitter, "Projects" ); + overviewContainer = new TQVBox( splitter, "Projects" ); overviewContainer->setMargin ( 2 ); overviewContainer->setSpacing ( 2 ); - // overviewContainer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); - // splitter->setResizeMode(overviewContainer, QSplitter::FollowSizeHint); + // overviewContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + // splitter->setResizeMode(overviewContainer, TQSplitter::FollowSizeHint); - projectTools = new QHBox( overviewContainer, "Project buttons" ); + projectTools = new TQHBox( overviewContainer, "Project buttons" ); projectTools->setMargin ( 2 ); projectTools->setSpacing ( 2 ); // Add subdir - addSubdirButton = new QToolButton ( projectTools, "Add subproject button" ); + addSubdirButton = new TQToolButton ( projectTools, "Add subproject button" ); addSubdirButton->setPixmap ( SmallIcon ( "folder_new" ) ); - addSubdirButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); + addSubdirButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); addSubdirButton->setEnabled ( true ); - QToolTip::add( addSubdirButton, i18n( "Add subproject" ) ); - QWhatsThis::add( addSubdirButton, i18n( "Add subproject

Creates a new or adds an existing subproject to a currently selected subproject. " + TQToolTip::add( addSubdirButton, i18n( "Add subproject" ) ); + TQWhatsThis::add( addSubdirButton, i18n( "Add subproject

Creates a new or adds an existing 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 Subproject Settings dialog (open it from the subproject context menu)." ) ); // Create scope - createScopeButton = new QToolButton ( projectTools, "Create scope button" ); + createScopeButton = new TQToolButton ( projectTools, "Create scope button" ); createScopeButton->setPixmap ( SmallIcon ( "qmake_scopenew" ) ); - createScopeButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) ); + createScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) ); createScopeButton->setEnabled ( true ); - QToolTip::add( createScopeButton, i18n( "Create scope" ) ); - QWhatsThis::add( createScopeButton, i18n( "Create scope

Creates QMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) ); + TQToolTip::add( createScopeButton, i18n( "Create scope" ) ); + TQWhatsThis::add( createScopeButton, i18n( "Create scope

Creates QMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) ); // build - buildProjectButton = new QToolButton ( projectTools, "Make button" ); + buildProjectButton = new TQToolButton ( projectTools, "Make button" ); buildProjectButton->setPixmap ( SmallIcon ( "make_kdevelop" ) ); - buildProjectButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) ); + buildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) ); buildProjectButton->setEnabled ( true ); - QToolTip::add( buildProjectButton, i18n( "Build project" ) ); - QWhatsThis::add( buildProjectButton, i18n( "Build project

Runs make from the project directory.
" + TQToolTip::add( buildProjectButton, i18n( "Build project" ) ); + TQWhatsThis::add( buildProjectButton, i18n( "Build project

Runs make from the project directory.
" "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab." ) ); // rebuild - rebuildProjectButton = new QToolButton ( projectTools, "Rebuild button" ); + rebuildProjectButton = new TQToolButton ( projectTools, "Rebuild button" ); rebuildProjectButton->setPixmap ( SmallIcon ( "rebuild" ) ); - rebuildProjectButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) ); + rebuildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) ); rebuildProjectButton->setEnabled ( true ); - QToolTip::add( rebuildProjectButton, i18n( "Rebuild project" ) ); - QWhatsThis::add( rebuildProjectButton, i18n( "Rebuild project

Runs make clean and then make from the project directory.
" + TQToolTip::add( rebuildProjectButton, i18n( "Rebuild project" ) ); + TQWhatsThis::add( rebuildProjectButton, i18n( "Rebuild project

Runs make clean and then make from the project directory.
" "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab." ) ); // run - executeProjectButton = new QToolButton ( projectTools, "Run button" ); + executeProjectButton = new TQToolButton ( projectTools, "Run button" ); executeProjectButton->setPixmap ( SmallIcon ( "exec" ) ); - executeProjectButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) ); + executeProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) ); executeProjectButton->setEnabled ( true ); - QToolTip::add( executeProjectButton, i18n( "Execute main program" ) ); - QWhatsThis::add( executeProjectButton, i18n( "Execute main program

Executes the main program specified in project settings, Run Options tab." ) ); + TQToolTip::add( executeProjectButton, i18n( "Execute main program" ) ); + TQWhatsThis::add( executeProjectButton, i18n( "Execute main program

Executes the main program specified in project settings, Run Options tab." ) ); // spacer - QWidget *spacer = new QWidget( projectTools ); + TQWidget *spacer = new TQWidget( projectTools ); projectTools->setStretchFactor( spacer, 1 ); // Project configuration - projectconfButton = new QToolButton ( projectTools, "Project configuration button" ); + projectconfButton = new TQToolButton ( projectTools, "Project configuration button" ); projectconfButton->setPixmap ( SmallIcon ( "configure" ) ); - projectconfButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) ); + projectconfButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) ); projectconfButton->setEnabled ( true ); - QToolTip::add( projectconfButton, i18n( "Subproject settings" ) ); - QWhatsThis::add( projectconfButton, i18n( "Subproject settings

Opens QMake Subproject Configuration dialog for the currently selected subproject. " + TQToolTip::add( projectconfButton, i18n( "Subproject settings" ) ); + TQWhatsThis::add( projectconfButton, i18n( "Subproject settings

Opens QMake Subproject Configuration dialog for the currently selected subproject. " "It provides settings for:
subproject type and configuration,
include and library paths,
lists of dependencies and " "external libraries,
build order,
intermediate files locations,
compiler options." ) ); // Project button connections - connect ( addSubdirButton, SIGNAL ( clicked () ), this, SLOT ( slotAddSubproject () ) ); - connect ( createScopeButton, SIGNAL ( clicked () ), this, SLOT ( slotCreateScope () ) ); + connect ( addSubdirButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSubproject () ) ); + connect ( createScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotCreateScope () ) ); - connect ( buildProjectButton, SIGNAL ( clicked () ), this, SLOT ( slotBuildProject () ) ); - connect ( rebuildProjectButton, SIGNAL ( clicked () ), this, SLOT ( slotRebuildProject () ) ); - connect ( executeProjectButton, SIGNAL ( clicked () ), m_part, SLOT ( slotBuildAndExecuteProject () ) ); + connect ( buildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildProject () ) ); + connect ( rebuildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildProject () ) ); + connect ( executeProjectButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteProject () ) ); - connect ( projectconfButton, SIGNAL ( clicked () ), this, SLOT ( slotConfigureProject () ) ); + connect ( projectconfButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotConfigureProject () ) ); // Project tree overview = new TrollListView( this, overviewContainer, SubprojectView, "project overview widget" ); -// overview->setResizeMode( QListView::LastColumn ); +// overview->setResizeMode( TQListView::LastColumn ); overview->setSorting( -1 ); overview->header() ->hide(); - overview->addColumn( QString::null ); + overview->addColumn( TQString::null ); // Project tree connections - connect( overview, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotOverviewSelectionChanged( QListViewItem* ) ) ); - connect( overview, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotOverviewContextMenu( KListView*, QListViewItem*, const QPoint& ) ) ); + connect( overview, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); + connect( overview, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotOverviewContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); ///////////////// @@ -186,128 +186,128 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) ///////////////// // Details tree - detailContainer = new QVBox( splitter, "Details" ); + detailContainer = new TQVBox( splitter, "Details" ); detailContainer->setMargin ( 2 ); detailContainer->setSpacing ( 2 ); - // detailContainer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + // detailContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); // Details Toolbar - fileTools = new QHBox( detailContainer, "Detail buttons" ); + fileTools = new TQHBox( detailContainer, "Detail buttons" ); fileTools->setMargin ( 2 ); fileTools->setSpacing ( 2 ); // Add new file button - newfileButton = new QToolButton ( fileTools, "Create new file" ); + newfileButton = new TQToolButton ( fileTools, "Create new file" ); newfileButton->setPixmap ( SmallIcon ( "filenew" ) ); - newfileButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); + newfileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); newfileButton->setEnabled ( true ); - QToolTip::add( newfileButton, i18n( "Create new file" ) ); - QWhatsThis::add( newfileButton, i18n( "Create new file

Creates a new file and adds it to a currently selected group." ) ); + TQToolTip::add( newfileButton, i18n( "Create new file" ) ); + TQWhatsThis::add( newfileButton, i18n( "Create new file

Creates a new file and adds it to a currently selected group." ) ); // Add existing files button - addfilesButton = new QToolButton ( fileTools, "Add existing files" ); + addfilesButton = new TQToolButton ( fileTools, "Add existing files" ); addfilesButton->setPixmap ( SmallIcon ( "fileimport" ) ); - addfilesButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) ); + addfilesButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) ); addfilesButton->setEnabled ( true ); - QToolTip::add( addfilesButton, i18n( "Add existing files" ) ); - QWhatsThis::add( addfilesButton, i18n( "Add existing files

Adds existing files to a currently selected group. It is " + TQToolTip::add( addfilesButton, i18n( "Add existing files" ) ); + TQWhatsThis::add( addfilesButton, i18n( "Add existing files

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." ) ); // remove file button - removefileButton = new QToolButton ( fileTools, "Remove file" ); + removefileButton = new TQToolButton ( fileTools, "Remove file" ); removefileButton->setPixmap ( SmallIcon ( "button_cancel" ) ); - removefileButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) ); + removefileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) ); removefileButton->setEnabled ( true ); - QToolTip::add( removefileButton, i18n( "Remove file" ) ); - QWhatsThis::add( removefileButton, i18n( "Remove file

Removes file from a current group. Does not remove file from disk." ) ); + TQToolTip::add( removefileButton, i18n( "Remove file" ) ); + TQWhatsThis::add( removefileButton, i18n( "Remove file

Removes file from a current group. Does not remove file from disk." ) ); // build selected file - buildFileButton = new QToolButton ( fileTools, "Make file button" ); + buildFileButton = new TQToolButton ( fileTools, "Make file button" ); buildFileButton->setPixmap ( SmallIcon ( "compfile" ) ); - buildFileButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) ); + buildFileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) ); buildFileButton->setEnabled ( true ); - QToolTip::add( buildFileButton, i18n( "Compile file" ) ); - QWhatsThis::add( buildFileButton, i18n( "Compile file

Runs make filename.o command from the directory where 'filename' is the name of currently opened file.
" + TQToolTip::add( buildFileButton, i18n( "Compile file" ) ); + TQWhatsThis::add( buildFileButton, i18n( "Compile file

Runs make filename.o command from the directory where 'filename' is the name of currently opened file.
" "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab." ) ); // build - buildTargetButton = new QToolButton ( fileTools, "Make sp button" ); + buildTargetButton = new TQToolButton ( fileTools, "Make sp button" ); buildTargetButton->setPixmap ( SmallIcon ( "make_kdevelop" ) ); - buildTargetButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) ); + buildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) ); buildTargetButton->setEnabled ( true ); - QToolTip::add( buildTargetButton, i18n( "Build subproject" ) ); - QWhatsThis::add( buildTargetButton, i18n( "Build subproject

Runs make from the current subproject directory. " + TQToolTip::add( buildTargetButton, i18n( "Build subproject" ) ); + TQWhatsThis::add( buildTargetButton, i18n( "Build subproject

Runs make from the current subproject directory. " "Current subproject is a subproject selected in QMake manager 'overview' window.
" "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab." ) ); // rebuild - rebuildTargetButton = new QToolButton ( fileTools, "Rebuild sp button" ); + rebuildTargetButton = new TQToolButton ( fileTools, "Rebuild sp button" ); rebuildTargetButton->setPixmap ( SmallIcon ( "rebuild" ) ); - rebuildTargetButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) ); + rebuildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) ); rebuildTargetButton->setEnabled ( true ); - QToolTip::add( rebuildTargetButton, i18n( "Rebuild subproject" ) ); - QWhatsThis::add( rebuildTargetButton, i18n( "Rebuild subproject

Runs make clean and then make from the current subproject directory. " + TQToolTip::add( rebuildTargetButton, i18n( "Rebuild subproject" ) ); + TQWhatsThis::add( rebuildTargetButton, i18n( "Rebuild subproject

Runs make clean and then make from the current subproject directory. " "Current subproject is a subproject selected in QMake manager 'overview' window.
" "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab." ) ); // run - executeTargetButton = new QToolButton ( fileTools, "Run sp button" ); + executeTargetButton = new TQToolButton ( fileTools, "Run sp button" ); executeTargetButton->setPixmap ( SmallIcon ( "exec" ) ); - executeTargetButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) ); + executeTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) ); executeTargetButton->setEnabled ( true ); - QToolTip::add( executeTargetButton, i18n( "Execute subproject" ) ); - QWhatsThis::add( executeTargetButton, i18n( "Execute subproject

Executes the target program for the currently selected subproject. " + TQToolTip::add( executeTargetButton, i18n( "Execute subproject" ) ); + TQWhatsThis::add( executeTargetButton, i18n( "Execute subproject

Executes the target program for the currently selected subproject. " "This action is allowed only if a type of the subproject is 'application'. The type of the subproject can be " "defined in Subproject Settings dialog (open it from the subproject context menu)." ) ); // spacer - spacer = new QWidget( fileTools ); + spacer = new TQWidget( fileTools ); projectTools->setStretchFactor( spacer, 1 ); // Configure file button - excludeFileFromScopeButton = new QToolButton ( fileTools, "Exclude file" ); + excludeFileFromScopeButton = new TQToolButton ( fileTools, "Exclude file" ); excludeFileFromScopeButton->setPixmap ( SmallIcon ( "configure_file" ) ); - excludeFileFromScopeButton->setSizePolicy ( QSizePolicy ( ( QSizePolicy::SizeType ) 0, ( QSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) ); + excludeFileFromScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) ); excludeFileFromScopeButton->setEnabled ( true ); - QToolTip::add( excludeFileFromScopeButton , i18n( "Exclude file" ) ); - QWhatsThis::add( excludeFileFromScopeButton , i18n( "Exclude file

Exclude the selected file from this scope." ) ); + TQToolTip::add( excludeFileFromScopeButton , i18n( "Exclude file" ) ); + TQWhatsThis::add( excludeFileFromScopeButton , i18n( "Exclude file

Exclude the selected file from this scope." ) ); // detail tree details = new TrollListView( this, detailContainer, DetailsView, "details widget" ); details->setRootIsDecorated( true ); - details->setResizeMode( QListView::LastColumn ); + details->setResizeMode( TQListView::LastColumn ); details->setSorting( -1 ); details->header() ->hide(); - details->addColumn( QString::null ); + details->addColumn( TQString::null ); // Detail button connections - connect ( addfilesButton, SIGNAL ( clicked () ), this, SLOT ( slotAddFiles () ) ); - connect ( newfileButton, SIGNAL ( clicked () ), this, SLOT ( slotNewFile () ) ); - connect ( removefileButton, SIGNAL ( clicked () ), this, SLOT ( slotRemoveFile () ) ); - connect ( buildFileButton, SIGNAL ( clicked () ), this, SLOT ( slotBuildSelectedFile () ) ); - connect ( excludeFileFromScopeButton, SIGNAL ( clicked () ), this, SLOT ( slotExcludeFileFromScopeButton() ) ); + connect ( addfilesButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddFiles () ) ); + connect ( newfileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotNewFile () ) ); + connect ( removefileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveFile () ) ); + connect ( buildFileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildSelectedFile () ) ); + connect ( excludeFileFromScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotExcludeFileFromScopeButton() ) ); // Detail tree connections - connect( details, SIGNAL( selectionChanged( QListViewItem* ) ), - this, SLOT( slotDetailsSelectionChanged( QListViewItem* ) ) ); - connect( details, SIGNAL( executed( QListViewItem* ) ), - this, SLOT( slotDetailsExecuted( QListViewItem* ) ) ); - connect( details, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotDetailsContextMenu( KListView*, QListViewItem*, const QPoint& ) ) ); - - connect ( buildTargetButton, SIGNAL ( clicked () ), this, SLOT ( slotBuildTarget () ) ); - connect ( rebuildTargetButton, SIGNAL ( clicked () ), this, SLOT ( slotRebuildTarget () ) ); - connect ( executeTargetButton, SIGNAL ( clicked () ), m_part, SLOT ( slotBuildAndExecuteTarget () ) ); + connect( details, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQT_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); + connect( details, TQT_SIGNAL( executed( TQListViewItem* ) ), + this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( details, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotDetailsContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + + connect ( buildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildTarget () ) ); + connect ( rebuildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildTarget () ) ); + connect ( executeTargetButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteTarget () ) ); buildTargetButton->setEnabled( false ); rebuildTargetButton->setEnabled( false ); executeTargetButton->setEnabled( false ); m_configDlg = new ProjectConfigurationDlg( overview, this, this ); - connect( m_part->dirWatch(), SIGNAL( dirty(const QString&) ), this, SLOT( slotProjectDirty(const QString&) ) ); + connect( m_part->dirWatch(), TQT_SIGNAL( dirty(const TQString&) ), this, TQT_SLOT( slotProjectDirty(const TQString&) ) ); } @@ -317,28 +317,28 @@ TrollProjectWidget::~TrollProjectWidget() } -void TrollProjectWidget::openProject( const QString &dirName ) +void TrollProjectWidget::openProject( const TQString &dirName ) { - QDomDocument & dom = *( m_part->projectDom() ); + TQDomDocument & dom = *( m_part->projectDom() ); m_subclasslist = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , "subclass", "sourcefile", "uifile" ); - QString projectfile = DomUtil::readEntry( dom, "/kdevtrollproject/qmake/projectfile", "" ); + TQString projectfile = DomUtil::readEntry( dom, "/kdevtrollproject/qmake/projectfile", "" ); m_showFilenamesOnly = DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/enableFilenamesOnly", false ); m_showVariablesInTree = DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/showVariablesInTree", true ); - QString proname; + TQString proname; if( projectfile.isEmpty() ) { - QFileInfo fi( dirName ); - QDir dir( dirName ); - // QString proname = item->path + "/" + fi.baseName() + ".pro"; + TQFileInfo fi( dirName ); + TQDir dir( dirName ); + // TQString proname = item->path + "/" + fi.baseName() + ".pro"; - QStringList l = dir.entryList( "*.pro" ); + TQStringList l = dir.entryList( "*.pro" ); - QString profile; + TQString profile; if( l.count() && l.findIndex( m_part->projectName() + ".pro") != -1 ) profile = m_part->projectName()+".pro"; else if( l.isEmpty() || ( l.count() && l.findIndex( fi.baseName() + ".pro") != -1 ) ) @@ -346,7 +346,7 @@ void TrollProjectWidget::openProject( const QString &dirName ) else profile = l[0]; - proname = dirName + QString( QChar( QDir::separator() ) ) + profile; + proname = dirName + TQString( TQChar( TQDir::separator() ) ) + profile; } else { proname = projectfile; @@ -393,10 +393,10 @@ void TrollProjectWidget::closeProject() delete m_rootScope; } -QStringList TrollProjectWidget::allFiles() +TQStringList TrollProjectWidget::allFiles() { if( !m_rootScope ) - return QStringList(); + return TQStringList(); if( m_filesCached ) return m_allFilesCache; m_allFilesCache = m_rootScope->allFiles( m_rootScope->projectDir() ); @@ -404,19 +404,19 @@ QStringList TrollProjectWidget::allFiles() return m_allFilesCache; } -QString TrollProjectWidget::projectDirectory() +TQString TrollProjectWidget::projectDirectory() { if ( !m_rootScope ) - return QString::null; //confused + return TQString::null; //confused return m_rootScope->projectDir(); } -QString TrollProjectWidget::subprojectDirectory() +TQString TrollProjectWidget::subprojectDirectory() { if ( !m_shownSubproject ) - return QString::null; + return TQString::null; return m_shownSubproject->scope->projectDir(); } @@ -431,7 +431,7 @@ void TrollProjectWidget::setupContext() bool hasSourceFiles = true; bool hasSubdirs = false; - QStringList tmpl = m_shownSubproject->scope->variableValues( "TEMPLATE" ); + TQStringList tmpl = m_shownSubproject->scope->variableValues( "TEMPLATE" ); if ( tmpl.findIndex( "lib" ) != -1 ) { @@ -471,9 +471,9 @@ void TrollProjectWidget::setupContext() details->setEnabled( hasSourceFiles ); } -void TrollProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) +void TrollProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item ) { - QString olddir = m_part->activeDirectory(); + TQString olddir = m_part->activeDirectory(); if ( !item ) { kdDebug(9024) << "Trying to select a non-existing item" << endl; @@ -484,7 +484,7 @@ void TrollProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) setupContext(); buildProjectDetailTree( m_shownSubproject, details ); - QDomDocument &dom = *( m_part->projectDom() ); + TQDomDocument &dom = *( m_part->projectDom() ); DomUtil::writeEntry( dom, "/kdevtrollproject/general/activedir", m_shownSubproject->relativePath() ); if ( m_configDlg && m_configDlg->isShown() ) { @@ -493,33 +493,33 @@ void TrollProjectWidget::slotOverviewSelectionChanged( QListViewItem *item ) emit m_part->activeDirectoryChanged( olddir, m_part->activeDirectory() ); } -QString TrollProjectWidget::getCurrentTarget() +TQString TrollProjectWidget::getCurrentTarget() { if ( !m_shownSubproject ) return ""; - QString destdir = getCurrentDestDir(); + TQString destdir = getCurrentDestDir(); if ( destdir.isEmpty() ) return getCurrentOutputFilename(); else - return destdir + QString( QChar( QDir::separator() ) ) + getCurrentOutputFilename(); + return destdir + TQString( TQChar( TQDir::separator() ) ) + getCurrentOutputFilename(); } -QString TrollProjectWidget::getCurrentDestDir() +TQString TrollProjectWidget::getCurrentDestDir() { if ( !m_shownSubproject ) return ""; - QStringList destdir = m_shownSubproject->scope->variableValues( "DESTDIR", true, true, true ); + TQStringList destdir = m_shownSubproject->scope->variableValues( "DESTDIR", true, true, true ); return m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->variableValues( "DESTDIR", true, true, true ).front()); } -QString TrollProjectWidget::getCurrentOutputFilename() +TQString TrollProjectWidget::getCurrentOutputFilename() { if ( !m_shownSubproject ) return ""; if ( m_shownSubproject->scope->variableValues( "TARGET", true, true, true ).isEmpty() ) { - QString exe = m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->fileName()); - return exe.replace( QRegExp( "\\.pro$" ), "" ); + TQString exe = m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->fileName()); + return exe.replace( TQRegExp( "\\.pro$" ), "" ); } else { @@ -533,14 +533,14 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) // it is a subdir template if ( item && details->childCount() ) { - QListViewItem* i = details->firstChild(); + TQListViewItem* i = details->firstChild(); while( i ) { - QListViewItem* old = i; + TQListViewItem* old = i; i = i->nextSibling(); details->takeItem(old); } -// QMapIterator it1 = item->groups.begin() ; +// TQMapIterator it1 = item->groups.begin() ; // for ( ; it1 != item->groups.end(); ++it1 ) // { // // After AddTargetDialog, it can happen that an @@ -560,8 +560,8 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) return ; - QMapIterator it2 = item->groups.begin(); - QListViewItem* lastItem = 0; + TQMapIterator it2 = item->groups.begin(); + TQListViewItem* lastItem = 0; for ( ; it2 != item->groups.end(); ++it2 ) { listviewControl->insertItem( it2.data() ); @@ -570,16 +570,16 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView lastItem = it2.data(); if ( it2.key() == GroupItem::InstallRoot ) { - QListViewItem* lastinstallitem = 0; - QPtrListIterator it3( it2.data() ->installs ); + TQListViewItem* lastinstallitem = 0; + TQPtrListIterator it3( it2.data() ->installs ); for ( ; it3.current(); ++it3 ) { it2.data() ->insertItem( *it3 ); if ( lastinstallitem ) it3.current()->moveItem(lastinstallitem); lastinstallitem = it3.current(); - QPtrListIterator it4( ( *it3 ) ->files ); - QListViewItem* lastfileitem = 0; + TQPtrListIterator it4( ( *it3 ) ->files ); + TQListViewItem* lastfileitem = 0; for ( ; it4.current(); ++it4 ) { ( *it3 ) ->insertItem( *it4 ); @@ -595,8 +595,8 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView } else { - QPtrListIterator it3( it2.data() ->files ); - QListViewItem* lastfileitem = 0; + TQPtrListIterator it3( it2.data() ->files ); + TQListViewItem* lastfileitem = 0; for ( ; it3.current(); ++it3 ) { it2.data() ->insertItem( *it3 ); @@ -612,7 +612,7 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView listviewControl->setCurrentItem( 0 ); } -void TrollProjectWidget::slotDetailsExecuted( QListViewItem *item ) +void TrollProjectWidget::slotDetailsExecuted( TQListViewItem *item ) { if ( !item ) return ; @@ -625,7 +625,7 @@ void TrollProjectWidget::slotDetailsExecuted( QListViewItem *item ) FileItem *fitem = static_cast( pvitem ); - QString filePath; + TQString filePath; if( m_shownSubproject->scope->scopeType() == Scope::IncludeScope ) { filePath = m_shownSubproject->scope->parent()->projectDir(); @@ -633,9 +633,9 @@ void TrollProjectWidget::slotDetailsExecuted( QListViewItem *item ) { filePath = m_shownSubproject->scope->projectDir(); } - filePath += QChar( QDir::separator() ) + m_shownSubproject->scope->resolveVariables( fitem->localFilePath ); + filePath += TQChar( TQDir::separator() ) + m_shownSubproject->scope->resolveVariables( fitem->localFilePath ); - bool isUiFile = QFileInfo( fitem->text( 0 ) ).extension() == "ui"; + bool isUiFile = TQFileInfo( fitem->text( 0 ) ).extension() == "ui"; kdDebug(9024) << "Opening file: " << filePath << endl; if ( isTMakeProject() && isUiFile ) { @@ -686,10 +686,10 @@ void TrollProjectWidget::slotExecuteTarget() } - QString program = KProcess::quote( "." + QString( QChar( QDir::separator() ) ) + getCurrentOutputFilename() ); + TQString program = KProcess::quote( "." + TQString( TQChar( TQDir::separator() ) ) + getCurrentOutputFilename() ); // Build environment variables to prepend to the executable path - QString runEnvVars = QString::null; + TQString runEnvVars = TQString::null; DomUtil::PairList list = DomUtil::readPairListEntry( *( m_part->projectDom() ), "/kdevtrollproject/run/envvars", "envvar", "name", "value" ); @@ -709,7 +709,7 @@ void TrollProjectWidget::slotExecuteTarget() bool inTerminal = DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/run/terminal" ); - m_part->appFrontend() ->startAppCommand( subprojectDirectory() + QString( QChar( QDir::separator() ) ) + getCurrentDestDir(), program, inTerminal ); + m_part->appFrontend() ->startAppCommand( subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + getCurrentDestDir(), program, inTerminal ); } @@ -718,7 +718,7 @@ void TrollProjectWidget::slotBuildProject() if ( m_part->partController() ->saveAllFiles() == false ) return ; //user cancelled - QString dir = projectDirectory(); + TQString dir = projectDirectory(); if ( !m_rootSubproject ) return ; @@ -726,8 +726,8 @@ void TrollProjectWidget::slotBuildProject() createMakefileIfMissing( dir, m_rootSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ); + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ); m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -736,7 +736,7 @@ void TrollProjectWidget::slotInstallProject() if ( m_part->partController() ->saveAllFiles() == false ) return ; //user cancelled - QString dir = projectDirectory(); + TQString dir = projectDirectory(); if ( !m_rootSubproject ) return ; @@ -744,8 +744,8 @@ void TrollProjectWidget::slotInstallProject() createMakefileIfMissing( dir, m_rootSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " install"; + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " install"; m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -758,12 +758,12 @@ void TrollProjectWidget::slotBuildTarget() // can't build from scope if ( m_shownSubproject->scope->scopeType() != Scope::ProjectScope ) return ; - QString dir = subprojectDirectory(); + TQString dir = subprojectDirectory(); createMakefileIfMissing( dir, m_shownSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ); + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ); m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -776,19 +776,19 @@ void TrollProjectWidget::slotInstallTarget() // can't build from scope if ( m_shownSubproject->scope->scopeType() != Scope::ProjectScope ) return ; - QString dir = subprojectDirectory(); + TQString dir = subprojectDirectory(); createMakefileIfMissing( dir, m_shownSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " install"; + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " install"; m_part->queueCmd( dir, dircmd + buildcmd ); } void TrollProjectWidget::slotRebuildProject() { m_part->partController() ->saveAllFiles(); - QString dir = this-> projectDirectory(); + TQString dir = this-> projectDirectory(); if ( !m_rootSubproject ) return ; @@ -796,8 +796,8 @@ void TrollProjectWidget::slotRebuildProject() createMakefileIfMissing( dir, m_rootSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString rebuildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " clean && " + constructMakeCommandLine( m_rootSubproject->scope ); + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString rebuildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " clean && " + constructMakeCommandLine( m_rootSubproject->scope ); m_part->queueCmd( dir, dircmd + rebuildcmd ); } @@ -811,12 +811,12 @@ void TrollProjectWidget::slotRebuildTarget() if ( m_shownSubproject->scope->scopeType() != Scope::ProjectScope ) return ; - QString dir = subprojectDirectory(); + TQString dir = subprojectDirectory(); createMakefileIfMissing( dir, m_shownSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString rebuildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " clean && " + constructMakeCommandLine( m_shownSubproject->scope ); + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString rebuildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " clean && " + constructMakeCommandLine( m_shownSubproject->scope ); m_part->queueCmd( dir, dircmd + rebuildcmd ); } @@ -827,7 +827,7 @@ void TrollProjectWidget::slotCreateScope( QMakeScopeItem *spitem ) else spitem = m_shownSubproject; CreateScopeDlg dlg( spitem, this ); - if ( dlg.exec() == QDialog::Accepted ) + if ( dlg.exec() == TQDialog::Accepted ) { spitem->scope->saveToFile( ); spitem->sortChildItems( 0, true ); @@ -845,31 +845,31 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem ) m_filesCached = false; m_allFilesCache.clear(); - QString projectdir = spitem->scope->projectDir(); + TQString projectdir = spitem->scope->projectDir(); KURLRequesterDlg dialog( i18n( "Add Subproject" ), i18n( "Please enter a name for the subproject: " ), this, 0 ); KURLRequester* req = dialog.urlRequester(); req->setMode( KFile::Directory | KFile::File | KFile::LocalOnly ); req->setFilter( "*.pro|QMake Project Files (*.pro)" ); - req->setURL( QString() ); + req->setURL( TQString() ); req->fileDialog()->setURL( KURL::fromPathOrURL( projectdir ) ); req->completionObject() ->setDir( projectdir ); - if ( dialog.exec() == QDialog::Accepted && !dialog.urlRequester() ->url().isEmpty() ) + if ( dialog.exec() == TQDialog::Accepted && !dialog.urlRequester() ->url().isEmpty() ) { - QString subdirname; - if ( !QDir::isRelativePath( dialog.urlRequester() ->url() ) ) + TQString subdirname; + if ( !TQDir::isRelativePath( dialog.urlRequester() ->url() ) ) subdirname = URLUtil::getRelativePath( projectdir, dialog.urlRequester()->url() ); else subdirname = dialog.urlRequester()->url(); - while( subdirname.endsWith( QString(QChar(QDir::separator())) ) ) + while( subdirname.endsWith( TQString(TQChar(TQDir::separator())) ) ) subdirname = subdirname.left(subdirname.length()-1); if( !subdirname.endsWith(".pro") ) { kdDebug(9024) << "Cleaned subdirname: " << subdirname << endl; - QDir dir( projectdir ); - QString realdir = spitem->scope->resolveVariables( subdirname ); + TQDir dir( projectdir ); + TQString realdir = spitem->scope->resolveVariables( subdirname ); if ( !dir.exists( realdir ) ) { if ( !dir.mkdir( realdir ) ) @@ -880,15 +880,15 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem ) return ; }else { - QFile f( dir.absPath()+"/"+realdir+"/"+realdir+".pro" ); + TQFile f( dir.absPath()+"/"+realdir+"/"+realdir+".pro" ); f.open( IO_WriteOnly ); f.close(); } } }else { - QString realdir = spitem->scope->resolveVariables( subdirname ); - QFile f( projectdir+"/"+realdir ); + TQString realdir = spitem->scope->resolveVariables( subdirname ); + TQFile f( projectdir+"/"+realdir ); f.open( IO_WriteOnly ); f.close(); } @@ -898,9 +898,9 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem ) } } -void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const QString& subdirname ) +void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQString& subdirname ) { - QListViewItem* item = spitem->firstChild(); + TQListViewItem* item = spitem->firstChild(); while( item ) { QMakeScopeItem* sitem = static_cast(item); @@ -924,7 +924,7 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const QStr if( subproject ) { new QMakeScopeItem( spitem, subproject->scopeName(), subproject ); -// QListViewItem* lastitem = spitem->firstChild(); +// TQListViewItem* lastitem = spitem->firstChild(); // while( lastitem->nextSibling() != 0 ) // lastitem = lastitem->nextSibling(); // newitem->moveItem( lastitem ); @@ -966,7 +966,7 @@ void TrollProjectWidget::slotRemoveSubproject( QMakeScopeItem *spitem ) } } -void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; @@ -1066,7 +1066,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *it int r = popup.exec( p ); - QString relpath = spitem->relativePath(); + TQString relpath = spitem->relativePath(); if ( r == idAddSubproject ) { slotAddSubproject( spitem ); @@ -1090,12 +1090,12 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *it else if ( r == idBuild ) { slotBuildTarget(); - // m_part->startMakeCommand(projectDirectory() + relpath, QString::fromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); } else if ( r == idInstall ) { slotInstallTarget(); - // m_part->startMakeCommand(projectDirectory() + relpath, QString::fromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); } else if ( r == idRebuild ) { @@ -1112,7 +1112,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *it else if ( r == idQmake ) { - m_part->startQMakeCommand( projectDirectory() + QString(QChar(QDir::separator())) + relpath ); + m_part->startQMakeCommand( projectDirectory() + TQString(TQChar(TQDir::separator())) + relpath ); } else if ( r == idQmakeRecursive ) { @@ -1126,7 +1126,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, QListViewItem *it } } -void TrollProjectWidget::addFileToCurrentSubProject( GroupItem *titem, const QString &filename ) +void TrollProjectWidget::addFileToCurrentSubProject( GroupItem *titem, const TQString &filename ) { m_filesCached = false; @@ -1134,7 +1134,7 @@ void TrollProjectWidget::addFileToCurrentSubProject( GroupItem *titem, const QSt titem->addFileToScope( filename ); } -void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype, const QString &filename ) +void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype, const TQString &filename ) { if ( !m_shownSubproject ) return ; @@ -1157,7 +1157,7 @@ void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype, * Method adds a file to the current project by grouped * by file extension */ -void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoot ) +void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRoot ) { if ( !m_shownSubproject ) return ; @@ -1165,22 +1165,22 @@ void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoo m_filesCached = false; m_allFilesCache.clear(); - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) { - QString fileName = *it; + TQString fileName = *it; kdDebug(9024) << "Adding file:" << fileName << " " << relativeToProjectRoot << endl; if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") ) { ChooseSubprojectDlg dlg( this, false ); - if ( dlg.exec() == QDialog::Accepted ) + if ( dlg.exec() == TQDialog::Accepted ) { if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { fileName = URLUtil::getRelativePath( dlg.selectedSubproject()->scope->projectDir() , - QDir::cleanDirPath( + TQDir::cleanDirPath( m_shownSubproject->scope->projectDir()+ - QString(QChar(QDir::separator()))+ + TQString(TQChar(TQDir::separator()))+ fileName ) ); overview->setCurrentItem( dlg.selectedSubproject() ); @@ -1192,21 +1192,21 @@ void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoo } } - QFileInfo info( fileName ); - QString ext = info.extension( false ).simplifyWhiteSpace(); + TQFileInfo info( fileName ); + TQString ext = info.extension( false ).simplifyWhiteSpace(); - QString noPathFileName; + TQString noPathFileName; if( relativeToProjectRoot ) - noPathFileName = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), QDir::cleanDirPath(projectDirectory()+QString(QChar(QDir::separator()))+fileName ) ); + noPathFileName = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), TQDir::cleanDirPath(projectDirectory()+TQString(TQChar(TQDir::separator()))+fileName ) ); else - noPathFileName = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), QDir::cleanDirPath(m_shownSubproject->scope->projectDir()+QString(QChar(QDir::separator()))+fileName ) ); + noPathFileName = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), TQDir::cleanDirPath(m_shownSubproject->scope->projectDir()+TQString(TQChar(TQDir::separator()))+fileName ) ); if( DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/replacePaths", false ) ) { - QString var = m_shownSubproject->scope->findCustomVarForPath( QFileInfo( noPathFileName ).dirPath() ); + TQString var = m_shownSubproject->scope->findCustomVarForPath( TQFileInfo( noPathFileName ).dirPath() ); if( !var.isEmpty() ) { - noPathFileName = "$${"+var+"}"+QString( QChar( QDir::separator() ) )+QFileInfo( noPathFileName ).fileName(); + noPathFileName = "$${"+var+"}"+TQString( TQChar( TQDir::separator() ) )+TQFileInfo( noPathFileName ).fileName(); } } @@ -1219,16 +1219,16 @@ void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoo if( ext == "pro" ) { - addSubprojectToItem( findSubprojectForPath( QFileInfo( fileName ).dirPath() ), QFileInfo( fileName ).fileName() ); + addSubprojectToItem( findSubprojectForPath( TQFileInfo( fileName ).dirPath() ), TQFileInfo( fileName ).fileName() ); }else { addFileToCurrentSubProject( GroupItem::groupTypeForExtension( ext ), noPathFileName ); slotOverviewSelectionChanged( m_shownSubproject ); kdDebug(9024) << "emitting" << relativeToProjectRoot << " " << fileName << endl; if( relativeToProjectRoot ) - emitAddedFile ( projectDirectory()+QString( QChar( QDir::separator() ) ) + fileName ); + emitAddedFile ( projectDirectory()+TQString( TQChar( TQDir::separator() ) ) + fileName ); else - emitAddedFile ( m_shownSubproject->scope->projectDir()+QString( QChar( QDir::separator() ) ) + fileName ); + emitAddedFile ( m_shownSubproject->scope->projectDir()+TQString( TQChar( TQDir::separator() ) ) + fileName ); } } @@ -1238,9 +1238,9 @@ void TrollProjectWidget::addFiles( QStringList &files, bool relativeToProjectRoo void TrollProjectWidget::slotAddFiles() { static KURL lastVisited; - QString cleanSubprojectDir = QDir::cleanDirPath( m_shownSubproject->scope->projectDir() ); - QString title, filter; - QString otherTitle, otherFilter; + TQString cleanSubprojectDir = TQDir::cleanDirPath( m_shownSubproject->scope->projectDir() ); + TQString title, filter; + TQString otherTitle, otherFilter; GroupItem* item = dynamic_cast( details->selectedItem() ); GroupItem::GroupType type = item ? item->groupType : GroupItem::NoType; @@ -1265,7 +1265,7 @@ void TrollProjectWidget::slotAddFiles() filter, this, "Insert existing files", - true, new QComboBox( false ) ); + true, new TQComboBox( false ) ); dialog->setMode( KFile::Files | KFile::ExistingOnly | KFile::LocalOnly ); @@ -1275,7 +1275,7 @@ void TrollProjectWidget::slotAddFiles() } dialog->exec(); - QStringList files = dialog->selectedFiles(); + TQStringList files = dialog->selectedFiles(); lastVisited = dialog->baseURL(); for ( unsigned int i = 0; i < files.count(); i++ ) @@ -1286,13 +1286,13 @@ void TrollProjectWidget::slotAddFiles() { // Copy selected files to current subproject folder // and add them to the filelist - QString filename = KURL( files[ i ] ).fileName(); - KIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + QString( QChar( QDir::separator() ) ) + filename, -1, false, false, this ); - QFile testExist( cleanSubprojectDir + QString( QChar( QDir::separator() ) ) + filename ); + TQString filename = KURL( files[ i ] ).fileName(); + KIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this ); + TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) { - QStringList files( filename ); + TQStringList files( filename ); addFiles( files, false ); } } @@ -1307,12 +1307,12 @@ void TrollProjectWidget::slotAddFiles() *proc << files[ i ]; *proc << cleanSubprojectDir; proc->start(KProcess::Block); - QString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist - QFile testExist( cleanSubprojectDir + QString( QChar( QDir::separator() ) ) + filename ); + TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) { - QStringList files( filename ); + TQStringList files( filename ); addFiles( files, false ); } } @@ -1321,8 +1321,8 @@ void TrollProjectWidget::slotAddFiles() case AddFilesDialog::Relative: { // Form relative path to current subproject folder - QString theFile = files[ i ]; - QStringList files( URLUtil::relativePathToFile( cleanSubprojectDir , theFile ) + TQString theFile = files[ i ]; + TQStringList files( URLUtil::relativePathToFile( cleanSubprojectDir , theFile ) ); addFiles( files, false ); } @@ -1338,12 +1338,12 @@ GroupItem* TrollProjectWidget::getInstallRoot( QMakeScopeItem* item ) return 0; } -GroupItem* TrollProjectWidget::getInstallObject( QMakeScopeItem* item, const QString& objectname ) +GroupItem* TrollProjectWidget::getInstallObject( QMakeScopeItem* item, const TQString& objectname ) { GroupItem * instroot = getInstallRoot( item ); if ( !instroot ) return 0; - QPtrListIterator it( instroot->installs ); + TQPtrListIterator it( instroot->installs ); for ( ;it.current();++it ) { if ( ( *it ) ->groupType == GroupItem::InstallObject && @@ -1370,13 +1370,13 @@ void TrollProjectWidget::slotNewFile() { if ( gitem->groupType == GroupItem::InstallObject ) { - // QString relpath = m_shownSubproject->path.mid(projectDirectory().length()); + // TQString relpath = m_shownSubproject->path.mid(projectDirectory().length()); bool ok = FALSE; - QString filepattern = KInputDialog::getText( + TQString filepattern = KInputDialog::getText( i18n( "Insert New Filepattern" ), i18n( "Please enter a filepattern relative the current " "subproject (example docs/*.html):" ), - QString::null, &ok, this ); + TQString::null, &ok, this ); if ( ok && !filepattern.isEmpty() ) { addFileToCurrentSubProject( gitem, filepattern ); @@ -1386,12 +1386,12 @@ void TrollProjectWidget::slotNewFile() } if ( gitem->groupType == GroupItem::InstallRoot ) { - // QString relpath = m_shownSubproject->path.mid(projectDirectory().length()); + // TQString relpath = m_shownSubproject->path.mid(projectDirectory().length()); bool ok = FALSE; - QString install_obj = KInputDialog::getText( + TQString install_obj = KInputDialog::getText( i18n( "Insert New Install Object" ), i18n( "Please enter a name for the new object:" ), - QString::null, &ok, this ); + TQString::null, &ok, this ); if ( ok && !install_obj.isEmpty() ) { gitem->addInstallObject( install_obj ); @@ -1404,7 +1404,7 @@ void TrollProjectWidget::slotNewFile() } } KDevCreateFile * createFileSupport = m_part->extension( "KDevelop/CreateFile" ); - QString fcext; + TQString fcext; if( gitem ) { switch ( gitem->groupType ) @@ -1434,16 +1434,16 @@ void TrollProjectWidget::slotNewFile() fcext = "qrc"; break; default: - fcext = QString::null; + fcext = TQString::null; } } KDevCreateFile::CreatedFile crFile = - createFileSupport->createNewFile( fcext, projectDirectory() + QString(QChar(QDir::separator()))+ m_shownSubproject->relativePath() ); + createFileSupport->createNewFile( fcext, projectDirectory() + TQString(TQChar(TQDir::separator()))+ m_shownSubproject->relativePath() ); } void TrollProjectWidget::slotRemoveFile() { - QListViewItem * selectedItem = details->currentItem(); + TQListViewItem * selectedItem = details->currentItem(); if ( !selectedItem ) return ; @@ -1460,7 +1460,7 @@ void TrollProjectWidget::slotRemoveFile() void TrollProjectWidget::slotExcludeFileFromScopeButton() { - QListViewItem * selectedItem = details->currentItem(); + TQListViewItem * selectedItem = details->currentItem(); if ( !selectedItem ) return ; qProjectItem *pvitem = static_cast( selectedItem ); @@ -1474,7 +1474,7 @@ void TrollProjectWidget::slotExcludeFileFromScopeButton() gitem->removeFileFromScope( fitem->text( 0 ) ); } -void TrollProjectWidget::slotDetailsSelectionChanged( QListViewItem *item ) +void TrollProjectWidget::slotDetailsSelectionChanged( TQListViewItem *item ) { if ( !item ) { @@ -1516,7 +1516,7 @@ void TrollProjectWidget::slotDetailsSelectionChanged( QListViewItem *item ) } } -void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; @@ -1525,7 +1525,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite if ( pvitem->type() == qProjectItem::Group ) { GroupItem * titem = static_cast( pvitem ); - QString title, ext; + TQString title, ext; GroupItem::groupTypeMeanings( titem->groupType, title, ext ); KPopupMenu popup( this ); @@ -1583,7 +1583,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite "add them with the relative path." ) ); } int r = popup.exec( p ); - QString cleanSubprojectPath = QDir::cleanDirPath( m_shownSubproject->scope->projectDir() ); + TQString cleanSubprojectPath = TQDir::cleanDirPath( m_shownSubproject->scope->projectDir() ); if ( r == idSetInstObjPath ) { @@ -1591,7 +1591,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite "(example /usr/local/share/... ):" ), this, 0 ); dialog.urlRequester() ->setMode( KFile::Directory ); dialog.urlRequester() ->setURL( titem->owner->scope->variableValues( titem->text( 0 ) + ".path" ).front() ); - if ( dialog.exec() == QDialog::Accepted ) + if ( dialog.exec() == TQDialog::Accepted ) { titem->owner->scope->setEqualOp( titem->text( 0 ) + ".path", dialog.urlRequester() ->url() ); titem->owner->scope->saveToFile( ); @@ -1600,11 +1600,11 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite else if ( r == idInsNewFilepatternItem ) { bool ok = FALSE; - QString filepattern = KInputDialog::getText( + TQString filepattern = KInputDialog::getText( i18n( "Add Pattern of Files to Install" ), i18n( "Enter a pattern relative to the current " "subproject (example docs/*.html):" ), - QString::null, &ok, this ); + TQString::null, &ok, this ); if ( ok && !filepattern.isEmpty() ) { addFileToCurrentSubProject( titem, filepattern ); @@ -1617,11 +1617,11 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite ext + "|" + title + " (" + ext + ")", this, "Add existing files", - true, new QComboBox( false ) ); + true, new TQComboBox( false ) ); dialog->setMode( KFile::Files | KFile::ExistingOnly | KFile::LocalOnly ); - if ( dialog->exec() == QDialog::Rejected ) + if ( dialog->exec() == TQDialog::Rejected ) return ; - QStringList files = dialog->selectedFiles(); + TQStringList files = dialog->selectedFiles(); for ( unsigned int i = 0;i < files.count();++i ) { switch ( dialog->mode() ) @@ -1630,13 +1630,13 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite { // Copy selected files to current subproject folder // and add them to the filelist - QString filename = KURL( files[ i ] ).fileName(); - KIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + QString( QChar( QDir::separator() ) ) + filename, -1, false, false, this ); - QFile testExist( cleanSubprojectPath + QString( QChar( QDir::separator() ) ) + filename ); + TQString filename = KURL( files[ i ] ).fileName(); + KIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this ); + TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) { - QStringList files( filename ); + TQStringList files( filename ); addFiles( files, false ); } } @@ -1651,12 +1651,12 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite *proc << files[ i ]; *proc << cleanSubprojectPath; proc->start(KProcess::Block); - QString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist - QFile testExist( cleanSubprojectPath + QString( QChar( QDir::separator() ) ) + filename ); + TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) { - QStringList files( filename ); + TQStringList files( filename ); addFiles( files, false ); } } @@ -1665,8 +1665,8 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite case AddFilesDialog::Relative: { // Form relative path to current subproject folder - QString theFile = files[ i ]; - QStringList files( URLUtil::relativePathToFile( cleanSubprojectPath, theFile ) + TQString theFile = files[ i ]; + TQStringList files( URLUtil::relativePathToFile( cleanSubprojectPath, theFile ) ); addFiles( files, false ); } @@ -1684,7 +1684,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite else if ( r == idInsNewFile ) { KDevCreateFile * createFileSupport = m_part->extension( "KDevelop/CreateFile" ); - QString fcext; + TQString fcext; switch ( titem->groupType ) { case GroupItem::Sources: @@ -1712,7 +1712,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite fcext = "qrc"; break; default: - fcext = QString::null; + fcext = TQString::null; } KDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile( fcext, cleanSubprojectPath ); @@ -1721,10 +1721,10 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite else if ( r == idInsInstallObject ) { bool ok = FALSE; - QString install_obj = KInputDialog::getText( + TQString install_obj = KInputDialog::getText( i18n( "Add Install Object" ), i18n( "Enter a name for the new object:" ), - QString::null, &ok, this ); + TQString::null, &ok, this ); if ( ok && !install_obj.isEmpty() ) { titem->addInstallObject( install_obj ); @@ -1733,13 +1733,13 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite } else if ( r == idLUpdate ) { - QString cmd = "lupdate "; + TQString cmd = "lupdate "; cmd += m_shownSubproject->scope->fileName(); m_part->appFrontend() ->startAppCommand( m_shownSubproject->scope->projectDir(), cmd, false ); } else if ( r == idLRelease ) { - QString cmd = "lrelease "; + TQString cmd = "lrelease "; cmd += m_shownSubproject->scope->fileName(); m_part->appFrontend() ->startAppCommand( m_shownSubproject->scope->projectDir(), cmd, false ); }else if( r == idRemoveFile ) @@ -1808,7 +1808,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite if ( !( gitem->groupType == GroupItem::InstallObject ) ) { KURL::List urls; - urls.append( m_shownSubproject->scope->projectDir() + QChar( QDir::separator() ) + m_shownSubproject->scope->resolveVariables( fitem->localFilePath ) ); + urls.append( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) + m_shownSubproject->scope->resolveVariables( fitem->localFilePath ) ); FileContext context( urls ); m_part->core() ->fillContextMenu( &popup, &context ); } @@ -1828,29 +1828,29 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite else if ( r == idViewUIH ) { kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).replace(".ui","") << endl; - m_part->partController() ->editDocument( KURL( m_shownSubproject->scope->projectDir() + QChar( QDir::separator() ) + + m_part->partController() ->editDocument( KURL( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) + fitem->localFilePath.replace(".ui","") + ".h" ) ); } else if ( r == idSubclassWidget ) { - QStringList newFileNames; - newFileNames = m_part->languageSupport() ->subclassWidget( m_shownSubproject->scope->projectDir() + QChar( QDir::separator() ) + fitem->localFilePath ); + TQStringList newFileNames; + newFileNames = m_part->languageSupport() ->subclassWidget( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) + fitem->localFilePath ); kdDebug(9024) << "got new filenames: " << newFileNames << endl; if ( !newFileNames.empty() ) { - QDomDocument & dom = *( m_part->projectDom() ); + TQDomDocument & dom = *( m_part->projectDom() ); for ( uint i = 0; i < newFileNames.count(); ++i ) { - QString srcfile_relpath = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), newFileNames[ i ] ) ; + TQString srcfile_relpath = URLUtil::getRelativePath( m_shownSubproject->scope->projectDir(), newFileNames[ i ] ) ; newFileNames[i] = URLUtil::getRelativePath( projectDirectory(), newFileNames[ i ] ) ; - QString uifile_relpath = m_shownSubproject->relativePath() + QChar( QDir::separator() ) + fitem->localFilePath; + TQString uifile_relpath = m_shownSubproject->relativePath() + TQChar( TQDir::separator() ) + fitem->localFilePath; DomUtil::PairList list = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , "subclass", "sourcefile", "uifile" ); list << DomUtil::Pair( srcfile_relpath, uifile_relpath ); DomUtil::writePairListEntry( dom, "/kdevtrollproject/subclassing", "subclass", "sourcefile", "uifile", list ); - // newFileNames[i] = newFileNames[i].replace(QRegExp(projectDirectory()+"/"),""); + // newFileNames[i] = newFileNames[i].replace(TQRegExp(projectDirectory()+"/"),""); qWarning( "new file: %s", newFileNames[ i ].latin1() ); } m_subclasslist = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , @@ -1861,30 +1861,30 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite } else if ( r == idUpdateWidgetclass ) { - QString noext = fitem->text( 0 ); + TQString noext = fitem->text( 0 ); if ( noext.findRev( '.' ) > -1 ) noext = noext.left( noext.findRev( '.' ) ); - QStringList dummy; - QString uifile = fitem->uiFileLink; - if ( uifile.findRev( QString( QChar( QDir::separator() ) ) ) > -1 ) + TQStringList dummy; + TQString uifile = fitem->uiFileLink; + if ( uifile.findRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 ) { - QStringList uisplit = QStringList::split( QString( QChar( QDir::separator() ) ), uifile ); + TQStringList uisplit = TQStringList::split( TQString( TQChar( TQDir::separator() ) ), uifile ); uifile = uisplit[ uisplit.count() - 1 ]; } - m_part->languageSupport() ->updateWidget( m_shownSubproject->scope->projectDir() + QString( QChar( QDir::separator() ) ) + uifile, noext ); + m_part->languageSupport() ->updateWidget( m_shownSubproject->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + uifile, noext ); } else if ( r == idUISubclasses ) { - QDomDocument & dom = *( m_part->projectDom() ); + TQDomDocument & dom = *( m_part->projectDom() ); DomUtil::PairList list = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , "subclass", "sourcefile", "uifile" ); - SubclassesDlg *sbdlg = new SubclassesDlg( m_shownSubproject->relativePath() + QChar( QDir::separator() ) + fitem->localFilePath, + SubclassesDlg *sbdlg = new SubclassesDlg( m_shownSubproject->relativePath() + TQChar( TQDir::separator() ) + fitem->localFilePath, list, projectDirectory() ); if ( sbdlg->exec() ) { - QDomElement el = DomUtil::elementByPath( dom, "/kdevtrollproject" ); - QDomElement el2 = DomUtil::elementByPath( dom, "/kdevtrollproject/subclassing" ); + TQDomElement el = DomUtil::elementByPath( dom, "/kdevtrollproject" ); + TQDomElement el2 = DomUtil::elementByPath( dom, "/kdevtrollproject/subclassing" ); if ( ( !el.isNull() ) && ( !el2.isNull() ) ) { el.removeChild( el2 ); @@ -1901,7 +1901,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, QListViewItem *ite GroupItem * titem = static_cast( item->parent() ); bool ok = FALSE; - QString filepattern = KInputDialog::getText( + TQString filepattern = KInputDialog::getText( i18n( "Edit Pattern" ), i18n( "Enter a pattern relative to the current " "subproject (example docs/*.html):" ), @@ -1928,7 +1928,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) m_filesCached = false; m_allFilesCache.clear(); - QString realfilename = spitem->scope->resolveVariables( fitem->localFilePath ); + TQString realfilename = spitem->scope->resolveVariables( fitem->localFilePath ); if ( KMessageBox::warningYesNo( this, "" + i18n( "Do you want to delete the file %1 from the project and your disk?" ) @@ -1942,24 +1942,24 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) return; }else { - kdDebug(9024) << "Deleting file as the user wished: " << spitem->scope->projectDir() + QString( QChar( QDir::separator() ) ) + realfilename << endl; - KIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + QString( QChar( QDir::separator() ) ) + realfilename ), 0 ); + kdDebug(9024) << "Deleting file as the user wished: " << spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename << endl; + KIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename ), 0 ); } if ( gitem->groupType != GroupItem::InstallObject ) { - QString removedFileName = spitem->relativePath() + QString( QChar( QDir::separator() ) ) + realfilename; - if ( removedFileName.startsWith( QDir::rootDirPath() ) ) + TQString removedFileName = spitem->relativePath() + TQString( TQChar( TQDir::separator() ) ) + realfilename; + if ( removedFileName.startsWith( TQDir::rootDirPath() ) ) removedFileName = removedFileName.mid( 1 ); emitRemovedFile( removedFileName ); } //remove subclassing info - QDomDocument &dom = *( m_part->projectDom() ); + TQDomDocument &dom = *( m_part->projectDom() ); DomUtil::PairList list = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , "subclass", "sourcefile", "uifile" ); - QPtrList pairsToRemove; + TQPtrList pairsToRemove; DomUtil::PairList::iterator it; for ( it = list.begin(); it != list.end(); ++it ) { @@ -1973,8 +1973,8 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) { list.remove( *pair ); } - QDomElement el = DomUtil::elementByPath( dom, "/kdevtrollproject" ); - QDomElement el2 = DomUtil::elementByPath( dom, "/kdevtrollproject/subclassing" ); + TQDomElement el = DomUtil::elementByPath( dom, "/kdevtrollproject" ); + TQDomElement el2 = DomUtil::elementByPath( dom, "/kdevtrollproject/subclassing" ); if ( ( !el.isNull() ) && ( !el2.isNull() ) ) { el.removeChild( el2 ); @@ -1984,19 +1984,19 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) gitem->removeFileFromScope( fitem->text( 0 ) ); } -void TrollProjectWidget::emitAddedFile( const QString &fileName ) +void TrollProjectWidget::emitAddedFile( const TQString &fileName ) { - emit m_part->addedFilesToProject( QStringList( fileName ) ); + emit m_part->addedFilesToProject( TQStringList( fileName ) ); } -void TrollProjectWidget::emitRemovedFile( const QString &fileName ) +void TrollProjectWidget::emitRemovedFile( const TQString &fileName ) { - emit m_part->removedFilesFromProject( QStringList( fileName ) ); + emit m_part->removedFilesFromProject( TQStringList( fileName ) ); } -QString TrollProjectWidget::getUiFileLink( const QString &relpath, const QString& filename ) +TQString TrollProjectWidget::getUiFileLink( const TQString &relpath, const TQString& filename ) { DomUtil::PairList::iterator it; for ( it = m_subclasslist.begin();it != m_subclasslist.end(); ++it ) @@ -2013,28 +2013,28 @@ void TrollProjectWidget::slotBuildOpenFile() if ( !part || !part->url().isLocalFile() ) return ; - QString fileName = part->url().path(); - QFileInfo fi( fileName ); - QString sourceDir = fi.dirPath(); - QString baseName = fi.baseName( true ); + TQString fileName = part->url().path(); + TQFileInfo fi( fileName ); + TQString sourceDir = fi.dirPath(); + TQString baseName = fi.baseName( true ); kdDebug( 9024 ) << "Compiling " << fileName << "in dir " << sourceDir << " with baseName " << baseName << endl; - QString buildDir = sourceDir; - QString target = baseName + ".o"; + TQString buildDir = sourceDir; + TQString target = baseName + ".o"; m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); // m_part->startMakeCommand(buildDir, target); - QPtrList list = findSubprojectForFile( fi ); + TQPtrList list = findSubprojectForFile( fi ); QMakeScopeItem *spitem; for ( spitem = list.first(); spitem; spitem = list.next() ) { - QString buildcmd = constructMakeCommandLine( spitem->scope ); - QString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; + TQString buildcmd = constructMakeCommandLine( spitem->scope ); + TQString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; kdDebug( 9024 ) << "builddir " << spitem->scope->projectDir() << ", cmd " << dircmd + buildcmd + " " + target << endl; m_part->queueCmd( spitem->scope->projectDir(), dircmd + buildcmd + " " + target ); } @@ -2046,7 +2046,7 @@ void TrollProjectWidget::slotBuildOpenFile() void TrollProjectWidget::slotExecuteProject() { - QString program = m_part->mainProgram(); + TQString program = m_part->mainProgram(); if ( program.isEmpty() ) { KMessageBox::sorry( this, i18n( "Please specify the executable name in the " @@ -2067,12 +2067,12 @@ void TrollProjectWidget::slotExecuteProject() } } - if ( !program.startsWith( QDir::rootDirPath() ) ) - program.prepend( "." + QString( QChar( QDir::separator() ) ) ); + if ( !program.startsWith( TQDir::rootDirPath() ) ) + program.prepend( "." + TQString( TQChar( TQDir::separator() ) ) ); // Build environment variables to prepend to the executable path - QString runEnvVars = QString::null; + TQString runEnvVars = TQString::null; DomUtil::PairList list = DomUtil::readPairListEntry( *( m_part->projectDom() ), "/kdevtrollproject/run/envvars", "envvar", "name", "value" ); @@ -2112,7 +2112,7 @@ void TrollProjectWidget::slotDistCleanTarget() runClean(m_shownSubproject, "distclean"); } -void TrollProjectWidget::runClean( QMakeScopeItem* item, const QString& cleantargetname ) +void TrollProjectWidget::runClean( QMakeScopeItem* item, const TQString& cleantargetname ) { // no subproject selected m_part->partController() ->saveAllFiles(); @@ -2122,24 +2122,24 @@ void TrollProjectWidget::runClean( QMakeScopeItem* item, const QString& cleantar if ( item->scope->scopeType() != Scope::ProjectScope ) return ; - QString dir = item->scope->projectDir(); + TQString dir = item->scope->projectDir(); createMakefileIfMissing( dir, item ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - QString dircmd = "cd " + KProcess::quote( dir ) + " && " ; - QString rebuildcmd = constructMakeCommandLine( item->scope ) + " "+cleantargetname; + TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString rebuildcmd = constructMakeCommandLine( item->scope ) + " "+cleantargetname; m_part->queueCmd( dir, dircmd + rebuildcmd ); } -QString TrollProjectWidget::constructMakeCommandLine( Scope* s ) +TQString TrollProjectWidget::constructMakeCommandLine( Scope* s ) { - QString makeFileName; + TQString makeFileName; if ( s ) makeFileName = s->resolveVariables( s->variableValues( "MAKEFILE", true, true, true ).front() ); - QDomDocument & dom = *( m_part->projectDom() ); + TQDomDocument & dom = *( m_part->projectDom() ); - QString cmdline = DomUtil::readEntry( dom, "/kdevtrollproject/make/makebin" ); + TQString cmdline = DomUtil::readEntry( dom, "/kdevtrollproject/make/makebin" ); if ( cmdline.isEmpty() ) cmdline = MAKE_COMMAND; if ( !makeFileName.isEmpty() ) @@ -2153,7 +2153,7 @@ QString TrollProjectWidget::constructMakeCommandLine( Scope* s ) if ( jobs != 0 && runmultiple ) { cmdline += " -j"; - cmdline += QString::number( jobs ); + cmdline += TQString::number( jobs ); } if ( DomUtil::readBoolEntry( dom, "/kdevtrollproject/make/dontact" ) ) cmdline += " -n"; @@ -2165,44 +2165,44 @@ QString TrollProjectWidget::constructMakeCommandLine( Scope* s ) } -void TrollProjectWidget::createMakefileIfMissing( const QString &dir, QMakeScopeItem *item ) +void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item ) { - QFileInfo fi; - QFileInfo fi2; + TQFileInfo fi; + TQFileInfo fi2; kdDebug(9024) << "Makefile:" << item->scope->variableValues( "MAKEFILE", true, true, true ) << endl; if ( item->scope->variableValues( "MAKEFILE", true, true, true ).isEmpty() ) { - fi.setFile( dir + QString( QChar( QDir::separator() ) ) + "Makefile" ); - fi2.setFile( dir + QString( QChar( QDir::separator() ) ) + "makefile" ); + fi.setFile( dir + TQString( TQChar( TQDir::separator() ) ) + "Makefile" ); + fi2.setFile( dir + TQString( TQChar( TQDir::separator() ) ) + "makefile" ); } else { - QString realmf = item->scope->resolveVariables( item->scope->variableValues( "MAKEFILE", true, true, true ).front() ); + TQString realmf = item->scope->resolveVariables( item->scope->variableValues( "MAKEFILE", true, true, true ).front() ); fi.setFile( realmf ); - fi2.setFile( dir + QString( QChar( QDir::separator() ) ) + realmf ); + fi2.setFile( dir + TQString( TQChar( TQDir::separator() ) ) + realmf ); } if ( !fi.exists() && !fi2.exists() ) { - int r = KMessageBox::questionYesNo( this, i18n( "There is no Makefile in this directory. Run qmake first?" ), QString::null, i18n( "Run qmake" ), i18n( "Do Not Run" ) ); + int r = KMessageBox::questionYesNo( this, i18n( "There is no Makefile in this directory. Run qmake first?" ), TQString::null, i18n( "Run qmake" ), i18n( "Do Not Run" ) ); if ( r == KMessageBox::No ) return ; m_part->startQMakeCommand( dir ); } } -QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const QString& relPath ) +QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPath ) { if( !m_rootSubproject ) return 0; - QStringList dirs = QStringList::split("/", relPath); + TQStringList dirs = TQStringList::split("/", relPath); QMakeScopeItem* pitem = static_cast(m_rootSubproject); - for( QStringList::iterator it = dirs.begin(); it != dirs.end(); ++it) + for( TQStringList::iterator it = dirs.begin(); it != dirs.end(); ++it) { - QListViewItem* item = pitem->firstChild(); + TQListViewItem* item = pitem->firstChild(); while( item ) { QMakeScopeItem* sitem = static_cast(item); - if( QFileInfo( sitem->scope->projectDir() ).fileName() == *it ) + if( TQFileInfo( sitem->scope->projectDir() ).fileName() == *it ) { pitem = sitem; break; @@ -2212,37 +2212,37 @@ QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const QString& relPat return pitem; } -QPtrList TrollProjectWidget::findSubprojectForFile( QFileInfo fi ) +TQPtrList TrollProjectWidget::findSubprojectForFile( TQFileInfo fi ) { - QPtrList list; + TQPtrList list; findSubprojectForFile( list, m_rootSubproject, fi.absFilePath() ); return list; } -void TrollProjectWidget::findSubprojectForFile( QPtrList &list, QMakeScopeItem * item, QString absFilePath ) +void TrollProjectWidget::findSubprojectForFile( TQPtrList &list, QMakeScopeItem * item, TQString absFilePath ) { if( !item ) return; - QDir d( item->scope->projectDir() ); + TQDir d( item->scope->projectDir() ); - QStringList vars = item->scope->variableValues( "SOURCES" ); - for ( QStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) + TQStringList vars = item->scope->variableValues( "SOURCES" ); + for ( TQStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { - QFileInfo fi2( d, item->scope->resolveVariables( *it ) ); + TQFileInfo fi2( d, item->scope->resolveVariables( *it ) ); if ( absFilePath == fi2.absFilePath() ) list.append( item ); } vars = item->scope->variableValues( "HEADERS" ); - for ( QStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) + for ( TQStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { - QFileInfo fi2( d, item->scope->resolveVariables( *it ) ); + TQFileInfo fi2( d, item->scope->resolveVariables( *it ) ); if ( absFilePath == fi2.absFilePath() ) list.append( item ); } - QListViewItem * child = item->firstChild(); + TQListViewItem * child = item->firstChild(); while ( child ) { QMakeScopeItem * spitem = dynamic_cast( child ); @@ -2320,7 +2320,7 @@ QMakeScopeItem * TrollProjectWidget::findSubprojectForScope( QMakeScopeItem * sc return findSubprojectForScope( dynamic_cast( scope->parent() ) ); } -void TrollProjectWidget::focusInEvent( QFocusEvent * /*e*/ ) +void TrollProjectWidget::focusInEvent( TQFocusEvent * /*e*/ ) { switch ( m_lastFocusedView ) { @@ -2360,7 +2360,7 @@ void TrollProjectWidget::runQMakeRecursive( QMakeScopeItem* proj ) void TrollProjectWidget::slotBuildSelectedFile() { - QListViewItem * selectedItem = details->currentItem(); + TQListViewItem * selectedItem = details->currentItem(); if ( !selectedItem ) return ; qProjectItem *pvitem = static_cast( selectedItem ); @@ -2373,24 +2373,24 @@ void TrollProjectWidget::slotBuildSelectedFile() void TrollProjectWidget::buildFile( QMakeScopeItem* spitem, FileItem* fitem ) { - QFileInfo fi( spitem->scope->projectDir() + QChar( QDir::separator() ) + spitem->scope->resolveVariables( fitem->localFilePath ) ); - QString sourceDir = fi.dirPath(); - QString baseName = fi.baseName( true ); + TQFileInfo fi( spitem->scope->projectDir() + TQChar( TQDir::separator() ) + spitem->scope->resolveVariables( fitem->localFilePath ) ); + TQString sourceDir = fi.dirPath(); + TQString baseName = fi.baseName( true ); kdDebug( 9024 ) << "Compiling " << spitem->scope->resolveVariables( fitem->text( 0 ) ) << "in dir " << sourceDir << " with baseName " << baseName << endl; - QString buildDir = sourceDir; - QString target = baseName + ".o"; + TQString buildDir = sourceDir; + TQString target = baseName + ".o"; if( !spitem->scope->variableValues("OBJECTS_DIR").isEmpty() ) - target = spitem->scope->resolveVariables( spitem->scope->variableValues("OBJECTS_DIR").first() )+ QString( QChar( QDir::separator() ) )+target; + target = spitem->scope->resolveVariables( spitem->scope->variableValues("OBJECTS_DIR").first() )+ TQString( TQChar( TQDir::separator() ) )+target; kdDebug( 9024 ) << "builddir " << buildDir << ", target " << target << endl; m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); // m_part->startMakeCommand(buildDir, target); - QString buildcmd = constructMakeCommandLine( spitem->scope ); - QString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; + TQString buildcmd = constructMakeCommandLine( spitem->scope ); + TQString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; kdDebug( 9024 ) << "builddir " << spitem->scope->projectDir() << ", cmd " << dircmd + buildcmd + " " + target << endl; m_part->queueCmd( spitem->scope->projectDir(), dircmd + buildcmd + " " + target ); @@ -2428,12 +2428,12 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) if( spitem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { - QStringList subdirs = spitem->scope->variableValues( "SUBDIRS" ); + TQStringList subdirs = spitem->scope->variableValues( "SUBDIRS" ); DisableSubprojectDlg dlg( subdirs ); if( dlg.exec() ) { - QStringList values = dlg.selectedProjects(); - QListViewItem* item = spitem->firstChild(); + TQStringList values = dlg.selectedProjects(); + TQListViewItem* item = spitem->firstChild(); while( item ) { if( values.findIndex( item->text(0) ) != -1 ) @@ -2448,7 +2448,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) }else { QMakeScopeItem* parent = static_cast(spitem->parent()); - parent->disableSubprojects( QStringList( spitem->scope->scopeName() ) ); + parent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) ); delete spitem; parent->scope->saveToFile(); m_shownSubproject = parent; @@ -2456,21 +2456,21 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) } } -void TrollProjectWidget::slotProjectDirty(const QString& path) +void TrollProjectWidget::slotProjectDirty(const TQString& path) { kdDebug(9024) << "File is dirty:" << path << " using method " << endl; if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the QMake Manager).\n\nDo you want to reload it?").arg(path).arg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No ) { m_part->dirWatch()->stopScan(); - QListViewItemIterator it(m_rootSubproject); - QValueList itemstoreload; + TQListViewItemIterator it(m_rootSubproject); + TQValueList itemstoreload; while( it.current() ) { QMakeScopeItem* projectitem = static_cast( it.current() ); if( projectitem->scope->scopeType() == Scope::ProjectScope || projectitem->scope->scopeType() == Scope::IncludeScope ) { - QString projectfile = projectitem->scope->projectDir() + QString(QChar(QDir::separator())) + projectitem->scope->fileName(); + TQString projectfile = projectitem->scope->projectDir() + TQString(TQChar(TQDir::separator())) + projectitem->scope->fileName(); if( projectfile == path ) { itemstoreload.append(projectitem); @@ -2479,7 +2479,7 @@ void TrollProjectWidget::slotProjectDirty(const QString& path) it++; } - QValueList::const_iterator reloadit = itemstoreload.begin(); + TQValueList::const_iterator reloadit = itemstoreload.begin(); for( ; reloadit != itemstoreload.end() ; ++reloadit ) { (*reloadit)->reloadProject(); @@ -2517,13 +2517,13 @@ bool TrollProjectWidget::showVariablesInTree() const } -QMap TrollProjectWidget::qmakeEnvironment() const +TQMap TrollProjectWidget::qmakeEnvironment() const { - QMap map; + TQMap map; DomUtil::PairList envvars = DomUtil::readPairListEntry(*m_part->projectDom(), "/kdevtrollproject/make/envvars", "envvar", "name", "value"); - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; bool hasQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index 19595f78..7983f4d7 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -20,18 +20,18 @@ #ifndef _TROLLPROJECTWIDGET_H_ #define _TROLLPROJECTWIDGET_H_ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include "choosesubprojectdlg.h" #include "newwidgetdlg.h" #include "domutil.h" @@ -49,45 +49,45 @@ public: TrollProjectWidget( TrollProjectPart *part ); ~TrollProjectWidget(); - void openProject( const QString &dirName ); + void openProject( const TQString &dirName ); void closeProject(); /** * A list of the (relative) names of all subprojects (== subdirectories). */ - //QStringList allSubprojects(); + //TQStringList allSubprojects(); /** * A list of the (relative) names of all libraries. */ - QStringList allLibraries(); + TQStringList allLibraries(); /** * A list of all files that belong to the project. **/ - QStringList allFiles(); + TQStringList allFiles(); /** * The top level directory of the project. **/ - QString projectDirectory(); + TQString projectDirectory(); /** * The directory of the currently active subproject. */ - QString subprojectDirectory(); + TQString subprojectDirectory(); /** * The directory of the currently active subproject. */ - QString getCurrentTarget(); + TQString getCurrentTarget(); - QString getCurrentDestDir(); + TQString getCurrentDestDir(); - QString getCurrentOutputFilename(); + TQString getCurrentOutputFilename(); - void addFileToCurrentSubProject( GroupItem *titem, const QString &filename ); - void addFileToCurrentSubProject( GroupItem::GroupType gtype, const QString &filename ); - void addFiles( QStringList &files, bool relativeToProjectRoot = true ); - void emitAddedFile( const QString &name ); - void emitRemovedFile( const QString &name ); + void addFileToCurrentSubProject( GroupItem *titem, const TQString &filename ); + void addFileToCurrentSubProject( GroupItem::GroupType gtype, const TQString &filename ); + void addFiles( TQStringList &files, bool relativeToProjectRoot = true ); + void emitAddedFile( const TQString &name ); + void emitRemovedFile( const TQString &name ); - QString getUiFileLink( const QString &path, const QString& filename ); + TQString getUiFileLink( const TQString &path, const TQString& filename ); bool isTMakeProject(); enum TrollProjectView { SubprojectView, DetailsView }; @@ -122,78 +122,78 @@ public slots: void slotRemoveFile(); protected: - virtual void focusInEvent( QFocusEvent *e ); + virtual void focusInEvent( TQFocusEvent *e ); private slots: - void slotOverviewSelectionChanged( QListViewItem *item ); - void slotOverviewContextMenu( KListView *, QListViewItem *item, const QPoint &p ); - void slotDetailsSelectionChanged( QListViewItem* ); - void slotDetailsExecuted( QListViewItem *item ); - void slotDetailsContextMenu( KListView *, QListViewItem *item, const QPoint &p ); + void slotOverviewSelectionChanged( TQListViewItem *item ); + void slotOverviewContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + void slotDetailsSelectionChanged( TQListViewItem* ); + void slotDetailsExecuted( TQListViewItem *item ); + void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); void slotExcludeFileFromScopeButton(); void slotAddSubproject( QMakeScopeItem *spitem = 0 ); void slotRemoveSubproject( QMakeScopeItem *spitem = 0 ); void slotCreateScope( QMakeScopeItem *spitem = 0 ); void slotRemoveScope( QMakeScopeItem *spitem = 0 ); void slotDisableSubproject( QMakeScopeItem* spitem = 0 ); - void slotProjectDirty( const QString& ); + void slotProjectDirty( const TQString& ); void createQMakeScopeItems(); private: void cleanDetailView( QMakeScopeItem *item ); - void runClean( QMakeScopeItem*, const QString& ); + void runClean( QMakeScopeItem*, const TQString& ); void buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ); void removeFile( QMakeScopeItem *spitem, FileItem *fitem ); - void addSubprojectToItem( QMakeScopeItem*, const QString& ); + void addSubprojectToItem( QMakeScopeItem*, const TQString& ); void setupContext(); - // void parseScope(QMakeScopeItem *item,QString scopeString, Scope *scope); + // void parseScope(QMakeScopeItem *item,TQString scopeString, Scope *scope); GroupItem* getInstallRoot( QMakeScopeItem *item ); - GroupItem* getInstallObject( QMakeScopeItem *item, const QString& objectname ); - QString constructMakeCommandLine( Scope* s = 0 ); + GroupItem* getInstallObject( QMakeScopeItem *item, const TQString& objectname ); + TQString constructMakeCommandLine( Scope* s = 0 ); - void createMakefileIfMissing( const QString &dir, QMakeScopeItem *item ); + void createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item ); void runQMakeRecursive( QMakeScopeItem* proj); void buildFile( QMakeScopeItem* spitem, FileItem* fitem); - /*fileName: full base file name like QFileInfo::baseName ( true )*/ - QPtrList findSubprojectForFile( QFileInfo fi ); - void findSubprojectForFile( QPtrList &list, QMakeScopeItem * item, QString absFilePath ); - QMakeScopeItem* findSubprojectForPath( const QString& ); - // QString makeEnvironment(); + /*fileName: full base file name like TQFileInfo::baseName ( true )*/ + TQPtrList findSubprojectForFile( TQFileInfo fi ); + void findSubprojectForFile( TQPtrList &list, QMakeScopeItem * item, TQString absFilePath ); + QMakeScopeItem* findSubprojectForPath( const TQString& ); + // TQString makeEnvironment(); TrollProjectWidget::SaveType dialogSaveBehaviour() const; QMakeScopeItem *findSubprojectForScope( QMakeScopeItem *scope ); void reloadProjectFromFile( QMakeScopeItem* item ); - QMap qmakeEnvironment() const; + TQMap qmakeEnvironment() const; - QVBox *overviewContainer; + TQVBox *overviewContainer; KListView *overview; - QHBox *projectTools; - QToolButton *addSubdirButton; - QToolButton *createScopeButton; + TQHBox *projectTools; + TQToolButton *addSubdirButton; + TQToolButton *createScopeButton; - QToolButton *buildProjectButton; - QToolButton *rebuildProjectButton; - QToolButton *executeProjectButton; + TQToolButton *buildProjectButton; + TQToolButton *rebuildProjectButton; + TQToolButton *executeProjectButton; - QToolButton *buildTargetButton; - QToolButton *rebuildTargetButton; - QToolButton *executeTargetButton; + TQToolButton *buildTargetButton; + TQToolButton *rebuildTargetButton; + TQToolButton *executeTargetButton; - QToolButton *buildFileButton; - QToolButton *projectconfButton; + TQToolButton *buildFileButton; + TQToolButton *projectconfButton; - QVBox *detailContainer; + TQVBox *detailContainer; KListView *details; - QHBox *fileTools; - QToolButton *addfilesButton; - QToolButton *newfileButton; - QToolButton *removefileButton; - QToolButton *excludeFileFromScopeButton; + TQHBox *fileTools; + TQToolButton *addfilesButton; + TQToolButton *newfileButton; + TQToolButton *removefileButton; + TQToolButton *excludeFileFromScopeButton; DomUtil::PairList m_subclasslist; QMakeScopeItem *m_shownSubproject; @@ -207,7 +207,7 @@ private: bool m_filesCached; bool m_showFilenamesOnly; bool m_showVariablesInTree; - QStringList m_allFilesCache; + TQStringList m_allFilesCache; friend class ChooseSubprojectDlg; friend class ProjectConfigurationDlg; diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 336187d3..3bfeeee7 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -11,13 +11,13 @@ #include "scriptnewfiledlg.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include @@ -30,35 +30,35 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, - QWidget *parent, const char *name) - : QDialog(parent, name, true) + TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("New File")); - QLabel *filename_label = new QLabel(i18n("&File name:"), this); + TQLabel *filename_label = new TQLabel(i18n("&File name:"), this); filename_edit = new KLineEdit(this); filename_edit->setFocus(); filename_label->setBuddy(this); - QFontMetrics fm(filename_edit->fontMetrics()); + TQFontMetrics fm(filename_edit->fontMetrics()); filename_edit->setMinimumWidth(fm.width('X')*35); - usetemplate_box = new QCheckBox(i18n("&Use file template"), this); + usetemplate_box = new TQCheckBox(i18n("&Use file template"), this); usetemplate_box->setChecked(true); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); - QPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); + TQPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); ok_button->setDefault(true); - connect( ok_button, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel_button, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); - QVBoxLayout *layout = new QVBoxLayout(this, 10, 4); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); layout->addWidget(filename_label); layout->addWidget(filename_edit); layout->addWidget(usetemplate_box); @@ -75,7 +75,7 @@ ScriptNewFileDialog::~ScriptNewFileDialog() void ScriptNewFileDialog::accept() { - QString fileName = filename_edit->text(); + TQString fileName = filename_edit->text(); if (fileName.find('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; @@ -84,9 +84,9 @@ void ScriptNewFileDialog::accept() KDevProject *project = m_part->project(); if (!project->activeDirectory().isEmpty()) fileName.prepend(project->activeDirectory() + "/"); - QString destpath = project->projectDirectory() + "/" + fileName; + TQString destpath = project->projectDirectory() + "/" + fileName; - if (QFileInfo(destpath).exists()) { + if (TQFileInfo(destpath).exists()) { KMessageBox::sorry(this, i18n("A file with this name already exists.")); return; } @@ -94,14 +94,14 @@ void ScriptNewFileDialog::accept() bool success = false; if (usetemplate_box->isChecked()) { - QString extension = QFileInfo(destpath).extension(); + TQString extension = TQFileInfo(destpath).extension(); if (!FileTemplate::exists(m_part, extension)) { KMessageBox::sorry(this, i18n("A file template for this extension does not exist.")); return; } success = FileTemplate::copy(m_part, extension, destpath); } else { - QFile f(destpath); + TQFile f(destpath); success = f.open(IO_WriteOnly); if (success) f.close(); @@ -113,7 +113,7 @@ void ScriptNewFileDialog::accept() kdDebug(9015) << "AddFile1: " << fileName << endl; m_part->addFile(fileName); - QDialog::accept(); + TQDialog::accept(); } #include "scriptnewfiledlg.moc" diff --git a/buildtools/script/scriptnewfiledlg.h b/buildtools/script/scriptnewfiledlg.h index b3c73713..990fc663 100644 --- a/buildtools/script/scriptnewfiledlg.h +++ b/buildtools/script/scriptnewfiledlg.h @@ -12,7 +12,7 @@ #ifndef _SCRIPTNEWFILEDLG_H_ #define _SCRIPTNEWFILEDLG_H_ -#include +#include class QCheckBox; class KLineEdit; @@ -24,14 +24,14 @@ class ScriptNewFileDialog : public QDialog Q_OBJECT public: - ScriptNewFileDialog( ScriptProjectPart *part, QWidget *parent=0, const char *name=0 ); + ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *parent=0, const char *name=0 ); ~ScriptNewFileDialog(); protected: virtual void accept(); private: - QCheckBox *usetemplate_box; + TQCheckBox *usetemplate_box; KLineEdit *filename_edit; ScriptProjectPart *m_part; }; diff --git a/buildtools/script/scriptoptionswidget.cpp b/buildtools/script/scriptoptionswidget.cpp index c1660b00..d80cd501 100644 --- a/buildtools/script/scriptoptionswidget.cpp +++ b/buildtools/script/scriptoptionswidget.cpp @@ -11,27 +11,27 @@ #include "scriptoptionswidget.h" -#include +#include #include -#include -#include +#include +#include #include "domutil.h" #include "kdevlanguagesupport.h" ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, - QWidget *parent, const char *name) + TQWidget *parent, const char *name) : ScriptOptionsWidgetBase(parent, name) { m_part = part; - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); - QString includepatterns + TQString includepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/includepatterns"); if (includepatterns.isNull() && part->languageSupport()){ - QStringList includepatternList; + TQStringList includepatternList; KMimeType::List list = part->languageSupport()->mimeTypes(); KMimeType::List::Iterator it = list.begin(); while( it != list.end() ){ @@ -41,7 +41,7 @@ ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, includepatterns = includepatternList.join( "," ); } - QString excludepatterns + TQString excludepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/excludepatterns"); if (excludepatterns.isNull()) excludepatterns = "*~"; @@ -57,10 +57,10 @@ ScriptOptionsWidget::~ScriptOptionsWidget() void ScriptOptionsWidget::accept() { - QDomDocument &dom = *m_part->projectDom(); + TQDomDocument &dom = *m_part->projectDom(); - QString includepatterns = includepatterns_edit->text(); - QString excludepatterns = excludepatterns_edit->text(); + TQString includepatterns = includepatterns_edit->text(); + TQString excludepatterns = excludepatterns_edit->text(); DomUtil::writeEntry(dom, "/kdevscriptproject/general/includepatterns", includepatterns); DomUtil::writeEntry(dom, "/kdevscriptproject/general/excludepatterns", excludepatterns); diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index c33d099d..3dc03058 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -22,7 +22,7 @@ class ScriptOptionsWidget : public ScriptOptionsWidgetBase Q_OBJECT public: - ScriptOptionsWidget( KDevPlugin *part, QWidget *parent=0, const char *name=0 ); + ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 ); ~ScriptOptionsWidget(); public slots: diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index ff560f23..2bc19135 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -11,12 +11,12 @@ #include "scriptprojectpart.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -40,7 +40,7 @@ typedef KDevGenericFactory ScriptProjectFactory; static const KDevPluginInfo data("kdevscriptproject"); K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) -ScriptProjectPart::ScriptProjectPart(QObject *parent, const char *name, const QStringList &) +ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); @@ -51,17 +51,17 @@ ScriptProjectPart::ScriptProjectPart(QObject *parent, const char *name, const QS if (!extension("KDevelop/CreateFile")) { KAction *action; action = new KAction( i18n("New File..."), 0, - this, SLOT(slotNewFile()), + this, TQT_SLOT(slotNewFile()), actionCollection(), "file_newfile" ); action->setWhatsThis( i18n("New file

Creates a new file.") ); action->setToolTip( i18n("Create a new file") ); } new KAction( i18n("Rescan Project"), 0, CTRL+ALT+Key_R, - this, SLOT(rescan()), + this, TQT_SLOT(rescan()), actionCollection(), "rescan" ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -71,10 +71,10 @@ ScriptProjectPart::~ScriptProjectPart() void ScriptProjectPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Script Project Options"), i18n("Script Project Options"), BarIcon("kdevelop", KIcon::SizeMedium)); ScriptOptionsWidget *w = new ScriptOptionsWidget(this, vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } @@ -82,11 +82,11 @@ void ScriptProjectPart::projectConfigWidget(KDialogBase *dlg) * @todo This should really be merged with FileTreeWidget::matchesHidePattern() * and put in its own class. Currently this is repeated in scriptprojectpart.cpp, pascalproject_part.cpp, adaproject_part.cpp */ -static bool matchesPattern(const QString &fileName, const QStringList &patternList) +static bool matchesPattern(const TQString &fileName, const TQStringList &patternList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = patternList.begin(); it != patternList.end(); ++it) { - QRegExp re(*it, true, true); + TQRegExp re(*it, true, true); if (re.search(fileName) == 0 && re.matchedLength() == (int)fileName.length()) return true; } @@ -95,7 +95,7 @@ static bool matchesPattern(const QString &fileName, const QStringList &patternLi } -void ScriptProjectPart::openProject(const QString &dirName, const QString &projectName) +void ScriptProjectPart::openProject(const TQString &dirName, const TQString &projectName) { if (!languageSupport()) kdDebug(9015) << "ScriptProjectPart::openProject: no language support found!" << endl; @@ -103,7 +103,7 @@ void ScriptProjectPart::openProject(const QString &dirName, const QString &proje m_projectDirectory = dirName; m_projectName = projectName; - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" if (DomUtil::readEntry(dom, "/kdevscriptproject/run/directoryradio") == "" ) { @@ -111,28 +111,28 @@ void ScriptProjectPart::openProject(const QString &dirName, const QString &proje } // Put all files from all subdirectories into file list - QValueStack s; + TQValueStack s; int prefixlen = m_projectDirectory.length()+1; s.push(m_projectDirectory); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug(9015) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); if ( dirEntries ) { - QPtrListIterator it(*dirEntries); + TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { //do not follow symlinks which point to the themselves if (it.current()->isSymLink()) { - QString symLink = it.current()->readLink(); + TQString symLink = it.current()->readLink(); if ((symLink == path) || (symLink == "./")) continue; } else if (canAddDirectoryToProject(path)) { @@ -157,18 +157,18 @@ void ScriptProjectPart::closeProject() } -QString ScriptProjectPart::projectDirectory() const +TQString ScriptProjectPart::projectDirectory() const { return m_projectDirectory; } -QString ScriptProjectPart::buildDirectory() const +TQString ScriptProjectPart::buildDirectory() const { return m_projectDirectory; } -QString ScriptProjectPart::projectName() const +TQString ScriptProjectPart::projectName() const { return m_projectName; } @@ -190,9 +190,9 @@ DomUtil::PairList ScriptProjectPart::runEnvironmentVars() const * if run/directoryradio == custom * The custom directory absolute path */ -QString ScriptProjectPart::runDirectory() const +TQString ScriptProjectPart::runDirectory() const { - QString cwd = defaultRunDirectory("kdevscriptproject"); + TQString cwd = defaultRunDirectory("kdevscriptproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -208,15 +208,15 @@ QString ScriptProjectPart::runDirectory() const * if run/directoryradio == custom or relative == false * The absolute path to executable */ -QString ScriptProjectPart::mainProgram() const +TQString ScriptProjectPart::mainProgram() const { - QDomDocument * dom = projectDom(); + TQDomDocument * dom = projectDom(); - if ( !dom ) return QString(); + if ( !dom ) return TQString(); - QString DomMainProgram = DomUtil::readEntry( *dom, "/kdevscriptproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevscriptproject/run/mainprogram"); - if ( DomMainProgram.isEmpty() ) return QString(); + if ( DomMainProgram.isEmpty() ) return TQString(); if ( DomMainProgram.startsWith("/") ) // assume absolute path { @@ -227,36 +227,36 @@ QString ScriptProjectPart::mainProgram() const return projectDirectory() + "/" + DomMainProgram; } - return QString(); + return TQString(); } -/** Retuns a QString with the debug command line arguments */ -QString ScriptProjectPart::debugArguments() const +/** Retuns a TQString with the debug command line arguments */ +TQString ScriptProjectPart::debugArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevscriptproject/run/globaldebugarguments"); } -/** Retuns a QString with the run command line arguments */ -QString ScriptProjectPart::runArguments() const +/** Retuns a TQString with the run command line arguments */ +TQString ScriptProjectPart::runArguments() const { return DomUtil::readEntry(*projectDom(), "/kdevscriptproject/run/programargs"); } -QString ScriptProjectPart::activeDirectory() const +TQString ScriptProjectPart::activeDirectory() const { - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); return DomUtil::readEntry(dom, "/kdevscriptproject/general/activedir"); } -QStringList ScriptProjectPart::allFiles() const +TQStringList ScriptProjectPart::allFiles() const { -/* QStringList res; +/* TQStringList res; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = m_sourceFiles.begin(); it != m_sourceFiles.end(); ++it) res += (m_projectDirectory + "/" + (*it)); @@ -266,19 +266,19 @@ QStringList ScriptProjectPart::allFiles() const return m_sourceFiles; } -void ScriptProjectPart::addFile(const QString &fileName) +void ScriptProjectPart::addFile(const TQString &fileName) { kdDebug(9015) << "AddFile2" << fileName << endl; - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->addFiles ( fileList ); } -void ScriptProjectPart::addFiles ( const QStringList& fileList ) +void ScriptProjectPart::addFiles ( const TQStringList& fileList ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -288,19 +288,19 @@ void ScriptProjectPart::addFiles ( const QStringList& fileList ) emit addedFilesToProject ( fileList ); } -void ScriptProjectPart::removeFile(const QString &fileName) +void ScriptProjectPart::removeFile(const TQString &fileName) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); this->addFiles ( fileList ); } -void ScriptProjectPart::removeFiles ( const QStringList& fileList ) +void ScriptProjectPart::removeFiles ( const TQStringList& fileList ) { emit removedFilesFromProject ( fileList ); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -317,13 +317,13 @@ void ScriptProjectPart::slotNewFile() /*! \fn ScriptProjectPart::distFiles() const */ -QStringList ScriptProjectPart::distFiles() const +TQStringList ScriptProjectPart::distFiles() const { - QStringList sourceList = allFiles(); + TQStringList sourceList = allFiles(); // Scan current source directory for any .pro files. - QString projectDir = projectDirectory(); - QDir dir(projectDir); - QStringList files = dir.entryList( "*README*"); + TQString projectDir = projectDirectory(); + TQDir dir(projectDir); + TQStringList files = dir.entryList( "*README*"); return sourceList + files; } @@ -332,28 +332,28 @@ void ScriptProjectPart::rescan() // kdDebug() << "Directory " << path << " changed, scanning for new files in the project" << endl; // Put all files from all subdirectories into file list - QValueStack s; + TQValueStack s; int prefixlen = m_projectDirectory.length()+1; s.push(m_projectDirectory); - QDir dir; + TQDir dir; do { dir.setPath(s.pop()); kdDebug(9015) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); if ( dirEntries ) { - QPtrListIterator it(*dirEntries); + TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) { - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; - QString path = it.current()->absFilePath(); + TQString path = it.current()->absFilePath(); if (it.current()->isDir()) { //do not follow symlinks which point to the themselves if (it.current()->isSymLink()) { - QString symLink = it.current()->readLink(); + TQString symLink = it.current()->readLink(); if ((symLink == path) || (symLink == "./")) continue; } else if (canAddDirectoryToProject(path)) { @@ -370,18 +370,18 @@ void ScriptProjectPart::rescan() } } while (!s.isEmpty()); -/* const QFileInfoList *dirEntries = QDir(path).entryInfoList(); +/* const QFileInfoList *dirEntries = TQDir(path).entryInfoList(); if ( dirEntries ) { kdDebug() << "1" << endl; - QPtrListIterator it(*dirEntries); + TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) { kdDebug() << "2" << endl; - QString fileName = it.current()->fileName(); + TQString fileName = it.current()->fileName(); if (fileName == "." || fileName == "..") continue; kdDebug() << "3" << endl; - QString filePath = it.current()->absFilePath(); + TQString filePath = it.current()->absFilePath(); if (!it.current()->isDir() && canAddToProject(filePath) && !isProjectFile(filePath)) { kdDebug() << "=== adding " << filePath << endl; addFile(filePath); @@ -390,12 +390,12 @@ void ScriptProjectPart::rescan() }*/ } -bool ScriptProjectPart::canAddToProject(const QString & path) +bool ScriptProjectPart::canAddToProject(const TQString & path) { - QDomDocument &dom = *projectDom(); - QString includepatterns + TQDomDocument &dom = *projectDom(); + TQString includepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/includepatterns"); - QStringList includepatternList; + TQStringList includepatternList; if ( includepatterns.isNull() ) { if ( languageSupport() ){ KMimeType::List list = languageSupport()->mimeTypes(); @@ -406,14 +406,14 @@ bool ScriptProjectPart::canAddToProject(const QString & path) } } } else { - includepatternList = QStringList::split(",", includepatterns); + includepatternList = TQStringList::split(",", includepatterns); } - QString excludepatterns + TQString excludepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/excludepatterns"); if (excludepatterns.isNull()) excludepatterns = "*~"; - QStringList excludepatternList = QStringList::split(",", excludepatterns); + TQStringList excludepatternList = TQStringList::split(",", excludepatterns); if (matchesPattern(path, includepatternList) && !matchesPattern(path, excludepatternList)) { @@ -425,15 +425,15 @@ bool ScriptProjectPart::canAddToProject(const QString & path) } } -bool ScriptProjectPart::canAddDirectoryToProject(const QString & path) +bool ScriptProjectPart::canAddDirectoryToProject(const TQString & path) { - QDomDocument &dom = *projectDom(); - QString excludepatterns + TQDomDocument &dom = *projectDom(); + TQString excludepatterns = DomUtil::readEntry(dom, "/kdevscriptproject/general/excludepatterns"); if (excludepatterns.isNull()) { return true; } - QStringList excludepatternList = QStringList::split(",", excludepatterns); + TQStringList excludepatternList = TQStringList::split(",", excludepatterns); if (!matchesPattern(path, excludepatternList)) { return true; diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index b16c4ffb..b886bd46 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -12,8 +12,8 @@ #ifndef _SCRIPTPROJECTPART_H_ #define _SCRIPTPROJECTPART_H_ -#include -#include +#include +#include #include "kdevbuildtool.h" @@ -27,31 +27,31 @@ class ScriptProjectPart : public KDevBuildTool Q_OBJECT public: - ScriptProjectPart( QObject *parent, const char *name, const QStringList &args ); + ScriptProjectPart( TQObject *parent, const char *name, const TQStringList &args ); ~ScriptProjectPart(); - QStringList distFiles() const; + TQStringList distFiles() const; protected: - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); virtual void closeProject(); - virtual QString projectDirectory() const; - virtual QString projectName() const; - virtual QString mainProgram() const; - virtual QString activeDirectory() const; - virtual QStringList allFiles() const; - virtual void addFile(const QString &fileName); - virtual void addFiles ( const QStringList& fileList ); - virtual void removeFile(const QString &fileName); - virtual void removeFiles ( const QStringList& fileList ); - virtual QString buildDirectory() const; - virtual QString runDirectory() const; - virtual QString debugArguments() const; - virtual QString runArguments() const; + virtual TQString projectDirectory() const; + virtual TQString projectName() const; + virtual TQString mainProgram() const; + virtual TQString activeDirectory() const; + virtual TQStringList allFiles() const; + virtual void addFile(const TQString &fileName); + virtual void addFiles ( const TQStringList& fileList ); + virtual void removeFile(const TQString &fileName); + virtual void removeFiles ( const TQStringList& fileList ); + virtual TQString buildDirectory() const; + virtual TQString runDirectory() const; + virtual TQString debugArguments() const; + virtual TQString runArguments() const; virtual DomUtil::PairList runEnvironmentVars() const; - bool canAddToProject(const QString &path); - bool canAddDirectoryToProject(const QString &path); + bool canAddToProject(const TQString &path); + bool canAddDirectoryToProject(const TQString &path); private slots: void projectConfigWidget(KDialogBase *dlg); @@ -59,9 +59,9 @@ private slots: void rescan(); private: - QString m_projectDirectory; - QString m_projectName; - QStringList m_sourceFiles; + TQString m_projectDirectory; + TQString m_projectName; + TQStringList m_sourceFiles; friend class ScriptNewFileDialog; }; diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp index f11a540b..4dffa96d 100644 --- a/editors/editor-chooser/editorchooser_part.cpp +++ b/editors/editor-chooser/editorchooser_part.cpp @@ -1,4 +1,4 @@ -#include +#include #include @@ -16,12 +16,12 @@ typedef KDevGenericFactory EditorChooserFactory; static const KDevPluginInfo data("kdeveditorchooser"); K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) ) -EditorChooserPart::EditorChooserPart(QObject *parent, const char *name, const QStringList &) +EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name ? name : "EditorChooserPart") { setInstance(EditorChooserFactory::instance()); - connect(core(), SIGNAL(configWidget(KDialogBase*)), this, SLOT(configWidget(KDialogBase*))); + connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*))); } @@ -32,9 +32,9 @@ EditorChooserPart::~EditorChooserPart() void EditorChooserPart::configWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Editor"), i18n("Editor"), BarIcon("kate", KIcon::SizeMedium) ); + TQVBox *vbox = dlg->addVBoxPage(i18n("Editor"), i18n("Editor"), BarIcon("kate", KIcon::SizeMedium) ); EditorChooserWidget *w = new EditorChooserWidget(vbox); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); } diff --git a/editors/editor-chooser/editorchooser_part.h b/editors/editor-chooser/editorchooser_part.h index 15cb2f97..810e1066 100644 --- a/editors/editor-chooser/editorchooser_part.h +++ b/editors/editor-chooser/editorchooser_part.h @@ -19,7 +19,7 @@ class EditorChooserPart : public KDevPlugin public: - EditorChooserPart(QObject *parent, const char *name, const QStringList &); + EditorChooserPart(TQObject *parent, const char *name, const TQStringList &); ~EditorChooserPart(); diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp index 6c9f7071..3a8a3584 100644 --- a/editors/editor-chooser/editorchooser_widget.cpp +++ b/editors/editor-chooser/editorchooser_widget.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include @@ -12,7 +12,7 @@ #include "editorchooser_widget.h" -EditorChooserWidget::EditorChooserWidget(QWidget *parent, const char *name) +EditorChooserWidget::EditorChooserWidget(TQWidget *parent, const char *name) : EditChooser(parent, name) { // ask the trader which editors he has to offer @@ -32,7 +32,7 @@ EditorChooserWidget::EditorChooserWidget(QWidget *parent, const char *name) } load(); - slotEditPartChanged(QString()); + slotEditPartChanged(TQString()); } @@ -43,7 +43,7 @@ void EditorChooserWidget::load() // find the editor to use KConfig *config = kapp->config(); config->setGroup("Editor"); - QString editor = config->readPathEntry("EmbeddedKTextEditor"); + TQString editor = config->readPathEntry("EmbeddedKTextEditor"); // add the entries to the listview KTrader::OfferList::Iterator it; @@ -59,7 +59,7 @@ void EditorChooserWidget::load() if (index >=0) EditorPart->setCurrentItem(index); - QString dirtyAction = config->readEntry( "DirtyAction" ); + TQString dirtyAction = config->readEntry( "DirtyAction" ); if ( dirtyAction == "reload" ) { @@ -110,7 +110,7 @@ void EditorChooserWidget::accept() save(); } -void EditorChooserWidget::slotEditPartChanged( const QString & ) +void EditorChooserWidget::slotEditPartChanged( const TQString & ) { KTrader::OfferList::Iterator it; for (it = m_offers.begin(); it != m_offers.end(); ++it) diff --git a/editors/editor-chooser/editorchooser_widget.h b/editors/editor-chooser/editorchooser_widget.h index 1688b5c0..75880af7 100644 --- a/editors/editor-chooser/editorchooser_widget.h +++ b/editors/editor-chooser/editorchooser_widget.h @@ -2,7 +2,7 @@ #define __EDITORCHOOSER_WIDGET_H__ -#include +#include #include #include "editchooser.h" @@ -14,10 +14,10 @@ class EditorChooserWidget : public EditChooser public: - EditorChooserWidget(QWidget *parent=0, const char *name=0); + EditorChooserWidget(TQWidget *parent=0, const char *name=0); public slots: - virtual void slotEditPartChanged(const QString &); + virtual void slotEditPartChanged(const TQString &); private slots: diff --git a/embedded/visualboyadvance/vbaconfigwidget.cpp b/embedded/visualboyadvance/vbaconfigwidget.cpp index e9c00c12..a89a397f 100644 --- a/embedded/visualboyadvance/vbaconfigwidget.cpp +++ b/embedded/visualboyadvance/vbaconfigwidget.cpp @@ -17,11 +17,11 @@ #include "vbaconfigwidget.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -30,15 +30,15 @@ using namespace VisualBoyAdvance; -VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,QWidget *parent, const char *name ) : VBAConfigWidgetBase(parent,name) { +VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent, const char *name ) : VBAConfigWidgetBase(parent,name) { m_part = part; - QDomDocument &doc = *m_part->projectDom(); + TQDomDocument &doc = *m_part->projectDom(); // read - QString emulator = DomUtil::readEntry(doc, "/kdevvisualadvance/emulator"); - QString binary = DomUtil::readEntry(doc, "/kdevvisualadvance/binary"); - QString graphicFilter = DomUtil::readEntry(doc, "/kdevvisualadvance/graphicFilter"); - QString scaling = DomUtil::readEntry(doc, "/kdevvisualadvance/scaling"); - QString addOptions = DomUtil::readEntry(doc, "/kdevvisualadvance/addOptions"); + TQString emulator = DomUtil::readEntry(doc, "/kdevvisualadvance/emulator"); + TQString binary = DomUtil::readEntry(doc, "/kdevvisualadvance/binary"); + TQString graphicFilter = DomUtil::readEntry(doc, "/kdevvisualadvance/graphicFilter"); + TQString scaling = DomUtil::readEntry(doc, "/kdevvisualadvance/scaling"); + TQString addOptions = DomUtil::readEntry(doc, "/kdevvisualadvance/addOptions"); bool terminal = DomUtil::readBoolEntry(doc, "/kdevvisualadvance/terminal"); bool fullscreen = DomUtil::readBoolEntry(doc, "/kdevvisualadvance/fullscreen"); // set the widgets @@ -98,13 +98,13 @@ VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,QWidget *parent, con } addOptionsEdit->setText(addOptions); - connect(emuPathButton,SIGNAL(clicked()),this,SLOT(emuPathButtonClicked())); + connect(emuPathButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(emuPathButtonClicked())); } VBAConfigWidget::~VBAConfigWidget(){ } void VBAConfigWidget::accept(){ - QDomDocument &doc = *m_part->projectDom(); + TQDomDocument &doc = *m_part->projectDom(); DomUtil::writeEntry(doc, "/kdevvisualadvance/emulator",emuPathEdit->text()); DomUtil::writeEntry(doc, "/kdevvisualadvance/binary",binaryEdit->text()); @@ -135,7 +135,7 @@ void VBAConfigWidget::accept(){ } } void VBAConfigWidget::emuPathButtonClicked(){ - QString emu = KFileDialog::getOpenFileName(QDir::homeDirPath()); + TQString emu = KFileDialog::getOpenFileName(TQDir::homeDirPath()); if(!emu.isEmpty()){ emuPathEdit->setText(emu); } diff --git a/embedded/visualboyadvance/vbaconfigwidget.h b/embedded/visualboyadvance/vbaconfigwidget.h index 61866eb6..eb0bd8ea 100644 --- a/embedded/visualboyadvance/vbaconfigwidget.h +++ b/embedded/visualboyadvance/vbaconfigwidget.h @@ -18,7 +18,7 @@ #ifndef VBACONFIGWIDGET_H #define VBACONFIGWIDGET_H -#include +#include #include "vbaconfigwidgetbase.h" #include "visualboyadvance_part.h" @@ -30,7 +30,7 @@ namespace VisualBoyAdvance { class VBAConfigWidget : public VBAConfigWidgetBase { Q_OBJECT public: - VBAConfigWidget(VisualBoyAdvancePart* part,QWidget *parent=0, const char *name=0); + VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent=0, const char *name=0); ~VBAConfigWidget(); public slots: void accept(); diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp index ad434b43..da7acb88 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.cpp +++ b/embedded/visualboyadvance/visualboyadvance_part.cpp @@ -1,7 +1,7 @@ #include "visualboyadvance_part.h" -#include -#include +#include +#include #include #include @@ -23,7 +23,7 @@ typedef KDevGenericFactory VisualBoyAdvanceFactory; static const KDevPluginInfo data("kdevvisualboyadvance"); K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) ) -VisualBoyAdvancePart::VisualBoyAdvancePart(QObject *parent, const char *name, const QStringList &) +VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &) : KDevPlugin(&data, parent, name){ setInstance(VisualBoyAdvanceFactory::instance()); @@ -31,11 +31,11 @@ VisualBoyAdvancePart::VisualBoyAdvancePart(QObject *parent, const char *name, co KAction *action; action = new KAction( i18n("Execute Program"), "exec", Key_F9, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -45,17 +45,17 @@ VisualBoyAdvancePart::~VisualBoyAdvancePart() } void VisualBoyAdvancePart::slotExecute(){ KDevProject* prj = project(); - QDomDocument &doc = *projectDom(); - QString binary = DomUtil::readEntry(doc, "/kdevvisualadvance/binary"); - QString emulator = DomUtil::readEntry(doc, "/kdevvisualadvance/emulator"); - QString graphicFilter = DomUtil::readEntry(doc, "/kdevvisualadvance/graphicFilter"); - QString scaling = DomUtil::readEntry(doc, "/kdevvisualadvance/scaling"); - QString addOptions = DomUtil::readEntry(doc, "/kdevvisualadvance/addOptions"); + TQDomDocument &doc = *projectDom(); + TQString binary = DomUtil::readEntry(doc, "/kdevvisualadvance/binary"); + TQString emulator = DomUtil::readEntry(doc, "/kdevvisualadvance/emulator"); + TQString graphicFilter = DomUtil::readEntry(doc, "/kdevvisualadvance/graphicFilter"); + TQString scaling = DomUtil::readEntry(doc, "/kdevvisualadvance/scaling"); + TQString addOptions = DomUtil::readEntry(doc, "/kdevvisualadvance/addOptions"); bool terminal = DomUtil::readBoolEntry(doc, "/kdevvisualadvance/terminal"); bool fullscreen = DomUtil::readBoolEntry(doc, "/kdevvisualadvance/fullscreen"); if(emulator.isNull()) emulator = "VisualBoyAdvance"; - QString program = emulator + " " + graphicFilter +" " + scaling + " " + addOptions +" "; + TQString program = emulator + " " + graphicFilter +" " + scaling + " " + addOptions +" "; if(fullscreen){ program += "-F "; } @@ -63,14 +63,14 @@ void VisualBoyAdvancePart::slotExecute(){ program += prj->projectDirectory() + "/" + binary; if (KDevAppFrontend *appFrontend = extension("KDevelop/AppFrontend")) - appFrontend->startAppCommand(QString::QString(), program, terminal); + appFrontend->startAppCommand(TQString::TQString(), program, terminal); } void VisualBoyAdvancePart::projectConfigWidget(KDialogBase *dlg){ - QVBox *vbox; + TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium )); VBAConfigWidget* w = new VBAConfigWidget(this,vbox); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } diff --git a/embedded/visualboyadvance/visualboyadvance_part.h b/embedded/visualboyadvance/visualboyadvance_part.h index 86903d0b..bb231f0d 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.h +++ b/embedded/visualboyadvance/visualboyadvance_part.h @@ -6,7 +6,7 @@ #ifndef __KDEVPART_VISUALBOYADVANCE_H__ #define __KDEVPART_VISUALBOYADVANCE_H__ -#include +#include #include #include @@ -17,7 +17,7 @@ namespace VisualBoyAdvance { public: - VisualBoyAdvancePart(QObject *parent, const char *name, const QStringList &); + VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &); ~VisualBoyAdvancePart(); private slots: void slotExecute(); diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index 071f0d4b..4c287582 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -33,46 +33,46 @@ #include "widgetfactory.h" #include "hierarchyview.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -QAction *ActionDrag::the_action = 0; +TQAction *ActionDrag::the_action = 0; -ActionDrag::ActionDrag(QAction *action, QWidget *source) -: QStoredDrag("application/x-designer-actions", source) +ActionDrag::ActionDrag(TQAction *action, TQWidget *source) +: TQStoredDrag("application/x-designer-actions", source) { Q_ASSERT(the_action == 0); the_action = action; } -ActionDrag::ActionDrag(QActionGroup *group, QWidget *source) -: QStoredDrag("application/x-designer-actiongroup", source) +ActionDrag::ActionDrag(TQActionGroup *group, TQWidget *source) +: TQStoredDrag("application/x-designer-actiongroup", source) { Q_ASSERT(the_action == 0); the_action = group; } -ActionDrag::ActionDrag(const QString &type, QAction *action, QWidget *source) -: QStoredDrag(type, source) +ActionDrag::ActionDrag(const TQString &type, TQAction *action, TQWidget *source) +: TQStoredDrag(type, source) { Q_ASSERT(the_action == 0); the_action = action; } -bool ActionDrag::canDecode(QDropEvent *e) +bool ActionDrag::canDecode(TQDropEvent *e) { return e->provides( "application/x-designer-actions" ) || e->provides( "application/x-designer-actiongroup" ) || @@ -100,24 +100,24 @@ void QDesignerActionGroup::init() WidgetFactory::saveChangedProperties( this, id ); } -bool QDesignerAction::addTo( QWidget *w ) +bool QDesignerAction::addTo( TQWidget *w ) { if ( !widgetToInsert ) - return QAction::addTo( w ); + return TQAction::addTo( w ); - if ( ::qt_cast(w) ) + if ( ::qt_cast(w) ) return FALSE; - widgetToInsert->reparent( w, QPoint( 0, 0 ), FALSE ); + widgetToInsert->reparent( w, TQPoint( 0, 0 ), FALSE ); widgetToInsert->show(); addedTo( widgetToInsert, w ); return TRUE; } -bool QDesignerAction::removeFrom( QWidget *w ) +bool QDesignerAction::removeFrom( TQWidget *w ) { if ( !widgetToInsert ) - return QAction::removeFrom( w ); + return TQAction::removeFrom( w ); remove(); return TRUE; @@ -128,19 +128,19 @@ void QDesignerAction::remove() if ( !widgetToInsert ) return; MainWindow::self->formWindow()->selectWidget( widgetToInsert, FALSE ); - widgetToInsert->reparent( 0, QPoint( 0, 0 ), FALSE ); + widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE ); } -QDesignerToolBarSeparator::QDesignerToolBarSeparator(Orientation o , QToolBar *parent, +QDesignerToolBarSeparator::QDesignerToolBarSeparator(Orientation o , TQToolBar *parent, const char* name ) - : QWidget( parent, name ) + : TQWidget( parent, name ) { - connect( parent, SIGNAL(orientationChanged(Orientation)), - this, SLOT(setOrientation(Orientation)) ); + connect( parent, TQT_SIGNAL(orientationChanged(Orientation)), + this, TQT_SLOT(setOrientation(Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); - setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } void QDesignerToolBarSeparator::setOrientation( Orientation o ) @@ -148,81 +148,81 @@ void QDesignerToolBarSeparator::setOrientation( Orientation o ) orient = o; } -void QDesignerToolBarSeparator::styleChange( QStyle& ) +void QDesignerToolBarSeparator::styleChange( TQStyle& ) { setOrientation( orient ); } -QSize QDesignerToolBarSeparator::sizeHint() const +TQSize QDesignerToolBarSeparator::sizeHint() const { - int extent = style().pixelMetric( QStyle::PM_DockWindowSeparatorExtent, + int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); if ( orient == Horizontal ) - return QSize( extent, 0 ); + return TQSize( extent, 0 ); else - return QSize( 0, extent ); + return TQSize( 0, extent ); } -void QDesignerToolBarSeparator::paintEvent( QPaintEvent * ) +void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) { - QPainter p( this ); - QStyle::SFlags flags = QStyle::Style_Default; + TQPainter p( this ); + TQStyle::SFlags flags = TQStyle::Style_Default; if ( orientation() == Horizontal ) - flags |= QStyle::Style_Horizontal; + flags |= TQStyle::Style_Horizontal; - style().drawPrimitive( QStyle::PE_DockWindowSeparator, &p, rect(), + style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), colorGroup(), flags ); } -QSeparatorAction::QSeparatorAction( QObject *parent ) - : QAction( parent, "qt_designer_separator" ), wid( 0 ) +QSeparatorAction::QSeparatorAction( TQObject *parent ) + : TQAction( parent, "qt_designer_separator" ), wid( 0 ) { } -bool QSeparatorAction::addTo( QWidget *w ) +bool QSeparatorAction::addTo( TQWidget *w ) { - if ( ::qt_cast(w) ) { - QToolBar *tb = (QToolBar*)w; + if ( ::qt_cast(w) ) { + TQToolBar *tb = (TQToolBar*)w; wid = new QDesignerToolBarSeparator( tb->orientation(), tb ); return TRUE; - } else if ( ::qt_cast(w) ) { - idx = ( (QPopupMenu*)w )->count(); - ( (QPopupMenu*)w )->insertSeparator( idx ); + } else if ( ::qt_cast(w) ) { + idx = ( (TQPopupMenu*)w )->count(); + ( (TQPopupMenu*)w )->insertSeparator( idx ); return TRUE; } return FALSE; } -bool QSeparatorAction::removeFrom( QWidget *w ) +bool QSeparatorAction::removeFrom( TQWidget *w ) { - if ( ::qt_cast(w) ) { + if ( ::qt_cast(w) ) { delete wid; return TRUE; - } else if ( ::qt_cast(w) ) { - ( (QPopupMenu*)w )->removeItemAt( idx ); + } else if ( ::qt_cast(w) ) { + ( (TQPopupMenu*)w )->removeItemAt( idx ); return TRUE; } return FALSE; } -QWidget *QSeparatorAction::widget() const +TQWidget *QSeparatorAction::widget() const { return wid; } -QDesignerToolBar::QDesignerToolBar( QMainWindow *mw ) - : QToolBar( mw ), lastIndicatorPos( -1, -1 ) +QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw ) + : TQToolBar( mw ), lastIndicatorPos( -1, -1 ) { insertAnchor = 0; afterAnchor = TRUE; setAcceptDrops( TRUE ); MetaDataBase::addEntry( this ); - lastIndicatorPos = QPoint( -1, -1 ); + lastIndicatorPos = TQPoint( -1, -1 ); indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); installEventFilter( this ); @@ -231,8 +231,8 @@ QDesignerToolBar::QDesignerToolBar( QMainWindow *mw ) mw->setDockEnabled( DockTornOff, FALSE ); } -QDesignerToolBar::QDesignerToolBar( QMainWindow *mw, Dock dock ) - : QToolBar( QString::null, mw, dock), lastIndicatorPos( -1, -1 ) +QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw, Dock dock ) + : TQToolBar( TQString::null, mw, dock), lastIndicatorPos( -1, -1 ) { insertAnchor = 0; afterAnchor = TRUE; @@ -248,7 +248,7 @@ QDesignerToolBar::QDesignerToolBar( QMainWindow *mw, Dock dock ) void QDesignerToolBar::findFormWindow() { - QWidget *w = this; + TQWidget *w = this; while ( w ) { formWindow = ::qt_cast(w); if ( formWindow ) @@ -257,11 +257,11 @@ void QDesignerToolBar::findFormWindow() } } -void QDesignerToolBar::addAction( QAction *a ) +void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, SIGNAL( destroyed() ), this, SLOT( actionRemoved() ) ); - if ( ::qt_cast(a) ) { + connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + if ( ::qt_cast(a) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); } else if ( ::qt_cast(a) ) { @@ -273,79 +273,79 @@ void QDesignerToolBar::addAction( QAction *a ) } } -static void fixObject( QObject *&o ) +static void fixObject( TQObject *&o ) { while ( o && o->parent() && !::qt_cast(o->parent()) ) o = o->parent(); } -bool QDesignerToolBar::eventFilter( QObject *o, QEvent *e ) +bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) { if ( !o || !e || o->inherits( "QDockWindowHandle" ) || o->inherits( "QDockWindowTitleBar" ) ) - return QToolBar::eventFilter( o, e ); + return TQToolBar::eventFilter( o, e ); - if ( o == this && e->type() == QEvent::MouseButtonPress && - ( ( QMouseEvent*)e )->button() == LeftButton ) { - mousePressEvent( (QMouseEvent*)e ); + if ( o == this && e->type() == TQEvent::MouseButtonPress && + ( ( TQMouseEvent*)e )->button() == LeftButton ) { + mousePressEvent( (TQMouseEvent*)e ); return TRUE; } if ( o == this ) - return QToolBar::eventFilter( o, e ); + return TQToolBar::eventFilter( o, e ); - if ( e->type() == QEvent::MouseButtonPress ) { - QMouseEvent *ke = (QMouseEvent*)e; + if ( e->type() == TQEvent::MouseButtonPress ) { + TQMouseEvent *ke = (TQMouseEvent*)e; fixObject( o ); if ( !o ) return FALSE; buttonMousePressEvent( ke, o ); return TRUE; - } else if(e->type() == QEvent::ContextMenu ) { - QContextMenuEvent *ce = (QContextMenuEvent*)e; + } else if(e->type() == TQEvent::ContextMenu ) { + TQContextMenuEvent *ce = (TQContextMenuEvent*)e; fixObject( o ); if( !o ) return FALSE; buttonContextMenuEvent( ce, o ); return TRUE; - } else if ( e->type() == QEvent::MouseMove ) { - QMouseEvent *ke = (QMouseEvent*)e; + } else if ( e->type() == TQEvent::MouseMove ) { + TQMouseEvent *ke = (TQMouseEvent*)e; fixObject( o ); if ( !o ) return FALSE; buttonMouseMoveEvent( ke, o ); return TRUE; - } else if ( e->type() == QEvent::MouseButtonRelease ) { - QMouseEvent *ke = (QMouseEvent*)e; + } else if ( e->type() == TQEvent::MouseButtonRelease ) { + TQMouseEvent *ke = (TQMouseEvent*)e; fixObject( o ); if ( !o ) return FALSE; buttonMouseReleaseEvent( ke, o ); return TRUE; - } else if ( e->type() == QEvent::DragEnter ) { - QDragEnterEvent *de = (QDragEnterEvent*)e; + } else if ( e->type() == TQEvent::DragEnter ) { + TQDragEnterEvent *de = (TQDragEnterEvent*)e; if (ActionDrag::canDecode(de)) de->accept(); - } else if ( e->type() == QEvent::DragMove ) { - QDragMoveEvent *de = (QDragMoveEvent*)e; + } else if ( e->type() == TQEvent::DragMove ) { + TQDragMoveEvent *de = (TQDragMoveEvent*)e; if (ActionDrag::canDecode(de)) de->accept(); } - return QToolBar::eventFilter( o, e ); + return TQToolBar::eventFilter( o, e ); } -void QDesignerToolBar::paintEvent( QPaintEvent *e ) +void QDesignerToolBar::paintEvent( TQPaintEvent *e ) { - QToolBar::paintEvent( e ); + TQToolBar::paintEvent( e ); if ( e->rect() != rect() ) return; - lastIndicatorPos = QPoint( -1, -1 ); + lastIndicatorPos = TQPoint( -1, -1 ); } -void QDesignerToolBar::contextMenuEvent( QContextMenuEvent *e ) +void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) { e->accept(); - QPopupMenu menu( 0 ); + TQPopupMenu menu( 0 ); menu.insertItem( i18n( "Delete Toolbar" ), 1 ); int res = menu.exec( e->globalPos() ); if ( res != -1 ) { @@ -356,7 +356,7 @@ void QDesignerToolBar::contextMenuEvent( QContextMenuEvent *e ) } } -void QDesignerToolBar::mousePressEvent( QMouseEvent *e ) +void QDesignerToolBar::mousePressEvent( TQMouseEvent *e ) { widgetInserting = FALSE; if ( e->button() == LeftButton && @@ -367,14 +367,14 @@ void QDesignerToolBar::mousePressEvent( QMouseEvent *e ) widgetInserting = TRUE; } -void QDesignerToolBar::mouseReleaseEvent( QMouseEvent *e ) +void QDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e ) { if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); widgetInserting = FALSE; } -void QDesignerToolBar::buttonMouseReleaseEvent( QMouseEvent *e, QObject *w ) +void QDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) { if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); @@ -385,14 +385,14 @@ void QDesignerToolBar::buttonMouseReleaseEvent( QMouseEvent *e, QObject *w ) widgetInserting = FALSE; } -void QDesignerToolBar::buttonContextMenuEvent( QContextMenuEvent *e, QObject *o ) +void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o ) { e->accept(); - QPopupMenu menu( 0 ); + TQPopupMenu menu( 0 ); const int ID_DELETE = 1; const int ID_SEP = 2; const int ID_DELTOOLBAR = 3; - QMap::Iterator it = actionMap.find( (QWidget*)o ); + TQMap::Iterator it = actionMap.find( (TQWidget*)o ); if ( it != actionMap.end() && ::qt_cast(*it) ) menu.insertItem( i18n( "Delete Separator" ), ID_DELETE ); else @@ -402,10 +402,10 @@ void QDesignerToolBar::buttonContextMenuEvent( QContextMenuEvent *e, QObject *o menu.insertItem( i18n( "Delete Toolbar" ), ID_DELTOOLBAR ); int res = menu.exec( e->globalPos() ); if ( res == ID_DELETE ) { - QMap::Iterator it = actionMap.find( (QWidget*)o ); + TQMap::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; - QAction *a = *it; + TQAction *a = *it; int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). @@ -415,7 +415,7 @@ void QDesignerToolBar::buttonContextMenuEvent( QContextMenuEvent *e, QObject *o cmd->execute(); } else if ( res == ID_SEP ) { calcIndicatorPos( mapFromGlobal( e->globalPos() ) ); - QAction *a = new QSeparatorAction( 0 ); + TQAction *a = new QSeparatorAction( 0 ); int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; @@ -436,7 +436,7 @@ void QDesignerToolBar::buttonContextMenuEvent( QContextMenuEvent *e, QObject *o } } -void QDesignerToolBar::buttonMousePressEvent( QMouseEvent *e, QObject * ) +void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) { widgetInserting = FALSE; @@ -455,12 +455,12 @@ void QDesignerToolBar::buttonMousePressEvent( QMouseEvent *e, QObject * ) dragStartPos = e->pos(); } -void QDesignerToolBar::removeWidget( QWidget *w ) +void QDesignerToolBar::removeWidget( TQWidget *w ) { - QMap::Iterator it = actionMap.find( w ); + TQMap::Iterator it = actionMap.find( w ); if ( it == actionMap.end() ) return; - QAction *a = *it; + TQAction *a = *it; int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). @@ -468,20 +468,20 @@ void QDesignerToolBar::removeWidget( QWidget *w ) formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - QApplication::sendPostedEvents(); + TQApplication::sendPostedEvents(); adjustSize(); } -void QDesignerToolBar::buttonMouseMoveEvent( QMouseEvent *e, QObject *o ) +void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) { if ( widgetInserting || ( e->state() & LeftButton ) == 0 ) return; - if ( QABS( QPoint( dragStartPos - e->pos() ).manhattanLength() ) < QApplication::startDragDistance() ) + if ( QABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) return; - QMap::Iterator it = actionMap.find( (QWidget*)o ); + TQMap::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; - QAction *a = *it; + TQAction *a = *it; if ( !a ) return; int index = actionList.find( a ); @@ -491,12 +491,12 @@ void QDesignerToolBar::buttonMouseMoveEvent( QMouseEvent *e, QObject *o ) formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - QApplication::sendPostedEvents(); + TQApplication::sendPostedEvents(); adjustSize(); - QString type = ::qt_cast(a) ? QString( "application/x-designer-actiongroup" ) : - ::qt_cast(a) ? QString( "application/x-designer-separator" ) : QString( "application/x-designer-actions" ); - QStoredDrag *drag = new ActionDrag( type, a, this ); + TQString type = ::qt_cast(a) ? TQString( "application/x-designer-actiongroup" ) : + ::qt_cast(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); + TQStoredDrag *drag = new ActionDrag( type, a, this ); drag->setPixmap( a->iconSet().pixmap() ); if ( ::qt_cast(a) ) { if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) ) @@ -509,21 +509,21 @@ void QDesignerToolBar::buttonMouseMoveEvent( QMouseEvent *e, QObject *o ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } - lastIndicatorPos = QPoint( -1, -1 ); + lastIndicatorPos = TQPoint( -1, -1 ); indicator->hide(); } #ifndef QT_NO_DRAGANDDROP -void QDesignerToolBar::dragEnterEvent( QDragEnterEvent *e ) +void QDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e ) { widgetInserting = FALSE; - lastIndicatorPos = QPoint( -1, -1 ); + lastIndicatorPos = TQPoint( -1, -1 ); if (ActionDrag::canDecode(e)) e->accept(); } -void QDesignerToolBar::dragMoveEvent( QDragMoveEvent *e ) +void QDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e ) { if (ActionDrag::canDecode(e)) { e->accept(); @@ -531,14 +531,14 @@ void QDesignerToolBar::dragMoveEvent( QDragMoveEvent *e ) } } -void QDesignerToolBar::dragLeaveEvent( QDragLeaveEvent * ) +void QDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * ) { indicator->hide(); insertAnchor = 0; afterAnchor = TRUE; } -void QDesignerToolBar::dropEvent( QDropEvent *e ) +void QDesignerToolBar::dropEvent( TQDropEvent *e ) { if (!ActionDrag::canDecode(e)) return; @@ -546,7 +546,7 @@ void QDesignerToolBar::dropEvent( QDropEvent *e ) e->accept(); indicator->hide(); - QAction *a = 0; + TQAction *a = 0; int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; @@ -563,7 +563,7 @@ void QDesignerToolBar::dropEvent( QDropEvent *e ) } if ( actionList.findRef( a ) != -1 ) { - QMessageBox::warning( MainWindow::self, i18n( "Insert/Move Action" ), + TQMessageBox::warning( MainWindow::self, i18n( "Insert/Move Action" ), i18n( "Action '%1' has already been added to this toolbar.\n" "An Action may only occur once in a given toolbar." ). arg( a->name() ) ); @@ -576,19 +576,19 @@ void QDesignerToolBar::dropEvent( QDropEvent *e ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - lastIndicatorPos = QPoint( -1, -1 ); + lastIndicatorPos = TQPoint( -1, -1 ); } #endif void QDesignerToolBar::reInsert() { - QAction *a = 0; + TQAction *a = 0; actionMap.clear(); clear(); for ( a = actionList.first(); a; a = actionList.next() ) { a->addTo( this ); - if ( ::qt_cast(a) ) { + if ( ::qt_cast(a) ) { actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); if ( ( (QDesignerActionGroup*)a )->widget() ) ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); @@ -600,31 +600,31 @@ void QDesignerToolBar::reInsert() ( (QSeparatorAction*)a )->widget()->installEventFilter( this ); } } - QApplication::sendPostedEvents(); + TQApplication::sendPostedEvents(); adjustSize(); } void QDesignerToolBar::actionRemoved() { - actionList.removeRef( (QAction*)sender() ); + actionList.removeRef( (TQAction*)sender() ); } -QPoint QDesignerToolBar::calcIndicatorPos( const QPoint &pos ) +TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) { if ( orientation() == Horizontal ) { - QPoint pnt( width() - 2, 0 ); + TQPoint pnt( width() - 2, 0 ); insertAnchor = 0; afterAnchor = TRUE; if ( !children() ) return pnt; - pnt = QPoint( 13, 0 ); - QObjectListIt it( *children() ); - QObject * obj; + pnt = TQPoint( 13, 0 ); + TQObjectListIt it( *children() ); + TQObject * obj; while( (obj=it.current()) != 0 ) { ++it; if ( obj->isWidgetType() && qstrcmp( "qt_dockwidget_internal", obj->name() ) != 0 ) { - QWidget *w = (QWidget*)obj; + TQWidget *w = (TQWidget*)obj; if ( w->x() < pos.x() ) { pnt.setX( w->x() + w->width() + 1 ); insertAnchor = w; @@ -634,19 +634,19 @@ QPoint QDesignerToolBar::calcIndicatorPos( const QPoint &pos ) } return pnt; } else { - QPoint pnt( 0, height() - 2 ); + TQPoint pnt( 0, height() - 2 ); insertAnchor = 0; afterAnchor = TRUE; if ( !children() ) return pnt; - pnt = QPoint( 0, 13 ); - QObjectListIt it( *children() ); - QObject * obj; + pnt = TQPoint( 0, 13 ); + TQObjectListIt it( *children() ); + TQObject * obj; while( (obj=it.current()) != 0 ) { ++it; if ( obj->isWidgetType() && qstrcmp( "qt_dockwidget_internal", obj->name() ) != 0 ) { - QWidget *w = (QWidget*)obj; + TQWidget *w = (TQWidget*)obj; if ( w->y() < pos.y() ) { pnt.setY( w->y() + w->height() + 1 ); insertAnchor = w; @@ -658,36 +658,36 @@ QPoint QDesignerToolBar::calcIndicatorPos( const QPoint &pos ) } } -void QDesignerToolBar::drawIndicator( const QPoint &pos ) +void QDesignerToolBar::drawIndicator( const TQPoint &pos ) { if ( lastIndicatorPos == pos ) return; bool wasVsisible = indicator->isVisible(); if ( orientation() == Horizontal ) { indicator->resize( 3, height() ); - if ( pos != QPoint( -1, -1 ) ) + if ( pos != TQPoint( -1, -1 ) ) indicator->move( pos.x() - 1, 0 ); indicator->show(); indicator->raise(); lastIndicatorPos = pos; } else { indicator->resize( width(), 3 ); - if ( pos != QPoint( -1, -1 ) ) + if ( pos != TQPoint( -1, -1 ) ) indicator->move( 0, pos.y() - 1 ); indicator->show(); indicator->raise(); lastIndicatorPos = pos; } if ( !wasVsisible ) - QApplication::sendPostedEvents(); + TQApplication::sendPostedEvents(); } -void QDesignerToolBar::doInsertWidget( const QPoint &p ) +void QDesignerToolBar::doInsertWidget( const TQPoint &p ) { if ( formWindow != MainWindow::self->formWindow() ) return; calcIndicatorPos( p ); - QWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE ); + TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE ); installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, TRUE ); QDesignerAction *a = new QDesignerAction( w, parent() ); @@ -706,19 +706,19 @@ void QDesignerToolBar::doInsertWidget( const QPoint &p ) void QDesignerToolBar::clear() { - for ( QAction *a = actionList.first(); a; a = actionList.next() ) { + for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( ::qt_cast(a) ) ( (QDesignerAction*)a )->remove(); } - QToolBar::clear(); + TQToolBar::clear(); } -void QDesignerToolBar::installEventFilters( QWidget *w ) +void QDesignerToolBar::installEventFilters( TQWidget *w ) { if ( !w ) return; - QObjectList *l = w->queryList( "QWidget" ); - for ( QObject *o = l->first(); o; o = l->next() ) + TQObjectList *l = w->queryList( "TQWidget" ); + for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( this ); delete l; } diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h index fcf37fe9..5d189f7c 100644 --- a/kdevdesigner/designer/actiondnd.h +++ b/kdevdesigner/designer/actiondnd.h @@ -27,15 +27,15 @@ #ifndef ACTIONDND_H #define ACTIONDND_H -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "../shared/widgetdatabase.h" //class QDesignerPopupMenu; @@ -48,8 +48,8 @@ class QDesignerIndicatorWidget : public QWidget Q_OBJECT public: - QDesignerIndicatorWidget( QWidget *p ) - : QWidget( p, "qt_dockwidget_internal" ) { + QDesignerIndicatorWidget( TQWidget *p ) + : TQWidget( p, "qt_dockwidget_internal" ) { setBackgroundColor( red ); } @@ -60,21 +60,21 @@ class ActionDrag : public QStoredDrag Q_OBJECT public: - ActionDrag(const QString &type, QAction *action, QWidget *source); - ActionDrag(QAction *action, QWidget *source); - ActionDrag(QActionGroup *group, QWidget *source); + ActionDrag(const TQString &type, TQAction *action, TQWidget *source); + ActionDrag(TQAction *action, TQWidget *source); + ActionDrag(TQActionGroup *group, TQWidget *source); ~ActionDrag(); - static bool canDecode(QDropEvent *e); + static bool canDecode(TQDropEvent *e); - static QAction *action() + static TQAction *action() { return the_action; } private: - static QAction *the_action; + static TQAction *the_action; }; class QDesignerActionGroup : public QActionGroup @@ -82,32 +82,32 @@ class QDesignerActionGroup : public QActionGroup Q_OBJECT public: - QDesignerActionGroup( QObject *parent ) - : QActionGroup( ::qt_cast(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); } + QDesignerActionGroup( TQObject *parent ) + : TQActionGroup( ::qt_cast(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); } void init(); - QWidget *widget() const { return wid; } - QWidget *widget( QAction *a ) const { return *widgets.find( a ); } + TQWidget *widget() const { return wid; } + TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } int index() const { return idx; } protected: #if !defined(Q_NO_USING_KEYWORD) - using QActionGroup::addedTo; + using TQActionGroup::addedTo; #endif - void addedTo( QWidget *w, QWidget * ) { + void addedTo( TQWidget *w, TQWidget * ) { wid = w; } - void addedTo( QWidget *w, QWidget *, QAction *a ) { + void addedTo( TQWidget *w, TQWidget *, TQAction *a ) { widgets.insert( a, w ); } - void addedTo( int index, QPopupMenu * ) { + void addedTo( int index, TQPopupMenu * ) { idx = index; } private: - QWidget *wid; - QMap widgets; + TQWidget *wid; + TQMap widgets; int idx; }; @@ -117,34 +117,34 @@ class QDesignerAction : public QAction Q_OBJECT public: - QDesignerAction( QObject *parent ) - : QAction( ::qt_cast(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } - QDesignerAction( QWidget *w, QObject *parent ) - : QAction( ::qt_cast(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } + QDesignerAction( TQObject *parent ) + : TQAction( ::qt_cast(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } + QDesignerAction( TQWidget *w, TQObject *parent ) + : TQAction( ::qt_cast(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } void init(); - QWidget *widget() const { return wid; } + TQWidget *widget() const { return wid; } int index() const { return idx; } - bool addTo( QWidget *w ); - bool removeFrom( QWidget *w ); + bool addTo( TQWidget *w ); + bool removeFrom( TQWidget *w ); void remove(); bool supportsMenu() const { return !widgetToInsert; } protected: - void addedTo( QWidget *w, QWidget * ) { + void addedTo( TQWidget *w, TQWidget * ) { wid = w; } - void addedTo( int index, QPopupMenu * ) { + void addedTo( int index, TQPopupMenu * ) { idx = index; } private: - QWidget *wid; + TQWidget *wid; int idx; - QWidget *widgetToInsert; + TQWidget *widgetToInsert; }; @@ -153,15 +153,15 @@ class QDesignerToolBarSeparator : public QWidget Q_OBJECT public: - QDesignerToolBarSeparator( Orientation, QToolBar *parent, const char* name=0 ); + QDesignerToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 ); - QSize sizeHint() const; + TQSize sizeHint() const; Orientation orientation() const { return orient; } public slots: void setOrientation( Orientation ); protected: - void styleChange( QStyle& ); - void paintEvent( QPaintEvent * ); + void styleChange( TQStyle& ); + void paintEvent( TQPaintEvent * ); private: Orientation orient; }; @@ -172,15 +172,15 @@ class QSeparatorAction : public QAction Q_OBJECT public: - QSeparatorAction( QObject *parent ); + QSeparatorAction( TQObject *parent ); - bool addTo( QWidget *w ); - bool removeFrom( QWidget *w ); - QWidget *widget() const; + bool addTo( TQWidget *w ); + bool removeFrom( TQWidget *w ); + TQWidget *widget() const; int index() const; private: - QWidget *wid; + TQWidget *wid; int idx; }; @@ -191,53 +191,53 @@ class QDesignerToolBar : public QToolBar Q_OBJECT public: - QDesignerToolBar( QMainWindow *mw ); - QDesignerToolBar( QMainWindow *mw, Dock dock ); - QPtrList insertedActions() const { return actionList; } - void addAction( QAction *a ); + QDesignerToolBar( TQMainWindow *mw ); + QDesignerToolBar( TQMainWindow *mw, Dock dock ); + TQPtrList insertedActions() const { return actionList; } + void addAction( TQAction *a ); void clear(); - void installEventFilters( QWidget *w ); - void insertAction( QWidget *w, QAction *a ) { actionMap.insert( w, a ); } - void insertAction( int index, QAction *a ) { actionList.insert( index, a ); } - void appendAction( QAction *a ) { actionList.append( a ); } - void removeAction( QAction *a ) { actionList.remove( a ); } + void installEventFilters( TQWidget *w ); + void insertAction( TQWidget *w, TQAction *a ) { actionMap.insert( w, a ); } + void insertAction( int index, TQAction *a ) { actionList.insert( index, a ); } + void appendAction( TQAction *a ) { actionList.append( a ); } + void removeAction( TQAction *a ) { actionList.remove( a ); } void reInsert(); - void removeWidget( QWidget *w ); + void removeWidget( TQWidget *w ); protected: - bool eventFilter( QObject *, QEvent * ); - void paintEvent( QPaintEvent * ); + bool eventFilter( TQObject *, TQEvent * ); + void paintEvent( TQPaintEvent * ); #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent( QDragEnterEvent * ); - void dragMoveEvent( QDragMoveEvent * ); - void dragLeaveEvent( QDragLeaveEvent * ); - void dropEvent( QDropEvent * ); + void dragEnterEvent( TQDragEnterEvent * ); + void dragMoveEvent( TQDragMoveEvent * ); + void dragLeaveEvent( TQDragLeaveEvent * ); + void dropEvent( TQDropEvent * ); #endif - void contextMenuEvent( QContextMenuEvent *e ); - void mousePressEvent( QMouseEvent *e ); - void mouseReleaseEvent( QMouseEvent *e ); + void contextMenuEvent( TQContextMenuEvent *e ); + void mousePressEvent( TQMouseEvent *e ); + void mouseReleaseEvent( TQMouseEvent *e ); private slots: void actionRemoved(); private: - void drawIndicator( const QPoint &pos ); - QPoint calcIndicatorPos( const QPoint &pos ); - void buttonContextMenuEvent( QContextMenuEvent *e, QObject *o ); - void buttonMousePressEvent( QMouseEvent *e, QObject *o ); - void buttonMouseMoveEvent( QMouseEvent *e, QObject *o ); - void buttonMouseReleaseEvent( QMouseEvent *e, QObject *o ); - void doInsertWidget( const QPoint &p ); + void drawIndicator( const TQPoint &pos ); + TQPoint calcIndicatorPos( const TQPoint &pos ); + void buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o ); + void buttonMousePressEvent( TQMouseEvent *e, TQObject *o ); + void buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ); + void buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *o ); + void doInsertWidget( const TQPoint &p ); void findFormWindow(); private: - QPoint lastIndicatorPos; - QWidget *insertAnchor; + TQPoint lastIndicatorPos; + TQWidget *insertAnchor; bool afterAnchor; - QPtrList actionList; - QMap actionMap; - QPoint dragStartPos; + TQPtrList actionList; + TQMap actionMap; + TQPoint dragStartPos; QDesignerIndicatorWidget *indicator; bool widgetInserting; FormWindow *formWindow; diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp index 589525e4..ad014c9f 100644 --- a/kdevdesigner/designer/actioneditorimpl.cpp +++ b/kdevdesigner/designer/actioneditorimpl.cpp @@ -33,19 +33,19 @@ #include "hierarchyview.h" #include "formfile.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -ActionEditor::ActionEditor( QWidget* parent, const char* name, WFlags fl ) +ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ), explicitlyClosed(false) { @@ -53,27 +53,27 @@ ActionEditor::ActionEditor( QWidget* parent, const char* name, WFlags fl ) setEnabled( FALSE ); buttonConnect->setEnabled( FALSE ); - QPopupMenu *popup = new QPopupMenu( this ); - popup->insertItem( i18n( "New &Action" ), this, SLOT( newAction() ) ); - popup->insertItem( i18n( "New Action &Group" ), this, SLOT( newActionGroup() ) ); - popup->insertItem( i18n( "New &Dropdown Action Group" ), this, SLOT( newDropDownActionGroup() ) ); + TQPopupMenu *popup = new TQPopupMenu( this ); + popup->insertItem( i18n( "New &Action" ), this, TQT_SLOT( newAction() ) ); + popup->insertItem( i18n( "New Action &Group" ), this, TQT_SLOT( newActionGroup() ) ); + popup->insertItem( i18n( "New &Dropdown Action Group" ), this, TQT_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, SIGNAL( insertAction() ), this, SLOT( newAction() ) ); - connect( listActions, SIGNAL( insertActionGroup() ), this, SLOT( newActionGroup() ) ); - connect( listActions, SIGNAL( insertDropDownActionGroup() ), this, SLOT( newDropDownActionGroup() ) ); - connect( listActions, SIGNAL( deleteAction() ), this, SLOT( deleteAction() ) ); - connect( listActions, SIGNAL( connectAction() ), this, SLOT( connectionsClicked() ) ); + connect( listActions, TQT_SIGNAL( insertAction() ), this, TQT_SLOT( newAction() ) ); + connect( listActions, TQT_SIGNAL( insertActionGroup() ), this, TQT_SLOT( newActionGroup() ) ); + connect( listActions, TQT_SIGNAL( insertDropDownActionGroup() ), this, TQT_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQT_SIGNAL( deleteAction() ), this, TQT_SLOT( deleteAction() ) ); + connect( listActions, TQT_SIGNAL( connectAction() ), this, TQT_SLOT( connectionsClicked() ) ); } -void ActionEditor::closeEvent( QCloseEvent *e ) +void ActionEditor::closeEvent( TQCloseEvent *e ) { emit hidden(); e->accept(); } -void ActionEditor::currentActionChanged( QListViewItem *i ) +void ActionEditor::currentActionChanged( TQListViewItem *i ) { buttonConnect->setEnabled( i != 0 ); if ( !i ) @@ -86,9 +86,9 @@ void ActionEditor::currentActionChanged( QListViewItem *i ) MainWindow::self->objectHierarchy()->hierarchyList()->setCurrent( currentAction ); } -void ActionEditor::setCurrentAction( QAction *a ) +void ActionEditor::setCurrentAction( TQAction *a ) { - QListViewItemIterator it( listActions ); + TQListViewItemIterator it( listActions ); while ( it.current() ) { if ( ( (ActionItem*)it.current() )->action() == a || ( (ActionItem*)it.current() )->actionGroup() == a ) { listActions->setCurrentItem( it.current() ); @@ -99,14 +99,14 @@ void ActionEditor::setCurrentAction( QAction *a ) } } -QAction *ActionEditor::newActionEx() +TQAction *ActionEditor::newActionEx() { ActionItem *i = new ActionItem( listActions, (bool)FALSE ); - QAction *a = i->action(); - QObject::connect( a, SIGNAL( destroyed( QObject * ) ), - this, SLOT( removeConnections( QObject* ) ) ); + TQAction *a = i->action(); + TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), + this, TQT_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); - QString n = "Action"; + TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); i->setText( 0, n ); i->action()->setName( n ); @@ -124,7 +124,7 @@ void ActionEditor::deleteAction() if ( !currentAction ) return; - QListViewItemIterator it( listActions ); + TQListViewItemIterator it( listActions ); ActionItem *ai = 0; while ( it.current() ) { ai = (ActionItem*)it.current(); @@ -149,7 +149,7 @@ void ActionEditor::newAction() { ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { - if ( !::qt_cast(actionParent->actionGroup()) ) + if ( !::qt_cast(actionParent->actionGroup()) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -158,11 +158,11 @@ void ActionEditor::newAction() i = new ActionItem( actionParent ); else i = new ActionItem( listActions, (bool)FALSE ); - QAction *a = i->action(); - QObject::connect( a, SIGNAL( destroyed( QObject * ) ), - this, SLOT( removeConnections( QObject* ) ) ); + TQAction *a = i->action(); + TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), + this, TQT_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); - QString n = "Action"; + TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); i->setText( 0, n ); i->action()->setName( n ); @@ -185,7 +185,7 @@ void ActionEditor::newActionGroup() { ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { - if ( !::qt_cast(actionParent->actionGroup()) ) + if ( !::qt_cast(actionParent->actionGroup()) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -194,12 +194,12 @@ void ActionEditor::newActionGroup() i = new ActionItem( actionParent, TRUE ); else i = new ActionItem( listActions, TRUE ); - QAction *ag = i->actionGroup(); - QObject::connect( ag, SIGNAL( destroyed( QObject * ) ), - this, SLOT( removeConnections( QObject* ) ) ); + TQAction *ag = i->actionGroup(); + TQObject::connect( ag, TQT_SIGNAL( destroyed( TQObject * ) ), + this, TQT_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->actionGroup() ); MetaDataBase::setPropertyChanged( i->actionGroup(), "usesDropDown", TRUE ); - QString n = "ActionGroup"; + TQString n = "ActionGroup"; formWindow->unify( i->action(), n, TRUE ); i->setText( 0, n ); i->actionGroup()->setName( n ); @@ -225,23 +225,23 @@ void ActionEditor::setFormWindow( FormWindow *fw ) listActions->clear(); formWindow = fw; if ( !formWindow || - !::qt_cast(formWindow->mainContainer()) ) { + !::qt_cast(formWindow->mainContainer()) ) { setEnabled( FALSE ); } else { setEnabled( TRUE ); - for ( QAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { + for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( ::qt_cast(a->parent()) ) + if ( ::qt_cast(a->parent()) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - QObject::disconnect( a, SIGNAL( destroyed( QObject * ) ), - this, SLOT( removeConnections( QObject * ) ) ); - QObject::connect( a, SIGNAL( destroyed( QObject * ) ), - this, SLOT( removeConnections( QObject* ) ) ); - if ( ::qt_cast(a) ) { + TQObject::disconnect( a, TQT_SIGNAL( destroyed( TQObject * ) ), + this, TQT_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), + this, TQT_SLOT( removeConnections( TQObject* ) ) ); + if ( ::qt_cast(a) ) { insertChildActions( i ); } } @@ -256,30 +256,30 @@ void ActionEditor::insertChildActions( ActionItem *i ) { if ( !i->actionGroup() || !i->actionGroup()->children() ) return; - QObjectListIt it( *i->actionGroup()->children() ); + TQObjectListIt it( *i->actionGroup()->children() ); while ( it.current() ) { - QObject *o = it.current(); + TQObject *o = it.current(); ++it; - if ( !::qt_cast(o) ) + if ( !::qt_cast(o) ) continue; - QAction *a = (QAction*)o; - ActionItem *i2 = new ActionItem( (QListViewItem*)i, a ); + TQAction *a = (TQAction*)o; + ActionItem *i2 = new ActionItem( (TQListViewItem*)i, a ); i->setOpen( TRUE ); i2->setText( 0, a->name() ); i2->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - QObject::disconnect( o, SIGNAL( destroyed( QObject * ) ), - this, SLOT( removeConnections( QObject * ) ) ); - QObject::connect( o, SIGNAL( destroyed( QObject * ) ), - this, SLOT( removeConnections( QObject * ) ) ); - if ( ::qt_cast(a) ) + TQObject::disconnect( o, TQT_SIGNAL( destroyed( TQObject * ) ), + this, TQT_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( o, TQT_SIGNAL( destroyed( TQObject * ) ), + this, TQT_SLOT( removeConnections( TQObject * ) ) ); + if ( ::qt_cast(a) ) insertChildActions( i2 ); } } -void ActionEditor::updateActionName( QAction *a ) +void ActionEditor::updateActionName( TQAction *a ) { - QListViewItemIterator it( listActions ); + TQListViewItemIterator it( listActions ); while ( it.current() ) { if ( ( (ActionItem*)it.current() )->action() == a ) ( (ActionItem*)it.current() )->setText( 0, a->name() ); @@ -289,9 +289,9 @@ void ActionEditor::updateActionName( QAction *a ) } } -void ActionEditor::updateActionIcon( QAction *a ) +void ActionEditor::updateActionIcon( TQAction *a ) { - QListViewItemIterator it( listActions ); + TQListViewItemIterator it( listActions ); while ( it.current() ) { if ( ( (ActionItem*)it.current() )->action() == a ) ( (ActionItem*)it.current() )->setPixmap( 0, a->iconSet().pixmap() ); @@ -309,11 +309,11 @@ void ActionEditor::connectionsClicked() dlg.exec(); } -void ActionEditor::removeConnections( QObject *o ) +void ActionEditor::removeConnections( TQObject *o ) { - QValueList conns = + TQValueList conns = MetaDataBase::connections( formWindow, o ); - for ( QValueList::Iterator it2 = conns.begin(); + for ( TQValueList::Iterator it2 = conns.begin(); it2 != conns.end(); ++it2 ) MetaDataBase::removeConnection( formWindow, (*it2).sender, (*it2).signal, (*it2).receiver, (*it2).slot ); diff --git a/kdevdesigner/designer/actioneditorimpl.h b/kdevdesigner/designer/actioneditorimpl.h index 439a8fb8..e510f38c 100644 --- a/kdevdesigner/designer/actioneditorimpl.h +++ b/kdevdesigner/designer/actioneditorimpl.h @@ -38,39 +38,39 @@ class ActionEditor : public ActionEditorBase Q_OBJECT public: - ActionEditor( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ActionEditor( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); void setFormWindow( FormWindow *fw ); - void updateActionName( QAction *a ); - void updateActionIcon( QAction *a ); + void updateActionName( TQAction *a ); + void updateActionIcon( TQAction *a ); FormWindow *form() const { return formWindow; } bool wantToBeShown() const { return !explicitlyClosed; } void setWantToBeShown( bool b ) { explicitlyClosed = !b; } - void setCurrentAction( QAction *a ); - QAction *newActionEx(); + void setCurrentAction( TQAction *a ); + TQAction *newActionEx(); protected: - void closeEvent( QCloseEvent *e ); + void closeEvent( TQCloseEvent *e ); protected slots: - void currentActionChanged( QListViewItem * ); + void currentActionChanged( TQListViewItem * ); void deleteAction(); void newAction(); void newActionGroup(); void newDropDownActionGroup(); void connectionsClicked(); - void removeConnections( QObject *o ); + void removeConnections( TQObject *o ); signals: void hidden(); - void removing( QAction * ); + void removing( TQAction * ); private: void insertChildActions( ActionItem *i ); private: - QAction *currentAction; + TQAction *currentAction; FormWindow *formWindow; bool explicitlyClosed; diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp index 53c7e292..7b687fe4 100644 --- a/kdevdesigner/designer/actionlistview.cpp +++ b/kdevdesigner/designer/actionlistview.cpp @@ -26,22 +26,22 @@ #include "actiondnd.h" #include "actionlistview.h" -#include +#include #include -ActionListView::ActionListView( QWidget *parent, const char *name ) - : QListView( parent, name ) +ActionListView::ActionListView( TQWidget *parent, const char *name ) + : TQListView( parent, name ) { setShowSortIndicator( TRUE ); setResizeMode( LastColumn ); setRootIsDecorated( TRUE ); - connect( this, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint &, int ) ), - this, SLOT( rmbMenu( QListViewItem *, const QPoint & ) ) ); + connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } -ActionItem::ActionItem( QListView *lv, QAction *ac ) - : QListViewItem( lv ), a( 0 ), g( 0 ) +ActionItem::ActionItem( TQListView *lv, TQAction *ac ) + : TQListViewItem( lv ), a( 0 ), g( 0 ) { g = ::qt_cast(ac); if ( !g ) @@ -49,8 +49,8 @@ ActionItem::ActionItem( QListView *lv, QAction *ac ) setDragEnabled( TRUE ); } -ActionItem::ActionItem( QListViewItem *i, QAction *ac ) - : QListViewItem( i ), a( 0 ), g( 0 ) +ActionItem::ActionItem( TQListViewItem *i, TQAction *ac ) + : TQListViewItem( i ), a( 0 ), g( 0 ) { g = ::qt_cast(ac); if ( !g ) @@ -61,19 +61,19 @@ ActionItem::ActionItem( QListViewItem *i, QAction *ac ) void ActionItem::moveToEnd() { - QListViewItem *i = this; + TQListViewItem *i = this; while ( i->nextSibling() ) i = i->nextSibling(); if ( i != this ) moveItem( i ); } -QDragObject *ActionListView::dragObject() +TQDragObject *ActionListView::dragObject() { ActionItem *i = (ActionItem*)currentItem(); if ( !i ) return 0; - QStoredDrag *drag = 0; + TQStoredDrag *drag = 0; if ( i->action() ) { drag = new ActionDrag( i->action(), viewport() ); drag->setPixmap( i->action()->iconSet().pixmap() ); @@ -84,9 +84,9 @@ QDragObject *ActionListView::dragObject() return drag; } -void ActionListView::rmbMenu( QListViewItem *i, const QPoint &p ) +void ActionListView::rmbMenu( TQListViewItem *i, const TQPoint &p ) { - QPopupMenu *popup = new QPopupMenu( this ); + TQPopupMenu *popup = new TQPopupMenu( this ); popup->insertItem( i18n( "New &Action" ), 0 ); popup->insertItem( i18n( "New Action &Group" ), 1 ); popup->insertItem( i18n( "New &Dropdown Action Group" ), 2 ); diff --git a/kdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h index 59c48b20..66d6419e 100644 --- a/kdevdesigner/designer/actionlistview.h +++ b/kdevdesigner/designer/actionlistview.h @@ -27,20 +27,20 @@ #ifndef ACTIONLISTVIEW_H #define ACTIONLISTVIEW_H -#include +#include #include "actiondnd.h" class ActionItem : public QListViewItem { public: - ActionItem( QListView *lv, bool group ) - : QListViewItem( lv ), + ActionItem( TQListView *lv, bool group ) + : TQListViewItem( lv ), a( group ? 0 : new QDesignerAction( 0 ) ), g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); } - ActionItem( QListView *lv, QAction *ac ); - ActionItem( QListViewItem *i, QAction *ac ); + ActionItem( TQListView *lv, TQAction *ac ); + ActionItem( TQListViewItem *i, TQAction *ac ); ActionItem( ActionItem *parent, bool group = FALSE ) - : QListViewItem( parent ), + : TQListViewItem( parent ), a( group ? 0 : new QDesignerAction( parent->actionGroup() ) ), g( group ? new QDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } @@ -61,13 +61,13 @@ class ActionListView : public QListView Q_OBJECT public: - ActionListView( QWidget *parent = 0, const char *name = 0 ); + ActionListView( TQWidget *parent = 0, const char *name = 0 ); protected: - QDragObject *dragObject(); + TQDragObject *dragObject(); private slots: - void rmbMenu( QListViewItem *i, const QPoint &p ); + void rmbMenu( TQListViewItem *i, const TQPoint &p ); signals: void insertAction(); diff --git a/kdevdesigner/designer/asciivalidator.cpp b/kdevdesigner/designer/asciivalidator.cpp index 7642d47f..695b2292 100644 --- a/kdevdesigner/designer/asciivalidator.cpp +++ b/kdevdesigner/designer/asciivalidator.cpp @@ -26,20 +26,20 @@ #include "asciivalidator.h" -#include +#include -AsciiValidator::AsciiValidator( QObject * parent, const char *name ) - : QValidator( parent, name ), functionName( FALSE ) +AsciiValidator::AsciiValidator( TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( FALSE ) { } -AsciiValidator::AsciiValidator( bool funcName, QObject * parent, const char *name ) - : QValidator( parent, name ), functionName( funcName ) +AsciiValidator::AsciiValidator( bool funcName, TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( funcName ) { } -AsciiValidator::AsciiValidator( const QString &allow, QObject * parent, const char *name ) - : QValidator( parent, name ), functionName( FALSE ), allowedChars( allow ) +AsciiValidator::AsciiValidator( const TQString &allow, TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( FALSE ), allowedChars( allow ) { } @@ -47,7 +47,7 @@ AsciiValidator::~AsciiValidator() { } -QValidator::State AsciiValidator::validate( QString &s, int & ) const +TQValidator::State AsciiValidator::validate( TQString &s, int & ) const { bool inParen = FALSE; bool outParen = FALSE; @@ -58,11 +58,11 @@ QValidator::State AsciiValidator::validate( QString &s, int & ) const uchar c = s[i].cell(); if ( outParen ) { // check if we have 'const' or 'volatile' - static const QString con = " const"; - static const QString vol = " volatile"; - QString mid = s.mid( j ); + static const TQString con = " const"; + static const TQString vol = " volatile"; + TQString mid = s.mid( j ); if ( !( con.startsWith( mid ) || vol.startsWith( mid ) ) ) - return QValidator::Invalid; + return TQValidator::Invalid; } if ( inParen && c != ')' ) @@ -90,5 +90,5 @@ QValidator::State AsciiValidator::validate( QString &s, int & ) const s[i] = '_'; } - return QValidator::Acceptable; + return TQValidator::Acceptable; } diff --git a/kdevdesigner/designer/asciivalidator.h b/kdevdesigner/designer/asciivalidator.h index 2cdfe0cb..8e79d21f 100644 --- a/kdevdesigner/designer/asciivalidator.h +++ b/kdevdesigner/designer/asciivalidator.h @@ -28,23 +28,23 @@ #define ASCIIVALIDATOR_H -#include +#include class AsciiValidator: public QValidator { Q_OBJECT public: - AsciiValidator( QObject * parent, const char *name = 0 ); - AsciiValidator( bool funcName, QObject * parent, const char *name = 0 ); - AsciiValidator( const QString &allow, QObject * parent, const char *name = 0 ); + AsciiValidator( TQObject * parent, const char *name = 0 ); + AsciiValidator( bool funcName, TQObject * parent, const char *name = 0 ); + AsciiValidator( const TQString &allow, TQObject * parent, const char *name = 0 ); ~AsciiValidator(); - QValidator::State validate( QString &, int & ) const; + TQValidator::State validate( TQString &, int & ) const; private: bool functionName; - QString allowedChars; + TQString allowedChars; }; diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index 83ec9a77..8e46c2e1 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -39,22 +39,22 @@ #include "menubareditor.h" #include "popupmenueditor.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef QT_NO_TABLE -#include +#include #endif -#include +#include #include "kdevdesigner_part.h" @@ -93,7 +93,7 @@ void CommandHistory::addCommand( Command *cmd, bool tryCompress ) if ( current < savedAt ) savedAt = -2; - QPtrList commands; + TQPtrList commands; commands.setAutoDelete( FALSE ); for( int i = 0; i <= current; ++i ) { @@ -165,11 +165,11 @@ void CommandHistory::emitUndoRedo() redoCmd = history.at( current + 1 ); bool ua = (undoCmd != 0); - QString uc; + TQString uc; if ( ua ) uc = undoCmd->name(); bool ra = (redoCmd != 0); - QString rc; + TQString rc; if ( ra ) rc = redoCmd->name(); emit undoRedoChanged( ua, ra, uc, rc ); @@ -203,7 +203,7 @@ void CommandHistory::checkCompressedCommand() // ------------------------------------------------------------ -Command::Command( const QString &n, FormWindow *fw ) +Command::Command( const TQString &n, FormWindow *fw ) : cmdName( n ), formWin( fw ) { } @@ -212,7 +212,7 @@ Command::~Command() { } -QString Command::name() const +TQString Command::name() const { return cmdName; } @@ -233,8 +233,8 @@ bool Command::canMerge( Command * ) // ------------------------------------------------------------ -ResizeCommand::ResizeCommand( const QString &n, FormWindow *fw, - QWidget *w, const QRect &oldr, const QRect &nr ) +ResizeCommand::ResizeCommand( const TQString &n, FormWindow *fw, + TQWidget *w, const TQRect &oldr, const TQRect &nr ) : Command( n, fw ), widget( w ), oldRect( oldr ), newRect( nr ) { } @@ -259,21 +259,21 @@ void ResizeCommand::unexecute() // ------------------------------------------------------------ -InsertCommand::InsertCommand( const QString &n, FormWindow *fw, - QWidget *w, const QRect &g ) +InsertCommand::InsertCommand( const TQString &n, FormWindow *fw, + TQWidget *w, const TQRect &g ) : Command( n, fw ), widget( w ), geometry( g ) { } void InsertCommand::execute() { - if ( geometry.size() == QSize( 0, 0 ) ) { + if ( geometry.size() == TQSize( 0, 0 ) ) { widget->move( geometry.topLeft() ); widget->adjustSize(); } else { - QSize s = geometry.size().expandedTo( widget->minimumSize() ); + TQSize s = geometry.size().expandedTo( widget->minimumSize() ); s = s.expandedTo( widget->minimumSizeHint() ); - QRect r( geometry.topLeft(), s ); + TQRect r( geometry.topLeft(), s ); widget->setGeometry( r ); } widget->show(); @@ -293,11 +293,11 @@ void InsertCommand::unexecute() // ------------------------------------------------------------ -MoveCommand::MoveCommand( const QString &n, FormWindow *fw, - const QWidgetList &w, - const QValueList op, - const QValueList np, - QWidget *opr, QWidget *npr ) +MoveCommand::MoveCommand( const TQString &n, FormWindow *fw, + const TQWidgetList &w, + const TQValueList op, + const TQValueList np, + TQWidget *opr, TQWidget *npr ) : Command( n, fw ), widgets( w ), oldPos( op ), newPos( np ), oldParent( opr ), newParent( npr ) { @@ -319,10 +319,10 @@ bool MoveCommand::canMerge( Command *c ) void MoveCommand::execute() { - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) { if ( newParent && oldParent && newParent != oldParent ) { - QPoint pos = newParent->mapFromGlobal( w->mapToGlobal( QPoint( 0,0 ) ) ); + TQPoint pos = newParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) ); w->reparent( newParent, pos, TRUE ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); @@ -340,10 +340,10 @@ void MoveCommand::execute() void MoveCommand::unexecute() { - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) { if ( newParent && oldParent && newParent != oldParent ) { - QPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( QPoint( 0,0 ) ) ); + TQPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) ); w->reparent( oldParent, pos, TRUE ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); @@ -361,18 +361,18 @@ void MoveCommand::unexecute() // ------------------------------------------------------------ -DeleteCommand::DeleteCommand( const QString &n, FormWindow *fw, - const QWidgetList &wl ) +DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, + const TQWidgetList &wl ) : Command( n, fw ), widgets( wl ) { widgets.setAutoDelete( FALSE ); - QWidgetList copyOfWidgets = widgets; + TQWidgetList copyOfWidgets = widgets; copyOfWidgets.setAutoDelete(FALSE); // Include the children of the selected items when deleting - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { - QObjectList *children = w->queryList( "QWidget" ); - for ( QWidget *c = (QWidget *)children->first(); c; c = (QWidget *)children->next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { + TQObjectList *children = w->queryList( "TQWidget" ); + for ( TQWidget *c = (TQWidget *)children->first(); c; c = (TQWidget *)children->next() ) { if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) { widgets.insert(widgets.at() + 1, c); widgets.prev(); @@ -387,16 +387,16 @@ void DeleteCommand::execute() { formWindow()->setPropertyShowingBlocked( TRUE ); connections.clear(); - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->hide(); - QString s = w->name(); + TQString s = w->name(); s.prepend( "qt_dead_widget_" ); w->setName( s ); formWindow()->selectWidget( w, FALSE ); formWindow()->widgets()->remove( w ); - QValueList conns = MetaDataBase::connections( formWindow(), w ); + TQValueList conns = MetaDataBase::connections( formWindow(), w ); connections.insert( w, conns ); - QValueList::Iterator it = conns.begin(); + TQValueList::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { MetaDataBase::removeConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); @@ -412,15 +412,15 @@ void DeleteCommand::unexecute() { formWindow()->setPropertyShowingBlocked( TRUE ); formWindow()->clearSelection( FALSE ); - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->show(); - QString s = w->name(); - s.remove( 0, QString( "qt_dead_widget_" ).length() ); + TQString s = w->name(); + s.remove( 0, TQString( "qt_dead_widget_" ).length() ); w->setName( s ); formWindow()->widgets()->insert( w, w ); formWindow()->selectWidget( w ); - QValueList conns = *connections.find( w ); - QValueList::Iterator it = conns.begin(); + TQValueList conns = *connections.find( w ); + TQValueList::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { MetaDataBase::addConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); @@ -433,11 +433,11 @@ void DeleteCommand::unexecute() // ------------------------------------------------------------ -SetPropertyCommand::SetPropertyCommand( const QString &n, FormWindow *fw, - QObject *w, PropertyEditor *e, - const QString &pn, const QVariant &ov, - const QVariant &nv, const QString &ncut, - const QString &ocut, bool reset ) +SetPropertyCommand::SetPropertyCommand( const TQString &n, FormWindow *fw, + TQObject *w, PropertyEditor *e, + const TQString &pn, const TQVariant &ov, + const TQVariant &nv, const TQString &ncut, + const TQString &ocut, bool reset ) : Command( n, fw ), widget( w ), editor( e ), propName( pn ), oldValue( ov ), newValue( nv ), oldCurrentItemText( ocut ), newCurrentItemText( ncut ), wasChanged( TRUE ), isResetCommand( reset ) @@ -457,8 +457,8 @@ void SetPropertyCommand::execute() if ( isResetCommand ) { MetaDataBase::setPropertyChanged( widget, propName, FALSE ); if ( WidgetFactory::resetProperty( widget, propName ) ) { - if ( !formWindow()->isWidgetSelected( widget ) && formWindow() != (QObject *)widget ) - formWindow()->selectWidget( (QObject *)widget ); + if ( !formWindow()->isWidgetSelected( widget ) && formWindow() != (TQObject *)widget ) + formWindow()->selectWidget( (TQObject *)widget ); if ( editor->widget() != widget ) editor->setWidget( widget, formWindow() ); editor->propertyList()->setCurrentProperty( propName ); @@ -489,17 +489,17 @@ bool SetPropertyCommand::canMerge( Command *c ) SetPropertyCommand *cmd = (SetPropertyCommand*)c; if ( !widget ) return FALSE; - const QMetaProperty *p = + const TQMetaProperty *p = widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return TRUE; - if ( ::qt_cast((QObject *)widget) ) { - MetaDataBase::CustomWidget *cw = ((CustomWidget*)(QObject*)widget)->customWidget(); + if ( ::qt_cast((TQObject *)widget) ) { + MetaDataBase::CustomWidget *cw = ((CustomWidget*)(TQObject*)widget)->customWidget(); if ( !cw ) return FALSE; - for ( QValueList::Iterator it = cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) { - if ( QString( (*it ).property ) == propName ) { + for ( TQValueList::Iterator it = cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) { + if ( TQString( (*it ).property ) == propName ) { if ( (*it).type == "String" || (*it).type == "CString" || (*it).type == "Int" || (*it).type == "UInt" ) return TRUE; } @@ -507,9 +507,9 @@ bool SetPropertyCommand::canMerge( Command *c ) } return FALSE; } - QVariant::Type t = QVariant::nameToType( p->type() ); + TQVariant::Type t = TQVariant::nameToType( p->type() ); return ( cmd->propName == propName && - t == QVariant::String || t == QVariant::CString || t == QVariant::Int || t == QVariant::UInt ); + t == TQVariant::String || t == TQVariant::CString || t == TQVariant::Int || t == TQVariant::UInt ); } void SetPropertyCommand::merge( Command *c ) @@ -522,9 +522,9 @@ void SetPropertyCommand::merge( Command *c ) bool SetPropertyCommand::checkProperty() { if ( propName == "name" /*|| propName == "itemName"*/ ) { // ### fix that - QString s = newValue.toString(); + TQString s = newValue.toString(); if ( !formWindow()->unify( widget, s, FALSE ) ) { - QMessageBox::information( formWindow()->mainWindow(), + TQMessageBox::information( formWindow()->mainWindow(), i18n( "Set 'name' Property" ), i18n( "The name of a widget must be unique.\n" "'%1' is already used in form '%2',\n" @@ -536,7 +536,7 @@ bool SetPropertyCommand::checkProperty() return FALSE; } if ( s.isEmpty() ) { - QMessageBox::information( formWindow()->mainWindow(), + TQMessageBox::information( formWindow()->mainWindow(), i18n( "Set 'name' Property" ), i18n( "The name of a widget must not be null.\n" "The name has been reverted to '%1'." ). @@ -546,12 +546,12 @@ bool SetPropertyCommand::checkProperty() } if ( ::qt_cast(widget->parent()) ) - formWindow()->mainWindow()->formNameChanged( (FormWindow*)((QWidget*)(QObject*)widget)->parentWidget() ); + formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() ); } return TRUE; } -void SetPropertyCommand::setProperty( const QVariant &v, const QString ¤tItemText, bool select ) +void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤tItemText, bool select ) { if ( !widget ) return; @@ -562,7 +562,7 @@ void SetPropertyCommand::setProperty( const QVariant &v, const QString ¤tI editor->setWidget( widget, formWindow() ); if ( select ) editor->propertyList()->setCurrentProperty( propName ); - const QMetaProperty *p = + const TQMetaProperty *p = widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "hAlign" ) { @@ -570,35 +570,35 @@ void SetPropertyCommand::setProperty( const QVariant &v, const QString ¤tI int align = widget->property( "alignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); - widget->setProperty( "alignment", QVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE ); int align = widget->property( "alignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); - widget->setProperty( "alignment", QVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "wordwrap" ) { int align = widget->property( "alignment" ).toInt(); align &= ~WordBreak; if ( v.toBool() ) align |= WordBreak; - widget->setProperty( "alignment", QVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "layoutSpacing" ) { - QVariant val = v; + TQVariant val = v; if ( val.toString() == "default" ) val = -1; - MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( (QWidget*)editor->widget() ), val.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), val.toInt() ); } else if ( propName == "layoutMargin" ) { - QVariant val = v; + TQVariant val = v; if ( val.toString() == "default" ) val = -1; - MetaDataBase::setMargin( WidgetFactory::containerOfWidget( (QWidget*)editor->widget() ), val.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), val.toInt() ); } else if ( propName == "resizeMode" ) { - MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( (QWidget*)editor->widget() ), currentItemText ); + MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), currentItemText ); } else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) { MetaDataBase::setFakeProperty( editor->widget(), propName, v ); } else if ( ::qt_cast(editor->widget()) ) { - MetaDataBase::CustomWidget *cw = ((CustomWidget *)(QObject *)widget)->customWidget(); + MetaDataBase::CustomWidget *cw = ((CustomWidget *)(TQObject *)widget)->customWidget(); if ( cw ) { MetaDataBase::setFakeProperty( editor->widget(), propName, v ); } @@ -608,16 +608,16 @@ void SetPropertyCommand::setProperty( const QVariant &v, const QString ¤tI ( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) ); #ifndef QT_NO_SQL if ( propName == "database" ) { - formWindow()->mainWindow()->objectHierarchy()->databasePropertyChanged( (QWidget*)((QObject *)widget), MetaDataBase::fakeProperty( widget, "database" ).toStringList() ); + formWindow()->mainWindow()->objectHierarchy()->databasePropertyChanged( (TQWidget*)((TQObject *)widget), MetaDataBase::fakeProperty( widget, "database" ).toStringList() ); } #endif return; } if ( p->isSetType() ) { - QStrList strlst; - QStringList lst = QStringList::split( "|", currentItemText ); - QValueListConstIterator it = lst.begin(); + TQStrList strlst; + TQStringList lst = TQStringList::split( "|", currentItemText ); + TQValueListConstIterator it = lst.begin(); for ( ; it != lst.end(); ++it ) strlst.append( (*it).latin1() ); widget->setProperty( propName, p->keysToValue( strlst ) ); @@ -626,11 +626,11 @@ void SetPropertyCommand::setProperty( const QVariant &v, const QString ¤tI } else if ( qstrcmp( p->name(), "buddy" ) == 0 ) { widget->setProperty( propName, currentItemText ); } else { - QVariant ov; + TQVariant ov; if ( propName == "name" || propName == "itemName" ) ov = widget->property( propName ); int oldSerNum = -1; - if ( v.type() == QVariant::Pixmap ) + if ( v.type() == TQVariant::Pixmap ) oldSerNum = v.toPixmap().serialNumber(); widget->setProperty( propName, v ); if ( oldSerNum != -1 && oldSerNum != widget->property( propName ).toPixmap().serialNumber() ) @@ -638,18 +638,18 @@ void SetPropertyCommand::setProperty( const QVariant &v, const QString ¤tI widget->property( propName ).toPixmap().serialNumber(), MetaDataBase::pixmapKey( formWindow(), oldSerNum ) ); if ( propName == "cursor" ) { - MetaDataBase::setCursor( (QWidget*)((QObject *)widget), v.toCursor() ); + MetaDataBase::setCursor( (TQWidget*)((TQObject *)widget), v.toCursor() ); } if ( propName == "name" && widget->isWidgetType() ) { - formWindow()->mainWindow()->objectHierarchy()->namePropertyChanged( ((QWidget*)(QObject *)widget), ov ); + formWindow()->mainWindow()->objectHierarchy()->namePropertyChanged( ((TQWidget*)(TQObject *)widget), ov ); if ( formWindow()->isMainContainer( widget ) ) formWindow()->setName( v.toCString() ); } - if ( propName == "name" && ::qt_cast((QObject *)widget) && ::qt_cast(formWindow()->mainContainer()) ) { - formWindow()->mainWindow()->actioneditor()->updateActionName( (QAction*)(QObject *)widget ); + if ( propName == "name" && ::qt_cast((TQObject *)widget) && ::qt_cast(formWindow()->mainContainer()) ) { + formWindow()->mainWindow()->actioneditor()->updateActionName( (TQAction*)(TQObject *)widget ); } - if ( propName == "iconSet" && ::qt_cast((QObject *)widget) && ::qt_cast(formWindow()->mainContainer()) ) { - formWindow()->mainWindow()->actioneditor()->updateActionIcon( (QAction*)(QObject *)widget ); + if ( propName == "iconSet" && ::qt_cast((TQObject *)widget) && ::qt_cast(formWindow()->mainContainer()) ) { + formWindow()->mainWindow()->actioneditor()->updateActionIcon( (TQAction*)(TQObject *)widget ); } if ( propName == "caption" ) { if ( formWindow()->isMainContainer( widget ) ) @@ -671,9 +671,9 @@ void SetPropertyCommand::setProperty( const QVariant &v, const QString ¤tI // ------------------------------------------------------------ -LayoutHorizontalCommand::LayoutHorizontalCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl ) +LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl ) : Command( n, fw ), layout( wl, parent, fw, layoutBase ) { } @@ -694,9 +694,9 @@ void LayoutHorizontalCommand::unexecute() // ------------------------------------------------------------ -LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl ) +LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl ) : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE ) { } @@ -717,9 +717,9 @@ void LayoutHorizontalSplitCommand::unexecute() // ------------------------------------------------------------ -LayoutVerticalCommand::LayoutVerticalCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl ) +LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl ) : Command( n, fw ), layout( wl, parent, fw, layoutBase ) { } @@ -740,9 +740,9 @@ void LayoutVerticalCommand::unexecute() // ------------------------------------------------------------ -LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl ) +LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl ) : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE ) { } @@ -763,10 +763,10 @@ void LayoutVerticalSplitCommand::unexecute() // ------------------------------------------------------------ -LayoutGridCommand::LayoutGridCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl, int xres, int yres ) - : Command( n, fw ), layout( wl, parent, fw, layoutBase, QSize( QMAX(5,xres), QMAX(5,yres) ) ) +LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl, int xres, int yres ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( QMAX(5,xres), QMAX(5,yres) ) ) { } @@ -786,8 +786,8 @@ void LayoutGridCommand::unexecute() // ------------------------------------------------------------ -BreakLayoutCommand::BreakLayoutCommand( const QString &n, FormWindow *fw, - QWidget *layoutBase, const QWidgetList &wl ) +BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, + TQWidget *layoutBase, const TQWidgetList &wl ) : Command( n, fw ), lb( layoutBase ), widgets( wl ) { WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase ); @@ -795,11 +795,11 @@ BreakLayoutCommand::BreakLayoutCommand( const QString &n, FormWindow *fw, margin = MetaDataBase::margin( layoutBase ); layout = 0; if ( lay == WidgetFactory::HBox ) - layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::qt_cast(layoutBase) != 0 ); + layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::qt_cast(layoutBase) != 0 ); else if ( lay == WidgetFactory::VBox ) - layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::qt_cast(layoutBase) != 0 ); + layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::qt_cast(layoutBase) != 0 ); else if ( lay == WidgetFactory::Grid ) - layout = new GridLayout( wl, layoutBase, fw, layoutBase, QSize( QMAX( 5, fw->grid().x()), QMAX( 5, fw->grid().y()) ), FALSE ); + layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( QMAX( 5, fw->grid().x()), QMAX( 5, fw->grid().y()) ), FALSE ); } void BreakLayoutCommand::execute() @@ -809,7 +809,7 @@ void BreakLayoutCommand::execute() formWindow()->clearSelection( FALSE ); layout->breakLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->resize( QMAX( 16, w->width() ), QMAX( 16, w->height() ) ); } @@ -826,8 +826,8 @@ void BreakLayoutCommand::unexecute() // ------------------------------------------------------------ -MacroCommand::MacroCommand( const QString &n, FormWindow *fw, - const QPtrList &cmds ) +MacroCommand::MacroCommand( const TQString &n, FormWindow *fw, + const TQPtrList &cmds ) : Command( n, fw ), commands( cmds ) { } @@ -846,8 +846,8 @@ void MacroCommand::unexecute() // ------------------------------------------------------------ -AddTabPageCommand::AddTabPageCommand( const QString &n, FormWindow *fw, - QTabWidget *tw, const QString &label ) +AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw, + TQTabWidget *tw, const TQString &label ) : Command( n, fw ), tabWidget( tw ), tabLabel( label ) { tabPage = new QDesignerWidget( formWindow(), tabWidget, "TabPage" ); @@ -876,8 +876,8 @@ void AddTabPageCommand::unexecute() // ------------------------------------------------------------ -MoveTabPageCommand::MoveTabPageCommand( const QString &n, FormWindow *fw, - QTabWidget *tw, QWidget* page, const QString& label, int nIndex, int oIndex ) +MoveTabPageCommand::MoveTabPageCommand( const TQString &n, FormWindow *fw, + TQTabWidget *tw, TQWidget* page, const TQString& label, int nIndex, int oIndex ) : Command( n, fw ), tabWidget( tw ), tabPage( page ), tabLabel( label ) { newIndex = nIndex; @@ -904,8 +904,8 @@ void MoveTabPageCommand::unexecute() // ------------------------------------------------------------ -DeleteTabPageCommand::DeleteTabPageCommand( const QString &n, FormWindow *fw, - QTabWidget *tw, QWidget *page ) +DeleteTabPageCommand::DeleteTabPageCommand( const TQString &n, FormWindow *fw, + TQTabWidget *tw, TQWidget *page ) : Command( n, fw ), tabWidget( tw ), tabPage( page ) { tabLabel = ( (QDesignerTabWidget*)tabWidget )->pageTitle(); @@ -930,7 +930,7 @@ void DeleteTabPageCommand::unexecute() // ------------------------------------------------------------ -AddWidgetStackPageCommand::AddWidgetStackPageCommand( const QString &n, FormWindow *fw, +AddWidgetStackPageCommand::AddWidgetStackPageCommand( const TQString &n, FormWindow *fw, QDesignerWidgetStack *ws ) : Command( n, fw ), widgetStack( ws ) { @@ -955,8 +955,8 @@ void AddWidgetStackPageCommand::unexecute() formWindow()->mainWindow()->objectHierarchy()->tabsChanged( 0 ); } -DeleteWidgetStackPageCommand::DeleteWidgetStackPageCommand( const QString &n, FormWindow *fw, - QDesignerWidgetStack *ws, QWidget *page ) +DeleteWidgetStackPageCommand::DeleteWidgetStackPageCommand( const TQString &n, FormWindow *fw, + QDesignerWidgetStack *ws, TQWidget *page ) : Command( n, fw), widgetStack( ws ), stackPage( page ) { index = -1; @@ -980,8 +980,8 @@ void DeleteWidgetStackPageCommand::unexecute() // ------------------------------------------------------------ -AddWizardPageCommand::AddWizardPageCommand( const QString &n, FormWindow *fw, - QWizard *w, const QString &label, int i, bool s ) +AddWizardPageCommand::AddWizardPageCommand( const TQString &n, FormWindow *fw, + TQWizard *w, const TQString &label, int i, bool s ) : Command( n, fw ), wizard( w ), pageLabel( label ) { page = new QDesignerWidget( formWindow(), wizard, "WizardPage" ); @@ -1012,8 +1012,8 @@ void AddWizardPageCommand::unexecute() // ------------------------------------------------------------ -DeleteWizardPageCommand::DeleteWizardPageCommand( const QString &n, FormWindow *fw, - QWizard *w, int i, bool s ) +DeleteWizardPageCommand::DeleteWizardPageCommand( const TQString &n, FormWindow *fw, + TQWizard *w, int i, bool s ) : Command( n, fw ), wizard( w ), index( i ) { show = s; @@ -1040,8 +1040,8 @@ void DeleteWizardPageCommand::unexecute() // ------------------------------------------------------------ -RenameWizardPageCommand::RenameWizardPageCommand( const QString &n, FormWindow *fw, - QWizard *w, int i, const QString& name ) +RenameWizardPageCommand::RenameWizardPageCommand( const TQString &n, FormWindow *fw, + TQWizard *w, int i, const TQString& name ) : Command( n, fw ), wizard( w ), index( i ), label( name ) { @@ -1050,7 +1050,7 @@ RenameWizardPageCommand::RenameWizardPageCommand( const QString &n, FormWindow * void RenameWizardPageCommand::execute() { page = wizard->page( index ); - QString oldLabel = wizard->title( page ); + TQString oldLabel = wizard->title( page ); wizard->setTitle( page, label ); label = oldLabel; @@ -1064,17 +1064,17 @@ void RenameWizardPageCommand::unexecute() // ------------------------------------------------------------ -SwapWizardPagesCommand::SwapWizardPagesCommand( const QString &n, FormWindow *fw, QWizard *w, int i1, int i2 ) +SwapWizardPagesCommand::SwapWizardPagesCommand( const TQString &n, FormWindow *fw, TQWizard *w, int i1, int i2 ) : Command( n, fw ), wizard( w ), index1( i1 ), index2( i2 ) { } void SwapWizardPagesCommand::execute() { - QWidget *page1 = wizard->page( index1 ); - QWidget *page2 = wizard->page( index2 ); - QString page1Label = wizard->title( page1 ); - QString page2Label = wizard->title( page2 ); + TQWidget *page1 = wizard->page( index1 ); + TQWidget *page2 = wizard->page( index2 ); + TQString page1Label = wizard->title( page1 ); + TQString page2Label = wizard->title( page2 ); wizard->removePage( page1 ); wizard->removePage( page2 ); wizard->insertPage( page1, page1Label, index2 ); @@ -1090,15 +1090,15 @@ void SwapWizardPagesCommand::unexecute() // ------------------------------------------------------------ -MoveWizardPageCommand::MoveWizardPageCommand( const QString &n, FormWindow *fw, QWizard *w, int i1, int i2 ) +MoveWizardPageCommand::MoveWizardPageCommand( const TQString &n, FormWindow *fw, TQWizard *w, int i1, int i2 ) : Command( n, fw ), wizard( w ), index1( i1 ), index2( i2 ) { } void MoveWizardPageCommand::execute() { - QWidget *page = wizard->page( index1 ); - QString pageLabel = wizard->title( page ); + TQWidget *page = wizard->page( index1 ); + TQString pageLabel = wizard->title( page ); wizard->removePage( page ); wizard->insertPage( page, pageLabel, index2 ); formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); @@ -1108,8 +1108,8 @@ void MoveWizardPageCommand::execute() void MoveWizardPageCommand::unexecute() { // ###FIX: index1 may be the wrong place - QWidget *page = wizard->page( index2 ); - QString pageLabel = wizard->title( page ); + TQWidget *page = wizard->page( index2 ); + TQString pageLabel = wizard->title( page ); wizard->removePage( page ); wizard->insertPage( page, pageLabel, index1 ); formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); @@ -1118,7 +1118,7 @@ void MoveWizardPageCommand::unexecute() // ------------------------------------------------------------ -AddConnectionCommand::AddConnectionCommand( const QString &name, FormWindow *fw, +AddConnectionCommand::AddConnectionCommand( const TQString &name, FormWindow *fw, MetaDataBase::Connection c ) : Command( name, fw ), connection( c ) { @@ -1142,7 +1142,7 @@ void AddConnectionCommand::unexecute() // ------------------------------------------------------------ -RemoveConnectionCommand::RemoveConnectionCommand( const QString &name, FormWindow *fw, +RemoveConnectionCommand::RemoveConnectionCommand( const TQString &name, FormWindow *fw, MetaDataBase::Connection c ) : Command( name, fw ), connection( c ) { @@ -1166,9 +1166,9 @@ void RemoveConnectionCommand::unexecute() // ------------------------------------------------------------ -AddFunctionCommand::AddFunctionCommand( const QString &name, FormWindow *fw, const QCString &f, - const QString& spec, const QString &a, const QString &t, - const QString &l, const QString &rt ) +AddFunctionCommand::AddFunctionCommand( const TQString &name, FormWindow *fw, const TQCString &f, + const TQString& spec, const TQString &a, const TQString &t, + const TQString &l, const TQString &rt ) : Command( name, fw ), function( f ), specifier( spec ), access( a ), functionType( t ), language( l ), returnType( rt ) { @@ -1213,10 +1213,10 @@ void AddFunctionCommand::unexecute() // ------------------------------------------------------------ -ChangeFunctionAttribCommand::ChangeFunctionAttribCommand( const QString &name, FormWindow *fw, MetaDataBase::Function f, - const QString &on, const QString &os, - const QString &oa, const QString &ot, const QString &ol, - const QString &ort ) +ChangeFunctionAttribCommand::ChangeFunctionAttribCommand( const TQString &name, FormWindow *fw, MetaDataBase::Function f, + const TQString &on, const TQString &os, + const TQString &oa, const TQString &ot, const TQString &ol, + const TQString &ort ) : Command( name, fw ), oldName( on ), oldSpec( os ), oldAccess( oa ), oldType( ot ), oldLang( ol ), oldReturnType( ort ) { @@ -1284,15 +1284,15 @@ void ChangeFunctionAttribCommand::unexecute() // ------------------------------------------------------------ -RemoveFunctionCommand::RemoveFunctionCommand( const QString &name, FormWindow *fw, const QCString &f, - const QString& spec, const QString &a, const QString &t, - const QString &l, const QString &rt ) +RemoveFunctionCommand::RemoveFunctionCommand( const TQString &name, FormWindow *fw, const TQCString &f, + const TQString& spec, const TQString &a, const TQString &t, + const TQString &l, const TQString &rt ) : Command( name, fw ), function( f ), specifier( spec ), access( a ), functionType( t ), language( l ), returnType( rt ) { if ( spec.isNull() ) { - QValueList lst = MetaDataBase::functionList( fw ); - for ( QValueList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + TQValueList lst = MetaDataBase::functionList( fw ); + for ( TQValueList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( MetaDataBase::normalizeFunction( (*it).function ) == MetaDataBase::normalizeFunction( function ) ) { specifier = (*it).specifier; @@ -1347,7 +1347,7 @@ void RemoveFunctionCommand::unexecute() // ------------------------------------------------------------ -AddVariableCommand::AddVariableCommand( const QString &name, FormWindow *fw, const QString &vn, const QString &a ) +AddVariableCommand::AddVariableCommand( const TQString &name, FormWindow *fw, const TQString &vn, const TQString &a ) : Command( name, fw ), varName( vn ), access( a ) { } @@ -1370,8 +1370,8 @@ void AddVariableCommand::unexecute() // ------------------------------------------------------------ -SetVariablesCommand::SetVariablesCommand( const QString &name, FormWindow *fw, - QValueList lst ) +SetVariablesCommand::SetVariablesCommand( const TQString &name, FormWindow *fw, + TQValueList lst ) : Command( name, fw ), newList( lst ) { oldList = MetaDataBase::variables( formWindow() ); @@ -1395,11 +1395,11 @@ void SetVariablesCommand::unexecute() // ------------------------------------------------------------ -RemoveVariableCommand::RemoveVariableCommand( const QString &name, FormWindow *fw, const QString &vn ) +RemoveVariableCommand::RemoveVariableCommand( const TQString &name, FormWindow *fw, const TQString &vn ) : Command( name, fw ), varName( vn ) { - QValueList lst = MetaDataBase::variables( fw ); - for ( QValueList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + TQValueList lst = MetaDataBase::variables( fw ); + for ( TQValueList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( (*it).varName == varName ) { access = (*it).varAccess; break; @@ -1425,8 +1425,8 @@ void RemoveVariableCommand::unexecute() // ------------------------------------------------------------ -EditDefinitionsCommand::EditDefinitionsCommand( const QString &name, FormWindow *fw, LanguageInterface *lf, - const QString &n, const QStringList &nl ) +EditDefinitionsCommand::EditDefinitionsCommand( const TQString &name, FormWindow *fw, LanguageInterface *lf, + const TQString &n, const TQStringList &nl ) : Command( name, fw ), lIface( lf ), defName( n ), newList( nl ) { oldList = lIface->definitionEntries( defName, formWindow()->mainWindow()->designerInterface() ); @@ -1452,14 +1452,14 @@ void EditDefinitionsCommand::unexecute() // ------------------------------------------------------------ -LowerCommand::LowerCommand( const QString &name, FormWindow *fw, const QWidgetList &w ) +LowerCommand::LowerCommand( const TQString &name, FormWindow *fw, const TQWidgetList &w ) : Command( name, fw ), widgets( w ) { } void LowerCommand::execute() { - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->lower(); formWindow()->raiseSelection( w ); } @@ -1468,7 +1468,7 @@ void LowerCommand::execute() void LowerCommand::unexecute() { - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->raise(); formWindow()->raiseSelection( w ); } @@ -1476,14 +1476,14 @@ void LowerCommand::unexecute() // ------------------------------------------------------------ -RaiseCommand::RaiseCommand( const QString &name, FormWindow *fw, const QWidgetList &w ) +RaiseCommand::RaiseCommand( const TQString &name, FormWindow *fw, const TQWidgetList &w ) : Command( name, fw ), widgets( w ) { } void RaiseCommand::execute() { - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->raise(); formWindow()->raiseSelection( w ); } @@ -1492,7 +1492,7 @@ void RaiseCommand::execute() void RaiseCommand::unexecute() { - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->lower(); formWindow()->raiseSelection( w ); } @@ -1500,15 +1500,15 @@ void RaiseCommand::unexecute() // ------------------------------------------------------------ -PasteCommand::PasteCommand( const QString &n, FormWindow *fw, - const QWidgetList &w ) +PasteCommand::PasteCommand( const TQString &n, FormWindow *fw, + const TQWidgetList &w ) : Command( n, fw ), widgets( w ) { } void PasteCommand::execute() { - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->show(); formWindow()->selectWidget( w ); formWindow()->widgets()->insert( w, w ); @@ -1518,7 +1518,7 @@ void PasteCommand::execute() void PasteCommand::unexecute() { - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->hide(); formWindow()->selectWidget( w, FALSE ); formWindow()->widgets()->remove( w ); @@ -1528,8 +1528,8 @@ void PasteCommand::unexecute() // ------------------------------------------------------------ -TabOrderCommand::TabOrderCommand( const QString &n, FormWindow *fw, - const QWidgetList &ol, const QWidgetList &nl ) +TabOrderCommand::TabOrderCommand( const TQString &n, FormWindow *fw, + const TQWidgetList &ol, const TQWidgetList &nl ) : Command( n, fw ), oldOrder( ol ), newOrder( nl ) { } @@ -1557,11 +1557,11 @@ void TabOrderCommand::unexecute() // ------------------------------------------------------------ -PopulateListBoxCommand::PopulateListBoxCommand( const QString &n, FormWindow *fw, - QListBox *lb, const QValueList &items ) +PopulateListBoxCommand::PopulateListBoxCommand( const TQString &n, FormWindow *fw, + TQListBox *lb, const TQValueList &items ) : Command( n, fw ), newItems( items ), listbox( lb ) { - QListBoxItem *i = 0; + TQListBoxItem *i = 0; for ( i = listbox->firstItem(); i; i = i->next() ) { Item item; if ( i->pixmap() ) @@ -1574,12 +1574,12 @@ PopulateListBoxCommand::PopulateListBoxCommand( const QString &n, FormWindow *fw void PopulateListBoxCommand::execute() { listbox->clear(); - for ( QValueList::Iterator it = newItems.begin(); it != newItems.end(); ++it ) { + for ( TQValueList::Iterator it = newItems.begin(); it != newItems.end(); ++it ) { Item i = *it; if ( !i.pix.isNull() ) - (void)new QListBoxPixmap( listbox, i.pix, i.text ); + (void)new TQListBoxPixmap( listbox, i.pix, i.text ); else - (void)new QListBoxText( listbox, i.text ); + (void)new TQListBoxText( listbox, i.text ); } formWindow()->mainWindow()->propertyeditor()->refetchData(); } @@ -1587,24 +1587,24 @@ void PopulateListBoxCommand::execute() void PopulateListBoxCommand::unexecute() { listbox->clear(); - for ( QValueList::Iterator it = oldItems.begin(); it != oldItems.end(); ++it ) { + for ( TQValueList::Iterator it = oldItems.begin(); it != oldItems.end(); ++it ) { Item i = *it; if ( !i.pix.isNull() ) - (void)new QListBoxPixmap( listbox, i.pix, i.text ); + (void)new TQListBoxPixmap( listbox, i.pix, i.text ); else - (void)new QListBoxText( listbox, i.text ); + (void)new TQListBoxText( listbox, i.text ); } formWindow()->mainWindow()->propertyeditor()->refetchData(); } // ------------------------------------------------------------ -PopulateIconViewCommand::PopulateIconViewCommand( const QString &n, FormWindow *fw, - QIconView *iv, const QValueList &items ) +PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow *fw, + TQIconView *iv, const TQValueList &items ) : Command( n, fw ), newItems( items ), iconview( iv ) { #ifndef QT_NO_ICONVIEW - QIconViewItem *i = 0; + TQIconViewItem *i = 0; for ( i = iconview->firstItem(); i; i = i->nextItem() ) { Item item; if ( i->pixmap() ) @@ -1619,9 +1619,9 @@ void PopulateIconViewCommand::execute() { #ifndef QT_NO_ICONVIEW iconview->clear(); - for ( QValueList::Iterator it = newItems.begin(); it != newItems.end(); ++it ) { + for ( TQValueList::Iterator it = newItems.begin(); it != newItems.end(); ++it ) { Item i = *it; - (void)new QIconViewItem( iconview, i.text, i.pix ); + (void)new TQIconViewItem( iconview, i.text, i.pix ); } #endif } @@ -1630,23 +1630,23 @@ void PopulateIconViewCommand::unexecute() { #ifndef QT_NO_ICONVIEW iconview->clear(); - for ( QValueList::Iterator it = oldItems.begin(); it != oldItems.end(); ++it ) { + for ( TQValueList::Iterator it = oldItems.begin(); it != oldItems.end(); ++it ) { Item i = *it; - (void)new QIconViewItem( iconview, i.text, i.pix ); + (void)new TQIconViewItem( iconview, i.text, i.pix ); } #endif } // ------------------------------------------------------------ -PopulateListViewCommand::PopulateListViewCommand( const QString &n, FormWindow *fw, - QListView *lv, QListView *from ) +PopulateListViewCommand::PopulateListViewCommand( const TQString &n, FormWindow *fw, + TQListView *lv, TQListView *from ) : Command( n, fw ), listview( lv ) { - newItems = new QListView(); + newItems = new TQListView(); newItems->hide(); transferItems( from, newItems ); - oldItems = new QListView(); + oldItems = new TQListView(); oldItems->hide(); transferItems( listview, oldItems ); } @@ -1663,12 +1663,12 @@ void PopulateListViewCommand::unexecute() transferItems( oldItems, listview ); } -void PopulateListViewCommand::transferItems( QListView *from, QListView *to ) +void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) { - QHeader *header = to->header(); + TQHeader *header = to->header(); while ( header->count() ) to->removeColumn( 0 ); - QHeader *h2 = from->header(); + TQHeader *h2 = from->header(); for ( int i = 0; i < h2->count(); ++i ) { to->addColumn( h2->label( i ) ); if ( h2->iconSet( i ) && !h2->iconSet( i )->pixmap().isNull() ) @@ -1677,25 +1677,25 @@ void PopulateListViewCommand::transferItems( QListView *from, QListView *to ) header->setClickEnabled( h2->isClickEnabled( i ), i ); } - QListViewItemIterator it( from ); - QPtrStack fromParents, toParents; + TQListViewItemIterator it( from ); + TQPtrStack fromParents, toParents; fromParents.push( 0 ); toParents.push( 0 ); - QPtrStack toLasts; - QListViewItem *fromLast = 0; + TQPtrStack toLasts; + TQListViewItem *fromLast = 0; toLasts.push( 0 ); int cols = from->columns(); to->setSorting( -1 ); from->setSorting( -1 ); for ( ; it.current(); ++it ) { - QListViewItem *i = it.current(); + TQListViewItem *i = it.current(); if ( i->parent() == fromParents.top() ) { - QListViewItem *pi = toParents.top(); - QListViewItem *ni = 0; + TQListViewItem *pi = toParents.top(); + TQListViewItem *ni = 0; if ( pi ) - ni = new QListViewItem( pi, toLasts.top() ); + ni = new TQListViewItem( pi, toLasts.top() ); else - ni = new QListViewItem( to, toLasts.top() ); + ni = new TQListViewItem( to, toLasts.top() ); for ( int c = 0; c < cols; ++c ) { ni->setText( c, i->text( c ) ); if ( i->pixmap( c ) ) @@ -1710,12 +1710,12 @@ void PopulateListViewCommand::transferItems( QListView *from, QListView *to ) fromParents.push( fromLast ); toParents.push( toLasts.top() ); toLasts.push( 0 ); - QListViewItem *pi = toParents.top(); - QListViewItem *ni = 0; + TQListViewItem *pi = toParents.top(); + TQListViewItem *ni = 0; if ( pi ) - ni = new QListViewItem( pi ); + ni = new TQListViewItem( pi ); else - ni = new QListViewItem( to ); + ni = new TQListViewItem( to ); for ( int c = 0; c < cols; ++c ) { ni->setText( c, i->text( c ) ); if ( i->pixmap( c ) ) @@ -1732,12 +1732,12 @@ void PopulateListViewCommand::transferItems( QListView *from, QListView *to ) toLasts.pop(); } - QListViewItem *pi = toParents.top(); - QListViewItem *ni = 0; + TQListViewItem *pi = toParents.top(); + TQListViewItem *ni = 0; if ( pi ) - ni = new QListViewItem( pi, toLasts.top() ); + ni = new TQListViewItem( pi, toLasts.top() ); else - ni = new QListViewItem( to, toLasts.top() ); + ni = new TQListViewItem( to, toLasts.top() ); for ( int c = 0; c < cols; ++c ) { ni->setText( c, i->text( c ) ); if ( i->pixmap( c ) ) @@ -1757,8 +1757,8 @@ void PopulateListViewCommand::transferItems( QListView *from, QListView *to ) // ------------------------------------------------------------ -PopulateMultiLineEditCommand::PopulateMultiLineEditCommand( const QString &n, FormWindow *fw, - QTextEdit *mle, const QString &txt ) +PopulateMultiLineEditCommand::PopulateMultiLineEditCommand( const TQString &n, FormWindow *fw, + TQTextEdit *mle, const TQString &txt ) : Command( n, fw ), newText( txt ), mlined( mle ) { oldText = mlined->text(); @@ -1781,14 +1781,14 @@ void PopulateMultiLineEditCommand::unexecute() // ------------------------------------------------------------ -PopulateTableCommand::PopulateTableCommand( const QString &n, FormWindow *fw, QTable *t, - const QValueList &rows, - const QValueList &columns ) +PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, TQTable *t, + const TQValueList &rows, + const TQValueList &columns ) : Command( n, fw ), newRows( rows ), newColumns( columns ), table( t ) { #ifndef QT_NO_TABLE int i = 0; - QMap columnFields = MetaDataBase::columnFields( table ); + TQMap columnFields = MetaDataBase::columnFields( table ); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { PopulateTableCommand::Column col; col.text = table->horizontalHeader()->label( i ); @@ -1810,10 +1810,10 @@ PopulateTableCommand::PopulateTableCommand( const QString &n, FormWindow *fw, QT void PopulateTableCommand::execute() { #ifndef QT_NO_TABLE - QMap columnFields; + TQMap columnFields; table->setNumCols( newColumns.count() ); int i = 0; - for ( QValueList::Iterator cit = newColumns.begin(); cit != newColumns.end(); ++cit, ++i ) { + for ( TQValueList::Iterator cit = newColumns.begin(); cit != newColumns.end(); ++cit, ++i ) { table->horizontalHeader()->setLabel( i, (*cit).pix, (*cit).text ); if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); @@ -1821,7 +1821,7 @@ void PopulateTableCommand::execute() MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( newRows.count() ); i = 0; - for ( QValueList::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i ) + for ( TQValueList::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i ) table->verticalHeader()->setLabel( i, (*rit).pix, (*rit).text ); #endif } @@ -1829,10 +1829,10 @@ void PopulateTableCommand::execute() void PopulateTableCommand::unexecute() { #ifndef QT_NO_TABLE - QMap columnFields; + TQMap columnFields; table->setNumCols( oldColumns.count() ); int i = 0; - for ( QValueList::Iterator cit = oldColumns.begin(); cit != oldColumns.end(); ++cit, ++i ) { + for ( TQValueList::Iterator cit = oldColumns.begin(); cit != oldColumns.end(); ++cit, ++i ) { table->horizontalHeader()->setLabel( i, (*cit).pix, (*cit).text ); if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); @@ -1840,15 +1840,15 @@ void PopulateTableCommand::unexecute() MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( oldRows.count() ); i = 0; - for ( QValueList::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i ) + for ( TQValueList::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i ) table->verticalHeader()->setLabel( i, (*rit).pix, (*rit).text ); #endif } // ------------------------------------------------------------ -AddActionToToolBarCommand::AddActionToToolBarCommand( const QString &n, FormWindow *fw, - QAction *a, QDesignerToolBar *tb, int idx ) +AddActionToToolBarCommand::AddActionToToolBarCommand( const TQString &n, FormWindow *fw, + TQAction *a, QDesignerToolBar *tb, int idx ) : Command( n, fw ), action( a ), toolBar( tb ), index( idx ) { } @@ -1858,9 +1858,9 @@ void AddActionToToolBarCommand::execute() action->addTo( toolBar ); if ( ::qt_cast(action) ) { - QString s = ( (QDesignerAction*)action )->widget()->name(); + TQString s = ( (QDesignerAction*)action )->widget()->name(); if ( s.startsWith( "qt_dead_widget_" ) ) { - s.remove( 0, QString( "qt_dead_widget_" ).length() ); + s.remove( 0, TQString( "qt_dead_widget_" ).length() ); ( (QDesignerAction*)action )->widget()->setName( s ); } toolBar->insertAction( ( (QDesignerAction*)action )->widget(), action ); @@ -1874,21 +1874,21 @@ void AddActionToToolBarCommand::execute() toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action ); ( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar ); } - if ( !::qt_cast(action) || ( (QActionGroup*)action )->usesDropDown()) { + if ( !::qt_cast(action) || ( (TQActionGroup*)action )->usesDropDown()) { if ( index == -1 ) toolBar->appendAction( action ); else toolBar->insertAction( index, action ); toolBar->reInsert(); - QObject::connect( action, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); } else { if ( action->children() ) { - QObjectListIt it( *action->children() ); + TQObjectListIt it( *action->children() ); int i = 0; while ( it.current() ) { - QObject *o = it.current(); + TQObject *o = it.current(); ++it; - if ( !::qt_cast(o) ) + if ( !::qt_cast(o) ) continue; // ### fix it for nested actiongroups if ( ::qt_cast(o) ) { @@ -1900,11 +1900,11 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index + (i++), ac ); } - QObject::connect( o, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::connect( o, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); } } toolBar->reInsert(); - QObject::connect( action, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); } formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -1912,29 +1912,29 @@ void AddActionToToolBarCommand::execute() void AddActionToToolBarCommand::unexecute() { if ( ::qt_cast(action) ) { - QString s = ( (QDesignerAction*)action )->widget()->name(); + TQString s = ( (QDesignerAction*)action )->widget()->name(); s.prepend( "qt_dead_widget_" ); ( (QDesignerAction*)action )->widget()->setName( s ); } toolBar->removeAction( action ); action->removeFrom( toolBar ); - QObject::disconnect( action, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); - if ( !::qt_cast(action) || ( (QActionGroup*)action )->usesDropDown()) { + TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + if ( !::qt_cast(action) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { if ( action->children() ) { - QObjectListIt it( *action->children() ); + TQObjectListIt it( *action->children() ); while ( it.current() ) { - QObject *o = it.current(); + TQObject *o = it.current(); ++it; - if ( !::qt_cast(o) ) + if ( !::qt_cast(o) ) continue; if ( ::qt_cast(o) ) { o->removeEventFilter( toolBar ); - toolBar->removeAction( (QAction*)o ); + toolBar->removeAction( (TQAction*)o ); } - QObject::disconnect( o, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::disconnect( o, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); } } } @@ -1943,7 +1943,7 @@ void AddActionToToolBarCommand::unexecute() // ------------------------------------------------------------ -AddToolBarCommand::AddToolBarCommand( const QString &n, FormWindow *fw, QMainWindow *mw ) +AddToolBarCommand::AddToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw ) : Command( n, fw ), toolBar( 0 ), mainWindow( mw ) { } @@ -1952,14 +1952,14 @@ void AddToolBarCommand::execute() { if ( !toolBar ) { toolBar = new QDesignerToolBar( mainWindow ); - QString n = "Toolbar"; + TQString n = "Toolbar"; formWindow()->unify( toolBar, n, TRUE ); toolBar->setName( n ); mainWindow->addToolBar( toolBar, n ); } else { toolBar->show(); - QString s = toolBar->name(); - s.remove( 0, QString( "qt_dead_widget_" ).length() ); + TQString s = toolBar->name(); + s.remove( 0, TQString( "qt_dead_widget_" ).length() ); toolBar->setName( s ); } formWindow()->mainWindow()->objectHierarchy()->rebuild(); @@ -1968,7 +1968,7 @@ void AddToolBarCommand::execute() void AddToolBarCommand::unexecute() { toolBar->hide(); - QString s = toolBar->name(); + TQString s = toolBar->name(); s.prepend( "qt_dead_widget_" ); toolBar->setName( s ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); @@ -1977,8 +1977,8 @@ void AddToolBarCommand::unexecute() // ------------------------------------------------------------ #ifdef QT_CONTAINER_CUSTOM_WIDGETS -AddContainerPageCommand::AddContainerPageCommand( const QString &n, FormWindow *fw, - QWidget *c, const QString &label ) +AddContainerPageCommand::AddContainerPageCommand( const TQString &n, FormWindow *fw, + TQWidget *c, const TQString &label ) : Command( n, fw ), container( c ), index( -1 ), pageLabel( label ), page( 0 ) { WidgetInterface *iface = 0; @@ -2024,8 +2024,8 @@ void AddContainerPageCommand::unexecute() // ------------------------------------------------------------ -DeleteContainerPageCommand::DeleteContainerPageCommand( const QString &n, FormWindow *fw, - QWidget *c, int idx ) +DeleteContainerPageCommand::DeleteContainerPageCommand( const TQString &n, FormWindow *fw, + TQWidget *c, int idx ) : Command( n, fw ), container( c ), index( idx ) { WidgetInterface *iface = 0; @@ -2070,9 +2070,9 @@ void DeleteContainerPageCommand::unexecute() // ------------------------------------------------------------ -RenameContainerPageCommand::RenameContainerPageCommand( const QString &n, FormWindow *fw, - QWidget *c, int idx, - const QString &label ) +RenameContainerPageCommand::RenameContainerPageCommand( const TQString &n, FormWindow *fw, + TQWidget *c, int idx, + const TQString &label ) : Command( n, fw ), container( c ), index( idx ), newLabel( label ) { WidgetInterface *iface = 0; @@ -2112,7 +2112,7 @@ void RenameContainerPageCommand::unexecute() #endif // QT_CONTAINER_CUSTOM_WIDGETS // ------------------------------------------------------------ -AddActionToPopupCommand::AddActionToPopupCommand( const QString &n, +AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n, FormWindow *fw, PopupMenuEditor *m, PopupMenuEditorItem *i, @@ -2136,7 +2136,7 @@ void AddActionToPopupCommand::unexecute() // ------------------------------------------------------------ -RemoveActionFromPopupCommand::RemoveActionFromPopupCommand( const QString &n, +RemoveActionFromPopupCommand::RemoveActionFromPopupCommand( const TQString &n, FormWindow *fw, PopupMenuEditor *m, int idx ) @@ -2157,7 +2157,7 @@ void RemoveActionFromPopupCommand::unexecute() // ------------------------------------------------------------ -ExchangeActionInPopupCommand::ExchangeActionInPopupCommand( const QString &n, +ExchangeActionInPopupCommand::ExchangeActionInPopupCommand( const TQString &n, FormWindow *fw, PopupMenuEditor *m, int a, @@ -2185,11 +2185,11 @@ ActionEditor *ActionCommand::actionEditor() // ------------------------------------------------------------ -RenameActionCommand::RenameActionCommand( const QString &n, +RenameActionCommand::RenameActionCommand( const TQString &n, FormWindow *fw, - QAction *a, + TQAction *a, PopupMenuEditor *m, - QString nm ) + TQString nm ) : ActionCommand( n, fw, a ), menu( m ), newName( nm ) { oldName = action->menuText(); @@ -2197,9 +2197,9 @@ RenameActionCommand::RenameActionCommand( const QString &n, void RenameActionCommand::execute() { - QString actionText = newName; + TQString actionText = newName; actionText.replace("&&", "&"); - QString menuText = newName; + TQString menuText = newName; action->setText( actionText ); action->setMenuText( menuText ); @@ -2215,11 +2215,11 @@ void RenameActionCommand::unexecute() // ------------------------------------------------------------ -SetActionIconsCommand::SetActionIconsCommand( const QString &n, +SetActionIconsCommand::SetActionIconsCommand( const TQString &n, FormWindow *fw, - QAction *a, + TQAction *a, PopupMenuEditor *m, - QIconSet &icons ) + TQIconSet &icons ) : ActionCommand( n, fw, a ), menu( m ), newIcons( icons ) { oldIcons = a->iconSet(); @@ -2245,7 +2245,7 @@ void SetActionIconsCommand::unexecute() // ------------------------------------------------------------ -AddMenuCommand::AddMenuCommand( const QString &n, +AddMenuCommand::AddMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *b, MenuBarEditorItem *i, @@ -2253,10 +2253,10 @@ AddMenuCommand::AddMenuCommand( const QString &n, : Command( n, fw ), mb( b ), item( i ), name( 0 ), index( idx ) { } -AddMenuCommand::AddMenuCommand( const QString &n, +AddMenuCommand::AddMenuCommand( const TQString &n, FormWindow *fw, - QMainWindow *mw, - const QString &nm ) + TQMainWindow *mw, + const TQString &nm ) : Command( n, fw ), mb( 0 ), item( 0 ), name( nm ), index( -1 ) { if ( mw ) @@ -2265,8 +2265,8 @@ AddMenuCommand::AddMenuCommand( const QString &n, void AddMenuCommand::execute() { - QString n; - QMainWindow *mw = (QMainWindow*)formWindow()->mainContainer(); + TQString n; + TQMainWindow *mw = (TQMainWindow*)formWindow()->mainContainer(); if ( !mb ) { mb = new MenuBarEditor( formWindow(), mw ); mb->setName( "MenuBarEditor" ); @@ -2303,7 +2303,7 @@ void AddMenuCommand::unexecute() // ------------------------------------------------------------ -RemoveMenuCommand::RemoveMenuCommand( const QString &n, +RemoveMenuCommand::RemoveMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *b, int idx ) @@ -2325,7 +2325,7 @@ void RemoveMenuCommand::unexecute() // ------------------------------------------------------------ -ExchangeMenuCommand::ExchangeMenuCommand( const QString &n, +ExchangeMenuCommand::ExchangeMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *b, int i, @@ -2345,7 +2345,7 @@ void ExchangeMenuCommand::unexecute() // ------------------------------------------------------------ -MoveMenuCommand::MoveMenuCommand( const QString &n, +MoveMenuCommand::MoveMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *b, int i, @@ -2373,20 +2373,20 @@ void MoveMenuCommand::unexecute() // ------------------------------------------------------------ -RenameMenuCommand::RenameMenuCommand( const QString &n, +RenameMenuCommand::RenameMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *b, - QString nm, + TQString nm, MenuBarEditorItem *i ) : Command( n, fw ), bar( b ), item( i ), newName( nm ) { oldName = item->menu()->name(); } -QString RenameMenuCommand::makeLegal( const QString &str ) +TQString RenameMenuCommand::makeLegal( const TQString &str ) { // remove illegal characters - QString d; + TQString d; char c = 0, i = 0; while ( !str.at(i).isNull() ) { c = str.at(i).latin1(); @@ -2404,7 +2404,7 @@ void RenameMenuCommand::execute() { PopupMenuEditor *popup = item->menu(); item->setMenuText( newName ); - QString legal = makeLegal( newName ); + TQString legal = makeLegal( newName ); formWindow()->unify( popup, legal, TRUE ); popup->setName( legal ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); @@ -2420,8 +2420,8 @@ void RenameMenuCommand::unexecute() // ------------------------------------------------------------ -AddToolBoxPageCommand::AddToolBoxPageCommand( const QString &n, FormWindow *fw, - QToolBox *tw, const QString &label ) +AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw, + TQToolBox *tw, const TQString &label ) : Command( n, fw ), toolBox( tw ), toolBoxLabel( label ) { toolBoxPage = new QDesignerWidget( formWindow(), toolBox, "page" ); @@ -2448,8 +2448,8 @@ void AddToolBoxPageCommand::unexecute() // ------------------------------------------------------------ -DeleteToolBoxPageCommand::DeleteToolBoxPageCommand( const QString &n, FormWindow *fw, - QToolBox *tw, QWidget *page ) +DeleteToolBoxPageCommand::DeleteToolBoxPageCommand( const TQString &n, FormWindow *fw, + TQToolBox *tw, TQWidget *page ) : Command( n, fw ), toolBox( tw ), toolBoxPage( page ) { toolBoxLabel = toolBox->itemLabel( toolBox->currentIndex() ); diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h index ac5e9d5a..5aa1764f 100644 --- a/kdevdesigner/designer/command.h +++ b/kdevdesigner/designer/command.h @@ -30,15 +30,15 @@ #include "metadatabase.h" #include "layout.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include class QWizard; class QTabWidget; @@ -65,7 +65,7 @@ class ActionEditor; class Command : public Qt { public: - Command( const QString &n, FormWindow *fw ); + Command( const TQString &n, FormWindow *fw ); virtual ~Command(); enum Type { @@ -131,7 +131,7 @@ public: DeleteToolBoxPage }; - QString name() const; + TQString name() const; virtual void execute() = 0; virtual void unexecute() = 0; @@ -142,7 +142,7 @@ public: FormWindow *formWindow() const; private: - QString cmdName; + TQString cmdName; FormWindow *formWin; }; @@ -168,11 +168,11 @@ public slots: signals: void undoRedoChanged( bool undoAvailable, bool redoAvailable, - const QString &undoCmd, const QString &redoCmd ); + const TQString &undoCmd, const TQString &redoCmd ); void modificationChanged( bool m ); private: - QPtrList history; + TQPtrList history; int current, steps; bool modified; int savedAt; @@ -183,42 +183,42 @@ private: class ResizeCommand : public Command { public: - ResizeCommand( const QString &n, FormWindow *fw, - QWidget *w, const QRect &oldr, const QRect &nr ); + ResizeCommand( const TQString &n, FormWindow *fw, + TQWidget *w, const TQRect &oldr, const TQRect &nr ); void execute(); void unexecute(); Type type() const { return Resize; } private: - QWidget *widget; - QRect oldRect, newRect; + TQWidget *widget; + TQRect oldRect, newRect; }; class InsertCommand : public Command { public: - InsertCommand( const QString &n, FormWindow *fw, QWidget *w, const QRect &g ); + InsertCommand( const TQString &n, FormWindow *fw, TQWidget *w, const TQRect &g ); void execute(); void unexecute(); Type type() const { return Insert; } private: - QWidget *widget; - QRect geometry; + TQWidget *widget; + TQRect geometry; }; class MoveCommand : public Command { public: - MoveCommand( const QString &n, FormWindow *fw, - const QWidgetList &w, - const QValueList op, - const QValueList np, - QWidget *opr, QWidget *npr ); + MoveCommand( const TQString &n, FormWindow *fw, + const TQWidgetList &w, + const TQValueList op, + const TQValueList np, + TQWidget *opr, TQWidget *npr ); void execute(); void unexecute(); Type type() const { return Move; } @@ -226,35 +226,35 @@ public: bool canMerge( Command *c ); private: - QWidgetList widgets; - QValueList oldPos, newPos; - QWidget *oldParent, *newParent; + TQWidgetList widgets; + TQValueList oldPos, newPos; + TQWidget *oldParent, *newParent; }; class DeleteCommand : public Command { public: - DeleteCommand( const QString &n, FormWindow *fw, - const QWidgetList &w ); + DeleteCommand( const TQString &n, FormWindow *fw, + const TQWidgetList &w ); void execute(); void unexecute(); Type type() const { return Delete; } private: - QWidgetList widgets; - QMap< QWidget*, QValueList > connections; + TQWidgetList widgets; + TQMap< TQWidget*, TQValueList > connections; }; class SetPropertyCommand : public Command { public: - SetPropertyCommand( const QString &n, FormWindow *fw, - QObject *w, PropertyEditor *e, - const QString &pn, const QVariant &ov, - const QVariant &nv, const QString &ncut, - const QString &ocut, + SetPropertyCommand( const TQString &n, FormWindow *fw, + TQObject *w, PropertyEditor *e, + const TQString &pn, const TQVariant &ov, + const TQVariant &nv, const TQString &ncut, + const TQString &ocut, bool reset = FALSE ); void execute(); @@ -265,13 +265,13 @@ public: bool checkProperty(); private: - void setProperty( const QVariant &v, const QString ¤tItemText, bool select = TRUE ); + void setProperty( const TQVariant &v, const TQString ¤tItemText, bool select = TRUE ); - QGuardedPtr widget; + TQGuardedPtr widget; PropertyEditor *editor; - QString propName; - QVariant oldValue, newValue; - QString oldCurrentItemText, newCurrentItemText; + TQString propName; + TQVariant oldValue, newValue; + TQString oldCurrentItemText, newCurrentItemText; bool wasChanged; bool isResetCommand; @@ -280,9 +280,9 @@ private: class LayoutHorizontalCommand : public Command { public: - LayoutHorizontalCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl ); + LayoutHorizontalCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl ); void execute(); void unexecute(); @@ -296,9 +296,9 @@ private: class LayoutHorizontalSplitCommand : public Command { public: - LayoutHorizontalSplitCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl ); + LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl ); void execute(); void unexecute(); @@ -312,9 +312,9 @@ private: class LayoutVerticalCommand : public Command { public: - LayoutVerticalCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl ); + LayoutVerticalCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl ); void execute(); void unexecute(); @@ -328,9 +328,9 @@ private: class LayoutVerticalSplitCommand : public Command { public: - LayoutVerticalSplitCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl ); + LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl ); void execute(); void unexecute(); @@ -344,9 +344,9 @@ private: class LayoutGridCommand : public Command { public: - LayoutGridCommand( const QString &n, FormWindow *fw, - QWidget *parent, QWidget *layoutBase, - const QWidgetList &wl, int xres, int yres ); + LayoutGridCommand( const TQString &n, FormWindow *fw, + TQWidget *parent, TQWidget *layoutBase, + const TQWidgetList &wl, int xres, int yres ); void execute(); void unexecute(); @@ -360,8 +360,8 @@ private: class BreakLayoutCommand : public Command { public: - BreakLayoutCommand( const QString &n, FormWindow *fw, - QWidget *layoutBase, const QWidgetList &wl ); + BreakLayoutCommand( const TQString &n, FormWindow *fw, + TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); void unexecute(); @@ -371,84 +371,84 @@ private: Layout *layout; int spacing; int margin; - QWidget *lb; - QWidgetList widgets; + TQWidget *lb; + TQWidgetList widgets; }; class MacroCommand : public Command { public: - MacroCommand( const QString &n, FormWindow *fw, - const QPtrList &cmds ); + MacroCommand( const TQString &n, FormWindow *fw, + const TQPtrList &cmds ); void execute(); void unexecute(); Type type() const { return Macro; } private: - QPtrList commands; + TQPtrList commands; }; class AddTabPageCommand : public Command { public: - AddTabPageCommand( const QString &n, FormWindow *fw, - QTabWidget *tw, const QString &label ); + AddTabPageCommand( const TQString &n, FormWindow *fw, + TQTabWidget *tw, const TQString &label ); void execute(); void unexecute(); Type type() const { return AddTabPage; } private: - QTabWidget *tabWidget; + TQTabWidget *tabWidget; int index; - QWidget *tabPage; - QString tabLabel; + TQWidget *tabPage; + TQString tabLabel; }; class DeleteTabPageCommand : public Command { public: - DeleteTabPageCommand( const QString &n, FormWindow *fw, - QTabWidget *tw, QWidget *page ); + DeleteTabPageCommand( const TQString &n, FormWindow *fw, + TQTabWidget *tw, TQWidget *page ); void execute(); void unexecute(); Type type() const { return DeleteTabPage; } private: - QTabWidget *tabWidget; + TQTabWidget *tabWidget; int index; - QWidget *tabPage; - QString tabLabel; + TQWidget *tabPage; + TQString tabLabel; }; class MoveTabPageCommand : public Command { public: - MoveTabPageCommand(const QString &n, FormWindow *fw, - QTabWidget *tw, QWidget *page, const QString& label, int nIndex, int oIndex ); + MoveTabPageCommand(const TQString &n, FormWindow *fw, + TQTabWidget *tw, TQWidget *page, const TQString& label, int nIndex, int oIndex ); void execute(); void unexecute(); Type type() const { return MoveTabPage; } private: - QTabWidget *tabWidget; + TQTabWidget *tabWidget; int newIndex, oldIndex; - QWidget *tabPage; - QString tabLabel; + TQWidget *tabPage; + TQString tabLabel; }; class QDesignerWidgetStack; class AddWidgetStackPageCommand : public Command { public: - AddWidgetStackPageCommand( const QString &n, FormWindow *fw, + AddWidgetStackPageCommand( const TQString &n, FormWindow *fw, QDesignerWidgetStack *ws ); void execute(); @@ -458,14 +458,14 @@ public: private: QDesignerWidgetStack *widgetStack; int index; - QWidget *stackPage; + TQWidget *stackPage; }; class DeleteWidgetStackPageCommand : public Command { public: - DeleteWidgetStackPageCommand( const QString &n, FormWindow *fw, - QDesignerWidgetStack *ws, QWidget *page ); + DeleteWidgetStackPageCommand( const TQString &n, FormWindow *fw, + QDesignerWidgetStack *ws, TQWidget *page ); void execute(); void unexecute(); @@ -474,7 +474,7 @@ public: private: QDesignerWidgetStack *widgetStack; int index; - QWidget *stackPage; + TQWidget *stackPage; }; @@ -482,71 +482,71 @@ private: class AddWizardPageCommand : public Command { public: - AddWizardPageCommand( const QString &n, FormWindow *fw, - QWizard *w, const QString &label, int index = -1, bool show = TRUE ); + AddWizardPageCommand( const TQString &n, FormWindow *fw, + TQWizard *w, const TQString &label, int index = -1, bool show = TRUE ); void execute(); void unexecute(); Type type() const { return AddWizardPage; } private: - QWizard *wizard; + TQWizard *wizard; int index; bool show; - QWidget *page; - QString pageLabel; + TQWidget *page; + TQString pageLabel; }; class DeleteWizardPageCommand : public Command { public: - DeleteWizardPageCommand( const QString &n, FormWindow *fw, - QWizard *w, int index, bool show = TRUE ); + DeleteWizardPageCommand( const TQString &n, FormWindow *fw, + TQWizard *w, int index, bool show = TRUE ); void execute(); void unexecute(); Type type() const { return DeleteWizardPage; } private: - QWizard *wizard; + TQWizard *wizard; int index; bool show; - QWidget *page; - QString pageLabel; + TQWidget *page; + TQString pageLabel; }; class RenameWizardPageCommand : public Command { public: - RenameWizardPageCommand( const QString &n, FormWindow *fw, - QWizard *w, int index, const QString& name ); + RenameWizardPageCommand( const TQString &n, FormWindow *fw, + TQWizard *w, int index, const TQString& name ); void execute(); void unexecute(); Type type() const { return RenameWizardPage; } private: - QWizard *wizard; + TQWizard *wizard; int index; - QWidget *page; - QString label; + TQWidget *page; + TQString label; }; class SwapWizardPagesCommand : public Command { public: - SwapWizardPagesCommand( const QString &n, FormWindow *fw, - QWizard *w, int index1, int index2 ); + SwapWizardPagesCommand( const TQString &n, FormWindow *fw, + TQWizard *w, int index1, int index2 ); void execute(); void unexecute(); Type type() const { return SwapWizardPages; } private: - QWizard *wizard; + TQWizard *wizard; int index1, index2; }; @@ -554,15 +554,15 @@ private: class MoveWizardPageCommand : public Command { public: - MoveWizardPageCommand( const QString &n, FormWindow *fw, - QWizard *w, int index1, int index2 ); + MoveWizardPageCommand( const TQString &n, FormWindow *fw, + TQWizard *w, int index1, int index2 ); void execute(); void unexecute(); Type type() const { return MoveWizardPage; } private: - QWizard *wizard; + TQWizard *wizard; int index1, index2; }; @@ -570,7 +570,7 @@ private: class AddConnectionCommand : public Command { public: - AddConnectionCommand( const QString &name, FormWindow *fw, + AddConnectionCommand( const TQString &name, FormWindow *fw, MetaDataBase::Connection c ); void execute(); @@ -585,7 +585,7 @@ private: class RemoveConnectionCommand : public Command { public: - RemoveConnectionCommand( const QString &name, FormWindow *fw, + RemoveConnectionCommand( const TQString &name, FormWindow *fw, MetaDataBase::Connection c ); void execute(); @@ -601,160 +601,160 @@ private: class AddFunctionCommand : public Command { public: - AddFunctionCommand( const QString &name, FormWindow *fw, const QCString &f, const QString& spec, - const QString &a, const QString &t, const QString &l, const QString &rt ); + AddFunctionCommand( const TQString &name, FormWindow *fw, const TQCString &f, const TQString& spec, + const TQString &a, const TQString &t, const TQString &l, const TQString &rt ); void execute(); void unexecute(); Type type() const { return AddFunction; } private: - QCString function; - QString specifier; - QString access; - QString functionType; - QString language; - QString returnType; + TQCString function; + TQString specifier; + TQString access; + TQString functionType; + TQString language; + TQString returnType; }; class ChangeFunctionAttribCommand : public Command { public: - ChangeFunctionAttribCommand( const QString &name, FormWindow *fw, MetaDataBase::Function f, - const QString &on, const QString &os, const QString &oa, - const QString &ot, const QString &ol, const QString &ort ); + ChangeFunctionAttribCommand( const TQString &name, FormWindow *fw, MetaDataBase::Function f, + const TQString &on, const TQString &os, const TQString &oa, + const TQString &ot, const TQString &ol, const TQString &ort ); void execute(); void unexecute(); Type type() const { return ChangeFunctionAttrib; } private: - QString oldName, newName; - QString oldSpec, newSpec; - QString oldAccess, newAccess; - QString oldType, newType; - QString oldLang, newLang; - QString oldReturnType, newReturnType; + TQString oldName, newName; + TQString oldSpec, newSpec; + TQString oldAccess, newAccess; + TQString oldType, newType; + TQString oldLang, newLang; + TQString oldReturnType, newReturnType; }; class RemoveFunctionCommand : public Command { public: - RemoveFunctionCommand( const QString &name, FormWindow *fw, const QCString &f, const QString& spec, - const QString &a, const QString &t, const QString &l, const QString &rt ); + RemoveFunctionCommand( const TQString &name, FormWindow *fw, const TQCString &f, const TQString& spec, + const TQString &a, const TQString &t, const TQString &l, const TQString &rt ); void execute(); void unexecute(); Type type() const { return RemoveFunction; } private: - QCString function; - QString specifier; - QString access; - QString functionType; - QString language; - QString returnType; + TQCString function; + TQString specifier; + TQString access; + TQString functionType; + TQString language; + TQString returnType; }; class AddVariableCommand : public Command { public: - AddVariableCommand( const QString &name, FormWindow *fw, const QString &vn, const QString &a ); + AddVariableCommand( const TQString &name, FormWindow *fw, const TQString &vn, const TQString &a ); void execute(); void unexecute(); Type type() const { return AddVariable; } private: - QString varName; - QString access; + TQString varName; + TQString access; }; class SetVariablesCommand : public Command { public: - SetVariablesCommand( const QString &name, FormWindow *fw, QValueList lst ); + SetVariablesCommand( const TQString &name, FormWindow *fw, TQValueList lst ); void execute(); void unexecute(); Type type() const { return SetVariables; } private: - QValueList oldList, newList; + TQValueList oldList, newList; }; class RemoveVariableCommand : public Command { public: - RemoveVariableCommand( const QString &name, FormWindow *fw, const QString &vn ); + RemoveVariableCommand( const TQString &name, FormWindow *fw, const TQString &vn ); void execute(); void unexecute(); Type type() const { return RemoveVariable; } private: - QString varName; - QString access; + TQString varName; + TQString access; }; class EditDefinitionsCommand : public Command { public: - EditDefinitionsCommand( const QString &name, FormWindow *fw, LanguageInterface *lf, - const QString &n, const QStringList &l ); + EditDefinitionsCommand( const TQString &name, FormWindow *fw, LanguageInterface *lf, + const TQString &n, const TQStringList &l ); void execute(); void unexecute(); Type type() const { return EditDefinitions; } private: LanguageInterface *lIface; - QString defName; - QStringList newList, oldList; + TQString defName; + TQStringList newList, oldList; }; class LowerCommand : public Command { public: - LowerCommand( const QString &name, FormWindow *fw, const QWidgetList &w ); + LowerCommand( const TQString &name, FormWindow *fw, const TQWidgetList &w ); void execute(); void unexecute(); Type type() const { return Lower; } private: - QWidgetList widgets; + TQWidgetList widgets; }; class RaiseCommand : public Command { public: - RaiseCommand( const QString &name, FormWindow *fw, const QWidgetList &w ); + RaiseCommand( const TQString &name, FormWindow *fw, const TQWidgetList &w ); void execute(); void unexecute(); Type type() const { return Raise; } private: - QWidgetList widgets; + TQWidgetList widgets; }; class PasteCommand : public Command { public: - PasteCommand( const QString &n, FormWindow *fw, const QWidgetList &w ); + PasteCommand( const TQString &n, FormWindow *fw, const TQWidgetList &w ); void execute(); void unexecute(); Type type() const { return Paste; } private: - QWidgetList widgets; + TQWidgetList widgets; }; class TabOrderCommand : public Command { public: - TabOrderCommand( const QString &n, FormWindow *fw, const QWidgetList &ol, const QWidgetList &nl ); + TabOrderCommand( const TQString &n, FormWindow *fw, const TQWidgetList &ol, const TQWidgetList &nl ); void execute(); void unexecute(); @@ -763,7 +763,7 @@ public: bool canMerge( Command *c ); private: - QWidgetList oldOrder, newOrder; + TQWidgetList oldOrder, newOrder; }; @@ -772,13 +772,13 @@ class PopulateListBoxCommand : public Command public: struct Item { - QString text; - QPixmap pix; + TQString text; + TQPixmap pix; Q_DUMMY_COMPARISON_OPERATOR( Item ) }; - PopulateListBoxCommand( const QString &n, FormWindow *fw, - QListBox *lb, const QValueList &items ); + PopulateListBoxCommand( const TQString &n, FormWindow *fw, + TQListBox *lb, const TQValueList &items ); void execute(); void unexecute(); Type type() const { return PopulateListBox; } @@ -786,8 +786,8 @@ public: bool operator==( const PopulateListBoxCommand & ) const; private: - QValueList oldItems, newItems; - QListBox *listbox; + TQValueList oldItems, newItems; + TQListBox *listbox; }; @@ -796,13 +796,13 @@ class PopulateIconViewCommand : public Command public: struct Item { - QString text; - QPixmap pix; + TQString text; + TQPixmap pix; Q_DUMMY_COMPARISON_OPERATOR( Item ) }; - PopulateIconViewCommand( const QString &n, FormWindow *fw, - QIconView *iv, const QValueList &items ); + PopulateIconViewCommand( const TQString &n, FormWindow *fw, + TQIconView *iv, const TQValueList &items ); void execute(); void unexecute(); Type type() const { return PopulateIconView; } @@ -810,41 +810,41 @@ public: bool operator==( const PopulateIconViewCommand & ) const; private: - QValueList oldItems, newItems; - QIconView *iconview; + TQValueList oldItems, newItems; + TQIconView *iconview; }; class PopulateListViewCommand : public Command { public: - PopulateListViewCommand( const QString &n, FormWindow *fw, - QListView *lv, QListView *from ); + PopulateListViewCommand( const TQString &n, FormWindow *fw, + TQListView *lv, TQListView *from ); void execute(); void unexecute(); Type type() const { return PopulateListView; } - static void transferItems( QListView *from, QListView *to ); + static void transferItems( TQListView *from, TQListView *to ); bool operator==( const PopulateListViewCommand & ) const; private: - QListView *oldItems, *newItems; - QListView *listview; + TQListView *oldItems, *newItems; + TQListView *listview; }; class PopulateMultiLineEditCommand : public Command { public: - PopulateMultiLineEditCommand( const QString &n, FormWindow *fw, - QTextEdit *mle, const QString &txt ); + PopulateMultiLineEditCommand( const TQString &n, FormWindow *fw, + TQTextEdit *mle, const TQString &txt ); void execute(); void unexecute(); Type type() const { return PopulateMultiLineEdit; } private: - QString newText, oldText; - QTextEdit *mlined; + TQString newText, oldText; + TQTextEdit *mlined; bool wasChanged; }; @@ -854,46 +854,46 @@ class PopulateTableCommand : public Command public: struct Row { - QString text; - QPixmap pix; + TQString text; + TQPixmap pix; Q_DUMMY_COMPARISON_OPERATOR( Row ) }; struct Column { - QString text; - QPixmap pix; - QString field; + TQString text; + TQPixmap pix; + TQString field; Q_DUMMY_COMPARISON_OPERATOR( Column ) }; - PopulateTableCommand( const QString &n, FormWindow *fw, QTable *t, - const QValueList &rows, - const QValueList &columns ); + PopulateTableCommand( const TQString &n, FormWindow *fw, TQTable *t, + const TQValueList &rows, + const TQValueList &columns ); void execute(); void unexecute(); Type type() const { return PopulateTable; } private: - QValueList oldRows, newRows; - QValueList oldColumns, newColumns; - QTable *table; + TQValueList oldRows, newRows; + TQValueList oldColumns, newColumns; + TQTable *table; }; class AddActionToToolBarCommand : public Command { public: - AddActionToToolBarCommand( const QString &n, FormWindow *fw, - QAction *a, QDesignerToolBar *tb, int idx ); + AddActionToToolBarCommand( const TQString &n, FormWindow *fw, + TQAction *a, QDesignerToolBar *tb, int idx ); void execute(); void unexecute(); Type type() const { return AddActionToToolBar; } private: - QAction *action; + TQAction *action; QDesignerToolBar *toolBar; int index; @@ -902,8 +902,8 @@ private: class RemoveActionFromToolBarCommand : public AddActionToToolBarCommand { public: - RemoveActionFromToolBarCommand( const QString &n, FormWindow *fw, - QAction *a, QDesignerToolBar *tb, int idx ) + RemoveActionFromToolBarCommand( const TQString &n, FormWindow *fw, + TQAction *a, QDesignerToolBar *tb, int idx ) : AddActionToToolBarCommand( n, fw, a, tb, idx ) {} void execute() { AddActionToToolBarCommand::unexecute(); } @@ -917,7 +917,7 @@ public: class AddToolBarCommand : public Command { public: - AddToolBarCommand( const QString &n, FormWindow *fw, QMainWindow *mw ); + AddToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw ); void execute(); void unexecute(); @@ -925,14 +925,14 @@ public: protected: QDesignerToolBar *toolBar; - QMainWindow *mainWindow; + TQMainWindow *mainWindow; }; class RemoveToolBarCommand : public AddToolBarCommand { public: - RemoveToolBarCommand( const QString &n, FormWindow *fw, QMainWindow *mw, QDesignerToolBar *tb ) + RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, QDesignerToolBar *tb ) : AddToolBarCommand( n, fw, mw ) { toolBar = tb; } void execute() { AddToolBarCommand::unexecute(); } @@ -946,8 +946,8 @@ struct QWidgetContainerInterfacePrivate; class AddContainerPageCommand : public Command { public: - AddContainerPageCommand( const QString &n, FormWindow *fw, - QWidget *c, const QString &label ); + AddContainerPageCommand( const TQString &n, FormWindow *fw, + TQWidget *c, const TQString &label ); ~AddContainerPageCommand(); @@ -956,11 +956,11 @@ public: Type type() const { return AddContainerPage; } private: - QString wClassName; - QWidget *container; + TQString wClassName; + TQWidget *container; int index; - QString pageLabel; - QWidget *page; + TQString pageLabel; + TQWidget *page; QWidgetContainerInterfacePrivate *wiface; }; @@ -968,8 +968,8 @@ private: class DeleteContainerPageCommand : public Command { public: - DeleteContainerPageCommand( const QString &n, FormWindow *fw, - QWidget *container, int index ); + DeleteContainerPageCommand( const TQString &n, FormWindow *fw, + TQWidget *container, int index ); ~DeleteContainerPageCommand(); void execute(); @@ -977,11 +977,11 @@ public: Type type() const { return DeleteContainerPage; } private: - QString wClassName; - QWidget *container; + TQString wClassName; + TQWidget *container; int index; - QString pageLabel; - QWidget *page; + TQString pageLabel; + TQWidget *page; QWidgetContainerInterfacePrivate *wiface; }; @@ -989,9 +989,9 @@ private: class RenameContainerPageCommand : public Command { public: - RenameContainerPageCommand( const QString &n, FormWindow *fw, - QWidget *container, int index, - const QString &label ); + RenameContainerPageCommand( const TQString &n, FormWindow *fw, + TQWidget *container, int index, + const TQString &label ); ~RenameContainerPageCommand(); void execute(); @@ -999,10 +999,10 @@ public: Type type() const { return RenameContainerPage; } private: - QString wClassName; - QWidget *container; + TQString wClassName; + TQWidget *container; int index; - QString oldLabel, newLabel; + TQString oldLabel, newLabel; QWidgetContainerInterfacePrivate *wiface; }; @@ -1010,7 +1010,7 @@ private: class AddActionToPopupCommand : public Command { public: - AddActionToPopupCommand( const QString &n, + AddActionToPopupCommand( const TQString &n, FormWindow *fw, PopupMenuEditor *m, PopupMenuEditorItem *i, @@ -1019,7 +1019,7 @@ public: void unexecute(); Type type() const { return AddActionToPopup; } protected: - QString constructName() const; + TQString constructName() const; PopupMenuEditor *menu; PopupMenuEditorItem *item; int index; @@ -1029,7 +1029,7 @@ private: class RemoveActionFromPopupCommand : public AddActionToPopupCommand { public: - RemoveActionFromPopupCommand( const QString &n, + RemoveActionFromPopupCommand( const TQString &n, FormWindow *fw, PopupMenuEditor *m, int idx ); @@ -1043,7 +1043,7 @@ private: class ExchangeActionInPopupCommand : public Command { public: - ExchangeActionInPopupCommand( const QString &n, + ExchangeActionInPopupCommand( const TQString &n, FormWindow *fw, PopupMenuEditor *m, int a, @@ -1061,7 +1061,7 @@ private: class MoveActionInPopupCommand : public Command { public: - MoveActionInPopupCommand( const QString &n, + MoveActionInPopupCommand( const TQString &n, FormWindow *fw, PopupMenuEditor *m, int a, @@ -1079,41 +1079,41 @@ private: class ActionCommand : public Command { public: - ActionCommand( const QString &n, + ActionCommand( const TQString &n, FormWindow *fw, - QAction *a ) + TQAction *a ) : Command( n, fw ), action( a ) { } virtual Type type() const = 0; protected: ActionEditor *actionEditor(); - QAction *action; + TQAction *action; }; class RenameActionCommand : public ActionCommand { public: - RenameActionCommand( const QString &n, + RenameActionCommand( const TQString &n, FormWindow *fw, - QAction *a, + TQAction *a, PopupMenuEditor *m, - QString nm ); + TQString nm ); void execute(); void unexecute(); Type type() const { return RenameAction; } private: PopupMenuEditor *menu; - QString newName; - QString oldName; + TQString newName; + TQString oldName; }; class SetActionIconsCommand : public ActionCommand { public: - SetActionIconsCommand( const QString &n, + SetActionIconsCommand( const TQString &n, FormWindow *fw, - QAction *a, + TQAction *a, PopupMenuEditor *m, - QIconSet &icons ); + TQIconSet &icons ); void execute(); void unexecute(); Type type() const { return SetActionIcons; } @@ -1121,23 +1121,23 @@ protected: void updateActionEditorItem(); private: PopupMenuEditor *menu; - QIconSet newIcons; - QIconSet oldIcons; + TQIconSet newIcons; + TQIconSet oldIcons; }; class AddMenuCommand : public Command { public: - AddMenuCommand( const QString &n, + AddMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *b, MenuBarEditorItem *i, int idx = -1 ); - AddMenuCommand( const QString &n, + AddMenuCommand( const TQString &n, FormWindow *fw, - QMainWindow *mw, - const QString &nm = "Menu" ); + TQMainWindow *mw, + const TQString &nm = "Menu" ); void execute(); void unexecute(); @@ -1145,7 +1145,7 @@ public: protected: MenuBarEditor *mb; MenuBarEditorItem *item; - QString name; + TQString name; int index; private: }; @@ -1153,7 +1153,7 @@ private: class RemoveMenuCommand : public AddMenuCommand { public: - RemoveMenuCommand( const QString &n, + RemoveMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *b, int idx ); @@ -1167,7 +1167,7 @@ private: class ExchangeMenuCommand : public Command { public: - ExchangeMenuCommand( const QString &n, + ExchangeMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *b, int i, @@ -1186,7 +1186,7 @@ private: class MoveMenuCommand : public Command { public: - MoveMenuCommand( const QString &n, + MoveMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *b, int i, @@ -1204,55 +1204,55 @@ private: class RenameMenuCommand : public Command { public: - RenameMenuCommand( const QString &n, + RenameMenuCommand( const TQString &n, FormWindow *fw, MenuBarEditor *m, - QString nm, + TQString nm, MenuBarEditorItem *i ); void execute(); void unexecute(); Type type() const { return RenameMenu; } - static QString makeLegal( const QString &str ); + static TQString makeLegal( const TQString &str ); private: MenuBarEditor *bar; MenuBarEditorItem *item; - QString newName; - QString oldName; + TQString newName; + TQString oldName; }; class AddToolBoxPageCommand : public Command { public: - AddToolBoxPageCommand( const QString &n, FormWindow *fw, - QToolBox *tw, const QString &label ); + AddToolBoxPageCommand( const TQString &n, FormWindow *fw, + TQToolBox *tw, const TQString &label ); void execute(); void unexecute(); Type type() const { return AddToolBoxPage; } private: - QToolBox *toolBox; + TQToolBox *toolBox; int index; - QWidget *toolBoxPage; - QString toolBoxLabel; + TQWidget *toolBoxPage; + TQString toolBoxLabel; }; class DeleteToolBoxPageCommand : public Command { public: - DeleteToolBoxPageCommand( const QString &n, FormWindow *fw, - QToolBox *tw, QWidget *page ); + DeleteToolBoxPageCommand( const TQString &n, FormWindow *fw, + TQToolBox *tw, TQWidget *page ); void execute(); void unexecute(); Type type() const { return DeleteToolBoxPage; } private: - QToolBox *toolBox; + TQToolBox *toolBox; int index; - QWidget *toolBoxPage; - QString toolBoxLabel; + TQWidget *toolBoxPage; + TQString toolBoxLabel; }; diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h index 6b5d55b6..0b176afc 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui.h +++ b/kdevdesigner/designer/configtoolboxdialog.ui.h @@ -27,7 +27,7 @@ #include "mainwindow.h" #include "widgetaction.h" #include "listviewdnd.h" -#include +#include void ConfigToolboxDialog::init() { @@ -40,31 +40,31 @@ void ConfigToolboxDialog::init() ListViewDnd *commonDnd = new ListViewDnd( listViewCommon ); commonDnd->setDragMode( ListViewDnd::Both | ListViewDnd::Move | ListViewDnd::Flat ); - QObject::connect( toolsDnd, SIGNAL( dropped( QListViewItem * ) ), - commonDnd, SLOT( confirmDrop( QListViewItem * ) ) ); - QObject::connect( commonDnd, SIGNAL( dropped( QListViewItem * ) ), - commonDnd, SLOT( confirmDrop( QListViewItem * ) ) ); + TQObject::connect( toolsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( commonDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); - QDict groups; - QAction *a; + TQDict groups; + TQAction *a; for ( a = MainWindow::self->toolActions.last(); a; a = MainWindow::self->toolActions.prev() ) { - QString grp = ( (WidgetAction*)a )->group(); - QListViewItem *parent = groups.find( grp ); + TQString grp = ( (WidgetAction*)a )->group(); + TQListViewItem *parent = groups.find( grp ); if ( !parent ) { - parent = new QListViewItem( listViewTools ); + parent = new TQListViewItem( listViewTools ); parent->setText( 0, grp ); parent->setOpen( TRUE ); groups.insert( grp, parent ); } - QListViewItem *i = new QListViewItem( parent ); + TQListViewItem *i = new TQListViewItem( parent ); i->setText( 0, a->text() ); i->setPixmap( 0, a->iconSet().pixmap() ); } for ( a = MainWindow::self->commonWidgetsPage.last(); a; a = MainWindow::self->commonWidgetsPage.prev() ) { - QListViewItem *i = new QListViewItem( listViewCommon ); + TQListViewItem *i = new TQListViewItem( listViewCommon ); i->setText( 0, a->text() ); i->setPixmap( 0, a->iconSet().pixmap() ); } @@ -74,12 +74,12 @@ void ConfigToolboxDialog::init() void ConfigToolboxDialog::addTool() { - QListView *src = listViewTools; + TQListView *src = listViewTools; bool addKids = FALSE; - QListViewItem *nextSibling = 0; - QListViewItem *nextParent = 0; - QListViewItemIterator it = src->firstChild(); + TQListViewItem *nextSibling = 0; + TQListViewItem *nextParent = 0; + TQListViewItemIterator it = src->firstChild(); for ( ; *it; it++ ) { // Hit the nextSibling, turn of child processing if ( (*it) == nextSibling ) @@ -88,7 +88,7 @@ void ConfigToolboxDialog::addTool() if ( (*it)->isSelected() ) { if ( (*it)->childCount() == 0 ) { // Selected, no children - QListViewItem *i = new QListViewItem( listViewCommon, listViewCommon->lastItem() ); + TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() ); i->setText( 0, (*it)->text(0) ); i->setPixmap( 0, *((*it)->pixmap(0)) ); listViewCommon->setCurrentItem( i ); @@ -107,7 +107,7 @@ void ConfigToolboxDialog::addTool() } } else if ( ((*it)->childCount() == 0) && addKids ) { // Leaf node, and we _do_ process children - QListViewItem *i = new QListViewItem( listViewCommon, listViewCommon->lastItem() ); + TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() ); i->setText( 0, (*it)->text(0) ); i->setPixmap( 0, *((*it)->pixmap(0)) ); listViewCommon->setCurrentItem( i ); @@ -119,7 +119,7 @@ void ConfigToolboxDialog::addTool() void ConfigToolboxDialog::removeTool() { - QListViewItemIterator it = listViewCommon->firstChild(); + TQListViewItemIterator it = listViewCommon->firstChild(); while ( *it ) { if ( (*it)->isSelected() ) delete (*it); @@ -131,8 +131,8 @@ void ConfigToolboxDialog::removeTool() void ConfigToolboxDialog::moveToolUp() { - QListViewItem *next = 0; - QListViewItem *item = listViewCommon->firstChild(); + TQListViewItem *next = 0; + TQListViewItem *item = listViewCommon->firstChild(); for ( int i = 0; i < listViewCommon->childCount(); ++i ) { next = item->itemBelow(); if ( item->isSelected() && (i > 0) && !item->itemAbove()->isSelected() ) @@ -145,8 +145,8 @@ void ConfigToolboxDialog::moveToolUp() void ConfigToolboxDialog::moveToolDown() { int count = listViewCommon->childCount(); - QListViewItem *next = 0; - QListViewItem *item = listViewCommon->lastItem(); + TQListViewItem *next = 0; + TQListViewItem *item = listViewCommon->lastItem(); for ( int i = 0; i < count; ++i ) { next = item->itemAbove(); if ( item->isSelected() && (i > 0) && !item->itemBelow()->isSelected() ) @@ -154,7 +154,7 @@ void ConfigToolboxDialog::moveToolDown() item = next; } - // QListViewItem *item = listViewCommon->firstChild(); + // TQListViewItem *item = listViewCommon->firstChild(); // for ( int i = 0; i < listViewCommon->childCount(); ++i ) { //if ( item == listViewCommon->currentItem() ) { // item->moveItem( item->itemBelow() ); @@ -166,10 +166,10 @@ void ConfigToolboxDialog::moveToolDown() } -void ConfigToolboxDialog::currentToolChanged( QListViewItem *i ) +void ConfigToolboxDialog::currentToolChanged( TQListViewItem *i ) { bool canAdd = FALSE; - QListViewItemIterator it = listViewTools->firstChild(); + TQListViewItemIterator it = listViewTools->firstChild(); for ( ; *it; it++ ) { if ( (*it)->isSelected() ) { canAdd = TRUE; @@ -180,13 +180,13 @@ void ConfigToolboxDialog::currentToolChanged( QListViewItem *i ) } -void ConfigToolboxDialog::currentCommonToolChanged( QListViewItem *i ) +void ConfigToolboxDialog::currentCommonToolChanged( TQListViewItem *i ) { buttonUp->setEnabled( (bool) (i && i->itemAbove()) ); buttonDown->setEnabled( (bool) (i && i->itemBelow()) ); bool canRemove = FALSE; - QListViewItemIterator it = listViewCommon->firstChild(); + TQListViewItemIterator it = listViewCommon->firstChild(); for ( ; *it; it++ ) { if ( (*it)->isSelected() ) { canRemove = TRUE; @@ -200,9 +200,9 @@ void ConfigToolboxDialog::currentCommonToolChanged( QListViewItem *i ) void ConfigToolboxDialog::ok() { MainWindow::self->commonWidgetsPage.clear(); - QListViewItem *item = listViewCommon->firstChild(); + TQListViewItem *item = listViewCommon->firstChild(); for ( int j = 0; j < listViewCommon->childCount(); item = item->itemBelow(), ++j ) { - QAction *a = 0; + TQAction *a = 0; for ( a = MainWindow::self->toolActions.last(); a; a = MainWindow::self->toolActions.prev() ) { diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h index 3c6cd932..f8df4230 100644 --- a/kdevdesigner/designer/connectiondialog.ui.h +++ b/kdevdesigner/designer/connectiondialog.ui.h @@ -64,25 +64,25 @@ static const char * invalid_connection[] = { " " }; -static QPixmap *invalidConnection = 0; -static QPixmap *validConnection = 0; +static TQPixmap *invalidConnection = 0; +static TQPixmap *validConnection = 0; void ConnectionDialog::init() { - connect( connectionsTable, SIGNAL( currentChanged( int, int ) ), - this, SLOT( updateEditSlotsButton() ) ); - connect( connectionsTable, SIGNAL( resorted() ), - this, SLOT( updateConnectionContainers() ) ); + connect( connectionsTable, TQT_SIGNAL( currentChanged( int, int ) ), + this, TQT_SLOT( updateEditSlotsButton() ) ); + connect( connectionsTable, TQT_SIGNAL( resorted() ), + this, TQT_SLOT( updateConnectionContainers() ) ); buttonEditSlots->setEnabled( FALSE ); if ( !invalidConnection ) { - invalidConnection = new QPixmap( invalid_connection ); - validConnection = new QPixmap( valid_connection ); + invalidConnection = new TQPixmap( invalid_connection ); + validConnection = new TQPixmap( valid_connection ); } - QValueList conns = + TQValueList conns = MetaDataBase::connections( MainWindow::self->formWindow() ); - for ( QValueList::Iterator it = conns.begin(); + for ( TQValueList::Iterator it = conns.begin(); it != conns.end(); ++it ) { ConnectionContainer *c = addConnection( (*it).sender, (*it).receiver, (*it).signal, (*it).slot ); @@ -96,13 +96,13 @@ void ConnectionDialog::init() void ConnectionDialog::addConnection() { - addConnection( defaultSender, defaultReceiver, QString::null, QString::null ); + addConnection( defaultSender, defaultReceiver, TQString::null, TQString::null ); ensureConnectionVisible(); } -ConnectionContainer *ConnectionDialog::addConnection( QObject *sender, QObject *receiver, - const QString &signal, - const QString &slot ) +ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject *receiver, + const TQString &signal, + const TQString &slot ) { connectionsTable->insertRows( connectionsTable->numRows() ); @@ -144,17 +144,17 @@ ConnectionContainer *ConnectionDialog::addConnection( QObject *sender, QObject * re->setSlot( sl ); sl->setSlot( sl ); - connect( re, SIGNAL( currentReceiverChanged( QObject * ) ), - this, SLOT( updateEditSlotsButton() ) ); + connect( re, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQT_SLOT( updateEditSlotsButton() ) ); ConnectionContainer *c = new ConnectionContainer( this, se, si, re, sl, row ); connections.append( c ); - connect( c, SIGNAL( changed( ConnectionContainer * ) ), - this, SLOT( updateConnectionState( ConnectionContainer * ) ) ); + connect( c, TQT_SIGNAL( changed( ConnectionContainer * ) ), + this, TQT_SLOT( updateConnectionState( ConnectionContainer * ) ) ); connectionsTable->setCurrentCell( row, 0 ); - connectionsTable->verticalHeader()->setLabel( row, *invalidConnection, QString::null ); + connectionsTable->verticalHeader()->setLabel( row, *invalidConnection, TQString::null ); if ( sender ) se->setSenderEx( sender ); @@ -178,19 +178,19 @@ void ConnectionDialog::updateConnectionState( ConnectionContainer *c ) c->repaint(); if ( c->isValid() ) connectionsTable->verticalHeader()->setLabel( c->row(), - *validConnection, QString::null ); + *validConnection, TQString::null ); else connectionsTable->verticalHeader()->setLabel( c->row(), - *invalidConnection, QString::null ); + *invalidConnection, TQString::null ); } void ConnectionDialog::okClicked() { - QValueList oldConnections = + TQValueList oldConnections = MetaDataBase::connections( MainWindow::self->formWindow() ); - QPtrList newConnectionCmds; - QPtrList oldConnectionCmds; + TQPtrList newConnectionCmds; + TQPtrList oldConnectionCmds; for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) { MetaDataBase::Connection conn; @@ -214,9 +214,9 @@ void ConnectionDialog::okClicked() } - QValueList conns = + TQValueList conns = MetaDataBase::connections( MainWindow::self->formWindow() ); - for ( QValueList::Iterator it = conns.begin(); + for ( TQValueList::Iterator it = conns.begin(); it != conns.end(); ++it ) { RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n( "Remove Signal/Slot " "Connection" ), @@ -231,7 +231,7 @@ void ConnectionDialog::okClicked() MacroCommand *cmd2 = new MacroCommand( i18n( "Remove Signal/Slot Connections" ), MainWindow::self->formWindow(), oldConnectionCmds ); - QPtrList cmds; + TQPtrList cmds; cmds.append( cmd2 ); cmds.append( cmd1 ); MacroCommand *cmd = new MacroCommand( i18n( "Edit Signal/Slot Connections" ), @@ -269,14 +269,14 @@ void ConnectionDialog::editSlots() connectionsTable->setCurrentCell( connectionsTable->currentRow(), 0 ); for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) { if ( c->receiverItem()->currentText() != - QString( MainWindow::self->formWindow()->mainContainer()->name() ) ) + TQString( MainWindow::self->formWindow()->mainContainer()->name() ) ) continue; c->slotItem()->customSlotsChanged(); } connectionsTable->setCurrentCell( connectionsTable->currentRow(), currentCol ); } -void ConnectionDialog::setDefault( QObject *sender, QObject *receiver ) +void ConnectionDialog::setDefault( TQObject *sender, TQObject *receiver ) { defaultSender = sender; defaultReceiver = receiver; @@ -291,13 +291,13 @@ void ConnectionDialog::updateEditSlotsButton() if ( !c || !c->receiverItem() ) return; buttonEditSlots->setEnabled( c->receiverItem()->currentText() == - QString( MainWindow::self->formWindow()-> + TQString( MainWindow::self->formWindow()-> mainContainer()->name() ) ); } void ConnectionDialog::updateConnectionContainers() { - QPtrList newContainers; + TQPtrList newContainers; for ( int i = 0; i < connectionsTable->numRows(); ++i ) { for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) { if ( c->senderItem() == connectionsTable->item( i, 0 ) ) { diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp index 197eef65..9f1c3fa6 100644 --- a/kdevdesigner/designer/connectionitems.cpp +++ b/kdevdesigner/designer/connectionitems.cpp @@ -30,30 +30,30 @@ #include "metadatabase.h" #include "widgetfactory.h" #include "project.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include static const char* const ignore_slots[] = { "destroyed()", - "setCaption(const QString&)", - "setIcon(const QPixmap&)", - "setIconText(const QString&)", + "setCaption(const TQString&)", + "setIcon(const TQPixmap&)", + "setIconText(const TQString&)", "setMouseTracking(bool)", "clearFocus()", "setUpdatesEnabled(bool)", "update()", "update(int,int,int,int)", - "update(const QRect&)", + "update(const TQRect&)", "repaint()", "repaint(bool)", "repaint(int,int,int,int,bool)", - "repaint(const QRect&,bool)", - "repaint(const QRegion&,bool)", + "repaint(const TQRect&,bool)", + "repaint(const TQRegion&,bool)", "show()", "hide()", "iconify()", @@ -65,91 +65,91 @@ static const char* const ignore_slots[] = { "constPolish()", "raise()", "lower()", - "stackUnder(QWidget*)", + "stackUnder(TQWidget*)", "move(int,int)", - "move(const QPoint&)", + "move(const TQPoint&)", "resize(int,int)", - "resize(const QSize&)", + "resize(const TQSize&)", "setGeometry(int,int,int,int)", - "setGeometry(const QRect&)", + "setGeometry(const TQRect&)", "focusProxyDestroyed()", "showExtension(bool)", "setUpLayout()", - "showDockMenu(const QPoint&)", + "showDockMenu(const TQPoint&)", "init()", "destroy()", "deleteLater()", 0 }; -ConnectionItem::ConnectionItem( QTable *table, FormWindow *fw ) - : QComboTableItem( table, QStringList(), FALSE ), formWindow( fw ), conn( 0 ) +ConnectionItem::ConnectionItem( TQTable *table, FormWindow *fw ) + : TQComboTableItem( table, TQStringList(), FALSE ), formWindow( fw ), conn( 0 ) { setReplaceable( FALSE ); } -void ConnectionItem::senderChanged( QObject * ) +void ConnectionItem::senderChanged( TQObject * ) { emit changed(); - QWidget *w = table()->cellWidget( row(), col() ); + TQWidget *w = table()->cellWidget( row(), col() ); if ( w ) setContentFromEditor( w ); } -void ConnectionItem::receiverChanged( QObject * ) +void ConnectionItem::receiverChanged( TQObject * ) { emit changed(); - QWidget *w = table()->cellWidget( row(), col() ); + TQWidget *w = table()->cellWidget( row(), col() ); if ( w ) setContentFromEditor( w ); } -void ConnectionItem::signalChanged( const QString & ) +void ConnectionItem::signalChanged( const TQString & ) { emit changed(); - QWidget *w = table()->cellWidget( row(), col() ); + TQWidget *w = table()->cellWidget( row(), col() ); if ( w ) setContentFromEditor( w ); } -void ConnectionItem::slotChanged( const QString & ) +void ConnectionItem::slotChanged( const TQString & ) { emit changed(); - QWidget *w = table()->cellWidget( row(), col() ); + TQWidget *w = table()->cellWidget( row(), col() ); if ( w ) setContentFromEditor( w ); } void ConnectionItem::setSender( SenderItem *i ) { - connect( i, SIGNAL( currentSenderChanged( QObject * ) ), - this, SLOT( senderChanged( QObject * ) ) ); + connect( i, TQT_SIGNAL( currentSenderChanged( TQObject * ) ), + this, TQT_SLOT( senderChanged( TQObject * ) ) ); } void ConnectionItem::setReceiver( ReceiverItem *i ) { - connect( i, SIGNAL( currentReceiverChanged( QObject * ) ), - this, SLOT( receiverChanged( QObject * ) ) ); + connect( i, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQT_SLOT( receiverChanged( TQObject * ) ) ); } void ConnectionItem::setSignal( SignalItem *i ) { - connect( i, SIGNAL( currentSignalChanged( const QString & ) ), - this, SLOT( signalChanged( const QString & ) ) ); + connect( i, TQT_SIGNAL( currentSignalChanged( const TQString & ) ), + this, TQT_SLOT( signalChanged( const TQString & ) ) ); } void ConnectionItem::setSlot( SlotItem *i ) { - connect( i, SIGNAL( currentSlotChanged( const QString & ) ), - this, SLOT( slotChanged( const QString & ) ) ); + connect( i, TQT_SIGNAL( currentSlotChanged( const TQString & ) ), + this, TQT_SLOT( slotChanged( const TQString & ) ) ); } -void ConnectionItem::paint( QPainter *p, const QColorGroup &cg, - const QRect &cr, bool selected ) +void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg, + const TQRect &cr, bool selected ) { p->fillRect( 0, 0, cr.width(), cr.height(), - selected ? cg.brush( QColorGroup::Highlight ) - : cg.brush( QColorGroup::Base ) ); + selected ? cg.brush( TQColorGroup::Highlight ) + : cg.brush( TQColorGroup::Base ) ); int w = cr.width(); int h = cr.height(); @@ -157,14 +157,14 @@ void ConnectionItem::paint( QPainter *p, const QColorGroup &cg, int x = 0; if ( currentText()[0] == '<' ) - p->setPen( QObject::red ); + p->setPen( TQObject::red ); else if ( selected ) p->setPen( cg.highlightedText() ); else p->setPen( cg.text() ); - QFont f( p->font() ); - QFont oldf( p->font() ); + TQFont f( p->font() ); + TQFont oldf( p->font() ); if ( conn && conn->isModified() ) { f.setBold( TRUE ); p->setFont( f ); @@ -181,29 +181,29 @@ void ConnectionItem::setConnection( ConnectionContainer *c ) // ------------------------------------------------------------------ -static void appendChildActions( QAction *action, QStringList &lst ) +static void appendChildActions( TQAction *action, TQStringList &lst ) { - QObjectListIt it( *action->children() ); + TQObjectListIt it( *action->children() ); while ( it.current() ) { - QObject *o = it.current(); + TQObject *o = it.current(); ++it; - if ( !::qt_cast(o) ) + if ( !::qt_cast(o) ) continue; lst << o->name(); - if ( o->children() && ::qt_cast(o) ) - appendChildActions( (QAction*)o, lst ); + if ( o->children() && ::qt_cast(o) ) + appendChildActions( (TQAction*)o, lst ); } } -static QStringList flatActions( const QPtrList &l ) +static TQStringList flatActions( const TQPtrList &l ) { - QStringList lst; + TQStringList lst; - QPtrListIterator it( l ); + TQPtrListIterator it( l ); while ( it.current() ) { - QAction *action = it.current(); + TQAction *action = it.current(); lst << action->name(); - if ( action->children() && ::qt_cast(action) ) + if ( action->children() && ::qt_cast(action) ) appendChildActions( action, lst ); ++it; } @@ -213,18 +213,18 @@ static QStringList flatActions( const QPtrList &l ) // ------------------------------------------------------------------ -SenderItem::SenderItem( QTable *table, FormWindow *fw ) +SenderItem::SenderItem( TQTable *table, FormWindow *fw ) : ConnectionItem( table, fw ) { - QStringList lst; + TQStringList lst; - QPtrDictIterator it( *formWindow->widgets() ); + TQPtrDictIterator it( *formWindow->widgets() ); while ( it.current() ) { if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } - if ( !QString( it.current()->name() ).startsWith( "qt_dead_widget_" ) && + if ( !TQString( it.current()->name() ).startsWith( "qt_dead_widget_" ) && !::qt_cast(it.current()) && !::qt_cast(it.current()) && !::qt_cast(it.current()) && @@ -241,24 +241,24 @@ SenderItem::SenderItem( QTable *table, FormWindow *fw ) setStringList( lst ); } -QWidget *SenderItem::createEditor() const +TQWidget *SenderItem::createEditor() const { - QComboBox *cb = (QComboBox*)ConnectionItem::createEditor(); + TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const QString & ) ), - this, SLOT( senderChanged( const QString & ) ) ); + connect( cb, TQT_SIGNAL( activated( const TQString & ) ), + this, TQT_SLOT( senderChanged( const TQString & ) ) ); return cb; } -void SenderItem::setSenderEx( QObject *sender ) +void SenderItem::setSenderEx( TQObject *sender ) { setCurrentItem( sender->name() ); emit currentSenderChanged( sender ); } -void SenderItem::senderChanged( const QString &sender ) +void SenderItem::senderChanged( const TQString &sender ) { - QObject *o = formWindow->child( sender, "QObject" ); + TQObject *o = formWindow->child( sender, "TQObject" ); if ( !o ) o = formWindow->findAction( sender ); if ( !o ) @@ -270,18 +270,18 @@ void SenderItem::senderChanged( const QString &sender ) // ------------------------------------------------------------------ -ReceiverItem::ReceiverItem( QTable *table, FormWindow *fw ) +ReceiverItem::ReceiverItem( TQTable *table, FormWindow *fw ) : ConnectionItem( table, fw ) { - QStringList lst; + TQStringList lst; - QPtrDictIterator it( *formWindow->widgets() ); + TQPtrDictIterator it( *formWindow->widgets() ); while ( it.current() ) { if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } - if ( !QString( it.current()->name() ).startsWith( "qt_dead_widget_" ) && + if ( !TQString( it.current()->name() ).startsWith( "qt_dead_widget_" ) && !::qt_cast(it.current()) && !::qt_cast(it.current()) && !::qt_cast(it.current()) && @@ -298,24 +298,24 @@ ReceiverItem::ReceiverItem( QTable *table, FormWindow *fw ) setStringList( lst ); } -QWidget *ReceiverItem::createEditor() const +TQWidget *ReceiverItem::createEditor() const { - QComboBox *cb = (QComboBox*)ConnectionItem::createEditor(); + TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const QString & ) ), - this, SLOT( receiverChanged( const QString & ) ) ); + connect( cb, TQT_SIGNAL( activated( const TQString & ) ), + this, TQT_SLOT( receiverChanged( const TQString & ) ) ); return cb; } -void ReceiverItem::setReceiverEx( QObject *receiver ) +void ReceiverItem::setReceiverEx( TQObject *receiver ) { setCurrentItem( receiver->name() ); emit currentReceiverChanged( receiver ); } -void ReceiverItem::receiverChanged( const QString &receiver ) +void ReceiverItem::receiverChanged( const TQString &receiver ) { - QObject *o = formWindow->child( receiver, "QObject" ); + TQObject *o = formWindow->child( receiver, "TQObject" ); if ( !o ) o = formWindow->findAction( receiver ); if ( !o ) @@ -327,34 +327,34 @@ void ReceiverItem::receiverChanged( const QString &receiver ) // ------------------------------------------------------------------ -SignalItem::SignalItem( QTable *table, FormWindow *fw ) +SignalItem::SignalItem( TQTable *table, FormWindow *fw ) : ConnectionItem( table, fw ) { - QStringList lst; + TQStringList lst; lst << ""; lst.sort(); setStringList( lst ); } -void SignalItem::senderChanged( QObject *sender ) +void SignalItem::senderChanged( TQObject *sender ) { - QStrList sigs = sender->metaObject()->signalNames( TRUE ); + TQStrList sigs = sender->metaObject()->signalNames( TRUE ); sigs.remove( "destroyed()" ); - sigs.remove( "destroyed(QObject*)" ); + sigs.remove( "destroyed(TQObject*)" ); sigs.remove( "accessibilityChanged(int)" ); sigs.remove( "accessibilityChanged(int,int)" ); - QStringList lst = QStringList::fromStrList( sigs ); + TQStringList lst = TQStringList::fromStrList( sigs ); if ( ::qt_cast(sender) ) { MetaDataBase::CustomWidget *w = ( (CustomWidget*)sender )->customWidget(); - for ( QValueList::Iterator it = w->lstSignals.begin(); + for ( TQValueList::Iterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) lst << MetaDataBase::normalizeFunction( *it ); } if ( sender == formWindow->mainContainer() ) { - QStringList extra = MetaDataBase::signalList( formWindow ); + TQStringList extra = MetaDataBase::signalList( formWindow ); if ( !extra.isEmpty() ) lst += extra; } @@ -367,21 +367,21 @@ void SignalItem::senderChanged( QObject *sender ) ConnectionItem::senderChanged( sender ); } -QWidget *SignalItem::createEditor() const +TQWidget *SignalItem::createEditor() const { - QComboBox *cb = (QComboBox*)ConnectionItem::createEditor(); + TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const QString & ) ), - this, SIGNAL( currentSignalChanged( const QString & ) ) ); + connect( cb, TQT_SIGNAL( activated( const TQString & ) ), + this, TQT_SIGNAL( currentSignalChanged( const TQString & ) ) ); return cb; } // ------------------------------------------------------------------ -SlotItem::SlotItem( QTable *table, FormWindow *fw ) +SlotItem::SlotItem( TQTable *table, FormWindow *fw ) : ConnectionItem( table, fw ) { - QStringList lst; + TQStringList lst; lst << ""; lst.sort(); setStringList( lst ); @@ -390,14 +390,14 @@ SlotItem::SlotItem( QTable *table, FormWindow *fw ) lastSignal = ""; } -void SlotItem::receiverChanged( QObject *receiver ) +void SlotItem::receiverChanged( TQObject *receiver ) { lastReceiver = receiver; updateSlotList(); ConnectionItem::receiverChanged( receiver ); } -void SlotItem::signalChanged( const QString &signal ) +void SlotItem::signalChanged( const TQString &signal ) { lastSignal = signal; updateSlotList(); @@ -408,7 +408,7 @@ bool SlotItem::ignoreSlot( const char* slot ) const { #ifndef QT_NO_SQL if ( qstrcmp( slot, "update()" ) == 0 && - ::qt_cast(lastReceiver) ) + ::qt_cast(lastReceiver) ) return FALSE; #endif @@ -417,14 +417,14 @@ bool SlotItem::ignoreSlot( const char* slot ) const return TRUE; } - if ( !formWindow->isMainContainer( (QWidget*)lastReceiver ) ) { + if ( !formWindow->isMainContainer( (TQWidget*)lastReceiver ) ) { if ( qstrcmp( slot, "close()" ) == 0 ) return TRUE; } if ( qstrcmp( slot, "setFocus()" ) == 0 ) if ( lastReceiver->isWidgetType() && - ( (QWidget*)lastReceiver )->focusPolicy() == QWidget::NoFocus ) + ( (TQWidget*)lastReceiver )->focusPolicy() == TQWidget::NoFocus ) return TRUE; return FALSE; @@ -432,7 +432,7 @@ bool SlotItem::ignoreSlot( const char* slot ) const void SlotItem::updateSlotList() { - QStringList lst; + TQStringList lst; if ( !lastReceiver || lastSignal == "" ) { lst << ""; lst.sort(); @@ -440,15 +440,15 @@ void SlotItem::updateSlotList() return; } - QString signal = MetaDataBase::normalizeFunction( lastSignal ); + TQString signal = MetaDataBase::normalizeFunction( lastSignal ); int n = lastReceiver->metaObject()->numSlots( TRUE ); - QStringList slts; + TQStringList slts; for( int i = 0; i < n; ++i ) { // accept only public slots. For the form window, also accept protected slots const QMetaData* md = lastReceiver->metaObject()->slot( i, TRUE ); if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->access == QMetaData::Public) || - (formWindow->isMainContainer( (QWidget*)lastReceiver ) && + (formWindow->isMainContainer( (TQWidget*)lastReceiver ) && lastReceiver->metaObject()->slot(i, TRUE)->access == QMetaData::Protected) ) && !ignoreSlot( md->name ) && @@ -460,12 +460,12 @@ void SlotItem::updateSlotList() LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); if ( !iface || iface->supports( LanguageInterface::ConnectionsToCustomSlots ) ) { - if ( formWindow->isMainContainer( (QWidget*)lastReceiver ) ) { - QValueList moreSlots = MetaDataBase::slotList( formWindow ); + if ( formWindow->isMainContainer( (TQWidget*)lastReceiver ) ) { + TQValueList moreSlots = MetaDataBase::slotList( formWindow ); if ( !moreSlots.isEmpty() ) { - for ( QValueList::Iterator it = moreSlots.begin(); + for ( TQValueList::Iterator it = moreSlots.begin(); it != moreSlots.end(); ++it ) { - QCString s = (*it).function; + TQCString s = (*it).function; if ( !s.data() ) continue; s = MetaDataBase::normalizeFunction( s ); @@ -480,9 +480,9 @@ void SlotItem::updateSlotList() if ( ::qt_cast(lastReceiver) ) { MetaDataBase::CustomWidget *w = ( (CustomWidget*)lastReceiver )->customWidget(); - for ( QValueList::Iterator it = w->lstSlots.begin(); + for ( TQValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) { - QCString s = (*it).function; + TQCString s = (*it).function; if ( !s.data() ) continue; s = MetaDataBase::normalizeFunction( s ); @@ -498,18 +498,18 @@ void SlotItem::updateSlotList() setStringList( lst ); } -QWidget *SlotItem::createEditor() const +TQWidget *SlotItem::createEditor() const { - QComboBox *cb = (QComboBox*)ConnectionItem::createEditor(); + TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const QString & ) ), - this, SIGNAL( currentSlotChanged( const QString & ) ) ); + connect( cb, TQT_SIGNAL( activated( const TQString & ) ), + this, TQT_SIGNAL( currentSlotChanged( const TQString & ) ) ); return cb; } void SlotItem::customSlotsChanged() { - QString currSlot = currentText(); + TQString currSlot = currentText(); updateSlotList(); setCurrentItem( "" ); setCurrentItem( currSlot ); diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h index 2442e475..2af42b6b 100644 --- a/kdevdesigner/designer/connectionitems.h +++ b/kdevdesigner/designer/connectionitems.h @@ -29,7 +29,7 @@ class FormWindow; -#include +#include class SenderItem; class ReceiverItem; @@ -38,16 +38,16 @@ class SlotItem; class ConnectionContainer; -class ConnectionItem : public QObject, +class ConnectionItem : public TQObject, public QComboTableItem { Q_OBJECT public: - ConnectionItem( QTable *table, FormWindow *fw ); + ConnectionItem( TQTable *table, FormWindow *fw ); - void paint( QPainter *p, const QColorGroup &cg, - const QRect &cr, bool selected ); + void paint( TQPainter *p, const TQColorGroup &cg, + const TQRect &cr, bool selected ); void setSender( SenderItem *i ); void setReceiver( ReceiverItem *i ); @@ -56,10 +56,10 @@ public: void setConnection( ConnectionContainer *c ); public slots: - virtual void senderChanged( QObject *sender ); - virtual void receiverChanged( QObject *receiver ); - virtual void signalChanged( const QString &sig ); - virtual void slotChanged( const QString &slot ); + virtual void senderChanged( TQObject *sender ); + virtual void receiverChanged( TQObject *receiver ); + virtual void signalChanged( const TQString &sig ); + virtual void slotChanged( const TQString &slot ); signals: void changed(); @@ -79,15 +79,15 @@ class SenderItem : public ConnectionItem Q_OBJECT public: - SenderItem( QTable *table, FormWindow *fw ); - QWidget *createEditor() const; - void setSenderEx( QObject *sender ); + SenderItem( TQTable *table, FormWindow *fw ); + TQWidget *createEditor() const; + void setSenderEx( TQObject *sender ); signals: - void currentSenderChanged( QObject *sender ); + void currentSenderChanged( TQObject *sender ); private slots: - void senderChanged( const QString &sender ); + void senderChanged( const TQString &sender ); }; @@ -98,15 +98,15 @@ class ReceiverItem : public ConnectionItem Q_OBJECT public: - ReceiverItem( QTable *table, FormWindow *fw ); - QWidget *createEditor() const; - void setReceiverEx( QObject *receiver ); + ReceiverItem( TQTable *table, FormWindow *fw ); + TQWidget *createEditor() const; + void setReceiverEx( TQObject *receiver ); signals: - void currentReceiverChanged( QObject *receiver ); + void currentReceiverChanged( TQObject *receiver ); private slots: - void receiverChanged( const QString &receiver ); + void receiverChanged( const TQString &receiver ); }; @@ -117,13 +117,13 @@ class SignalItem : public ConnectionItem Q_OBJECT public: - SignalItem( QTable *table, FormWindow *fw ); + SignalItem( TQTable *table, FormWindow *fw ); - void senderChanged( QObject *sender ); - QWidget *createEditor() const; + void senderChanged( TQObject *sender ); + TQWidget *createEditor() const; signals: - void currentSignalChanged( const QString & ); + void currentSignalChanged( const TQString & ); }; @@ -134,24 +134,24 @@ class SlotItem : public ConnectionItem Q_OBJECT public: - SlotItem( QTable *table, FormWindow *fw ); + SlotItem( TQTable *table, FormWindow *fw ); - void receiverChanged( QObject *receiver ); - void signalChanged( const QString &signal ); - QWidget *createEditor() const; + void receiverChanged( TQObject *receiver ); + void signalChanged( const TQString &signal ); + TQWidget *createEditor() const; void customSlotsChanged(); signals: - void currentSlotChanged( const QString & ); + void currentSlotChanged( const TQString & ); private: void updateSlotList(); bool ignoreSlot( const char* slot ) const; private: - QObject *lastReceiver; - QString lastSignal; + TQObject *lastReceiver; + TQString lastSignal; }; @@ -162,18 +162,18 @@ class ConnectionContainer : public QObject Q_OBJECT public: - ConnectionContainer( QObject *parent, SenderItem *i1, SignalItem *i2, + ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2, ReceiverItem *i3, SlotItem *i4, int r ) - : QObject( parent ), mod( FALSE ), se( i1 ), si( i2 ), + : TQObject( parent ), mod( FALSE ), se( i1 ), si( i2 ), re( i3 ), sl( i4 ), rw ( r ) { i1->setConnection( this ); i2->setConnection( this ); i3->setConnection( this ); i4->setConnection( this ); - connect( i1, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); - connect( i2, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); - connect( i3, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); - connect( i4, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); + connect( i1, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); + connect( i2, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); + connect( i3, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); + connect( i4, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); } bool isModified() const { return mod; } diff --git a/kdevdesigner/designer/connectiontable.cpp b/kdevdesigner/designer/connectiontable.cpp index 7fed1b07..3cfdb057 100644 --- a/kdevdesigner/designer/connectiontable.cpp +++ b/kdevdesigner/designer/connectiontable.cpp @@ -28,8 +28,8 @@ #include -ConnectionTable::ConnectionTable( QWidget *parent, const char *name ) - : QTable( 0, 4, parent, name ) +ConnectionTable::ConnectionTable( TQWidget *parent, const char *name ) + : TQTable( 0, 4, parent, name ) { setSorting( TRUE ); setShowGrid( FALSE ); @@ -50,7 +50,7 @@ void ConnectionTable::sortColumn( int col, bool ascending, bool ) horizontalHeader()->setSortIndicator( col, ascending ); if ( isEditing() ) endEdit( currEditRow(), currEditCol(), FALSE, FALSE ); - QTable::sortColumn( col, ascending, TRUE ); + TQTable::sortColumn( col, ascending, TRUE ); setCurrentCell( 0, 0 ); emit resorted(); } diff --git a/kdevdesigner/designer/connectiontable.h b/kdevdesigner/designer/connectiontable.h index 288b544f..4db4bf51 100644 --- a/kdevdesigner/designer/connectiontable.h +++ b/kdevdesigner/designer/connectiontable.h @@ -27,14 +27,14 @@ #ifndef CONNECTIONTABLE_H #define CONNECTIONTABLE_H -#include +#include class ConnectionTable : public QTable { Q_OBJECT public: - ConnectionTable( QWidget *parent, const char *name ); + ConnectionTable( TQWidget *parent, const char *name ); void sortColumn( int col, bool ascending, bool wholeRows ); diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp index dc0ed1a8..99fa00fd 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.cpp +++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp @@ -36,32 +36,32 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -CustomWidgetEditor::CustomWidgetEditor( QWidget *parent, MainWindow *mw ) +CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); - checkTimer = new QTimer( this ); - connect( checkTimer, SIGNAL( timeout() ), - this, SLOT( checkWidgetName() ) ); + connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + checkTimer = new TQTimer( this ); + connect( checkTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( checkWidgetName() ) ); editClass->setEnabled( FALSE ); editHeader->setEnabled( FALSE ); @@ -73,7 +73,7 @@ CustomWidgetEditor::CustomWidgetEditor( QWidget *parent, MainWindow *mw ) sizeVer->setEnabled( FALSE ); checkContainer->setEnabled( FALSE ); localGlobalCombo->setEnabled( FALSE ); - editClass->setValidator( new AsciiValidator( QString(":"), editClass ) ); + editClass->setValidator( new AsciiValidator( TQString(":"), editClass ) ); editSignal->setValidator( new AsciiValidator( TRUE, editSignal ) ); editSlot->setValidator( new AsciiValidator( TRUE, editSignal ) ); editProperty->setValidator( new AsciiValidator( editSignal ) ); @@ -88,13 +88,13 @@ CustomWidgetEditor::CustomWidgetEditor( QWidget *parent, MainWindow *mw ) void CustomWidgetEditor::setupDefinition() { - QPtrList *lst = MetaDataBase::customWidgets(); + TQPtrList *lst = MetaDataBase::customWidgets(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { - QListBoxItem *i; + TQListBoxItem *i; if ( w->pixmap ) - i = new QListBoxPixmap( boxWidgets, *w->pixmap, w->className ); + i = new TQListBoxPixmap( boxWidgets, *w->pixmap, w->className ); else - i = new QListBoxText( boxWidgets, w->className ); + i = new TQListBoxText( boxWidgets, w->className ); customWidgets.insert( i, w ); } @@ -113,8 +113,8 @@ void CustomWidgetEditor::setupSignals() if ( !w ) return; listSignals->clear(); - for ( QValueList::Iterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) - listSignals->insertItem( QString( *it ) ); + for ( TQValueList::Iterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) + listSignals->insertItem( TQString( *it ) ); if ( listSignals->firstItem() ) { listSignals->setCurrentItem( listSignals->firstItem() ); listSignals->setSelected( listSignals->firstItem(), TRUE ); @@ -131,8 +131,8 @@ void CustomWidgetEditor::setupSlots() if ( !w ) return; listSlots->clear(); - for ( QValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) - (void)new QListViewItem( listSlots, (*it).function, (*it).access ); + for ( TQValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) + (void)new TQListViewItem( listSlots, (*it).function, (*it).access ); if ( listSlots->firstChild() ) { listSlots->setCurrentItem( listSlots->firstChild() ); @@ -150,8 +150,8 @@ void CustomWidgetEditor::setupProperties() if ( !w ) return; listProperties->clear(); - for ( QValueList::Iterator it = w->lstProperties.begin(); it != w->lstProperties.end(); ++it ) - (void)new QListViewItem( listProperties, (*it).property, (*it).type ); + for ( TQValueList::Iterator it = w->lstProperties.begin(); it != w->lstProperties.end(); ++it ) + (void)new TQListViewItem( listProperties, (*it).property, (*it).type ); if ( listProperties->firstChild() ) { listProperties->setCurrentItem( listProperties->firstChild() ); @@ -159,7 +159,7 @@ void CustomWidgetEditor::setupProperties() } } -void CustomWidgetEditor::currentWidgetChanged( QListBoxItem *i ) +void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i ) { checkTimer->stop(); checkWidgetName(); @@ -217,25 +217,25 @@ void CustomWidgetEditor::addWidgetClicked() checkWidgetName(); MetaDataBase::CustomWidget *w = new MetaDataBase::CustomWidget; - QString s = w->className; + TQString s = w->className; if ( !MetaDataBase::addCustomWidget( w ) ) { - QMessageBox::information( this, i18n( "Adding Custom Widget" ), + TQMessageBox::information( this, i18n( "Adding Custom Widget" ), i18n( "Custom widget names must be unique.\n" "A custom widget called '%1' already exists, so it is not possible " "to add another widget with this name." ).arg( s ) ); return; } - QListBoxPixmap *i = new QListBoxPixmap( boxWidgets, *w->pixmap, w->className ); + TQListBoxPixmap *i = new TQListBoxPixmap( boxWidgets, *w->pixmap, w->className ); customWidgets.insert( i, w ); boxWidgets->setCurrentItem( i ); boxWidgets->setSelected( i, TRUE ); } -void CustomWidgetEditor::classNameChanged( const QString &s ) +void CustomWidgetEditor::classNameChanged( const TQString &s ) { - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -246,7 +246,7 @@ void CustomWidgetEditor::classNameChanged( const QString &s ) boxWidgets->blockSignals( TRUE ); oldName = w->className; w->className = s; - QListBoxItem *old = i; + TQListBoxItem *old = i; if ( w->pixmap ) boxWidgets->changeItem( *w->pixmap, s, boxWidgets->currentItem() ); else @@ -265,11 +265,11 @@ void CustomWidgetEditor::deleteWidgetClicked() checkTimer->stop(); checkWidgetName(); - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( mainWindow->isCustomWidgetUsed( w ) ) { - QMessageBox::information( mainWindow, i18n( "Removing Custom Widget" ), + TQMessageBox::information( mainWindow, i18n( "Removing Custom Widget" ), i18n( "The custom widget '%1' is in use, so it cannot be removed." ). arg( w->className ) ); return; @@ -293,9 +293,9 @@ void CustomWidgetEditor::deleteWidgetClicked() } } -void CustomWidgetEditor::headerFileChanged( const QString &s ) +void CustomWidgetEditor::headerFileChanged( const TQString &s ) { - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -305,7 +305,7 @@ void CustomWidgetEditor::headerFileChanged( const QString &s ) void CustomWidgetEditor::heightChanged( int h ) { - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -316,7 +316,7 @@ void CustomWidgetEditor::heightChanged( int h ) void CustomWidgetEditor::includePolicyChanged( int p ) { - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -326,19 +326,19 @@ void CustomWidgetEditor::includePolicyChanged( int p ) void CustomWidgetEditor::pixmapChoosen() { - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; - QPixmap pix = qChoosePixmap( this ); + TQPixmap pix = qChoosePixmap( this ); if ( pix.isNull() ) return; delete w->pixmap; - w->pixmap = new QPixmap( pix ); + w->pixmap = new TQPixmap( pix ); boxWidgets->blockSignals( TRUE ); - QListBoxItem *old = i; + TQListBoxItem *old = i; boxWidgets->changeItem( *w->pixmap, w->className, boxWidgets->currentItem() ); i = boxWidgets->item( boxWidgets->currentItem() ); customWidgets.insert( i, w ); @@ -349,7 +349,7 @@ void CustomWidgetEditor::pixmapChoosen() void CustomWidgetEditor::widthChanged( int wid ) { - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -358,12 +358,12 @@ void CustomWidgetEditor::widthChanged( int wid ) updateCustomWidgetSizes(); } -MetaDataBase::CustomWidget *CustomWidgetEditor::findWidget( QListBoxItem *i ) +MetaDataBase::CustomWidget *CustomWidgetEditor::findWidget( TQListBoxItem *i ) { if ( !i ) return 0; - QMap::Iterator it = customWidgets.find( i ); + TQMap::Iterator it = customWidgets.find( i ); if ( it == customWidgets.end() ) return 0; return *it; @@ -371,12 +371,12 @@ MetaDataBase::CustomWidget *CustomWidgetEditor::findWidget( QListBoxItem *i ) void CustomWidgetEditor::chooseHeader() { - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; - QString h = KFileDialog::getOpenFileName( QString::null, i18n( "*.h *.h++ *.hxx *.hh|Header Files" ), this ); + TQString h = KFileDialog::getOpenFileName( TQString::null, i18n( "*.h *.h++ *.hxx *.hh|Header Files" ), this ); if ( h.isEmpty() ) return; editHeader->setText( h ); @@ -385,16 +385,16 @@ void CustomWidgetEditor::chooseHeader() void CustomWidgetEditor::checkWidgetName() { - QListBoxItem *i = oldItem ? oldItem : boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = oldItem ? oldItem : boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); oldItem = 0; if ( !i || !w ) return; if ( MetaDataBase::isWidgetNameUsed( w ) ) { - QString s = w->className; + TQString s = w->className; w->className = oldName; - QMessageBox::information( this, i18n( "Renaming Custom Widget" ), + TQMessageBox::information( this, i18n( "Renaming Custom Widget" ), i18n( "Custom widget names must be unique.\n" "A custom widget called '%1' already exists, so it is not possible " "to rename this widget with this name." ).arg( s ) ); @@ -415,7 +415,7 @@ void CustomWidgetEditor::closeClicked() accept(); } -void CustomWidgetEditor::currentSignalChanged( QListBoxItem *i ) +void CustomWidgetEditor::currentSignalChanged( TQListBoxItem *i ) { editSignal->blockSignals( TRUE ); editSignal->setText( "" ); @@ -436,7 +436,7 @@ void CustomWidgetEditor::currentSignalChanged( QListBoxItem *i ) void CustomWidgetEditor::addSignal() { - QListBoxItem *i = new QListBoxText( listSignals, "signal()" ); + TQListBoxItem *i = new TQListBoxText( listSignals, "signal()" ); listSignals->setCurrentItem( i ); listSignals->setSelected( i, TRUE ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); @@ -446,7 +446,7 @@ void CustomWidgetEditor::addSignal() void CustomWidgetEditor::removeSignal() { - QString s = listSignals->currentText(); + TQString s = listSignals->currentText(); delete listSignals->item( listSignals->currentItem() ); if ( listSignals->currentItem() != -1 ) listSignals->setSelected( listSignals->currentItem(), TRUE ); @@ -455,13 +455,13 @@ void CustomWidgetEditor::removeSignal() w->lstSignals.remove( s.latin1() ); } -void CustomWidgetEditor::signalNameChanged( const QString &s ) +void CustomWidgetEditor::signalNameChanged( const TQString &s ) { MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || listSignals->currentItem() == -1 ) return; - QValueList::Iterator it = w->lstSignals.find( listSignals->currentText().latin1() ); + TQValueList::Iterator it = w->lstSignals.find( listSignals->currentText().latin1() ); if ( it != w->lstSignals.end() ) w->lstSignals.remove( it ); listSignals->blockSignals( TRUE ); @@ -470,7 +470,7 @@ void CustomWidgetEditor::signalNameChanged( const QString &s ) w->lstSignals.append( s.latin1() ); } -void CustomWidgetEditor::slotAccessChanged( const QString &s ) +void CustomWidgetEditor::slotAccessChanged( const TQString &s ) { MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listSlots->currentItem() ) @@ -479,7 +479,7 @@ void CustomWidgetEditor::slotAccessChanged( const QString &s ) MetaDataBase::Function slot; slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); - QValueList::Iterator it = w->lstSlots.find( slot ); + TQValueList::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 1, s ); @@ -488,7 +488,7 @@ void CustomWidgetEditor::slotAccessChanged( const QString &s ) w->lstSlots.append( slot ); } -void CustomWidgetEditor::slotNameChanged( const QString &s ) +void CustomWidgetEditor::slotNameChanged( const TQString &s ) { MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listSlots->currentItem() ) @@ -498,7 +498,7 @@ void CustomWidgetEditor::slotNameChanged( const QString &s ) slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); slot.type = "slot"; - QValueList::Iterator it = w->lstSlots.find( slot ); + TQValueList::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 0, s ); @@ -509,7 +509,7 @@ void CustomWidgetEditor::slotNameChanged( const QString &s ) void CustomWidgetEditor::addSlot() { - QListViewItem *i = new QListViewItem( listSlots, "slot()", "public" ); + TQListViewItem *i = new TQListViewItem( listSlots, "slot()", "public" ); listSlots->setCurrentItem( i ); listSlots->setSelected( i, TRUE ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); @@ -538,7 +538,7 @@ void CustomWidgetEditor::removeSlot() w->lstSlots.remove( slot ); } -void CustomWidgetEditor::currentSlotChanged( QListViewItem *i ) +void CustomWidgetEditor::currentSlotChanged( TQListViewItem *i ) { editSlot->blockSignals( TRUE ); editSlot->setText( "" ); @@ -565,7 +565,7 @@ void CustomWidgetEditor::currentSlotChanged( QListViewItem *i ) comboAccess->blockSignals( FALSE ); } -void CustomWidgetEditor::propertyTypeChanged( const QString &s ) +void CustomWidgetEditor::propertyTypeChanged( const TQString &s ) { MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listProperties->currentItem() ) @@ -574,7 +574,7 @@ void CustomWidgetEditor::propertyTypeChanged( const QString &s ) MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - QValueList::Iterator it = w->lstProperties.find( property ); + TQValueList::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 1, s ); @@ -583,7 +583,7 @@ void CustomWidgetEditor::propertyTypeChanged( const QString &s ) w->lstProperties.append( property ); } -void CustomWidgetEditor::propertyNameChanged( const QString &s ) +void CustomWidgetEditor::propertyNameChanged( const TQString &s ) { MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listProperties->currentItem() ) @@ -592,7 +592,7 @@ void CustomWidgetEditor::propertyNameChanged( const QString &s ) MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - QValueList::Iterator it = w->lstProperties.find( property ); + TQValueList::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 0, s ); @@ -603,7 +603,7 @@ void CustomWidgetEditor::propertyNameChanged( const QString &s ) void CustomWidgetEditor::addProperty() { - QListViewItem *i = new QListViewItem( listProperties, "property", "String" ); + TQListViewItem *i = new TQListViewItem( listProperties, "property", "String" ); listProperties->setCurrentItem( i ); listProperties->setSelected( i, TRUE ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); @@ -631,7 +631,7 @@ void CustomWidgetEditor::removeProperty() w->lstProperties.remove( property ); } -void CustomWidgetEditor::currentPropertyChanged( QListViewItem *i ) +void CustomWidgetEditor::currentPropertyChanged( TQListViewItem *i ) { editProperty->blockSignals( TRUE ); editProperty->setText( "" ); @@ -661,16 +661,16 @@ void CustomWidgetEditor::currentPropertyChanged( QListViewItem *i ) comboType->blockSignals( FALSE ); } -static QString makeIndent2( int indent ) +static TQString makeIndent2( int indent ) { - QString s; + TQString s; s.fill( ' ', indent * 4 ); return s; } -static QString entitize2( const QString &s ) +static TQString entitize2( const TQString &s ) { - QString s2 = s; + TQString s2 = s; s2 = s2.replace( "\"", """ ); s2 = s2.replace( "&", "&" ); s2 = s2.replace( ">", ">" ); @@ -681,18 +681,18 @@ static QString entitize2( const QString &s ) void CustomWidgetEditor::saveDescription() { - QString fn = KFileDialog::getSaveFileName( QString::null, i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this ); + TQString fn = KFileDialog::getSaveFileName( TQString::null, i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this ); if ( fn.isEmpty() ) return; - if ( QFileInfo( fn ).extension() != "cw" ) + if ( TQFileInfo( fn ).extension() != "cw" ) fn += ".cw"; - QFile f( fn ); + TQFile f( fn ); if ( !f.open( IO_WriteOnly ) ) return; - QTextStream ts( &f ); - ts.setCodec( QTextCodec::codecForName( "UTF-8" ) ); + TQTextStream ts( &f ); + ts.setCodec( TQTextCodec::codecForName( "UTF-8" ) ); int indent = 0; ts << "" << endl; @@ -700,7 +700,7 @@ void CustomWidgetEditor::saveDescription() ts << makeIndent2( indent ) << "" << endl; indent++; - QPtrList *lst = MetaDataBase::customWidgets(); + TQPtrList *lst = MetaDataBase::customWidgets(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { ts << makeIndent2( indent ) << "" << endl; indent++; @@ -727,15 +727,15 @@ void CustomWidgetEditor::saveDescription() indent--; ts << makeIndent2( indent ) << "" << endl; if ( !w->lstSignals.isEmpty() ) { - for ( QValueList::Iterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) + for ( TQValueList::Iterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) ts << makeIndent2( indent ) << "" << entitize2( *it ) << "" << endl; } if ( !w->lstSlots.isEmpty() ) { - for ( QValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) + for ( TQValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) ts << makeIndent2( indent ) << "" << entitize2( (*it).function ) << "" << endl; } if ( !w->lstProperties.isEmpty() ) { - for ( QValueList::Iterator it = w->lstProperties.begin(); it != w->lstProperties.end(); ++it ) + for ( TQValueList::Iterator it = w->lstProperties.begin(); it != w->lstProperties.end(); ++it ) ts << makeIndent2( indent ) << "" << entitize2( (*it).property ) << "" << endl; } indent--; @@ -749,23 +749,23 @@ void CustomWidgetEditor::saveDescription() void CustomWidgetEditor::loadDescription() { - QString fn = KFileDialog::getOpenFileName( QString::null, i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this ); + TQString fn = KFileDialog::getOpenFileName( TQString::null, i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this ); if ( fn.isEmpty() ) return; - QFile f( fn ); + TQFile f( fn ); if ( !f.open( IO_ReadOnly ) ) return; - QDomDocument doc; - QString errMsg; + TQDomDocument doc; + TQString errMsg; int errLine; if ( !doc.setContent( &f, &errMsg, &errLine ) ) { - qDebug( QString("Parse error: ") + errMsg + QString(" in line %d"), errLine ); + qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); return; } - QDomElement firstWidget = doc.firstChild().toElement().firstChild().toElement(); + TQDomElement firstWidget = doc.firstChild().toElement().firstChild().toElement(); while ( firstWidget.tagName() != "customwidgets" ) firstWidget = firstWidget.nextSibling().toElement(); @@ -782,23 +782,23 @@ void CustomWidgetEditor::updateCustomWidgetSizes() { if ( cwLst.isEmpty() ) cwLst = *mainWindow->queryList( "CustomWidget" ); - for ( QObject *o = cwLst.first(); o; o = cwLst.next() ) - ( (QWidget*)o )->updateGeometry(); + for ( TQObject *o = cwLst.first(); o; o = cwLst.next() ) + ( (TQWidget*)o )->updateGeometry(); } void CustomWidgetEditor::horDataChanged( int a ) { - QSizePolicy::SizeType st = int_to_size_type( a ); - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQSizePolicy::SizeType st = int_to_size_type( a ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; - QSizePolicy osp = w->sizePolicy; + TQSizePolicy osp = w->sizePolicy; w->sizePolicy.setHorData( st ); if ( cwLst.isEmpty() ) cwLst = *mainWindow->queryList( "CustomWidget" ); - for ( QObject *o = cwLst.first(); o; o = cwLst.next() ) { + for ( TQObject *o = cwLst.first(); o; o = cwLst.next() ) { CustomWidget *cw = (CustomWidget*)o; if ( cw->realClassName() == boxWidgets->currentText() ) { if ( cw->sizePolicy() == osp ) @@ -809,17 +809,17 @@ void CustomWidgetEditor::horDataChanged( int a ) void CustomWidgetEditor::verDataChanged( int a ) { - QSizePolicy::SizeType st = int_to_size_type( a ); - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQSizePolicy::SizeType st = int_to_size_type( a ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; - QSizePolicy osp = w->sizePolicy; + TQSizePolicy osp = w->sizePolicy; w->sizePolicy.setVerData( st ); if ( cwLst.isEmpty() ) cwLst = *mainWindow->queryList( "CustomWidget" ); - for ( QObject *o = cwLst.first(); o; o = cwLst.next() ) { + for ( TQObject *o = cwLst.first(); o; o = cwLst.next() ) { CustomWidget *cw = (CustomWidget*)o; if ( cw->realClassName() == boxWidgets->currentText() ) { if ( cw->sizePolicy() == osp ) @@ -830,7 +830,7 @@ void CustomWidgetEditor::verDataChanged( int a ) void CustomWidgetEditor::widgetIsContainer( bool b ) { - QListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); + TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; diff --git a/kdevdesigner/designer/customwidgeteditorimpl.h b/kdevdesigner/designer/customwidgeteditorimpl.h index cdbf402f..6bf06d18 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.h +++ b/kdevdesigner/designer/customwidgeteditorimpl.h @@ -30,8 +30,8 @@ #include "customwidgeteditor.h" #include "metadatabase.h" -#include -#include +#include +#include class QTimer; class QListBoxItem; @@ -42,14 +42,14 @@ class CustomWidgetEditor : public CustomWidgetEditorBase Q_OBJECT public: - CustomWidgetEditor( QWidget *parent , MainWindow *mw); + CustomWidgetEditor( TQWidget *parent , MainWindow *mw); protected slots: void addWidgetClicked(); - void classNameChanged( const QString & ); - void currentWidgetChanged( QListBoxItem * ); + void classNameChanged( const TQString & ); + void currentWidgetChanged( TQListBoxItem * ); void deleteWidgetClicked(); - void headerFileChanged( const QString & ); + void headerFileChanged( const TQString & ); void heightChanged( int ); void includePolicyChanged( int ); void pixmapChoosen(); @@ -57,20 +57,20 @@ protected slots: void chooseHeader(); void checkWidgetName(); void closeClicked(); - void currentSignalChanged( QListBoxItem *i ); + void currentSignalChanged( TQListBoxItem *i ); void addSignal(); void removeSignal(); - void signalNameChanged( const QString &s ); - void slotAccessChanged( const QString & ); - void slotNameChanged( const QString & ); + void signalNameChanged( const TQString &s ); + void slotAccessChanged( const TQString & ); + void slotNameChanged( const TQString & ); void addSlot(); void removeSlot(); - void currentSlotChanged( QListViewItem * ); - void propertyTypeChanged( const QString & ); - void propertyNameChanged( const QString & ); + void currentSlotChanged( TQListViewItem * ); + void propertyTypeChanged( const TQString & ); + void propertyNameChanged( const TQString & ); void addProperty(); void removeProperty(); - void currentPropertyChanged( QListViewItem * ); + void currentPropertyChanged( TQListViewItem * ); void saveDescription(); void loadDescription(); void horDataChanged( int ); @@ -78,7 +78,7 @@ protected slots: void widgetIsContainer( bool ); private: - MetaDataBase::CustomWidget *findWidget( QListBoxItem *i ); + MetaDataBase::CustomWidget *findWidget( TQListBoxItem *i ); void setupDefinition(); void setupSignals(); void setupSlots(); @@ -86,12 +86,12 @@ private: void updateCustomWidgetSizes(); private: - QMap customWidgets; - QString oldName; - QTimer *checkTimer; - QListBoxItem *oldItem; + TQMap customWidgets; + TQString oldName; + TQTimer *checkTimer; + TQListBoxItem *oldItem; MainWindow *mainWindow; - QObjectList cwLst; + TQObjectList cwLst; }; diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp index a92a04c8..c9621604 100644 --- a/kdevdesigner/designer/database.cpp +++ b/kdevdesigner/designer/database.cpp @@ -37,10 +37,10 @@ #include "mainwindow.h" #endif -#include -#include -#include -#include +#include +#include +#include +#include DatabaseSupport::DatabaseSupport() { @@ -49,40 +49,40 @@ DatabaseSupport::DatabaseSupport() parent = 0; } -void DatabaseSupport::initPreview( const QString &connection, const QString &table, QObject *o, - const QMap &databaseControls ) +void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o, + const TQMap &databaseControls ) { tbl = table; dbControls = databaseControls; parent = o; if ( connection != "(default)" ) - con = QSqlDatabase::database( connection ); + con = TQSqlDatabase::database( connection ); else - con = QSqlDatabase::database(); - frm = new QSqlForm( o, table ); - for ( QMap::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { - QObject *chld = parent->child( it.key(), "QWidget" ); + con = TQSqlDatabase::database(); + frm = new TQSqlForm( o, table ); + for ( TQMap::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { + TQObject *chld = parent->child( it.key(), "TQWidget" ); if ( !chld ) continue; - frm->insert( (QWidget*)chld, *it ); + frm->insert( (TQWidget*)chld, *it ); } } -QDesignerDataBrowser::QDesignerDataBrowser( QWidget *parent, const char *name ) - : QDataBrowser( parent, name ) +QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *parent, const char *name ) + : TQDataBrowser( parent, name ) { } -bool QDesignerDataBrowser::event( QEvent* e ) +bool QDesignerDataBrowser::event( TQEvent* e ) { - bool b = QDataBrowser::event( e ); + bool b = TQDataBrowser::event( e ); #if defined(DESIGNER) if ( MainWindow::self->isPreviewing() ) { #endif - if ( e->type() == QEvent::Show ) { + if ( e->type() == TQEvent::Show ) { if ( con ) { - QSqlCursor* cursor = new QSqlCursor( tbl, TRUE, con ); + TQSqlCursor* cursor = new TQSqlCursor( tbl, TRUE, con ); setSqlCursor( cursor, TRUE ); setForm( frm ); refresh(); @@ -96,18 +96,18 @@ bool QDesignerDataBrowser::event( QEvent* e ) return b; } -QDesignerDataView::QDesignerDataView( QWidget *parent, const char *name ) - : QDataView( parent, name ) +QDesignerDataView::QDesignerDataView( TQWidget *parent, const char *name ) + : TQDataView( parent, name ) { } -bool QDesignerDataView::event( QEvent* e ) +bool QDesignerDataView::event( TQEvent* e ) { - bool b = QDataView::event( e ); + bool b = TQDataView::event( e ); #if defined(DESIGNER) if ( MainWindow::self->isPreviewing() ) { #endif - if ( e->type() == QEvent::Show ) { + if ( e->type() == TQEvent::Show ) { setForm( frm ); readFields(); return TRUE; diff --git a/kdevdesigner/designer/database.h b/kdevdesigner/designer/database.h index 530085fb..600018ed 100644 --- a/kdevdesigner/designer/database.h +++ b/kdevdesigner/designer/database.h @@ -27,13 +27,13 @@ #ifndef DATABASE_H #define DATABASE_H -#include "qfeatures.h" +#include "tqfeatures.h" #ifndef QT_NO_SQL -#include -#include -#include -#include +#include +#include +#include +#include class QSqlDatabase; class QSqlForm; @@ -44,38 +44,38 @@ public: DatabaseSupport(); virtual ~DatabaseSupport() {} - void initPreview( const QString &connection, const QString &table, QObject *o, - const QMap &databaseControls ); + void initPreview( const TQString &connection, const TQString &table, TQObject *o, + const TQMap &databaseControls ); protected: - QSqlDatabase* con; - QSqlForm* frm; - QString tbl; - QMap dbControls; - QObject *parent; + TQSqlDatabase* con; + TQSqlForm* frm; + TQString tbl; + TQMap dbControls; + TQObject *parent; }; -class QDesignerDataBrowser : public QDataBrowser, public DatabaseSupport +class QDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport { Q_OBJECT public: - QDesignerDataBrowser( QWidget *parent, const char *name ); + QDesignerDataBrowser( TQWidget *parent, const char *name ); protected: - bool event( QEvent* e ); + bool event( TQEvent* e ); }; -class QDesignerDataView : public QDataView, public DatabaseSupport +class QDesignerDataView : public TQDataView, public DatabaseSupport { Q_OBJECT public: - QDesignerDataView( QWidget *parent, const char *name ); + QDesignerDataView( TQWidget *parent, const char *name ); protected: - bool event( QEvent* e ); + bool event( TQEvent* e ); }; #endif diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp index 4867ed39..fb5697ca 100644 --- a/kdevdesigner/designer/dbconnectionimpl.cpp +++ b/kdevdesigner/designer/dbconnectionimpl.cpp @@ -28,14 +28,14 @@ #include "dbconnection.h" #include "project.h" #include "asciivalidator.h" -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include -DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, QWidget* parent, +DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent, const char* name, bool modal, WFlags fl ) : DatabaseConnectionEditorBase( parent, name, modal, fl ), conn( connection ) { diff --git a/kdevdesigner/designer/dbconnectionimpl.h b/kdevdesigner/designer/dbconnectionimpl.h index daef2c21..f85b978e 100644 --- a/kdevdesigner/designer/dbconnectionimpl.h +++ b/kdevdesigner/designer/dbconnectionimpl.h @@ -38,7 +38,7 @@ class DatabaseConnectionEditor : public DatabaseConnectionEditorBase Q_OBJECT public: - DatabaseConnectionEditor( DatabaseConnection* connection, QWidget* parent = 0, + DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~DatabaseConnectionEditor(); @@ -49,7 +49,7 @@ private: private: DatabaseConnection *conn; - QGridLayout* lay; + TQGridLayout* lay; DatabaseConnectionWidget* connectionWidget; }; diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp index 6f059336..1d3c1a0b 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.cpp +++ b/kdevdesigner/designer/dbconnectionsimpl.cpp @@ -25,18 +25,18 @@ **********************************************************************/ #include "dbconnectionsimpl.h" -#include -#include -#include +#include +#include +#include #include "project.h" -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "mainwindow.h" #include "asciivalidator.h" @@ -51,17 +51,17 @@ static bool blockChanges = FALSE; * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, QWidget* parent, const char* name, bool modal, WFlags fl ) +DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : DatabaseConnectionBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); connectionWidget = new DatabaseConnectionWidget( grp ); grpLayout->addWidget( connectionWidget, 0, 0 ); #ifndef QT_NO_SQL - QPtrList lst = project->databaseConnections(); + TQPtrList lst = project->databaseConnections(); for ( DatabaseConnection *conn = lst.first(); conn; conn = lst.next() ) listConnections->insertItem( conn->name() ); - connectionWidget->comboDriver->insertStringList( QSqlDatabase::drivers() ); + connectionWidget->comboDriver->insertStringList( TQSqlDatabase::drivers() ); #endif connectionWidget->editName->setValidator( new AsciiValidator( connectionWidget->editName ) ); enableAll( FALSE ); @@ -90,13 +90,13 @@ void DatabaseConnectionsEditor::newConnection() { blockChanges = TRUE; enableAll( TRUE ); - QString n( "(default)" ); + TQString n( "(default)" ); if ( project->databaseConnection( n ) ) { n = "connection"; int i = 2; - while ( project->databaseConnection( n + QString::number( i ) ) ) + while ( project->databaseConnection( n + TQString::number( i ) ) ) ++i; - n = n + QString::number( i ); + n = n + TQString::number( i ); } connectionWidget->editName->setText( n ); listConnections->clearSelection(); @@ -125,7 +125,7 @@ void DatabaseConnectionsEditor::doConnect() listConnections->setCurrentItem( listConnections->count() - 1 ); project->saveConnections(); } else { - QMessageBox::warning( MainWindow::self, i18n( "Connection" ), + TQMessageBox::warning( MainWindow::self, i18n( "Connection" ), i18n( "Could not connect to the database.\n" "Please ensure that the database server is running " "and that all the connection information is correct.\n" @@ -147,7 +147,7 @@ void DatabaseConnectionsEditor::doConnect() #endif } -void DatabaseConnectionsEditor::currentConnectionChanged( const QString &s ) +void DatabaseConnectionsEditor::currentConnectionChanged( const TQString &s ) { #ifndef QT_NO_SQL DatabaseConnection *conn = project->databaseConnection( s ); @@ -169,7 +169,7 @@ void DatabaseConnectionsEditor::currentConnectionChanged( const QString &s ) #endif } -void DatabaseConnectionsEditor::connectionNameChanged( const QString &s ) +void DatabaseConnectionsEditor::connectionNameChanged( const TQString &s ) { if ( listConnections->currentItem() == 0 || blockChanges ) return; diff --git a/kdevdesigner/designer/dbconnectionsimpl.h b/kdevdesigner/designer/dbconnectionsimpl.h index fdb70427..220e24a8 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.h +++ b/kdevdesigner/designer/dbconnectionsimpl.h @@ -37,7 +37,7 @@ class DatabaseConnectionsEditor : public DatabaseConnectionBase Q_OBJECT public: - DatabaseConnectionsEditor( Project *pro, QWidget* parent = 0, + DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~DatabaseConnectionsEditor(); @@ -45,8 +45,8 @@ protected slots: void deleteConnection(); void newConnection(); void doConnect(); - void currentConnectionChanged( const QString & ); - void connectionNameChanged( const QString &s ); + void currentConnectionChanged( const TQString & ); + void connectionNameChanged( const TQString &s ); private: void enableAll( bool b ); diff --git a/kdevdesigner/designer/defs.cpp b/kdevdesigner/designer/defs.cpp index 11b3dca0..de1c7dfc 100644 --- a/kdevdesigner/designer/defs.cpp +++ b/kdevdesigner/designer/defs.cpp @@ -26,59 +26,59 @@ #include "defs.h" -int size_type_to_int( QSizePolicy::SizeType t ) +int size_type_to_int( TQSizePolicy::SizeType t ) { - if ( t == QSizePolicy::Fixed ) + if ( t == TQSizePolicy::Fixed ) return 0; - if ( t == QSizePolicy::Minimum ) + if ( t == TQSizePolicy::Minimum ) return 1; - if ( t == QSizePolicy::Maximum ) + if ( t == TQSizePolicy::Maximum ) return 2; - if ( t == QSizePolicy::Preferred ) + if ( t == TQSizePolicy::Preferred ) return 3; - if ( t == QSizePolicy::MinimumExpanding ) + if ( t == TQSizePolicy::MinimumExpanding ) return 4; - if ( t == QSizePolicy::Expanding ) + if ( t == TQSizePolicy::Expanding ) return 5; - if ( t == QSizePolicy::Ignored ) + if ( t == TQSizePolicy::Ignored ) return 6; return 0; } -QString size_type_to_string( QSizePolicy::SizeType t ) +TQString size_type_to_string( TQSizePolicy::SizeType t ) { - if ( t == QSizePolicy::Fixed ) + if ( t == TQSizePolicy::Fixed ) return "Fixed"; - if ( t == QSizePolicy::Minimum ) + if ( t == TQSizePolicy::Minimum ) return "Minimum"; - if ( t == QSizePolicy::Maximum ) + if ( t == TQSizePolicy::Maximum ) return "Maximum"; - if ( t == QSizePolicy::Preferred ) + if ( t == TQSizePolicy::Preferred ) return "Preferred"; - if ( t == QSizePolicy::MinimumExpanding ) + if ( t == TQSizePolicy::MinimumExpanding ) return "MinimumExpanding"; - if ( t == QSizePolicy::Expanding ) + if ( t == TQSizePolicy::Expanding ) return "Expanding"; - if ( t == QSizePolicy::Ignored ) + if ( t == TQSizePolicy::Ignored ) return "Ignored"; - return QString(); + return TQString(); } -QSizePolicy::SizeType int_to_size_type( int i ) +TQSizePolicy::SizeType int_to_size_type( int i ) { if ( i == 0 ) - return QSizePolicy::Fixed; + return TQSizePolicy::Fixed; if ( i == 1 ) - return QSizePolicy::Minimum; + return TQSizePolicy::Minimum; if ( i == 2 ) - return QSizePolicy::Maximum; + return TQSizePolicy::Maximum; if ( i == 3 ) - return QSizePolicy::Preferred; + return TQSizePolicy::Preferred; if ( i == 4 ) - return QSizePolicy::MinimumExpanding; + return TQSizePolicy::MinimumExpanding; if ( i == 5 ) - return QSizePolicy::Expanding; + return TQSizePolicy::Expanding; if ( i == 6 ) - return QSizePolicy::Ignored; - return QSizePolicy::Preferred; + return TQSizePolicy::Ignored; + return TQSizePolicy::Preferred; } diff --git a/kdevdesigner/designer/defs.h b/kdevdesigner/designer/defs.h index 80a11671..e79d676c 100644 --- a/kdevdesigner/designer/defs.h +++ b/kdevdesigner/designer/defs.h @@ -27,16 +27,16 @@ #ifndef DEFS_H #define DEFS_H -#include -#include +#include +#include #define POINTER_TOOL 32000 #define CONNECT_TOOL 32001 #define ORDER_TOOL 32002 #define BUDDY_TOOL 32004 -int size_type_to_int( QSizePolicy::SizeType t ); -QString size_type_to_string( QSizePolicy::SizeType t ); -QSizePolicy::SizeType int_to_size_type( int i ); +int size_type_to_int( TQSizePolicy::SizeType t ); +TQString size_type_to_string( TQSizePolicy::SizeType t ); +TQSizePolicy::SizeType int_to_size_type( int i ); #endif diff --git a/kdevdesigner/designer/designer_pch.h b/kdevdesigner/designer/designer_pch.h index 6b53f984..883a7a7c 100644 --- a/kdevdesigner/designer/designer_pch.h +++ b/kdevdesigner/designer/designer_pch.h @@ -9,30 +9,30 @@ #if defined __cplusplus #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "command.h" #include "formwindow.h" diff --git a/kdevdesigner/designer/designeraction.cpp b/kdevdesigner/designer/designeraction.cpp index c797db5a..129bf3e5 100644 --- a/kdevdesigner/designer/designeraction.cpp +++ b/kdevdesigner/designer/designeraction.cpp @@ -25,13 +25,13 @@ DesignerAction::~DesignerAction() void DesignerAction::setDisabled( bool d ) { - QAction::setEnabled(!d); + TQAction::setEnabled(!d); emit actionEnabled(!d); } void DesignerAction::setEnabled( bool e ) { - QAction::setEnabled(e); + TQAction::setEnabled(e); emit actionEnabled(e); } diff --git a/kdevdesigner/designer/designeraction.h b/kdevdesigner/designer/designeraction.h index d8153574..0efd69dd 100644 --- a/kdevdesigner/designer/designeraction.h +++ b/kdevdesigner/designer/designeraction.h @@ -20,24 +20,24 @@ #ifndef DESIGNERACTION_H #define DESIGNERACTION_H -#include +#include class DesignerAction : public QAction { Q_OBJECT public: - DesignerAction(QObject *parent = 0, const char *name = 0) - :QAction(parent, name) {} - DesignerAction ( const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0 ) - :QAction(menuText, accel, parent, name) {} - DesignerAction ( const QIconSet & icon, const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0 ) - :QAction(icon, menuText, accel, parent, name) {} - DesignerAction ( const QString & text, const QIconSet & icon, const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0, bool toggle = FALSE ) - :QAction(text, icon, menuText, accel, parent, name, toggle) {} - DesignerAction ( const QString & text, const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0, bool toggle = FALSE ) - :QAction(text, menuText, accel, parent, name, toggle) {} - DesignerAction ( QObject * parent, const char * name, bool toggle ) - :QAction(parent, name, toggle) {} + DesignerAction(TQObject *parent = 0, const char *name = 0) + :TQAction(parent, name) {} + DesignerAction ( const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 ) + :TQAction(menuText, accel, parent, name) {} + DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 ) + :TQAction(icon, menuText, accel, parent, name) {} + DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE ) + :TQAction(text, icon, menuText, accel, parent, name, toggle) {} + DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE ) + :TQAction(text, menuText, accel, parent, name, toggle) {} + DesignerAction ( TQObject * parent, const char * name, bool toggle ) + :TQAction(parent, name, toggle) {} ~DesignerAction(); virtual void setEnabled(bool e); diff --git a/kdevdesigner/designer/designerapp.cpp b/kdevdesigner/designer/designerapp.cpp index 480bc65b..3a0016c4 100644 --- a/kdevdesigner/designer/designerapp.cpp +++ b/kdevdesigner/designer/designerapp.cpp @@ -31,30 +31,30 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef Q_WS_WIN #include #include #endif -static QSplashScreen *splash = 0; +static TQSplashScreen *splash = 0; -void set_splash_status( const QString &txt ) +void set_splash_status( const TQString &txt ) { if ( !splash ) return; - QString splashText = "Licensed to " - + QString::fromLatin1( QT_PRODUCT_LICENSEE ) + "\n" + TQString splashText = "Licensed to " + + TQString::fromLatin1( QT_PRODUCT_LICENSEE ) + "\n" + txt; splash->message( splashText, Qt::AlignRight|Qt::AlignTop ); } DesignerApplication::DesignerApplication( int &argc, char **argv ) - : QApplication( argc, argv ) + : TQApplication( argc, argv ) { #if defined(Q_WS_WIN) if ( winVersion() & Qt::WV_NT_based ) @@ -64,23 +64,23 @@ DesignerApplication::DesignerApplication( int &argc, char **argv ) #endif } -QSplashScreen *DesignerApplication::showSplash() +TQSplashScreen *DesignerApplication::showSplash() { - QRect screen = QApplication::desktop()->screenGeometry(); - QSettings config; - config.insertSearchPath( QSettings::Windows, "/Trolltech" ); + TQRect screen = TQApplication::desktop()->screenGeometry(); + TQSettings config; + config.insertSearchPath( TQSettings::Windows, "/Trolltech" ); - QRect mainRect; - QString keybase = settingsKey(); + TQRect mainRect; + TQString keybase = settingsKey(); bool show = config.readBoolEntry( keybase + "SplashScreen", TRUE ); mainRect.setX( config.readNumEntry( keybase + "Geometries/MainwindowX", 0 ) ); mainRect.setY( config.readNumEntry( keybase + "Geometries/MainwindowY", 0 ) ); mainRect.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", 500 ) ); mainRect.setHeight( config.readNumEntry( keybase + "Geometries/MainwindowHeight", 500 ) ); - screen = QApplication::desktop()->screenGeometry( QApplication::desktop()->screenNumber( mainRect.center() ) ); + screen = TQApplication::desktop()->screenGeometry( TQApplication::desktop()->screenNumber( mainRect.center() ) ); if ( show ) { - splash = new QSplashScreen( UserIcon("designer_splash.png") ); + splash = new TQSplashScreen( UserIcon("designer_splash.png") ); splash->show(); set_splash_status( "Initializing..." ); } @@ -93,19 +93,19 @@ void DesignerApplication::closeSplash() splash->hide(); } -static QString *settings_key = 0; -static QString *old_settings_key = 0; +static TQString *settings_key = 0; +static TQString *old_settings_key = 0; -QString DesignerApplication::settingsKey() +TQString DesignerApplication::settingsKey() { if ( !settings_key ) - settings_key = new QString( "/Qt Designer/" + - QString::number( (QT_VERSION >> 16) & 0xff ) + - "." + QString::number( (QT_VERSION >> 8) & 0xff ) + "/" ); + settings_key = new TQString( "/Qt Designer/" + + TQString::number( (QT_VERSION >> 16) & 0xff ) + + "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" ); return *settings_key; } -QString DesignerApplication::oldSettingsKey() +TQString DesignerApplication::oldSettingsKey() { if ( !old_settings_key ) { int majorVer = (QT_VERSION >> 16) & 0xff; @@ -116,17 +116,17 @@ QString DesignerApplication::oldSettingsKey() if ( !minorVer == 0 ) minorVer--; - old_settings_key = new QString( "/Qt Designer/" + - QString::number( majorVer ) + - "." + QString::number( minorVer ) + "/" ); + old_settings_key = new TQString( "/Qt Designer/" + + TQString::number( majorVer ) + + "." + TQString::number( minorVer ) + "/" ); } return *old_settings_key; } -void DesignerApplication::setSettingsKey( const QString &key ) +void DesignerApplication::setSettingsKey( const TQString &key ) { if ( !settings_key ) - settings_key = new QString( key ); + settings_key = new TQString( key ); else *settings_key = key; } @@ -135,20 +135,20 @@ void DesignerApplication::setSettingsKey( const QString &key ) bool DesignerApplication::winEventFilter( MSG *msg ) { if ( msg->message == DESIGNER_OPENFILE ) { - QFile f( QDir::homeDirPath() + "/.designerargs" ); - QFileInfo fi(f); + TQFile f( TQDir::homeDirPath() + "/.designerargs" ); + TQFileInfo fi(f); if ( fi.lastModified() == lastMod ) - return QApplication::winEventFilter( msg ); + return TQApplication::winEventFilter( msg ); lastMod = fi.lastModified(); f.open( IO_ReadOnly ); - QString args; + TQString args; f.readLine( args, f.size() ); - QStringList lst = QStringList::split( " ", args ); + TQStringList lst = TQStringList::split( " ", args ); - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { - QString arg = (*it).stripWhiteSpace(); + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + TQString arg = (*it).stripWhiteSpace(); if ( arg[0] != '-' ) { - QObjectList* l = MainWindow::self->queryList( "FormWindow" ); + TQObjectList* l = MainWindow::self->queryList( "FormWindow" ); FormWindow* fw = (FormWindow*) l->first(); FormWindow* totop = 0; bool haveit = FALSE; @@ -171,6 +171,6 @@ bool DesignerApplication::winEventFilter( MSG *msg ) } return TRUE; } - return QApplication::winEventFilter( msg ); + return TQApplication::winEventFilter( msg ); } #endif diff --git a/kdevdesigner/designer/designerapp.h b/kdevdesigner/designer/designerapp.h index d78d55af..3284bb91 100644 --- a/kdevdesigner/designer/designerapp.h +++ b/kdevdesigner/designer/designerapp.h @@ -29,7 +29,7 @@ class QSplashScreen; -#include +#include class DesignerApplication : public QApplication { @@ -38,15 +38,15 @@ public: DesignerApplication( int &argc, char **argv ); - QSplashScreen *showSplash(); + TQSplashScreen *showSplash(); static void closeSplash(); - static QString settingsKey(); - static QString oldSettingsKey(); - static void setSettingsKey( const QString &key ); + static TQString settingsKey(); + static TQString oldSettingsKey(); + static void setSettingsKey( const TQString &key ); protected: - QDateTime lastMod; + TQDateTime lastMod; #if defined(Q_WS_WIN) bool winEventFilter( MSG *msg ); diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp index 798f45b6..dca4bbd8 100644 --- a/kdevdesigner/designer/designerappiface.cpp +++ b/kdevdesigner/designer/designerappiface.cpp @@ -24,8 +24,8 @@ ** **********************************************************************/ -#include -#include +#include +#include #include "designerappiface.h" #include "mainwindow.h" #include "project.h" @@ -35,14 +35,14 @@ #include "command.h" #include "outputwindow.h" #include "../shared/widgetdatabase.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "pixmapcollection.h" #include "hierarchyview.h" #include -#include +#include #include "popupmenueditor.h" #include "menubareditor.h" @@ -88,12 +88,12 @@ DesignerSourceFile *DesignerInterfaceImpl::currentSourceFile() const return 0; } -QPtrList DesignerInterfaceImpl::projectList() const +TQPtrList DesignerInterfaceImpl::projectList() const { return mainWindow->projectList(); } -void DesignerInterfaceImpl::showStatusMessage( const QString &text, int ms ) const +void DesignerInterfaceImpl::showStatusMessage( const TQString &text, int ms ) const { if ( text.isEmpty() ) { mainWindow->statusBar()->clear(); @@ -115,7 +115,7 @@ DesignerOutputDock *DesignerInterfaceImpl::outputDock() const return mainWindow->outputWindow() ? mainWindow->outputWindow()->iFace() : 0; } -void DesignerInterfaceImpl::setModified( bool b, QWidget *window ) +void DesignerInterfaceImpl::setModified( bool b, TQWidget *window ) { mainWindow->setModified( b, window ); } @@ -127,15 +127,15 @@ void DesignerInterfaceImpl::updateFunctionList() mainWindow->objectHierarchy()->updateClassBrowsers(); } -void DesignerInterfaceImpl::onProjectChange( QObject *receiver, const char *slot ) +void DesignerInterfaceImpl::onProjectChange( TQObject *receiver, const char *slot ) { - QObject::connect( mainWindow, SIGNAL( projectChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQT_SIGNAL( projectChanged() ), receiver, slot ); } -void DesignerInterfaceImpl::onFormChange( QObject *receiver, const char *slot ) +void DesignerInterfaceImpl::onFormChange( TQObject *receiver, const char *slot ) { - QObject::connect( mainWindow, SIGNAL( formWindowChanged() ), receiver, slot ); - QObject::connect( mainWindow, SIGNAL( editorChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQT_SIGNAL( formWindowChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQT_SIGNAL( editorChanged() ), receiver, slot ); } bool DesignerInterfaceImpl::singleProjectMode() const @@ -143,8 +143,8 @@ bool DesignerInterfaceImpl::singleProjectMode() const return mainWindow->singleProjectMode(); } -void DesignerInterfaceImpl::showError( QWidget *widget, - int line, const QString &message ) +void DesignerInterfaceImpl::showError( TQWidget *widget, + int line, const TQString &message ) { mainWindow->showErrorMessage( widget, line, message ); } @@ -154,12 +154,12 @@ void DesignerInterfaceImpl::runFinished() mainWindow->finishedRun(); } -void DesignerInterfaceImpl::showStackFrame( QWidget *w, int line ) +void DesignerInterfaceImpl::showStackFrame( TQWidget *w, int line ) { mainWindow->showStackFrame( w, line ); } -void DesignerInterfaceImpl::showDebugStep( QWidget *w, int line ) +void DesignerInterfaceImpl::showDebugStep( TQWidget *w, int line ) { mainWindow->showDebugStep( w, line ); } @@ -169,7 +169,7 @@ void DesignerInterfaceImpl::runProjectPrecondition() mainWindow->runProjectPrecondition(); } -void DesignerInterfaceImpl::runProjectPostcondition( QObjectList *l ) +void DesignerInterfaceImpl::runProjectPostcondition( TQObjectList *l ) { mainWindow->runProjectPostcondition( l ); } @@ -179,18 +179,18 @@ DesignerProjectImpl::DesignerProjectImpl( Project *pr ) { } -QPtrList DesignerProjectImpl::formList() const +TQPtrList DesignerProjectImpl::formList() const { - QPtrList list; - QObjectList *forms = project->formList(); + TQPtrList list; + TQObjectList *forms = project->formList(); if ( !forms ) return list; - QPtrListIterator it( *forms ); + TQPtrListIterator it( *forms ); while ( it.current() ) { - QObject *obj = it.current(); + TQObject *obj = it.current(); ++it; - QWidget *par = ::qt_cast(obj->parent()); + TQWidget *par = ::qt_cast(obj->parent()); if ( !obj->isWidgetType() || !par ) continue; @@ -201,20 +201,20 @@ QPtrList DesignerProjectImpl::formList() const return list; } -QString DesignerProjectImpl::formFileName( const QString &form ) const +TQString DesignerProjectImpl::formFileName( const TQString &form ) const { - for ( QPtrListIterator forms = project->formFiles(); + for ( TQPtrListIterator forms = project->formFiles(); forms.current(); ++forms ) { - if ( QString( forms.current()->formName() ) == form ) + if ( TQString( forms.current()->formName() ) == form ) return forms.current()->fileName(); } - return QString::null; + return TQString::null; } -QStringList DesignerProjectImpl::formNames() const +TQStringList DesignerProjectImpl::formNames() const { - QStringList l; - for ( QPtrListIterator forms = project->formFiles(); + TQStringList l; + for ( TQPtrListIterator forms = project->formFiles(); forms.current(); ++forms ) { FormFile* f = forms.current(); if ( f->isFake() ) @@ -232,30 +232,30 @@ void DesignerProjectImpl::removeForm( DesignerFormWindow * ) { } -QString DesignerProjectImpl::fileName() const +TQString DesignerProjectImpl::fileName() const { return project->fileName(); } -void DesignerProjectImpl::setFileName( const QString & ) +void DesignerProjectImpl::setFileName( const TQString & ) { } -QString DesignerProjectImpl::projectName() const +TQString DesignerProjectImpl::projectName() const { return project->projectName(); } -void DesignerProjectImpl::setProjectName( const QString & ) +void DesignerProjectImpl::setProjectName( const TQString & ) { } -QString DesignerProjectImpl::databaseFile() const +TQString DesignerProjectImpl::databaseFile() const { - return QString::null; + return TQString::null; } -void DesignerProjectImpl::setDatabaseFile( const QString & ) +void DesignerProjectImpl::setDatabaseFile( const TQString & ) { } @@ -264,11 +264,11 @@ void DesignerProjectImpl::setupDatabases() const MainWindow::self->editDatabaseConnections(); } -QPtrList DesignerProjectImpl::databaseConnections() const +TQPtrList DesignerProjectImpl::databaseConnections() const { - QPtrList lst; + TQPtrList lst; #ifndef QT_NO_SQL - QPtrList conns = project->databaseConnections(); + TQPtrList conns = project->databaseConnections(); for ( DatabaseConnection *d = conns.first(); d; d = conns.next() ) lst.append( d->iFace() ); #endif @@ -287,26 +287,26 @@ void DesignerProjectImpl::save() const { } -void DesignerProjectImpl::setLanguage( const QString &l ) +void DesignerProjectImpl::setLanguage( const TQString &l ) { project->setLanguage( l ); } -QString DesignerProjectImpl::language() const +TQString DesignerProjectImpl::language() const { return project->language(); } -void DesignerProjectImpl::setCustomSetting( const QString &key, const QString &value ) +void DesignerProjectImpl::setCustomSetting( const TQString &key, const TQString &value ) { project->setCustomSetting( key, value ); } -QString DesignerProjectImpl::customSetting( const QString &key ) const +TQString DesignerProjectImpl::customSetting( const TQString &key ) const { if ( key == "QTSCRIPT_PACKAGES" ) { - QString s = getenv( "QTSCRIPT_PACKAGES" ); - QString s2 = project->customSetting( "QUICK_PACKAGES" ); + TQString s = getenv( "QTSCRIPT_PACKAGES" ); + TQString s2 = project->customSetting( "QUICK_PACKAGES" ); if ( !s.isEmpty() && !s2.isEmpty() ) #if defined(Q_OS_WIN32) s += ";"; @@ -324,40 +324,40 @@ DesignerPixmapCollection *DesignerProjectImpl::pixmapCollection() const return project->pixmapCollection()->iFace(); } -void DesignerProjectImpl::breakPoints( QMap > &bps ) const +void DesignerProjectImpl::breakPoints( TQMap > &bps ) const { MainWindow::self->saveAllBreakPoints(); - for ( QPtrListIterator sources = project->sourceFiles(); + for ( TQPtrListIterator sources = project->sourceFiles(); sources.current(); ++sources ) { SourceFile* f = sources.current(); bps.insert( project->makeRelative( f->fileName() ) + " ", MetaDataBase::breakPoints( f ) ); } - for ( QPtrListIterator forms = project->formFiles(); + for ( TQPtrListIterator forms = project->formFiles(); forms.current(); ++forms ) { if ( forms.current()->formWindow() ) - bps.insert( QString( forms.current()->formWindow()->name() ) + "

", MetaDataBase::breakPoints( forms.current()->formWindow() ) ); + bps.insert( TQString( forms.current()->formWindow()->name() ) + " ", MetaDataBase::breakPoints( forms.current()->formWindow() ) ); } } -QString DesignerProjectImpl::breakPointCondition( QObject *o, int line ) const +TQString DesignerProjectImpl::breakPointCondition( TQObject *o, int line ) const { return MetaDataBase::breakPointCondition( MainWindow::self->findRealObject( o ), line ); } -void DesignerProjectImpl::setBreakPointCondition( QObject *o, int line, const QString &condition ) +void DesignerProjectImpl::setBreakPointCondition( TQObject *o, int line, const TQString &condition ) { MetaDataBase::setBreakPointCondition( MainWindow::self->findRealObject( o ), line, condition ); } void DesignerProjectImpl::clearAllBreakpoints() const { - QValueList empty; - for ( QPtrListIterator sources = project->sourceFiles(); + TQValueList empty; + for ( TQPtrListIterator sources = project->sourceFiles(); sources.current(); ++sources ) { SourceFile* f = sources.current(); MetaDataBase::setBreakPoints( f, empty ); } - for ( QPtrListIterator forms = project->formFiles(); + for ( TQPtrListIterator forms = project->formFiles(); forms.current(); ++forms ) { if ( forms.current()->formWindow() ) MetaDataBase::setBreakPoints( forms.current()->formWindow(), empty ); @@ -365,57 +365,57 @@ void DesignerProjectImpl::clearAllBreakpoints() const } } -void DesignerProjectImpl::setIncludePath( const QString &platform, const QString &path ) +void DesignerProjectImpl::setIncludePath( const TQString &platform, const TQString &path ) { project->setIncludePath( platform, path ); } -void DesignerProjectImpl::setLibs( const QString &platform, const QString &path ) +void DesignerProjectImpl::setLibs( const TQString &platform, const TQString &path ) { project->setLibs( platform, path ); } -void DesignerProjectImpl::setDefines( const QString &platform, const QString &path ) +void DesignerProjectImpl::setDefines( const TQString &platform, const TQString &path ) { project->setDefines( platform, path ); } -void DesignerProjectImpl::setConfig( const QString &platform, const QString &config ) +void DesignerProjectImpl::setConfig( const TQString &platform, const TQString &config ) { project->setConfig( platform, config ); } -void DesignerProjectImpl::setTemplate( const QString &t ) +void DesignerProjectImpl::setTemplate( const TQString &t ) { project->setTemplate( t ); } -QString DesignerProjectImpl::config( const QString &platform ) const +TQString DesignerProjectImpl::config( const TQString &platform ) const { return project->config( platform ); } -QString DesignerProjectImpl::libs( const QString &platform ) const +TQString DesignerProjectImpl::libs( const TQString &platform ) const { return project->libs( platform ); } -QString DesignerProjectImpl::defines( const QString &platform ) const +TQString DesignerProjectImpl::defines( const TQString &platform ) const { return project->defines( platform ); } -QString DesignerProjectImpl::includePath( const QString &platform ) const +TQString DesignerProjectImpl::includePath( const TQString &platform ) const { return project->includePath( platform ); } -QString DesignerProjectImpl::templte() const +TQString DesignerProjectImpl::templte() const { return project->templte(); } -bool DesignerProjectImpl::isGenericObject( QObject *o ) const +bool DesignerProjectImpl::isGenericObject( TQObject *o ) const { return !!project->fakeFormFileFor( o ); } @@ -432,66 +432,66 @@ DesignerDatabaseImpl::DesignerDatabaseImpl( DatabaseConnection *d ) { } -QString DesignerDatabaseImpl::name() const +TQString DesignerDatabaseImpl::name() const { return db->name(); } -void DesignerDatabaseImpl::setName( const QString & ) +void DesignerDatabaseImpl::setName( const TQString & ) { } -QString DesignerDatabaseImpl::driver() const +TQString DesignerDatabaseImpl::driver() const { return db->driver(); } -void DesignerDatabaseImpl::setDriver( const QString & ) +void DesignerDatabaseImpl::setDriver( const TQString & ) { } -QString DesignerDatabaseImpl::database() const +TQString DesignerDatabaseImpl::database() const { return db->database(); } -void DesignerDatabaseImpl::setDatabase( const QString & ) +void DesignerDatabaseImpl::setDatabase( const TQString & ) { } -QString DesignerDatabaseImpl::userName() const +TQString DesignerDatabaseImpl::userName() const { return db->username(); } -void DesignerDatabaseImpl::setUserName( const QString & ) +void DesignerDatabaseImpl::setUserName( const TQString & ) { } -QString DesignerDatabaseImpl::password() const +TQString DesignerDatabaseImpl::password() const { return db->password(); } -void DesignerDatabaseImpl::setPassword( const QString & ) +void DesignerDatabaseImpl::setPassword( const TQString & ) { } -QString DesignerDatabaseImpl::hostName() const +TQString DesignerDatabaseImpl::hostName() const { return db->hostname(); } -void DesignerDatabaseImpl::setHostName( const QString & ) +void DesignerDatabaseImpl::setHostName( const TQString & ) { } -QStringList DesignerDatabaseImpl::tables() const +TQStringList DesignerDatabaseImpl::tables() const { return db->tables(); } -QMap DesignerDatabaseImpl::fields() const +TQMap DesignerDatabaseImpl::fields() const { return db->fields(); } @@ -506,15 +506,15 @@ void DesignerDatabaseImpl::close() const db->close(); } -void DesignerDatabaseImpl::setFields( const QMap & ) +void DesignerDatabaseImpl::setFields( const TQMap & ) { } -void DesignerDatabaseImpl::setTables( const QStringList & ) +void DesignerDatabaseImpl::setTables( const TQStringList & ) { } -QSqlDatabase* DesignerDatabaseImpl::connection() +TQSqlDatabase* DesignerDatabaseImpl::connection() { return db->connection(); } @@ -527,7 +527,7 @@ DesignerPixmapCollectionImpl::DesignerPixmapCollectionImpl( PixmapCollection *co { } -void DesignerPixmapCollectionImpl::addPixmap( const QPixmap &p, const QString &name, bool force ) +void DesignerPixmapCollectionImpl::addPixmap( const TQPixmap &p, const TQString &name, bool force ) { PixmapCollection::Pixmap pix; pix.pix = p; @@ -538,7 +538,7 @@ void DesignerPixmapCollectionImpl::addPixmap( const QPixmap &p, const QString &n MetaDataBase::setPixmapKey( fw, p.serialNumber(), name ); } -QPixmap DesignerPixmapCollectionImpl::pixmap( const QString &name ) const +TQPixmap DesignerPixmapCollectionImpl::pixmap( const TQString &name ) const { return pixCollection->pixmap( name ); } @@ -550,22 +550,22 @@ DesignerFormWindowImpl::DesignerFormWindowImpl( FormWindow *fw ) { } -QString DesignerFormWindowImpl::name() const +TQString DesignerFormWindowImpl::name() const { return formWindow->name(); } -void DesignerFormWindowImpl::setName( const QString &n ) +void DesignerFormWindowImpl::setName( const TQString &n ) { formWindow->setName( n ); } -QString DesignerFormWindowImpl::fileName() const +TQString DesignerFormWindowImpl::fileName() const { return formWindow->fileName(); } -void DesignerFormWindowImpl::setFileName( const QString & ) +void DesignerFormWindowImpl::setFileName( const TQString & ) { } @@ -578,25 +578,25 @@ bool DesignerFormWindowImpl::isModified() const return formWindow->commandHistory()->isModified(); } -void DesignerFormWindowImpl::insertWidget( QWidget * ) +void DesignerFormWindowImpl::insertWidget( TQWidget * ) { } -QWidget *DesignerFormWindowImpl::create( const char *className, QWidget *parent, const char *name ) +TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *parent, const char *name ) { - QWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name ); formWindow->insertWidget( w, TRUE ); formWindow->killAccels( formWindow->mainContainer() ); return w; } -void DesignerFormWindowImpl::removeWidget( QWidget * ) +void DesignerFormWindowImpl::removeWidget( TQWidget * ) { } -QWidgetList DesignerFormWindowImpl::widgets() const +TQWidgetList DesignerFormWindowImpl::widgets() const { - return QWidgetList(); + return TQWidgetList(); } void DesignerFormWindowImpl::undo() @@ -653,17 +653,17 @@ void DesignerFormWindowImpl::layoutG() formWindow->layoutGrid(); } -void DesignerFormWindowImpl::layoutHContainer( QWidget* w ) +void DesignerFormWindowImpl::layoutHContainer( TQWidget* w ) { formWindow->layoutHorizontalContainer( w ); } -void DesignerFormWindowImpl::layoutVContainer( QWidget* w ) +void DesignerFormWindowImpl::layoutVContainer( TQWidget* w ) { formWindow->layoutVerticalContainer( w ); } -void DesignerFormWindowImpl::layoutGContainer( QWidget* w ) +void DesignerFormWindowImpl::layoutGContainer( TQWidget* w ) { formWindow->layoutGridContainer( w ); } @@ -672,7 +672,7 @@ void DesignerFormWindowImpl::breakLayout() { } -void DesignerFormWindowImpl::selectWidget( QWidget * w ) +void DesignerFormWindowImpl::selectWidget( TQWidget * w ) { formWindow->selectWidget( w, TRUE ); } @@ -686,38 +686,38 @@ void DesignerFormWindowImpl::clearSelection() formWindow->clearSelection(); } -bool DesignerFormWindowImpl::isWidgetSelected( QWidget * ) const +bool DesignerFormWindowImpl::isWidgetSelected( TQWidget * ) const { return FALSE; } -QWidgetList DesignerFormWindowImpl::selectedWidgets() const +TQWidgetList DesignerFormWindowImpl::selectedWidgets() const { return formWindow->selectedWidgets(); } -QWidget *DesignerFormWindowImpl::currentWidget() const +TQWidget *DesignerFormWindowImpl::currentWidget() const { return formWindow->currentWidget(); } -QWidget *DesignerFormWindowImpl::form() const +TQWidget *DesignerFormWindowImpl::form() const { return formWindow; } -void DesignerFormWindowImpl::setCurrentWidget( QWidget * ) +void DesignerFormWindowImpl::setCurrentWidget( TQWidget * ) { } -QPtrList DesignerFormWindowImpl::actionList() const +TQPtrList DesignerFormWindowImpl::actionList() const { - return QPtrList(); + return TQPtrList(); } -QAction *DesignerFormWindowImpl::createAction( const QString& text, const QIconSet& icon, const QString& menuText, int accel, - QObject* parent, const char* name, bool toggle ) +TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, + TQObject* parent, const char* name, bool toggle ) { QDesignerAction *a = new QDesignerAction( parent ); a->setName( name ); @@ -730,7 +730,7 @@ QAction *DesignerFormWindowImpl::createAction( const QString& text, const QIconS return a; } -void DesignerFormWindowImpl::addAction( QAction *a ) +void DesignerFormWindowImpl::addAction( TQAction *a ) { if ( formWindow->actionList().findRef( a ) != -1 ) return; @@ -744,7 +744,7 @@ void DesignerFormWindowImpl::addAction( QAction *a ) setPropertyChanged( a, "iconSet", TRUE ); } -void DesignerFormWindowImpl::removeAction( QAction *a ) +void DesignerFormWindowImpl::removeAction( TQAction *a ) { formWindow->actionList().removeRef( a ); } @@ -753,14 +753,14 @@ void DesignerFormWindowImpl::preview() const { } -void DesignerFormWindowImpl::addConnection( QObject *sender, const char *signal, QObject *receiver, const char *slot ) +void DesignerFormWindowImpl::addConnection( TQObject *sender, const char *signal, TQObject *receiver, const char *slot ) { MetaDataBase::addConnection( formWindow, sender, signal, receiver, slot ); } -void DesignerFormWindowImpl::addFunction( const QCString &function, const QString &specifier, - const QString &access, const QString &type, - const QString &language, const QString &returnType ) +void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQString &specifier, + const TQString &access, const TQString &type, + const TQString &language, const TQString &returnType ) { MetaDataBase::addFunction( formWindow, function, specifier, access, type, language, returnType ); formWindow->mainWindow()->functionsChanged(); @@ -768,49 +768,49 @@ void DesignerFormWindowImpl::addFunction( const QCString &function, const QStrin -void DesignerFormWindowImpl::setProperty( QObject *o, const char *property, const QVariant &value ) +void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value ) { int id = o->metaObject()->findProperty( property, TRUE ); - const QMetaProperty* p = o->metaObject()->property( id, TRUE ); + const TQMetaProperty* p = o->metaObject()->property( id, TRUE ); if ( p && p->isValid() ) o->setProperty( property, value ); else MetaDataBase::setFakeProperty( o, property, value ); } -QVariant DesignerFormWindowImpl::property( QObject *o, const char *prop ) const +TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const { int id = o->metaObject()->findProperty( prop, TRUE ); - const QMetaProperty* p = o->metaObject()->property( id, TRUE ); + const TQMetaProperty* p = o->metaObject()->property( id, TRUE ); if ( p && p->isValid() ) return o->property( prop ); return MetaDataBase::fakeProperty( o, prop ); } -void DesignerFormWindowImpl::setPropertyChanged( QObject *o, const char *property, bool changed ) +void DesignerFormWindowImpl::setPropertyChanged( TQObject *o, const char *property, bool changed ) { MetaDataBase::setPropertyChanged( o, property, changed ); } -bool DesignerFormWindowImpl::isPropertyChanged( QObject *o, const char *property ) const +bool DesignerFormWindowImpl::isPropertyChanged( TQObject *o, const char *property ) const { return MetaDataBase::isPropertyChanged( o, property ); } -void DesignerFormWindowImpl::setColumnFields( QObject *o, const QMap &f ) +void DesignerFormWindowImpl::setColumnFields( TQObject *o, const TQMap &f ) { MetaDataBase::setColumnFields( o, f ); } -QStringList DesignerFormWindowImpl::implementationIncludes() const +TQStringList DesignerFormWindowImpl::implementationIncludes() const { - QValueList includes = MetaDataBase::includes( formWindow ); - QStringList lst; - for ( QValueList::Iterator it = includes.begin(); it != includes.end(); ++it ) { + TQValueList includes = MetaDataBase::includes( formWindow ); + TQStringList lst; + for ( TQValueList::Iterator it = includes.begin(); it != includes.end(); ++it ) { MetaDataBase::Include inc = *it; if ( inc.implDecl != "in implementation" ) continue; - QString s = inc.header; + TQString s = inc.header; if ( inc.location == "global" ) { s.prepend( "<" ); s.append( ">" ); @@ -823,15 +823,15 @@ QStringList DesignerFormWindowImpl::implementationIncludes() const return lst; } -QStringList DesignerFormWindowImpl::declarationIncludes() const +TQStringList DesignerFormWindowImpl::declarationIncludes() const { - QValueList includes = MetaDataBase::includes( formWindow ); - QStringList lst; - for ( QValueList::Iterator it = includes.begin(); it != includes.end(); ++it ) { + TQValueList includes = MetaDataBase::includes( formWindow ); + TQStringList lst; + for ( TQValueList::Iterator it = includes.begin(); it != includes.end(); ++it ) { MetaDataBase::Include inc = *it; if ( inc.implDecl == "in implementation" ) continue; - QString s = inc.header; + TQString s = inc.header; if ( inc.location == "global" ) { s.prepend( "<" ); s.append( ">" ); @@ -844,19 +844,19 @@ QStringList DesignerFormWindowImpl::declarationIncludes() const return lst; } -void DesignerFormWindowImpl::setImplementationIncludes( const QStringList &lst ) +void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst ) { - QValueList oldIncludes = MetaDataBase::includes( formWindow ); - QValueList includes; - for ( QValueList::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) { + TQValueList oldIncludes = MetaDataBase::includes( formWindow ); + TQValueList includes; + for ( TQValueList::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) { MetaDataBase::Include inc = *it; if ( inc.implDecl == "in implementation" ) continue; includes << inc; } - for ( QStringList::ConstIterator sit = lst.begin(); sit != lst.end(); ++sit ) { - QString s = *sit; + for ( TQStringList::ConstIterator sit = lst.begin(); sit != lst.end(); ++sit ) { + TQString s = *sit; if ( s.startsWith( "#include" ) ) s.remove( (uint)0, 8 ); s = s.simplifyWhiteSpace(); @@ -886,19 +886,19 @@ void DesignerFormWindowImpl::setImplementationIncludes( const QStringList &lst ) formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } -void DesignerFormWindowImpl::setDeclarationIncludes( const QStringList &lst ) +void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst ) { - QValueList oldIncludes = MetaDataBase::includes( formWindow ); - QValueList includes; - for ( QValueList::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) { + TQValueList oldIncludes = MetaDataBase::includes( formWindow ); + TQValueList includes; + for ( TQValueList::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) { MetaDataBase::Include inc = *it; if ( inc.implDecl == "in declaration" ) continue; includes << inc; } - for ( QStringList::ConstIterator sit = lst.begin(); sit != lst.end(); ++sit ) { - QString s = *sit; + for ( TQStringList::ConstIterator sit = lst.begin(); sit != lst.end(); ++sit ) { + TQString s = *sit; if ( s.startsWith( "#include" ) ) s.remove( (uint)0, 8 ); s = s.simplifyWhiteSpace(); @@ -928,41 +928,41 @@ void DesignerFormWindowImpl::setDeclarationIncludes( const QStringList &lst ) formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } -QStringList DesignerFormWindowImpl::forwardDeclarations() const +TQStringList DesignerFormWindowImpl::forwardDeclarations() const { return MetaDataBase::forwards( formWindow ); } -void DesignerFormWindowImpl::setForwardDeclarations( const QStringList &lst ) +void DesignerFormWindowImpl::setForwardDeclarations( const TQStringList &lst ) { MetaDataBase::setForwards( formWindow, lst ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } -QStringList DesignerFormWindowImpl::signalList() const +TQStringList DesignerFormWindowImpl::signalList() const { return MetaDataBase::signalList( formWindow ); } -void DesignerFormWindowImpl::setSignalList( const QStringList &lst ) +void DesignerFormWindowImpl::setSignalList( const TQStringList &lst ) { MetaDataBase::setSignalList( formWindow, lst ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } -void DesignerFormWindowImpl::onModificationChange( QObject *receiver, const char *slot ) +void DesignerFormWindowImpl::onModificationChange( TQObject *receiver, const char *slot ) { - QObject::connect( formWindow, SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); + TQObject::connect( formWindow, TQT_SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); } -void DesignerFormWindowImpl::addMenu( const QString &text, const QString &name ) +void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name ) { - if ( !::qt_cast(formWindow->mainContainer()) ) + if ( !::qt_cast(formWindow->mainContainer()) ) return; - QMainWindow *mw = (QMainWindow*)formWindow->mainContainer(); + TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); PopupMenuEditor *popup = new PopupMenuEditor( formWindow, mw ); - QString n = name; + TQString n = name; formWindow->unify( popup, n, TRUE ); popup->setName( n ); MenuBarEditor *mb = (MenuBarEditor *)mw->child( 0, "MenuBarEditor" ); @@ -975,11 +975,11 @@ void DesignerFormWindowImpl::addMenu( const QString &text, const QString &name ) MetaDataBase::addEntry( popup ); } -void DesignerFormWindowImpl::addMenuAction( const QString &menu, QAction *a ) +void DesignerFormWindowImpl::addMenuAction( const TQString &menu, TQAction *a ) { - if ( !::qt_cast(formWindow->mainContainer()) ) + if ( !::qt_cast(formWindow->mainContainer()) ) return; - QMainWindow *mw = (QMainWindow*)formWindow->mainContainer(); + TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); if ( !mw->child( 0, "MenuBarEditor" ) ) return; PopupMenuEditor *popup = (PopupMenuEditor*)mw->child( menu, "PopupMenuEditor" ); @@ -988,37 +988,37 @@ void DesignerFormWindowImpl::addMenuAction( const QString &menu, QAction *a ) popup->insert( a ); } -void DesignerFormWindowImpl::addMenuSeparator( const QString &menu ) +void DesignerFormWindowImpl::addMenuSeparator( const TQString &menu ) { - if ( !::qt_cast(formWindow->mainContainer()) ) + if ( !::qt_cast(formWindow->mainContainer()) ) return; - QMainWindow *mw = (QMainWindow*)formWindow->mainContainer(); + TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); if ( !mw->child( 0, "MenuBarEditor" ) ) return; PopupMenuEditor *popup = (PopupMenuEditor*)mw->child( menu, "PopupMenuEditor" ); if ( !popup ) return; - QAction *a = new QSeparatorAction( 0 ); + TQAction *a = new QSeparatorAction( 0 ); popup->insert( a ); } -void DesignerFormWindowImpl::addToolBar( const QString &text, const QString &name ) +void DesignerFormWindowImpl::addToolBar( const TQString &text, const TQString &name ) { - if ( !::qt_cast(formWindow->mainContainer()) ) + if ( !::qt_cast(formWindow->mainContainer()) ) return; - QMainWindow *mw = (QMainWindow*)formWindow->mainContainer(); - QToolBar *tb = new QDesignerToolBar( mw ); - QString n = name; + TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); + TQToolBar *tb = new QDesignerToolBar( mw ); + TQString n = name; formWindow->unify( tb, n, TRUE ); tb->setName( n ); mw->addToolBar( tb, text ); } -void DesignerFormWindowImpl::addToolBarAction( const QString &tbn, QAction *a ) +void DesignerFormWindowImpl::addToolBarAction( const TQString &tbn, TQAction *a ) { - if ( !::qt_cast(formWindow->mainContainer()) ) + if ( !::qt_cast(formWindow->mainContainer()) ) return; - QMainWindow *mw = (QMainWindow*)formWindow->mainContainer(); + TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" ); if ( !tb ) return; @@ -1026,15 +1026,15 @@ void DesignerFormWindowImpl::addToolBarAction( const QString &tbn, QAction *a ) tb->addAction( a ); } -void DesignerFormWindowImpl::addToolBarSeparator( const QString &tbn ) +void DesignerFormWindowImpl::addToolBarSeparator( const TQString &tbn ) { - if ( !::qt_cast(formWindow->mainContainer()) ) + if ( !::qt_cast(formWindow->mainContainer()) ) return; - QMainWindow *mw = (QMainWindow*)formWindow->mainContainer(); + TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" ); if ( !tb ) return; - QAction *a = new QSeparatorAction( 0 ); + TQAction *a = new QSeparatorAction( 0 ); a->addTo( tb ); tb->addAction( a ); } @@ -1043,7 +1043,7 @@ DesignerDockImpl::DesignerDockImpl() { } -QDockWindow *DesignerDockImpl::dockWindow() const +TQDockWindow *DesignerDockImpl::dockWindow() const { return 0; } @@ -1053,14 +1053,14 @@ DesignerOutputDockImpl::DesignerOutputDockImpl( OutputWindow *ow ) { } -QWidget *DesignerOutputDockImpl::addView( const QString &title ) +TQWidget *DesignerOutputDockImpl::addView( const TQString &title ) { - QWidget *page = new QWidget( outWin ); + TQWidget *page = new TQWidget( outWin ); outWin->addTab( page, title ); return page; } -void DesignerOutputDockImpl::appendDebug( const QString &s ) +void DesignerOutputDockImpl::appendDebug( const TQString &s ) { outWin->appendDebug( s ); } @@ -1069,13 +1069,13 @@ void DesignerOutputDockImpl::clearDebug() { } -void DesignerOutputDockImpl::appendError( const QString &s, int l ) +void DesignerOutputDockImpl::appendError( const TQString &s, int l ) { - QStringList ls; + TQStringList ls; ls << s; - QValueList ll; + TQValueList ll; ll << l; - outWin->setErrorMessages( ls, ll, FALSE, QStringList(), QObjectList() ); + outWin->setErrorMessages( ls, ll, FALSE, TQStringList(), TQObjectList() ); } void DesignerOutputDockImpl::clearError() @@ -1087,7 +1087,7 @@ DesignerSourceFileImpl::DesignerSourceFileImpl( SourceFile *e ) { } -QString DesignerSourceFileImpl::fileName() const +TQString DesignerSourceFileImpl::fileName() const { return ed->fileName(); } diff --git a/kdevdesigner/designer/designerappiface.h b/kdevdesigner/designer/designerappiface.h index a9eace16..8566ac8e 100644 --- a/kdevdesigner/designer/designerappiface.h +++ b/kdevdesigner/designer/designerappiface.h @@ -44,23 +44,23 @@ public: DesignerProject *currentProject() const; DesignerFormWindow *currentForm() const; DesignerSourceFile *currentSourceFile() const; - QPtrList projectList() const; - void showStatusMessage( const QString &, int ms = 0 ) const; + TQPtrList projectList() const; + void showStatusMessage( const TQString &, int ms = 0 ) const; DesignerDock *createDock() const; DesignerOutputDock *outputDock() const; - void setModified( bool b, QWidget *window ); + void setModified( bool b, TQWidget *window ); void updateFunctionList(); - void onProjectChange( QObject *receiver, const char *slot ); - void onFormChange( QObject *receiver, const char *slot ); + void onProjectChange( TQObject *receiver, const char *slot ); + void onFormChange( TQObject *receiver, const char *slot ); bool singleProjectMode() const; - void showError( QWidget *widget, int line, const QString &message ); + void showError( TQWidget *widget, int line, const TQString &message ); void runFinished(); - void showStackFrame( QWidget *w, int line ); - void showDebugStep( QWidget *w, int line ); + void showStackFrame( TQWidget *w, int line ); + void showDebugStep( TQWidget *w, int line ); void runProjectPrecondition(); - void runProjectPostcondition( QObjectList *l ); + void runProjectPostcondition( TQObjectList *l ); QRESULT queryInterface( const QUuid &uuid, QUnknownInterface** iface ); @@ -76,42 +76,42 @@ class DesignerProjectImpl: public DesignerProject public: DesignerProjectImpl( Project *pr ); - QPtrList formList() const; - QStringList formNames() const; - QString formFileName( const QString &form ) const; + TQPtrList formList() const; + TQStringList formNames() const; + TQString formFileName( const TQString &form ) const; void addForm( DesignerFormWindow * ); void removeForm( DesignerFormWindow * ); - QString fileName() const; - void setFileName( const QString & ); - QString projectName() const; - void setProjectName( const QString & ); - QString databaseFile() const; - void setDatabaseFile( const QString & ); + TQString fileName() const; + void setFileName( const TQString & ); + TQString projectName() const; + void setProjectName( const TQString & ); + TQString databaseFile() const; + void setDatabaseFile( const TQString & ); void setupDatabases() const; - QPtrList databaseConnections() const; + TQPtrList databaseConnections() const; void addDatabase( DesignerDatabase * ); void removeDatabase( DesignerDatabase * ); void save() const; - void setLanguage( const QString & ); - QString language() const; - void setCustomSetting( const QString &key, const QString &value ); - QString customSetting( const QString &key ) const; + void setLanguage( const TQString & ); + TQString language() const; + void setCustomSetting( const TQString &key, const TQString &value ); + TQString customSetting( const TQString &key ) const; DesignerPixmapCollection *pixmapCollection() const; - void breakPoints( QMap > &bps ) const; - QString breakPointCondition( QObject *o, int line ) const; - void setBreakPointCondition( QObject *o, int line, const QString &condition ); + void breakPoints( TQMap > &bps ) const; + TQString breakPointCondition( TQObject *o, int line ) const; + void setBreakPointCondition( TQObject *o, int line, const TQString &condition ); void clearAllBreakpoints() const; - void setIncludePath( const QString &platform, const QString &path ); - void setLibs( const QString &platform, const QString &path ); - void setDefines( const QString &platform, const QString &path ); - void setConfig( const QString &platform, const QString &config ); - void setTemplate( const QString &t ); - QString config( const QString &platform ) const; - QString libs( const QString &platform ) const; - QString defines( const QString &platform ) const; - QString includePath( const QString &platform ) const; - QString templte() const; - bool isGenericObject( QObject *o ) const; + void setIncludePath( const TQString &platform, const TQString &path ); + void setLibs( const TQString &platform, const TQString &path ); + void setDefines( const TQString &platform, const TQString &path ); + void setConfig( const TQString &platform, const TQString &config ); + void setTemplate( const TQString &t ); + TQString config( const TQString &platform ) const; + TQString libs( const TQString &platform ) const; + TQString defines( const TQString &platform ) const; + TQString includePath( const TQString &platform ) const; + TQString templte() const; + bool isGenericObject( TQObject *o ) const; private: Project *project; @@ -126,25 +126,25 @@ class DesignerDatabaseImpl: public DesignerDatabase public: DesignerDatabaseImpl( DatabaseConnection *d ); - QString name() const; - void setName( const QString & ); - QString driver() const; - void setDriver( const QString & ); - QString database() const; - void setDatabase( const QString & ); - QString userName() const; - void setUserName( const QString & ); - QString password() const; - void setPassword( const QString & ); - QString hostName() const; - void setHostName( const QString & ); - QStringList tables() const; - void setTables( const QStringList & ); - QMap fields() const; - void setFields( const QMap & ); + TQString name() const; + void setName( const TQString & ); + TQString driver() const; + void setDriver( const TQString & ); + TQString database() const; + void setDatabase( const TQString & ); + TQString userName() const; + void setUserName( const TQString & ); + TQString password() const; + void setPassword( const TQString & ); + TQString hostName() const; + void setHostName( const TQString & ); + TQStringList tables() const; + void setTables( const TQStringList & ); + TQMap fields() const; + void setFields( const TQMap & ); void open( bool suppressDialog = TRUE ) const; void close() const; - QSqlDatabase* connection(); + TQSqlDatabase* connection(); private: DatabaseConnection *db; @@ -155,8 +155,8 @@ class DesignerPixmapCollectionImpl : public DesignerPixmapCollection { public: DesignerPixmapCollectionImpl( PixmapCollection *coll ); - void addPixmap( const QPixmap &p, const QString &name, bool force ); - QPixmap pixmap( const QString &name ) const; + void addPixmap( const TQPixmap &p, const TQString &name, bool force ); + TQPixmap pixmap( const TQString &name ) const; private: PixmapCollection *pixCollection; @@ -168,16 +168,16 @@ class DesignerFormWindowImpl: public DesignerFormWindow public: DesignerFormWindowImpl( FormWindow *fw ); - QString name() const; - void setName( const QString &n ); - QString fileName() const; - void setFileName( const QString & ); + TQString name() const; + void setName( const TQString &n ); + TQString fileName() const; + void setFileName( const TQString & ); void save() const; bool isModified() const; - void insertWidget( QWidget * ); - QWidget *create( const char *className, QWidget *parent, const char *name ); - void removeWidget( QWidget * ); - QWidgetList widgets() const; + void insertWidget( TQWidget * ); + TQWidget *create( const char *className, TQWidget *parent, const char *name ); + void removeWidget( TQWidget * ); + TQWidgetList widgets() const; void undo(); void redo(); void cut(); @@ -191,48 +191,48 @@ public: void layoutHSplit(); void layoutVSplit(); void layoutG(); - void layoutHContainer( QWidget* w ); - void layoutVContainer( QWidget* w ); - void layoutGContainer( QWidget* w ); + void layoutHContainer( TQWidget* w ); + void layoutVContainer( TQWidget* w ); + void layoutGContainer( TQWidget* w ); void breakLayout(); - void selectWidget( QWidget * ); + void selectWidget( TQWidget * ); void selectAll(); void clearSelection(); - bool isWidgetSelected( QWidget * ) const; - QWidgetList selectedWidgets() const; - QWidget *currentWidget() const; - QWidget *form() const; - void setCurrentWidget( QWidget * ); - QPtrList actionList() const; - QAction *createAction( const QString& text, const QIconSet& icon, const QString& menuText, int accel, - QObject* parent, const char* name = 0, bool toggle = FALSE ); - void addAction( QAction * ); - void removeAction( QAction * ); + bool isWidgetSelected( TQWidget * ) const; + TQWidgetList selectedWidgets() const; + TQWidget *currentWidget() const; + TQWidget *form() const; + void setCurrentWidget( TQWidget * ); + TQPtrList actionList() const; + TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, + TQObject* parent, const char* name = 0, bool toggle = FALSE ); + void addAction( TQAction * ); + void removeAction( TQAction * ); void preview() const; - void addFunction( const QCString &function, const QString& specifier, const QString &access, - const QString &type, const QString &language, const QString &returnType ); - void addConnection( QObject *sender, const char *signal, QObject *receiver, const char *slot ); - void setProperty( QObject *o, const char *property, const QVariant &value ); - QVariant property( QObject *o, const char *property ) const; - void setPropertyChanged( QObject *o, const char *property, bool changed ); - bool isPropertyChanged( QObject *o, const char *property ) const; - void setColumnFields( QObject *o, const QMap & ); - QStringList implementationIncludes() const; - QStringList declarationIncludes() const; - void setImplementationIncludes( const QStringList &lst ); - void setDeclarationIncludes( const QStringList &lst ); - QStringList forwardDeclarations() const; - void setForwardDeclarations( const QStringList &lst ); - QStringList signalList() const; - void setSignalList( const QStringList &lst ); - void addMenu( const QString &text, const QString &name ); - void addMenuAction( const QString &menu, QAction *a ); - void addMenuSeparator( const QString &menu ); - void addToolBar( const QString &text, const QString &name ); - void addToolBarAction( const QString &tb, QAction *a ); - void addToolBarSeparator( const QString &tb ); - - void onModificationChange( QObject *receiver, const char *slot ); + void addFunction( const TQCString &function, const TQString& specifier, const TQString &access, + const TQString &type, const TQString &language, const TQString &returnType ); + void addConnection( TQObject *sender, const char *signal, TQObject *receiver, const char *slot ); + void setProperty( TQObject *o, const char *property, const TQVariant &value ); + TQVariant property( TQObject *o, const char *property ) const; + void setPropertyChanged( TQObject *o, const char *property, bool changed ); + bool isPropertyChanged( TQObject *o, const char *property ) const; + void setColumnFields( TQObject *o, const TQMap & ); + TQStringList implementationIncludes() const; + TQStringList declarationIncludes() const; + void setImplementationIncludes( const TQStringList &lst ); + void setDeclarationIncludes( const TQStringList &lst ); + TQStringList forwardDeclarations() const; + void setForwardDeclarations( const TQStringList &lst ); + TQStringList signalList() const; + void setSignalList( const TQStringList &lst ); + void addMenu( const TQString &text, const TQString &name ); + void addMenuAction( const TQString &menu, TQAction *a ); + void addMenuSeparator( const TQString &menu ); + void addToolBar( const TQString &text, const TQString &name ); + void addToolBarAction( const TQString &tb, TQAction *a ); + void addToolBarSeparator( const TQString &tb ); + + void onModificationChange( TQObject *receiver, const char *slot ); private: FormWindow *formWindow; @@ -244,7 +244,7 @@ class DesignerDockImpl: public DesignerDock public: DesignerDockImpl(); - QDockWindow *dockWindow() const; + TQDockWindow *dockWindow() const; }; class DesignerOutputDockImpl: public DesignerOutputDock @@ -252,10 +252,10 @@ class DesignerOutputDockImpl: public DesignerOutputDock public: DesignerOutputDockImpl( OutputWindow *ow ); - QWidget *addView( const QString &pageName ); - void appendDebug( const QString & ); + TQWidget *addView( const TQString &pageName ); + void appendDebug( const TQString & ); void clearDebug(); - void appendError( const QString &, int ); + void appendError( const TQString &, int ); void clearError(); private: @@ -267,7 +267,7 @@ class DesignerSourceFileImpl : public DesignerSourceFile { public: DesignerSourceFileImpl( SourceFile *e ); - QString fileName() const; + TQString fileName() const; private: SourceFile *ed; diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp index 19506e22..fd773bd0 100644 --- a/kdevdesigner/designer/editfunctionsimpl.cpp +++ b/kdevdesigner/designer/editfunctionsimpl.cpp @@ -36,30 +36,30 @@ #include #include "kdevdesigner_part.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -EditFunctions::EditFunctions( QWidget *parent, FormWindow *fw, bool justSlots ) +EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); id = 0; functList.clear(); - QValueList functionList = MetaDataBase::functionList( fw ); - for ( QValueList::Iterator it = functionList.begin(); it != functionList.end(); ++it ) { - QListViewItem *i = new QListViewItem( functionListView ); + TQValueList functionList = MetaDataBase::functionList( fw ); + for ( TQValueList::Iterator it = functionList.begin(); it != functionList.end(); ++it ) { + TQListViewItem *i = new TQListViewItem( functionListView ); i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) ); i->setText( 0, (*it).function ); @@ -105,40 +105,40 @@ EditFunctions::EditFunctions( QWidget *parent, FormWindow *fw, bool justSlots ) lastType = "function"; // Enable rename for all QListViewItems - QListViewItemIterator lvit = functionListView->firstChild(); + TQListViewItemIterator lvit = functionListView->firstChild(); for ( ; *lvit; lvit++ ) (*lvit)->setRenameEnabled( 0, TRUE ); // Connect listview signal to signal-relay - QObject::connect( functionListView, - SIGNAL( itemRenamed( QListViewItem*, int, const QString & ) ), + TQObject::connect( functionListView, + TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - SLOT( emitItemRenamed(QListViewItem*, int, const QString&) ) ); + TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); - // Connect signal-relay to QLineEdit "functionName" - QObjectList *l = parent->queryList( "QLineEdit", "functionName" ); - QObject *obj; - QObjectListIt itemsLineEditIt( *l ); + // Connect signal-relay to TQLineEdit "functionName" + TQObjectList *l = parent->queryList( "TQLineEdit", "functionName" ); + TQObject *obj; + TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; - QObject::connect( this, - SIGNAL( itemRenamed( const QString & ) ), + TQObject::connect( this, + TQT_SIGNAL( itemRenamed( const TQString & ) ), obj, - SLOT( setText( const QString & ) ) ); + TQT_SLOT( setText( const TQString & ) ) ); } delete l; } void EditFunctions::okClicked() { - QValueList functionList = MetaDataBase::functionList( formWindow ); - QString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() ); - QPtrList commands; - QValueList::Iterator fit; + TQValueList functionList = MetaDataBase::functionList( formWindow ); + TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() ); + TQPtrList commands; + TQValueList::Iterator fit; if ( !functionList.isEmpty() ) { for ( fit = functionList.begin(); fit != functionList.end(); ++fit ) { bool functionFound = FALSE; - QValueList::Iterator it = functList.begin(); + TQValueList::Iterator it = functList.begin(); for ( ; it != functList.end(); ++it ) { if ( MetaDataBase::normalizeFunction( (*it).oldName ) == MetaDataBase::normalizeFunction( (*fit).function ) ) { @@ -157,11 +157,11 @@ void EditFunctions::okClicked() } bool invalidFunctions = FALSE; - QValueList invalidItems; + TQValueList invalidItems; if ( !functList.isEmpty() ) { - QStrList lst; - QValueList::Iterator it = functList.begin(); + TQStrList lst; + TQValueList::Iterator it = functList.begin(); for ( ; it != functList.end(); ++it ) { MetaDataBase::Function function; function.function = (*it).newName; @@ -172,7 +172,7 @@ void EditFunctions::okClicked() function.language = formWindow->project()->language(); if ( function.returnType.isEmpty() ) function.returnType = "void"; - QString s = function.function; + TQString s = function.function; s = s.simplifyWhiteSpace(); bool startNum = s[ 0 ] >= '0' && s[ 0 ] <= '9'; bool noParens = s.contains( '(' ) != 1 || s.contains( ')' ) != 1; @@ -200,7 +200,7 @@ void EditFunctions::okClicked() if ( MetaDataBase::normalizeFunction( (*it).newName ) != MetaDataBase::normalizeFunction( (*it).oldName ) || (*it).spec != (*it).oldSpec || (*it).access != (*it).oldAccess || (*it).type != (*it).oldType || (*it).retTyp != (*it).oldRetTyp ) { - QString normalizedOldName = MetaDataBase::normalizeFunction( (*it).oldName ); + TQString normalizedOldName = MetaDataBase::normalizeFunction( (*it).oldName ); if ((*it).oldName.endsWith("const")) // make sure we get the 'const' when we remove the old name normalizedOldName += " const"; commands.append( new ChangeFunctionAttribCommand( i18n( "Change Function Attributes" ), @@ -213,13 +213,13 @@ void EditFunctions::okClicked() } if ( invalidFunctions ) { - if ( QMessageBox::information( this, i18n( "Edit Functions" ), + if ( TQMessageBox::information( this, i18n( "Edit Functions" ), i18n( "Some syntactically incorrect functions have been defined.\n" "Remove these functions?" ), i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { - QValueList::Iterator it = functList.begin(); + TQValueList::Iterator it = functList.begin(); while ( it != functList.end() ) { bool found = FALSE; - QValueList::Iterator vit = invalidItems.begin(); + TQValueList::Iterator vit = invalidItems.begin(); for ( ; vit != invalidItems.end(); ++vit ) { if ( (*vit).newName == (*it).newName ) { invalidItems.remove( vit ); @@ -230,10 +230,10 @@ void EditFunctions::okClicked() if ( found ) { int delId = (*it).id; it = functList.remove( it ); - QMap::Iterator fit = functionIds.begin(); + TQMap::Iterator fit = functionIds.begin(); while ( fit != functionIds.end() ) { if ( *fit == delId ) { - QListViewItem *litem = fit.key(); + TQListViewItem *litem = fit.key(); functionIds.remove( fit ); delete litem; if ( functionListView->currentItem() ) @@ -266,9 +266,9 @@ void EditFunctions::okClicked() accept(); } -void EditFunctions::functionAdd( const QString &access, const QString &type ) +void EditFunctions::functionAdd( const TQString &access, const TQString &type ) { - QListViewItem *i = new QListViewItem( functionListView ); + TQListViewItem *i = new TQListViewItem( functionListView ); i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) ); i->setRenameEnabled( 0, TRUE ); i->setText( 1, "void" ); @@ -332,7 +332,7 @@ void EditFunctions::functionRemove() functionListView->blockSignals( TRUE ); removedFunctions << MetaDataBase::normalizeFunction( functionListView->currentItem()->text( 0 ) ); int delId = functionIds[ functionListView->currentItem() ]; - QValueList::Iterator it = functList.begin(); + TQValueList::Iterator it = functList.begin(); while ( it != functList.end() ) { if ( (*it).id == delId ) { functList.remove( it ); @@ -348,7 +348,7 @@ void EditFunctions::functionRemove() currentItemChanged( functionListView->currentItem() ); } -void EditFunctions::currentItemChanged( QListViewItem *i ) +void EditFunctions::currentItemChanged( TQListViewItem *i ) { functionName->blockSignals( TRUE ); functionName->setText( "" ); @@ -363,9 +363,9 @@ void EditFunctions::currentItemChanged( QListViewItem *i ) functionName->blockSignals( TRUE ); functionName->setText( i->text( 0 ) ); editType->setText( i->text( 1 ) ); - QString specifier = i->text( 2 ); - QString access = i->text( 3 ); - QString type = i->text( 4 ); + TQString specifier = i->text( 2 ); + TQString access = i->text( 3 ); + TQString type = i->text( 4 ); if ( specifier == "pure virtual" ) functionSpecifier->setCurrentItem( 2 ); else if ( specifier == "non virtual" ) @@ -389,7 +389,7 @@ void EditFunctions::currentItemChanged( QListViewItem *i ) boxProperties->setEnabled( TRUE ); } -void EditFunctions::currentTextChanged( const QString &txt ) +void EditFunctions::currentTextChanged( const TQString &txt ) { if ( !functionListView->currentItem() ) return; @@ -407,7 +407,7 @@ void EditFunctions::currentTextChanged( const QString &txt ) } } -void EditFunctions::currentSpecifierChanged( const QString& s ) +void EditFunctions::currentSpecifierChanged( const TQString& s ) { if ( !functionListView->currentItem() ) return; @@ -416,7 +416,7 @@ void EditFunctions::currentSpecifierChanged( const QString& s ) functionListView->currentItem()->setText( 2, s ); } -void EditFunctions::currentAccessChanged( const QString& a ) +void EditFunctions::currentAccessChanged( const TQString& a ) { if ( !functionListView->currentItem() ) return; @@ -425,7 +425,7 @@ void EditFunctions::currentAccessChanged( const QString& a ) } -void EditFunctions::currentReturnTypeChanged( const QString &type ) +void EditFunctions::currentReturnTypeChanged( const TQString &type ) { if ( !functionListView->currentItem() ) return; @@ -433,7 +433,7 @@ void EditFunctions::currentReturnTypeChanged( const QString &type ) functionListView->currentItem()->setText( 1, type ); } -void EditFunctions::currentTypeChanged( const QString &type ) +void EditFunctions::currentTypeChanged( const TQString &type ) { if ( !functionListView->currentItem() ) return; @@ -451,16 +451,16 @@ void EditFunctions::currentTypeChanged( const QString &type ) } } -void EditFunctions::changeItem( QListViewItem *item, Attribute a, const QString &nV ) +void EditFunctions::changeItem( TQListViewItem *item, Attribute a, const TQString &nV ) { int itemId; - QMap::Iterator fit = functionIds.find( item ); + TQMap::Iterator fit = functionIds.find( item ); if ( fit != functionIds.end() ) itemId = *fit; else return; - QValueList::Iterator it = functList.begin(); + TQValueList::Iterator it = functList.begin(); for ( ; it != functList.end(); ++it ) { if ( (*it).id == itemId ) { switch( a ) { @@ -484,9 +484,9 @@ void EditFunctions::changeItem( QListViewItem *item, Attribute a, const QString } } -void EditFunctions::setCurrentFunction( const QString &function ) +void EditFunctions::setCurrentFunction( const TQString &function ) { - QListViewItemIterator it( functionListView ); + TQListViewItemIterator it( functionListView ); while ( it.current() ) { if ( MetaDataBase::normalizeFunction( it.current()->text( 0 ) ) == function ) { functionListView->setCurrentItem( it.current() ); @@ -502,10 +502,10 @@ void EditFunctions::displaySlots( bool justSlots ) { functionIds.clear(); functionListView->clear(); - for ( QValueList::Iterator it = functList.begin(); it != functList.end(); ++it ) { + for ( TQValueList::Iterator it = functList.begin(); it != functList.end(); ++it ) { if ( (*it).type == "function" && justSlots ) continue; - QListViewItem *i = new QListViewItem( functionListView ); + TQListViewItem *i = new TQListViewItem( functionListView ); functionIds.insert( i, (*it).id ); i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) ); i->setText( 0, (*it).newName ); @@ -528,7 +528,7 @@ void EditFunctions::displaySlots( bool justSlots ) functionListView->setSelected( functionListView->firstChild(), TRUE ); } -void EditFunctions::emitItemRenamed( QListViewItem *, int, const QString & text ) +void EditFunctions::emitItemRenamed( TQListViewItem *, int, const TQString & text ) { - emit itemRenamed( text ); // Relay signal ( to QLineEdit ) + emit itemRenamed( text ); // Relay signal ( to TQLineEdit ) } diff --git a/kdevdesigner/designer/editfunctionsimpl.h b/kdevdesigner/designer/editfunctionsimpl.h index f19f9d72..f068c9dc 100644 --- a/kdevdesigner/designer/editfunctionsimpl.h +++ b/kdevdesigner/designer/editfunctionsimpl.h @@ -30,7 +30,7 @@ #include "editfunctions.h" #include "hierarchyview.h" #include "metadatabase.h" -#include +#include class FormWindow; class QListViewItem; @@ -40,55 +40,55 @@ class EditFunctions : public EditFunctionsBase Q_OBJECT public: - EditFunctions( QWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE ); + EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE ); - void setCurrentFunction( const QString &function ); - void functionAdd( const QString &access = QString::null, - const QString &type = QString::null ); + void setCurrentFunction( const TQString &function ); + void functionAdd( const TQString &access = TQString::null, + const TQString &type = TQString::null ); void functionAdd() { functionAdd( "public" ); } signals: - void itemRenamed(const QString &); + void itemRenamed(const TQString &); protected slots: void okClicked(); void functionRemove(); - void currentItemChanged( QListViewItem * ); - void currentTextChanged( const QString &txt ); - void currentSpecifierChanged( const QString &s ); - void currentAccessChanged( const QString &a ); - void currentReturnTypeChanged( const QString &type ); - void currentTypeChanged( const QString &type ); + void currentItemChanged( TQListViewItem * ); + void currentTextChanged( const TQString &txt ); + void currentSpecifierChanged( const TQString &s ); + void currentAccessChanged( const TQString &a ); + void currentReturnTypeChanged( const TQString &type ); + void currentTypeChanged( const TQString &type ); void displaySlots( bool justSlots ); - void emitItemRenamed( QListViewItem *, int, const QString & ); + void emitItemRenamed( TQListViewItem *, int, const TQString & ); private: enum Attribute { Name, Specifier, Access, ReturnType, Type }; struct FunctItem { int id; - QString oldName; - QString newName; - QString oldRetTyp; - QString retTyp; - QString spec; - QString oldSpec; - QString access; - QString oldAccess; - QString type; - QString oldType; + TQString oldName; + TQString newName; + TQString oldRetTyp; + TQString retTyp; + TQString spec; + TQString oldSpec; + TQString access; + TQString oldAccess; + TQString type; + TQString oldType; Q_DUMMY_COMPARISON_OPERATOR( FunctItem ) }; - void changeItem( QListViewItem *item, Attribute a, const QString &nV ); + void changeItem( TQListViewItem *item, Attribute a, const TQString &nV ); FormWindow *formWindow; - QMap functionIds; - QStringList removedFunctions; - QValueList itemList; - QValueList functList; + TQMap functionIds; + TQStringList removedFunctions; + TQValueList itemList; + TQValueList functList; int id; - QString lastType; + TQString lastType; }; #endif diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp index 5a882b37..9f1287e0 100644 --- a/kdevdesigner/designer/filechooser.cpp +++ b/kdevdesigner/designer/filechooser.cpp @@ -25,31 +25,31 @@ **********************************************************************/ #include "filechooser.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -FileChooser::FileChooser( QWidget *parent, const char *name ) - : QWidget( parent, name ), md( File ) +FileChooser::FileChooser( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), md( File ) { - QHBoxLayout *layout = new QHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); layout->setMargin( 0 ); - lineEdit = new QLineEdit( this, "filechooser_lineedit" ); + lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, SIGNAL( textChanged( const QString & ) ), - this, SIGNAL( fileNameChanged( const QString & ) ) ); + connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), + this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); - button = new QPushButton( "...", this, "filechooser_button" ); + button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, SIGNAL( clicked() ), - this, SLOT( chooseFile() ) ); + connect( button, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } @@ -64,21 +64,21 @@ FileChooser::Mode FileChooser::mode() const return md; } -void FileChooser::setFileName( const QString &fn ) +void FileChooser::setFileName( const TQString &fn ) { lineEdit->setText( fn ); } -QString FileChooser::fileName() const +TQString FileChooser::fileName() const { return lineEdit->text(); } void FileChooser::chooseFile() { - QString fn; + TQString fn; if ( mode() == File ) - fn = KFileDialog::getOpenFileName( lineEdit->text(), QString::null, this ); + fn = KFileDialog::getOpenFileName( lineEdit->text(), TQString::null, this ); else fn = KFileDialog::getExistingDirectory( lineEdit->text(),this ); diff --git a/kdevdesigner/designer/filechooser.h b/kdevdesigner/designer/filechooser.h index 6647a1d5..552b645c 100644 --- a/kdevdesigner/designer/filechooser.h +++ b/kdevdesigner/designer/filechooser.h @@ -27,7 +27,7 @@ #ifndef FILECHOOSER_H #define FILECHOOSER_H -#include +#include class QLineEdit; class QPushButton; @@ -38,29 +38,29 @@ class FileChooser : public QWidget Q_ENUMS( Mode ) Q_PROPERTY( Mode mode READ mode WRITE setMode ) - Q_PROPERTY( QString fileName READ fileName WRITE setFileName ) + Q_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: - FileChooser( QWidget *parent = 0, const char *name = 0); + FileChooser( TQWidget *parent = 0, const char *name = 0); enum Mode { File, Directory }; - QString fileName() const; + TQString fileName() const; Mode mode() const; public slots: - void setFileName( const QString &fn ); + void setFileName( const TQString &fn ); void setMode( Mode m ); signals: - void fileNameChanged( const QString & ); + void fileNameChanged( const TQString & ); private slots: void chooseFile(); private: - QLineEdit *lineEdit; - QPushButton *button; + TQLineEdit *lineEdit; + TQPushButton *button; Mode md; }; diff --git a/kdevdesigner/designer/finddialog.ui.h b/kdevdesigner/designer/finddialog.ui.h index c9b4f230..0abde994 100644 --- a/kdevdesigner/designer/finddialog.ui.h +++ b/kdevdesigner/designer/finddialog.ui.h @@ -49,7 +49,7 @@ void FindDialog::doFind() } -void FindDialog::setEditor( EditorInterface * e, QObject * fw ) +void FindDialog::setEditor( EditorInterface * e, TQObject * fw ) { if ( fw != formWindow ) checkBegin->setChecked( TRUE ); diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp index cde7eb8b..e65ed706 100644 --- a/kdevdesigner/designer/formfile.cpp +++ b/kdevdesigner/designer/formfile.cpp @@ -34,22 +34,22 @@ #include "../interfaces/languageinterface.h" #include "resource.h" #include "workspace.h" -#include -#include -#include +#include +#include +#include #include "propertyeditor.h" -#include +#include #include #include "designerappiface.h" -#include +#include #include #include #include "kdevdesigner_part.h" -static QString make_func_pretty( const QString &s ) +static TQString make_func_pretty( const TQString &s ) { - QString res = s; + TQString res = s; if ( res.find( ")" ) - res.find( "(" ) == 1 ) return res; res.replace( "(", "( " ); @@ -64,7 +64,7 @@ static QString make_func_pretty( const QString &s ) return res; } -FormFile::FormFile( const QString &fn, bool temp, Project *p, const char *name ) +FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name ) : filename( fn ), fileNameTemp( temp ), pro( p ), fw( 0 ), ed( 0 ), timeStamp( 0, fn + codeExtension() ), codeEdited( FALSE ), pkg( FALSE ), cm( FALSE ), codeFileStat( None ) @@ -77,7 +77,7 @@ FormFile::FormFile( const QString &fn, bool temp, Project *p, const char *name ) if ( !temp ) checkFileName( FALSE ); - connect(this, SIGNAL(somethingChanged(FormFile* )), this, SLOT(emitNewStatus(FormFile* ))); + connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewStatus(FormFile* ))); } FormFile::~FormFile() @@ -97,7 +97,7 @@ void FormFile::setFormWindow( FormWindow *f ) if ( fw ) fw->setFormFile( this ); parseCode( cod, FALSE ); - QTimer::singleShot( 0, this, SLOT( notifyFormWindowChange() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( notifyFormWindowChange() ) ); } void FormFile::setEditor( SourceEditor *e ) @@ -105,7 +105,7 @@ void FormFile::setEditor( SourceEditor *e ) ed = e; } -void FormFile::setFileName( const QString &fn ) +void FormFile::setFileName( const TQString &fn ) { if ( fn == filename ) return; @@ -123,7 +123,7 @@ void FormFile::setFileName( const QString &fn ) loadCode(); } -void FormFile::setCode( const QString &c ) +void FormFile::setCode( const TQString &c ) { cod = c; } @@ -138,25 +138,25 @@ SourceEditor *FormFile::editor() const return ed; } -QString FormFile::fileName() const +TQString FormFile::fileName() const { return filename; } -QString FormFile::absFileName() const +TQString FormFile::absFileName() const { return pro->makeAbsolute( filename ); } -QString FormFile::codeFile() const +TQString FormFile::codeFile() const { - QString codeExt = codeExtension(); + TQString codeExt = codeExtension(); if ( codeExt.isEmpty() ) return ""; return filename + codeExt; } -QString FormFile::code() +TQString FormFile::code() { return cod; } @@ -176,22 +176,22 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) return FALSE; } - if ( QFile::exists( pro->makeAbsolute( filename ) ) ) { - QString fn( pro->makeAbsolute( filename ) ); + if ( TQFile::exists( pro->makeAbsolute( filename ) ) ) { + TQString fn( pro->makeAbsolute( filename ) ); #if defined(Q_OS_WIN32) fn += ".bak"; #else fn += "~"; #endif - QFile f( pro->makeAbsolute( filename ) ); + TQFile f( pro->makeAbsolute( filename ) ); if ( f.open( IO_ReadOnly ) ) { - QFile f2( fn ); + TQFile f2( fn ); if ( f2.open( IO_WriteOnly | IO_Translate ) ) { - QCString data( f.size() ); + TQCString data( f.size() ); f.readBlock( data.data(), f.size() ); f2.writeBlock( data ); } else { - QMessageBox::warning( MainWindow::self, i18n( "Save" ), + TQMessageBox::warning( MainWindow::self, i18n( "Save" ), i18n( "The file %1 could not be saved" ).arg( codeFile() ) ); } } @@ -199,22 +199,22 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) } if ( isModified( WFormCode ) ) { - if ( QFile::exists( pro->makeAbsolute( codeFile() ) ) ) { - QString fn( pro->makeAbsolute( codeFile() ) ); + if ( TQFile::exists( pro->makeAbsolute( codeFile() ) ) ) { + TQString fn( pro->makeAbsolute( codeFile() ) ); #if defined(Q_OS_WIN32) fn += ".bak"; #else fn += "~"; #endif - QFile f( pro->makeAbsolute( codeFile() ) ); + TQFile f( pro->makeAbsolute( codeFile() ) ); if ( f.open( IO_ReadOnly ) ) { - QFile f2( fn ); + TQFile f2( fn ); if ( f2.open( IO_WriteOnly | IO_Translate) ) { - QCString data( f.size() ); + TQCString data( f.size() ); f.readBlock( data.data(), f.size() ); f2.writeBlock( data ); - } else if ( qApp->type() != QApplication::Tty ) { - QMessageBox::warning( MainWindow::self, i18n( "Save" ), + } else if ( qApp->type() != TQApplication::Tty ) { + TQMessageBox::warning( MainWindow::self, i18n( "Save" ), i18n( "The file %1 could not be saved" ).arg( codeFile() ) ); } } @@ -246,19 +246,19 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) bool FormFile::saveAs( bool ignoreModified ) { - QString f = pro->makeAbsolute( fileName() ); + TQString f = pro->makeAbsolute( fileName() ); if ( fileNameTemp && formWindow() ) { - f = QString( formWindow()->name() ).lower(); + f = TQString( formWindow()->name() ).lower(); f.replace( "::", "_" ); f = pro->makeAbsolute( f + ".ui" ); } bool saved = FALSE; if ( ignoreModified ) { - QString dir = QStringList::split( ':', pro->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first(); - f = QFileInfo( f ).fileName(); + TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first(); + f = TQFileInfo( f ).fileName(); f.prepend( dir + "/" ); } - QString fn; + TQString fn; while ( !saved ) { fn = KFileDialog::getSaveFileName( f, i18n( "*.ui|Qt User-Interface Files" ) + "\n" + @@ -267,17 +267,17 @@ bool FormFile::saveAs( bool ignoreModified ) MainWindow::self ? &MainWindow::self->lastSaveFilter : 0*/ ); if ( fn.isEmpty() ) return FALSE; - QFileInfo fi( fn ); + TQFileInfo fi( fn ); if ( fi.extension() != "ui" ) fn += ".ui"; fileNameTemp = FALSE; filename = pro->makeRelative( fn ); - QFileInfo relfi( filename ); + TQFileInfo relfi( filename ); if ( relfi.exists() ) { - if ( QMessageBox::warning( MainWindow::self, i18n( "File Already Exists" ), + if ( TQMessageBox::warning( MainWindow::self, i18n( "File Already Exists" ), i18n( "The file already exists. Do you wish to overwrite it?" ), - QMessageBox::Yes, - QMessageBox::No ) == QMessageBox::Yes ) { + TQMessageBox::Yes, + TQMessageBox::No ) == TQMessageBox::Yes ) { saved = TRUE; } else { filename = f; @@ -325,7 +325,7 @@ bool FormFile::closeEvent() if ( editor() ) editor()->save(); - switch ( QMessageBox::warning( MainWindow::self, i18n( "Save Form" ), + switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Form" ), i18n( "Save changes to form '%1'?" ).arg( filename ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save @@ -437,7 +437,7 @@ bool FormFile::setupUihFile( bool askForUih ) } if ( codeFileStat != FormFile::Ok && !ed ) { if ( hasFormCode() ) { - int i = QMessageBox::information( MainWindow::self, i18n( "Using ui.h File" ), + int i = TQMessageBox::information( MainWindow::self, i18n( "Using ui.h File" ), i18n( "An \"ui.h\" file for this form already exists.\n" "Do you want to use it or create a new one?" ), i18n( "Use Existing" ), i18n( "Create New" ), @@ -447,9 +447,9 @@ bool FormFile::setupUihFile( bool askForUih ) if ( i == 1 ) createFormCode(); } else { - if ( QMessageBox::Yes != QMessageBox::information( MainWindow::self, i18n( "Creating ui.h file" ), + if ( TQMessageBox::Yes != TQMessageBox::information( MainWindow::self, i18n( "Creating ui.h file" ), i18n( "Do you want to create an new \"ui.h\" file?" ), - QMessageBox::Yes, QMessageBox::No ) ) + TQMessageBox::Yes, TQMessageBox::No ) ) return FALSE; createFormCode(); } @@ -474,12 +474,12 @@ SourceEditor *FormFile::showEditor( bool askForUih ) } static int ui_counter = 0; -QString FormFile::createUnnamedFileName() +TQString FormFile::createUnnamedFileName() { - return QString( "unnamed" ) + QString::number( ++ui_counter ) + QString( ".ui" ); + return TQString( "unnamed" ) + TQString::number( ++ui_counter ) + TQString( ".ui" ); } -QString FormFile::codeExtension() const +TQString FormFile::codeExtension() const { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); if ( iface ) @@ -487,9 +487,9 @@ QString FormFile::codeExtension() const return ""; } -QString FormFile::codeComment() const +TQString FormFile::codeComment() const { - return QString( "/****************************************************************************\n" + return TQString( "/****************************************************************************\n" "** ui.h extension file, included from the uic-generated form implementation.\n" "**\n" "** If you want to add, delete, or rename functions or slots, use\n" @@ -504,7 +504,7 @@ QString FormFile::codeComment() const bool FormFile::hasFormCode() const { - return !cod.isEmpty() && cod != QString( codeComment() ); + return !cod.isEmpty() && cod != TQString( codeComment() ); } int FormFile::codeFileState() const @@ -526,12 +526,12 @@ void FormFile::createFormCode() return; if ( pro->isCpp() ) cod = codeComment(); - QValueList functionList = MetaDataBase::functionList( formWindow() ); - for ( QValueList::Iterator it = functionList.begin(); it != functionList.end(); ++it ) { + TQValueList functionList = MetaDataBase::functionList( formWindow() ); + for ( TQValueList::Iterator it = functionList.begin(); it != functionList.end(); ++it ) { cod += (!cod.isEmpty() ? "\n\n" : "") + iface->createFunctionStart( formWindow()->name(), make_func_pretty((*it).function), (*it).returnType.isEmpty() ? - QString( "void" ) : + TQString( "void" ) : (*it).returnType, (*it).access ) + "\n" + iface->createEmptyFunction(); } @@ -546,13 +546,13 @@ void FormFile::load() bool FormFile::loadCode() { - QFile f( pro->makeAbsolute( codeFile() ) ); + TQFile f( pro->makeAbsolute( codeFile() ) ); if ( !f.open( IO_ReadOnly ) ) { cod = ""; setCodeFileState( FormFile::None ); return FALSE; } - QTextStream ts( &f ); + TQTextStream ts( &f ); cod = ts.read(); parseCode( cod, FALSE ); if ( hasFormCode() && codeFileStat != FormFile::Ok ) @@ -571,24 +571,24 @@ void FormFile::setCodeEdited( bool b ) codeEdited = b; } -void FormFile::parseCode( const QString &txt, bool allowModify ) +void FormFile::parseCode( const TQString &txt, bool allowModify ) { if ( !formWindow() ) return; LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); if ( !iface ) return; - QValueList functions; - QValueList newFunctions, oldFunctions; + TQValueList functions; + TQValueList newFunctions, oldFunctions; oldFunctions = MetaDataBase::functionList( formWindow() ); iface->functions( txt, &functions ); - QMap funcs; - for ( QValueList::Iterator it = functions.begin(); + TQMap funcs; + for ( TQValueList::Iterator it = functions.begin(); it != functions.end(); ++it ) { bool found = FALSE; - for ( QValueList::Iterator fit = oldFunctions.begin(); + for ( TQValueList::Iterator fit = oldFunctions.begin(); fit != oldFunctions.end(); ++fit ) { - QString f( (*fit).function ); + TQString f( (*fit).function ); if ( MetaDataBase::normalizeFunction( f ) == MetaDataBase::normalizeFunction( (*it).name ) ) { found = TRUE; @@ -651,13 +651,13 @@ void FormFile::checkTimeStamp() return; timeStamp.update(); if ( codeEdited ) { - if ( QMessageBox::information( MainWindow::self, i18n( "Qt Designer" ), + if ( TQMessageBox::information( MainWindow::self, i18n( "Qt Designer" ), i18n( "File '%1' has been changed outside Qt Designer.\n" "Do you want to reload it?" ).arg( timeStamp.fileName() ), i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { - QFile f( timeStamp.fileName() ); + TQFile f( timeStamp.fileName() ); if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); + TQTextStream ts( &f ); editor()->editorInterface()->setText( ts.read() ); editor()->save(); if ( MainWindow::self ) @@ -690,10 +690,10 @@ void FormFile::addFunctionCode( MetaDataBase::Function function ) if ( !iface ) return; - QValueList funcs; + TQValueList funcs; iface->functions( cod, &funcs ); bool hasFunc = FALSE; - for ( QValueList::Iterator it = funcs.begin(); + for ( TQValueList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { if ( MetaDataBase::normalizeFunction( (*it).name ) == MetaDataBase::normalizeFunction( function.function ) ) { hasFunc = TRUE; @@ -705,15 +705,15 @@ void FormFile::addFunctionCode( MetaDataBase::Function function ) if ( !codeEdited && !timeStamp.isUpToDate() ) loadCode(); MetaDataBase::MetaInfo mi = MetaDataBase::metaInfo( formWindow() ); - QString cn; + TQString cn; if ( mi.classNameChanged ) cn = mi.className; if ( cn.isEmpty() ) cn = formWindow()->name(); - QString body = "\n\n" + iface->createFunctionStart( cn, + TQString body = "\n\n" + iface->createFunctionStart( cn, make_func_pretty( function.function ), function.returnType.isEmpty() ? - QString( "void" ) : + TQString( "void" ) : function.returnType, function.access ) + "\n" + iface->createEmptyFunction(); cod += body; @@ -734,13 +734,13 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) return; checkTimeStamp(); - QString sourceCode = code(); + TQString sourceCode = code(); if ( sourceCode.isEmpty() ) return; - QValueList functions; + TQValueList functions; iface->functions( sourceCode, &functions ); - QString fu = MetaDataBase::normalizeFunction( function.function ); - for ( QValueList::Iterator fit = functions.begin(); fit != functions.end(); ++fit ) { + TQString fu = MetaDataBase::normalizeFunction( function.function ); + for ( TQValueList::Iterator fit = functions.begin(); fit != functions.end(); ++fit ) { if ( MetaDataBase::normalizeFunction( (*fit).name ) == fu ) { int line = 0; int start = 0; @@ -773,10 +773,10 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) } } -void FormFile::functionNameChanged( const QString &oldName, const QString &newName ) +void FormFile::functionNameChanged( const TQString &oldName, const TQString &newName ) { if ( !cod.isEmpty() ) { - QString funcStart = QString( formWindow()->name() ) + QString( "::" ); + TQString funcStart = TQString( formWindow()->name() ) + TQString( "::" ); int i = cod.find( funcStart + oldName ); if ( i != -1 ) { cod.remove( i + funcStart.length(), oldName.length() ); @@ -785,11 +785,11 @@ void FormFile::functionNameChanged( const QString &oldName, const QString &newNa } } -void FormFile::functionRetTypeChanged( const QString &fuName, const QString &oldType, const QString &newType ) +void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &oldType, const TQString &newType ) { if ( !cod.isEmpty() ) { - QString oldFunct = oldType + " " + QString( formWindow()->name() ) + "::" + fuName; - QString newFunct = newType + " " + QString( formWindow()->name() ) + "::" + fuName; + TQString oldFunct = oldType + " " + TQString( formWindow()->name() ) + "::" + fuName; + TQString newFunct = newType + " " + TQString( formWindow()->name() ) + "::" + fuName; int i = cod.find( oldFunct ); if ( i != -1 ) { @@ -799,7 +799,7 @@ void FormFile::functionRetTypeChanged( const QString &fuName, const QString &old } } -QString FormFile::formName() const +TQString FormFile::formName() const { FormFile* that = (FormFile*) this; if ( formWindow() ) { @@ -808,11 +808,11 @@ QString FormFile::formName() const } if ( !cachedFormName.isNull() ) return cachedFormName; - QFile f( pro->makeAbsolute( filename ) ); + TQFile f( pro->makeAbsolute( filename ) ); if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); - QString line; - QString className; + TQTextStream ts( &f ); + TQString line; + TQString className; while ( !ts.eof() ) { line = ts.readLine(); if ( !className.isEmpty() ) { @@ -852,11 +852,11 @@ bool FormFile::checkFileName( bool allowBreak ) { FormFile *ff = pro->findFormFile( filename, this ); if ( ff ) - QMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), + TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), i18n( "The project already contains a form with a\n" "filename of '%1'. Please choose a new filename." ).arg( filename ) ); while ( ff ) { - QString fn; + TQString fn; while ( fn.isEmpty() ) { fn = KFileDialog::getSaveFileName( pro->makeAbsolute( fileName() ), i18n( "*.ui|Qt User-Interface Files" ) + "\n" + @@ -873,8 +873,8 @@ bool FormFile::checkFileName( bool allowBreak ) return TRUE; } -void FormFile::addConnection( const QString &sender, const QString &signal, - const QString &receiver, const QString &slot ) +void FormFile::addConnection( const TQString &sender, const TQString &signal, + const TQString &receiver, const TQString &slot ) { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); if ( iface ) @@ -883,8 +883,8 @@ void FormFile::addConnection( const QString &sender, const QString &signal, ed->editorInterface()->setText( cod ); } -void FormFile::removeConnection( const QString &sender, const QString &signal, - const QString &receiver, const QString &slot ) +void FormFile::removeConnection( const TQString &sender, const TQString &signal, + const TQString &receiver, const TQString &slot ) { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); if ( iface ) diff --git a/kdevdesigner/designer/formfile.h b/kdevdesigner/designer/formfile.h index 65d0f389..a2767d33 100644 --- a/kdevdesigner/designer/formfile.h +++ b/kdevdesigner/designer/formfile.h @@ -27,7 +27,7 @@ #ifndef FORMFILE_H #define FORMFILE_H -#include +#include #include "timestamp.h" #include "metadatabase.h" @@ -49,25 +49,25 @@ public: enum UihState { None, Ok, Deleted }; - FormFile( const QString &fn, bool temp, Project *p, const char *name = 0 ); + FormFile( const TQString &fn, bool temp, Project *p, const char *name = 0 ); ~FormFile(); void setFormWindow( FormWindow *f ); void setEditor( SourceEditor *e ); - void setFileName( const QString &fn ); - void setCode( const QString &c ); + void setFileName( const TQString &fn ); + void setCode( const TQString &c ); void setModified( bool m, int who = WAnyOrAll ); void setCodeEdited( bool b ); FormWindow *formWindow() const; SourceEditor *editor() const; - QString fileName() const; - QString absFileName() const; + TQString fileName() const; + TQString absFileName() const; bool supportsCodeFile() const { return !codeExtension().isEmpty(); } - QString codeComment() const; - QString codeFile() const; - QString code(); + TQString codeComment() const; + TQString codeFile() const; + TQString code(); bool isCodeEdited() const; bool loadCode(); @@ -84,23 +84,23 @@ public: bool isUihFileUpToDate(); void addFunctionCode( MetaDataBase::Function function ); void removeFunctionCode( MetaDataBase::Function function ); - void functionNameChanged( const QString &oldName, const QString &newName ); - void functionRetTypeChanged( const QString &fuName, const QString &oldType, const QString &newType ); + void functionNameChanged( const TQString &oldName, const TQString &newName ); + void functionRetTypeChanged( const TQString &fuName, const TQString &oldType, const TQString &newType ); void showFormWindow(); SourceEditor *showEditor( bool askForUih = TRUE ); - static QString createUnnamedFileName(); - QString formName() const; + static TQString createUnnamedFileName(); + TQString formName() const; bool isFake() const { return fake; } - void parseCode( const QString &txt, bool allowModify ); + void parseCode( const TQString &txt, bool allowModify ); - void addConnection( const QString &sender, const QString &signal, - const QString &receiver, const QString &slot ); - void removeConnection( const QString &sender, const QString &signal, - const QString &receiver, const QString &slot ); + void addConnection( const TQString &sender, const TQString &signal, + const TQString &receiver, const TQString &slot ); + void removeConnection( const TQString &sender, const TQString &signal, + const TQString &receiver, const TQString &slot ); bool hasTempFileName() const { return fileNameTemp; } void setCodeFileState( UihState ); @@ -122,19 +122,19 @@ private: bool isCodeModified() const; void setFormWindowModified( bool m ); void setCodeModified( bool m ); - QString codeExtension() const; + TQString codeExtension() const; bool checkFileName( bool allowBreak ); private: - QString filename; + TQString filename; bool fileNameTemp; Project *pro; FormWindow *fw; SourceEditor *ed; - QString cod; + TQString cod; TimeStamp timeStamp; bool codeEdited; - QString cachedFormName; + TQString cachedFormName; bool fake; bool pkg; bool cm; diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp index ce76dde7..edbb8134 100644 --- a/kdevdesigner/designer/formsettingsimpl.cpp +++ b/kdevdesigner/designer/formsettingsimpl.cpp @@ -32,18 +32,18 @@ #include "mainwindow.h" #include "project.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include -FormSettings::FormSettings( QWidget *parent, FormWindow *fw ) +FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) : FormSettingsBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw ); if ( info.classNameChanged && !info.className.isEmpty() ) editClassName->setText( info.className ); @@ -52,8 +52,8 @@ FormSettings::FormSettings( QWidget *parent, FormWindow *fw ) editComment->setText( info.comment ); editAuthor->setText( info.author ); - editClassName->setValidator( new AsciiValidator( QString( ":" ), editClassName ) ); - editPixmapFunction->setValidator( new AsciiValidator( QString( ":" ), editPixmapFunction ) ); + editClassName->setValidator( new AsciiValidator( TQString( ":" ), editClassName ) ); + editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), editPixmapFunction ) ); if ( formwindow->savePixmapInline() ) radioPixmapInline->setChecked( TRUE ); @@ -65,8 +65,8 @@ FormSettings::FormSettings( QWidget *parent, FormWindow *fw ) radioProjectImageFile->setEnabled( !fw->project()->isDummy() ); spinSpacing->setValue( formwindow->layoutDefaultSpacing() ); spinMargin->setValue( formwindow->layoutDefaultMargin() ); - editSpacingFunction->setValidator( new AsciiValidator( QString( ":" ), editSpacingFunction ) ); - editMarginFunction->setValidator( new AsciiValidator( QString( ":" ), editMarginFunction ) ); + editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), editSpacingFunction ) ); + editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), editMarginFunction ) ); checkLayoutFunctions->setChecked( formwindow->hasLayoutFunctions() ); editSpacingFunction->setText( formwindow->spacingFunction() ); editMarginFunction->setText( formwindow->marginFunction() ); @@ -76,7 +76,7 @@ void FormSettings::okClicked() { MetaDataBase::MetaInfo info; info.className = editClassName->text(); - info.classNameChanged = info.className != QString( formwindow->name() ); + info.classNameChanged = info.className != TQString( formwindow->name() ); info.comment = editComment->text(); info.author = editAuthor->text(); MetaDataBase::setMetaInfo( formwindow, info ); diff --git a/kdevdesigner/designer/formsettingsimpl.h b/kdevdesigner/designer/formsettingsimpl.h index 08750fbc..d8944ae5 100644 --- a/kdevdesigner/designer/formsettingsimpl.h +++ b/kdevdesigner/designer/formsettingsimpl.h @@ -36,7 +36,7 @@ class FormSettings : public FormSettingsBase Q_OBJECT public: - FormSettings( QWidget *parent, FormWindow *fw ); + FormSettings( TQWidget *parent, FormWindow *fw ); protected slots: void okClicked(); diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index d9de42cc..9c90e383 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -48,30 +48,30 @@ #include #include "kdevdesigner_part.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // FormWindow should be able to work to some limited degree // (existance, loading) without a MainWindow. Functions which require @@ -81,36 +81,36 @@ #define CHECK_MAINWINDOW Q_ASSERT( mainWindow() ); if ( !mainWindow() ) return #define CHECK_MAINWINDOW_VALUE( v ) Q_ASSERT( mainWindow() ); if ( !mainWindow() ) return v -static void setCursorToAll( const QCursor &c, QWidget *start ) +static void setCursorToAll( const TQCursor &c, TQWidget *start ) { start->setCursor( c ); - QObjectList *l = (QObjectList*)start->children(); + TQObjectList *l = (TQObjectList*)start->children(); if ( l ) { - for ( QObject *o = l->first(); o; o = l->next() ) { + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && !::qt_cast(o) ) - setCursorToAll( c, ( (QWidget*)o ) ); + setCursorToAll( c, ( (TQWidget*)o ) ); } } } -static void restoreCursors( QWidget *start, FormWindow *fw ) +static void restoreCursors( TQWidget *start, FormWindow *fw ) { if ( fw->widgets()->find( start ) ) start->setCursor( MetaDataBase::cursor( start ) ); else start->setCursor( Qt::ArrowCursor ); - QObjectList *l = (QObjectList*)start->children(); + TQObjectList *l = (TQObjectList*)start->children(); if ( l ) { - for ( QObject *o = l->first(); o; o = l->next() ) { + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && !::qt_cast(o) ) - restoreCursors( ( (QWidget*)o ), fw ); + restoreCursors( ( (TQWidget*)o ), fw ); } } } #if defined(Q_WS_WIN32) // #### needed for the workaround for repaint problem on windows #include -static void flickerfree_update( QWidget *w ) +static void flickerfree_update( TQWidget *w ) { InvalidateRect( w->winId(), 0, FALSE ); } @@ -134,8 +134,8 @@ static void flickerfree_update( QWidget *w ) event filter which is implemented in MainWindow::eventFilter(). */ -FormWindow::FormWindow( FormFile *f, MainWindow *mw, QWidget *parent, const char *name ) - : QWidget( parent, name, WDestructiveClose ), mainwindow( mw ), +FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WDestructiveClose ), mainwindow( mw ), commands( 100 ), pixInline( TRUE ), pixProject( FALSE ) { ff = f; @@ -143,8 +143,8 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, QWidget *parent, const char initSlots(); } -FormWindow::FormWindow( FormFile *f, QWidget *parent, const char *name ) - : QWidget( parent, name, WDestructiveClose ), mainwindow( 0 ), +FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WDestructiveClose ), mainwindow( 0 ), commands( 100 ), pixInline( TRUE ) { ff = f; @@ -171,34 +171,34 @@ void FormWindow::init() drawRubber = FALSE; setFocusPolicy( ClickFocus ); sizePreviewLabel = 0; - checkSelectionsTimer = new QTimer( this, "checkSelectionsTimer" ); - connect( checkSelectionsTimer, SIGNAL( timeout() ), - this, SLOT( invalidCheckedSelections() ) ); - updatePropertiesTimer = new QTimer( this ); - connect( updatePropertiesTimer, SIGNAL( timeout() ), - this, SLOT( updatePropertiesTimerDone() ) ); - showPropertiesTimer = new QTimer( this ); + checkSelectionsTimer = new TQTimer( this, "checkSelectionsTimer" ); + connect( checkSelectionsTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( invalidCheckedSelections() ) ); + updatePropertiesTimer = new TQTimer( this ); + connect( updatePropertiesTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( updatePropertiesTimerDone() ) ); + showPropertiesTimer = new TQTimer( this ); //!!!! - connect( showPropertiesTimer, SIGNAL( timeout() ), - this, SLOT( showPropertiesTimerDone() ) ); - selectionChangedTimer = new QTimer( this ); - connect( selectionChangedTimer, SIGNAL( timeout() ), - this, SLOT( selectionChangedTimerDone() ) ); - windowsRepaintWorkaroundTimer = new QTimer( this ); - connect( windowsRepaintWorkaroundTimer, SIGNAL( timeout() ), - this, SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); + connect( showPropertiesTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( showPropertiesTimerDone() ) ); + selectionChangedTimer = new TQTimer( this ); + connect( selectionChangedTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( selectionChangedTimerDone() ) ); + windowsRepaintWorkaroundTimer = new TQTimer( this ); + connect( windowsRepaintWorkaroundTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); insertParent = 0; - connect( &commands, SIGNAL( undoRedoChanged( bool, bool, const QString &, const QString & ) ), - this, SIGNAL( undoRedoChanged( bool, bool, const QString &, const QString & ) ) ); + connect( &commands, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); propShowBlocked = FALSE; setIcon( SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); - connect( &commands, SIGNAL( modificationChanged( bool ) ), - this, SLOT( modificationChanged( bool ) ) ); + connect( &commands, TQT_SIGNAL( modificationChanged( bool ) ), + this, TQT_SLOT( modificationChanged( bool ) ) ); buffer = 0; - QWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QFrame" ), this ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this ); setMainContainer( w ); propertyWidget = w; targetContainer = 0; @@ -225,7 +225,7 @@ void FormWindow::initSlots() return; Project *p = project() ? project() : MainWindow::self->currProject(); if ( p && p->isCpp() ) { - QString code = formFile()->code(); + TQString code = formFile()->code(); if ( code.isEmpty() ) formFile()->setCode( formFile()->codeComment() ); } @@ -242,28 +242,28 @@ FormWindow::~FormWindow() delete iface; } -void FormWindow::closeEvent( QCloseEvent *e ) +void FormWindow::closeEvent( TQCloseEvent *e ) { - QGuardedPtr that = this; + TQGuardedPtr that = this; if ( ff->closeEvent() && ( !that || ( mainwindow && mainwindow->unregisterClient( this ) ) ) ) e->accept(); else e->ignore(); } -void FormWindow::paintGrid( QWidget *w, QPaintEvent *e ) +void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) { if ( !mainWindow() || !mainWindow()->showGrid() ) return; - QPixmap grid; - QString grid_name; + TQPixmap grid; + TQString grid_name; grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y()); - if( !QPixmapCache::find( grid_name, grid ) ) { - grid = QPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); - grid.fill( colorGroup().color( QColorGroup::Foreground ) ); - QBitmap mask( grid.width(), grid.height() ); + if( !TQPixmapCache::find( grid_name, grid ) ) { + grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); + grid.fill( colorGroup().color( TQColorGroup::Foreground ) ); + TQBitmap mask( grid.width(), grid.height() ); mask.fill( color0 ); - QPainter p( &mask ); + TQPainter p( &mask ); p.setPen( color1 ); for ( int y = 0; y < grid.width(); y += mainWindow()->grid().y()) { for ( int x = 0; x < grid.height(); x += mainWindow()->grid().x() ) { @@ -271,11 +271,11 @@ void FormWindow::paintGrid( QWidget *w, QPaintEvent *e ) } } grid.setMask( mask ); - QPixmapCache::insert( grid_name, grid ); + TQPixmapCache::insert( grid_name, grid ); } - QPainter p( w ); + TQPainter p( w ); p.setClipRegion( e->rect() ); - p.drawTiledPixmap( QRect( 0, 0, width(), height() ), grid ); + p.drawTiledPixmap( TQRect( 0, 0, width(), height() ), grid ); } /*! For operations like drawing a rubber band or drawing the rect @@ -293,7 +293,7 @@ void FormWindow::beginUnclippedPainter( bool doNot ) if ( !unclipped ) clearWFlags( WPaintUnclipped ); if ( doNot ) { - unclippedPainter->setPen( QPen( color0, 2 ) ); + unclippedPainter->setPen( TQPen( color0, 2 ) ); unclippedPainter->setRasterOp( NotROP ); } } @@ -312,32 +312,32 @@ void FormWindow::endUnclippedPainter() unclippedPainter = 0; } -QPoint FormWindow::gridPoint( const QPoint &p ) +TQPoint FormWindow::gridPoint( const TQPoint &p ) { - return QPoint( ( p.x() / grid().x() ) * grid().x(), + return TQPoint( ( p.x() / grid().x() ) * grid().x(), ( p.y() / grid().y() ) * grid().y() ); } -void FormWindow::drawSizePreview( const QPoint &pos, const QString& text ) +void FormWindow::drawSizePreview( const TQPoint &pos, const TQString& text ) { unclippedPainter->save(); - unclippedPainter->setPen( QPen( colorGroup().foreground(), 1 )); + unclippedPainter->setPen( TQPen( colorGroup().foreground(), 1 )); unclippedPainter->setRasterOp( CopyROP ); if ( !sizePreviewPixmap.isNull() ) unclippedPainter->drawPixmap( sizePreviewPos, sizePreviewPixmap ); if ( text.isNull() ) { - sizePreviewPixmap = QPixmap(); // set null again + sizePreviewPixmap = TQPixmap(); // set null again unclippedPainter->restore(); return; } - QRect r = fontMetrics().boundingRect( 0, 0, 0, 0, AlignCenter, text ); - r = QRect( pos + QPoint( 10, 10 ), r.size() + QSize( 5, 5 ) ); + TQRect r = fontMetrics().boundingRect( 0, 0, 0, 0, AlignCenter, text ); + r = TQRect( pos + TQPoint( 10, 10 ), r.size() + TQSize( 5, 5 ) ); checkPreviewGeometry( r ); sizePreviewPos = r.topLeft(); - sizePreviewPixmap = QPixmap::grabWindow( winId(), r.x(), r.y(), r.width(), r.height() ); - unclippedPainter->setBrush( QColor( 255, 255, 128 ) ); + sizePreviewPixmap = TQPixmap::grabWindow( winId(), r.x(), r.y(), r.width(), r.height() ); + unclippedPainter->setBrush( TQColor( 255, 255, 128 ) ); unclippedPainter->drawRect( r ); unclippedPainter->drawText( r, AlignCenter, text ); unclippedPainter->restore(); @@ -354,57 +354,57 @@ void FormWindow::insertWidget() bool useSizeHint = !oldRectValid || ( currRect.width() < 2 && currRect.height() < 2 ); Orientation orient = Horizontal; - QString n = WidgetDatabase::className( currTool ); - if ( useSizeHint && ( n == "Spacer" || n == "QSlider" || n == "Line" || n == "QScrollBar" ) ) { - QPopupMenu m( mainWindow() ); + TQString n = WidgetDatabase::className( currTool ); + if ( useSizeHint && ( n == "Spacer" || n == "TQSlider" || n == "Line" || n == "TQScrollBar" ) ) { + TQPopupMenu m( mainWindow() ); m.insertItem( i18n( "&Horizontal" ) ); int ver = m.insertItem( i18n( "&Vertical" ) ); - int r = m.exec( QCursor::pos() ); + int r = m.exec( TQCursor::pos() ); if ( r == ver ) orient = Vertical; } - QWidget *w = WidgetFactory::create( currTool, insertParent, 0, TRUE, &currRect, orient ); + TQWidget *w = WidgetFactory::create( currTool, insertParent, 0, TRUE, &currRect, orient ); if ( !w ) return; if ( !savePixmapInline() && currTool == WidgetDatabase::idFromClassName( "PixmapLabel" ) ) { // ### what to do for pixmaps in project - QPixmap pix; + TQPixmap pix; // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that pix.convertFromImage( SmallIcon( "designer_image.png" , KDevDesignerPartFactory::instance()).convertToImage() ); - ( (QLabel*)w )->setPixmap( pix ); + ( (TQLabel*)w )->setPixmap( pix ); } int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ); if ( WidgetDatabase::isCustomWidget( id ) ) { - QWhatsThis::add( w, i18n("A %1 (custom widget) " + TQWhatsThis::add( w, i18n("A %1 (custom widget) " "

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

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

%2

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

%2

").arg( tt ).arg( wt ) ); } - QString s = w->name(); + TQString s = w->name(); unify( w, s, TRUE ); w->setName( s ); insertWidget( w ); - QRect r( currRect ); + TQRect r( currRect ); if ( !oldRectValid || ( currRect.width() < 2 && currRect.height() < 2 ) ) - r = QRect( rectAnchor, QSize( 0, 0 ) ); + r = TQRect( rectAnchor, TQSize( 0, 0 ) ); - QPoint p = r.topLeft(); + TQPoint p = r.topLeft(); p = mapToGlobal( p ); p = insertParent->mapFromGlobal( p ); - r = QRect( p, r.size() ); + r = TQRect( p, r.size() ); if ( useSizeHint ) { if ( n == "Spacer" ) { @@ -426,31 +426,31 @@ void FormWindow::insertWidget() if ( r.height() < 2 * grid().y() ) r.setHeight( 2 * grid().y() ); - const QObjectList *l = insertParent->children(); - QObjectListIt it( *l ); - QWidgetList lst; + const TQObjectList *l = insertParent->children(); + TQObjectListIt it( *l ); + TQWidgetList lst; if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) { for ( ; it.current(); ) { - QObject *o = it.current(); + TQObject *o = it.current(); ++it; if ( o->isWidgetType() && - ( (QWidget*)o )->isVisibleTo( this ) && - insertedWidgets.find( (QWidget*)o ) && o != w ) { - QRect r2( ( (QWidget*)o )->pos(), - ( (QWidget*)o )->size() ); + ( (TQWidget*)o )->isVisibleTo( this ) && + insertedWidgets.find( (TQWidget*)o ) && o != w ) { + TQRect r2( ( (TQWidget*)o )->pos(), + ( (TQWidget*)o )->size() ); if ( r.contains( r2 ) ) - lst.append( (QWidget*)o ); + lst.append( (TQWidget*)o ); } } } if ( !lst.isEmpty() ) { - QWidget *pw = WidgetFactory::containerOfWidget( w ); + TQWidget *pw = WidgetFactory::containerOfWidget( w ); if (pw) { - QValueList op, np; - for ( QWidget *i = lst.first(); i; i = lst.next() ) { + TQValueList op, np; + for ( TQWidget *i = lst.first(); i; i = lst.next() ) { op.append( i->pos() ); - QPoint pos = pw->mapFromGlobal( i->mapToGlobal( QPoint( 0, 0 ) ) ); + TQPoint pos = pw->mapFromGlobal( i->mapToGlobal( TQPoint( 0, 0 ) ) ); pos -= r.topLeft(); np.append( pos ); } @@ -465,7 +465,7 @@ void FormWindow::insertWidget() InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r ); - QPtrList commands; + TQPtrList commands; commands.append( mv ); commands.append( cmd ); @@ -491,12 +491,12 @@ void FormWindow::insertWidget() } } -void FormWindow::insertWidget( QWidget *w, bool checkName ) +void FormWindow::insertWidget( TQWidget *w, bool checkName ) { if ( !w ) return; if ( checkName ) { - QString s = w->name(); + TQString s = w->name(); unify( w, s, TRUE ); w->setName( s ); } @@ -504,19 +504,19 @@ void FormWindow::insertWidget( QWidget *w, bool checkName ) MetaDataBase::addEntry( w ); int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ); if ( WidgetDatabase::isCustomWidget( id ) ) { - QWhatsThis::add( w, i18n("A %1 (custom widget) " + TQWhatsThis::add( w, i18n("A %1 (custom widget) " "

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

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

%2

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

%2

").arg( tt ).arg( wt ) ); } restoreCursors( w, this ); @@ -524,13 +524,13 @@ void FormWindow::insertWidget( QWidget *w, bool checkName ) w->show(); } -void FormWindow::removeWidget( QWidget *w ) +void FormWindow::removeWidget( TQWidget *w ) { MetaDataBase::removeEntry( w ); widgets()->take( w ); } -void FormWindow::handleContextMenu( QContextMenuEvent *e, QWidget *w ) +void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; switch ( currTool ) { @@ -539,12 +539,12 @@ void FormWindow::handleContextMenu( QContextMenuEvent *e, QWidget *w ) raiseChildSelections( w ); // raise selections and select widget selectWidget( w ); // if widget is laid out, find the first non-laid out super-widget - QWidget *realWidget = w; // but store the original one + TQWidget *realWidget = w; // but store the original one while ( w->parentWidget() && ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); - if ( ::qt_cast(mainContainer()) && ((QMainWindow*)mainContainer())->centralWidget() == realWidget ) { + if ( ::qt_cast(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) { e->accept(); mainwindow->popupFormWindowMenu( e->globalPos(), this ); } else { @@ -562,16 +562,16 @@ void FormWindow::handleContextMenu( QContextMenuEvent *e, QWidget *w ) } } -void FormWindow::handleMousePress( QMouseEvent *e, QWidget *w ) +void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; checkedSelectionsForMove = FALSE; checkSelectionsTimer->stop(); if ( !sizePreviewLabel ) { - sizePreviewLabel = new QLabel( this ); + sizePreviewLabel = new TQLabel( this ); sizePreviewLabel->hide(); - sizePreviewLabel->setBackgroundColor( QColor( 255, 255, 128 ) ); - sizePreviewLabel->setFrameStyle( QFrame::Plain | QFrame::Box ); + sizePreviewLabel->setBackgroundColor( TQColor( 255, 255, 128 ) ); + sizePreviewLabel->setFrameStyle( TQFrame::Plain | TQFrame::Box ); } switch ( currTool ) { @@ -582,7 +582,7 @@ void FormWindow::handleMousePress( QMouseEvent *e, QWidget *w ) w->raise(); if ( ( e->state() & ControlButton ) ) { // with control pressed, always start rubber band selection drawRubber = TRUE; - currRect = QRect( 0, 0, -1, -1 ); + currRect = TQRect( 0, 0, -1, -1 ); startRectDraw( mapFromGlobal( e->globalPos() ), e->globalPos(), this, Rubber ); break; } @@ -594,13 +594,13 @@ void FormWindow::handleMousePress( QMouseEvent *e, QWidget *w ) } else { // ...widget selected // only if widget has a layout (it is a layout meta widget or a laid out container!), unselect its childs if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) { - QObjectList *l = w->queryList( "QWidget" ); + TQObjectList *l = w->queryList( "TQWidget" ); setPropertyShowingBlocked( TRUE ); - for ( QObject *o = l->first(); o; o = l->next() ) { + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( !o->isWidgetType() ) continue; - if ( insertedWidgets.find( (QWidget*)o ) ) - selectWidget( (QWidget*)o, FALSE ); + if ( insertedWidgets.find( (TQWidget*)o ) ) + selectWidget( (TQWidget*)o, FALSE ); } setPropertyShowingBlocked( FALSE ); delete l; @@ -624,7 +624,7 @@ void FormWindow::handleMousePress( QMouseEvent *e, QWidget *w ) if ( e->button() == LeftButton ) { // left button: store original geometry and more as the widget might start moving widgetPressed = TRUE; - widgetGeom = QRect( w->pos(), w->size() ); + widgetGeom = TQRect( w->pos(), w->size() ); oldPressPos = w->mapFromGlobal( e->globalPos() ); origPressPos = oldPressPos; checkedSelectionsForMove = FALSE; @@ -640,12 +640,12 @@ void FormWindow::handleMousePress( QMouseEvent *e, QWidget *w ) drawRubber = TRUE; if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) { clearSelection( FALSE ); - QObject *opw = propertyWidget; + TQObject *opw = propertyWidget; propertyWidget = mainContainer(); if ( opw->isWidgetType() ) - repaintSelection( (QWidget*)opw ); + repaintSelection( (TQWidget*)opw ); } - currRect = QRect( 0, 0, -1, -1 ); + currRect = TQRect( 0, 0, -1, -1 ); startRectDraw( mapFromGlobal( e->globalPos() ), e->globalPos(), this, Rubber ); } } @@ -656,7 +656,7 @@ void FormWindow::handleMousePress( QMouseEvent *e, QWidget *w ) break; validForBuddy = FALSE; if ( currTool == BUDDY_TOOL ) { - if ( !::qt_cast(w) ) + if ( !::qt_cast(w) ) break; clearSelection( FALSE ); validForBuddy = TRUE; @@ -676,14 +676,14 @@ void FormWindow::handleMousePress( QMouseEvent *e, QWidget *w ) if ( !isMainContainer( w ) ) { // press on a child widget orderedWidgets.removeRef( w ); orderedWidgets.append( w ); - for ( QWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { + for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); } } - QWidgetList oldl = MetaDataBase::tabOrder( this ); + TQWidgetList oldl = MetaDataBase::tabOrder( this ); TabOrderCommand *cmd = new TabOrderCommand( i18n( "Change Tab Order" ), this, oldl, stackedWidgets ); cmd->execute(); commandHistory()->addCommand( cmd, TRUE ); @@ -694,11 +694,11 @@ void FormWindow::handleMousePress( QMouseEvent *e, QWidget *w ) if ( e->button() == LeftButton ) { insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another parent - QWidget *wid = w; + TQWidget *wid = w; for (;;) { int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) ); if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) && - !::qt_cast(wid) && !::qt_cast(wid) ) { + !::qt_cast(wid) && !::qt_cast(wid) ) { insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it break; } else { @@ -714,7 +714,7 @@ void FormWindow::handleMousePress( QMouseEvent *e, QWidget *w ) } } -void FormWindow::handleMouseDblClick( QMouseEvent *, QWidget *w ) +void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) { CHECK_MAINWINDOW; switch ( currTool ) { @@ -722,14 +722,14 @@ void FormWindow::handleMouseDblClick( QMouseEvent *, QWidget *w ) if ( !isMainContainer( w ) ) { // press on a child widget orderedWidgets.clear(); orderedWidgets.append( w ); - for ( QWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { + for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); } } - QWidgetList oldl = MetaDataBase::tabOrder( this ); + TQWidgetList oldl = MetaDataBase::tabOrder( this ); TabOrderCommand *cmd = new TabOrderCommand( i18n( "Change Tab Order" ), this, oldl, stackedWidgets ); cmd->execute(); commandHistory()->addCommand( cmd, TRUE ); @@ -743,13 +743,13 @@ void FormWindow::handleMouseDblClick( QMouseEvent *, QWidget *w ) } } -void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) +void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; if ( ( e->state() & LeftButton ) != LeftButton ) return; - QWidget *newendWidget = endWidget, *oldendWidget = endWidget, *wid; + TQWidget *newendWidget = endWidget, *oldendWidget = endWidget, *wid; bool drawRecRect; switch ( currTool ) { case POINTER_TOOL: @@ -761,23 +761,23 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) w = w->parentWidget(); // calc correct position - QPoint pos = w->mapFromGlobal( e->globalPos() ); + TQPoint pos = w->mapFromGlobal( e->globalPos() ); #if 0 - QPoint mpos = w->mapToParent( pos ); + TQPoint mpos = w->mapToParent( pos ); // check if we are not outside the visible area, else correct coords if ( mpos.x() < 0 ) - pos.setX( w->mapFromParent( QPoint( 0, mpos.y() ) ).x() ); + pos.setX( w->mapFromParent( TQPoint( 0, mpos.y() ) ).x() ); if ( mpos.y() < 0 ) - pos.setY( w->mapFromParent( QPoint( mpos.x(), 0 ) ).y() ); + pos.setY( w->mapFromParent( TQPoint( mpos.x(), 0 ) ).y() ); if ( mpos.x() > w->parentWidget()->width() ) - pos.setX( w->mapFromParent( QPoint( w->parentWidget()->width(), mpos.y() ) ).x() ); + pos.setX( w->mapFromParent( TQPoint( w->parentWidget()->width(), mpos.y() ) ).x() ); if ( mpos.y() > w->parentWidget()->height() ) - pos.setY( w->mapFromParent( QPoint( mpos.x(), w->parentWidget()->height() ) ).y() ); + pos.setY( w->mapFromParent( TQPoint( mpos.x(), w->parentWidget()->height() ) ).y() ); #endif // calc move distance and store it - QPoint d = oldPressPos - pos; + TQPoint d = oldPressPos - pos; if ( QABS( d.x() ) < grid().x() ) d.setX( 0 ); if ( QABS( d.y() ) < grid().y() ) @@ -795,7 +795,7 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) int y = widgetGeom.y() - d.y(); widgetGeom.setY( y ); y = ( y / grid().y() ) * grid().y(); - QPoint p = w->pos(); + TQPoint p = w->pos(); if ( x - p.x() != 0 || y - p.y() != 0 ) { // if we actually have to move if ( !checkedSelectionsForMove ) { // if not checked yet, check if the correct widget are selected... @@ -808,8 +808,8 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) } // check whether we would have to reparent the selection and highlight the possible new parent container - QMapConstIterator it = moving.begin(); - QWidget* wa = containerAt( e->globalPos(), it.key() ); + TQMapConstIterator it = moving.begin(); + TQWidget* wa = containerAt( e->globalPos(), it.key() ); if ( wa && !isMainContainer( wa ) && !isCentralWidget( wa ) ) { wa = WidgetFactory::containerOfWidget( wa ); // ok, looks like we moved onto a container @@ -839,7 +839,7 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) moveSelectedWidgets( x - p.x(), y - p.y() ); sizePreviewLabel->setText( i18n( "%1/%2" ).arg( w->pos().x() ).arg( w->pos().y() ) ); sizePreviewLabel->adjustSize(); - QRect lg( mapFromGlobal( e->globalPos() ) + QPoint( 16, 16 ), sizePreviewLabel->size() ); + TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() ); checkPreviewGeometry( lg ); sizePreviewLabel->setGeometry( lg ); sizePreviewLabel->raise(); @@ -848,7 +848,7 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) windowsRepaintWorkaroundTimer->start( 100, TRUE ); #endif } else { // if we don't need to move, do some indication - QRect lg( mapFromGlobal( e->globalPos() ) + QPoint( 16, 16 ), sizePreviewLabel->size() ); + TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() ); checkPreviewGeometry( lg ); sizePreviewLabel->move( lg.x(), lg.y() ); } @@ -866,7 +866,7 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) if ( wid && ( isMainContainer( wid ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) newendWidget = wid; if ( ::qt_cast(newendWidget) || ::qt_cast(newendWidget) ) - newendWidget = (QWidget*)endWidget; + newendWidget = (TQWidget*)endWidget; drawRecRect = newendWidget != endWidget; if ( newendWidget && ( isMainContainer( newendWidget ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( newendWidget ) ) @@ -876,8 +876,8 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) currentPos = mapFromGlobal( e->globalPos() ); qApp->processEvents(); if ( drawRecRect ) - restoreRect( QRect( mapToForm( ( (QWidget*)oldendWidget )->parentWidget(), ( (QWidget*)oldendWidget )->pos() ), - ( (QWidget*)oldendWidget )->size() ) ); + restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ), + ( (TQWidget*)oldendWidget )->size() ) ); drawConnectionLine(); break; case BUDDY_TOOL: @@ -892,7 +892,7 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) else newendWidget = 0; if ( ::qt_cast(newendWidget) || ::qt_cast(newendWidget) ) - newendWidget = (QWidget*)endWidget; + newendWidget = (TQWidget*)endWidget; drawRecRect = newendWidget != endWidget; if ( !newendWidget ) endWidget = newendWidget; @@ -906,8 +906,8 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) currentPos = mapFromGlobal( e->globalPos() ); qApp->processEvents(); if ( drawRecRect && oldendWidget ) - restoreRect( QRect( mapToForm( ( (QWidget*)oldendWidget )->parentWidget(), ( (QWidget*)oldendWidget )->pos() ), - ( (QWidget*)oldendWidget )->size() ) ); + restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ), + ( (TQWidget*)oldendWidget )->size() ) ); drawConnectionLine(); break; case ORDER_TOOL: @@ -919,7 +919,7 @@ void FormWindow::handleMouseMove( QMouseEvent *e, QWidget *w ) } } -void FormWindow::handleMouseRelease( QMouseEvent *e, QWidget *w ) +void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; if ( e->button() != LeftButton ) @@ -945,11 +945,11 @@ void FormWindow::handleMouseRelease( QMouseEvent *e, QWidget *w ) if ( propertyWidget && propertyWidget->isWidgetType() && !isMainContainer( propertyWidget ) ) emitUpdateProperties( propertyWidget ); - QMapConstIterator it = moving.begin(); - QWidget *oldParent = it.key()->parentWidget(); - QWidget *newParent = oldParent; + TQMapConstIterator it = moving.begin(); + TQWidget *oldParent = it.key()->parentWidget(); + TQWidget *newParent = oldParent; // check whether we have to reparent the selection - QWidget* wa = containerAt( e->globalPos(), it.key() ); + TQWidget* wa = containerAt( e->globalPos(), it.key() ); if ( wa ) { wa = WidgetFactory::containerOfWidget( wa ); // ok, looks like we moved onto a container @@ -960,7 +960,7 @@ void FormWindow::handleMouseRelease( QMouseEvent *e, QWidget *w ) // break layout if necessary if ( WidgetFactory::layoutType( wa ) != WidgetFactory::NoLayout ) { - if ( QMessageBox::information( mainWindow(), i18n( "Inserting Widget" ), + if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ), i18n( "You tried to insert a widget into the " "layout Container Widget '%1'.\n" "This is not possible. " @@ -975,18 +975,18 @@ void FormWindow::handleMouseRelease( QMouseEvent *e, QWidget *w ) // doesn't need to be a command, the MoveCommand does reparenting too bool emitSelChanged = FALSE; - for ( QMap::Iterator it = moving.begin(); it != moving.end(); ++it ) { - QWidget *i = it.key(); - if ( !emitSelChanged && ::qt_cast(i) ) { - if ( ::qt_cast(i->parentWidget()) || ::qt_cast(wa) ) + for ( TQMap::Iterator it = moving.begin(); it != moving.end(); ++it ) { + TQWidget *i = it.key(); + if ( !emitSelChanged && ::qt_cast(i) ) { + if ( ::qt_cast(i->parentWidget()) || ::qt_cast(wa) ) emitSelChanged = TRUE; - if ( !::qt_cast(wa) ) { + if ( !::qt_cast(wa) ) { MetaDataBase::setPropertyChanged( i, "buttonGroupId", FALSE ); - if ( ::qt_cast(i->parentWidget()) ) - ( (QButtonGroup*)i->parentWidget() )->remove( (QButton*)i ); + if ( ::qt_cast(i->parentWidget()) ) + ( (TQButtonGroup*)i->parentWidget() )->remove( (TQButton*)i ); } } - QPoint pos = wa->mapFromGlobal( i->mapToGlobal( QPoint(0,0) ) ); + TQPoint pos = wa->mapFromGlobal( i->mapToGlobal( TQPoint(0,0) ) ); i->reparent( wa, pos, TRUE ); raiseSelection( i ); raiseChildSelections( i ); @@ -1002,8 +1002,8 @@ void FormWindow::handleMouseRelease( QMouseEvent *e, QWidget *w ) } make_move_command: - QWidgetList widgets; // collect the widgets and its old and new positions which have been moved - QValueList oldPos, newPos; + TQWidgetList widgets; // collect the widgets and its old and new positions which have been moved + TQValueList oldPos, newPos; for ( it = moving.begin(); it != moving.end(); ++it ) { widgets.append( it.key() ); oldPos.append( *it ); @@ -1027,13 +1027,13 @@ void FormWindow::handleMouseRelease( QMouseEvent *e, QWidget *w ) case BUDDY_TOOL: restoreConnectionLine(); if ( startWidget ) - restoreRect( QRect( mapToForm( ( (QWidget*)startWidget )->parentWidget(), - ( (QWidget*)startWidget )->pos() ), - ((QWidget*)startWidget )->size() ) ); + restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->parentWidget(), + ( (TQWidget*)startWidget )->pos() ), + ((TQWidget*)startWidget )->size() ) ); if ( endWidget ) - restoreRect( QRect( mapToForm( ( (QWidget*)endWidget )->parentWidget(), - ( (QWidget*)endWidget )->pos() ), - ( (QWidget*)endWidget )->size() ) ); + restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->parentWidget(), + ( (TQWidget*)endWidget )->pos() ), + ( (TQWidget*)endWidget )->size() ) ); endUnclippedPainter(); qApp->processEvents(); @@ -1041,7 +1041,7 @@ void FormWindow::handleMouseRelease( QMouseEvent *e, QWidget *w ) if ( currTool == CONNECT_TOOL ) editConnections(); else if ( currTool == BUDDY_TOOL && validForBuddy && startWidget != endWidget ) { - QString oldBuddy = startWidget->property( "buddy" ).toString(); + TQString oldBuddy = startWidget->property( "buddy" ).toString(); if ( oldBuddy.isNull() ) oldBuddy = ""; SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).arg( startWidget->name() ), @@ -1065,7 +1065,7 @@ void FormWindow::handleMouseRelease( QMouseEvent *e, QWidget *w ) if ( insertParent ) { // we should insert the new widget now endRectDraw(); if ( WidgetFactory::layoutType( insertParent ) != WidgetFactory::NoLayout ) { - if ( QMessageBox::information( mainWindow(), i18n( "Inserting Widget" ), + if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ), i18n( "You tried to insert a widget into the " "layout Container Widget '%1'.\n" "This is not possible. " @@ -1092,7 +1092,7 @@ void FormWindow::handleMouseRelease( QMouseEvent *e, QWidget *w ) buffer = 0; } -void FormWindow::handleKeyPress( QKeyEvent *e, QWidget *w ) +void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; e->ignore(); @@ -1103,12 +1103,12 @@ void FormWindow::handleKeyPress( QKeyEvent *e, QWidget *w ) e->key() == Key_Up || e->key() == Key_Down ) && propertyWidget->isWidgetType() ) - checkSelectionsForMove( (QWidget*)propertyWidget ); + checkSelectionsForMove( (TQWidget*)propertyWidget ); checkSelectionsTimer->start( 1000, TRUE ); if ( e->key() == Key_Left || e->key() == Key_Right || e->key() == Key_Up || e->key() == Key_Down ) { - QWidgetList widgets; - QValueList oldPos, newPos; + TQWidgetList widgets; + TQValueList oldPos, newPos; for ( WidgetSelection *s = selections.first(); s; s = selections.next() ) { if ( s->isUsed() ) { int dx = 0, dy = 0; @@ -1149,7 +1149,7 @@ void FormWindow::handleKeyPress( QKeyEvent *e, QWidget *w ) widgets.append( s->widget() ); oldPos.append( s->widget()->pos() ); - newPos.append( s->widget()->pos() + QPoint( dx, dy ) ); + newPos.append( s->widget()->pos() + TQPoint( dx, dy ) ); } } if ( !widgets.isEmpty() ) { @@ -1160,7 +1160,7 @@ void FormWindow::handleKeyPress( QKeyEvent *e, QWidget *w ) } } if ( !e->isAccepted() ) { - QObjectList *l = queryList( "QWidget" ); + TQObjectList *l = queryList( "TQWidget" ); if ( !l ) return; if ( l->find( w ) != -1 ) @@ -1170,35 +1170,35 @@ void FormWindow::handleKeyPress( QKeyEvent *e, QWidget *w ) } -void FormWindow::handleKeyRelease( QKeyEvent *e, QWidget * ) +void FormWindow::handleKeyRelease( TQKeyEvent *e, TQWidget * ) { e->ignore(); } -void FormWindow::selectWidget( QObject *o, bool select ) +void FormWindow::selectWidget( TQObject *o, bool select ) { CHECK_MAINWINDOW; if ( !o->isWidgetType() ) { - // ########### do QObject stuff + // ########### do TQObject stuff return; } - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; if ( isMainContainer( w ) ) { - QObject *opw = propertyWidget; + TQObject *opw = propertyWidget; propertyWidget = mainContainer(); if ( opw->isWidgetType() ) - repaintSelection( (QWidget*)opw ); + repaintSelection( (TQWidget*)opw ); emitShowProperties( propertyWidget ); return; } - if ( ::qt_cast(mainContainer()) && w == ( (QMainWindow*)mainContainer() )->centralWidget() ) { - QObject *opw = propertyWidget; + if ( ::qt_cast(mainContainer()) && w == ( (TQMainWindow*)mainContainer() )->centralWidget() ) { + TQObject *opw = propertyWidget; propertyWidget = mainContainer(); if ( opw->isWidgetType() ) - repaintSelection( (QWidget*)opw ); + repaintSelection( (TQWidget*)opw ); emitShowProperties( propertyWidget ); return; } @@ -1207,10 +1207,10 @@ void FormWindow::selectWidget( QObject *o, bool select ) return; if ( select ) { - QObject *opw = propertyWidget; + TQObject *opw = propertyWidget; propertyWidget = w; if ( opw->isWidgetType() ) - repaintSelection( (QWidget*)opw ); + repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) emitShowProperties( propertyWidget ); WidgetSelection *s = usedSelections.find( w ); @@ -1236,27 +1236,27 @@ void FormWindow::selectWidget( QObject *o, bool select ) WidgetSelection *s = usedSelections.find( w ); if ( s ) s->setWidget( 0 ); - QObject *opw = propertyWidget; + TQObject *opw = propertyWidget; if ( !usedSelections.isEmpty() ) - propertyWidget = QPtrDictIterator( usedSelections ).current()->widget(); + propertyWidget = TQPtrDictIterator( usedSelections ).current()->widget(); else propertyWidget = mainContainer(); if ( opw->isWidgetType() ) - repaintSelection( (QWidget*)opw ); + repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) emitShowProperties( propertyWidget ); emitSelectionChanged(); } } -QPoint FormWindow::grid() const +TQPoint FormWindow::grid() const { if ( !mainWindow() || !mainWindow()->snapGrid() ) - return QPoint( 1, 1 ); + return TQPoint( 1, 1 ); return mainWindow()->grid(); } -void FormWindow::updateSelection( QWidget *w ) +void FormWindow::updateSelection( TQWidget *w ) { WidgetSelection *s = usedSelections.find( w ); if ( !w->isVisibleTo( this ) ) @@ -1265,14 +1265,14 @@ void FormWindow::updateSelection( QWidget *w ) s->updateGeometry(); } -void FormWindow::raiseSelection( QWidget *w ) +void FormWindow::raiseSelection( TQWidget *w ) { WidgetSelection *s = usedSelections.find( w ); if ( s ) s->show(); } -void FormWindow::repaintSelection( QWidget *w ) +void FormWindow::repaintSelection( TQWidget *w ) { WidgetSelection *s = usedSelections.find( w ); if ( s ) @@ -1281,52 +1281,52 @@ void FormWindow::repaintSelection( QWidget *w ) void FormWindow::clearSelection( bool changePropertyDisplay ) { - QPtrDictIterator it( usedSelections ); + TQPtrDictIterator it( usedSelections ); for ( ; it.current(); ++it ) it.current()->setWidget( 0, FALSE ); usedSelections.clear(); if ( changePropertyDisplay ) { - QObject *opw = propertyWidget; + TQObject *opw = propertyWidget; propertyWidget = mainContainer(); if ( opw->isWidgetType() ) - repaintSelection( (QWidget*)opw ); + repaintSelection( (TQWidget*)opw ); emitShowProperties( propertyWidget ); } emitSelectionChanged(); } -void FormWindow::startRectDraw( const QPoint &p, const QPoint &global, QWidget *, RectType t ) +void FormWindow::startRectDraw( const TQPoint &p, const TQPoint &global, TQWidget *, RectType t ) { - QPoint pos( p ); + TQPoint pos( p ); pos = mapFromGlobal( global ); oldRectValid = FALSE; beginUnclippedPainter( TRUE ); if ( t == Rubber ) - unclippedPainter->setPen( QPen( color0, 1 ) ); + unclippedPainter->setPen( TQPen( color0, 1 ) ); if ( t == Insert ) rectAnchor = gridPoint( pos ); else if ( t == Rubber ) rectAnchor = pos; - currRect = QRect( rectAnchor, QPoint( 0, 0 ) ); + currRect = TQRect( rectAnchor, TQPoint( 0, 0 ) ); if ( t == Insert ) drawSizePreview( pos, i18n("Use Size Hint") ); } -void FormWindow::continueRectDraw( const QPoint &p, const QPoint &global, QWidget *, RectType t ) +void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWidget *, RectType t ) { - QPoint pos =p; + TQPoint pos =p; pos = mapFromGlobal( global ); - QPoint p2; + TQPoint p2; if ( t == Insert ) p2 = gridPoint( pos ); else if ( t == Rubber ) p2 = pos; - QRect r( rectAnchor, p2 ); + TQRect r( rectAnchor, p2 ); r = r.normalize(); if ( currRect == r ) { - QString t = i18n( "%1/%2" ); + TQString t = i18n( "%1/%2" ); t = t.arg( r.width() - 1 ).arg( r.height() - 1 ); drawSizePreview( pos, t ); return; @@ -1338,11 +1338,11 @@ void FormWindow::continueRectDraw( const QPoint &p, const QPoint &global, QWidge oldRectValid = TRUE; currRect = r; if ( t == Insert ) { - QString t = i18n( "%1/%2" ); + TQString t = i18n( "%1/%2" ); t = t.arg( r.width() - 1 ).arg( r.height() - 1 ); drawSizePreview( pos, t ); } - unclippedPainter->setClipRegion( QRegion( rect() ).subtract( QRect( sizePreviewPos, sizePreviewPixmap.size() ) ) ); + unclippedPainter->setClipRegion( TQRegion( rect() ).subtract( TQRect( sizePreviewPos, sizePreviewPixmap.size() ) ) ); unclippedPainter->drawRect( currRect ); unclippedPainter->setClipping( FALSE ); } else { @@ -1359,22 +1359,22 @@ void FormWindow::endRectDraw() if ( oldRectValid ) unclippedPainter->drawRect( currRect ); - drawSizePreview( QPoint(-1,-1), QString::null ); + drawSizePreview( TQPoint(-1,-1), TQString::null ); endUnclippedPainter(); } void FormWindow::selectWidgets() { - QObjectList *l = mainContainer()->queryList( "QWidget" ); + TQObjectList *l = mainContainer()->queryList( "TQWidget" ); if ( l ) { - for ( QObject *o = l->first(); o; o = l->next() ) { - if ( ( (QWidget*)o )->isVisibleTo( this ) && + for ( TQObject *o = l->first(); o; o = l->next() ) { + if ( ( (TQWidget*)o )->isVisibleTo( this ) && insertedWidgets[ (void*)o ] ) { - QPoint p = ( (QWidget*)o )->mapToGlobal( QPoint(0,0) ); + TQPoint p = ( (TQWidget*)o )->mapToGlobal( TQPoint(0,0) ); p = mapFromGlobal( p ); - QRect r( p, ( (QWidget*)o )->size() ); + TQRect r( p, ( (TQWidget*)o )->size() ); if ( r.intersects( currRect ) && !r.contains( currRect ) ) - selectWidget( (QWidget*)o ); + selectWidget( (TQWidget*)o ); } } delete l; @@ -1382,19 +1382,19 @@ void FormWindow::selectWidgets() emitSelectionChanged(); } -bool FormWindow::isWidgetSelected( QObject *w ) +bool FormWindow::isWidgetSelected( TQObject *w ) { if ( w->isWidgetType() ) - return usedSelections.find( (QWidget*)w ) != 0; + return usedSelections.find( (TQWidget*)w ) != 0; return FALSE; // #### do stuff for QObjects } void FormWindow::moveSelectedWidgets( int dx, int dy ) { - QPtrDictIterator it( usedSelections ); + TQPtrDictIterator it( usedSelections ); for ( ; it.current(); ++it ) { WidgetSelection *s = it.current(); - QWidget *w = s->widget(); + TQWidget *w = s->widget(); if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) continue; w->move( w->x() + dx, w->y() + dy ); @@ -1418,15 +1418,15 @@ void FormWindow::redo() commandHistory()->redo(); } -void FormWindow::raiseChildSelections( QWidget *w ) +void FormWindow::raiseChildSelections( TQWidget *w ) { - QObjectList *l = w->queryList( "QWidget" ); + TQObjectList *l = w->queryList( "TQWidget" ); if ( !l || !l->first() ) { delete l; return; } - QPtrDictIterator it( usedSelections ); + TQPtrDictIterator it( usedSelections ); for ( ; it.current(); ++it ) { if ( l->findRef( it.current()->widget() ) != -1 ) it.current()->show(); @@ -1434,27 +1434,27 @@ void FormWindow::raiseChildSelections( QWidget *w ) delete l; } -void FormWindow::updateChildSelections( QWidget *w ) +void FormWindow::updateChildSelections( TQWidget *w ) { - QObjectList *l = w->queryList( "QWidget" ); + TQObjectList *l = w->queryList( "TQWidget" ); if ( l ) { - for ( QObject *o = l->first(); o; o = l->next() ) { + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - insertedWidgets.find( (QWidget*)o ) ) - updateSelection( (QWidget*)o ); + insertedWidgets.find( (TQWidget*)o ) ) + updateSelection( (TQWidget*)o ); } delete l; } } -void FormWindow::checkSelectionsForMove( QWidget *w ) +void FormWindow::checkSelectionsForMove( TQWidget *w ) { checkedSelectionsForMove = TRUE; - QObjectList *l = w->parentWidget()->queryList( "QWidget", 0, FALSE, FALSE ); + TQObjectList *l = w->parentWidget()->queryList( "TQWidget", 0, FALSE, FALSE ); moving.clear(); if ( l ) { - QPtrDictIterator it( usedSelections ); + TQPtrDictIterator it( usedSelections ); WidgetSelection *sel; while ( ( sel = it.current() ) != 0 ) { if ( it.current()->widget() == mainContainer() ) @@ -1479,10 +1479,10 @@ void FormWindow::checkSelectionsForMove( QWidget *w ) void FormWindow::deleteWidgets() { CHECK_MAINWINDOW; - QWidgetList widgets; - QPtrDictIterator it( usedSelections ); + TQWidgetList widgets; + TQPtrDictIterator it( usedSelections ); for ( ; it.current(); ++it ) { - QWidget *tb = 0; + TQWidget *tb = 0; if ( !( tb = mainWindow()->isAToolBarChild( it.current()->widget() ) ) ) widgets.append( it.current()->widget() ); else @@ -1499,28 +1499,28 @@ void FormWindow::deleteWidgets() void FormWindow::editAdjustSize() { - QPtrList commands; - QWidgetList widgets = selectedWidgets(); + TQPtrList commands; + TQWidgetList widgets = selectedWidgets(); if ( widgets.isEmpty() ) { - QRect oldr = geometry(); + TQRect oldr = geometry(); mainContainer()->adjustSize(); resize( mainContainer()->size() ); // check whether our own size constraint hit us if ( size() != mainContainer()->size() ) mainContainer()->resize( size() ); - QRect nr = geometry(); + TQRect nr = geometry(); if ( oldr != nr ) { ResizeCommand *cmd = new ResizeCommand( i18n( "Adjust Size" ), this, this, oldr, nr ); commandHistory()->addCommand( cmd ); } return; } - for ( QWidget* w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) { if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) continue; - QRect oldr = w->geometry(); + TQRect oldr = w->geometry(); w->adjustSize(); - QRect nr = w->geometry(); + TQRect nr = w->geometry(); if ( oldr != nr ) commands.append( new ResizeCommand( i18n("Adjust Size"), this, w, oldr, nr ) ); } @@ -1535,29 +1535,29 @@ void FormWindow::editAdjustSize() } -QWidgetList FormWindow::selectedWidgets() const +TQWidgetList FormWindow::selectedWidgets() const { - QWidgetList widgets; - QPtrDictIterator it( usedSelections ); + TQWidgetList widgets; + TQPtrDictIterator it( usedSelections ); for ( ; it.current(); ++it ) widgets.append( it.current()->widget() ); return widgets; } -void FormWindow::widgetChanged( QObject *w ) +void FormWindow::widgetChanged( TQObject *w ) { if ( w->isWidgetType() ) - updateSelection( (QWidget*)w ); - // ########## do QObject stuff + updateSelection( (TQWidget*)w ); + // ########## do TQObject stuff } -QLabel *FormWindow::sizePreview() const +TQLabel *FormWindow::sizePreview() const { if ( !sizePreviewLabel ) { - ( (FormWindow*)this )->sizePreviewLabel = new QLabel( (FormWindow*)this ); + ( (FormWindow*)this )->sizePreviewLabel = new TQLabel( (FormWindow*)this ); ( (FormWindow*)this )->sizePreviewLabel->hide(); - ( (FormWindow*)this )->sizePreviewLabel->setBackgroundColor( QColor( 255, 255, 128 ) ); - ( (FormWindow*)this )->sizePreviewLabel->setFrameStyle( QFrame::Plain | QFrame::Box ); + ( (FormWindow*)this )->sizePreviewLabel->setBackgroundColor( TQColor( 255, 255, 128 ) ); + ( (FormWindow*)this )->sizePreviewLabel->setFrameStyle( TQFrame::Plain | TQFrame::Box ); } return sizePreviewLabel; } @@ -1567,39 +1567,39 @@ void FormWindow::invalidCheckedSelections() checkedSelectionsForMove = FALSE; } -void FormWindow::checkPreviewGeometry( QRect &r ) +void FormWindow::checkPreviewGeometry( TQRect &r ) { if ( !rect().contains( r ) ) { if ( r.left() < rect().left() ) - r.moveTopLeft( QPoint( 0, r.top() ) ); + r.moveTopLeft( TQPoint( 0, r.top() ) ); if ( r.right() > rect().right() ) - r.moveBottomRight( QPoint( rect().right(), r.bottom() ) ); + r.moveBottomRight( TQPoint( rect().right(), r.bottom() ) ); if ( r.top() < rect().top() ) - r.moveTopLeft( QPoint( r.left(), rect().top() ) ); + r.moveTopLeft( TQPoint( r.left(), rect().top() ) ); if ( r.bottom() > rect().bottom() ) - r.moveBottomRight( QPoint( r.right(), rect().bottom() ) ); + r.moveBottomRight( TQPoint( r.right(), rect().bottom() ) ); } } -void FormWindow::focusInEvent( QFocusEvent * ){ +void FormWindow::focusInEvent( TQFocusEvent * ){ if (ff) ff->checkTimeStamp(); } -void FormWindow::focusOutEvent( QFocusEvent * ) +void FormWindow::focusOutEvent( TQFocusEvent * ) { if ( propertyWidget && !isMainContainer( propertyWidget ) && !isWidgetSelected( propertyWidget ) ) { - QObject *opw = propertyWidget; + TQObject *opw = propertyWidget; propertyWidget = mainContainer(); if ( opw->isWidgetType() ) - repaintSelection( (QWidget*)opw ); + repaintSelection( (TQWidget*)opw ); } } -void FormWindow::resizeEvent( QResizeEvent *e ) +void FormWindow::resizeEvent( TQResizeEvent *e ) { - QWidget::resizeEvent( e ); + TQWidget::resizeEvent( e ); if ( currTool == ORDER_TOOL ) repositionOrderIndicators(); if ( isVisible() ) @@ -1613,44 +1613,44 @@ void FormWindow::resizeEvent( QResizeEvent *e ) void FormWindow::windowsRepaintWorkaroundTimerTimeout() { #if defined(Q_WS_WIN32) - QObjectList *l = queryList( "QWidget" ); - for ( QObject *o = l->first(); o; o = l->next() ) { - flickerfree_update( (QWidget*)o ); + TQObjectList *l = queryList( "TQWidget" ); + for ( TQObject *o = l->first(); o; o = l->next() ) { + flickerfree_update( (TQWidget*)o ); } flickerfree_update( this ); delete l; #endif } -QPtrDict *FormWindow::widgets() +TQPtrDict *FormWindow::widgets() { return &insertedWidgets; } -QWidget *FormWindow::designerWidget( QObject *o ) const +TQWidget *FormWindow::designerWidget( TQObject *o ) const { if ( !o || !o->isWidgetType() ) return 0; - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; while ( w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ] || isCentralWidget( w ) ) - w = (QWidget*)w->parent(); + w = (TQWidget*)w->parent(); return w; } -void FormWindow::emitShowProperties( QObject *w ) +void FormWindow::emitShowProperties( TQObject *w ) { if ( w ) { - QObject *opw = propertyWidget; + TQObject *opw = propertyWidget; propertyWidget = w; if ( opw->isWidgetType() ) - repaintSelection( (QWidget*)opw ); + repaintSelection( (TQWidget*)opw ); } showPropertiesTimer->stop(); // showPropertiesTimer->start( 0, TRUE ); showPropertiesTimerDone(); } -void FormWindow::emitUpdateProperties( QObject *w ) +void FormWindow::emitUpdateProperties( TQObject *w ) { if ( w == propertyWidget ) { updatePropertiesTimer->stop(); @@ -1700,13 +1700,13 @@ void FormWindow::currentToolChanged() case BUDDY_TOOL: restoreConnectionLine(); if ( startWidget ) - restoreRect( QRect( mapToForm( ( (QWidget*)startWidget )->parentWidget(), - ( (QWidget*)startWidget )->pos() ), - ( (QWidget*)startWidget )->size() ) ); + restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->parentWidget(), + ( (TQWidget*)startWidget )->pos() ), + ( (TQWidget*)startWidget )->size() ) ); if ( endWidget ) - restoreRect( QRect( mapToForm( ( (QWidget*)endWidget )->parentWidget(), - ( (QWidget*)endWidget )->pos() ), - ( (QWidget*)endWidget )->size() ) ); + restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->parentWidget(), + ( (TQWidget*)endWidget )->pos() ), + ( (TQWidget*)endWidget )->size() ) ); endUnclippedPainter(); break; case POINTER_TOOL: @@ -1771,12 +1771,12 @@ void FormWindow::showOrderIndicators() { hideOrderIndicators(); orderIndicators.setAutoDelete( TRUE ); - QObjectList *l = mainContainer()->queryList( "QWidget" ); + TQObjectList *l = mainContainer()->queryList( "TQWidget" ); stackedWidgets = MetaDataBase::tabOrder( this ); if ( l ) { int order = 1; - for ( QObject *o = l->first(); o; o = l->next() ) { - QWidget* w = (QWidget*) o; + for ( TQObject *o = l->first(); o; o = l->next() ) { + TQWidget* w = (TQWidget*) o; if ( w->isShown() && insertedWidgets[ (void*)w ] && w->focusPolicy() != NoFocus ) { @@ -1799,7 +1799,7 @@ void FormWindow::hideOrderIndicators() void FormWindow::updateOrderIndicators() { int order = 1; - for ( QWidget *w = stackedWidgets.first(); w; w = stackedWidgets.next() ) { + for ( TQWidget *w = stackedWidgets.first(); w; w = stackedWidgets.next() ) { for ( OrderIndicator* i = orderIndicators.first(); i; i = orderIndicators.next() ) i->setOrder( order, w ); order++; @@ -1820,25 +1820,25 @@ void FormWindow::updateUndoInfo() bool FormWindow::checkCustomWidgets() { - QStringList missingCustomWidgets; - QPtrDictIterator it( insertedWidgets ); + TQStringList missingCustomWidgets; + TQPtrDictIterator it( insertedWidgets ); for ( ; it.current(); ++it ) { if ( it.current()->isA( "CustomWidget" ) ) { - QString className = WidgetFactory::classNameOf( it.current() ); + TQString className = WidgetFactory::classNameOf( it.current() ); if ( !MetaDataBase::hasCustomWidget( className ) ) missingCustomWidgets << className; } } if ( !missingCustomWidgets.isEmpty() ) { - QString txt = i18n( "The following custom widgets are used in '%1',\n" + TQString txt = i18n( "The following custom widgets are used in '%1',\n" "but are not known to Qt Designer:\n" ).arg( name() ); - for ( QStringList::Iterator sit = missingCustomWidgets.begin(); sit != missingCustomWidgets.end(); ++sit ) + for ( TQStringList::Iterator sit = missingCustomWidgets.begin(); sit != missingCustomWidgets.end(); ++sit ) txt += " " + *sit + "\n"; txt += i18n( "If you save this form and generate code for it using uic, \n" "the generated code will not compile.\n" "Do you want to save this form now?" ); - if ( QMessageBox::information( mainWindow(), i18n( "Save Form" ), txt ) == 1 ) + if ( TQMessageBox::information( mainWindow(), i18n( "Save Form" ), txt ) == 1 ) return FALSE; } return TRUE; @@ -1859,9 +1859,9 @@ int FormWindow::numSelectedWidgets() const return usedSelections.count(); } -QString FormWindow::copy() +TQString FormWindow::copy() { - CHECK_MAINWINDOW_VALUE( QString::null ); + CHECK_MAINWINDOW_VALUE( TQString::null ); Resource resource( mainWindow() ); resource.setWidget( this ); return resource.copy(); @@ -1869,8 +1869,8 @@ QString FormWindow::copy() void FormWindow::lowerWidgets() { - QWidgetList widgets; - QPtrDictIterator it( usedSelections ); + TQWidgetList widgets; + TQPtrDictIterator it( usedSelections ); for ( ; it.current(); ++it ) widgets.append( it.current()->widget() ); @@ -1879,22 +1879,22 @@ void FormWindow::lowerWidgets() commandHistory()->addCommand( cmd ); } -void find_accel( const QString &txt, QMap &accels, QWidget *w ) +void find_accel( const TQString &txt, TQMap &accels, TQWidget *w ) { int i = txt.find( "&" ); if ( i == -1 ) return; - QChar c = txt[ i + 1 ]; + TQChar c = txt[ i + 1 ]; if ( c.isNull() || c == '&' ) return; c = c.lower(); - QMap::Iterator it = accels.find( c ); + TQMap::Iterator it = accels.find( c ); if ( it == accels.end() ) { - QWidgetList wl; + TQWidgetList wl; wl.append( w ); accels.insert( c, wl ); } else { - QWidgetList *wl = &*it; + TQWidgetList *wl = &*it; wl->append( w ); } } @@ -1902,18 +1902,18 @@ void find_accel( const QString &txt, QMap &accels, QWidget void FormWindow::checkAccels() { CHECK_MAINWINDOW; - QMap accels; - QObjectList *l = mainContainer()->queryList( "QWidget" ); + TQMap accels; + TQObjectList *l = mainContainer()->queryList( "TQWidget" ); if ( l ) { - for ( QObject *o = l->first(); o; o = l->next() ) { - if ( ( (QWidget*)o )->isVisibleTo( this ) && + for ( TQObject *o = l->first(); o; o = l->next() ) { + if ( ( (TQWidget*)o )->isVisibleTo( this ) && insertedWidgets[ (void*)o ] ) { - QWidget *w = (QWidget*)o; - const QMetaProperty* text = + TQWidget *w = (TQWidget*)o; + const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); - const QMetaProperty* title = + const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); - const QMetaProperty* pageTitle = + const TQMetaProperty* pageTitle = w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( text ) find_accel( w->property( "text" ).toString(), accels, w ); @@ -1929,15 +1929,15 @@ void FormWindow::checkAccels() } bool ok = TRUE; - QWidget *wid; - for ( QMap::Iterator it = accels.begin(); it != accels.end(); ++it ) { + TQWidget *wid; + for ( TQMap::Iterator it = accels.begin(); it != accels.end(); ++it ) { if ( (*it).count() > 1 ) { ok = FALSE; - switch ( QMessageBox::information( mainWindow(), i18n( "Check Accelerators" ), + switch ( TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ), i18n( "Accelerator '%1' is used once.", "Accelerator '%1' is used %n times.", (*it).count() ).arg( it.key().upper() ), i18n( "&Select" ), - i18n( "&Cancel" ), QString::null, 2 ) ) { + i18n( "&Cancel" ), TQString::null, 2 ) ) { case 0: // select clearSelection( FALSE ); for ( wid = (*it).first(); wid; wid = (*it).next() ) @@ -1950,14 +1950,14 @@ void FormWindow::checkAccels() } if ( ok ) - QMessageBox::information( mainWindow(), i18n( "Check Accelerators" ), + TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ), i18n( "No accelerator is used more than once." ) ); } void FormWindow::raiseWidgets() { - QWidgetList widgets; - QPtrDictIterator it( usedSelections ); + TQWidgetList widgets; + TQPtrDictIterator it( usedSelections ); for ( ; it.current(); ++it ) widgets.append( it.current()->widget() ); @@ -1966,7 +1966,7 @@ void FormWindow::raiseWidgets() commandHistory()->addCommand( cmd ); } -void FormWindow::paste( const QString &cb, QWidget *parent ) +void FormWindow::paste( const TQString &cb, TQWidget *parent ) { CHECK_MAINWINDOW; Resource resource( mainWindow() ); @@ -1978,12 +1978,12 @@ void FormWindow::selectAll() { checkedSelectionsForMove = FALSE; blockSignals( TRUE ); - QObjectList *l = mainContainer()->queryList( "QWidget" ); + TQObjectList *l = mainContainer()->queryList( "TQWidget" ); if ( l ) { - for ( QObject *o = l->first(); o; o = l->next() ) { - if ( ( (QWidget*)o )->isVisibleTo( this ) && + for ( TQObject *o = l->first(); o; o = l->next() ) { + if ( ( (TQWidget*)o )->isVisibleTo( this ) && insertedWidgets[ (void*)o ] ) { - selectWidget( (QWidget*)o ); + selectWidget( (TQWidget*)o ); } } delete l; @@ -1998,7 +1998,7 @@ void FormWindow::selectAll() void FormWindow::layoutHorizontal() { - QWidgetList widgets( selectedWidgets() ); + TQWidgetList widgets( selectedWidgets() ); LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Horizontally" ), this, mainContainer(), 0, widgets ); clearSelection( FALSE ); @@ -2008,7 +2008,7 @@ void FormWindow::layoutHorizontal() void FormWindow::layoutVertical() { - QWidgetList widgets( selectedWidgets() ); + TQWidgetList widgets( selectedWidgets() ); LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Vertically" ), this, mainContainer(), 0, widgets ); clearSelection( FALSE ); @@ -2018,7 +2018,7 @@ void FormWindow::layoutVertical() void FormWindow::layoutHorizontalSplit() { - QWidgetList widgets( selectedWidgets() ); + TQWidgetList widgets( selectedWidgets() ); LayoutHorizontalSplitCommand *cmd = new LayoutHorizontalSplitCommand( i18n( "Lay Out Horizontally (in splitter)" ), this, mainContainer(), 0, widgets ); clearSelection( FALSE ); @@ -2028,7 +2028,7 @@ void FormWindow::layoutHorizontalSplit() void FormWindow::layoutVerticalSplit() { - QWidgetList widgets( selectedWidgets() ); + TQWidgetList widgets( selectedWidgets() ); LayoutVerticalSplitCommand *cmd = new LayoutVerticalSplitCommand( i18n( "Lay Out Vertically (in splitter)" ), this, mainContainer(), 0, widgets ); clearSelection( FALSE ); @@ -2041,7 +2041,7 @@ void FormWindow::layoutGrid() int xres = grid().x(); int yres = grid().y(); - QWidgetList widgets( selectedWidgets() ); + TQWidgetList widgets( selectedWidgets() ); LayoutGridCommand *cmd = new LayoutGridCommand( i18n( "Lay Out in a Grid" ), this, mainContainer(), 0, widgets, xres, yres ); clearSelection( FALSE ); @@ -2049,19 +2049,19 @@ void FormWindow::layoutGrid() cmd->execute(); } -void FormWindow::layoutHorizontalContainer( QWidget *w ) +void FormWindow::layoutHorizontalContainer( TQWidget *w ) { if ( w == this ) w = mainContainer(); - QObjectList *l = (QObjectList*)WidgetFactory::containerOfWidget(w)->children(); + TQObjectList *l = (TQObjectList*)WidgetFactory::containerOfWidget(w)->children(); if ( !l ) return; - QWidgetList widgets; - for ( QObject *o = l->first(); o; o = l->next() ) { + TQWidgetList widgets; + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - ( (QWidget*)o )->isVisibleTo( this ) && - insertedWidgets.find( (QWidget*)o ) ) - widgets.append( (QWidget*)o ); + ( (TQWidget*)o )->isVisibleTo( this ) && + insertedWidgets.find( (TQWidget*)o ) ) + widgets.append( (TQWidget*)o ); } LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Children Horizontally" ), this, mainContainer(), w, widgets ); @@ -2070,19 +2070,19 @@ void FormWindow::layoutHorizontalContainer( QWidget *w ) cmd->execute(); } -void FormWindow::layoutVerticalContainer( QWidget *w ) +void FormWindow::layoutVerticalContainer( TQWidget *w ) { if ( w == this ) w = mainContainer(); - QObjectList *l = (QObjectList*)WidgetFactory::containerOfWidget(w)->children(); + TQObjectList *l = (TQObjectList*)WidgetFactory::containerOfWidget(w)->children(); if ( !l ) return; - QWidgetList widgets; - for ( QObject *o = l->first(); o; o = l->next() ) { + TQWidgetList widgets; + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - ( (QWidget*)o )->isVisibleTo( this ) && - insertedWidgets.find( (QWidget*)o ) ) - widgets.append( (QWidget*)o ); + ( (TQWidget*)o )->isVisibleTo( this ) && + insertedWidgets.find( (TQWidget*)o ) ) + widgets.append( (TQWidget*)o ); } LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Children Vertically" ), this, mainContainer(), w, widgets ); @@ -2091,22 +2091,22 @@ void FormWindow::layoutVerticalContainer( QWidget *w ) cmd->execute(); } -void FormWindow::layoutGridContainer( QWidget *w ) +void FormWindow::layoutGridContainer( TQWidget *w ) { if ( w == this ) w = mainContainer(); int xres = grid().x(); int yres = grid().y(); - QObjectList *l = (QObjectList*)WidgetFactory::containerOfWidget(w)->children(); + TQObjectList *l = (TQObjectList*)WidgetFactory::containerOfWidget(w)->children(); if ( !l ) return; - QWidgetList widgets; - for ( QObject *o = l->first(); o; o = l->next() ) { + TQWidgetList widgets; + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - ( (QWidget*)o )->isVisibleTo( this ) && - insertedWidgets.find( (QWidget*)o ) ) - widgets.append( (QWidget*)o ); + ( (TQWidget*)o )->isVisibleTo( this ) && + insertedWidgets.find( (TQWidget*)o ) ) + widgets.append( (TQWidget*)o ); } LayoutGridCommand *cmd = new LayoutGridCommand( i18n( "Lay Out Children in a Grid" ), this, mainContainer(), w, widgets, xres, yres ); @@ -2115,12 +2115,12 @@ void FormWindow::layoutGridContainer( QWidget *w ) cmd->execute(); } -void FormWindow::breakLayout( QWidget *w ) +void FormWindow::breakLayout( TQWidget *w ) { if ( w == this ) w = mainContainer(); w = WidgetFactory::containerOfWidget( w ); - QPtrList commands; + TQPtrList commands; for (;;) { if ( !w || w == this ) @@ -2130,7 +2130,7 @@ void FormWindow::breakLayout( QWidget *w ) Command *cmd = breakLayoutCommand( w ); if ( cmd ) commands.insert( 0, cmd ); - if ( !::qt_cast(w) && !::qt_cast(w) ) + if ( !::qt_cast(w) && !::qt_cast(w) ) break; } w = w->parentWidget(); @@ -2145,27 +2145,27 @@ void FormWindow::breakLayout( QWidget *w ) cmd->execute(); } -BreakLayoutCommand *FormWindow::breakLayoutCommand( QWidget *w ) +BreakLayoutCommand *FormWindow::breakLayoutCommand( TQWidget *w ) { CHECK_MAINWINDOW_VALUE( 0 ); - QObjectList *l = (QObjectList*)w->children(); + TQObjectList *l = (TQObjectList*)w->children(); if ( !l ) return 0; - QWidgetList widgets; - for ( QObject *o = l->first(); o; o = l->next() ) { + TQWidgetList widgets; + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - !mainWindow()->isAToolBarChild( (QWidget*)o ) && - ( (QWidget*)o )->isVisibleTo( this ) && - insertedWidgets.find( (QWidget*)o ) ) - widgets.append( (QWidget*)o ); + !mainWindow()->isAToolBarChild( (TQWidget*)o ) && + ( (TQWidget*)o )->isVisibleTo( this ) && + insertedWidgets.find( (TQWidget*)o ) ) + widgets.append( (TQWidget*)o ); } return new BreakLayoutCommand( i18n( "Break Layout" ), this, WidgetFactory::widgetOfContainer( w ), widgets ); } int FormWindow::numVisibleWidgets() const { - QPtrDictIterator it( insertedWidgets ); + TQPtrDictIterator it( insertedWidgets ); int visible = 0; for ( ; it.current(); ++it ) { if ( it.current()->isVisibleTo( (FormWindow*)this ) ) @@ -2174,23 +2174,23 @@ int FormWindow::numVisibleWidgets() const return visible; } -bool FormWindow::hasInsertedChildren( QWidget *w ) const +bool FormWindow::hasInsertedChildren( TQWidget *w ) const { if ( !w ) return FALSE; w = WidgetFactory::containerOfWidget( w ); if ( !w ) return FALSE; - QObjectList *l = w->queryList( "QWidget" ); + TQObjectList *l = w->queryList( "TQWidget" ); if ( !l || !l->first() ) { delete l; return FALSE; } - for ( QObject *o = l->first(); o; o = l->next() ) { + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - ( (QWidget*)o )->isVisibleTo( (FormWindow*)this ) && - insertedWidgets.find( (QWidget*)o ) ) { + ( (TQWidget*)o )->isVisibleTo( (FormWindow*)this ) && + insertedWidgets.find( (TQWidget*)o ) ) { delete l; return TRUE; } @@ -2200,7 +2200,7 @@ bool FormWindow::hasInsertedChildren( QWidget *w ) const return FALSE; } -bool FormWindow::allowMove( QWidget *w ) +bool FormWindow::allowMove( TQWidget *w ) { w = w->parentWidget(); while ( w ) { @@ -2221,8 +2221,8 @@ void FormWindow::editConnections() ConnectionDialog dlg( mainwindow ); mainWindow()->statusMessage( i18n( "Edit connections...") ); - dlg.addConnection( startWidget, endWidget, QString::null, QString::null ); - QTimer::singleShot( 0, &dlg, SLOT(ensureConnectionVisible()) ); + dlg.addConnection( startWidget, endWidget, TQString::null, TQString::null ); + TQTimer::singleShot( 0, &dlg, TQT_SLOT(ensureConnectionVisible()) ); dlg.exec(); } @@ -2230,8 +2230,8 @@ void FormWindow::saveBackground() { if ( buffer ) delete buffer; - buffer = new QPixmap( width(), height() ); - *buffer = QPixmap::grabWindow( winId() ); + buffer = new TQPixmap( width(), height() ); + *buffer = TQPixmap::grabWindow( winId() ); } void FormWindow::restoreConnectionLine() @@ -2241,7 +2241,7 @@ void FormWindow::restoreConnectionLine() int a =QABS( startPos.x() - currentPos.x() ); int b = QABS( startPos.y() - currentPos.y() ); - QRect r( startPos, currentPos ); + TQRect r( startPos, currentPos ); if ( a < 32 || b < 32 ) { // special case: vertical or horizontal line r = r.normalize(); @@ -2265,7 +2265,7 @@ void FormWindow::restoreConnectionLine() int dx = 2 * w / 3; int dy = 2 * h / 3; - QPoint p( startPos ); + TQPoint p( startPos ); if ( r.x() > r.right() ) { dx = dx * -1; @@ -2281,7 +2281,7 @@ void FormWindow::restoreConnectionLine() w = h = 64; r = r.normalize(); while ( r.contains( p ) ) { - unclippedPainter->drawPixmap( p, *buffer, QRect( p, QSize( w, h ) ) ); + unclippedPainter->drawPixmap( p, *buffer, TQRect( p, TQSize( w, h ) ) ); unclippedPainter->setPen( red ); p.setX( p.x() + dx ); p.setY( p.y() + dy ); @@ -2291,15 +2291,15 @@ void FormWindow::restoreConnectionLine() startPos.x() - 10, startPos.y() - 10, 20, 20 ); } -void FormWindow::restoreRect( const QRect &rect ) +void FormWindow::restoreRect( const TQRect &rect ) { if (!unclippedPainter || !buffer) return; - QRect r( rect ); + TQRect r( rect ); r = r.normalize(); - r = QRect( r.x() + 2, r.y() + 2, r.width() - 4, r.height() - 4 ); + r = TQRect( r.x() + 2, r.y() + 2, r.width() - 4, r.height() - 4 ); unclippedPainter->drawPixmap( r.x() - 2, r.y() - 2, *buffer, r.x() - 2, r.y() - 2, r.width() + 4, 4 ); unclippedPainter->drawPixmap( r.x() - 2, r.y() - 2, *buffer, r.x() - 2, r.y() - 2, 4, r.height() + 4 ); @@ -2312,36 +2312,36 @@ void FormWindow::drawConnectionLine() if ( !unclippedPainter ) return; - unclippedPainter->setPen( QPen( white, 2 ) ); + unclippedPainter->setPen( TQPen( white, 2 ) ); unclippedPainter->drawLine( startPos, currentPos ); if ( validForBuddy ) - unclippedPainter->setPen( QPen( darkRed, 1 ) ); + unclippedPainter->setPen( TQPen( darkRed, 1 ) ); else - unclippedPainter->setPen( QPen( darkCyan, 1 ) ); + unclippedPainter->setPen( TQPen( darkCyan, 1 ) ); unclippedPainter->drawLine( startPos, currentPos ); if ( validForBuddy ) - unclippedPainter->setPen( QPen( darkGreen, 1 ) ); + unclippedPainter->setPen( TQPen( darkGreen, 1 ) ); else - unclippedPainter->setPen( QPen( magenta, 1 ) ); + unclippedPainter->setPen( TQPen( magenta, 1 ) ); if ( startWidget ) { - QWidget *s = (QWidget*)startWidget; - QPoint p = mapToForm( s, QPoint(0,0) ); - unclippedPainter->drawRect( QRect( p + QPoint( 2, 2 ), s->size() - QSize( 4, 4 ) ) ); + TQWidget *s = (TQWidget*)startWidget; + TQPoint p = mapToForm( s, TQPoint(0,0) ); + unclippedPainter->drawRect( TQRect( p + TQPoint( 2, 2 ), s->size() - TQSize( 4, 4 ) ) ); } if ( endWidget ) { - QWidget *e = (QWidget*)endWidget; - QPoint p = mapToForm( e, QPoint(0,0) ); - unclippedPainter->drawRect( QRect( p + QPoint( 2, 2 ), e->size() - QSize( 4, 4 ) ) ); + TQWidget *e = (TQWidget*)endWidget; + TQPoint p = mapToForm( e, TQPoint(0,0) ); + unclippedPainter->drawRect( TQRect( p + TQPoint( 2, 2 ), e->size() - TQSize( 4, 4 ) ) ); } } -QString FormWindow::fileName() const +TQString FormWindow::fileName() const { return ff->absFileName(); } -void FormWindow::setFileName( const QString &fn ) +void FormWindow::setFileName( const TQString &fn ) { ff->setFileName( fn ); emit fileNameChanged( ff->fileName(), this ); @@ -2353,33 +2353,33 @@ void FormWindow::modificationChanged( bool m ) emit modificationChanged( m, ff->fileName() ); } -bool FormWindow::unify( QObject *w, QString &s, bool changeIt ) +bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) { bool found = !isMainContainer( w ) && qstrcmp( name(), s.latin1() ) == 0; if ( !found ) { - QString orig = s; + TQString orig = s; int num = 1; - QPtrDictIterator it( insertedWidgets ); + TQPtrDictIterator it( insertedWidgets ); for ( ; it.current();) { if ( it.current() != w && qstrcmp( it.current()->name(), s.latin1() ) == 0 ) { found = TRUE; if ( !changeIt ) break; - s = orig + "_" + QString::number( ++num ); + s = orig + "_" + TQString::number( ++num ); it.toFirst(); } else { ++it; } } if ( !found ) { - QPtrList al; - QAction *a = 0; + TQPtrList al; + TQAction *a = 0; for ( a = actions.first(); a; a = actions.next() ) { - QObjectList *l = a->queryList( "QAction" ); + TQObjectList *l = a->queryList( "TQAction" ); al.append( a ); - for ( QObject *ao = l->first(); ao; ao = l->next() ) - al.append( (QAction*)ao ); + for ( TQObject *ao = l->first(); ao; ao = l->next() ) + al.append( (TQAction*)ao ); delete l; } for ( a = al.first(); a; a = al.next() ) { @@ -2388,35 +2388,35 @@ bool FormWindow::unify( QObject *w, QString &s, bool changeIt ) found = TRUE; if ( !changeIt ) break; - s = orig + "_" + QString::number( ++num ); + s = orig + "_" + TQString::number( ++num ); a = actions.first(); } } } - if ( ::qt_cast(mainContainer()) && !found ) { - QObjectList *l = mainContainer()->queryList( "PopupMenuEditor" ); - for ( QObject *o = l->first(); o; o = l->next() ) { + if ( ::qt_cast(mainContainer()) && !found ) { + TQObjectList *l = mainContainer()->queryList( "PopupMenuEditor" ); + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o != w && qstrcmp ( o->name(), s.latin1() ) == 0 ) { found = TRUE; if ( !changeIt ) break; - s = orig + "_" + QString::number( ++num ); + s = orig + "_" + TQString::number( ++num ); o = l->first(); } } delete l; } - if ( ::qt_cast(mainContainer()) ) { + if ( ::qt_cast(mainContainer()) ) { if ( !found ) { - QObjectList *l = mainContainer()->queryList( "QDockWindow", 0, TRUE ); - for ( QObject *o = l->first(); o; o = l->next() ) { + TQObjectList *l = mainContainer()->queryList( "TQDockWindow", 0, TRUE ); + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o != w && qstrcmp( o->name(), s.latin1() ) == 0 ) { found = TRUE; if ( !changeIt ) break; - s = orig + "_" + QString::number( ++num ); + s = orig + "_" + TQString::number( ++num ); o = l->first(); } } @@ -2432,7 +2432,7 @@ bool FormWindow::unify( QObject *w, QString &s, bool changeIt ) bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w ) { - QPtrDictIterator it( insertedWidgets ); + TQPtrDictIterator it( insertedWidgets ); for ( ; it.current(); ++it ) { if ( it.current()->isA( "CustomWidget" ) ) { if ( qstrcmp( WidgetFactory::classNameOf( it.current() ), w->className.utf8() ) == 0 ) @@ -2446,11 +2446,11 @@ bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w ) bool FormWindow::isDatabaseWidgetUsed() const { #ifndef QT_NO_SQL - QStringList dbClasses; - dbClasses << "QDataTable"; // add more here - QPtrDictIterator it( insertedWidgets ); + TQStringList dbClasses; + dbClasses << "TQDataTable"; // add more here + TQPtrDictIterator it( insertedWidgets ); for ( ; it.current(); ++it ) { - QString c( it.current()->className() ); + TQString c( it.current()->className() ); if ( dbClasses.contains( c ) > 0 ) { return TRUE; } @@ -2462,7 +2462,7 @@ bool FormWindow::isDatabaseWidgetUsed() const bool FormWindow::isDatabaseAware() const { #ifndef QT_NO_SQL - if ( QString(mContainer->className()) == "QDesignerDataBrowser" || QString(mContainer->className()) == "QDesignerDataView" ) + if ( TQString(mContainer->className()) == "QDesignerDataBrowser" || TQString(mContainer->className()) == "QDesignerDataView" ) return TRUE; return isDatabaseWidgetUsed(); #else @@ -2487,18 +2487,18 @@ void FormWindow::visibilityChanged() This is the equivalent to mapFromGlobal(w->mapToGlobal(pos) ) but avoids the two roundtrips to the X-Server on Unix/X11. */ -QPoint FormWindow::mapToForm( const QWidget* w, const QPoint& pos ) const +TQPoint FormWindow::mapToForm( const TQWidget* w, const TQPoint& pos ) const { - QPoint p = pos; - const QWidget* i = w; - while ( i && !i->isTopLevel() && !isMainContainer( (QWidget*)i ) ) { + TQPoint p = pos; + const TQWidget* i = w; + while ( i && !i->isTopLevel() && !isMainContainer( (TQWidget*)i ) ) { p = i->mapToParent( p ); i = i->parentWidget(); } return mapFromGlobal( w->mapToGlobal( pos ) ); } -static int widgetDepth( QWidget *w ) +static int widgetDepth( TQWidget *w ) { int d = -1; while ( w && !w->isTopLevel() ) { @@ -2509,7 +2509,7 @@ static int widgetDepth( QWidget *w ) return d; } -static bool isChildOf( QWidget *c, QWidget *p ) +static bool isChildOf( TQWidget *c, TQWidget *p ) { while ( c && !c->isTopLevel() ) { if ( c == p ) @@ -2519,12 +2519,12 @@ static bool isChildOf( QWidget *c, QWidget *p ) return FALSE; } -QWidget *FormWindow::containerAt( const QPoint &pos, QWidget *notParentOf ) +TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) { - QPtrDictIterator it( insertedWidgets ); - QWidget *container = 0; + TQPtrDictIterator it( insertedWidgets ); + TQWidget *container = 0; int depth = -1; - QWidgetList selected = selectedWidgets(); + TQWidgetList selected = selectedWidgets(); if ( rect().contains( mapFromGlobal( pos ) ) ) { container = mainContainer(); depth = widgetDepth( container ); @@ -2532,7 +2532,7 @@ QWidget *FormWindow::containerAt( const QPoint &pos, QWidget *notParentOf ) for ( ; it.current(); ++it ) { if ( ::qt_cast(it.current()) - || ::qt_cast(it.current()) ) + || ::qt_cast(it.current()) ) continue; if ( !it.current()->isVisibleTo( this ) ) continue; @@ -2543,7 +2543,7 @@ QWidget *FormWindow::containerAt( const QPoint &pos, QWidget *notParentOf ) continue; // the rectangles of all ancestors of the container must contain the insert position - QWidget *w = it.current(); + TQWidget *w = it.current(); while ( w && !w->isTopLevel() ) { if ( !w->rect().contains( ( w->mapFromGlobal( pos ) ) ) ) break; @@ -2553,8 +2553,8 @@ QWidget *FormWindow::containerAt( const QPoint &pos, QWidget *notParentOf ) int wd = widgetDepth( it.current() ); if ( wd == depth && container ) { - if ( ( (QObjectList*)it.current()->parentWidget()->children() )->find( it.current() ) > - ( (QObjectList*)container->parentWidget()->children() )->find( container ) ) + if ( ( (TQObjectList*)it.current()->parentWidget()->children() )->find( it.current() ) > + ( (TQObjectList*)container->parentWidget()->children() )->find( container ) ) wd++; } if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) { @@ -2566,12 +2566,12 @@ QWidget *FormWindow::containerAt( const QPoint &pos, QWidget *notParentOf ) return container; } -bool FormWindow::isMainContainer( QObject *w ) const +bool FormWindow::isMainContainer( TQObject *w ) const { - return w && w->isWidgetType() && ( w == (QWidget*)this || w == mainContainer() ); + return w && w->isWidgetType() && ( w == (TQWidget*)this || w == mainContainer() ); } -void FormWindow::setMainContainer( QWidget *w ) +void FormWindow::setMainContainer( TQWidget *w ) { bool resetPropertyWidget = isMainContainer( propertyWidget ); if ( mContainer ) @@ -2582,13 +2582,13 @@ void FormWindow::setMainContainer( QWidget *w ) mContainer = w; insertedWidgets.insert( mContainer, mContainer ); delete layout(); - QHBoxLayout *l = new QHBoxLayout( this ); + TQHBoxLayout *l = new TQHBoxLayout( this ); l->addWidget( w ); if ( resetPropertyWidget ) { - QObject *opw = propertyWidget; + TQObject *opw = propertyWidget; propertyWidget = mContainer; if ( opw && opw->isWidgetType() ) - repaintSelection( (QWidget*)opw ); + repaintSelection( (TQWidget*)opw ); } if ( project() ) { LanguageInterface *iface = MetaDataBase::languageInterface( project()->language() ); @@ -2618,7 +2618,7 @@ bool FormWindow::savePixmapInProject() const return pixProject; } -QString FormWindow::pixmapLoaderFunction() const +TQString FormWindow::pixmapLoaderFunction() const { return pixLoader; } @@ -2637,12 +2637,12 @@ void FormWindow::setSavePixmapInProject( bool b ) pixInline = FALSE; } -void FormWindow::setPixmapLoaderFunction( const QString &func ) +void FormWindow::setPixmapLoaderFunction( const TQString &func ) { pixLoader = func; } -void FormWindow::setActiveObject( QObject *o ) +void FormWindow::setActiveObject( TQObject *o ) { emitShowProperties( o ); propertyWidget = o; @@ -2658,25 +2658,25 @@ Project *FormWindow::project() const return proj; } -QAction *FormWindow::findAction( const QString &name ) +TQAction *FormWindow::findAction( const TQString &name ) { - for ( QAction *a = actionList().first(); a; a = actionList().next() ) { - if ( QString( a->name() ) == name ) + for ( TQAction *a = actionList().first(); a; a = actionList().next() ) { + if ( TQString( a->name() ) == name ) return a; - QAction *ac = (QAction*)a->child( name.latin1(), "QAction" ); + TQAction *ac = (TQAction*)a->child( name.latin1(), "TQAction" ); if ( ac ) return ac; } return 0; } -void FormWindow::killAccels( QObject *top ) +void FormWindow::killAccels( TQObject *top ) { - QObjectList *l = top->queryList( "QAccel" ); + TQObjectList *l = top->queryList( "TQAccel" ); if ( !l ) return; - for ( QObject *o = l->first(); o; o = l->next() ) - ( (QAccel*)o )->setEnabled( FALSE ); + for ( TQObject *o = l->first(); o; o = l->next() ) + ( (TQAccel*)o )->setEnabled( FALSE ); delete l; } @@ -2687,11 +2687,11 @@ DesignerFormWindow *FormWindow::iFace() return iface; } -bool FormWindow::isCentralWidget( QObject *w ) const +bool FormWindow::isCentralWidget( TQObject *w ) const { - if ( !::qt_cast(mainContainer()) ) + if ( !::qt_cast(mainContainer()) ) return FALSE; - return w == ( (QMainWindow*)mainContainer() )->centralWidget(); + return w == ( (TQMainWindow*)mainContainer() )->centralWidget(); } int FormWindow::layoutDefaultSpacing() const @@ -2714,12 +2714,12 @@ void FormWindow::setLayoutDefaultMargin( int s ) defMargin = s; } -void FormWindow::setSpacingFunction( const QString &funct ) +void FormWindow::setSpacingFunction( const TQString &funct ) { spacFunction = funct; } -QString FormWindow::spacingFunction() const +TQString FormWindow::spacingFunction() const { return spacFunction; } @@ -2734,12 +2734,12 @@ bool FormWindow::hasLayoutFunctions() const return hasLayoutFunc; } -void FormWindow::setMarginFunction( const QString &funct ) +void FormWindow::setMarginFunction( const TQString &funct ) { margFunction = funct; } -QString FormWindow::marginFunction() const +TQString FormWindow::marginFunction() const { return margFunction; } @@ -2753,17 +2753,17 @@ void FormWindow::setFormFile( FormFile *f ) { ff = f; if ( ff ) - connect( this, SIGNAL( modificationChanged(bool, const QString&) ), ff, SLOT( formWindowChangedSomehow() ) ); + connect( this, TQT_SIGNAL( modificationChanged(bool, const TQString&) ), ff, TQT_SLOT( formWindowChangedSomehow() ) ); } -bool FormWindow::canBeBuddy( const QWidget *w ) const +bool FormWindow::canBeBuddy( const TQWidget *w ) const { - return w->focusPolicy() != QWidget::NoFocus; + return w->focusPolicy() != TQWidget::NoFocus; } -bool FormWindow::event( QEvent *e ) +bool FormWindow::event( TQEvent *e ) { - if (e->type() == QEvent::ShowMaximized) + if (e->type() == TQEvent::ShowMaximized) { #if QT_VERSION >= 0x030300 if ( isMaximized() ) @@ -2771,5 +2771,5 @@ bool FormWindow::event( QEvent *e ) #endif return true; } - return QWidget::event(e); + return TQWidget::event(e); } diff --git a/kdevdesigner/designer/formwindow.h b/kdevdesigner/designer/formwindow.h index 782a26c3..6a27961a 100644 --- a/kdevdesigner/designer/formwindow.h +++ b/kdevdesigner/designer/formwindow.h @@ -32,11 +32,11 @@ #include "sizehandle.h" #include "actiondnd.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class QPaintEvent; class QMouseEvent; @@ -65,28 +65,28 @@ class OrderIndicator; class FormWindow : public QWidget { Q_OBJECT - Q_PROPERTY( QString fileName READ fileName WRITE setFileName ) + Q_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: - FormWindow( FormFile *f, MainWindow *mw, QWidget *parent, const char *name = 0 ); - FormWindow( FormFile *f, QWidget *parent, const char *name = 0 ); + FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name = 0 ); + FormWindow( FormFile *f, TQWidget *parent, const char *name = 0 ); ~FormWindow(); void init(); virtual void setMainWindow( MainWindow *w ); - virtual QString fileName() const; - virtual void setFileName( const QString &fn ); + virtual TQString fileName() const; + virtual void setFileName( const TQString &fn ); - virtual QPoint grid() const; - virtual QPoint gridPoint( const QPoint &p ); + virtual TQPoint grid() const; + virtual TQPoint gridPoint( const TQPoint &p ); virtual CommandHistory *commandHistory(); virtual void undo(); virtual void redo(); - virtual QString copy(); - virtual void paste( const QString &cb, QWidget *parent ); + virtual TQString copy(); + virtual void paste( const TQString &cb, TQWidget *parent ); virtual void lowerWidgets(); virtual void raiseWidgets(); virtual void checkAccels(); @@ -97,53 +97,53 @@ public: virtual void layoutVerticalSplit(); virtual void layoutGrid(); - virtual void layoutHorizontalContainer( QWidget *w ); - virtual void layoutVerticalContainer( QWidget *w ); - virtual void layoutGridContainer( QWidget *w ); + virtual void layoutHorizontalContainer( TQWidget *w ); + virtual void layoutVerticalContainer( TQWidget *w ); + virtual void layoutGridContainer( TQWidget *w ); - virtual void breakLayout( QWidget *w ); + virtual void breakLayout( TQWidget *w ); - virtual void selectWidget( QObject *w, bool select = TRUE ); + virtual void selectWidget( TQObject *w, bool select = TRUE ); virtual void selectAll(); - virtual void updateSelection( QWidget *w ); - virtual void raiseSelection( QWidget *w ); - virtual void repaintSelection( QWidget *w ); + virtual void updateSelection( TQWidget *w ); + virtual void raiseSelection( TQWidget *w ); + virtual void repaintSelection( TQWidget *w ); virtual void clearSelection( bool changePropertyDisplay = TRUE ); virtual void selectWidgets(); - bool isWidgetSelected( QObject *w ); - virtual void updateChildSelections( QWidget *w ); - virtual void raiseChildSelections( QWidget *w ); + bool isWidgetSelected( TQObject *w ); + virtual void updateChildSelections( TQWidget *w ); + virtual void raiseChildSelections( TQWidget *w ); - virtual void emitUpdateProperties( QObject *w ); - virtual void emitShowProperties( QObject *w = 0 ); + virtual void emitUpdateProperties( TQObject *w ); + virtual void emitShowProperties( TQObject *w = 0 ); virtual void emitSelectionChanged(); virtual void setPropertyShowingBlocked( bool b ); bool isPropertyShowingBlocked() const; - virtual QLabel *sizePreview() const; - virtual void checkPreviewGeometry( QRect &r ); + virtual TQLabel *sizePreview() const; + virtual void checkPreviewGeometry( TQRect &r ); - virtual QPtrDict *widgets(); - virtual QWidgetList selectedWidgets() const; + virtual TQPtrDict *widgets(); + virtual TQWidgetList selectedWidgets() const; - virtual QWidget *designerWidget( QObject *o ) const; + virtual TQWidget *designerWidget( TQObject *o ) const; - virtual void handleContextMenu( QContextMenuEvent *e, QWidget *w ); - virtual void handleMousePress( QMouseEvent *e, QWidget *w ); - virtual void handleMouseRelease( QMouseEvent *e, QWidget *w ); - virtual void handleMouseDblClick( QMouseEvent *e, QWidget *w ); - virtual void handleMouseMove( QMouseEvent *e, QWidget *w ); - virtual void handleKeyPress( QKeyEvent *e, QWidget *w ); - virtual void handleKeyRelease( QKeyEvent *e, QWidget *w ); + virtual void handleContextMenu( TQContextMenuEvent *e, TQWidget *w ); + virtual void handleMousePress( TQMouseEvent *e, TQWidget *w ); + virtual void handleMouseRelease( TQMouseEvent *e, TQWidget *w ); + virtual void handleMouseDblClick( TQMouseEvent *e, TQWidget *w ); + virtual void handleMouseMove( TQMouseEvent *e, TQWidget *w ); + virtual void handleKeyPress( TQKeyEvent *e, TQWidget *w ); + virtual void handleKeyRelease( TQKeyEvent *e, TQWidget *w ); virtual void updateUndoInfo(); virtual MainWindow *mainWindow() const { return mainwindow; } bool checkCustomWidgets(); - virtual void insertWidget( QWidget *w, bool checkName = FALSE ); - virtual void removeWidget( QWidget *w ); + virtual void insertWidget( TQWidget *w, bool checkName = FALSE ); + virtual void removeWidget( TQWidget *w ); virtual void deleteWidgets(); virtual void editAdjustSize(); virtual void editConnections(); @@ -151,43 +151,43 @@ public: virtual int numSelectedWidgets() const; virtual int numVisibleWidgets() const; - virtual bool hasInsertedChildren( QWidget *w ) const; + virtual bool hasInsertedChildren( TQWidget *w ) const; - virtual QWidget *currentWidget() const { return propertyWidget && propertyWidget->isWidgetType() ? (QWidget*)propertyWidget : 0; } // ##### - virtual bool unify( QObject *w, QString &s, bool changeIt ); + virtual TQWidget *currentWidget() const { return propertyWidget && propertyWidget->isWidgetType() ? (TQWidget*)propertyWidget : 0; } // ##### + virtual bool unify( TQObject *w, TQString &s, bool changeIt ); virtual bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w ); virtual bool isDatabaseWidgetUsed() const; virtual bool isDatabaseAware() const; - virtual QPoint mapToForm( const QWidget* w, const QPoint& ) const; + virtual TQPoint mapToForm( const TQWidget* w, const TQPoint& ) const; - bool isMainContainer( QObject *w ) const; - bool isCentralWidget( QObject *w ) const; - QWidget *mainContainer() const { return mContainer; } - void setMainContainer( QWidget *w ); + bool isMainContainer( TQObject *w ) const; + bool isCentralWidget( TQObject *w ) const; + TQWidget *mainContainer() const { return mContainer; } + void setMainContainer( TQWidget *w ); - void paintGrid( QWidget *w, QPaintEvent *e ); + void paintGrid( TQWidget *w, TQPaintEvent *e ); bool savePixmapInline() const; - QString pixmapLoaderFunction() const; + TQString pixmapLoaderFunction() const; void setSavePixmapInline( bool b ); - void setPixmapLoaderFunction( const QString &func ); + void setPixmapLoaderFunction( const TQString &func ); bool savePixmapInProject() const; void setSavePixmapInProject( bool b ); void setToolFixed() { toolFixed = TRUE; } - void setActiveObject( QObject *o ); + void setActiveObject( TQObject *o ); - QPtrList &actionList() { return actions; } - QAction *findAction( const QString &name ); + TQPtrList &actionList() { return actions; } + TQAction *findAction( const TQString &name ); void setProject( Project *pro ); Project *project() const; - void killAccels( QObject *top ); + void killAccels( TQObject *top ); DesignerFormWindow *iFace(); @@ -195,10 +195,10 @@ public: int layoutDefaultMargin() const; void setLayoutDefaultSpacing( int s ); void setLayoutDefaultMargin( int s ); - QString spacingFunction() const; - QString marginFunction() const; - void setSpacingFunction( const QString &func ); - void setMarginFunction( const QString &func ); + TQString spacingFunction() const; + TQString marginFunction() const; + void setSpacingFunction( const TQString &func ); + void setMarginFunction( const TQString &func ); bool hasLayoutFunctions() const; void hasLayoutFunctions( bool b ); @@ -207,31 +207,31 @@ public: void setFormFile( FormFile *f ); bool isFake() const { return fake; } - bool canBeBuddy( const QWidget* ) const; + bool canBeBuddy( const TQWidget* ) const; public slots: - virtual void widgetChanged( QObject *w ); + virtual void widgetChanged( TQObject *w ); virtual void currentToolChanged(); virtual void visibilityChanged(); virtual void modificationChanged( bool m ); signals: - void showProperties( QObject *w ); - void updateProperties( QObject *w ); + void showProperties( TQObject *w ); + void updateProperties( TQObject *w ); void undoRedoChanged( bool undoAvailable, bool redoAvailable, - const QString &undoCmd, const QString &redoCmd ); + const TQString &undoCmd, const TQString &redoCmd ); void selectionChanged(); void modificationChanged( bool m, FormWindow *fw ); - void modificationChanged( bool m, const QString &s ); - void fileNameChanged( const QString &s, FormWindow *fw ); + void modificationChanged( bool m, const TQString &s ); + void fileNameChanged( const TQString &s, FormWindow *fw ); protected: - virtual void closeEvent( QCloseEvent *e ); - virtual void focusInEvent( QFocusEvent *e ); - virtual void focusOutEvent( QFocusEvent *e ); - virtual void resizeEvent( QResizeEvent *e ); - void mouseDoubleClickEvent( QMouseEvent *e ) { handleMouseDblClick( e, mainContainer() ); } - virtual bool event( QEvent *e ); + virtual void closeEvent( TQCloseEvent *e ); + virtual void focusInEvent( TQFocusEvent *e ); + virtual void focusOutEvent( TQFocusEvent *e ); + virtual void resizeEvent( TQResizeEvent *e ); + void mouseDoubleClickEvent( TQMouseEvent *e ) { handleMouseDblClick( e, mainContainer() ); } + virtual bool event( TQEvent *e ); private: enum RectType { Insert, Rubber }; @@ -239,30 +239,30 @@ private: void beginUnclippedPainter( bool doNot ); void endUnclippedPainter(); void drawConnectionLine(); - void drawSizePreview( const QPoint &pos, const QString& text ); + void drawSizePreview( const TQPoint &pos, const TQString& text ); void insertWidget(); void moveSelectedWidgets( int dx, int dy ); - void startRectDraw( const QPoint &p, const QPoint &global, QWidget *w, RectType t ); - void continueRectDraw( const QPoint &p, const QPoint &global, QWidget *w, RectType t ); + void startRectDraw( const TQPoint &p, const TQPoint &global, TQWidget *w, RectType t ); + void continueRectDraw( const TQPoint &p, const TQPoint &global, TQWidget *w, RectType t ); void endRectDraw(); - void checkSelectionsForMove( QWidget *w ); - BreakLayoutCommand *breakLayoutCommand( QWidget *w ); + void checkSelectionsForMove( TQWidget *w ); + BreakLayoutCommand *breakLayoutCommand( TQWidget *w ); - bool allowMove( QWidget *w ); + bool allowMove( TQWidget *w ); void saveBackground(); void restoreConnectionLine(); - void restoreRect( const QRect &rect ) ; + void restoreRect( const TQRect &rect ) ; void showOrderIndicators(); void updateOrderIndicators(); void repositionOrderIndicators(); void hideOrderIndicators(); - QWidget *containerAt( const QPoint &pos, QWidget *notParentOf ); + TQWidget *containerAt( const TQPoint &pos, TQWidget *notParentOf ); private slots: void invalidCheckedSelections(); @@ -275,44 +275,44 @@ private: int currTool; bool oldRectValid, widgetPressed, drawRubber, checkedSelectionsForMove; bool validForBuddy; - QRect currRect; - QPoint rectAnchor; - QPainter *unclippedPainter; - QPoint sizePreviewPos; - QPixmap sizePreviewPixmap; + TQRect currRect; + TQPoint rectAnchor; + TQPainter *unclippedPainter; + TQPoint sizePreviewPos; + TQPixmap sizePreviewPixmap; MainWindow *mainwindow; - QPtrList selections; - QPtrDict usedSelections; - QRect widgetGeom, rubber; - QPoint oldPressPos, origPressPos; + TQPtrList selections; + TQPtrDict usedSelections; + TQRect widgetGeom, rubber; + TQPoint oldPressPos, origPressPos; CommandHistory commands; - QMap moving; - QWidget *insertParent; - QObject *propertyWidget; - QLabel *sizePreviewLabel; - QTimer *checkSelectionsTimer; - QPtrDict insertedWidgets; + TQMap moving; + TQWidget *insertParent; + TQObject *propertyWidget; + TQLabel *sizePreviewLabel; + TQTimer *checkSelectionsTimer; + TQPtrDict insertedWidgets; bool propShowBlocked; - QTimer* updatePropertiesTimer, *showPropertiesTimer, *selectionChangedTimer, + TQTimer* updatePropertiesTimer, *showPropertiesTimer, *selectionChangedTimer, *windowsRepaintWorkaroundTimer; - QPoint startPos, currentPos; - QWidget *startWidget, *endWidget; - QPixmap *buffer; - QPtrList orderIndicators; - QWidgetList orderedWidgets; - QWidgetList stackedWidgets; - QWidget *mContainer; + TQPoint startPos, currentPos; + TQWidget *startWidget, *endWidget; + TQPixmap *buffer; + TQPtrList orderIndicators; + TQWidgetList orderedWidgets; + TQWidgetList stackedWidgets; + TQWidget *mContainer; bool pixInline, pixProject; - QString pixLoader; + TQString pixLoader; bool toolFixed; - QPtrList actions; + TQPtrList actions; Project *proj; DesignerFormWindow *iface; - QWidget* targetContainer; - QPalette restorePalette; + TQWidget* targetContainer; + TQPalette restorePalette; bool hadOwnPalette; int defSpacing, defMargin; - QString spacFunction, margFunction; + TQString spacFunction, margFunction; bool hasLayoutFunc; FormFile *ff; bool fake; diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp index 8c204ac3..0b2fc17e 100644 --- a/kdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -46,47 +46,47 @@ #include "kdevdesigner_part.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "../interfaces/languageinterface.h" -#include -#include -#include +#include +#include +#include #include -QListViewItem *newItem = 0; +TQListViewItem *newItem = 0; static QPluginManager *classBrowserInterfaceManager = 0; -HierarchyItem::HierarchyItem( Type type, QListViewItem *parent, QListViewItem *after, - const QString &txt1, const QString &txt2, const QString &txt3 ) - : QListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) +HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after, + const TQString &txt1, const TQString &txt2, const TQString &txt3 ) + : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) { } -HierarchyItem::HierarchyItem( Type type, QListView *parent, QListViewItem *after, - const QString &txt1, const QString &txt2, const QString &txt3 ) - : QListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) +HierarchyItem::HierarchyItem( Type type, TQListView *parent, TQListViewItem *after, + const TQString &txt1, const TQString &txt2, const TQString &txt3 ) + : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) { } -void HierarchyItem::paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align ) +void HierarchyItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ) { - QColorGroup g( cg ); - g.setColor( QColorGroup::Base, backgroundColor() ); - g.setColor( QColorGroup::Foreground, Qt::black ); - g.setColor( QColorGroup::Text, Qt::black ); - QString txt = text( 0 ); + TQColorGroup g( cg ); + g.setColor( TQColorGroup::Base, backgroundColor() ); + g.setColor( TQColorGroup::Foreground, Qt::black ); + g.setColor( TQColorGroup::Text, Qt::black ); + TQString txt = text( 0 ); if ( rtti() == Function && MainWindow::self->currProject()->isCpp() && ( txt == "init()" || txt == "destroy()" ) ) { @@ -95,14 +95,14 @@ void HierarchyItem::paintCell( QPainter *p, const QColorGroup &cg, int column, i setText( 0, txt + " " + "(Constructor)" ); else setText( 0, txt + " " + "(Destructor)" ); - QListViewItem::paintCell( p, g, column, width, align ); + TQListViewItem::paintCell( p, g, column, width, align ); setText( 0, txt ); listView()->setUpdatesEnabled( TRUE ); } else { - QListViewItem::paintCell( p, g, column, width, align ); + TQListViewItem::paintCell( p, g, column, width, align ); } p->save(); - p->setPen( QPen( cg.dark(), 1 ) ); + p->setPen( TQPen( cg.dark(), 1 ) ); if ( column == 0 ) p->drawLine( 0, 0, 0, height() - 1 ); if ( listView()->firstChild() != this ) { @@ -116,7 +116,7 @@ void HierarchyItem::paintCell( QPainter *p, const QColorGroup &cg, int column, i p->restore(); } -QColor HierarchyItem::backgroundColor() +TQColor HierarchyItem::backgroundColor() { updateBackColor(); return backColor; @@ -129,7 +129,7 @@ void HierarchyItem::updateBackColor() return; } - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); --it; if ( it.current() ) { if ( ( ( HierarchyItem*)it.current() )->backColor == *backColor1 ) @@ -141,12 +141,12 @@ void HierarchyItem::updateBackColor() } } -void HierarchyItem::setObject( QObject *o ) +void HierarchyItem::setObject( TQObject *o ) { obj = o; } -QObject *HierarchyItem::object() const +TQObject *HierarchyItem::object() const { return obj; } @@ -155,25 +155,25 @@ void HierarchyItem::okRename( int col ) { if ( newItem == this ) newItem = 0; - QListViewItem::okRename( col ); + TQListViewItem::okRename( col ); } void HierarchyItem::cancelRename( int col ) { if ( newItem == this ) { newItem = 0; - QListViewItem::cancelRename( col ); + TQListViewItem::cancelRename( col ); delete this; return; } - QListViewItem::cancelRename( col ); + TQListViewItem::cancelRename( col ); } -HierarchyList::HierarchyList( QWidget *parent, FormWindow *fw, bool doConnects ) - : QListView( parent ), formWindow( fw ) +HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects ) + : TQListView( parent ), formWindow( fw ) { DesignerFormPix = SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()); DesignerLayoutPix = SmallIcon( "designer_layout.png" , KDevDesignerPartFactory::instance()); @@ -189,64 +189,64 @@ HierarchyList::HierarchyList( QWidget *parent, FormWindow *fw, bool doConnects ) tabWidgetMenu = 0; addColumn( i18n( "Name" ) ); addColumn( i18n( "Class" ) ); - QPalette p( palette() ); - p.setColor( QColorGroup::Base, QColor( *backColor2 ) ); + TQPalette p( palette() ); + p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), SIGNAL( sectionClicked( int ) ), - this, SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), + this, TQT_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, SIGNAL( clicked( QListViewItem * ) ), - this, SLOT( objectClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( doubleClicked( QListViewItem * ) ), - this, SLOT( objectDoubleClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( returnPressed( QListViewItem * ) ), - this, SLOT( objectClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint&, int ) ), - this, SLOT( showRMBMenu( QListViewItem *, const QPoint & ) ) ); + connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), + this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQT_SLOT( objectDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQT_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } deselect = TRUE; setColumnWidthMode( 1, Manual ); } -void HierarchyList::keyPressEvent( QKeyEvent *e ) +void HierarchyList::keyPressEvent( TQKeyEvent *e ) { if ( e->key() == Key_Shift || e->key() == Key_Control ) deselect = FALSE; else deselect = TRUE; - QListView::keyPressEvent( e ); + TQListView::keyPressEvent( e ); } -void HierarchyList::keyReleaseEvent( QKeyEvent *e ) +void HierarchyList::keyReleaseEvent( TQKeyEvent *e ) { deselect = TRUE; - QListView::keyReleaseEvent( e ); + TQListView::keyReleaseEvent( e ); } -void HierarchyList::viewportMousePressEvent( QMouseEvent *e ) +void HierarchyList::viewportMousePressEvent( TQMouseEvent *e ) { if ( e->state() & ShiftButton || e->state() & ControlButton ) deselect = FALSE; else deselect = TRUE; - QListView::viewportMousePressEvent( e ); + TQListView::viewportMousePressEvent( e ); } -void HierarchyList::viewportMouseReleaseEvent( QMouseEvent *e ) +void HierarchyList::viewportMouseReleaseEvent( TQMouseEvent *e ) { - QListView::viewportMouseReleaseEvent( e ); + TQListView::viewportMouseReleaseEvent( e ); } -QObject *HierarchyList::handleObjectClick( QListViewItem *i ) +TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) { if ( !i ) return 0; - QObject *o = findObject( i ); + TQObject *o = findObject( i ); if ( !o ) return 0; if ( formWindow == o ) { @@ -256,33 +256,33 @@ QObject *HierarchyList::handleObjectClick( QListViewItem *i ) return 0; } if ( o->isWidgetType() ) { - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; if ( !formWindow->widgets()->find( w ) ) { - if ( ::qt_cast(w->parent()) ) { - if (::qt_cast(w->parent()->parent()) ) { - ((QTabWidget*)w->parent()->parent())->showPage( w ); - o = (QWidget*)w->parent()->parent(); + if ( ::qt_cast(w->parent()) ) { + if (::qt_cast(w->parent()->parent()) ) { + ((TQTabWidget*)w->parent()->parent())->showPage( w ); + o = (TQWidget*)w->parent()->parent(); formWindow->emitUpdateProperties( formWindow->currentWidget() ); - } else if ( ::qt_cast(w->parent()->parent()) ) { + } else if ( ::qt_cast(w->parent()->parent()) ) { ((QDesignerWizard*)w->parent()->parent())-> setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); - o = (QWidget*)w->parent()->parent(); + o = (TQWidget*)w->parent()->parent(); formWindow->emitUpdateProperties( formWindow->currentWidget() ); } else { - ( (QWidgetStack*)w->parent() )->raiseWidget( w ); - if ( (QWidgetStack*)w->parent()->isA( "QDesignerWidgetStack" ) ) + ( (TQWidgetStack*)w->parent() )->raiseWidget( w ); + if ( (TQWidgetStack*)w->parent()->isA( "QDesignerWidgetStack" ) ) ( (QDesignerWidgetStack*)w->parent() )->updateButtons(); } - } else if ( ::qt_cast(w) || ::qt_cast(w) ) { + } else if ( ::qt_cast(w) || ::qt_cast(w) ) { formWindow->setActiveObject( w ); - } else if ( ::qt_cast(w) ) { + } else if ( ::qt_cast(w) ) { return 0; // ### we could try to find our menu bar and change the currentMenu to our index } else { return 0; } } - } else if ( ::qt_cast(o) ) { - MainWindow::self->actioneditor()->setCurrentAction( (QAction*)o ); + } else if ( ::qt_cast(o) ) { + MainWindow::self->actioneditor()->setCurrentAction( (TQAction*)o ); deselect = TRUE; } @@ -293,13 +293,13 @@ QObject *HierarchyList::handleObjectClick( QListViewItem *i ) } -void HierarchyList::objectDoubleClicked( QListViewItem *i ) +void HierarchyList::objectDoubleClicked( TQListViewItem *i ) { - QObject *o = handleObjectClick( i ); + TQObject *o = handleObjectClick( i ); if ( !o ) return; - if ( o->isWidgetType() && ( (QWidget*)o )->isVisibleTo( formWindow ) ) { - QWidget *w = (QWidget*)o; + if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) { + TQWidget *w = (TQWidget*)o; if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) w->raise(); @@ -307,25 +307,25 @@ void HierarchyList::objectDoubleClicked( QListViewItem *i ) } } -void HierarchyList::objectClicked( QListViewItem *i ) +void HierarchyList::objectClicked( TQListViewItem *i ) { - QObject *o = handleObjectClick( i ); + TQObject *o = handleObjectClick( i ); if ( !o ) return; - if ( o->isWidgetType() && ( (QWidget*)o )->isVisibleTo( formWindow ) ) { - QWidget *w = (QWidget*)o; + if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) { + TQWidget *w = (TQWidget*)o; formWindow->selectWidget( w, TRUE ); } } -QObject *HierarchyList::findObject( QListViewItem *i ) +TQObject *HierarchyList::findObject( TQListViewItem *i ) { return ( (HierarchyItem*)i )->object(); } -QListViewItem *HierarchyList::findItem( QObject *o ) +TQListViewItem *HierarchyList::findItem( TQObject *o ) { - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); while ( it.current() ) { if ( ( (HierarchyItem*)it.current() )->object() == o ) return it.current(); @@ -334,42 +334,42 @@ QListViewItem *HierarchyList::findItem( QObject *o ) return 0; } -QObject *HierarchyList::current() const +TQObject *HierarchyList::current() const { if ( currentItem() ) return ( (HierarchyItem*)currentItem() )->object(); return 0; } -void HierarchyList::changeNameOf( QObject *o, const QString &name ) +void HierarchyList::changeNameOf( TQObject *o, const TQString &name ) { - QListViewItem *item = findItem( o ); + TQListViewItem *item = findItem( o ); if ( !item ) return; item->setText( 0, name ); } -void HierarchyList::changeDatabaseOf( QObject *o, const QString &info ) +void HierarchyList::changeDatabaseOf( TQObject *o, const TQString &info ) { #ifndef QT_NO_SQL if ( !formWindow->isDatabaseAware() ) return; - QListViewItem *item = findItem( o ); + TQListViewItem *item = findItem( o ); if ( !item ) return; item->setText( 2, info ); #endif } -static QPtrList *widgetStacks = 0; +static TQPtrList *widgetStacks = 0; void HierarchyList::setup() { if ( !formWindow || formWindow->isFake() ) return; clear(); - QWidget *w = formWindow->mainContainer(); + TQWidget *w = formWindow->mainContainer(); #ifndef QT_NO_SQL if ( formWindow->isDatabaseAware() ) { if ( columns() == 2 ) { @@ -386,33 +386,33 @@ void HierarchyList::setup() } #endif if ( !widgetStacks ) - widgetStacks = new QPtrList; + widgetStacks = new TQPtrList; if ( w ) insertObject( w, 0 ); widgetStacks->clear(); } -void HierarchyList::setOpen( QListViewItem *i, bool b ) +void HierarchyList::setOpen( TQListViewItem *i, bool b ) { - QListView::setOpen( i, b ); + TQListView::setOpen( i, b ); } -void HierarchyList::insertObject( QObject *o, QListViewItem *parent ) +void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) { - if ( QString( o->name() ).startsWith( "qt_dead_widget_" ) ) + if ( TQString( o->name() ).startsWith( "qt_dead_widget_" ) ) return; bool fakeMainWindow = FALSE; - if ( ::qt_cast(o) ) { - QObject *cw = ( (QMainWindow*)o )->centralWidget(); + if ( ::qt_cast(o) ) { + TQObject *cw = ( (TQMainWindow*)o )->centralWidget(); if ( cw ) { o = cw; fakeMainWindow = TRUE; } } - QListViewItem *item = 0; - QString className = WidgetFactory::classNameOf( o ); + TQListViewItem *item = 0; + TQString className = WidgetFactory::classNameOf( o ); if ( ::qt_cast(o) ) { - switch ( WidgetFactory::layoutType( (QWidget*)o ) ) { + switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) { case WidgetFactory::HBox: className = "HBox"; break; @@ -427,27 +427,27 @@ void HierarchyList::insertObject( QObject *o, QListViewItem *parent ) } } - QString dbInfo; + TQString dbInfo; #ifndef QT_NO_SQL dbInfo = MetaDataBase::fakeProperty( o, "database" ).toStringList().join("."); #endif - QString name = o->name(); - if ( ::qt_cast(o->parent()) ) { - if ( ::qt_cast(o->parent()->parent()) ) - name = ( (QTabWidget*)o->parent()->parent() )->tabLabel( (QWidget*)o ); - else if ( ::qt_cast(o->parent()->parent()) ) - name = ( (QWizard*)o->parent()->parent() )->title( (QWidget*)o ); + TQString name = o->name(); + if ( ::qt_cast(o->parent()) ) { + if ( ::qt_cast(o->parent()->parent()) ) + name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); + else if ( ::qt_cast(o->parent()->parent()) ) + name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o ); } - QToolBox *tb; + TQToolBox *tb; if ( o->parent() && o->parent()->parent() && - (tb = ::qt_cast(o->parent()->parent()->parent())) ) - name = tb->itemLabel( tb->indexOf((QWidget*)o) ); + (tb = ::qt_cast(o->parent()->parent()->parent())) ) + name = tb->itemLabel( tb->indexOf((TQWidget*)o) ); if ( fakeMainWindow ) { name = o->parent()->name(); - className = "QMainWindow"; + className = "TQMainWindow"; } if ( !parent ) @@ -462,53 +462,53 @@ void HierarchyList::insertObject( QObject *o, QListViewItem *parent ) else item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ). - pixmap( QIconSet::Small, QIconSet::Normal ) ); - if ( ::qt_cast(o) ) - item->setPixmap( 0, ( (QAction*)o )->iconSet().pixmap() ); + pixmap( TQIconSet::Small, TQIconSet::Normal ) ); + if ( ::qt_cast(o) ) + item->setPixmap( 0, ( (TQAction*)o )->iconSet().pixmap() ); ( (HierarchyItem*)item )->setObject( o ); - const QObjectList *l = o->children(); + const TQObjectList *l = o->children(); if ( ::qt_cast(o) ) l = 0; if ( l ) { - QObjectListIt it( *l ); + TQObjectListIt it( *l ); it.toLast(); for ( ; it.current(); --it ) { if ( !it.current()->isWidgetType() || - ( (QWidget*)it.current() )->isHidden() ) + ( (TQWidget*)it.current() )->isHidden() ) continue; - if ( !formWindow->widgets()->find( (QWidget*)it.current() ) ) { - if ( ::qt_cast(it.current()->parent()) || - ::qt_cast(it.current()) ) { - QObject *obj = it.current(); + if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { + if ( ::qt_cast(it.current()->parent()) || + ::qt_cast(it.current()) ) { + TQObject *obj = it.current(); QDesignerTabWidget *tw = ::qt_cast(it.current()->parent()); QDesignerWizard *dw = ::qt_cast(it.current()->parent()); - QWidgetStack *stack = 0; - if ( dw || tw || ::qt_cast(obj) ) - stack = (QWidgetStack*)obj; + TQWidgetStack *stack = 0; + if ( dw || tw || ::qt_cast(obj) ) + stack = (TQWidgetStack*)obj; else - stack = (QWidgetStack*)obj->parent(); + stack = (TQWidgetStack*)obj->parent(); if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); - QObjectList *l2 = stack->queryList( "QWidget", 0, TRUE, FALSE ); + TQObjectList *l2 = stack->queryList( "TQWidget", 0, TRUE, FALSE ); for ( obj = l2->last(); obj; obj = l2->prev() ) { if ( qstrcmp( obj->className(), "QWidgetStackPrivate::Invisible" ) == 0 || - ( tw && !tw->tabBar()->tab( stack->id( (QWidget*)obj ) ) ) || - ( dw && dw->isPageRemoved( (QWidget*)obj ) ) ) + ( tw && !tw->tabBar()->tab( stack->id( (TQWidget*)obj ) ) ) || + ( dw && dw->isPageRemoved( (TQWidget*)obj ) ) ) continue; if ( qstrcmp( obj->name(), "designer_wizardstack_button" ) == 0 ) continue; - if ( stack->id( (QWidget*)obj ) == -1 ) + if ( stack->id( (TQWidget*)obj ) == -1 ) continue; insertObject( obj, item ); } delete l2; - } else if ( ::qt_cast(it.current()->parent()) ) { - if ( !::qt_cast(it.current()) ) + } else if ( ::qt_cast(it.current()->parent()) ) { + if ( !::qt_cast(it.current()) ) continue; - QToolBox *tb = (QToolBox*)it.current()->parent(); + TQToolBox *tb = (TQToolBox*)it.current()->parent(); for ( int i = tb->count() - 1; i >= 0; --i ) insertObject( tb->item( i ), item ); } @@ -519,8 +519,8 @@ void HierarchyList::insertObject( QObject *o, QListViewItem *parent ) } if ( fakeMainWindow ) { - QObjectList *l = o->parent()->queryList( "QDesignerToolBar" ); - QObject *obj; + TQObjectList *l = o->parent()->queryList( "QDesignerToolBar" ); + TQObject *obj; for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); delete l; @@ -529,16 +529,16 @@ void HierarchyList::insertObject( QObject *o, QListViewItem *parent ) insertObject( obj, item ); delete l; } else if ( ::qt_cast(o) || ::qt_cast(o) ) { - QPtrList actions; + TQPtrList actions; if ( ::qt_cast(o) ) actions = ( (QDesignerToolBar*)o )->insertedActions(); else ( (PopupMenuEditor*)o )->insertedActions( actions ); - QPtrListIterator it( actions ); + TQPtrListIterator it( actions ); it.toLast(); while ( it.current() ) { - QAction *a = it.current(); + TQAction *a = it.current(); if ( ::qt_cast(a) ) { QDesignerAction *da = (QDesignerAction*)a; if ( da->supportsMenu() ) @@ -551,8 +551,8 @@ void HierarchyList::insertObject( QObject *o, QListViewItem *parent ) --it; } } else if ( ::qt_cast(o) && o->children() ) { - QObjectList *l = (QObjectList*)o->children(); - for ( QObject *obj = l->last(); obj; obj = l->prev() ) { + TQObjectList *l = (TQObjectList*)o->children(); + for ( TQObject *obj = l->last(); obj; obj = l->prev() ) { if ( ::qt_cast(obj) ) { QDesignerAction *da = (QDesignerAction*)obj; if ( da->supportsMenu() ) @@ -574,9 +574,9 @@ void HierarchyList::insertObject( QObject *o, QListViewItem *parent ) } } -void HierarchyList::setCurrent( QObject *o ) +void HierarchyList::setCurrent( TQObject *o ) { - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); while ( it.current() ) { if ( ( (HierarchyItem*)it.current() )->object() == o ) { blockSignals( TRUE ); @@ -589,22 +589,22 @@ void HierarchyList::setCurrent( QObject *o ) } } -void HierarchyList::showRMBMenu( QListViewItem *i, const QPoint & p ) +void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) { if ( !i ) return; - QObject *o = findObject( i ); + TQObject *o = findObject( i ); if ( !o ) return; if ( !o->isWidgetType() || - ( o != formWindow && !formWindow->widgets()->find( (QWidget*)o ) ) ) + ( o != formWindow && !formWindow->widgets()->find( (TQWidget*)o ) ) ) return; - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; if ( w->isVisibleTo( formWindow ) ) { - if ( !::qt_cast(w) && !::qt_cast(w) ) { + if ( !::qt_cast(w) && !::qt_cast(w) ) { if ( !normalMenu ) normalMenu = formWindow->mainWindow()->setupNormalHierarchyMenu( this ); normalMenu->popup( p ); @@ -612,8 +612,8 @@ void HierarchyList::showRMBMenu( QListViewItem *i, const QPoint & p ) if ( !tabWidgetMenu ) tabWidgetMenu = formWindow->mainWindow()->setupTabWidgetHierarchyMenu( - this, SLOT( addTabPage() ), - SLOT( removeTabPage() ) ); + this, TQT_SLOT( addTabPage() ), + TQT_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } @@ -621,19 +621,19 @@ void HierarchyList::showRMBMenu( QListViewItem *i, const QPoint & p ) void HierarchyList::addTabPage() { - QObject *o = current(); + TQObject *o = current(); if ( !o || !o->isWidgetType() ) return; - QWidget *w = (QWidget*)o; - if ( ::qt_cast(w) ) { - QTabWidget *tw = (QTabWidget*)w; + TQWidget *w = (TQWidget*)o; + if ( ::qt_cast(w) ) { + TQTabWidget *tw = (TQTabWidget*)w; AddTabPageCommand *cmd = new AddTabPageCommand( i18n( "Add Page to %1" ). arg( tw->name() ), formWindow, tw, "Tab" ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - } else if ( ::qt_cast(w) ) { - QWizard *wiz = (QWizard*)formWindow->mainContainer(); + } else if ( ::qt_cast(w) ) { + TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ). arg( wiz->name() ), formWindow, wiz, "Page" ); @@ -644,12 +644,12 @@ void HierarchyList::addTabPage() void HierarchyList::removeTabPage() { - QObject *o = current(); + TQObject *o = current(); if ( !o || !o->isWidgetType() ) return; - QWidget *w = (QWidget*)o; - if ( ::qt_cast(w) ) { - QTabWidget *tw = (QTabWidget*)w; + TQWidget *w = (TQWidget*)o; + if ( ::qt_cast(w) ) { + TQTabWidget *tw = (TQTabWidget*)w; if ( tw->currentPage() ) { QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = @@ -659,8 +659,8 @@ void HierarchyList::removeTabPage() formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } - } else if ( ::qt_cast(w) ) { - QWizard *wiz = (QWizard*)formWindow->mainContainer(); + } else if ( ::qt_cast(w) ) { + TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); if ( wiz->currentPage() ) { QDesignerWizard *dw = (QDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = @@ -676,13 +676,13 @@ void HierarchyList::removeTabPage() // ------------------------------------------------------------ -FormDefinitionView::FormDefinitionView( QWidget *parent, FormWindow *fw ) +FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw ) : HierarchyList( parent, fw, TRUE ) { header()->hide(); removeColumn( 1 ); - connect( this, SIGNAL( itemRenamed( QListViewItem *, int, const QString & ) ), - this, SLOT( renamed( QListViewItem * ) ) ); + connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQT_SLOT( renamed( TQListViewItem * ) ) ); popupOpen = FALSE; } @@ -692,10 +692,10 @@ void FormDefinitionView::setup() return; if ( !formWindow->project()->isCpp() ) return; - QListViewItem *i = firstChild(); + TQListViewItem *i = firstChild(); while ( i ) { if ( i->rtti() == HierarchyItem::DefinitionParent ) { - QListViewItem *a = i; + TQListViewItem *a = i; i = i->nextSibling(); delete a; continue; @@ -705,18 +705,18 @@ void FormDefinitionView::setup() LanguageInterface *lIface = MetaDataBase::languageInterface( formWindow->project()->language() ); if ( lIface ) { - QStringList defs = lIface->definitions(); - for ( QStringList::Iterator dit = defs.begin(); dit != defs.end(); ++dit ) { + TQStringList defs = lIface->definitions(); + for ( TQStringList::Iterator dit = defs.begin(); dit != defs.end(); ++dit ) { HierarchyItem *itemDef = new HierarchyItem( HierarchyItem::DefinitionParent, this, 0, - i18n( *dit ), QString::null, QString::null ); + i18n( *dit ), TQString::null, TQString::null ); itemDef->setPixmap( 0, DesignerFolderPix ); itemDef->setOpen( TRUE ); - QStringList entries = + TQStringList entries = lIface->definitionEntries( *dit, formWindow->mainWindow()->designerInterface() ); HierarchyItem *item = 0; - for ( QStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit ) { + for ( TQStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit ) { item = new HierarchyItem( HierarchyItem::Definition, - itemDef, item, *eit, QString::null, QString::null ); + itemDef, item, *eit, TQString::null, TQString::null ); item->setRenameEnabled( 0, TRUE ); } } @@ -730,10 +730,10 @@ void FormDefinitionView::setupVariables() { bool pubOpen, protOpen, privOpen; pubOpen = protOpen = privOpen = TRUE; - QListViewItem *i = firstChild(); + TQListViewItem *i = firstChild(); while ( i ) { if ( i->rtti() == HierarchyItem::VarParent ) { - QListViewItem *a = i; + TQListViewItem *a = i; i = i->firstChild(); while ( i ) { if ( i->rtti() == HierarchyItem::VarPublic ) @@ -751,31 +751,31 @@ void FormDefinitionView::setupVariables() } HierarchyItem *itemVar = new HierarchyItem( HierarchyItem::VarParent, this, 0, i18n( "Class Variables" ), - QString::null, QString::null ); + TQString::null, TQString::null ); itemVar->setPixmap( 0, DesignerFolderPix ); itemVar->setOpen( TRUE ); itemVarPriv = new HierarchyItem( HierarchyItem::VarPrivate, itemVar, 0, i18n( "private" ), - QString::null, QString::null ); + TQString::null, TQString::null ); itemVarProt = new HierarchyItem( HierarchyItem::VarProtected, itemVar, 0, i18n( "protected" ), - QString::null, QString::null ); + TQString::null, TQString::null ); itemVarPubl = new HierarchyItem( HierarchyItem::VarPublic, itemVar, 0, i18n( "public" ), - QString::null, QString::null ); + TQString::null, TQString::null ); - QValueList varList = MetaDataBase::variables( formWindow ); - QValueList::Iterator it = --( varList.end() ); + TQValueList varList = MetaDataBase::variables( formWindow ); + TQValueList::Iterator it = --( varList.end() ); if ( !varList.isEmpty() && itemVar ) { for (;;) { - QListViewItem *item = 0; + TQListViewItem *item = 0; if ( (*it).varAccess == "public" ) item = new HierarchyItem( HierarchyItem::Variable, itemVarPubl, 0, (*it).varName, - QString::null, QString::null ); + TQString::null, TQString::null ); else if ( (*it).varAccess == "private" ) item = new HierarchyItem( HierarchyItem::Variable, itemVarPriv, 0, (*it).varName, - QString::null, QString::null ); + TQString::null, TQString::null ); else // default is protected item = new HierarchyItem( HierarchyItem::Variable, itemVarProt, 0, (*it).varName, - QString::null, QString::null ); + TQString::null, TQString::null ); item->setPixmap( 0, DesignerEditSlotsPix ); if ( it == varList.begin() ) break; @@ -795,11 +795,11 @@ void FormDefinitionView::refresh() bool fuPub, fuProt, fuPriv, slPub, slProt, slPriv; fuPub = fuProt = fuPriv = slPub = slProt = slPriv = TRUE; - QListViewItem *i = firstChild(); + TQListViewItem *i = firstChild(); while ( i ) { if ( i->rtti() == HierarchyItem::SlotParent || i->rtti() == HierarchyItem::FunctParent ) { - QListViewItem *a = i; + TQListViewItem *a = i; i = i->firstChild(); while ( i ) { switch( i->rtti() ) { @@ -832,51 +832,51 @@ void FormDefinitionView::refresh() itemFunct = new HierarchyItem( HierarchyItem::FunctParent, - this, 0, i18n( "Functions" ), QString::null, QString::null ); + this, 0, i18n( "Functions" ), TQString::null, TQString::null ); itemFunct->moveItem( i ); itemFunct->setPixmap( 0, DesignerFolderPix ); itemFunctPriv = new HierarchyItem( HierarchyItem::FunctPrivate, itemFunct, 0, - i18n( "private" ), QString::null, QString::null ); + i18n( "private" ), TQString::null, TQString::null ); itemFunctProt = new HierarchyItem( HierarchyItem::FunctProtected, itemFunct, 0, - i18n( "protected" ), QString::null, QString::null ); + i18n( "protected" ), TQString::null, TQString::null ); itemFunctPubl = new HierarchyItem( HierarchyItem::FunctPublic, itemFunct, 0, - i18n( "public" ), QString::null, QString::null ); + i18n( "public" ), TQString::null, TQString::null ); itemSlots = new HierarchyItem( HierarchyItem::SlotParent, - this, 0, i18n( "Slots" ), QString::null, QString::null ); + this, 0, i18n( "Slots" ), TQString::null, TQString::null ); itemSlots->setPixmap( 0, DesignerFolderPix ); itemPrivate = new HierarchyItem( HierarchyItem::SlotPrivate, itemSlots, 0, i18n( "private" ), - QString::null, QString::null ); + TQString::null, TQString::null ); itemProtected = new HierarchyItem( HierarchyItem::SlotProtected, itemSlots, 0, i18n( "protected" ), - QString::null, QString::null ); + TQString::null, TQString::null ); itemPublic = new HierarchyItem( HierarchyItem::SlotPublic, itemSlots, 0, i18n( "public" ), - QString::null, QString::null ); + TQString::null, TQString::null ); - QValueList functionList = MetaDataBase::functionList( formWindow ); - QValueList::Iterator it = --( functionList.end() ); + TQValueList functionList = MetaDataBase::functionList( formWindow ); + TQValueList::Iterator it = --( functionList.end() ); if ( !functionList.isEmpty() && itemFunct ) { for (;;) { - QListViewItem *item = 0; + TQListViewItem *item = 0; if ( (*it).type == "slot" ) { if ( (*it).access == "protected" ) item = new HierarchyItem( HierarchyItem::Slot, itemProtected, 0, (*it).function, - QString::null, QString::null ); + TQString::null, TQString::null ); else if ( (*it).access == "private" ) item = new HierarchyItem( HierarchyItem::Slot, itemPrivate, 0, (*it).function, - QString::null, QString::null ); + TQString::null, TQString::null ); else // default is public item = new HierarchyItem( HierarchyItem::Slot, itemPublic, 0, (*it).function, - QString::null, QString::null ); + TQString::null, TQString::null ); } else { if ( (*it).access == "protected" ) item = new HierarchyItem( HierarchyItem::Function, itemFunctProt, 0, (*it).function, - QString::null, QString::null ); + TQString::null, TQString::null ); else if ( (*it).access == "private" ) item = new HierarchyItem( HierarchyItem::Function, itemFunctPriv, 0, (*it).function, - QString::null, QString::null ); + TQString::null, TQString::null ); else // default is public item = new HierarchyItem( HierarchyItem::Function, itemFunctPubl, 0, (*it).function, - QString::null, QString::null ); + TQString::null, TQString::null ); } item->setPixmap( 0, DesignerEditSlotsPix ); if ( it == functionList.begin() ) @@ -897,11 +897,11 @@ void FormDefinitionView::refresh() } -void FormDefinitionView::setCurrent( QWidget * ) +void FormDefinitionView::setCurrent( TQWidget * ) { } -void FormDefinitionView::objectClicked( QListViewItem *i ) +void FormDefinitionView::objectClicked( TQListViewItem *i ) { if ( !i ) return; @@ -947,13 +947,13 @@ static HierarchyItem::Type getChildType( int type ) return (HierarchyItem::Type)type; } -void HierarchyList::insertEntry( QListViewItem *i, const QPixmap &pix, const QString &s ) +void HierarchyList::insertEntry( TQListViewItem *i, const TQPixmap &pix, const TQString &s ) { - QListViewItem *after = i->firstChild(); + TQListViewItem *after = i->firstChild(); while ( after && after->nextSibling() ) after = after->nextSibling(); HierarchyItem *item = new HierarchyItem( getChildType( i->rtti() ), i, after, s, - QString::null, QString::null ); + TQString::null, TQString::null ); if ( !pix.isNull() ) item->setPixmap( 0, pix ); item->setRenameEnabled( 0, TRUE ); @@ -964,9 +964,9 @@ void HierarchyList::insertEntry( QListViewItem *i, const QPixmap &pix, const QSt item->startRename( 0 ); } -void FormDefinitionView::contentsMouseDoubleClickEvent( QMouseEvent *e ) +void FormDefinitionView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { - QListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); + TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); if ( !i ) return; @@ -1002,7 +1002,7 @@ void FormDefinitionView::contentsMouseDoubleClickEvent( QMouseEvent *e ) case HierarchyItem::VarProtected: case HierarchyItem::VarPrivate: { VariableDialog varDia( formWindow, this ); - QListViewItem *i = selectedItem(); + TQListViewItem *i = selectedItem(); if ( i ) varDia.setCurrentItem( i->text( 0 ) ); varDia.exec(); @@ -1014,7 +1014,7 @@ void FormDefinitionView::contentsMouseDoubleClickEvent( QMouseEvent *e ) insertEntry( i ); } -void FormDefinitionView::execFunctionDialog( const QString &access, const QString &type, bool addFunc ) +void FormDefinitionView::execFunctionDialog( const TQString &access, const TQString &type, bool addFunc ) { FormFile *formFile = formWindow->formFile(); if ( !formFile || !formFile->isUihFileUpToDate() ) @@ -1031,7 +1031,7 @@ void FormDefinitionView::execFunctionDialog( const QString &access, const QStrin dlg.exec(); } -void FormDefinitionView::showRMBMenu( QListViewItem *i, const QPoint &pos ) +void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) { if ( !i ) return; @@ -1042,7 +1042,7 @@ void FormDefinitionView::showRMBMenu( QListViewItem *i, const QPoint &pos ) const int PROPS = 4; const int GOIMPL = 5; - QPopupMenu menu; + TQPopupMenu menu; bool insertDelete = FALSE; if ( i->rtti() == HierarchyItem::FunctParent || i->rtti() == HierarchyItem::SlotParent || @@ -1087,10 +1087,10 @@ void FormDefinitionView::showRMBMenu( QListViewItem *i, const QPoint &pos ) case HierarchyItem::VarPrivate: case HierarchyItem::Variable: { VariableDialog varDia( formWindow, this ); - QListViewItem *i = selectedItem(); + TQListViewItem *i = selectedItem(); if ( i ) varDia.setCurrentItem( i->text( 0 ) ); - if ( varDia.exec() == QDialog::Accepted ) + if ( varDia.exec() == TQDialog::Accepted ) formWindow->commandHistory()->setModified( TRUE ); break; } @@ -1103,7 +1103,7 @@ void FormDefinitionView::showRMBMenu( QListViewItem *i, const QPoint &pos ) i = i->parent(); ListEditor dia( this, 0, TRUE ); dia.setCaption( i18n( "Edit %1" ).arg( i->text( 0 ) ) ); - QStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() ); + TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() ); dia.setList( entries ); dia.exec(); Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( i->text( 0 )), formWindow, @@ -1140,10 +1140,10 @@ void FormDefinitionView::showRMBMenu( QListViewItem *i, const QPoint &pos ) } else if ( res == DEL ) { if ( i->rtti() == HierarchyItem::Slot || i->rtti() == HierarchyItem::Function ) { - QCString funct( MetaDataBase::normalizeFunction( i->text( 0 ) ).latin1() ); + TQCString funct( MetaDataBase::normalizeFunction( i->text( 0 ) ).latin1() ); Command *cmd = new RemoveFunctionCommand( i18n( "Remove Function" ), formWindow, funct, - QString::null, QString::null, QString::null, - QString::null, formWindow->project()->language() ); + TQString::null, TQString::null, TQString::null, + TQString::null, formWindow->project()->language() ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); formWindow->mainWindow()->objectHierarchy()->updateFormDefinitionView(); @@ -1153,7 +1153,7 @@ void FormDefinitionView::showRMBMenu( QListViewItem *i, const QPoint &pos ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } else { - QListViewItem *p = i->parent(); + TQListViewItem *p = i->parent(); delete i; save( p, 0 ); } @@ -1174,7 +1174,7 @@ void FormDefinitionView::showRMBMenu( QListViewItem *i, const QPoint &pos ) } } -void FormDefinitionView::renamed( QListViewItem *i ) +void FormDefinitionView::renamed( TQListViewItem *i ) { if ( newItem == i ) newItem = 0; @@ -1184,7 +1184,7 @@ void FormDefinitionView::renamed( QListViewItem *i ) } -void FormDefinitionView::save( QListViewItem *p, QListViewItem *i ) +void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i ) { if ( i && i->text( 0 ).isEmpty() ) { delete i; @@ -1193,12 +1193,12 @@ void FormDefinitionView::save( QListViewItem *p, QListViewItem *i ) if ( i && i->rtti() == HierarchyItem::Variable ) { i->setRenameEnabled( 0, FALSE ); - QString varName = i->text( 0 ); + TQString varName = i->text( 0 ); varName = varName.simplifyWhiteSpace(); if ( varName[(int)varName.length() - 1] != ';' ) varName += ";"; if ( MetaDataBase::hasVariable( formWindow, varName ) ) { - QMessageBox::information( this, i18n( "Edit Variables" ), + TQMessageBox::information( this, i18n( "Edit Variables" ), i18n( "This variable has already been declared." ) ); } else { if ( p->rtti() == HierarchyItem::VarPublic ) @@ -1212,7 +1212,7 @@ void FormDefinitionView::save( QListViewItem *p, QListViewItem *i ) LanguageInterface *lIface = MetaDataBase::languageInterface( formWindow->project()->language() ); if ( !lIface ) return; - QStringList lst; + TQStringList lst; i = p->firstChild(); while ( i ) { lst << i->text( 0 ); @@ -1225,7 +1225,7 @@ void FormDefinitionView::save( QListViewItem *p, QListViewItem *i ) } } -void FormDefinitionView::addVariable( const QString &varName, const QString &access ) +void FormDefinitionView::addVariable( const TQString &varName, const TQString &access ) { Command *cmd = new AddVariableCommand( i18n( "Add Variable" ), formWindow, varName, access ); @@ -1235,8 +1235,8 @@ void FormDefinitionView::addVariable( const QString &varName, const QString &acc // ------------------------------------------------------------ -HierarchyView::HierarchyView( QWidget *parent ) - : QTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | +HierarchyView::HierarchyView( TQWidget *parent ) + : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_Tool |WStyle_MinMax | WStyle_SysMenu ) { formwindow = 0; @@ -1255,20 +1255,20 @@ HierarchyView::HierarchyView( QWidget *parent ) if ( !classBrowserInterfaceManager ) { classBrowserInterfaceManager = - new QPluginManager( IID_ClassBrowser, QApplication::libraryPaths(), + new QPluginManager( IID_ClassBrowser, TQApplication::libraryPaths(), MainWindow::self->pluginDirectory() ); } - classBrowsers = new QMap(); - QStringList langs = MetaDataBase::languages(); - for ( QStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { + classBrowsers = new TQMap(); + TQStringList langs = MetaDataBase::languages(); + for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { QInterfacePtr ciface = 0; classBrowserInterfaceManager->queryInterface( *it, &ciface ); if ( ciface ) { ClassBrowser cb( ciface->createClassBrowser( this ), ciface ); addTab( cb.lv, i18n( "Class Declarations" ) ); setTabToolTip( cb.lv, i18n( "List of all classes and its declarations of the current source file" ) ); - ciface->onClick( this, SLOT( jumpTo( const QString &, const QString &, int ) ) ); + ciface->onClick( this, TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); classBrowsers->insert( *it, cb ); setTabEnabled( cb.lv, FALSE ); } @@ -1283,13 +1283,13 @@ void HierarchyView::clear() { listview->clear(); fView->clear(); - for ( QMap::Iterator it = classBrowsers->begin(); + for ( TQMap::Iterator it = classBrowsers->begin(); it != classBrowsers->end(); ++it ) { (*it).iface->clear(); } } -void HierarchyView::setFormWindow( FormWindow *fw, QObject *o ) +void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o ) { bool fake = fw && qstrcmp( fw->name(), "qt_fakewindow" ) == 0; if ( fw == 0 || o == 0 ) { @@ -1307,7 +1307,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, QObject *o ) if ( fw == formwindow ) { if ( fw ) { if ( !fake ) - listview->setCurrent( (QWidget*)o ); + listview->setCurrent( (TQWidget*)o ); else listview->clear(); if ( MainWindow::self->qWorkspace()->activeWindow() == fw ) @@ -1330,11 +1330,11 @@ void HierarchyView::setFormWindow( FormWindow *fw, QObject *o ) fView->setFormWindow( fw ); if ( !fake ) { listview->setup(); - listview->setCurrent( (QWidget*)o ); + listview->setCurrent( (TQWidget*)o ); } fView->setup(); - for ( QMap::Iterator it = classBrowsers->begin(); + for ( TQMap::Iterator it = classBrowsers->begin(); it != classBrowsers->end(); ++it ) { (*it).iface->clear(); setTabEnabled( (*it).lv, fw && !fw->project()->isCpp() ); @@ -1356,7 +1356,7 @@ void HierarchyView::showClasses( SourceEditor *se ) return; lastSourceEditor = se; - QTimer::singleShot( 100, this, SLOT( showClassesTimeout() ) ); + TQTimer::singleShot( 100, this, TQT_SLOT( showClassesTimeout() ) ); } void HierarchyView::showClassesTimeout() @@ -1385,7 +1385,7 @@ void HierarchyView::showClassesTimeout() MainWindow::self->propertyeditor()->setWidget( 0, 0 ); editor = se; - for ( QMap::Iterator it = classBrowsers->begin(); + for ( TQMap::Iterator it = classBrowsers->begin(); it != classBrowsers->end(); ++it ) { if ( it.key() == se->project()->language() ) { (*it).iface->update( se->text() ); @@ -1402,7 +1402,7 @@ void HierarchyView::updateClassBrowsers() { if ( !editor ) return; - for ( QMap::Iterator it = classBrowsers->begin(); + for ( TQMap::Iterator it = classBrowsers->begin(); it != classBrowsers->end(); ++it ) { if ( it.key() == editor->project()->language() ) (*it).iface->update( editor->text() ); @@ -1416,56 +1416,56 @@ FormWindow *HierarchyView::formWindow() const return formwindow; } -void HierarchyView::closeEvent( QCloseEvent *e ) +void HierarchyView::closeEvent( TQCloseEvent *e ) { emit hidden(); e->accept(); } -void HierarchyView::widgetInserted( QWidget * ) +void HierarchyView::widgetInserted( TQWidget * ) { listview->setup(); } -void HierarchyView::widgetRemoved( QWidget * ) +void HierarchyView::widgetRemoved( TQWidget * ) { listview->setup(); } -void HierarchyView::widgetsInserted( const QWidgetList & ) +void HierarchyView::widgetsInserted( const TQWidgetList & ) { listview->setup(); } -void HierarchyView::widgetsRemoved( const QWidgetList & ) +void HierarchyView::widgetsRemoved( const TQWidgetList & ) { listview->setup(); } -void HierarchyView::namePropertyChanged( QWidget *w, const QVariant & ) +void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & ) { - QWidget *w2 = w; - if ( ::qt_cast(w) ) - w2 = ( (QMainWindow*)w )->centralWidget(); + TQWidget *w2 = w; + if ( ::qt_cast(w) ) + w2 = ( (TQMainWindow*)w )->centralWidget(); listview->changeNameOf( w2, w->name() ); } -void HierarchyView::databasePropertyChanged( QWidget *w, const QStringList& info ) +void HierarchyView::databasePropertyChanged( TQWidget *w, const TQStringList& info ) { #ifndef QT_NO_SQL - QString i = info.join( "." ); + TQString i = info.join( "." ); listview->changeDatabaseOf( w, i ); #endif } -void HierarchyView::tabsChanged( QTabWidget * ) +void HierarchyView::tabsChanged( TQTabWidget * ) { listview->setup(); } -void HierarchyView::pagesChanged( QWizard * ) +void HierarchyView::pagesChanged( TQWizard * ) { listview->setup(); } @@ -1488,7 +1488,7 @@ void HierarchyView::updateFormDefinitionView() fView->setup(); } -void HierarchyView::jumpTo( const QString &func, const QString &clss, int type ) +void HierarchyView::jumpTo( const TQString &func, const TQString &clss, int type ) { if ( !editor ) return; @@ -1498,7 +1498,7 @@ void HierarchyView::jumpTo( const QString &func, const QString &clss, int type ) editor->setFunction( func, clss ); } -HierarchyView::ClassBrowser::ClassBrowser( QListView *l, ClassBrowserInterface *i ) +HierarchyView::ClassBrowser::ClassBrowser( TQListView *l, ClassBrowserInterface *i ) : lv( l ), iface( i ) { } diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h index ffd269b7..cb75178e 100644 --- a/kdevdesigner/designer/hierarchyview.h +++ b/kdevdesigner/designer/hierarchyview.h @@ -27,10 +27,10 @@ #ifndef HIRARCHYVIEW_H #define HIRARCHYVIEW_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include "../interfaces/classbrowserinterface.h" @@ -68,18 +68,18 @@ public: Variable }; - HierarchyItem( Type type, QListViewItem *parent, QListViewItem *after, - const QString &txt1, const QString &txt2, const QString &txt3 ); - HierarchyItem( Type type, QListView *parent, QListViewItem *after, - const QString &txt1, const QString &txt2, const QString &txt3 ); + HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after, + const TQString &txt1, const TQString &txt2, const TQString &txt3 ); + HierarchyItem( Type type, TQListView *parent, TQListViewItem *after, + const TQString &txt1, const TQString &txt2, const TQString &txt3 ); - void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align ); + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); void updateBackColor(); - void setObject( QObject *o ); - QObject *object() const; + void setObject( TQObject *o ); + TQObject *object() const; - void setText( int col, const QString &txt ) { if ( !txt.isEmpty() ) QListViewItem::setText( col, txt ); } + void setText( int col, const TQString &txt ) { if ( !txt.isEmpty() ) TQListViewItem::setText( col, txt ); } int rtti() const { return (int)typ; } @@ -88,9 +88,9 @@ private: void cancelRename( int col ); private: - QColor backgroundColor(); - QColor backColor; - QObject *obj; + TQColor backgroundColor(); + TQColor backColor; + TQObject *obj; Type typ; }; @@ -100,55 +100,55 @@ class HierarchyList : public QListView Q_OBJECT public: - HierarchyList( QWidget *parent, FormWindow *fw, bool doConnects = TRUE ); + HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE ); virtual void setup(); - virtual void setCurrent( QObject *o ); - void setOpen( QListViewItem *i, bool b ); - void changeNameOf( QObject *o, const QString &name ); - void changeDatabaseOf( QObject *o, const QString &info ); + virtual void setCurrent( TQObject *o ); + void setOpen( TQListViewItem *i, bool b ); + void changeNameOf( TQObject *o, const TQString &name ); + void changeDatabaseOf( TQObject *o, const TQString &info ); void setFormWindow( FormWindow *fw ) { formWindow = fw; } - void drawContentsOffset( QPainter *p, int ox, int oy, + void drawContentsOffset( TQPainter *p, int ox, int oy, int cx, int cy, int cw, int ch ) { setUpdatesEnabled( FALSE ); triggerUpdate(); setUpdatesEnabled( TRUE ); - QListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); + TQListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); } - void insertEntry( QListViewItem *i, const QPixmap &pix = QPixmap(), const QString &s = QString::null ); + void insertEntry( TQListViewItem *i, const TQPixmap &pix = TQPixmap(), const TQString &s = TQString::null ); protected: - void keyPressEvent( QKeyEvent *e ); - void keyReleaseEvent( QKeyEvent *e ); - void viewportMousePressEvent( QMouseEvent *e ); - void viewportMouseReleaseEvent( QMouseEvent *e ); + void keyPressEvent( TQKeyEvent *e ); + void keyReleaseEvent( TQKeyEvent *e ); + void viewportMousePressEvent( TQMouseEvent *e ); + void viewportMouseReleaseEvent( TQMouseEvent *e ); public slots: void addTabPage(); void removeTabPage(); private: - void insertObject( QObject *o, QListViewItem *parent ); - QObject *findObject( QListViewItem *i ); - QListViewItem *findItem( QObject *o ); - QObject *current() const; - QObject *handleObjectClick( QListViewItem *i ); + void insertObject( TQObject *o, TQListViewItem *parent ); + TQObject *findObject( TQListViewItem *i ); + TQListViewItem *findItem( TQObject *o ); + TQObject *current() const; + TQObject *handleObjectClick( TQListViewItem *i ); private slots: - virtual void objectClicked( QListViewItem *i ); - virtual void objectDoubleClicked( QListViewItem *i ); - virtual void showRMBMenu( QListViewItem *, const QPoint & ); + virtual void objectClicked( TQListViewItem *i ); + virtual void objectDoubleClicked( TQListViewItem *i ); + virtual void showRMBMenu( TQListViewItem *, const TQPoint & ); protected: FormWindow *formWindow; - QPopupMenu *normalMenu, *tabWidgetMenu; + TQPopupMenu *normalMenu, *tabWidgetMenu; bool deselect; - QPixmap DesignerFormPix; - QPixmap DesignerLayoutPix; - QPixmap DesignerFolderPix; - QPixmap DesignerEditSlotsPix; + TQPixmap DesignerFormPix; + TQPixmap DesignerLayoutPix; + TQPixmap DesignerFolderPix; + TQPixmap DesignerEditSlotsPix; }; @@ -157,25 +157,25 @@ class FormDefinitionView : public HierarchyList Q_OBJECT public: - FormDefinitionView( QWidget *parent, FormWindow *fw ); + FormDefinitionView( TQWidget *parent, FormWindow *fw ); void setup(); void setupVariables(); void refresh(); - void setCurrent( QWidget *w ); + void setCurrent( TQWidget *w ); protected: - void contentsMouseDoubleClickEvent( QMouseEvent *e ); + void contentsMouseDoubleClickEvent( TQMouseEvent *e ); private: - void save( QListViewItem *p, QListViewItem *i ); - void execFunctionDialog( const QString &access, const QString &type, bool addFunc ); - void addVariable( const QString &varName, const QString &access ); + void save( TQListViewItem *p, TQListViewItem *i ); + void execFunctionDialog( const TQString &access, const TQString &type, bool addFunc ); + void addVariable( const TQString &varName, const TQString &access ); private slots: - void objectClicked( QListViewItem *i ); - void showRMBMenu( QListViewItem *, const QPoint & ); - void renamed( QListViewItem *i ); + void objectClicked( TQListViewItem *i ); + void showRMBMenu( TQListViewItem *, const TQPoint & ); + void renamed( TQListViewItem *i ); private: bool popupOpen; @@ -190,10 +190,10 @@ class HierarchyView : public QTabWidget Q_OBJECT public: - HierarchyView( QWidget *parent ); + HierarchyView( TQWidget *parent ); ~HierarchyView(); - void setFormWindow( FormWindow *fw, QObject *o ); + void setFormWindow( FormWindow *fw, TQObject *o ); FormWindow *formWindow() const; SourceEditor *sourceEditor() const { return editor; } void clear(); @@ -201,14 +201,14 @@ public: void showClasses( SourceEditor *se ); void updateClassBrowsers(); - void widgetInserted( QWidget *w ); - void widgetRemoved( QWidget *w ); - void widgetsInserted( const QWidgetList &l ); - void widgetsRemoved( const QWidgetList &l ); - void namePropertyChanged( QWidget *w, const QVariant &old ); - void databasePropertyChanged( QWidget *w, const QStringList& info ); - void tabsChanged( QTabWidget *w ); - void pagesChanged( QWizard *w ); + void widgetInserted( TQWidget *w ); + void widgetRemoved( TQWidget *w ); + void widgetsInserted( const TQWidgetList &l ); + void widgetsRemoved( const TQWidgetList &l ); + void namePropertyChanged( TQWidget *w, const TQVariant &old ); + void databasePropertyChanged( TQWidget *w, const TQStringList& info ); + void tabsChanged( TQTabWidget *w ); + void pagesChanged( TQWizard *w ); void rebuild(); void closed( FormWindow *fw ); void updateFormDefinitionView(); @@ -217,11 +217,11 @@ public: HierarchyList *hierarchyList() const { return listview; } protected slots: - void jumpTo( const QString &func, const QString &clss,int type ); + void jumpTo( const TQString &func, const TQString &clss,int type ); void showClassesTimeout(); protected: - void closeEvent( QCloseEvent *e ); + void closeEvent( TQCloseEvent *e ); signals: void hidden(); @@ -229,9 +229,9 @@ signals: private: struct ClassBrowser { - ClassBrowser( QListView * = 0, ClassBrowserInterface * = 0 ); + ClassBrowser( TQListView * = 0, ClassBrowserInterface * = 0 ); ~ClassBrowser(); - QListView *lv; + TQListView *lv; QInterfacePtr iface; Q_DUMMY_COMPARISON_OPERATOR( ClassBrowser ) @@ -240,8 +240,8 @@ private: HierarchyList *listview; FormDefinitionView *fView; SourceEditor *editor; - QMap *classBrowsers; - QGuardedPtr lastSourceEditor; + TQMap *classBrowsers; + TQGuardedPtr lastSourceEditor; }; diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp index 10e2fb7d..a4c3064c 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.cpp +++ b/kdevdesigner/designer/iconvieweditorimpl.cpp @@ -29,19 +29,19 @@ #include "mainwindow.h" #include "pixmapchooser.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -IconViewEditor::IconViewEditor( QWidget *parent, QWidget *editWidget, FormWindow *fw ) +IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); - iconview = (QIconView*)editWidget; + connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + iconview = (TQIconView*)editWidget; itemText->setText( "" ); itemText->setEnabled( FALSE ); @@ -49,9 +49,9 @@ IconViewEditor::IconViewEditor( QWidget *parent, QWidget *editWidget, FormWindow itemChoosePixmap->setEnabled( FALSE ); itemDeletePixmap->setEnabled( FALSE ); - QIconViewItem *i = 0; + TQIconViewItem *i = 0; for ( i = iconview->firstItem(); i; i = i->nextItem() ) { - (void)new QIconViewItem( preview, i->text(), *i->pixmap() ); + (void)new TQIconViewItem( preview, i->text(), *i->pixmap() ); } if ( preview->firstItem() ) @@ -60,7 +60,7 @@ IconViewEditor::IconViewEditor( QWidget *parent, QWidget *editWidget, FormWindow void IconViewEditor::insertNewItem() { - QIconViewItem *i = new QIconViewItem( preview, i18n( "New Item" ) ); + TQIconViewItem *i = new TQIconViewItem( preview, i18n( "New Item" ) ); preview->setCurrentItem( i ); preview->setSelected( i, TRUE ); itemText->setFocus(); @@ -74,7 +74,7 @@ void IconViewEditor::deleteCurrentItem() preview->setSelected( preview->currentItem(), TRUE ); } -void IconViewEditor::currentItemChanged( QIconViewItem *i ) +void IconViewEditor::currentItemChanged( TQIconViewItem *i ) { itemText->blockSignals( TRUE ); itemText->setText( "" ); @@ -98,7 +98,7 @@ void IconViewEditor::currentItemChanged( QIconViewItem *i ) itemText->blockSignals( FALSE ); } -void IconViewEditor::currentTextChanged( const QString &txt ) +void IconViewEditor::currentTextChanged( const TQString &txt ) { if ( !preview->currentItem() ) return; @@ -119,8 +119,8 @@ void IconViewEditor::cancelClicked() void IconViewEditor::applyClicked() { - QIconViewItem *i = 0; - QValueList items; + TQIconViewItem *i = 0; + TQValueList items; for ( i = preview->firstItem(); i; i = i->nextItem() ) { PopulateIconViewCommand::Item item; if ( i->pixmap() ) @@ -140,11 +140,11 @@ void IconViewEditor::choosePixmap() if ( !preview->currentItem() ) return; - QPixmap pix; + TQPixmap pix; if ( preview->currentItem()->pixmap() ) pix = qChoosePixmap( this, formwindow, *preview->currentItem()->pixmap() ); else - pix = qChoosePixmap( this, formwindow, QPixmap() ); + pix = qChoosePixmap( this, formwindow, TQPixmap() ); if ( pix.isNull() ) return; @@ -159,7 +159,7 @@ void IconViewEditor::deletePixmap() if ( !preview->currentItem() ) return; - preview->currentItem()->setPixmap( QPixmap() ); + preview->currentItem()->setPixmap( TQPixmap() ); itemPixmap->setText( "" ); itemDeletePixmap->setEnabled( FALSE ); } diff --git a/kdevdesigner/designer/iconvieweditorimpl.h b/kdevdesigner/designer/iconvieweditorimpl.h index 49e17570..a29276e8 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.h +++ b/kdevdesigner/designer/iconvieweditorimpl.h @@ -36,13 +36,13 @@ class IconViewEditor : public IconViewEditorBase Q_OBJECT public: - IconViewEditor( QWidget *parent, QWidget *editWidget, FormWindow *fw ); + IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected slots: void insertNewItem(); void deleteCurrentItem(); - void currentItemChanged( QIconViewItem * ); - void currentTextChanged( const QString & ); + void currentItemChanged( TQIconViewItem * ); + void currentTextChanged( const TQString & ); void okClicked(); void cancelClicked(); void applyClicked(); @@ -50,7 +50,7 @@ protected slots: void deletePixmap(); private: - QIconView *iconview; + TQIconView *iconview; FormWindow *formwindow; }; diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index 56ea2d07..135751e8 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -29,26 +29,26 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "mainwindow.h" #include "designeraction.h" #include "formwindow.h" -KDevDesignerPart::KDevDesignerPart( QWidget *parentWidget, const char *// widgetName +KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widgetName , - QObject *parent, const char *name, const QStringList &args ) + TQObject *parent, const char *name, const TQStringList &args ) : KInterfaceDesigner::Designer(parent, name) { setInstance( KDevDesignerPartFactory::instance() ); m_widget = new MainWindow( this, true ); - m_widget->reparent(parentWidget, QPoint(0,0)); + m_widget->reparent(parentWidget, TQPoint(0,0)); setupDesignerWindow(); setWidget(m_widget); @@ -62,7 +62,7 @@ KDevDesignerPart::KDevDesignerPart( QWidget *parentWidget, const char *// widget setReadWrite(true); setModified(false); - connect(m_widget, SIGNAL(formModified(bool )), this, SLOT(formModified(bool))); + connect(m_widget, TQT_SIGNAL(formModified(bool )), this, TQT_SLOT(formModified(bool))); } void KDevDesignerPart::setupDesignerWindow() @@ -74,61 +74,61 @@ void KDevDesignerPart::setupDesignerWindow() m_widget->statusBar()->hide(); } -static QIconSet createPartIconSet( const QString &name ) +static TQIconSet createPartIconSet( const TQString &name ) { - QIconSet ic( BarIcon( "" + name, KDevDesignerPartFactory::instance() ) ); - QString prefix = "designer_"; + TQIconSet ic( BarIcon( "" + name, KDevDesignerPartFactory::instance() ) ); + TQString prefix = "designer_"; int right = name.length() - prefix.length(); ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), KDevDesignerPartFactory::instance() ), - QIconSet::Small, QIconSet::Disabled ); + TQIconSet::Small, TQIconSet::Disabled ); return ic; } void KDevDesignerPart::setupActions( ) { KAction *action; - action = KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - action = KStdAction::open(this, SLOT(fileOpen()), actionCollection()); - action = KStdAction::close(this, SLOT(fileClose()), actionCollection()); + action = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + action = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection()); stateSync(action, m_widget->actionFileClose); - action = KStdAction::save(this, SLOT(save()), actionCollection()); + action = KStdAction::save(this, TQT_SLOT(save()), actionCollection()); stateSync(action, m_widget->actionFileSave); - action = KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); + action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); stateSync(action, m_widget->actionFileSaveAs); - action = new KAction(i18n("Save Al&l"), 0, this, SLOT(fileSaveAs()), actionCollection(), "file_saveall"); + action = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(fileSaveAs()), actionCollection(), "file_saveall"); stateSync(action, m_widget->actionFileSaveAll); - new KAction(i18n("Create &Template..."), 0, this, SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); + new KAction(i18n("Create &Template..."), 0, this, TQT_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); - action = KStdAction::undo(this, SLOT(editUndo()), actionCollection()); + action = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection()); stateSync(action, m_widget->actionEditUndo); - action = KStdAction::redo(this, SLOT(editRedo()), actionCollection()); + action = KStdAction::redo(this, TQT_SLOT(editRedo()), actionCollection()); stateSync(action, m_widget->actionEditRedo); - action = KStdAction::cut(this, SLOT(editCut()), actionCollection()); + action = KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection()); stateSync(action, m_widget->actionEditCut); - action = KStdAction::copy(this, SLOT(editCopy()), actionCollection()); + action = KStdAction::copy(this, TQT_SLOT(editCopy()), actionCollection()); stateSync(action, m_widget->actionEditCopy); - action = KStdAction::paste(this, SLOT(editPaste()), actionCollection()); + action = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection()); stateSync(action, m_widget->actionEditPaste); - action = new KAction(i18n("&Delete"), Key_Delete, this, SLOT(editDelete()), actionCollection(), "edit_delete"); + action = new KAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(editDelete()), actionCollection(), "edit_delete"); stateSync(action, m_widget->actionEditDelete); - action = KStdAction::selectAll(this, SLOT(editSelectAll()), actionCollection()); + action = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection()); stateSync(action, m_widget->actionEditSelectAll); - action = new KAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, SLOT(editAccels()), actionCollection(), "edit_accels"); + action = new KAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), actionCollection(), "edit_accels"); stateSync(action, m_widget->actionEditAccels); - action = new KAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, SLOT(editFunctions()), actionCollection(), "edit_functions"); + action = new KAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQT_SLOT(editFunctions()), actionCollection(), "edit_functions"); stateSync(action, m_widget->actionEditFunctions); - action = new KAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, SLOT(editConnections()), actionCollection(), "edit_connections"); + action = new KAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQT_SLOT(editConnections()), actionCollection(), "edit_connections"); stateSync(action, m_widget->actionEditConnections); - action = new KAction(i18n("&Form Settings..."), 0, this, SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); + action = new KAction(i18n("&Form Settings..."), 0, this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); stateSync(action, m_widget->actionEditFormSettings); - action = new KAction(i18n("&Add File..."), 0, this, SLOT(projectAddFile()), actionCollection(), "project_addfile"); + action = new KAction(i18n("&Add File..."), 0, this, TQT_SLOT(projectAddFile()), actionCollection(), "project_addfile"); stateSync(action, m_widget->actionProjectAddFile); - action = new KAction(i18n("&Image Collection..."), 0, this, SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); + action = new KAction(i18n("&Image Collection..."), 0, this, TQT_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); stateSync(action, m_widget->actionEditPixmapCollection); - action = new KAction(i18n("&Database Connections..."), 0, this, SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); + action = new KAction(i18n("&Database Connections..."), 0, this, TQT_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); stateSync(action, m_widget->actionEditDatabaseConnections); - action = new KAction(i18n("&Designer Project Settings..."), 0, this, SLOT(projectSettings()), actionCollection(), "project_settings"); + action = new KAction(i18n("&Designer Project Settings..."), 0, this, TQT_SLOT(projectSettings()), actionCollection(), "project_settings"); stateSync(action, m_widget->actionEditProjectSettings); KRadioAction *toggle; @@ -141,34 +141,34 @@ void KDevDesignerPart::setupActions( ) setupToolsAction(toggle, m_widget->actionOrderTool); toggle = new KRadioAction(i18n("Set &Buddy"), createPartIconSet("designer_setbuddy.png"), Key_F12, actionCollection(), "tools_setbuddy"); setupToolsAction(toggle, m_widget->actionBuddyTool); - new KAction(i18n("Configure Toolbox..."), 0, this, SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); - new KAction(i18n("Edit &Custom Widgets..."), 0, this, SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); + new KAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); + new KAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); - action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); + action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); stateSync(action, m_widget->actionEditAdjustSize); - action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, SLOT(layoutHLayout()), actionCollection(), "layout_h"); + action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h"); stateSync(action, m_widget->actionEditHLayout); - action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, SLOT(layoutVLayout()), actionCollection(), "layout_v"); + action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v"); stateSync(action, m_widget->actionEditVLayout); - action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); + action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); stateSync(action, m_widget->actionEditGridLayout); - action = new KAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); + action = new KAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); stateSync(action, m_widget->actionEditSplitHorizontal); - action = new KAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); + action = new KAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); stateSync(action, m_widget->actionEditSplitVertical); - action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, SLOT(layoutBreak()), actionCollection(), "layout_break"); + action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break"); stateSync(action, m_widget->actionEditBreakLayout); toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer"); setupToolsAction(toggle, m_widget->actionInsertSpacer); - action = new KAction(i18n("Preview &Form"), CTRL + Key_T, this, SLOT(windowPreview()), actionCollection(), "window_preview"); + action = new KAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview"); stateSync(action, m_widget->actionPreview); - action = new KAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, SLOT(windowNext()), actionCollection(), "window_next"); + action = new KAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQT_SLOT(windowNext()), actionCollection(), "window_next"); stateSync(action, m_widget->actionWindowNext); - action = new KAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, SLOT(windowPrev()), actionCollection(), "window_prev"); + action = new KAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQT_SLOT(windowPrev()), actionCollection(), "window_prev"); stateSync(action, m_widget->actionWindowPrevious); - action = KStdAction::preferences(this, SLOT(editPreferences()), actionCollection()); + action = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection()); action->setText(i18n("Configure &KDevDesigner...")); stateSync(action, m_widget->actionEditPreferences); } @@ -209,7 +209,7 @@ bool KDevDesignerPart::saveFile() return true; } -void KDevDesignerPart::stateSync( KAction * kaction, QAction * qaction ) +void KDevDesignerPart::stateSync( KAction * kaction, TQAction * qaction ) { if (!qaction) return; @@ -217,18 +217,18 @@ void KDevDesignerPart::stateSync( KAction * kaction, QAction * qaction ) DesignerAction *ac = dynamic_cast(qaction); if (!ac) return; - connect(ac, SIGNAL(actionEnabled(bool )), kaction, SLOT(setEnabled(bool ))); + connect(ac, TQT_SIGNAL(actionEnabled(bool )), kaction, TQT_SLOT(setEnabled(bool ))); } -void KDevDesignerPart::setupToolsAction( KRadioAction * toggle, QAction * action ) +void KDevDesignerPart::setupToolsAction( KRadioAction * toggle, TQAction * action ) { if (!action) return; toggle->setGroup("tools"); toggle->setExclusiveGroup("tools"); - connect(action, SIGNAL(toggled(bool )), this, SLOT(setToggleActionChecked(bool ))); - connect(toggle, SIGNAL(toggled(bool)), this, SLOT(setToggleActionOn(bool))); + connect(action, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); + connect(toggle, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToggleActionOn(bool))); toggle->setChecked(action->isOn()); m_actionMap[action] = toggle; m_actionMap2[toggle] = action; @@ -256,15 +256,15 @@ KDevDesignerPartFactory::~KDevDesignerPartFactory() s_instance = 0L; } -KParts::Part* KDevDesignerPartFactory::createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ) +KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ) { // Create an instance of our Part KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, parent, name, args ); // See if we are to be read-write or not - if (QCString(classname) == "KParts::ReadOnlyPart") + if (TQCString(classname) == "KParts::ReadOnlyPart") obj->setReadWrite(false); return obj; @@ -457,7 +457,7 @@ void KDevDesignerPart::windowPrev( ) m_widget->actionWindowPrevious->activate(); } -void KDevDesignerPart::statusMessage( const QString & msg ) +void KDevDesignerPart::statusMessage( const TQString & msg ) { emit setStatusBarText(msg); } @@ -466,7 +466,7 @@ void KDevDesignerPart::setToggleActionChecked( bool b) { if (!sender()) return; - const QAction *action = dynamic_cast(sender()); + const TQAction *action = dynamic_cast(sender()); if (!action) return; if (b) @@ -491,16 +491,16 @@ void KDevDesignerPart::setToggleActionOn( bool b ) const KRadioAction *action = dynamic_cast(sender()); if (!action) return; -// kdDebug() << (b?QString("toggle"):QString("untoggle")) << " action: " << action->text() << endl; - QAction *qaction = m_actionMap2[action]; +// kdDebug() << (b?TQString("toggle"):TQString("untoggle")) << " action: " << action->text() << endl; + TQAction *qaction = m_actionMap2[action]; if (!qaction) return; - disconnect(qaction, SIGNAL(toggled(bool )), this, SLOT(setToggleActionChecked(bool ))); + disconnect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); qaction->setOn(b); - connect(qaction, SIGNAL(toggled(bool )), this, SLOT(setToggleActionChecked(bool ))); + connect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); } -void KDevDesignerPart::openProject( const QString & // projectFile +void KDevDesignerPart::openProject( const TQString & // projectFile ) { //TODO: implement @@ -512,19 +512,19 @@ KInterfaceDesigner::DesignerType KDevDesignerPart::designerType( ) return KInterfaceDesigner::QtDesigner; } -void KDevDesignerPart::emitAddedFunction( const QString & form, KInterfaceDesigner::Function func ) +void KDevDesignerPart::emitAddedFunction( const TQString & form, KInterfaceDesigner::Function func ) { kdDebug() << "KDevDesignerPart::emitAddedFunction: form " << form << ", function: " << func.function << endl; emit addedFunction(designerType(), form, func); } -void KDevDesignerPart::emitRemovedFunction( const QString & form, KInterfaceDesigner::Function func ) +void KDevDesignerPart::emitRemovedFunction( const TQString & form, KInterfaceDesigner::Function func ) { kdDebug() << "KDevDesignerPart::emitRemovedFunction: form " << form << ", function: " << func.function << endl; emit removedFunction(designerType(), form, func); } -void KDevDesignerPart::emitEditedFunction( const QString & form, KInterfaceDesigner::Function oldFunc, KInterfaceDesigner::Function func ) +void KDevDesignerPart::emitEditedFunction( const TQString & form, KInterfaceDesigner::Function oldFunc, KInterfaceDesigner::Function func ) { kdDebug() << "KDevDesignerPart::emitEditedFunction: form " << form << ", old function: " << oldFunc.function @@ -534,7 +534,7 @@ void KDevDesignerPart::emitEditedFunction( const QString & form, KInterfaceDesig emit editedFunction(designerType(), form, oldFunc, func); } -void KDevDesignerPart::emitEditFunction(const QString &formName, const QString &functionName) +void KDevDesignerPart::emitEditFunction(const TQString &formName, const TQString &functionName) { kdDebug() << "KDevDesignerPart::emitEditedFunction: form " << formName << ", function: " << functionName << endl; @@ -547,12 +547,12 @@ void KDevDesignerPart::formModified(bool b) setModified(b); } -void KDevDesignerPart::emitEditSource(const QString &formName) +void KDevDesignerPart::emitEditSource(const TQString &formName) { emit editSource(designerType(), formName); } -void KDevDesignerPart::emitNewStatus(const QString &formName, int status) +void KDevDesignerPart::emitNewStatus(const TQString &formName, int status) { emit newStatus(formName, status); } diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h index cb2fa79f..b85f0b0b 100644 --- a/kdevdesigner/designer/kdevdesigner_part.h +++ b/kdevdesigner/designer/kdevdesigner_part.h @@ -21,7 +21,7 @@ #ifndef _KDEVDESIGNERPART_H_ #define _KDEVDESIGNERPART_H_ -#include +#include #include #include @@ -40,27 +40,27 @@ class KDevDesignerPart : public KInterfaceDesigner::Designer { Q_OBJECT public: - KDevDesignerPart(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, const QStringList &args); + KDevDesignerPart(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList &args); virtual ~KDevDesignerPart(); virtual void setReadWrite(bool rw); virtual void setModified(bool modified); - void statusMessage(const QString &msg); + void statusMessage(const TQString &msg); //KInterfaceDesigner::Designer methods - virtual void openProject(const QString &projectFile); + virtual void openProject(const TQString &projectFile); virtual KInterfaceDesigner::DesignerType designerType(); - void emitAddedFunction(const QString &form, KInterfaceDesigner::Function func); - void emitEditedFunction(const QString &form, KInterfaceDesigner::Function oldFunc, KInterfaceDesigner::Function func); - void emitRemovedFunction(const QString &form, KInterfaceDesigner::Function func); + void emitAddedFunction(const TQString &form, KInterfaceDesigner::Function func); + void emitEditedFunction(const TQString &form, KInterfaceDesigner::Function oldFunc, KInterfaceDesigner::Function func); + void emitRemovedFunction(const TQString &form, KInterfaceDesigner::Function func); - void emitEditFunction(const QString &formName, const QString &functionName); - void emitEditSource(const QString &formName); + void emitEditFunction(const TQString &formName, const TQString &functionName); + void emitEditSource(const TQString &formName); - void emitNewStatus(const QString &formName, int status); + void emitNewStatus(const TQString &formName, int status); protected: virtual bool openFile(); @@ -69,8 +69,8 @@ protected: void setupDesignerWindow(); void setupActions(); - void stateSync(KAction *kaction, QAction *qaction); - void setupToolsAction(KRadioAction *toggle, QAction *action); + void stateSync(KAction *kaction, TQAction *qaction); + void setupToolsAction(KRadioAction *toggle, TQAction *action); protected slots: void setToggleActionChecked(bool b); @@ -119,8 +119,8 @@ protected slots: private: MainWindow *m_widget; - QMap m_actionMap; - QMap m_actionMap2; + TQMap m_actionMap; + TQMap m_actionMap2; KRadioAction* pointerAction; }; @@ -133,9 +133,9 @@ class KDevDesignerPartFactory : public KParts::Factory public: KDevDesignerPartFactory(); virtual ~KDevDesignerPartFactory(); - virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ); + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ); static KInstance* instance(); private: diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index 2926b4f6..1f37ea64 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -29,16 +29,16 @@ #include #include "widgetfactory.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -bool operator<( const QGuardedPtr &p1, const QGuardedPtr &p2 ) +bool operator<( const TQGuardedPtr &p1, const TQGuardedPtr &p2 ) { return p1.operator->() < p2.operator->(); } @@ -61,7 +61,7 @@ bool operator<( const QGuardedPtr &p1, const QGuardedPtr &p2 ) widget is found later by Layout.) */ -Layout::Layout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, bool doSetup, bool splitter ) +Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter ) : widgets( wl ), parent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter ) { widgets.setAutoDelete( FALSE ); @@ -78,11 +78,11 @@ Layout::Layout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, void Layout::setup() { - startPoint = QPoint( 32767, 32767 ); - QValueList lists; - QWidget *lastParent = 0; - QWidgetList *lastList = 0; - QWidget *w = 0; + startPoint = TQPoint( 32767, 32767 ); + TQValueList lists; + TQWidget *lastParent = 0; + TQWidgetList *lastList = 0; + TQWidget *w = 0; // Go through all widgets of the list we got. As we can only // layout widgets which have the same parent, we first do some @@ -96,13 +96,13 @@ void Layout::setup() if ( lastParent != w->parentWidget() ) { lastList = 0; lastParent = w->parentWidget(); - QValueList::Iterator it = lists.begin(); + TQValueList::Iterator it = lists.begin(); for ( ; it != lists.end(); ++it ) { if ( ( *it ).first()->parentWidget() == w->parentWidget() ) lastList = &( *it ); } if ( !lastList ) { - QWidgetList l; + TQWidgetList l; l.setAutoDelete( FALSE ); lists.append( l ); lastList = &lists.last(); @@ -113,7 +113,7 @@ void Layout::setup() // So, now find the list with the most entries lastList = 0; - QValueList::Iterator it = lists.begin(); + TQValueList::Iterator it = lists.begin(); for ( ; it != lists.end(); ++it ) { if ( !lastList || ( *it ).count() > lastList->count() ) lastList = &( *it ); @@ -128,7 +128,7 @@ void Layout::setup() layoutBase != formWindow->mainContainer() ) ) ) ) { widgets.clear(); - startPoint = QPoint( 0, 0 ); + startPoint = TQPoint( 0, 0 ); return; } @@ -142,11 +142,11 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, SIGNAL( destroyed() ), - this, SLOT( widgetDestroyed() ) ); - startPoint = QPoint( QMIN( startPoint.x(), w->x() ), + connect( w, TQT_SIGNAL( destroyed() ), + this, TQT_SLOT( widgetDestroyed() ) ); + startPoint = TQPoint( QMIN( startPoint.x(), w->x() ), QMIN( startPoint.y(), w->y() ) ); - geometries.insert( w, QRect( w->pos(), w->size() ) ); + geometries.insert( w, TQRect( w->pos(), w->size() ) ); // Change the Z-order, as saving/loading uses the Z-order for // writing/creating widgets and this has to be the same as in // the layout. Else saving + loading will give different results @@ -157,23 +157,23 @@ void Layout::setup() void Layout::widgetDestroyed() { if ( sender() && sender()->isWidgetType() ) - widgets.removeRef( (QWidget*)sender() ); + widgets.removeRef( (TQWidget*)sender() ); } bool Layout::prepareLayout( bool &needMove, bool &needReparent ) { if ( !widgets.count() ) return FALSE; - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; - needReparent = needMove || ::qt_cast(layoutBase) || ::qt_cast(layoutBase); + needReparent = needMove || ::qt_cast(layoutBase) || ::qt_cast(layoutBase); if ( !layoutBase ) { if ( !useSplitter ) layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "QLayoutWidget" ), WidgetFactory::containerOfWidget( parent ) ); else - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "QSplitter" ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ), WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); @@ -182,11 +182,11 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent ) return TRUE; } -void Layout::finishLayout( bool needMove, QLayout *layout ) +void Layout::finishLayout( bool needMove, TQLayout *layout ) { if ( needMove ) layoutBase->move( startPoint ); - QRect g( QRect( layoutBase->pos(), layoutBase->size() ) ); + TQRect g( TQRect( layoutBase->pos(), layoutBase->size() ) ); if ( WidgetFactory::layoutType( layoutBase->parentWidget() ) == WidgetFactory::NoLayout && !isBreak ) layoutBase->adjustSize(); else if ( isBreak ) @@ -196,9 +196,9 @@ void Layout::finishLayout( bool needMove, QLayout *layout ) layout->activate(); formWindow->insertWidget( layoutBase ); formWindow->selectWidget( layoutBase ); - QString n = layoutBase->name(); + TQString n = layoutBase->name(); if ( n.find( "qt_dead_widget_" ) != -1 ) { - n.remove( 0, QString( "qt_dead_widget_" ).length() ); + n.remove( 0, TQString( "qt_dead_widget_" ).length() ); layoutBase->setName( n ); } } @@ -207,7 +207,7 @@ void Layout::undoLayout() { if ( !widgets.count() ) return; - QMap, QRect>::Iterator it = geometries.begin(); + TQMap, TQRect>::Iterator it = geometries.begin(); for ( ; it != geometries.end(); ++it ) { if ( !it.key() ) continue; @@ -216,9 +216,9 @@ void Layout::undoLayout() } formWindow->selectWidget( layoutBase, FALSE ); WidgetFactory::deleteLayout( layoutBase ); - if ( parent != layoutBase && !::qt_cast(layoutBase) ) { + if ( parent != layoutBase && !::qt_cast(layoutBase) ) { layoutBase->hide(); - QString n = layoutBase->name(); + TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); layoutBase->setName( n ); } else { @@ -232,35 +232,35 @@ void Layout::undoLayout() void Layout::breakLayout() { - QMap rects; + TQMap rects; if ( !widgets.isEmpty() ) { - QWidget *w; + TQWidget *w; for ( w = widgets.first(); w; w = widgets.next() ) rects.insert( w, w->geometry() ); } WidgetFactory::deleteLayout( layoutBase ); bool needReparent = qstrcmp( layoutBase->className(), "QLayoutWidget" ) == 0 || - qstrcmp( layoutBase->className(), "QSplitter" ) == 0 || + qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ); - bool needResize = qstrcmp( layoutBase->className(), "QSplitter" ) == 0; + bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0; bool add = geometries.isEmpty(); - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent ) w->reparent( layoutBase->parentWidget(), 0, layoutBase->pos() + w->pos(), TRUE ); if ( needResize ) { - QMap::Iterator it = rects.find( w ); + TQMap::Iterator it = rects.find( w ); if ( it != rects.end() ) - w->setGeometry( QRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) ); + w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) ); } if ( add ) - geometries.insert( w, QRect( w->pos(), w->size() ) ); + geometries.insert( w, TQRect( w->pos(), w->size() ) ); } if ( needReparent ) { layoutBase->hide(); parent = layoutBase->parentWidget(); - QString n = layoutBase->name(); + TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); layoutBase->setName( n ); } else { @@ -275,12 +275,12 @@ void Layout::breakLayout() class HorizontalLayoutList : public QWidgetList { public: - HorizontalLayoutList( const QWidgetList &l ) - : QWidgetList( l ) {} + HorizontalLayoutList( const TQWidgetList &l ) + : TQWidgetList( l ) {} - int compareItems( QPtrCollection::Item item1, QPtrCollection::Item item2 ) { - QWidget *w1 = (QWidget*)item1; - QWidget *w2 = (QWidget*)item2; + int compareItems( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) { + TQWidget *w1 = (TQWidget*)item1; + TQWidget *w2 = (TQWidget*)item2; if ( w1->x() == w2->x() ) return 0; if ( w1->x() > w2->x() ) @@ -290,7 +290,7 @@ public: }; -HorizontalLayout::HorizontalLayout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, bool doSetup, bool splitter ) +HorizontalLayout::HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter ) : Layout( wl, p, fw, lb, doSetup, splitter ) { if ( doSetup ) @@ -311,11 +311,11 @@ void HorizontalLayout::doLayout() if ( !prepareLayout( needMove, needReparent ) ) return; - QHBoxLayout *layout = (QHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); + TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent && w->parent() != layoutBase ) - w->reparent( layoutBase, 0, QPoint( 0, 0 ), FALSE ); + w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); @@ -327,8 +327,8 @@ void HorizontalLayout::doLayout() w->show(); } - if ( ::qt_cast(layoutBase) ) - ( (QSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); + if ( ::qt_cast(layoutBase) ) + ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); finishLayout( needMove, layout ); } @@ -339,12 +339,12 @@ void HorizontalLayout::doLayout() class VerticalLayoutList : public QWidgetList { public: - VerticalLayoutList( const QWidgetList &l ) - : QWidgetList( l ) {} + VerticalLayoutList( const TQWidgetList &l ) + : TQWidgetList( l ) {} - int compareItems( QPtrCollection::Item item1, QPtrCollection::Item item2 ) { - QWidget *w1 = (QWidget*)item1; - QWidget *w2 = (QWidget*)item2; + int compareItems( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) { + TQWidget *w1 = (TQWidget*)item1; + TQWidget *w2 = (TQWidget*)item2; if ( w1->y() == w2->y() ) return 0; if ( w1->y() > w2->y() ) @@ -354,7 +354,7 @@ public: }; -VerticalLayout::VerticalLayout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, bool doSetup, bool splitter ) +VerticalLayout::VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter ) : Layout( wl, p, fw, lb, doSetup, splitter ) { if ( doSetup ) @@ -375,11 +375,11 @@ void VerticalLayout::doLayout() if ( !prepareLayout( needMove, needReparent ) ) return; - QVBoxLayout *layout = (QVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); + TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent && w->parent() != layoutBase ) - w->reparent( layoutBase, 0, QPoint( 0, 0 ), FALSE ); + w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); @@ -391,8 +391,8 @@ void VerticalLayout::doLayout() w->show(); } - if ( ::qt_cast(layoutBase) ) - ( (QSplitter*)layoutBase )->setOrientation( Qt::Vertical ); + if ( ::qt_cast(layoutBase) ) + ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); finishLayout( needMove, layout ); } @@ -407,9 +407,9 @@ public: Grid( int rows, int cols ); ~Grid(); - QWidget* cell( int row, int col ) const { return cells[ row * ncols + col]; } - void setCell( int row, int col, QWidget* w ) { cells[ row*ncols + col] = w; } - void setCells( QRect c, QWidget* w ) { + TQWidget* cell( int row, int col ) const { return cells[ row * ncols + col]; } + void setCell( int row, int col, TQWidget* w ) { cells[ row*ncols + col] = w; } + void setCells( TQRect c, TQWidget* w ) { for ( int rows = c.bottom()-c.top(); rows >= 0; rows--) for ( int cols = c.right()-c.left(); cols >= 0; cols--) { setCell(c.top()+rows, c.left()+cols, w); @@ -419,14 +419,14 @@ public: int numCols() const { return ncols; } void simplify(); - bool locateWidget( QWidget* w, int& row, int& col, int& rowspan, int& colspan ); + bool locateWidget( TQWidget* w, int& row, int& col, int& rowspan, int& colspan ); private: void merge(); int countRow( int r, int c ) const; int countCol( int r, int c ) const; - void setRow( int r, int c, QWidget* w, int count ); - void setCol( int r, int c, QWidget* w, int count ); + void setRow( int r, int c, TQWidget* w, int count ); + void setCol( int r, int c, TQWidget* w, int count ); bool isWidgetStartCol( int c ) const; bool isWidgetEndCol( int c ) const; bool isWidgetStartRow( int r ) const; @@ -436,7 +436,7 @@ private: void extendRight(); void extendUp(); void extendDown(); - QWidget** cells; + TQWidget** cells; bool* cols; bool* rows; int nrows, ncols; @@ -446,7 +446,7 @@ private: Grid::Grid( int r, int c ) : nrows( r ), ncols( c ) { - cells = new QWidget*[ r * c ]; + cells = new TQWidget*[ r * c ]; memset( cells, 0, sizeof( cells ) * r * c ); rows = new bool[ r ]; cols = new bool[ c ]; @@ -462,7 +462,7 @@ Grid::~Grid() int Grid::countRow( int r, int c ) const { - QWidget* w = cell( r, c ); + TQWidget* w = cell( r, c ); int i = c + 1; while ( i < ncols && cell( r, i ) == w ) i++; @@ -471,20 +471,20 @@ int Grid::countRow( int r, int c ) const int Grid::countCol( int r, int c ) const { - QWidget* w = cell( r, c ); + TQWidget* w = cell( r, c ); int i = r + 1; while ( i < nrows && cell( i, c ) == w ) i++; return i - r; } -void Grid::setCol( int r, int c, QWidget* w, int count ) +void Grid::setCol( int r, int c, TQWidget* w, int count ) { for (int i = 0; i < count; i++ ) setCell( r + i, c, w ); } -void Grid::setRow( int r, int c, QWidget* w, int count ) +void Grid::setRow( int r, int c, TQWidget* w, int count ) { for (int i = 0; i < count; i++ ) setCell( r, c + i, w ); @@ -534,7 +534,7 @@ bool Grid::isWidgetEndRow( int r ) const bool Grid::isWidgetTopLeft( int r, int c ) const { - QWidget* w = cell( r, c ); + TQWidget* w = cell( r, c ); if ( !w ) return FALSE; return ( !r || cell( r-1, c) != w ) && (!c || cell( r, c-1) != w); @@ -545,7 +545,7 @@ void Grid::extendLeft() int r,c,i; for ( c = 1; c < ncols; c++ ) { for ( r = 0; r < nrows; r++ ) { - QWidget* w = cell( r, c ); + TQWidget* w = cell( r, c ); if ( !w ) continue; int cc = countCol( r, c); @@ -576,7 +576,7 @@ void Grid::extendRight() int r,c,i; for ( c = ncols - 2; c >= 0; c-- ) { for ( r = 0; r < nrows; r++ ) { - QWidget* w = cell( r, c ); + TQWidget* w = cell( r, c ); if ( !w ) continue; int cc = countCol( r, c); @@ -607,7 +607,7 @@ void Grid::extendUp() int r,c,i; for ( r = 1; r < nrows; r++ ) { for ( c = 0; c < ncols; c++ ) { - QWidget* w = cell( r, c ); + TQWidget* w = cell( r, c ); if ( !w ) continue; int cr = countRow( r, c); @@ -637,7 +637,7 @@ void Grid::extendDown() int r,c,i; for ( r = nrows - 2; r >= 0; r-- ) { for ( c = 0; c < ncols; c++ ) { - QWidget* w = cell( r, c ); + TQWidget* w = cell( r, c ); if ( !w ) continue; int cr = countRow( r, c); @@ -692,7 +692,7 @@ void Grid::merge() } } -bool Grid::locateWidget( QWidget* w, int& row, int& col, int& rowspan, int & colspan ) +bool Grid::locateWidget( TQWidget* w, int& row, int& col, int& rowspan, int & colspan ) { int r,c, r2, c2; for ( c = 0; c < ncols; c++ ) { @@ -728,7 +728,7 @@ bool Grid::locateWidget( QWidget* w, int& row, int& col, int& rowspan, int & col -GridLayout::GridLayout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, const QSize &res, bool doSetup ) +GridLayout::GridLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, const TQSize &res, bool doSetup ) : Layout( wl, p, fw, lb, doSetup ), resolution( res ) { grid = 0; @@ -752,12 +752,12 @@ void GridLayout::doLayout() if ( !grid ) buildGrid(); - QWidget* w; + TQWidget* w; int r, c, rs, cs; for ( w = widgets.first(); w; w = widgets.next() ) { if ( grid->locateWidget( w, r, c, rs, cs) ) { if ( needReparent && w->parent() != layoutBase ) - w->reparent( layoutBase, 0, QPoint( 0, 0 ), FALSE ); + w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( rs * cs == 1 ) { layout->addWidget( w, r, c, ::qt_cast(w) ? ( (Spacer*)w )->alignment() : 0 ); } else { @@ -791,14 +791,14 @@ void GridLayout::buildGrid() // ----------------------------------------------------------------- // We need a list of both start and stop values for x- & y-axis - QValueVector x( widgets.count()*2 ); - QValueVector y( widgets.count()*2 ); + TQValueVector x( widgets.count()*2 ); + TQValueVector y( widgets.count()*2 ); // Using push_back would look nicer, but operator[] is much faster int index = 0; - QWidget* w = 0; + TQWidget* w = 0; for ( w = widgets.first(); w; w = widgets.next() ) { - QRect widgetPos = w->geometry(); + TQRect widgetPos = w->geometry(); x[index] = widgetPos.left(); x[index+1] = widgetPos.right(); y[index] = widgetPos.top(); @@ -811,7 +811,7 @@ void GridLayout::buildGrid() // Remove duplicate x enteries (Remove next, if equal to current) if ( !x.empty() ) { - for (QValueVector::iterator current = x.begin() ; + for (TQValueVector::iterator current = x.begin() ; (current != x.end()) && ((current+1) != x.end()) ; ) if ( (*current == *(current+1)) ) x.erase(current+1); @@ -821,7 +821,7 @@ void GridLayout::buildGrid() // Remove duplicate y enteries (Remove next, if equal to current) if ( !y.empty() ) { - for (QValueVector::iterator current = y.begin() ; + for (TQValueVector::iterator current = y.begin() ; (current != y.end()) && ((current+1) != y.end()) ; ) if ( (*current == *(current+1)) ) y.erase(current+1); @@ -837,7 +837,7 @@ void GridLayout::buildGrid() // Mark the cells in the grid that contains a widget for ( w = widgets.first(); w; w = widgets.next() ) { - QRect c(0,0,0,0), widgetPos = w->geometry(); + TQRect c(0,0,0,0), widgetPos = w->geometry(); // From left til right (not including) for (uint cw=0; cw -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include class FormWindow; class QPaintEvent; @@ -43,23 +43,23 @@ class Layout : public QObject Q_OBJECT public: - Layout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); + Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); virtual ~Layout() {} virtual void doLayout() = 0; virtual void undoLayout(); virtual void breakLayout(); virtual bool prepareLayout( bool &needMove, bool &needReparent ); - virtual void finishLayout( bool needMove, QLayout *layout ); + virtual void finishLayout( bool needMove, TQLayout *layout ); protected: - QWidgetList widgets; - QWidget *parent; - QPoint startPoint; - QMap, QRect> geometries; - QWidget *layoutBase; + TQWidgetList widgets; + TQWidget *parent; + TQPoint startPoint; + TQMap, TQRect> geometries; + TQWidget *layoutBase; FormWindow *formWindow; - QRect oldGeometry; + TQRect oldGeometry; bool isBreak; bool useSplitter; @@ -74,7 +74,7 @@ protected slots: class HorizontalLayout : public Layout { public: - HorizontalLayout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); + HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); void doLayout(); @@ -86,7 +86,7 @@ protected: class VerticalLayout : public Layout { public: - VerticalLayout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); + VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); void doLayout(); @@ -100,7 +100,7 @@ class Grid; class GridLayout : public Layout { public: - GridLayout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, const QSize &res, bool doSetup = TRUE ); + GridLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, const TQSize &res, bool doSetup = TRUE ); ~GridLayout(); void doLayout(); @@ -110,7 +110,7 @@ protected: protected: void buildGrid(); - QSize resolution; + TQSize resolution; Grid* grid; }; @@ -119,12 +119,12 @@ class Spacer : public QWidget { Q_OBJECT - Q_OVERRIDE( QCString name ) + Q_OVERRIDE( TQCString name ) Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) Q_ENUMS( SizeType ) Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) - Q_PROPERTY( QSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) - Q_OVERRIDE( QRect geometry DESIGNABLE false ) + Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) + Q_OVERRIDE( TQRect geometry DESIGNABLE false ) private: enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize, @@ -138,36 +138,36 @@ public: MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink }; - Spacer( QWidget *parent, const char *name ); + Spacer( TQWidget *parent, const char *name ); - QSize minimumSize() const; - QSize sizeHint() const; + TQSize minimumSize() const; + TQSize sizeHint() const; void setSizeType( SizeType t ); SizeType sizeType() const; int alignment() const; Orientation orientation() const; void setOrientation( Orientation o ); void setInteraciveMode( bool b ) { interactive = b; }; - void setSizeHint( const QSize &s ); + void setSizeHint( const TQSize &s ); protected: - void paintEvent( QPaintEvent *e ); - void resizeEvent( QResizeEvent* e ); + void paintEvent( TQPaintEvent *e ); + void resizeEvent( TQResizeEvent* e ); void updateMask(); Qt::Orientation orient; bool interactive; - QSize sh; + TQSize sh; }; class QDesignerGridLayout : public QGridLayout { Q_OBJECT public: - QDesignerGridLayout( QWidget *parent ) : QGridLayout( parent ){}; - QDesignerGridLayout( QLayout *parentLayout ) : QGridLayout( parentLayout ){}; + QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){}; + QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){}; - void addWidget( QWidget *, int row, int col, int align = 0 ); - void addMultiCellWidget( QWidget *, int fromRow, int toRow, + void addWidget( TQWidget *, int row, int col, int align = 0 ); + void addMultiCellWidget( TQWidget *, int fromRow, int toRow, int fromCol, int toCol, int align = 0 ); struct Item @@ -181,7 +181,7 @@ public: Q_DUMMY_COMPARISON_OPERATOR( Item ) }; - QMap items; + TQMap items; }; diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp index a83ace44..8ed979f2 100644 --- a/kdevdesigner/designer/listboxdnd.cpp +++ b/kdevdesigner/designer/listboxdnd.cpp @@ -25,33 +25,33 @@ **********************************************************************/ #include "listboxdnd.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // The Dragobject Declaration --------------------------------------- class ListBoxItemDrag : public QStoredDrag { public: - ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, QListBox * parent = 0, const char * name = 0 ); + ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * parent = 0, const char * name = 0 ); ~ListBoxItemDrag() {}; - static bool canDecode( QDragMoveEvent * event ); - static bool decode( QDropEvent * event, QListBox * parent, QListBoxItem * insertPoint ); + static bool canDecode( TQDragMoveEvent * event ); + static bool decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * insertPoint ); enum ItemType { ListBoxText = 1, ListBoxPixmap = 2 }; }; // ------------------------------------------------------------------ -ListBoxDnd::ListBoxDnd( QListBox * eventSource, const char * name ) +ListBoxDnd::ListBoxDnd( TQListBox * eventSource, const char * name ) : ListDnd( eventSource, name ) { } -void ListBoxDnd::confirmDrop( QListBoxItem * ) +void ListBoxDnd::confirmDrop( TQListBoxItem * ) { dropConfirmed = TRUE; } -bool ListBoxDnd::dropEvent( QDropEvent * event ) +bool ListBoxDnd::dropEvent( TQDropEvent * event ) { if ( dragInside ) { @@ -61,13 +61,13 @@ bool ListBoxDnd::dropEvent( QDropEvent * event ) return TRUE; } - QPoint pos = event->pos(); - QListBoxItem * after = itemAt( pos ); + TQPoint pos = event->pos(); + TQListBoxItem * after = itemAt( pos ); - if ( ListBoxItemDrag::decode( event, (QListBox *) src, after ) ) { + if ( ListBoxItemDrag::decode( event, (TQListBox *) src, after ) ) { event->accept(); - QListBox * src = (QListBox *) this->src; - QListBoxItem * item = ( after ? after->next() : src->firstItem() ); + TQListBox * src = (TQListBox *) this->src; + TQListBoxItem * item = ( after ? after->next() : src->firstItem() ); src->setCurrentItem( item ); emit dropped( item ); // ###FIX: Supports only one item! } @@ -79,17 +79,17 @@ bool ListBoxDnd::dropEvent( QDropEvent * event ) return TRUE; } -bool ListBoxDnd::mouseMoveEvent( QMouseEvent * event ) +bool ListBoxDnd::mouseMoveEvent( TQMouseEvent * event ) { if ( event->state() & LeftButton ) { if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) { ListBoxItemList list; buildList( list ); - ListBoxItemDrag * dragobject = new ListBoxItemDrag( list, (dMode & Internal), (QListBox *) src ); + ListBoxItemDrag * dragobject = new ListBoxItemDrag( list, (dMode & Internal), (TQListBox *) src ); // Emit signal for all dragged items - QListBoxItem * i = list.first(); + TQListBoxItem * i = list.first(); while ( i ) { emit dragged( i ); i = list.next(); @@ -117,10 +117,10 @@ bool ListBoxDnd::mouseMoveEvent( QMouseEvent * event ) int ListBoxDnd::buildList( ListBoxItemList & list ) { - QListBoxItem * i = ((QListBox *)src)->firstItem(); + TQListBoxItem * i = ((TQListBox *)src)->firstItem(); while ( i ) { if ( i->isSelected() ) { - ((QListBox *)src)->setSelected( i, FALSE ); + ((TQListBox *)src)->setSelected( i, FALSE ); list.append( i ); } i = i->next(); @@ -130,40 +130,40 @@ int ListBoxDnd::buildList( ListBoxItemList & list ) void ListBoxDnd::insertList( ListBoxItemList & list ) { - QListBoxItem * i = list.first(); + TQListBoxItem * i = list.first(); while ( i ) { - ((QListBox *)src)->insertItem( i, i->prev() ); + ((TQListBox *)src)->insertItem( i, i->prev() ); i = list.next(); } } void ListBoxDnd::removeList( ListBoxItemList & list ) { - QListBoxItem * i = list.first(); + TQListBoxItem * i = list.first(); while ( i ) { - ((QListBox *)src)->takeItem( i ); // remove item from QListBox + ((TQListBox *)src)->takeItem( i ); // remove item from QListBox i = list.next(); } } -void ListBoxDnd::updateLine( const QPoint & dragPos ) +void ListBoxDnd::updateLine( const TQPoint & dragPos ) { - QListBox * src = (QListBox *) this->src; - QListBoxItem *item = itemAt( dragPos ); + TQListBox * src = (TQListBox *) this->src; + TQListBoxItem *item = itemAt( dragPos ); int ypos = item ? ( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) : - ( src->itemRect( ((QListBox *)src)->firstItem() ).top() ); + ( src->itemRect( ((TQListBox *)src)->firstItem() ).top() ); line->resize( src->viewport()->width(), line->height() ); line->move( 0, ypos ); } -QListBoxItem * ListBoxDnd::itemAt( QPoint pos ) +TQListBoxItem * ListBoxDnd::itemAt( TQPoint pos ) { - QListBox * src = (QListBox *) this->src; - QListBoxItem * result = src->itemAt( pos ); - QListBoxItem * last = src->item( src->count() - 1 ); + TQListBox * src = (TQListBox *) this->src; + TQListBoxItem * result = src->itemAt( pos ); + TQListBoxItem * last = src->item( src->count() - 1 ); int i = src->index( result ); if ( result && ( pos.y() < (src->itemRect(result).top() + src->itemHeight(i)/2) ) ) @@ -174,7 +174,7 @@ QListBoxItem * ListBoxDnd::itemAt( QPoint pos ) return result; } -bool ListBoxDnd::canDecode( QDragEnterEvent * event ) +bool ListBoxDnd::canDecode( TQDragEnterEvent * event ) { return ListBoxItemDrag::canDecode( event ); } @@ -184,17 +184,17 @@ bool ListBoxDnd::canDecode( QDragEnterEvent * event ) // The Dragobject Implementation ------------------------------------ // ------------------------------------------------------------------ -ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, QListBox * parent, const char * name ) - : QStoredDrag( "qt/listboxitem", parent, name ) +ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * parent, const char * name ) + : TQStoredDrag( "qt/listboxitem", parent, name ) { // ### FIX! - QByteArray data( sizeof( Q_INT32 ) + sizeof( QListBoxItem ) * items.count() ); - QDataStream stream( data, IO_WriteOnly ); + TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListBoxItem ) * items.count() ); + TQDataStream stream( data, IO_WriteOnly ); stream << items.count(); stream << (Q_UINT8) sendPtr; // just transfer item pointer; omit data - QListBoxItem * i = items.first(); + TQListBoxItem * i = items.first(); if ( sendPtr ) { @@ -211,7 +211,7 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, QListBo Q_UINT8 b = 0; - b = (Q_UINT8) ( i->text() != QString::null ); // does item have text ? + b = (Q_UINT8) ( i->text() != TQString::null ); // does item have text ? stream << b; if ( b ) { stream << i->text(); @@ -233,18 +233,18 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, QListBo setEncodedData( data ); } -bool ListBoxItemDrag::canDecode( QDragMoveEvent * event ) +bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event ) { return event->provides( "qt/listboxitem" ); } -bool ListBoxItemDrag::decode( QDropEvent * event, QListBox * parent, QListBoxItem * after ) +bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after ) { - QByteArray data = event->encodedData( "qt/listboxitem" ); + TQByteArray data = event->encodedData( "qt/listboxitem" ); if ( data.size() ) { event->accept(); - QDataStream stream( data, IO_ReadOnly ); + TQDataStream stream( data, IO_ReadOnly ); int count = 0; stream >> count; @@ -252,7 +252,7 @@ bool ListBoxItemDrag::decode( QDropEvent * event, QListBox * parent, QListBoxIte Q_UINT8 recievePtr = 0; // data contains just item pointers; no data stream >> recievePtr; - QListBoxItem * item = 0; + TQListBoxItem * item = 0; if ( recievePtr ) { @@ -260,7 +260,7 @@ bool ListBoxItemDrag::decode( QDropEvent * event, QListBox * parent, QListBoxIte Q_ULONG p = 0; //###FIX: demands sizeof(ulong) >= sizeof(void*) stream >> p; - item = (QListBoxItem *) p; + item = (TQListBoxItem *) p; parent->insertItem( item, after ); @@ -271,14 +271,14 @@ bool ListBoxItemDrag::decode( QDropEvent * event, QListBox * parent, QListBoxIte for ( int i = 0; i < count; i++ ) { Q_UINT8 hasText = 0; - QString text; + TQString text; stream >> hasText; if ( hasText ) { stream >> text; } Q_UINT8 hasPixmap = 0; - QPixmap pixmap; + TQPixmap pixmap; stream >> hasPixmap; if ( hasPixmap ) { stream >> pixmap; @@ -288,9 +288,9 @@ bool ListBoxItemDrag::decode( QDropEvent * event, QListBox * parent, QListBoxIte stream >> isSelectable; if ( hasPixmap ) { - item = new QListBoxPixmap( parent, pixmap, text, after ); + item = new TQListBoxPixmap( parent, pixmap, text, after ); } else { - item = new QListBoxText( parent, text, after ); + item = new TQListBoxText( parent, text, after ); } item->setSelectable( isSelectable ); diff --git a/kdevdesigner/designer/listboxdnd.h b/kdevdesigner/designer/listboxdnd.h index c0f91845..3885dce2 100644 --- a/kdevdesigner/designer/listboxdnd.h +++ b/kdevdesigner/designer/listboxdnd.h @@ -27,34 +27,34 @@ #ifndef LISTBOXDND_H #define LISTBOXDND_H -#include -#include +#include +#include #include "listdnd.h" -typedef QPtrList ListBoxItemList; +typedef TQPtrList ListBoxItemList; class ListBoxDnd : public ListDnd { Q_OBJECT public: // dragModes are enumerated in ListDnd - ListBoxDnd( QListBox * eventSource, const char * name = 0 ); + ListBoxDnd( TQListBox * eventSource, const char * name = 0 ); signals: - void dropped( QListBoxItem * ); - void dragged( QListBoxItem * ); + void dropped( TQListBoxItem * ); + void dragged( TQListBoxItem * ); public slots: - void confirmDrop( QListBoxItem * ); + void confirmDrop( TQListBoxItem * ); protected: - virtual bool dropEvent( QDropEvent * event ); - virtual bool mouseMoveEvent( QMouseEvent * event ); - virtual void updateLine( const QPoint & pos ); - virtual bool canDecode( QDragEnterEvent * event ); + virtual bool dropEvent( TQDropEvent * event ); + virtual bool mouseMoveEvent( TQMouseEvent * event ); + virtual void updateLine( const TQPoint & pos ); + virtual bool canDecode( TQDragEnterEvent * event ); private: - QListBoxItem * itemAt( QPoint pos ); + TQListBoxItem * itemAt( TQPoint pos ); int buildList( ListBoxItemList & list ); void insertList( ListBoxItemList & list ); void removeList( ListBoxItemList & list ); diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp index d19f22b2..40a6439c 100644 --- a/kdevdesigner/designer/listboxeditorimpl.cpp +++ b/kdevdesigner/designer/listboxeditorimpl.cpp @@ -33,18 +33,18 @@ #include "listboxrename.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include -ListBoxEditor::ListBoxEditor( QWidget *parent, QWidget *editWidget, FormWindow *fw ) +ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); - listbox = (QListBox*)editWidget; + connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + listbox = (TQListBox*)editWidget; itemText->setText( "" ); itemText->setEnabled( FALSE ); @@ -52,12 +52,12 @@ ListBoxEditor::ListBoxEditor( QWidget *parent, QWidget *editWidget, FormWindow * itemChoosePixmap->setEnabled( FALSE ); itemDeletePixmap->setEnabled( FALSE ); - QListBoxItem *i = 0; + TQListBoxItem *i = 0; for ( i = listbox->firstItem(); i; i = i->next() ) { if ( i->pixmap() ) - (void)new QListBoxPixmap( preview, *i->pixmap(), i->text() ); + (void)new TQListBoxPixmap( preview, *i->pixmap(), i->text() ); else - (void)new QListBoxText( preview, i->text() ); + (void)new TQListBoxText( preview, i->text() ); } if ( preview->firstItem() ) @@ -65,20 +65,20 @@ ListBoxEditor::ListBoxEditor( QWidget *parent, QWidget *editWidget, FormWindow * ListBoxDnd *editorDnd = new ListBoxDnd( preview ); editorDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - QObject::connect( editorDnd, SIGNAL( dropped( QListBoxItem * ) ), - editorDnd, SLOT( confirmDrop( QListBoxItem * ) ) ); + TQObject::connect( editorDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), + editorDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); ListBoxRename *editorRename = new ListBoxRename( preview ); - QObjectList *l = parent->queryList( "QLineEdit", "itemText" ); - QObjectListIt it( *l ); - QObject *obj; + TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); + TQObjectListIt it( *l ); + TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; - QObject::connect( editorRename, - SIGNAL( itemTextChanged( const QString & ) ), + TQObject::connect( editorRename, + TQT_SIGNAL( itemTextChanged( const TQString & ) ), obj, - SLOT( setText( const QString & ) ) ); + TQT_SLOT( setText( const TQString & ) ) ); } delete l; @@ -86,7 +86,7 @@ ListBoxEditor::ListBoxEditor( QWidget *parent, QWidget *editWidget, FormWindow * void ListBoxEditor::insertNewItem() { - QListBoxItem *i = new QListBoxText( preview, i18n("New Item") ); + TQListBoxItem *i = new TQListBoxText( preview, i18n("New Item") ); preview->setCurrentItem( i ); preview->setSelected( i, TRUE ); itemText->setFocus(); @@ -100,7 +100,7 @@ void ListBoxEditor::deleteCurrentItem() preview->setSelected( preview->currentItem(), TRUE ); } -void ListBoxEditor::currentItemChanged( QListBoxItem *i ) +void ListBoxEditor::currentItemChanged( TQListBoxItem *i ) { itemText->blockSignals( TRUE ); itemText->setText( "" ); @@ -125,7 +125,7 @@ void ListBoxEditor::currentItemChanged( QListBoxItem *i ) itemText->blockSignals( FALSE ); } -void ListBoxEditor::currentTextChanged( const QString &txt ) +void ListBoxEditor::currentTextChanged( const TQString &txt ) { if ( preview->currentItem() == -1 ) return; @@ -151,8 +151,8 @@ void ListBoxEditor::cancelClicked() void ListBoxEditor::applyClicked() { - QListBoxItem *i = 0; - QValueList items; + TQListBoxItem *i = 0; + TQValueList items; for ( i = preview->firstItem(); i; i = i->next() ) { PopulateListBoxCommand::Item item; if ( i->pixmap() ) @@ -172,16 +172,16 @@ void ListBoxEditor::choosePixmap() if ( preview->currentItem() == -1 ) return; - QPixmap pix; + TQPixmap pix; if ( preview->item( preview->currentItem() )->pixmap() ) pix = qChoosePixmap( this, formwindow, *preview->item( preview->currentItem() )->pixmap() ); else - pix = qChoosePixmap( this, formwindow, QPixmap() ); + pix = qChoosePixmap( this, formwindow, TQPixmap() ); if ( pix.isNull() ) return; - QString txt = preview->item( preview->currentItem() )->text(); + TQString txt = preview->item( preview->currentItem() )->text(); preview->changeItem( pix, txt, preview->currentItem() ); itemDeletePixmap->setEnabled( TRUE ); } @@ -191,14 +191,14 @@ void ListBoxEditor::moveItemUp() if ( preview->currentItem() < 1 ) return; - QListBoxItem *i = preview->item( preview->currentItem() ); + TQListBoxItem *i = preview->item( preview->currentItem() ); bool hasPix = (i->pixmap() != 0); - QPixmap pix; + TQPixmap pix; if ( hasPix ) pix = *i->pixmap(); - QString txt = i->text(); + TQString txt = i->text(); - QListBoxItem *p = i->prev(); + TQListBoxItem *p = i->prev(); if ( p->pixmap() ) preview->changeItem( *p->pixmap(), p->text(), preview->currentItem() ); else @@ -215,14 +215,14 @@ void ListBoxEditor::moveItemDown() if ( preview->currentItem() == -1 || preview->currentItem() > (int)preview->count() - 2 ) return; - QListBoxItem *i = preview->item( preview->currentItem() ); + TQListBoxItem *i = preview->item( preview->currentItem() ); bool hasPix = (i->pixmap() != 0); - QPixmap pix; + TQPixmap pix; if ( hasPix ) pix = *i->pixmap(); - QString txt = i->text(); + TQString txt = i->text(); - QListBoxItem *n = i->next(); + TQListBoxItem *n = i->next(); if ( n->pixmap() ) preview->changeItem( *n->pixmap(), n->text(), preview->currentItem() ); else @@ -239,7 +239,7 @@ void ListBoxEditor::deletePixmap() if ( preview->currentItem() == -1 ) return; - QListBoxItem *i = preview->item( preview->currentItem() ); + TQListBoxItem *i = preview->item( preview->currentItem() ); preview->changeItem( i->text(), preview->currentItem() ); itemDeletePixmap->setEnabled( FALSE ); } diff --git a/kdevdesigner/designer/listboxeditorimpl.h b/kdevdesigner/designer/listboxeditorimpl.h index 3719bc59..22ae5d5c 100644 --- a/kdevdesigner/designer/listboxeditorimpl.h +++ b/kdevdesigner/designer/listboxeditorimpl.h @@ -37,13 +37,13 @@ class ListBoxEditor : public ListBoxEditorBase Q_OBJECT public: - ListBoxEditor( QWidget *parent, QWidget *editWidget, FormWindow *fw ); + ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected slots: void insertNewItem(); void deleteCurrentItem(); - void currentItemChanged( QListBoxItem * ); - void currentTextChanged( const QString & ); + void currentItemChanged( TQListBoxItem * ); + void currentTextChanged( const TQString & ); void okClicked(); void cancelClicked(); void applyClicked(); @@ -53,7 +53,7 @@ protected slots: void deletePixmap(); private: - QListBox *listbox; + TQListBox *listbox; FormWindow *formwindow; }; diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp index 464ef412..d51381dd 100644 --- a/kdevdesigner/designer/listboxrename.cpp +++ b/kdevdesigner/designer/listboxrename.cpp @@ -24,46 +24,46 @@ ** **********************************************************************/ -#include -#include -#include +#include +#include +#include #include "listboxrename.h" class EditableListBoxItem : public QListBoxItem { public: - void setText( const QString & text ) + void setText( const TQString & text ) { - QListBoxItem::setText( text ); + TQListBoxItem::setText( text ); } }; -ListBoxRename::ListBoxRename( QListBox * eventSource, const char * name ) - : QObject( eventSource, name ), +ListBoxRename::ListBoxRename( TQListBox * eventSource, const char * name ) + : TQObject( eventSource, name ), clickedItem( 0 ), activity( FALSE ) { src = eventSource; src->installEventFilter( this ); - ed = new QLineEdit( src->viewport() ); + ed = new TQLineEdit( src->viewport() ); ed->hide(); ed->setFrame( FALSE ); - QObject::connect( ed, SIGNAL( returnPressed() ), - this, SLOT( renameClickedItem() ) ); + TQObject::connect( ed, TQT_SIGNAL( returnPressed() ), + this, TQT_SLOT( renameClickedItem() ) ); } -bool ListBoxRename::eventFilter( QObject *, QEvent * event ) +bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) { switch ( event->type() ) { - case QEvent::MouseButtonPress: + case TQEvent::MouseButtonPress: { - QPoint pos = ((QMouseEvent *) event)->pos(); + TQPoint pos = ((TQMouseEvent *) event)->pos(); if ( clickedItem && clickedItem->isSelected() && (clickedItem == src->itemAt( pos )) ) { - QTimer::singleShot( 500, this, SLOT( showLineEdit() ) ); + TQTimer::singleShot( 500, this, TQT_SLOT( showLineEdit() ) ); activity = FALSE; // no drags or clicks for 500 ms before we start the renaming } else { // new item clicked activity = TRUE; @@ -73,16 +73,16 @@ bool ListBoxRename::eventFilter( QObject *, QEvent * event ) } break; - case QEvent::MouseMove: + case TQEvent::MouseMove: - if ( ((QMouseEvent *) event)->state() & Qt::LeftButton ) { + if ( ((TQMouseEvent *) event)->state() & Qt::LeftButton ) { activity = TRUE; // drag } break; - case QEvent::KeyPress: + case TQEvent::KeyPress: - switch ( ((QKeyEvent *) event)->key() ) { + switch ( ((TQKeyEvent *) event)->key() ) { case Qt::Key_F2: @@ -110,10 +110,10 @@ bool ListBoxRename::eventFilter( QObject *, QEvent * event ) } break; - case QEvent::Resize: + case TQEvent::Resize: if ( clickedItem && ed && !ed->isHidden() ) { - QRect rect = src->itemRect( 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; - QRect rect = src->itemRect( 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/listboxrename.h b/kdevdesigner/designer/listboxrename.h index cdb6d67b..995389e5 100644 --- a/kdevdesigner/designer/listboxrename.h +++ b/kdevdesigner/designer/listboxrename.h @@ -27,8 +27,8 @@ #ifndef LISTBOXRENAME_H #define LISTBOXRENAME_H -#include -#include +#include +#include class QLineEdit; @@ -36,11 +36,11 @@ class ListBoxRename : public QObject { Q_OBJECT public: - ListBoxRename( QListBox * eventSource, const char * name = 0 ); - bool eventFilter( QObject *, QEvent * event ); + ListBoxRename( TQListBox * eventSource, const char * name = 0 ); + bool eventFilter( TQObject *, TQEvent * event ); signals: - void itemTextChanged( const QString & ); + void itemTextChanged( const TQString & ); public slots: void showLineEdit(); @@ -48,9 +48,9 @@ public slots: void renameClickedItem(); private: - QListBoxItem * clickedItem; - QListBox * src; - QLineEdit * ed; + TQListBoxItem * clickedItem; + TQListBox * src; + TQLineEdit * ed; bool activity; }; diff --git a/kdevdesigner/designer/listdnd.cpp b/kdevdesigner/designer/listdnd.cpp index 34562e6f..7df65cbd 100644 --- a/kdevdesigner/designer/listdnd.cpp +++ b/kdevdesigner/designer/listdnd.cpp @@ -25,11 +25,11 @@ **********************************************************************/ #include "listdnd.h" -#include -#include +#include +#include -ListDnd::ListDnd( QScrollView * eventSource, const char * name ) - : QObject( eventSource, name ), +ListDnd::ListDnd( TQScrollView * eventSource, const char * name ) + : TQObject( eventSource, name ), dragInside( FALSE ), dragDelete( TRUE ), dropConfirmed( FALSE ), dMode( Both ) { src = eventSource; @@ -37,7 +37,7 @@ ListDnd::ListDnd( QScrollView * eventSource, const char * name ) src->installEventFilter( this ); src->viewport()->installEventFilter( this ); - line = new QWidget( src->viewport(), 0, Qt::WStyle_NoBorder | WStyle_StaysOnTop ); + line = new TQWidget( src->viewport(), 0, Qt::WStyle_NoBorder | WStyle_StaysOnTop ); line->setBackgroundColor( Qt::black ); line->resize( src->viewport()->width(), 2 ); line->hide(); @@ -53,21 +53,21 @@ int ListDnd::dragMode() const return dMode; } -bool ListDnd::eventFilter( QObject *, QEvent * event ) +bool ListDnd::eventFilter( TQObject *, TQEvent * event ) { switch ( event->type() ) { - case QEvent::DragEnter: - return dragEnterEvent( (QDragEnterEvent *) event ); - case QEvent::DragLeave: - return dragLeaveEvent( (QDragLeaveEvent *) event ); - case QEvent::DragMove: - return dragMoveEvent( (QDragMoveEvent *) event ); - case QEvent::Drop: - return dropEvent( (QDropEvent *) event ); - case QEvent::MouseButtonPress: - return mousePressEvent( (QMouseEvent *) event ); - case QEvent::MouseMove: - return mouseMoveEvent( (QMouseEvent *) event ); + case TQEvent::DragEnter: + return dragEnterEvent( (TQDragEnterEvent *) event ); + case TQEvent::DragLeave: + return dragLeaveEvent( (TQDragLeaveEvent *) event ); + case TQEvent::DragMove: + return dragMoveEvent( (TQDragMoveEvent *) event ); + case TQEvent::Drop: + return dropEvent( (TQDropEvent *) event ); + case TQEvent::MouseButtonPress: + return mousePressEvent( (TQMouseEvent *) event ); + case TQEvent::MouseMove: + return mouseMoveEvent( (TQMouseEvent *) event ); default: break; } @@ -75,7 +75,7 @@ bool ListDnd::eventFilter( QObject *, QEvent * event ) } -bool ListDnd::dragEnterEvent( QDragEnterEvent * event ) +bool ListDnd::dragEnterEvent( TQDragEnterEvent * event ) { if ( dMode == None ) { return TRUE; @@ -96,14 +96,14 @@ bool ListDnd::dragEnterEvent( QDragEnterEvent * event ) return TRUE; } -bool ListDnd::dragLeaveEvent( QDragLeaveEvent * ) +bool ListDnd::dragLeaveEvent( TQDragLeaveEvent * ) { dragInside = FALSE; line->hide(); return TRUE; } -bool ListDnd::dragMoveEvent( QDragMoveEvent * event ) +bool ListDnd::dragMoveEvent( TQDragMoveEvent * event ) { if ( dragInside && dMode && !( dMode & NullDrop ) ) { updateLine( event->pos() ); @@ -111,31 +111,31 @@ bool ListDnd::dragMoveEvent( QDragMoveEvent * event ) return TRUE; } -bool ListDnd::dropEvent( QDropEvent * ) +bool ListDnd::dropEvent( TQDropEvent * ) { // do nothing return FALSE; } -bool ListDnd::mousePressEvent( QMouseEvent * event ) +bool ListDnd::mousePressEvent( TQMouseEvent * event ) { if ( event->button() == LeftButton ) mousePressPos = event->pos(); return FALSE; } -bool ListDnd::mouseMoveEvent( QMouseEvent * ) +bool ListDnd::mouseMoveEvent( TQMouseEvent * ) { // do nothing return FALSE; } -void ListDnd::updateLine( const QPoint & ) +void ListDnd::updateLine( const TQPoint & ) { // do nothing } -bool ListDnd::canDecode( QDragEnterEvent * ) +bool ListDnd::canDecode( TQDragEnterEvent * ) { // do nothing return FALSE; diff --git a/kdevdesigner/designer/listdnd.h b/kdevdesigner/designer/listdnd.h index 9e3e6351..8594085b 100644 --- a/kdevdesigner/designer/listdnd.h +++ b/kdevdesigner/designer/listdnd.h @@ -27,33 +27,33 @@ #ifndef LISTDND_H #define LISTDND_H -#include -#include +#include +#include class ListDnd : public QObject { Q_OBJECT public: enum DragMode { None = 0, External = 1, Internal = 2, Both = 3, Move = 4, NullDrop = 8 }; - ListDnd( QScrollView * eventSource, const char * name = 0 ); + ListDnd( TQScrollView * eventSource, const char * name = 0 ); void setDragMode( int mode ); int dragMode() const; - bool eventFilter( QObject *, QEvent * event ); + bool eventFilter( TQObject *, TQEvent * event ); protected: - virtual bool dragEnterEvent( QDragEnterEvent * event ); - virtual bool dragLeaveEvent( QDragLeaveEvent * ); - virtual bool dragMoveEvent( QDragMoveEvent * event ); - virtual bool dropEvent( QDropEvent * event ); - virtual bool mousePressEvent( QMouseEvent * event ); - virtual bool mouseMoveEvent( QMouseEvent * event ); - virtual void updateLine( const QPoint & dragPos ); - virtual bool canDecode( QDragEnterEvent * event ); + virtual bool dragEnterEvent( TQDragEnterEvent * event ); + virtual bool dragLeaveEvent( TQDragLeaveEvent * ); + virtual bool dragMoveEvent( TQDragMoveEvent * event ); + virtual bool dropEvent( TQDropEvent * event ); + virtual bool mousePressEvent( TQMouseEvent * event ); + virtual bool mouseMoveEvent( TQMouseEvent * event ); + virtual void updateLine( const TQPoint & dragPos ); + virtual bool canDecode( TQDragEnterEvent * event ); - QScrollView * src; - QWidget * line; - QPoint mousePressPos; - QPoint dragPos; + TQScrollView * src; + TQWidget * line; + TQPoint mousePressPos; + TQPoint dragPos; bool dragInside; bool dragDelete; bool dropConfirmed; diff --git a/kdevdesigner/designer/listeditor.ui.h b/kdevdesigner/designer/listeditor.ui.h index bba06104..cd0aa7f0 100644 --- a/kdevdesigner/designer/listeditor.ui.h +++ b/kdevdesigner/designer/listeditor.ui.h @@ -6,21 +6,21 @@ ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ -#include -#include +#include +#include void ListEditor::init() { listview->header()->hide(); listview->setSorting( -1 ); - listview->setDefaultRenameAction( QListView::Accept ); + listview->setDefaultRenameAction( TQListView::Accept ); } -void ListEditor::setList( const QStringList &l ) +void ListEditor::setList( const TQStringList &l ) { - QListViewItem *i = 0; - for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { - i = new QListViewItem( listview, i ); + TQListViewItem *i = 0; + for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { + i = new TQListViewItem( listview, i ); i->setText( 0, *it ); i->setRenameEnabled( 0, TRUE ); } @@ -28,13 +28,13 @@ void ListEditor::setList( const QStringList &l ) void ListEditor::addItem() { - QListViewItem *i = new QListViewItem( listview, listview->lastItem() ); + TQListViewItem *i = new TQListViewItem( listview, listview->lastItem() ); i->setRenameEnabled( 0, TRUE ); qApp->processEvents(); i->startRename( 0 ); } -void ListEditor::renamed( QListViewItem *i ) +void ListEditor::renamed( TQListViewItem *i ) { if ( i && i->text( 0 ).isEmpty() ) i->startRename( 0 ); @@ -42,8 +42,8 @@ void ListEditor::renamed( QListViewItem *i ) void ListEditor::removeItems() { - QListViewItemIterator it( listview ); - QListViewItem *i = 0; + TQListViewItemIterator it( listview ); + TQListViewItem *i = 0; while ( ( i = it.current() ) ) { ++it; if ( i->isSelected() ) @@ -51,11 +51,11 @@ void ListEditor::removeItems() } } -QStringList ListEditor::items() +TQStringList ListEditor::items() { - QStringList l; - QListViewItemIterator it( listview ); - QListViewItem *i = 0; + TQStringList l; + TQListViewItemIterator it( listview ); + TQListViewItem *i = 0; while ( ( i = it.current() ) ) { ++it; if ( !i->text( 0 ).isEmpty() ) @@ -66,7 +66,7 @@ QStringList ListEditor::items() void ListEditor::renameItem() { - QListViewItem *i = listview->currentItem(); + TQListViewItem *i = listview->currentItem(); if ( i ) i->startRename( 0 ); } diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp index b4098237..a4abae07 100644 --- a/kdevdesigner/designer/listviewdnd.cpp +++ b/kdevdesigner/designer/listviewdnd.cpp @@ -25,33 +25,33 @@ **********************************************************************/ #include "listviewdnd.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // The Dragobject Declaration --------------------------------------- class ListViewItemDrag : public QStoredDrag { public: enum DropRelation { Sibling, Child }; - ListViewItemDrag( ListViewItemList & items, QWidget * parent = 0, const char * name = 0 ); + ListViewItemDrag( ListViewItemList & items, TQWidget * parent = 0, const char * name = 0 ); ~ListViewItemDrag() {}; - static bool canDecode( QDragMoveEvent * event ); - static bool decode( QDropEvent * event, QListView * parent, QListViewItem * insertPoint, DropRelation dr ); + static bool canDecode( TQDragMoveEvent * event ); + static bool decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr ); }; // ------------------------------------------------------------------ -ListViewDnd::ListViewDnd( QListView * eventSource, const char * name ) +ListViewDnd::ListViewDnd( TQListView * eventSource, const char * name ) : ListDnd( eventSource, name ) { } -void ListViewDnd::confirmDrop( QListViewItem * ) +void ListViewDnd::confirmDrop( TQListViewItem * ) { dropConfirmed = TRUE; } -bool ListViewDnd::dropEvent( QDropEvent * event ) +bool ListViewDnd::dropEvent( TQDropEvent * event ) { if ( dragInside ) { @@ -61,10 +61,10 @@ bool ListViewDnd::dropEvent( QDropEvent * event ) return TRUE; } - QPoint pos = event->pos(); + TQPoint pos = event->pos(); ListViewItemDrag::DropRelation dr = ListViewItemDrag::Sibling; - QListViewItem *item = itemAt( pos ); + TQListViewItem *item = itemAt( pos ); int dpos = dropDepth( item, pos ); if ( item ) { @@ -78,7 +78,7 @@ bool ListViewDnd::dropEvent( QDropEvent * event ) } } - if ( ListViewItemDrag::decode( event, (QListView *) src, item, dr ) ) { + if ( ListViewItemDrag::decode( event, (TQListView *) src, item, dr ) ) { event->accept(); emit dropped( 0 ); // Use ID instead of item? } @@ -90,7 +90,7 @@ bool ListViewDnd::dropEvent( QDropEvent * event ) return TRUE; } -bool ListViewDnd::mouseMoveEvent( QMouseEvent * event ) +bool ListViewDnd::mouseMoveEvent( TQMouseEvent * event ) { if ( event->state() & LeftButton ) { if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) { @@ -101,7 +101,7 @@ bool ListViewDnd::mouseMoveEvent( QMouseEvent * event ) else buildTreeList( list ); - ListViewItemDrag * dragobject = new ListViewItemDrag( list, (QListView *) src ); + ListViewItemDrag * dragobject = new ListViewItemDrag( list, (TQListView *) src ); if ( dMode & Move ) { disabledItems = list; @@ -132,9 +132,9 @@ bool ListViewDnd::mouseMoveEvent( QMouseEvent * event ) int ListViewDnd::buildFlatList( ListViewItemList & list ) { bool addKids = FALSE; - QListViewItem *nextSibling = 0; - QListViewItem *nextParent = 0; - QListViewItemIterator it = ((QListView *)src)->firstChild(); + TQListViewItem *nextSibling = 0; + TQListViewItem *nextParent = 0; + TQListViewItemIterator it = ((TQListView *)src)->firstChild(); for ( ; *it; it++ ) { // Hit the nextSibling, turn of child processing if ( (*it) == nextSibling ) @@ -166,7 +166,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) int ListViewDnd::buildTreeList( ListViewItemList & list ) { - QListViewItemIterator it = ((QListView *)src)->firstChild(); + TQListViewItemIterator it = ((TQListView *)src)->firstChild(); for ( ; *it; it++ ) { if ( (*it)->isSelected() ) list.append( *it ); @@ -185,10 +185,10 @@ void ListViewDnd::setVisibleItems( bool b ) } while ( disabledItems.next() ); } -void ListViewDnd::updateLine( const QPoint & dragPos ) +void ListViewDnd::updateLine( const TQPoint & dragPos ) { - QListViewItem * item = itemAt(dragPos); - QListView * src = (QListView *) this->src; + TQListViewItem * item = itemAt(dragPos); + TQListView * src = (TQListView *) this->src; int ypos = item ? ( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) : @@ -199,12 +199,12 @@ void ListViewDnd::updateLine( const QPoint & dragPos ) line->move( xpos, ypos ); } -QListViewItem * ListViewDnd::itemAt( QPoint pos ) +TQListViewItem * ListViewDnd::itemAt( TQPoint pos ) { - QListView * src = (QListView *) this->src; + TQListView * src = (TQListView *) this->src; int headerHeight = (int)(src->header()->height()); pos.ry() -= headerHeight; - QListViewItem * result = src->itemAt( pos ); + TQListViewItem * result = src->itemAt( pos ); if ( result && ( pos.ry() < (src->itemPos(result) + result->height()/2) ) ) result = result->itemAbove(); @@ -227,14 +227,14 @@ QListViewItem * ListViewDnd::itemAt( QPoint pos ) return result; } -int ListViewDnd::dropDepth( QListViewItem * item, QPoint pos ) +int ListViewDnd::dropDepth( TQListViewItem * item, TQPoint pos ) { if ( !item || (dMode & Flat) ) return 0; int result = 0; int itemDepth = item->depth(); - int indentSize = ((QListView *)src)->treeStepSize(); + int indentSize = ((TQListView *)src)->treeStepSize(); int itemLeft = indentSize * itemDepth; int childMargin = indentSize*2; if ( pos.x() > itemLeft + childMargin ) { @@ -247,7 +247,7 @@ int ListViewDnd::dropDepth( QListViewItem * item, QPoint pos ) return result; } -bool ListViewDnd::canDecode( QDragEnterEvent * event ) +bool ListViewDnd::canDecode( TQDragEnterEvent * event ) { return ListViewItemDrag::canDecode( event ); } @@ -256,19 +256,19 @@ bool ListViewDnd::canDecode( QDragEnterEvent * event ) // The Dragobject Implementation ------------------------------------ // ------------------------------------------------------------------ -QDataStream & operator<< ( QDataStream & stream, const QListViewItem & item ); -QDataStream & operator>> ( QDataStream & stream, QListViewItem & item ); +TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item ); +TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item ); -ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, QWidget * parent, const char * name ) - : QStoredDrag( "qt/listviewitem", parent, name ) +ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * parent, const char * name ) + : TQStoredDrag( "qt/listviewitem", parent, name ) { // ### FIX! - QByteArray data( sizeof( Q_INT32 ) + sizeof( QListViewItem ) * items.count() ); - QDataStream stream( data, IO_WriteOnly ); + TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListViewItem ) * items.count() ); + TQDataStream stream( data, IO_WriteOnly ); stream << items.count(); - QListViewItem *i = items.first(); + TQListViewItem *i = items.first(); while ( i ) { stream << *i; i = items.next(); @@ -277,15 +277,15 @@ ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, QWidget * parent, setEncodedData( data ); } -bool ListViewItemDrag::canDecode( QDragMoveEvent * event ) +bool ListViewItemDrag::canDecode( TQDragMoveEvent * event ) { return event->provides( "qt/listviewitem" ); } -bool ListViewItemDrag::decode( QDropEvent * event, QListView * parent, QListViewItem * insertPoint, DropRelation dr ) +bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr ) { - QByteArray data = event->encodedData( "qt/listviewitem" ); - QListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0; + TQByteArray data = event->encodedData( "qt/listviewitem" ); + TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0; // Change from sibling (default) to child creation if ( insertPoint && dr == Child ) { @@ -295,17 +295,17 @@ bool ListViewItemDrag::decode( QDropEvent * event, QListView * parent, QListView if ( data.size() ) { event->accept(); - QDataStream stream( data, IO_ReadOnly ); + TQDataStream stream( data, IO_ReadOnly ); int count = 0; stream >> count; for( int i = 0; i < count; i++ ) { if ( itemParent ) { - insertPoint = new QListViewItem( itemParent, insertPoint ); + insertPoint = new TQListViewItem( itemParent, insertPoint ); itemParent->setOpen( TRUE ); } else { // No parent for insertPoint, use QListView - insertPoint = new QListViewItem( parent, insertPoint ); + insertPoint = new TQListViewItem( parent, insertPoint ); } stream >> *insertPoint; } @@ -315,7 +315,7 @@ bool ListViewItemDrag::decode( QDropEvent * event, QListView * parent, QListView } -QDataStream & operator<< ( QDataStream & stream, const QListViewItem & item ) +TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item ) { int columns = item.listView()->columns(); stream << columns; @@ -324,7 +324,7 @@ QDataStream & operator<< ( QDataStream & stream, const QListViewItem & item ) int i; for ( i = 0; i < columns; i++ ) { - b = (Q_UINT8) ( item.text( i ) != QString::null ); // does column i have a string ? + b = (Q_UINT8) ( item.text( i ) != TQString::null ); // does column i have a string ? stream << b; if ( b ) { stream << item.text( i ); @@ -354,7 +354,7 @@ QDataStream & operator<< ( QDataStream & stream, const QListViewItem & item ) stream << item.childCount(); if ( item.childCount() > 0 ) { - QListViewItem * child = item.firstChild(); + TQListViewItem * child = item.firstChild(); while ( child ) { stream << ( *child ); // recursive call child = child->nextSibling(); @@ -364,14 +364,14 @@ QDataStream & operator<< ( QDataStream & stream, const QListViewItem & item ) return stream; } -QDataStream & operator>> ( QDataStream & stream, QListViewItem & item ) +TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item ) { Q_INT32 columns; stream >> columns; Q_UINT8 b = 0; - QString text; + TQString text; int i; for ( i = 0; i < columns; i++ ) { stream >> b; @@ -381,7 +381,7 @@ QDataStream & operator>> ( QDataStream & stream, QListViewItem & item ) } } - QPixmap pixmap; + TQPixmap pixmap; for ( i = 0; i < columns; i++ ) { stream >> b; // column i has pixmap ? if ( b ) { @@ -419,10 +419,10 @@ QDataStream & operator>> ( QDataStream & stream, QListViewItem & item ) int childCount; stream >> childCount; - QListViewItem *child = 0; - QListViewItem *prevchild = 0; + TQListViewItem *child = 0; + TQListViewItem *prevchild = 0; for ( i = 0; i < childCount; i++ ) { - child = new QListViewItem( &item, prevchild ); + child = new TQListViewItem( &item, prevchild ); stream >> ( *child ); item.insertItem( child ); prevchild = child; diff --git a/kdevdesigner/designer/listviewdnd.h b/kdevdesigner/designer/listviewdnd.h index 52b18091..9de07af9 100644 --- a/kdevdesigner/designer/listviewdnd.h +++ b/kdevdesigner/designer/listviewdnd.h @@ -27,13 +27,13 @@ #ifndef LISTVIEWDND_H #define LISTVIEWDND_H -#include -#include +#include +#include #include "listdnd.h" class QWidget; class QListView; -typedef QPtrList ListViewItemList; +typedef TQPtrList ListViewItemList; class ListViewDnd : public ListDnd { @@ -41,22 +41,22 @@ class ListViewDnd : public ListDnd public: enum DragMode { Flat = 16 }; // see ListDnd::DragMode - ListViewDnd( QListView * eventSource, const char * name = 0 ); + ListViewDnd( TQListView * eventSource, const char * name = 0 ); signals: - void dropped( QListViewItem * ); + void dropped( TQListViewItem * ); public slots: - void confirmDrop( QListViewItem * ); + void confirmDrop( TQListViewItem * ); protected: - virtual bool dropEvent( QDropEvent * event ); - virtual bool mouseMoveEvent( QMouseEvent * event ); - virtual void updateLine( const QPoint & pos ); - virtual bool canDecode( QDragEnterEvent * event ); + virtual bool dropEvent( TQDropEvent * event ); + virtual bool mouseMoveEvent( TQMouseEvent * event ); + virtual void updateLine( const TQPoint & pos ); + virtual bool canDecode( TQDragEnterEvent * event ); private: - QListViewItem * itemAt( QPoint pos ); - int dropDepth( QListViewItem * item, QPoint pos ); + TQListViewItem * itemAt( TQPoint pos ); + int dropDepth( TQListViewItem * item, TQPoint pos ); int buildFlatList( ListViewItemList & list ); int buildTreeList( ListViewItemList & list ); void setVisibleItems( bool b ); diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp index 78055f92..60e7e155 100644 --- a/kdevdesigner/designer/listvieweditorimpl.cpp +++ b/kdevdesigner/designer/listvieweditorimpl.cpp @@ -33,23 +33,23 @@ #include "listboxdnd.h" #include "listboxrename.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -ListViewEditor::ListViewEditor( QWidget *parent, QListView *lv, FormWindow *fw ) +ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); itemText->setEnabled( FALSE ); itemChoosePixmap->setEnabled( FALSE ); itemDeletePixmap->setEnabled( FALSE ); @@ -71,55 +71,55 @@ ListViewEditor::ListViewEditor( QWidget *parent, QListView *lv, FormWindow *fw ) // Clamp on drag and drop to QListView ListViewDnd *itemsDnd = new ListViewDnd( itemsPreview ); itemsDnd->setDragMode( ListViewDnd::Internal | ListViewDnd::Move ); - QObject::connect( itemsDnd, SIGNAL( dropped( QListViewItem * ) ), - itemsDnd, SLOT( confirmDrop( QListViewItem * ) ) ); + TQObject::connect( itemsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), + itemsDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); // Enable rename for all QListViewItems - QListViewItemIterator it = ((QListView *)itemsPreview)->firstChild(); + TQListViewItemIterator it = ((TQListView *)itemsPreview)->firstChild(); for ( ; *it; it++ ) (*it)->setRenameEnabled( 0, TRUE ); // Connect listview signal to signal-relay - QObject::connect( itemsPreview, - SIGNAL( itemRenamed( QListViewItem*, int, const QString & ) ), + TQObject::connect( itemsPreview, + TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - SLOT( emitItemRenamed(QListViewItem*, int, const QString&) ) ); + TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); - // Connect signal-relay to QLineEdit "itemText" - QObjectList *l = parent->queryList( "QLineEdit", "itemText" ); - QObject *obj; - QObjectListIt itemsLineEditIt( *l ); + // Connect signal-relay to TQLineEdit "itemText" + TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); + TQObject *obj; + TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; - QObject::connect( this, - SIGNAL( itemRenamed( const QString & ) ), + TQObject::connect( this, + TQT_SIGNAL( itemRenamed( const TQString & ) ), obj, - SLOT( setText( const QString & ) ) ); + TQT_SLOT( setText( const TQString & ) ) ); } delete l; // Clamp on drag and drop to QListBox ListBoxDnd *columnsDnd = new ListBoxDnd( colPreview ); columnsDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - QObject::connect( columnsDnd, SIGNAL( dropped( QListBoxItem * ) ), - columnsDnd, SLOT( confirmDrop( QListBoxItem * ) ) ); + TQObject::connect( columnsDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), + columnsDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); // Clamp on rename to QListBox ListBoxRename *columnsRename = new ListBoxRename( colPreview ); - QObject::connect( columnsRename, - SIGNAL( itemTextChanged( const QString & ) ), + TQObject::connect( columnsRename, + TQT_SIGNAL( itemTextChanged( const TQString & ) ), this, - SLOT( columnTextChanged( const QString & ) ) ); + TQT_SLOT( columnTextChanged( const TQString & ) ) ); - // Find QLineEdit "colText" and connect - l = parent->queryList( "QLineEdit", "colText" ); - QObjectListIt columnsLineEditIt( *l ); + // Find TQLineEdit "colText" and connect + l = parent->queryList( "TQLineEdit", "colText" ); + TQObjectListIt columnsLineEditIt( *l ); while ( (obj = columnsLineEditIt.current()) != 0 ) { ++columnsLineEditIt; - QObject::connect( columnsRename, - SIGNAL( itemTextChanged( const QString & ) ), + TQObject::connect( columnsRename, + TQT_SIGNAL( itemTextChanged( const TQString & ) ), obj, - SLOT( setText( const QString & ) ) ); + TQT_SLOT( setText( const TQString & ) ) ); } delete l; } @@ -154,8 +154,8 @@ void ListViewEditor::columnDownClicked() return; colPreview->clearSelection(); - QListBoxItem *i = colPreview->item( colPreview->currentItem() ); - QListBoxItem *below = i->next(); + TQListBoxItem *i = colPreview->item( colPreview->currentItem() ); + TQListBoxItem *below = i->next(); colPreview->takeItem( i ); colPreview->insertItem( i, below ); @@ -170,11 +170,11 @@ void ListViewEditor::columnPixmapChosen() if ( !c ) return; - QPixmap pix; + TQPixmap pix; if ( colPixmap->pixmap() ) pix = qChoosePixmap( this, formwindow, *colPixmap->pixmap() ); else - pix = qChoosePixmap( this, formwindow, QPixmap() ); + pix = qChoosePixmap( this, formwindow, TQPixmap() ); if ( pix.isNull() ) return; @@ -197,7 +197,7 @@ void ListViewEditor::columnPixmapDeleted() if ( !c ) return; - c->pixmap = QPixmap(); + c->pixmap = TQPixmap(); colPreview->blockSignals( TRUE ); if ( !c->pixmap.isNull() ) colPreview->changeItem( c->pixmap, c->text, colPreview->index( c->item ) ); @@ -217,7 +217,7 @@ void ListViewEditor::columnResizable( bool b ) c->resizable = b; } -void ListViewEditor::columnTextChanged( const QString &txt ) +void ListViewEditor::columnTextChanged( const TQString &txt ) { Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) @@ -239,8 +239,8 @@ void ListViewEditor::columnUpClicked() return; colPreview->clearSelection(); - QListBoxItem *i = colPreview->item( colPreview->currentItem() ); - QListBoxItem *above = i->prev(); + TQListBoxItem *i = colPreview->item( colPreview->currentItem() ); + TQListBoxItem *above = i->prev(); colPreview->takeItem( above ); colPreview->insertItem( above, i ); @@ -249,7 +249,7 @@ void ListViewEditor::columnUpClicked() colPreview->setSelected( i, TRUE ); } -void ListViewEditor::currentColumnChanged( QListBoxItem *i ) +void ListViewEditor::currentColumnChanged( TQListBoxItem *i ) { Column *c = findColumn( i ); if ( !i || !c ) { @@ -285,13 +285,13 @@ void ListViewEditor::newColumnClicked() { Column col; col.text = i18n( "New Column" ); - col.pixmap = QPixmap(); + col.pixmap = TQPixmap(); col.clickable = TRUE; col.resizable = TRUE; if ( !col.pixmap.isNull() ) - col.item = new QListBoxPixmap( colPreview, col.pixmap, col.text ); + col.item = new TQListBoxPixmap( colPreview, col.pixmap, col.text ); else - col.item = new QListBoxText( colPreview, col.text ); + col.item = new TQListBoxText( colPreview, col.text ); columns.append( col ); colPreview->setCurrentItem( col.item ); colPreview->setSelected( col.item, TRUE ); @@ -299,11 +299,11 @@ void ListViewEditor::newColumnClicked() void ListViewEditor::deleteColumnClicked() { - QListBoxItem *i = colPreview->item( colPreview->currentItem() ); + TQListBoxItem *i = colPreview->item( colPreview->currentItem() ); if ( !i ) return; - for ( QValueList::Iterator it = columns.begin(); it != columns.end(); ++it ) { + for ( TQValueList::Iterator it = columns.begin(); it != columns.end(); ++it ) { if ( ( *it ).item == i ) { delete (*it).item; columns.remove( it ); @@ -315,7 +315,7 @@ void ListViewEditor::deleteColumnClicked() colPreview->setSelected( colPreview->currentItem(), TRUE ); } -void ListViewEditor::currentItemChanged( QListViewItem *i ) +void ListViewEditor::currentItemChanged( TQListViewItem *i ) { if ( !i ) { itemText->setEnabled( FALSE ); @@ -334,7 +334,7 @@ void ListViewEditor::currentItemChanged( QListViewItem *i ) displayItem( i, itemColumn->value() ); } -void ListViewEditor::displayItem( QListViewItem *i, int col ) +void ListViewEditor::displayItem( TQListViewItem *i, int col ) { itemText->blockSignals( TRUE ); itemText->setText( i->text( col ) ); @@ -350,7 +350,7 @@ void ListViewEditor::displayItem( QListViewItem *i, int col ) void ListViewEditor::itemColChanged( int col ) { - QListViewItem *i = itemsPreview->currentItem(); + TQListViewItem *i = itemsPreview->currentItem(); if ( !i ) return; @@ -360,7 +360,7 @@ void ListViewEditor::itemColChanged( int col ) void ListViewEditor::itemDeleteClicked() { - QListViewItem *i = itemsPreview->currentItem(); + TQListViewItem *i = itemsPreview->currentItem(); if ( !i ) return; @@ -373,12 +373,12 @@ void ListViewEditor::itemDeleteClicked() void ListViewEditor::itemDownClicked() { - QListViewItem *i = itemsPreview->currentItem(); + TQListViewItem *i = itemsPreview->currentItem(); if ( !i ) return; - QListViewItemIterator it( i ); - QListViewItem *parent = i->parent(); + TQListViewItemIterator it( i ); + TQListViewItem *parent = i->parent(); it++; while ( it.current() ) { if ( it.current()->parent() == parent ) @@ -388,14 +388,14 @@ void ListViewEditor::itemDownClicked() if ( !it.current() ) return; - QListViewItem *other = it.current(); + TQListViewItem *other = it.current(); i->moveItem( other ); } void ListViewEditor::itemNewClicked() { - QListViewItem *item = new QListViewItem( itemsPreview ); + TQListViewItem *item = new TQListViewItem( itemsPreview ); item->setText( 0, i18n( "Item" ) ); item->setRenameEnabled( 0, TRUE ); itemsPreview->setCurrentItem( item ); @@ -406,13 +406,13 @@ void ListViewEditor::itemNewClicked() void ListViewEditor::itemNewSubClicked() { - QListViewItem *parent = itemsPreview->currentItem(); - QListViewItem *item = 0; + TQListViewItem *parent = itemsPreview->currentItem(); + TQListViewItem *item = 0; if ( parent ) { - item = new QListViewItem( parent ); + item = new TQListViewItem( parent ); parent->setOpen( TRUE ); } else { - item = new QListViewItem( itemsPreview ); + item = new TQListViewItem( itemsPreview ); } item->setText( 0, i18n( "Subitem" ) ); item->setRenameEnabled( 0, TRUE ); @@ -422,38 +422,38 @@ void ListViewEditor::itemNewSubClicked() void ListViewEditor::itemPixmapChoosen() { - QListViewItem *i = itemsPreview->currentItem(); + TQListViewItem *i = itemsPreview->currentItem(); if ( !i ) return; - QPixmap pix; + TQPixmap pix; if ( itemPixmap->pixmap() ) pix = qChoosePixmap( this, formwindow, *itemPixmap->pixmap() ); else - pix = qChoosePixmap( this, formwindow, QPixmap() ); + pix = qChoosePixmap( this, formwindow, TQPixmap() ); if ( pix.isNull() ) return; - i->setPixmap( itemColumn->value(), QPixmap( pix ) ); + i->setPixmap( itemColumn->value(), TQPixmap( pix ) ); itemPixmap->setPixmap( pix ); itemDeletePixmap->setEnabled( TRUE ); } void ListViewEditor::itemPixmapDeleted() { - QListViewItem *i = itemsPreview->currentItem(); + TQListViewItem *i = itemsPreview->currentItem(); if ( !i ) return; - i->setPixmap( itemColumn->value(), QPixmap() ); + i->setPixmap( itemColumn->value(), TQPixmap() ); itemPixmap->setText( "" ); itemDeletePixmap->setEnabled( FALSE ); } -void ListViewEditor::itemTextChanged( const QString &txt ) +void ListViewEditor::itemTextChanged( const TQString &txt ) { - QListViewItem *i = itemsPreview->currentItem(); + TQListViewItem *i = itemsPreview->currentItem(); if ( !i ) return; i->setText( itemColumn->value(), txt ); @@ -461,12 +461,12 @@ void ListViewEditor::itemTextChanged( const QString &txt ) void ListViewEditor::itemUpClicked() { - QListViewItem *i = itemsPreview->currentItem(); + TQListViewItem *i = itemsPreview->currentItem(); if ( !i ) return; - QListViewItemIterator it( i ); - QListViewItem *parent = i->parent(); + TQListViewItemIterator it( i ); + TQListViewItem *parent = i->parent(); --it; while ( it.current() ) { if ( it.current()->parent() == parent ) @@ -476,19 +476,19 @@ void ListViewEditor::itemUpClicked() if ( !it.current() ) return; - QListViewItem *other = it.current(); + TQListViewItem *other = it.current(); other->moveItem( i ); } void ListViewEditor::itemRightClicked() { - QListViewItem *i = itemsPreview->currentItem(); + TQListViewItem *i = itemsPreview->currentItem(); if ( !i ) return; - QListViewItemIterator it( i ); - QListViewItem *parent = i->parent(); + TQListViewItemIterator it( i ); + TQListViewItem *parent = i->parent(); parent = parent ? parent->firstChild() : itemsPreview->firstChild(); if ( !parent ) return; @@ -501,19 +501,19 @@ void ListViewEditor::itemRightClicked() if ( !it.current() ) return; - QListViewItem *other = it.current(); + TQListViewItem *other = it.current(); for ( int c = 0; c < itemsPreview->columns(); ++c ) { - QString s = i->text( c ); + TQString s = i->text( c ); i->setText( c, other->text( c ) ); other->setText( c, s ); - QPixmap pix; + TQPixmap pix; if ( i->pixmap( c ) ) pix = *i->pixmap( c ); if ( other->pixmap( c ) ) i->setPixmap( c, *other->pixmap( c ) ); else - i->setPixmap( c, QPixmap() ); + i->setPixmap( c, TQPixmap() ); other->setPixmap( c, pix ); } @@ -523,12 +523,12 @@ void ListViewEditor::itemRightClicked() void ListViewEditor::itemLeftClicked() { - QListViewItem *i = itemsPreview->currentItem(); + TQListViewItem *i = itemsPreview->currentItem(); if ( !i ) return; - QListViewItemIterator it( i ); - QListViewItem *parent = i->parent(); + TQListViewItemIterator it( i ); + TQListViewItem *parent = i->parent(); if ( !parent ) return; parent = parent->parent(); @@ -541,19 +541,19 @@ void ListViewEditor::itemLeftClicked() if ( !it.current() ) return; - QListViewItem *other = it.current(); + TQListViewItem *other = it.current(); for ( int c = 0; c < itemsPreview->columns(); ++c ) { - QString s = i->text( c ); + TQString s = i->text( c ); i->setText( c, other->text( c ) ); other->setText( c, s ); - QPixmap pix; + TQPixmap pix; if ( i->pixmap( c ) ) pix = *i->pixmap( c ); if ( other->pixmap( c ) ) i->setPixmap( c, *other->pixmap( c ) ); else - i->setPixmap( c, QPixmap() ); + i->setPixmap( c, TQPixmap() ); other->setPixmap( c, pix ); } @@ -563,19 +563,19 @@ void ListViewEditor::itemLeftClicked() void ListViewEditor::setupColumns() { - QHeader *h = listview->header(); + TQHeader *h = listview->header(); for ( int i = 0; i < (int)h->count(); ++i ) { Column col; col.text = h->label( i ); - col.pixmap = QPixmap(); + col.pixmap = TQPixmap(); if ( h->iconSet( i ) ) col.pixmap = h->iconSet( i )->pixmap(); col.clickable = h->isClickEnabled( i ); col.resizable = h->isResizeEnabled( i ); if ( !col.pixmap.isNull() ) - col.item = new QListBoxPixmap( colPreview, col.pixmap, col.text ); + col.item = new TQListBoxPixmap( colPreview, col.pixmap, col.text ); else - col.item = new QListBoxText( colPreview, col.text ); + col.item = new TQListBoxText( colPreview, col.text ); columns.append( col ); } @@ -594,8 +594,8 @@ void ListViewEditor::setupItems() itemColumn->setMinValue( 0 ); itemColumn->setMaxValue( QMAX( numColumns - 1, 0 ) ); int i = 0; - QHeader *header = itemsPreview->header(); - for ( QListBoxItem *item = colPreview->firstItem(); item; item = item->next() ) { + TQHeader *header = itemsPreview->header(); + for ( TQListBoxItem *item = colPreview->firstItem(); item; item = item->next() ) { Column *col = findColumn( item ); if ( !col ) continue; @@ -612,12 +612,12 @@ void ListViewEditor::setupItems() itemColumn->setValue( QMIN( numColumns - 1, itemColumn->value() ) ); } -ListViewEditor::Column *ListViewEditor::findColumn( QListBoxItem *i ) +ListViewEditor::Column *ListViewEditor::findColumn( TQListBoxItem *i ) { if ( !i ) return 0; - for ( QValueList::Iterator it = columns.begin(); it != columns.end(); ++it ) { + for ( TQValueList::Iterator it = columns.begin(); it != columns.end(); ++it ) { if ( ( *it ).item == i ) return &( *it ); } @@ -625,7 +625,7 @@ ListViewEditor::Column *ListViewEditor::findColumn( QListBoxItem *i ) return 0; } -void ListViewEditor::initTabPage( const QString &page ) +void ListViewEditor::initTabPage( const TQString &page ) { numColumns = colPreview->count(); if ( page == i18n( "&Items" ) ) { @@ -644,7 +644,7 @@ void ListViewEditor::initTabPage( const QString &page ) } } -void ListViewEditor::emitItemRenamed( QListViewItem *, int, const QString & text ) +void ListViewEditor::emitItemRenamed( TQListViewItem *, int, const TQString & text ) { - emit itemRenamed( text ); // Relay signal ( to QLineEdit ) + emit itemRenamed( text ); // Relay signal ( to TQLineEdit ) } diff --git a/kdevdesigner/designer/listvieweditorimpl.h b/kdevdesigner/designer/listvieweditorimpl.h index 476e47ca..cdeeabe6 100644 --- a/kdevdesigner/designer/listvieweditorimpl.h +++ b/kdevdesigner/designer/listvieweditorimpl.h @@ -29,9 +29,9 @@ #include "listvieweditor.h" -#include -#include -#include +#include +#include +#include class FormWindow; @@ -40,10 +40,10 @@ class ListViewEditor : public ListViewEditorBase Q_OBJECT public: - ListViewEditor( QWidget *parent, QListView *lv, FormWindow *fw ); + ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ); signals: - void itemRenamed(const QString &); + void itemRenamed(const TQString &); protected slots: void applyClicked(); @@ -52,10 +52,10 @@ protected slots: void columnPixmapChosen(); void columnPixmapDeleted(); void columnResizable(bool); - void columnTextChanged(const QString &); + void columnTextChanged(const TQString &); void columnUpClicked(); - void currentColumnChanged(QListBoxItem*); - void currentItemChanged(QListViewItem*); + void currentColumnChanged(TQListBoxItem*); + void currentItemChanged(TQListViewItem*); void deleteColumnClicked(); void itemColChanged(int); void itemDeleteClicked(); @@ -64,21 +64,21 @@ protected slots: void itemNewSubClicked(); void itemPixmapChoosen(); void itemPixmapDeleted(); - void itemTextChanged(const QString &); + void itemTextChanged(const TQString &); void itemUpClicked(); void itemLeftClicked(); void itemRightClicked(); void newColumnClicked(); void okClicked(); - void initTabPage(const QString &page); - void emitItemRenamed(QListViewItem*, int, const QString&); // signal relay + void initTabPage(const TQString &page); + void emitItemRenamed(TQListViewItem*, int, const TQString&); // signal relay private: struct Column { - QListBoxItem *item; - QString text; - QPixmap pixmap; + TQListBoxItem *item; + TQString text; + TQPixmap pixmap; bool clickable, resizable; Q_DUMMY_COMPARISON_OPERATOR( Column ) }; @@ -86,13 +86,13 @@ private: private: void setupColumns(); void setupItems(); - Column *findColumn( QListBoxItem *i ); - void transferItems( QListView *from, QListView *to ); - void displayItem( QListViewItem *i, int col ); + Column *findColumn( TQListBoxItem *i ); + void transferItems( TQListView *from, TQListView *to ); + void displayItem( TQListViewItem *i, int col ); private: - QListView *listview; - QValueList columns; + TQListView *listview; + TQValueList columns; int numColumns; FormWindow *formwindow; diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index 530d9b07..874a410d 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -47,12 +47,12 @@ #include "actiondnd.h" #include "project.h" #include "projectsettingsimpl.h" -#include "qwidgetfactory.h" +#include "tqwidgetfactory.h" #include "pixmapcollection.h" #include "qcompletionedit.h" #include "sourcefile.h" #include "orderindicator.h" -#include +#include #include "widgetaction.h" #include "propertyobject.h" #include "popupmenueditor.h" @@ -84,63 +84,63 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include "kdevdesigner_part.h" static bool mblockNewForms = FALSE; -extern QMap *qwf_forms; -extern QString *qwf_language; +extern TQMap *qwf_forms; +extern TQString *qwf_language; extern bool qwf_execute_code; extern bool qwf_stays_on_top; -extern void set_splash_status( const QString &txt ); -extern QObject* qwf_form_object; -extern QString *qwf_plugin_dir; +extern void set_splash_status( const TQString &txt ); +extern TQObject* qwf_form_object; +extern TQString *qwf_plugin_dir; MainWindow *MainWindow::self = 0; -QString assistantPath() +TQString assistantPath() { - QString path = QDir::cleanDirPath( QString( qInstallPathBins() ) + - QDir::separator() ); + TQString path = TQDir::cleanDirPath( TQString( qInstallPathBins() ) + + TQDir::separator() ); return path; } -static QString textNoAccel( const QString& text) +static TQString textNoAccel( const TQString& text) { - QString t = text; + TQString t = text; int i; while ( (i = t.find('&') )>= 0 ) { t.remove(i,1); @@ -149,8 +149,8 @@ static QString textNoAccel( const QString& text) } -MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, const QString &plgDir ) - : QMainWindow( 0, "designer_mainwindow"/*, WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader*/ ), +MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, const TQString &plgDir ) + : TQMainWindow( 0, "designer_mainwindow"/*, WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader*/ ), grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), fileFilter( i18n( "Qt User-Interface Files (*.ui)" ) ), client( asClient ), previewing( FALSE ), databaseAutoEdit( FALSE ), autoSaveEnabled( FALSE ), autoSaveInterval( 1800 ), m_part(part) @@ -172,20 +172,20 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons inDebugMode = FALSE; savePluginPaths = FALSE; - updateFunctionsTimer = new QTimer( this ); - connect( updateFunctionsTimer, SIGNAL( timeout() ), - this, SLOT( doFunctionsChanged() ) ); + updateFunctionsTimer = new TQTimer( this ); + connect( updateFunctionsTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( doFunctionsChanged() ) ); - autoSaveTimer = new QTimer( this ); - connect( autoSaveTimer, SIGNAL( timeout() ), - this, SLOT( fileSaveAll() ) ); + autoSaveTimer = new TQTimer( this ); + connect( autoSaveTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( fileSaveAll() ) ); set_splash_status( "Loading Plugins..." ); setupPluginManagers(); /* if ( !single ) qApp->setMainWidget( this );*/ - QWidgetFactory::addWidgetFactory( new CustomWidgetFactory ); + TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory ); #ifndef Q_WS_MACX setIcon( BarIcon( "designer_appicon.png", KDevDesignerPartFactory::instance() ) ); #endif @@ -202,10 +202,10 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons statusBar()->clear(); #if defined(QT_NON_COMMERCIAL) - statusBar()->addWidget( new QLabel(i18n("Ready - This is the non-commercial version of Qt - " + statusBar()->addWidget( new TQLabel(i18n("Ready - This is the non-commercial version of Qt - " "For commercial evaluations, use the help menu to register with Trolltech."), statusBar()), 1 ); #else - statusBar()->addWidget( new QLabel("Ready", statusBar()), 1 ); + statusBar()->addWidget( new TQLabel("Ready", statusBar()), 1 ); #endif @@ -219,8 +219,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons setupEditActions(); setupProjectActions(); setupSearchActions(); - layoutToolBar = new QToolBar( this, "Layout" ); - layoutToolBar->setCloseMode( QDockWindow::Undocked ); + layoutToolBar = new TQToolBar( this, "Layout" ); + layoutToolBar->setCloseMode( TQDockWindow::Undocked ); addToolBar( layoutToolBar, i18n( "Layout" ) ); interpreterPluginManager = 0; setupToolActions(); @@ -239,8 +239,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons setupRMBMenus(); - connect( this, SIGNAL( projectChanged() ), this, SLOT( emitProjectSignals() ) ); - connect( this, SIGNAL( hasActiveWindow(bool) ), this, SLOT( emitProjectSignals() ) ); + connect( this, TQT_SIGNAL( projectChanged() ), this, TQT_SLOT( emitProjectSignals() ) ); + connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), this, TQT_SLOT( emitProjectSignals() ) ); emit hasActiveForm( FALSE ); emit hasActiveWindow( FALSE ); @@ -248,12 +248,12 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons lastPressWidget = 0; qApp->installEventFilter( this ); - QSize as( qApp->desktop()->size() ); - as -= QSize( 30, 30 ); - resize( QSize( 1200, 1000 ).boundedTo( as ) ); + TQSize as( qApp->desktop()->size() ); + as -= TQSize( 30, 30 ); + resize( TQSize( 1200, 1000 ).boundedTo( as ) ); - connect( qApp->clipboard(), SIGNAL( dataChanged() ), - this, SLOT( clipboardChanged() ) ); + connect( qApp->clipboard(), TQT_SIGNAL( dataChanged() ), + this, TQT_SLOT( clipboardChanged() ) ); clipboardChanged(); layoutChilds = FALSE; layoutSelected = FALSE; @@ -262,18 +262,18 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons set_splash_status( "Loading User Settings..." ); readConfig(); - // hack to make WidgetFactory happy (so it knows QWidget and QDialog for resetting properties) - QWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QWidget" ), this, 0, FALSE ); + // hack to make WidgetFactory happy (so it knows TQWidget and TQDialog for resetting properties) + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ), this, 0, FALSE ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QDialog" ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), this, 0, FALSE ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QLabel" ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLabel" ), this, 0, FALSE ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QTabWidget" ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQTabWidget" ), this, 0, FALSE ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QFrame" ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this, 0, FALSE ); delete w; - setAppropriate( (QDockWindow*)actionEditor->parentWidget(), FALSE ); + setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), FALSE ); actionEditor->parentWidget()->hide(); assistant = new QAssistantClient( assistantPath(), this ); @@ -281,7 +281,7 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons statusBar()->setSizeGripEnabled( TRUE ); set_splash_status( "Initialization Done." ); /* if ( shStartDialog ) - QTimer::singleShot( 0, this, SLOT( showStartDialog() ));*/ + TQTimer::singleShot( 0, this, TQT_SLOT( showStartDialog() ));*/ if ( autoSaveEnabled ) autoSaveTimer->start( autoSaveInterval * 1000 ); @@ -291,7 +291,7 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons MainWindow::~MainWindow() { - QValueList::Iterator tit; + TQValueList::Iterator tit; for ( tit = preferenceTabs.begin(); tit != preferenceTabs.end(); ++tit ) { Tab t = *tit; delete t.w; @@ -301,7 +301,7 @@ MainWindow::~MainWindow() delete t.w; } - QMap< QAction*, Project* >::Iterator it = projects.begin(); + TQMap< TQAction*, Project* >::Iterator it = projects.begin(); while ( it != projects.end() ) { Project *p = *it; ++it; @@ -330,16 +330,16 @@ MainWindow::~MainWindow() void MainWindow::setupMDI() { - QVBox *vbox = new QVBox( this ); + TQVBox *vbox = new TQVBox( this ); setCentralWidget( vbox ); - vbox->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + vbox->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); vbox->setMargin( 1 ); vbox->setLineWidth( 1 ); - qworkspace = new QWorkspace( vbox ); + qworkspace = new TQWorkspace( vbox ); qworkspace->setPaletteBackgroundPixmap( UserIcon( "designer_background.png", KDevDesignerPartFactory::instance() ) ); qworkspace->setScrollBarsEnabled( TRUE ); - connect( qworkspace, SIGNAL( windowActivated( QWidget * ) ), - this, SLOT( activeWindowChanged( QWidget * ) ) ); + connect( qworkspace, TQT_SIGNAL( windowActivated( TQWidget * ) ), + this, TQT_SLOT( activeWindowChanged( TQWidget * ) ) ); lastActiveFormWindow = 0; qworkspace->setAcceptDrops( TRUE ); } @@ -351,15 +351,15 @@ void MainWindow::setupMenuBar() void MainWindow::setupPropertyEditor() { - QDockWindow *dw = new QDockWindow( QDockWindow::InDock, this ); + TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); dw->setResizeEnabled( TRUE ); - dw->setCloseMode( QDockWindow::Always ); + dw->setCloseMode( TQDockWindow::Always ); propertyEditor = new PropertyEditor( dw ); addToolBar( dw, Qt::DockRight ); dw->setWidget( propertyEditor ); dw->setFixedExtentWidth( 250 ); dw->setCaption( i18n( "Property Editor/Signal Handlers" ) ); - QWhatsThis::add( propertyEditor, + TQWhatsThis::add( propertyEditor, i18n("The Property Editor" "

You can change the appearance and behavior of the selected widget in the " "property editor.

" @@ -380,9 +380,9 @@ void MainWindow::setupPropertyEditor() void MainWindow::setupOutputWindow() { - QDockWindow *dw = new QDockWindow( QDockWindow::InDock, this ); + TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); dw->setResizeEnabled( TRUE ); - dw->setCloseMode( QDockWindow::Always ); + dw->setCloseMode( TQDockWindow::Always ); addToolBar( dw, Qt::DockBottom ); oWindow = new OutputWindow( dw ); dw->setWidget( oWindow ); @@ -394,16 +394,16 @@ void MainWindow::setupHierarchyView() { if ( hierarchyView ) return; - QDockWindow *dw = new QDockWindow( QDockWindow::InDock, this ); + TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); dw->setResizeEnabled( TRUE ); - dw->setCloseMode( QDockWindow::Always ); + dw->setCloseMode( TQDockWindow::Always ); hierarchyView = new HierarchyView( dw ); addToolBar( dw, Qt::DockRight ); dw->setWidget( hierarchyView ); dw->setCaption( i18n( "Object Explorer" ) ); dw->setFixedExtentWidth( 250 ); - QWhatsThis::add( hierarchyView, + TQWhatsThis::add( hierarchyView, i18n("The Object Explorer" "

The Object Explorer provides an overview of the relationships " "between the widgets in a form. You can use the clipboard functions using " @@ -416,14 +416,14 @@ void MainWindow::setupHierarchyView() void MainWindow::setupWorkspace() { - QDockWindow *dw = new QDockWindow( QDockWindow::InDock, this ); + TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); dw->setResizeEnabled( TRUE ); - dw->setCloseMode( QDockWindow::Always ); - QVBox *vbox = new QVBox( dw ); + dw->setCloseMode( TQDockWindow::Always ); + TQVBox *vbox = new TQVBox( dw ); QCompletionEdit *edit = new QCompletionEdit( vbox ); - QToolTip::add( edit, i18n( "Start typing the buffer you want to switch to here (ALT+B)" ) ); - QAccel *a = new QAccel( this ); - a->connectItem( a->insertItem( ALT + Key_B ), edit, SLOT( setFocus() ) ); + TQToolTip::add( edit, i18n( "Start typing the buffer you want to switch to here (ALT+B)" ) ); + TQAccel *a = new TQAccel( this ); + a->connectItem( a->insertItem( ALT + Key_B ), edit, TQT_SLOT( setFocus() ) ); wspace = new Workspace( vbox, this ); wspace->setBufferEdit( edit ); wspace->setCurrentProject( currentProject ); @@ -431,7 +431,7 @@ void MainWindow::setupWorkspace() dw->setWidget( vbox ); dw->setCaption( i18n( "Project Overview" ) ); - QWhatsThis::add( wspace, i18n("The Project Overview Window" + TQWhatsThis::add( wspace, i18n("The Project Overview Window" "

The Project Overview Window displays all the current " "project, including forms and source files.

" "

Use the search field to rapidly switch between files.

")); @@ -441,15 +441,15 @@ void MainWindow::setupWorkspace() void MainWindow::setupActionEditor() { - QDockWindow *dw = new QDockWindow( QDockWindow::OutsideDock, this, 0 ); + TQDockWindow *dw = new TQDockWindow( TQDockWindow::OutsideDock, this, 0 ); addDockWindow( dw, Qt::DockTornOff ); dw->setResizeEnabled( TRUE ); - dw->setCloseMode( QDockWindow::Always ); + dw->setCloseMode( TQDockWindow::Always ); actionEditor = new ActionEditor( dw ); dw->setWidget( actionEditor ); actionEditor->show(); dw->setCaption( i18n( "Action Editor" ) ); - QWhatsThis::add( actionEditor, i18n("The Action Editor" + TQWhatsThis::add( actionEditor, i18n("The Action Editor" "

The Action Editor is used to add actions and action groups to " "a form, and to connect actions to slots. Actions and action " "groups can be dragged into menus and into toolbars, and may " @@ -462,19 +462,19 @@ void MainWindow::setupActionEditor() void MainWindow::setupToolbox() { - QDockWindow *dw = new QDockWindow( QDockWindow::InDock, this ); + TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); dw->setResizeEnabled( TRUE ); - dw->setCloseMode( QDockWindow::Always ); + dw->setCloseMode( TQDockWindow::Always ); addToolBar( dw, Qt::DockLeft ); - toolBox = new QToolBox( dw ); + toolBox = new TQToolBox( dw ); dw->setWidget( toolBox ); dw->setFixedExtentWidth( 160 ); dw->setCaption( i18n( "Toolbox" ) ); dw->show(); setDockEnabled( dw, Qt::DockTop, FALSE ); setDockEnabled( dw, Qt::DockBottom, FALSE ); - commonWidgetsToolBar = new QToolBar( "Common Widgets", 0, toolBox, FALSE, "Common Widgets" ); - commonWidgetsToolBar->setFrameStyle( QFrame::NoFrame ); + commonWidgetsToolBar = new TQToolBar( "Common Widgets", 0, toolBox, FALSE, "Common Widgets" ); + commonWidgetsToolBar->setFrameStyle( TQFrame::NoFrame ); commonWidgetsToolBar->setOrientation( Qt::Vertical ); commonWidgetsToolBar->setBackgroundMode(PaletteBase); toolBox->addItem( commonWidgetsToolBar, "Common Widgets" ); @@ -482,7 +482,7 @@ void MainWindow::setupToolbox() void MainWindow::setupRMBMenus() { - rmbWidgets = new QPopupMenu( this ); + rmbWidgets = new TQPopupMenu( this ); actionEditCut->addTo( rmbWidgets ); actionEditCopy->addTo( rmbWidgets ); actionEditPaste->addTo( rmbWidgets ); @@ -505,7 +505,7 @@ void MainWindow::setupRMBMenus() actionEditConnections->addTo( rmbWidgets ); actionEditSource->addTo( rmbWidgets ); - rmbFormWindow = new QPopupMenu( this ); + rmbFormWindow = new TQPopupMenu( this ); actionEditPaste->addTo( rmbFormWindow ); actionEditSelectAll->addTo( rmbFormWindow ); actionEditAccels->addTo( rmbFormWindow ); @@ -525,7 +525,7 @@ void MainWindow::setupRMBMenus() actionEditFormSettings->addTo( rmbFormWindow ); } -void MainWindow::toolSelected( QAction* action ) +void MainWindow::toolSelected( TQAction* action ) { actionCurrentTool = action; emit currentToolChanged(); @@ -537,7 +537,7 @@ int MainWindow::currentTool() const { if ( !actionCurrentTool ) return POINTER_TOOL; - return QString::fromLatin1(actionCurrentTool->name()).toInt(); + return TQString::fromLatin1(actionCurrentTool->name()).toInt(); } void MainWindow::runProjectPrecondition() @@ -556,7 +556,7 @@ void MainWindow::runProjectPrecondition() previewing = TRUE; } -void MainWindow::runProjectPostcondition( QObjectList *l ) +void MainWindow::runProjectPostcondition( TQObjectList *l ) { inDebugMode = TRUE; debuggingForms = *l; @@ -567,7 +567,7 @@ void MainWindow::runProjectPostcondition( QObjectList *l ) } } -QWidget* MainWindow::previewFormInternal( QStyle* style, QPalette* palet ) +TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet ) { qwf_execute_code = FALSE; for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) @@ -579,34 +579,34 @@ QWidget* MainWindow::previewFormInternal( QStyle* style, QPalette* palet ) if ( !fw ) return 0; - QStringList databases; - QPtrDictIterator wit( *fw->widgets() ); + TQStringList databases; + TQPtrDictIterator wit( *fw->widgets() ); while ( wit.current() ) { - QStringList lst = MetaDataBase::fakeProperty( wit.current(), "database" ).toStringList(); + TQStringList lst = MetaDataBase::fakeProperty( wit.current(), "database" ).toStringList(); if ( !lst.isEmpty() ) databases << lst [ 0 ]; ++wit; } if ( fw->project() ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = databases.begin(); it != databases.end(); ++it ) fw->project()->openDatabase( *it, FALSE ); } - QApplication::setOverrideCursor( WaitCursor ); + TQApplication::setOverrideCursor( WaitCursor ); - QCString s; - QBuffer buffer( s ); + TQCString s; + TQBuffer buffer( s ); buffer.open( IO_WriteOnly ); Resource resource( this ); resource.setWidget( fw ); - QValueList images; + TQValueList images; resource.save( &buffer ); buffer.close(); buffer.open( IO_ReadOnly ); - QWidget *w = QWidgetFactory::create( &buffer ); + TQWidget *w = TQWidgetFactory::create( &buffer ); if ( w ) { previewedForm = w; if ( palet ) { @@ -618,78 +618,78 @@ QWidget* MainWindow::previewFormInternal( QStyle* style, QPalette* palet ) if ( style ) w->setStyle( style ); - QObjectList *l = w->queryList( "QWidget" ); - for ( QObject *o = l->first(); o; o = l->next() ) { + TQObjectList *l = w->queryList( "TQWidget" ); + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( style ) - ( (QWidget*)o )->setStyle( style ); + ( (TQWidget*)o )->setStyle( style ); } delete l; - w->move( fw->mapToGlobal( QPoint(0,0) ) ); + w->move( fw->mapToGlobal( TQPoint(0,0) ) ); ((MainWindow*)w )->setWFlags( WDestructiveClose ); previewing = TRUE; w->show(); previewing = FALSE; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return w; } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return 0; } void MainWindow::previewForm() { - QWidget* w = previewFormInternal(); + TQWidget* w = previewFormInternal(); if ( w ) w->show(); } -void MainWindow::previewForm( const QString & style ) +void MainWindow::previewForm( const TQString & style ) { - QStyle* st = QStyleFactory::create( style ); - QWidget* w = 0; + TQStyle* st = TQStyleFactory::create( style ); + TQWidget* w = 0; if ( style == "Motif" ) { - QPalette p( QColor( 192, 192, 192 ) ); + TQPalette p( TQColor( 192, 192, 192 ) ); w = previewFormInternal( st, &p ); } else if ( style == "Windows" ) { - QPalette p( QColor( 212, 208, 200 ) ); + TQPalette p( TQColor( 212, 208, 200 ) ); w = previewFormInternal( st, &p ); } else if ( style == "Platinum" ) { - QPalette p( QColor( 220, 220, 220 ) ); + TQPalette p( TQColor( 220, 220, 220 ) ); w = previewFormInternal( st, &p ); } else if ( style == "CDE" ) { - QPalette p( QColor( 75, 123, 130 ) ); - p.setColor( QPalette::Active, QColorGroup::Base, QColor( 55, 77, 78 ) ); - p.setColor( QPalette::Inactive, QColorGroup::Base, QColor( 55, 77, 78 ) ); - p.setColor( QPalette::Disabled, QColorGroup::Base, QColor( 55, 77, 78 ) ); - p.setColor( QPalette::Active, QColorGroup::Highlight, Qt::white ); - p.setColor( QPalette::Active, QColorGroup::HighlightedText, QColor( 55, 77, 78 ) ); - p.setColor( QPalette::Inactive, QColorGroup::Highlight, Qt::white ); - p.setColor( QPalette::Inactive, QColorGroup::HighlightedText, QColor( 55, 77, 78 ) ); - p.setColor( QPalette::Disabled, QColorGroup::Highlight, Qt::white ); - p.setColor( QPalette::Disabled, QColorGroup::HighlightedText, QColor( 55, 77, 78 ) ); - p.setColor( QPalette::Active, QColorGroup::Foreground, Qt::white ); - p.setColor( QPalette::Active, QColorGroup::Text, Qt::white ); - p.setColor( QPalette::Active, QColorGroup::ButtonText, Qt::white ); - p.setColor( QPalette::Inactive, QColorGroup::Foreground, Qt::white ); - p.setColor( QPalette::Inactive, QColorGroup::Text, Qt::white ); - p.setColor( QPalette::Inactive, QColorGroup::ButtonText, Qt::white ); - p.setColor( QPalette::Disabled, QColorGroup::Foreground, Qt::lightGray ); - p.setColor( QPalette::Disabled, QColorGroup::Text, Qt::lightGray ); - p.setColor( QPalette::Disabled, QColorGroup::ButtonText, Qt::lightGray ); + TQPalette p( TQColor( 75, 123, 130 ) ); + p.setColor( TQPalette::Active, TQColorGroup::Base, TQColor( 55, 77, 78 ) ); + p.setColor( TQPalette::Inactive, TQColorGroup::Base, TQColor( 55, 77, 78 ) ); + p.setColor( TQPalette::Disabled, TQColorGroup::Base, TQColor( 55, 77, 78 ) ); + p.setColor( TQPalette::Active, TQColorGroup::Highlight, Qt::white ); + p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TQColor( 55, 77, 78 ) ); + p.setColor( TQPalette::Inactive, TQColorGroup::Highlight, Qt::white ); + p.setColor( TQPalette::Inactive, TQColorGroup::HighlightedText, TQColor( 55, 77, 78 ) ); + p.setColor( TQPalette::Disabled, TQColorGroup::Highlight, Qt::white ); + p.setColor( TQPalette::Disabled, TQColorGroup::HighlightedText, TQColor( 55, 77, 78 ) ); + p.setColor( TQPalette::Active, TQColorGroup::Foreground, Qt::white ); + p.setColor( TQPalette::Active, TQColorGroup::Text, Qt::white ); + p.setColor( TQPalette::Active, TQColorGroup::ButtonText, Qt::white ); + p.setColor( TQPalette::Inactive, TQColorGroup::Foreground, Qt::white ); + p.setColor( TQPalette::Inactive, TQColorGroup::Text, Qt::white ); + p.setColor( TQPalette::Inactive, TQColorGroup::ButtonText, Qt::white ); + p.setColor( TQPalette::Disabled, TQColorGroup::Foreground, Qt::lightGray ); + p.setColor( TQPalette::Disabled, TQColorGroup::Text, Qt::lightGray ); + p.setColor( TQPalette::Disabled, TQColorGroup::ButtonText, Qt::lightGray ); w = previewFormInternal( st, &p ); } else if ( style == "SGI" ) { - QPalette p( QColor( 220, 220, 220 ) ); + TQPalette p( TQColor( 220, 220, 220 ) ); w = previewFormInternal( st, &p ); } else if ( style == "MotifPlus" ) { - QColor gtkfg(0x00, 0x00, 0x00); - QColor gtkdf(0x75, 0x75, 0x75); - QColor gtksf(0xff, 0xff, 0xff); - QColor gtkbs(0xff, 0xff, 0xff); - QColor gtkbg(0xd6, 0xd6, 0xd6); - QColor gtksl(0x00, 0x00, 0x9c); - QColorGroup active(gtkfg, // foreground + TQColor gtkfg(0x00, 0x00, 0x00); + TQColor gtkdf(0x75, 0x75, 0x75); + TQColor gtksf(0xff, 0xff, 0xff); + TQColor gtkbs(0xff, 0xff, 0xff); + TQColor gtkbg(0xd6, 0xd6, 0xd6); + TQColor gtksl(0x00, 0x00, 0x9c); + TQColorGroup active(gtkfg, // foreground gtkbg, // button gtkbg.light(), // light gtkbg.dark(142), // dark @@ -708,19 +708,19 @@ void MainWindow::previewForm( const QString & style ) gtkbs, // base gtkbg); // background - QPalette pal(active, disabled, active); + TQPalette pal(active, disabled, active); - pal.setColor(QPalette::Active, QColorGroup::Highlight, + pal.setColor(TQPalette::Active, TQColorGroup::Highlight, gtksl); - pal.setColor(QPalette::Active, QColorGroup::HighlightedText, + pal.setColor(TQPalette::Active, TQColorGroup::HighlightedText, gtksf); - pal.setColor(QPalette::Inactive, QColorGroup::Highlight, + pal.setColor(TQPalette::Inactive, TQColorGroup::Highlight, gtksl); - pal.setColor(QPalette::Inactive, QColorGroup::HighlightedText, + pal.setColor(TQPalette::Inactive, TQColorGroup::HighlightedText, gtksf); - pal.setColor(QPalette::Disabled, QColorGroup::Highlight, + pal.setColor(TQPalette::Disabled, TQColorGroup::Highlight, gtksl); - pal.setColor(QPalette::Disabled, QColorGroup::HighlightedText, + pal.setColor(TQPalette::Disabled, TQColorGroup::HighlightedText, gtkdf); w = previewFormInternal( st, &pal ); } else { @@ -735,7 +735,7 @@ void MainWindow::previewForm( const QString & style ) void MainWindow::helpContents() { - QWidget *focusWidget = qApp->focusWidget(); + TQWidget *focusWidget = qApp->focusWidget(); bool showClassDocu = TRUE; while ( focusWidget ) { if ( focusWidget->isA( "PropertyList" ) ) { @@ -745,14 +745,14 @@ void MainWindow::helpContents() focusWidget = focusWidget->parentWidget(); } - QString source = "designer-manual.html"; + TQString source = "designer-manual.html"; if ( propertyDocumentation.isEmpty() ) { - QString indexFile = documentationPath() + "/propertyindex"; - QFile f( indexFile ); + TQString indexFile = documentationPath() + "/propertyindex"; + TQFile f( indexFile ); if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); + TQTextStream ts( &f ); while ( !ts.eof() ) { - QString s = ts.readLine(); + TQString s = ts.readLine(); int from = s.find( "\"" ); if ( from == -1 ) continue; @@ -767,39 +767,39 @@ void MainWindow::helpContents() if ( propertyEditor->widget() && !showClassDocu ) { if ( !propertyEditor->currentProperty().isEmpty() ) { - QMetaObject* mo = propertyEditor->metaObjectOfCurrentProperty(); - QString s; - QString cp = propertyEditor->currentProperty(); + TQMetaObject* mo = propertyEditor->metaObjectOfCurrentProperty(); + TQString s; + TQString cp = propertyEditor->currentProperty(); if ( cp == "layoutMargin" ) { source = propertyDocumentation[ "QLayout/margin" ]; } else if ( cp == "layoutSpacing" ) { source = propertyDocumentation[ "QLayout/spacing" ]; } else if ( cp == "toolTip" ) { - source = "qtooltip.html#details"; + source = "tqtooltip.html#details"; } else if ( mo && qstrcmp( mo->className(), "Spacer" ) == 0 ) { if ( cp != "name" ) - source = "qsizepolicy.html#SizeType"; + source = "tqsizepolicy.html#SizeType"; else source = propertyDocumentation[ "QObject/name" ]; } else { - while ( mo && !propertyDocumentation.contains( ( s = QString( mo->className() ) + "/" + cp ) ) ) + while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) mo = mo->superClass(); if ( mo ) source = "p:" + propertyDocumentation[s]; } } - QString classname = WidgetFactory::classNameOf( propertyEditor->widget() ); + TQString classname = WidgetFactory::classNameOf( propertyEditor->widget() ); if ( source.isEmpty() || source == "designer-manual.html" ) { if ( classname.lower() == "spacer" ) source = "qspaceritem.html#details"; else if ( classname == "QLayoutWidget" ) source = "layout.html"; else - source = QString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details"; + source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details"; } } else if ( propertyEditor->widget() ) { - source = QString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details"; + source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details"; } if ( !source.isEmpty() ) @@ -821,19 +821,19 @@ void MainWindow::helpAbout() LanguageInterface *iface = MetaDataBase::languageInterface( eProject->language() ); dlg.aboutLicense->setText( iface->aboutText() ); } - dlg.aboutVersion->setText(QString("Version ") + QString(QT_VERSION_STR)); + dlg.aboutVersion->setText(TQString("Version ") + TQString(QT_VERSION_STR)); dlg.resize( dlg.width(), dlg.layout()->heightForWidth(dlg.width()) ); dlg.exec(); } void MainWindow::helpAboutQt() { - QMessageBox::aboutQt( this, "Qt Designer" ); + TQMessageBox::aboutQt( this, "Qt Designer" ); } #if defined(_WS_WIN_) #include -#include +#include #endif void MainWindow::helpRegister() @@ -844,10 +844,10 @@ void MainWindow::helpRegister() long res; DWORD type; DWORD size = 255; - QString command; - QString sub( "htmlfile\\shell" ); + TQString command; + TQString sub( "htmlfile\\shell" ); #if defined(UNICODE) - if ( QApplication::winVersion() & Qt::WV_NT_based ) { + if ( TQApplication::winVersion() & Qt::WV_NT_based ) { unsigned char data[256]; res = RegOpenKeyExW( HKEY_CLASSES_ROOT, NULL, 0, KEY_READ, &key ); res = RegOpenKeyExW( key, (TCHAR*)sub.ucs2(), 0, KEY_READ, &subkey ); @@ -864,24 +864,24 @@ void MainWindow::helpRegister() res = RegOpenKeyExA( HKEY_CLASSES_ROOT, NULL, 0, KEY_READ, &key ); res = RegOpenKeyExA( key, sub.local8Bit(), 0, KEY_READ, &subkey ); res = RegQueryValueExA( subkey, NULL, NULL, &type, data, &size ); - command = QString::fromLocal8Bit( (const char*) data ) + "\\command"; + command = TQString::fromLocal8Bit( (const char*) data ) + "\\command"; size = 255; res = RegOpenKeyExA( subkey, command.local8Bit(), 0, KEY_READ, &subkey ); res = RegQueryValueExA( subkey, NULL, NULL, &type, data, &size ); - command = QString::fromLocal8Bit( (const char*) data ); + command = TQString::fromLocal8Bit( (const char*) data ); } res = RegCloseKey( subkey ); res = RegCloseKey( key ); - QProcess process( command + " www.trolltech.com/products/download/eval/evaluation.html" ); + TQProcess process( command + " www.trolltech.com/products/download/eval/evaluation.html" ); if ( !process.start() ) - QMessageBox::information( this, "Register Qt", "Launching your web browser failed.\n" + TQMessageBox::information( this, "Register Qt", "Launching your web browser failed.\n" "To register Qt, point your browser to www.trolltech.com/products/download/eval/evaluation.html" ); #endif } -void MainWindow::showProperties( QObject *o ) +void MainWindow::showProperties( TQObject *o ) { if ( !o->isWidgetType() ) { propertyEditor->setWidget( o, lastActiveFormWindow ); @@ -891,12 +891,12 @@ void MainWindow::showProperties( QObject *o ) hierarchyView->setFormWindow( 0, 0 ); return; } - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; setupHierarchyView(); FormWindow *fw = (FormWindow*)isAFormWindowChild( w ); if ( fw ) { if ( fw->numSelectedWidgets() > 1 ) { - QWidgetList wl = fw->selectedWidgets(); + TQWidgetList wl = fw->selectedWidgets(); if ( wl.first() != w ) { wl.removeRef( w ); wl.insert( 0, w ); @@ -921,46 +921,46 @@ void MainWindow::resetTool() actionPointerTool->setOn( TRUE ); } -void MainWindow::updateProperties( QObject * ) +void MainWindow::updateProperties( TQObject * ) { if ( propertyEditor ) propertyEditor->refetchData(); } -bool MainWindow::eventFilter( QObject *o, QEvent *e ) +bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) { if ( ::qt_cast(o) || ::qt_cast(o) || ( o && ( ::qt_cast(o->parent()) || ::qt_cast(o->parent()) ) ) ) { - if ( e->type() == QEvent::Accel && ::qt_cast(o) ) { + if ( e->type() == TQEvent::Accel && ::qt_cast(o) ) { return TRUE; // consume accel events - } else if ( e->type() == QEvent::MouseButtonPress && ::qt_cast(o) ) { - QPoint pos = ((QMouseEvent*)e)->pos(); + } else if ( e->type() == TQEvent::MouseButtonPress && ::qt_cast(o) ) { + TQPoint pos = ((TQMouseEvent*)e)->pos(); MenuBarEditor *m = ::qt_cast(o); showProperties( o ); if ( m->findItem( pos ) >= m->count() ) m->setFocus(); - } else if ( e->type() == QEvent::MouseButtonPress && ::qt_cast(o) ) { + } else if ( e->type() == TQEvent::MouseButtonPress && ::qt_cast(o) ) { PopupMenuEditor *m = ::qt_cast(o); - PopupMenuEditorItem *i = m->at( ((QMouseEvent*)e)->pos() ); + PopupMenuEditorItem *i = m->at( ((TQMouseEvent*)e)->pos() ); if ( m->find( i->action() ) != -1 && !i->isSeparator() ) showProperties( i->action() ); } - return QMainWindow::eventFilter( o, e ); + return TQMainWindow::eventFilter( o, e ); } if ( !o || !e || !o->isWidgetType() ) - return QMainWindow::eventFilter( o, e ); + return TQMainWindow::eventFilter( o, e ); - QWidget *w = 0; + TQWidget *w = 0; bool passiveInteractor; switch ( e->type() ) { - case QEvent::AccelOverride: - if ( ( (QKeyEvent*)e )->key() == Key_F1 && - ( ( (QKeyEvent*)e )->state() & ShiftButton ) != ShiftButton ) { - w = (QWidget*)o; + case TQEvent::AccelOverride: + if ( ( (TQKeyEvent*)e )->key() == Key_F1 && + ( ( (TQKeyEvent*)e )->state() & ShiftButton ) != ShiftButton ) { + w = (TQWidget*)o; while ( w ) { if ( ::qt_cast(w) ) break; @@ -968,59 +968,59 @@ bool MainWindow::eventFilter( QObject *o, QEvent *e ) } if ( w ) { propertyEditor->propertyList()->showCurrentWhatsThis(); - ( (QKeyEvent*)e )->accept(); + ( (TQKeyEvent*)e )->accept(); return TRUE; } } break; - case QEvent::Accel: - if ( ( ( (QKeyEvent*)e )->key() == Key_A || - ( (QKeyEvent*)e )->key() == Key_E ) && - ( (QKeyEvent*)e )->state() & ControlButton ) { + case TQEvent::Accel: + if ( ( ( (TQKeyEvent*)e )->key() == Key_A || + ( (TQKeyEvent*)e )->key() == Key_E ) && + ( (TQKeyEvent*)e )->state() & ControlButton ) { if ( qWorkspace()->activeWindow() && ::qt_cast(qWorkspace()->activeWindow()) ) { - ( (QKeyEvent*)e )->ignore(); + ( (TQKeyEvent*)e )->ignore(); return TRUE; } } break; - case QEvent::ContextMenu: - case QEvent::MouseButtonPress: + case TQEvent::ContextMenu: + case TQEvent::MouseButtonPress: if ( o && currentTool() == POINTER_TOOL && ( ::qt_cast(o) || ::qt_cast(o) || ::qt_cast(o) || - ( ::qt_cast(o) || - ::qt_cast(o) || + ( ::qt_cast(o) || + ::qt_cast(o) || ::qt_cast(o) ) && o->parent() && ( ::qt_cast(o->parent()) || ::qt_cast(o->parent())) ) ) { - QWidget *w = (QWidget*)o; - if ( ::qt_cast(w) || - ::qt_cast(w) || + TQWidget *w = (TQWidget*)o; + if ( ::qt_cast(w) || + ::qt_cast(w) || ::qt_cast(w) || ::qt_cast(w) ) w = w->parentWidget(); - QWidget *pw = w->parentWidget(); + TQWidget *pw = w->parentWidget(); while ( pw ) { if ( ::qt_cast(pw) ) { ( (FormWindow*)pw )->emitShowProperties( w ); if ( !::qt_cast(o) ) - return ( !::qt_cast(o) && + return ( !::qt_cast(o) && !::qt_cast(o) && - !::qt_cast(o) && + !::qt_cast(o) && !::qt_cast(o) ); } pw = pw->parentWidget(); } } if ( o && ( ::qt_cast(o) || o->inherits("QDockWindowHandle") ) - && e->type() == QEvent::ContextMenu ) + && e->type() == TQEvent::ContextMenu ) break; if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL ) break; - if ( ::qt_cast(o) ) + if ( ::qt_cast(o) ) break; if ( !( w = isAFormWindowChild( o ) ) || ::qt_cast(o) || @@ -1030,26 +1030,26 @@ bool MainWindow::eventFilter( QObject *o, QEvent *e ) w->setFocus(); passiveInteractor = WidgetFactory::isPassiveInteractor( o ); if ( !passiveInteractor || currentTool() != ORDER_TOOL ) { - if( e->type() == QEvent::ContextMenu ) { - ( (FormWindow*)w )->handleContextMenu( (QContextMenuEvent*)e, + if( e->type() == TQEvent::ContextMenu ) { + ( (FormWindow*)w )->handleContextMenu( (TQContextMenuEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); return TRUE; } else { - ( (FormWindow*)w )->handleMousePress( (QMouseEvent*)e, + ( (FormWindow*)w )->handleMousePress( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); } } - lastPressWidget = (QWidget*)o; + lastPressWidget = (TQWidget*)o; if ( passiveInteractor ) - QTimer::singleShot( 0, formWindow(), SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQT_SLOT( visibilityChanged() ) ); if ( currentTool() == CONNECT_TOOL || currentTool() == BUDDY_TOOL ) return TRUE; return !passiveInteractor; - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: lastPressWidget = 0; if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL ) break; - if ( ::qt_cast(o) ) + if ( ::qt_cast(o) ) break; if ( !( w = isAFormWindowChild( o ) ) || ::qt_cast(o) || @@ -1057,39 +1057,39 @@ bool MainWindow::eventFilter( QObject *o, QEvent *e ) break; passiveInteractor = WidgetFactory::isPassiveInteractor( o ); if ( !passiveInteractor ) - ( (FormWindow*)w )->handleMouseRelease( (QMouseEvent*)e, + ( (FormWindow*)w )->handleMouseRelease( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( passiveInteractor ) { - QTimer::singleShot( 0, this, SLOT( selectionChanged() ) ); - QTimer::singleShot( 0, formWindow(), SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( selectionChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQT_SLOT( visibilityChanged() ) ); } return !passiveInteractor; - case QEvent::MouseMove: + case TQEvent::MouseMove: if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL ) break; w = isAFormWindowChild( o ); - if ( lastPressWidget != (QWidget*)o && w && + if ( lastPressWidget != (TQWidget*)o && w && !::qt_cast(o) && !::qt_cast(o) && - !::qt_cast(o) && !::qt_cast(o) && - !::qt_cast(o) ) + !::qt_cast(o) && !::qt_cast(o) && + !::qt_cast(o) ) return TRUE; - if ( o && ::qt_cast(o) ) + if ( o && ::qt_cast(o) ) break; - if ( lastPressWidget != (QWidget*)o || + if ( lastPressWidget != (TQWidget*)o || ( !w || ::qt_cast(o) ) || ::qt_cast(o) ) break; passiveInteractor = WidgetFactory::isPassiveInteractor( o ); if ( !passiveInteractor ) - ( (FormWindow*)w )->handleMouseMove( (QMouseEvent*)e, + ( (FormWindow*)w )->handleMouseMove( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); return !passiveInteractor; - case QEvent::KeyPress: - if ( ( (QKeyEvent*)e )->key() == Key_Escape && currentTool() != POINTER_TOOL ) { + case TQEvent::KeyPress: + if ( ( (TQKeyEvent*)e )->key() == Key_Escape && currentTool() != POINTER_TOOL ) { resetTool(); return FALSE; } - if ( ( (QKeyEvent*)e )->key() == Key_Escape && incrementalSearch->hasFocus() ) { + if ( ( (TQKeyEvent*)e )->key() == Key_Escape && incrementalSearch->hasFocus() ) { if ( ::qt_cast(qWorkspace()->activeWindow()) ) { qWorkspace()->activeWindow()->setFocus(); return TRUE; @@ -1099,114 +1099,114 @@ bool MainWindow::eventFilter( QObject *o, QEvent *e ) ::qt_cast(o) || ::qt_cast(o) ) break; - ( (FormWindow*)w )->handleKeyPress( (QKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); - if ( ((QKeyEvent*)e)->isAccepted() ) + ( (FormWindow*)w )->handleKeyPress( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); + if ( ((TQKeyEvent*)e)->isAccepted() ) return TRUE; break; - case QEvent::MouseButtonDblClick: + case TQEvent::MouseButtonDblClick: if ( !( w = isAFormWindowChild( o ) ) || ::qt_cast(o) || ::qt_cast(o) ) { - if ( ::qt_cast(o) && ((QToolButton*)o)->isOn() && - o->parent() && ::qt_cast(o->parent()) && formWindow() ) + if ( ::qt_cast(o) && ((TQToolButton*)o)->isOn() && + o->parent() && ::qt_cast(o->parent()) && formWindow() ) formWindow()->setToolFixed(); break; } if ( currentTool() == ORDER_TOOL ) { - ( (FormWindow*)w )->handleMouseDblClick( (QMouseEvent*)e, + ( (FormWindow*)w )->handleMouseDblClick( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); return TRUE; } if ( !WidgetFactory::isPassiveInteractor( o ) && ( (FormWindow*)w )->formFile() ) return openEditor( ( (FormWindow*)w )->designerWidget( o ), (FormWindow*)w ); return TRUE; - case QEvent::KeyRelease: + case TQEvent::KeyRelease: if ( !( w = isAFormWindowChild( o ) ) || ::qt_cast(o) || ::qt_cast(o) ) break; - ( (FormWindow*)w )->handleKeyRelease( (QKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); - if ( ((QKeyEvent*)e)->isAccepted() ) + ( (FormWindow*)w )->handleKeyRelease( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); + if ( ((TQKeyEvent*)e)->isAccepted() ) return TRUE; break; - case QEvent::Hide: + case TQEvent::Hide: if ( !( w = isAFormWindowChild( o ) ) || ::qt_cast(o) || ::qt_cast(o) ) break; - if ( ( (FormWindow*)w )->isWidgetSelected( (QWidget*)o ) ) - ( (FormWindow*)w )->selectWidget( (QWidget*)o, FALSE ); + if ( ( (FormWindow*)w )->isWidgetSelected( (TQWidget*)o ) ) + ( (FormWindow*)w )->selectWidget( (TQWidget*)o, FALSE ); break; - case QEvent::Enter: - case QEvent::Leave: + case TQEvent::Enter: + case TQEvent::Leave: if ( !( w = isAFormWindowChild( o ) ) || ::qt_cast(o) || ::qt_cast(o) || ::qt_cast(o) ) break; return TRUE; - case QEvent::Resize: - case QEvent::Move: + case TQEvent::Resize: + case TQEvent::Move: if ( !( w = isAFormWindowChild( o ) ) || ::qt_cast(o) || ::qt_cast(o) ) break; - if ( WidgetFactory::layoutType( (QWidget*)o->parent() ) != WidgetFactory::NoLayout ) { - ( (FormWindow*)w )->updateSelection( (QWidget*)o ); - if ( e->type() != QEvent::Resize ) - ( (FormWindow*)w )->updateChildSelections( (QWidget*)o ); + if ( WidgetFactory::layoutType( (TQWidget*)o->parent() ) != WidgetFactory::NoLayout ) { + ( (FormWindow*)w )->updateSelection( (TQWidget*)o ); + if ( e->type() != TQEvent::Resize ) + ( (FormWindow*)w )->updateChildSelections( (TQWidget*)o ); } break; - case QEvent::Close: - if ( o->isWidgetType() && (QWidget*)o == (QWidget*)previewedForm ) { + case TQEvent::Close: + if ( o->isWidgetType() && (TQWidget*)o == (TQWidget*)previewedForm ) { if ( lastActiveFormWindow && lastActiveFormWindow->project() ) { - QStringList lst = + TQStringList lst = MetaDataBase::fakeProperty( lastActiveFormWindow, "database" ).toStringList(); lastActiveFormWindow->project()->closeDatabase( lst[ 0 ] ); } } break; - case QEvent::DragEnter: + case TQEvent::DragEnter: if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) { - workspace()->contentsDragEnterEvent( (QDragEnterEvent*)e ); + workspace()->contentsDragEnterEvent( (TQDragEnterEvent*)e ); return TRUE; } break; - case QEvent::DragMove: + case TQEvent::DragMove: if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) { - workspace()->contentsDragMoveEvent( (QDragMoveEvent*)e ); + workspace()->contentsDragMoveEvent( (TQDragMoveEvent*)e ); return TRUE; } break; - case QEvent::Drop: + case TQEvent::Drop: if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) { - workspace()->contentsDropEvent( (QDropEvent*)e ); + workspace()->contentsDropEvent( (TQDropEvent*)e ); return TRUE; } break; - case QEvent::Show: + case TQEvent::Show: if ( o != this ) break; - if ( ((QShowEvent*)e)->spontaneous() ) + if ( ((TQShowEvent*)e)->spontaneous() ) break; - QApplication::sendPostedEvents( qworkspace, QEvent::ChildInserted ); - showEvent( (QShowEvent*)e ); + TQApplication::sendPostedEvents( qworkspace, TQEvent::ChildInserted ); + showEvent( (TQShowEvent*)e ); checkTempFiles(); return TRUE; - case QEvent::Wheel: + case TQEvent::Wheel: if ( !( w = isAFormWindowChild( o ) ) || ::qt_cast(o) || ::qt_cast(o) ) break; return TRUE; - case QEvent::FocusIn: + case TQEvent::FocusIn: if ( !::qt_cast(o) && isAFormWindowChild( o ) ) return TRUE; //FIXME if ( hierarchyView->formDefinitionView()->isRenaming() && ( o->inherits( "Editor" ) || ::qt_cast(o) ) ) - QApplication::sendPostedEvents(); + TQApplication::sendPostedEvents(); if ( o->inherits( "Editor" ) ) { - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; while ( w ) { if ( ::qt_cast(w) ) break; @@ -1220,34 +1220,34 @@ bool MainWindow::eventFilter( QObject *o, QEvent *e ) fw->formFile()->editor()->checkTimeStamp(); } break; - case QEvent::FocusOut: + case TQEvent::FocusOut: if ( !::qt_cast(o) && isAFormWindowChild( o ) ) return TRUE; break; default: - return QMainWindow::eventFilter( o, e ); + return TQMainWindow::eventFilter( o, e ); } - return QMainWindow::eventFilter( o, e ); + return TQMainWindow::eventFilter( o, e ); } -QWidget *MainWindow::isAFormWindowChild( QObject *o ) const +TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const { - if ( ::qt_cast(o->parent()) && !::qt_cast(o) ) + if ( ::qt_cast(o->parent()) && !::qt_cast(o) ) return 0; while ( o ) { if ( ::qt_cast(o) ) - return (QWidget*)o; + return (TQWidget*)o; o = o->parent(); } return 0; } -QWidget *MainWindow::isAToolBarChild( QObject *o ) const +TQWidget *MainWindow::isAToolBarChild( TQObject *o ) const { while ( o ) { if ( ::qt_cast(o) ) - return (QWidget*)o; + return (TQWidget*)o; if ( ::qt_cast(o) ) return 0; o = o->parent(); @@ -1278,7 +1278,7 @@ void MainWindow::emitProjectSignals() void MainWindow::insertFormWindow( FormWindow *fw ) { if ( fw ) - QWhatsThis::add( fw, i18n( "The Form Window" + TQWhatsThis::add( fw, i18n( "The Form Window" "

Use the various tools to add widgets or to change the layout " "and behavior of the components in the form. Select one or multiple " "widgets to move them or lay them out. If a single widget is chosen it can " @@ -1290,16 +1290,16 @@ void MainWindow::insertFormWindow( FormWindow *fw ) "

You can have several forms open, and all open forms are listed " "in the Form List.") ); - connect( fw, SIGNAL( showProperties( QObject * ) ), - this, SLOT( showProperties( QObject * ) ) ); - connect( fw, SIGNAL( updateProperties( QObject * ) ), - this, SLOT( updateProperties( QObject * ) ) ); - connect( this, SIGNAL( currentToolChanged() ), - fw, SLOT( currentToolChanged() ) ); - connect( fw, SIGNAL( selectionChanged() ), - this, SLOT( selectionChanged() ) ); - connect( fw, SIGNAL( undoRedoChanged( bool, bool, const QString &, const QString & ) ), - this, SLOT( updateUndoRedo( bool, bool, const QString &, const QString & ) ) ); + connect( fw, TQT_SIGNAL( showProperties( TQObject * ) ), + this, TQT_SLOT( showProperties( TQObject * ) ) ); + connect( fw, TQT_SIGNAL( updateProperties( TQObject * ) ), + this, TQT_SLOT( updateProperties( TQObject * ) ) ); + connect( this, TQT_SIGNAL( currentToolChanged() ), + fw, TQT_SLOT( currentToolChanged() ) ); + connect( fw, TQT_SIGNAL( selectionChanged() ), + this, TQT_SLOT( selectionChanged() ) ); + connect( fw, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); if ( !mblockNewForms ) { } else { @@ -1321,7 +1321,7 @@ void MainWindow::insertFormWindow( FormWindow *fw ) } } -void MainWindow::createNewProject( const QString &lang ) +void MainWindow::createNewProject( const TQString &lang ) { Project *pro = new Project( "", "", projectSettingsPluginManager ); pro->setLanguage( lang ); @@ -1333,12 +1333,12 @@ void MainWindow::createNewProject( const QString &lang ) } if ( !pro->isValid() ) { - QMessageBox::information( this, i18n("New Project"), i18n( "Cannot create an invalid project." ) ); + TQMessageBox::information( this, i18n("New Project"), i18n( "Cannot create an invalid project." ) ); delete pro; return; } - QAction *a = new QAction( pro->makeRelative( pro->fileName() ), + TQAction *a = new TQAction( pro->makeRelative( pro->fileName() ), pro->makeRelative( pro->fileName() ), 0, actionGroupProjects, 0, TRUE ); projects.insert( a, pro ); addRecentlyOpened( pro->makeAbsolute( pro->fileName() ), recentlyProjects ); @@ -1353,7 +1353,7 @@ bool MainWindow::unregisterClient( FormWindow *w ) if ( w == lastActiveFormWindow ) lastActiveFormWindow = 0; - QPtrList waitingForDelete; + TQPtrList waitingForDelete; waitingForDelete.setAutoDelete( TRUE ); for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) { if ( e->object() == w ) @@ -1368,9 +1368,9 @@ bool MainWindow::unregisterClient( FormWindow *w ) return TRUE; } -void MainWindow::activeWindowChanged( QWidget *w ) +void MainWindow::activeWindowChanged( TQWidget *w ) { - QWidget *old = formWindow(); + TQWidget *old = formWindow(); if ( ::qt_cast(w) ) { FormWindow *fw = (FormWindow*)w; FormWindow *ofw = lastActiveFormWindow; @@ -1384,21 +1384,21 @@ void MainWindow::activeWindowChanged( QWidget *w ) formWindow()->clearSelection(); } workspace()->activeFormChanged( fw ); - setAppropriate( (QDockWindow*)actionEditor->parentWidget(), - ::qt_cast(lastActiveFormWindow->mainContainer()) ); - if ( appropriate( (QDockWindow*)actionEditor->parentWidget() ) ) { + setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), + ::qt_cast(lastActiveFormWindow->mainContainer()) ); + if ( appropriate( (TQDockWindow*)actionEditor->parentWidget() ) ) { if ( actionEditor->wantToBeShown() ) actionEditor->parentWidget()->show(); } else { - QWidget *mc = 0; - if ( ofw && (mc = ofw->mainContainer()) && ::qt_cast(mc) ) + TQWidget *mc = 0; + if ( ofw && (mc = ofw->mainContainer()) && ::qt_cast(mc) ) actionEditor->setWantToBeShown( !actionEditor->parentWidget()->isHidden() ); actionEditor->parentWidget()->hide(); } actionEditor->setFormWindow( lastActiveFormWindow ); if ( wspace && fw->project() && fw->project() != currentProject ) { - for ( QMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { + for ( TQMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { if ( *it == fw->project() ) { projectSelected( it.key() ); break; @@ -1421,14 +1421,14 @@ void MainWindow::activeWindowChanged( QWidget *w ) emit hasActiveForm( FALSE ); propertyEditor->clear(); hierarchyView->clear(); - updateUndoRedo( FALSE, FALSE, QString::null, QString::null ); + updateUndoRedo( FALSE, FALSE, TQString::null, TQString::null ); } selectionChanged(); if ( ::qt_cast(w) ) { SourceEditor *se = (SourceEditor*)w; - QGuardedPtr fw = se->formWindow(); + TQGuardedPtr fw = se->formWindow(); if ( se->formWindow() && lastActiveFormWindow != fw ) { activeWindowChanged( se->formWindow() ); @@ -1453,7 +1453,7 @@ void MainWindow::activeWindowChanged( QWidget *w ) hierarchyView->showClasses( se ); actionEditor->setFormWindow( 0 ); if ( wspace && se->project() && se->project() != currentProject ) { - for ( QMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { + for ( TQMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { if ( *it == se->project() ) { projectSelected( it.key() ); break; @@ -1476,7 +1476,7 @@ void MainWindow::activeWindowChanged( QWidget *w ) } void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable, - const QString &undoCmd, const QString &redoCmd ) + const TQString &undoCmd, const TQString &redoCmd ) { if ( qWorkspace()->activeWindow() && ::qt_cast(qWorkspace()->activeWindow()) ) @@ -1511,15 +1511,15 @@ void MainWindow::updateEditorUndoRedo() actionEditRedo->setEnabled( editor->editIsRedoAvailable() ); } -QWorkspace *MainWindow::qWorkspace() const +TQWorkspace *MainWindow::qWorkspace() const { return qworkspace; } -void MainWindow::popupFormWindowMenu( const QPoint & gp, FormWindow *fw ) +void MainWindow::popupFormWindowMenu( const TQPoint & gp, FormWindow *fw ) { - QValueList ids; - QMap commands; + TQValueList ids; + TQMap commands; setupRMBSpecialCommands( ids, commands, fw ); setupRMBProperties( ids, commands, fw ); @@ -1530,14 +1530,14 @@ void MainWindow::popupFormWindowMenu( const QPoint & gp, FormWindow *fw ) handleRMBProperties( r, commands, fw ); handleRMBSpecialCommands( r, commands, fw ); - for ( QValueList::ConstIterator i = ids.begin(); i != ids.end(); ++i ) + for ( TQValueList::ConstIterator i = ids.begin(); i != ids.end(); ++i ) rmbFormWindow->removeItem( *i ); } -void MainWindow::popupWidgetMenu( const QPoint &gp, FormWindow * /*fw*/, QWidget * w) +void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidget * w) { - QValueList ids; - QMap commands; + TQValueList ids; + TQMap commands; setupRMBSpecialCommands( ids, commands, w ); setupRMBProperties( ids, commands, w ); @@ -1548,25 +1548,25 @@ void MainWindow::popupWidgetMenu( const QPoint &gp, FormWindow * /*fw*/, QWidget handleRMBProperties( r, commands, w ); handleRMBSpecialCommands( r, commands, w ); - for ( QValueList::ConstIterator i = ids.begin(); i != ids.end(); ++i ) + for ( TQValueList::ConstIterator i = ids.begin(); i != ids.end(); ++i ) rmbWidgets->removeItem( *i ); } -void MainWindow::setupRMBProperties( QValueList &ids, QMap &props, QWidget *w ) +void MainWindow::setupRMBProperties( TQValueList &ids, TQMap &props, TQWidget *w ) { - const QMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); - if ( text && qstrcmp( text->type(), "QString") != 0 ) + const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); + if ( text && qstrcmp( text->type(), "TQString") != 0 ) text = 0; - const QMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); - if ( title && qstrcmp( title->type(), "QString") != 0 ) + const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); + if ( title && qstrcmp( title->type(), "TQString") != 0 ) title = 0; - const QMetaProperty* pagetitle = + const TQMetaProperty* pagetitle = w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE ); - if ( pagetitle && qstrcmp( pagetitle->type(), "QString") != 0 ) + if ( pagetitle && qstrcmp( pagetitle->type(), "TQString") != 0 ) pagetitle = 0; - const QMetaProperty* pixmap = + const TQMetaProperty* pixmap = w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE ); - if ( pixmap && qstrcmp( pixmap->type(), "QPixmap") != 0 ) + if ( pixmap && qstrcmp( pixmap->type(), "TQPixmap") != 0 ) pixmap = 0; if ( text && text->designable(w) || @@ -1580,7 +1580,7 @@ void MainWindow::setupRMBProperties( QValueList &ids, QMap & ids << ( id = rmbWidgets->insertItem( i18n("Choose Pixmap..."), -1, 0) ); props.insert( "pixmap", id ); } - if ( text && text->designable(w) && !::qt_cast(w) ) { + if ( text && text->designable(w) && !::qt_cast(w) ) { ids << ( id = rmbWidgets->insertItem( i18n("Edit Text..."), -1, 0) ); props.insert( "text", id ); } @@ -1596,7 +1596,7 @@ void MainWindow::setupRMBProperties( QValueList &ids, QMap & } #ifdef QT_CONTAINER_CUSTOM_WIDGETS -static QWidgetContainerInterfacePrivate *containerWidgetInterface( QWidget *w ) +static QWidgetContainerInterfacePrivate *containerWidgetInterface( TQWidget *w ) { WidgetInterface *iface = 0; widgetManager()->queryInterface( WidgetFactory::classNameOf( w ), &iface ); @@ -1611,12 +1611,12 @@ static QWidgetContainerInterfacePrivate *containerWidgetInterface( QWidget *w ) } #endif -void MainWindow::setupRMBSpecialCommands( QValueList &ids, - QMap &commands, QWidget *w ) +void MainWindow::setupRMBSpecialCommands( TQValueList &ids, + TQMap &commands, TQWidget *w ) { int id; - if ( ::qt_cast(w) ) { + if ( ::qt_cast(w) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); if ( ( (QDesignerTabWidget*)w )->count() > 1) { @@ -1639,10 +1639,10 @@ void MainWindow::setupRMBSpecialCommands( QValueList &ids, } ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) ); commands.insert( "add", id ); - } else if ( ::qt_cast(w) ) { + } else if ( ::qt_cast(w) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); - if ( ( (QToolBox*)w )->count() > 1 ) { + if ( ( (TQToolBox*)w )->count() > 1 ) { ids << ( id = rmbWidgets->insertItem( i18n("Delete Page"), -1, 0 ) ); commands.insert( "remove", id ); } @@ -1682,16 +1682,16 @@ void MainWindow::setupRMBSpecialCommands( QValueList &ids, } } -void MainWindow::setupRMBSpecialCommands( QValueList &ids, - QMap &commands, FormWindow *fw ) +void MainWindow::setupRMBSpecialCommands( TQValueList &ids, + TQMap &commands, FormWindow *fw ) { int id; - if ( ::qt_cast(fw->mainContainer()) ) { + if ( ::qt_cast(fw->mainContainer()) ) { if ( ids.isEmpty() ) ids << rmbFormWindow->insertSeparator( 0 ); - if ( ( (QWizard*)fw->mainContainer() )->pageCount() > 1) { + if ( ( (TQWizard*)fw->mainContainer() )->pageCount() > 1) { ids << ( id = rmbFormWindow->insertItem( i18n("Delete Page"), -1, 0 ) ); commands.insert( "remove", id ); } @@ -1705,7 +1705,7 @@ void MainWindow::setupRMBSpecialCommands( QValueList &ids, ids << ( id = rmbFormWindow->insertItem( i18n("Edit Pages..."), -1, 0 ) ); commands.insert( "edit", id ); - } else if ( ::qt_cast(fw->mainContainer()) ) { + } else if ( ::qt_cast(fw->mainContainer()) ) { if ( ids.isEmpty() ) ids << rmbFormWindow->insertSeparator( 0 ); ids << ( id = rmbFormWindow->insertItem( i18n( "Add Menu Item" ), -1, 0 ) ); @@ -1715,80 +1715,80 @@ void MainWindow::setupRMBSpecialCommands( QValueList &ids, } } -void MainWindow::handleRMBProperties( int id, QMap &props, QWidget *w ) +void MainWindow::handleRMBProperties( int id, TQMap &props, TQWidget *w ) { if ( id == props[ "text" ] ) { bool ok = FALSE; bool oldDoWrap = FALSE; - if ( ::qt_cast(w) ) { + if ( ::qt_cast(w) ) { int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) oldDoWrap = TRUE; } bool doWrap = oldDoWrap; - QString text; - if ( ::qt_cast(w) || ::qt_cast(w) || ::qt_cast(w) ) { - text = MultiLineEditor::getText( this, w->property( "text" ).toString(), !::qt_cast(w), &doWrap ); + TQString text; + if ( ::qt_cast(w) || ::qt_cast(w) || ::qt_cast(w) ) { + text = MultiLineEditor::getText( this, w->property( "text" ).toString(), !::qt_cast(w), &doWrap ); ok = !text.isNull(); } else { text = QInputDialog::getText( i18n("Text"), i18n( "New text" ), - QLineEdit::Normal, w->property("text").toString(), &ok, this ); + TQLineEdit::Normal, w->property("text").toString(), &ok, this ); } if ( ok ) { if ( oldDoWrap != doWrap ) { - QString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); + TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, - "wordwrap", QVariant( oldDoWrap, 0 ), - QVariant( doWrap, 0 ), QString::null, QString::null ); + "wordwrap", TQVariant( oldDoWrap, 0 ), + TQVariant( doWrap, 0 ), TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE ); } - QString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); + TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "text", w->property( "text" ), - text, QString::null, QString::null ); + text, TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "text", TRUE ); } } else if ( id == props[ "title" ] ) { bool ok = FALSE; - QString title = QInputDialog::getText( i18n("Title"), i18n( "New title" ), - QLineEdit::Normal, w->property("title").toString(), &ok, this ); + TQString title = QInputDialog::getText( i18n("Title"), i18n( "New title" ), + TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { - QString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); + TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "title", w->property( "title" ), - title, QString::null, QString::null ); + title, TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "title", TRUE ); } } else if ( id == props[ "pagetitle" ] ) { bool ok = FALSE; - QString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), - QLineEdit::Normal, w->property("pageTitle").toString(), &ok, this ); + TQString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), + TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this ); if ( ok ) { - QString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) ); + TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "pageTitle", w->property( "pageTitle" ), - text, QString::null, QString::null ); + text, TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "pageTitle", TRUE ); } } else if ( id == props[ "pixmap" ] ) { - QPixmap oldPix = w->property( "pixmap" ).toPixmap(); - QPixmap pix = qChoosePixmap( this, formWindow(), oldPix ); + TQPixmap oldPix = w->property( "pixmap" ).toPixmap(); + TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix ); if ( !pix.isNull() ) { - QString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) ); + TQString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "pixmap", w->property( "pixmap" ), - pix, QString::null, QString::null ); + pix, TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "pixmap", TRUE ); @@ -1796,10 +1796,10 @@ void MainWindow::handleRMBProperties( int id, QMap &props, QWidget } } -void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, QWidget *w ) +void MainWindow::handleRMBSpecialCommands( int id, TQMap &commands, TQWidget *w ) { - if ( ::qt_cast(w) ) { - QTabWidget *tw = (QTabWidget*)w; + if ( ::qt_cast(w) ) { + TQTabWidget *tw = (TQTabWidget*)w; if ( id == commands[ "add" ] ) { AddTabPageCommand *cmd = new AddTabPageCommand( i18n( "Add Page to %1" ).arg( tw->name() ), formWindow(), @@ -1817,8 +1817,8 @@ void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, cmd->execute(); } } - } else if ( ::qt_cast(w) ) { - QToolBox *tb = (QToolBox*)w; + } else if ( ::qt_cast(w) ) { + TQToolBox *tb = (TQToolBox*)w; if ( id == commands[ "add" ] ) { AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand( i18n( "Add Page to %1" ).arg( tb->name() ), @@ -1837,7 +1837,7 @@ void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, cmd->execute(); } } - } else if ( ::qt_cast(w) ) { + } else if ( ::qt_cast(w) ) { QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w; if ( id == commands[ "add" ] ) { AddWidgetStackPageCommand *cmd = @@ -1856,21 +1856,21 @@ void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, } } else if ( id == commands[ "nextpage" ] ) { int currentPage = w->property( "currentPage" ).toInt(); - QString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) ); + TQString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "currentPage", currentPage, - currentPage + 1, QString::null, QString::null ); + currentPage + 1, TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "currentPage", TRUE ); } else if ( id == commands[ "prevpage" ] ) { int currentPage = w->property( "currentPage" ).toInt(); - QString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) ); + TQString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "currentPage", currentPage, - currentPage -1, QString::null, QString::null ); + currentPage -1, TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "currentPage", TRUE ); @@ -1888,7 +1888,7 @@ void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, } else if ( id == commands[ "remove" ] ) { QWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w ); if ( iface ) { - QString wClassName = WidgetFactory::classNameOf( w ); + TQString wClassName = WidgetFactory::classNameOf( w ); int index = iface->currentIndex( wClassName, w ); DeleteContainerPageCommand *cmd = new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ). @@ -1904,10 +1904,10 @@ void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, QWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w ); if ( iface ) { bool ok = FALSE; - QString wClassName = WidgetFactory::classNameOf( w ); + TQString wClassName = WidgetFactory::classNameOf( w ); int index = iface->currentIndex( wClassName, w ); - QString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), - QLineEdit::Normal, + TQString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), + TQLineEdit::Normal, iface->pageLabel( wClassName, w, index ), &ok, this ); @@ -1936,10 +1936,10 @@ void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, } } -void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, FormWindow *fw ) +void MainWindow::handleRMBSpecialCommands( int id, TQMap &commands, FormWindow *fw ) { - if ( ::qt_cast(fw->mainContainer()) ) { - QWizard *wiz = (QWizard*)fw->mainContainer(); + if ( ::qt_cast(fw->mainContainer()) ) { + TQWizard *wiz = (TQWizard*)fw->mainContainer(); if ( id == commands[ "add" ] ) { AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wiz->name() ), @@ -1965,10 +1965,10 @@ void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, bool ok = FALSE; QDesignerWizard *dw = (QDesignerWizard*)wiz; - QString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), - QLineEdit::Normal, dw->pageTitle(), &ok, this ); + TQString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), + TQLineEdit::Normal, dw->pageTitle(), &ok, this ); if ( ok ) { - QString pn( i18n( "Rename page %1 of %2" ).arg( dw->pageTitle() ).arg( wiz->name() ) ); + TQString pn( i18n( "Rename page %1 of %2" ).arg( dw->pageTitle() ).arg( wiz->name() ) ); RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formWindow() , wiz, wiz->indexOf( wiz->currentPage() ), text ); @@ -1976,8 +1976,8 @@ void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, cmd->execute(); } } - } else if ( ::qt_cast(fw->mainContainer()) ) { - QMainWindow *mw = (QMainWindow*)fw->mainContainer(); + } else if ( ::qt_cast(fw->mainContainer()) ) { + TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); if ( id == commands[ "add_toolbar" ] ) { AddToolBarCommand *cmd = new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).arg( formWindow()->name() ), @@ -1996,8 +1996,8 @@ void MainWindow::handleRMBSpecialCommands( int id, QMap &commands, void MainWindow::clipboardChanged() { - QString text( qApp->clipboard()->text() ); - QString start( "" ); + TQString text( qApp->clipboard()->text() ); + TQString start( "" ); actionEditPaste->setEnabled( text.left( start.length() ) == start ); } @@ -2036,11 +2036,11 @@ void MainWindow::selectionChanged() actionEditSplitVertical->setEnabled( FALSE ); enable = FALSE; - QWidgetList widgets = formWindow()->selectedWidgets(); + TQWidgetList widgets = formWindow()->selectedWidgets(); if ( selectedWidgets > 1 ) { int unlaidout = 0; int laidout = 0; - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) unlaidout++; else @@ -2056,7 +2056,7 @@ void MainWindow::selectionChanged() layoutSelected = unlaidout > 1; breakLayout = laidout > 0; } else if ( selectedWidgets == 1 ) { - QWidget *w = widgets.first(); + TQWidget *w = widgets.first(); bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) || w == formWindow()->mainContainer(); actionEditAdjustSize->setEnabled( !w->parentWidget() || @@ -2100,7 +2100,7 @@ void MainWindow::selectionChanged() } } else if ( selectedWidgets == 0 ) { actionEditAdjustSize->setEnabled( TRUE ); - QWidget *w = formWindow()->mainContainer(); + TQWidget *w = formWindow()->mainContainer(); if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) { if ( !formWindow()->hasInsertedChildren( w ) ) { actionEditHLayout->setEnabled( FALSE ); @@ -2129,23 +2129,23 @@ void MainWindow::selectionChanged() } } -static QString fixArgs( const QString &s2 ) +static TQString fixArgs( const TQString &s2 ) { - QString s = s2; + TQString s = s2; return s.replace( ',', ';' ); } void MainWindow::writeConfig() { - QSettings config; + TQSettings config; // No search path for unix, only needs application name - config.insertSearchPath( QSettings::Windows, "/Trolltech" ); + config.insertSearchPath( TQSettings::Windows, "/Trolltech" ); - QString keybase = DesignerApplication::settingsKey(); + TQString keybase = DesignerApplication::settingsKey(); if (savePluginPaths) { - QStringList pluginPaths = QApplication::libraryPaths(); + TQStringList pluginPaths = TQApplication::libraryPaths(); config.writeEntry( keybase + "PluginPaths", pluginPaths ); } config.writeEntry( keybase + "RestoreWorkspace", restoreConfig ); @@ -2170,7 +2170,7 @@ void MainWindow::writeConfig() config.writeEntry( keybase + "Background/UsePixmap", backPix ); config.writeEntry( keybase + "Background/Color", (int)qworkspace->backgroundColor().rgb() ); if ( qworkspace->backgroundPixmap() ) - qworkspace->backgroundPixmap()->save( QDir::home().absPath() + "/.designer/" + "background.xpm", "PNG" ); + qworkspace->backgroundPixmap()->save( TQDir::home().absPath() + "/.designer/" + "background.xpm", "PNG" ); config.writeEntry( keybase + "Geometries/MainwindowX", x() ); config.writeEntry( keybase + "Geometries/MainwindowY", y() ); @@ -2193,67 +2193,67 @@ void MainWindow::writeConfig() config.writeEntry( keybase + "View/TextLabels", usesTextLabel() ); config.writeEntry( keybase + "View/BigIcons", usesBigPixmaps() ); - QString mwlKey = "MainwindowLayout"; + TQString mwlKey = "MainwindowLayout"; if ( singleProjectMode() ) mwlKey += "S"; - QString mainWindowLayout; - QTextStream ts( &mainWindowLayout, IO_WriteOnly ); + TQString mainWindowLayout; + TQTextStream ts( &mainWindowLayout, IO_WriteOnly ); ts << *this; config.writeEntry( keybase + mwlKey, mainWindowLayout ); - QPtrList *lst = MetaDataBase::customWidgets(); + TQPtrList *lst = MetaDataBase::customWidgets(); config.writeEntry( keybase + "CustomWidgets/num", (int)lst->count() ); int j = 0; - QDir::home().mkdir( ".designer" ); + TQDir::home().mkdir( ".designer" ); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { - QStringList l; + TQStringList l; l << w->className; l << w->includeFile; - l << QString::number( (int)w->includePolicy ); - l << QString::number( w->sizeHint.width() ); - l << QString::number( w->sizeHint.height() ); - l << QString::number( w->lstSignals.count() ); - for ( QValueList::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) - l << QString( fixArgs( *it ) ); - l << QString::number( w->lstSlots.count() ); - for ( QValueList::ConstIterator it2 = w->lstSlots.begin(); it2 != w->lstSlots.end(); ++it2 ) { + l << TQString::number( (int)w->includePolicy ); + l << TQString::number( w->sizeHint.width() ); + l << TQString::number( w->sizeHint.height() ); + l << TQString::number( w->lstSignals.count() ); + for ( TQValueList::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) + l << TQString( fixArgs( *it ) ); + l << TQString::number( w->lstSlots.count() ); + for ( TQValueList::ConstIterator it2 = w->lstSlots.begin(); it2 != w->lstSlots.end(); ++it2 ) { l << fixArgs( (*it2).function ); l << (*it2).access; } - l << QString::number( w->lstProperties.count() ); - for ( QValueList::ConstIterator it3 = w->lstProperties.begin(); it3 != w->lstProperties.end(); ++it3 ) { + l << TQString::number( w->lstProperties.count() ); + for ( TQValueList::ConstIterator it3 = w->lstProperties.begin(); it3 != w->lstProperties.end(); ++it3 ) { l << (*it3).property; l << (*it3).type; } - l << QString::number( size_type_to_int( w->sizePolicy.horData() ) ); - l << QString::number( size_type_to_int( w->sizePolicy.verData() ) ); - l << QString::number( (int)w->isContainer ); - config.writeEntry( keybase + "CustomWidgets/Widget" + QString::number( j++ ), l, ',' ); - w->pixmap->save( QDir::home().absPath() + "/.designer/" + w->className, "XPM" ); + l << TQString::number( size_type_to_int( w->sizePolicy.horData() ) ); + l << TQString::number( size_type_to_int( w->sizePolicy.verData() ) ); + l << TQString::number( (int)w->isContainer ); + config.writeEntry( keybase + "CustomWidgets/Widget" + TQString::number( j++ ), l, ',' ); + w->pixmap->save( TQDir::home().absPath() + "/.designer/" + w->className, "XPM" ); } - QStringList l; - for ( QAction *a = commonWidgetsPage.first(); a; a = commonWidgetsPage.next() ) + TQStringList l; + for ( TQAction *a = commonWidgetsPage.first(); a; a = commonWidgetsPage.next() ) l << a->text(); config.writeEntry( keybase + "ToolBox/CommonWidgets", l ); } -static QString fixArgs2( const QString &s2 ) +static TQString fixArgs2( const TQString &s2 ) { - QString s = s2; + TQString s = s2; return s.replace( ';', ',' ); } void MainWindow::readConfig() { - QString keybase = DesignerApplication::settingsKey(); - QSettings config; - config.insertSearchPath( QSettings::Windows, "/Trolltech" ); + TQString keybase = DesignerApplication::settingsKey(); + TQSettings config; + config.insertSearchPath( TQSettings::Windows, "/Trolltech" ); bool ok; bool readPreviousConfig = FALSE; - QString backPixName( QDir::home().absPath() + "/.designer/" + "background.xpm" ); + TQString backPixName( TQDir::home().absPath() + "/.designer/" + "background.xpm" ); restoreConfig = config.readBoolEntry( keybase + "RestoreWorkspace", TRUE, &ok ); if ( !ok ) { keybase = DesignerApplication::oldSettingsKey(); @@ -2261,9 +2261,9 @@ void MainWindow::readConfig() if ( !ok ) { if ( oWindow ) { oWindow->shuttingDown(); - ( (QDockWindow*)oWindow->parent() )->hide(); + ( (TQDockWindow*)oWindow->parent() )->hide(); } - QPixmap pix; + TQPixmap pix; pix.load( backPixName ); if ( !pix.isNull() ) qworkspace->setBackgroundPixmap( pix ); @@ -2273,7 +2273,7 @@ void MainWindow::readConfig() } if ( !readPreviousConfig ) { fileFilter = config.readEntry( keybase + "FileFilter", fileFilter ); - templPath = config.readEntry( keybase + "TemplatePath", QString::null ); + templPath = config.readEntry( keybase + "TemplatePath", TQString::null ); databaseAutoEdit = config.readBoolEntry( keybase + "DatabaseAutoEdit", databaseAutoEdit ); shStartDialog = config.readBoolEntry( keybase + "ShowStartDialog", shStartDialog ); autoSaveEnabled = config.readBoolEntry( keybase + "AutoSave/Enabled", autoSaveEnabled ); @@ -2281,7 +2281,7 @@ void MainWindow::readConfig() } if ( restoreConfig || readPreviousConfig ) { - QString s = config.readEntry( keybase + "LastToolPage" ); + TQString s = config.readEntry( keybase + "LastToolPage" ); for ( int i = 0; i < toolBox->count(); ++i ) { if ( toolBox->itemLabel(i) == s ) { toolBox->setCurrentIndex( i ); @@ -2310,12 +2310,12 @@ void MainWindow::readConfig() backPix = config.readBoolEntry( keybase + "Background/UsePixmap", TRUE ) | readPreviousConfig; if ( backPix ) { - QPixmap pix; + TQPixmap pix; pix.load( backPixName ); if ( !pix.isNull() ) qworkspace->setBackgroundPixmap( pix ); } else { - qworkspace->setBackgroundColor( QColor( (QRgb)config.readNumEntry( keybase + "Background/Color" ) ) ); + qworkspace->setBackgroundColor( TQColor( (QRgb)config.readNumEntry( keybase + "Background/Color" ) ) ); } if ( !readPreviousConfig ) { @@ -2327,14 +2327,14 @@ void MainWindow::readConfig() grd.setY( config.readNumEntry( keybase + "Grid/y", 10 ) ); if ( !config.readBoolEntry( DesignerApplication::settingsKey() + "Geometries/MainwindowMaximized", FALSE ) ) { - QRect r( pos(), size() ); + TQRect r( pos(), size() ); r.setX( config.readNumEntry( keybase + "Geometries/MainwindowX", r.x() ) ); r.setY( config.readNumEntry( keybase + "Geometries/MainwindowY", r.y() ) ); r.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", r.width() ) ); r.setHeight( config.readNumEntry( keybase + "Geometries/MainwindowHeight", r.height() ) ); - QRect desk = QApplication::desktop()->geometry(); - QRect inter = desk.intersect( r ); + TQRect desk = TQApplication::desktop()->geometry(); + TQRect inter = desk.intersect( r ); resize( r.size() ); if ( inter.width() * inter.height() > ( r.width() * r.height() / 20 ) ) { move( r.topLeft() ); @@ -2347,7 +2347,7 @@ void MainWindow::readConfig() int num = config.readNumEntry( keybase + "CustomWidgets/num" ); for ( int j = 0; j < num; ++j ) { MetaDataBase::CustomWidget *w = new MetaDataBase::CustomWidget; - QStringList l = config.readListEntry( keybase + "CustomWidgets/Widget" + QString::number( j ), ',' ); + TQStringList l = config.readListEntry( keybase + "CustomWidgets/Widget" + TQString::number( j ), ',' ); w->className = l[ 0 ]; w->includeFile = l[ 1 ]; w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt(); @@ -2384,15 +2384,15 @@ void MainWindow::readConfig() w->lstProperties.append( prop ); } } if ( l.count() > c ) { - QSizePolicy::SizeType h, v; + TQSizePolicy::SizeType h, v; h = int_to_size_type( l[ c++ ].toInt() ); v = int_to_size_type( l[ c++ ].toInt() ); - w->sizePolicy = QSizePolicy( h, v ); + w->sizePolicy = TQSizePolicy( h, v ); } if ( l.count() > c ) { w->isContainer = (bool)l[ c++ ].toInt(); } - w->pixmap = new QPixmap( BarIcon( QDir::home().absPath() + "/.designer/" + w->className , KDevDesignerPartFactory::instance()) ); + w->pixmap = new TQPixmap( BarIcon( TQDir::home().absPath() + "/.designer/" + w->className , KDevDesignerPartFactory::instance()) ); MetaDataBase::addCustomWidget( w ); } if ( num > 0 ) @@ -2403,32 +2403,32 @@ void MainWindow::readConfig() #ifndef Q_WS_MAC /* I'm sorry to make this not happen on the Mac, but it seems to hang somewhere deep - in QLayout, it gets into a very large loop - and seems it has to do with clever + in TQLayout, it gets into a very large loop - and seems it has to do with clever things the designer does ###Sam */ - QApplication::sendPostedEvents(); + TQApplication::sendPostedEvents(); #endif if ( !readPreviousConfig ) { - QString mwlKey = "MainwindowLayout"; + TQString mwlKey = "MainwindowLayout"; if ( singleProjectMode() ) mwlKey += "S"; - QString mainWindowLayout = config.readEntry( keybase + mwlKey ); - QTextStream ts( &mainWindowLayout, IO_ReadOnly ); + TQString mainWindowLayout = config.readEntry( keybase + mwlKey ); + TQTextStream ts( &mainWindowLayout, IO_ReadOnly ); ts >> *this; } if ( readPreviousConfig && oWindow ) { oWindow->shuttingDown(); - ( (QDockWindow*)oWindow->parent() )->hide(); + ( (TQDockWindow*)oWindow->parent() )->hide(); } rebuildCustomWidgetGUI(); - QStringList l = config.readListEntry( keybase + "ToolBox/CommonWidgets" ); + TQStringList l = config.readListEntry( keybase + "ToolBox/CommonWidgets" ); if ( !l.isEmpty() ) { - QPtrList lst; + TQPtrList lst; commonWidgetsPage.clear(); - for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { - for ( QAction *a = toolActions.first(); a; a = toolActions.next() ) { + for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { + for ( TQAction *a = toolActions.first(); a; a = toolActions.next() ) { if ( *it == a->text() ) { lst.append( a ); break; @@ -2449,9 +2449,9 @@ HierarchyView *MainWindow::objectHierarchy() const return hierarchyView; } -QPopupMenu *MainWindow::setupNormalHierarchyMenu( QWidget *parent ) +TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent ) { - QPopupMenu *menu = new QPopupMenu( parent ); + TQPopupMenu *menu = new TQPopupMenu( parent ); actionEditCut->addTo( menu ); actionEditCopy->addTo( menu ); @@ -2461,9 +2461,9 @@ QPopupMenu *MainWindow::setupNormalHierarchyMenu( QWidget *parent ) return menu; } -QPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( QWidget *parent, const char *addSlot, const char *removeSlot ) +TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot ) { - QPopupMenu *menu = new QPopupMenu( parent ); + TQPopupMenu *menu = new TQPopupMenu( parent ); menu->insertItem( i18n( "Add Page" ), parent, addSlot ); menu->insertItem( i18n( "Delete Page" ), parent, removeSlot ); @@ -2476,7 +2476,7 @@ QPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( QWidget *parent, const char return menu; } -void MainWindow::closeEvent( QCloseEvent *e ) +void MainWindow::closeEvent( TQCloseEvent *e ) { if ( singleProject ) { hide(); @@ -2484,10 +2484,10 @@ void MainWindow::closeEvent( QCloseEvent *e ) return; } - QWidgetList windows = qWorkspace()->windowList(); - QWidgetListIt wit( windows ); + TQWidgetList windows = qWorkspace()->windowList(); + TQWidgetListIt wit( windows ); while ( wit.current() ) { - QWidget *w = wit.current(); + TQWidget *w = wit.current(); ++wit; if ( ::qt_cast(w) ) { if ( ( (FormWindow*)w )->formFile()->editor() ) @@ -2507,12 +2507,12 @@ void MainWindow::closeEvent( QCloseEvent *e ) w->close(); } - QMapConstIterator it = projects.begin(); + TQMapConstIterator it = projects.begin(); while( it != projects.end() ) { Project *pro = it.data(); ++it; if ( pro->isModified() ) { - switch ( QMessageBox::warning( this, i18n( "Save Project Settings" ), + switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ), i18n( "Save changes to '%1'?" ).arg( pro->fileName() ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save @@ -2534,7 +2534,7 @@ void MainWindow::closeEvent( QCloseEvent *e ) e->accept(); if ( client ) { - QDir home( QDir::homeDirPath() ); + TQDir home( TQDir::homeDirPath() ); home.remove( ".designerpid" ); } } @@ -2560,20 +2560,20 @@ ActionEditor *MainWindow::actioneditor() const return actionEditor; } -bool MainWindow::openEditor( QWidget *w, FormWindow *f ) +bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) { if ( f && !f->project()->isCpp() && !WidgetFactory::isPassiveInteractor( w ) ) { - QString defSignal = WidgetFactory::defaultSignal( w ); + TQString defSignal = WidgetFactory::defaultSignal( w ); if ( defSignal.isEmpty() ) { editSource(); } else { - QString s = QString( w->name() ) + "_" + defSignal; + TQString s = TQString( w->name() ) + "_" + defSignal; LanguageInterface *iface = MetaDataBase::languageInterface( f->project()->language() ); if ( iface ) { - QStrList sigs = iface->signalNames( w ); - QString fullSignal; + TQStrList sigs = iface->signalNames( w ); + TQString fullSignal; for ( int i = 0; i < (int)sigs.count(); ++i ) { - QString sig = sigs.at( i ); + TQString sig = sigs.at( i ); if ( sig.left( sig.find( '(' ) ) == defSignal ) { fullSignal = sig; break; @@ -2581,7 +2581,7 @@ bool MainWindow::openEditor( QWidget *w, FormWindow *f ) } if ( !fullSignal.isEmpty() ) { - QString signl = fullSignal; + TQString signl = fullSignal; fullSignal = fullSignal.mid( fullSignal.find( '(' ) + 1 ); fullSignal.remove( (int)fullSignal.length() - 1, 1 ); fullSignal = iface->createArguments( fullSignal.simplifyWhiteSpace() ); @@ -2617,42 +2617,42 @@ bool MainWindow::openEditor( QWidget *w, FormWindow *f ) return TRUE; } - const QMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); - const QMetaProperty* title = w->metaObject()->property( w->metaObject()->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; - if ( ::qt_cast(w) ) { + if ( ::qt_cast(w) ) { int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) oldDoWrap = TRUE; } bool doWrap = oldDoWrap; - QString text; - if ( ::qt_cast(w) || ::qt_cast(w) || ::qt_cast(w) ) { + TQString text; + if ( ::qt_cast(w) || ::qt_cast(w) || ::qt_cast(w) ) { text = MultiLineEditor::getText( this, w->property( "text" ).toString(), - !::qt_cast(w), &doWrap ); + !::qt_cast(w), &doWrap ); ok = !text.isNull(); } else { text = QInputDialog::getText( i18n("Text"), i18n( "New text" ), - QLineEdit::Normal, w->property("text").toString(), &ok, this ); + TQLineEdit::Normal, w->property("text").toString(), &ok, this ); } if ( ok ) { if ( oldDoWrap != doWrap ) { - QString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); + TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, - "wordwrap", QVariant( oldDoWrap, 0 ), - QVariant( doWrap, 0 ), QString::null, QString::null ); + "wordwrap", TQVariant( oldDoWrap, 0 ), + TQVariant( doWrap, 0 ), TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE ); } - QString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); + TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "text", w->property( "text" ), - text, QString::null, QString::null ); + text, TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "text", TRUE ); @@ -2661,13 +2661,13 @@ bool MainWindow::openEditor( QWidget *w, FormWindow *f ) } if ( title && title->designable(w) ) { bool ok = FALSE; - QString text; - text = QInputDialog::getText( i18n("Title"), i18n( "New title" ), QLineEdit::Normal, w->property("title").toString(), &ok, this ); + TQString text; + text = QInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { - QString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); + TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "title", w->property( "title" ), - text, QString::null, QString::null ); + text, TQString::null, TQString::null ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); MetaDataBase::setPropertyChanged( w, "title", TRUE ); @@ -2688,21 +2688,21 @@ void MainWindow::rebuildCustomWidgetGUI() customWidgetToolBar2->clear(); int count = 0; - QPtrListIterator it( toolActions ); - QAction *action; + TQPtrListIterator it( toolActions ); + TQAction *action; while ( ( action = it.current() ) ) { ++it; if ( ( (WidgetAction*)action )->group() == "Custom Widgets" ) delete action; } - QPtrList *lst = MetaDataBase::customWidgets(); + TQPtrList *lst = MetaDataBase::customWidgets(); actionToolsCustomWidget->addTo( customWidgetMenu ); customWidgetMenu->insertSeparator(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { - WidgetAction* a = new WidgetAction( "Custom Widgets", actionGroupTools, QString::number( w->id ).latin1() ); + WidgetAction* a = new WidgetAction( "Custom Widgets", actionGroupTools, TQString::number( w->id ).latin1() ); a->setToggleAction( TRUE ); a->setText( w->className ); a->setIconSet( *w->pixmap ); @@ -2718,8 +2718,8 @@ void MainWindow::rebuildCustomWidgetGUI() a->addTo( customWidgetMenu ); count++; } - QWidget *wid; - customWidgetToolBar2->setStretchableWidget( ( wid = new QWidget( customWidgetToolBar2 ) ) ); + TQWidget *wid; + customWidgetToolBar2->setStretchableWidget( ( wid = new TQWidget( customWidgetToolBar2 ) ) ); wid->setBackgroundMode( customWidgetToolBar2->backgroundMode() ); if ( count == 0 ) @@ -2733,10 +2733,10 @@ void MainWindow::rebuildCommonWidgetsToolBoxPage() toolBox->setUpdatesEnabled( FALSE ); commonWidgetsToolBar->setUpdatesEnabled( FALSE ); commonWidgetsToolBar->clear(); - for ( QAction *a = commonWidgetsPage.first(); a; a = commonWidgetsPage.next() ) + for ( TQAction *a = commonWidgetsPage.first(); a; a = commonWidgetsPage.next() ) a->addTo( commonWidgetsToolBar ); - QWidget *w; - commonWidgetsToolBar->setStretchableWidget( ( w = new QWidget( commonWidgetsToolBar ) ) ); + TQWidget *w; + commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) ); w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() ); toolBox->setUpdatesEnabled( TRUE ); commonWidgetsToolBar->setUpdatesEnabled( TRUE ); @@ -2744,8 +2744,8 @@ void MainWindow::rebuildCommonWidgetsToolBoxPage() bool MainWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *wid ) { - QWidgetList windows = qWorkspace()->windowList(); - for ( QWidget *w = windows.first(); w; w = windows.next() ) { + TQWidgetList windows = qWorkspace()->windowList(); + for ( TQWidget *w = windows.first(); w; w = windows.next() ) { if ( ::qt_cast(w) ) { if ( ( (FormWindow*)w )->isCustomWidgetUsed( wid ) ) return TRUE; @@ -2754,13 +2754,13 @@ bool MainWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *wid ) return FALSE; } -void MainWindow::setGrid( const QPoint &p ) +void MainWindow::setGrid( const TQPoint &p ) { if ( p == grd ) return; grd = p; - QWidgetList windows = qWorkspace()->windowList(); - for ( QWidget *w = windows.first(); w; w = windows.next() ) { + TQWidgetList windows = qWorkspace()->windowList(); + for ( TQWidget *w = windows.first(); w; w = windows.next() ) { if ( !::qt_cast(w) ) continue; ( (FormWindow*)w )->mainContainer()->update(); @@ -2772,8 +2772,8 @@ void MainWindow::setShowGrid( bool b ) if ( b == sGrid ) return; sGrid = b; - QWidgetList windows = qWorkspace()->windowList(); - for ( QWidget *w = windows.first(); w; w = windows.next() ) { + TQWidgetList windows = qWorkspace()->windowList(); + for ( TQWidget *w = windows.first(); w; w = windows.next() ) { if ( !::qt_cast(w) ) continue; ( (FormWindow*)w )->mainContainer()->update(); @@ -2787,19 +2787,19 @@ void MainWindow::setSnapGrid( bool b ) snGrid = b; } -QString MainWindow::documentationPath() const +TQString MainWindow::documentationPath() const { - return QString( qInstallPathDocs() ) + "/html/"; + return TQString( qInstallPathDocs() ) + "/html/"; } void MainWindow::windowsMenuActivated( int id ) { - QWidget* w = qworkspace->windowList().at( id ); + TQWidget* w = qworkspace->windowList().at( id ); if ( w ) w->setFocus(); } -void MainWindow::projectSelected( QAction *a ) +void MainWindow::projectSelected( TQAction *a ) { a->setOn( TRUE ); if ( currentProject ) @@ -2813,40 +2813,40 @@ void MainWindow::projectSelected( QAction *a ) wspace->setCurrentProject( currentProject ); } -void MainWindow::openProject( const QString &fn ) +void MainWindow::openProject( const TQString &fn ) { - for ( QMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { + for ( TQMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { if ( (*it)->fileName() == fn ) { projectSelected( it.key() ); return; } } - QApplication::setOverrideCursor( waitCursor ); + TQApplication::setOverrideCursor( waitCursor ); Project *pro = new Project( fn, "", projectSettingsPluginManager ); pro->setModified( FALSE ); - QAction *a = new QAction( pro->projectName(), pro->projectName(), 0, actionGroupProjects, 0, TRUE ); + TQAction *a = new TQAction( pro->projectName(), pro->projectName(), 0, actionGroupProjects, 0, TRUE ); projects.insert( a, pro ); projectSelected( a ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } void MainWindow::checkTempFiles() { - QString s = QDir::homeDirPath() + "/.designer"; - QString baseName = s+ "/saved-form-"; - if ( !QFile::exists( baseName + "1.ui" ) ) + TQString s = TQDir::homeDirPath() + "/.designer"; + TQString baseName = s+ "/saved-form-"; + if ( !TQFile::exists( baseName + "1.ui" ) ) return; DesignerApplication::closeSplash(); - QDir d( s ); + TQDir d( s ); d.setNameFilter( "*.ui" ); - QStringList lst = d.entryList(); - QApplication::restoreOverrideCursor(); - bool load = QMessageBox::information( this, i18n( "Restoring Last Session" ), + TQStringList lst = d.entryList(); + TQApplication::restoreOverrideCursor(); + bool load = TQMessageBox::information( this, i18n( "Restoring Last Session" ), i18n( "Qt Designer found some temporary saved files, which were\n" "written when Qt Designer crashed last time. Do you want to\n" "load these files?" ), i18n( "&Yes" ), i18n( "&No" ) ) == 0; - QApplication::setOverrideCursor( waitCursor ); - for ( QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + TQApplication::setOverrideCursor( waitCursor ); + for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { if ( load ) openFormWindow( s + "/" + *it, FALSE ); d.remove( *it ); @@ -2855,10 +2855,10 @@ void MainWindow::checkTempFiles() void MainWindow::showDialogHelp() { - QWidget *w = (QWidget*)sender(); + TQWidget *w = (TQWidget*)sender(); w = w->topLevelWidget(); - QString link = documentationPath() + "/designer-manual-13.html#"; + TQString link = documentationPath() + "/designer-manual-13.html#"; if ( ::qt_cast(w) || ::qt_cast(w) ) // own doc for startdialog? link += "dialog-file-new"; @@ -2905,7 +2905,7 @@ void MainWindow::showDialogHelp() link += "dialog-text"; else { - QMessageBox::information( this, i18n( "Help" ), + TQMessageBox::information( this, i18n( "Help" ), i18n( "There is no help available for this dialog at the moment." ) ); return; } @@ -2915,33 +2915,33 @@ void MainWindow::showDialogHelp() void MainWindow::setupActionManager() { - actionPluginManager = new QPluginManager( IID_Action, QApplication::libraryPaths(), pluginDirectory() ); + actionPluginManager = new QPluginManager( IID_Action, TQApplication::libraryPaths(), pluginDirectory() ); - QStringList lst = actionPluginManager->featureList(); - for ( QStringList::ConstIterator ait = lst.begin(); ait != lst.end(); ++ait ) { + TQStringList lst = actionPluginManager->featureList(); + for ( TQStringList::ConstIterator ait = lst.begin(); ait != lst.end(); ++ait ) { ActionInterface *iface = 0; actionPluginManager->queryInterface( *ait, &iface ); if ( !iface ) continue; iface->connectTo( desInterface ); - QAction *a = iface->create( *ait, this ); + TQAction *a = iface->create( *ait, this ); if ( !a ) continue; - QString grp = iface->group( *ait ); + TQString grp = iface->group( *ait ); if ( grp.isEmpty() ) grp = "3rd party actions"; - QPopupMenu *menu = 0; - QToolBar *tb = 0; + TQPopupMenu *menu = 0; + TQToolBar *tb = 0; - if ( !( menu = (QPopupMenu*)child( grp.latin1(), "QPopupMenu" ) ) ) { - menu = new QPopupMenu( this, grp.latin1() ); + if ( !( menu = (TQPopupMenu*)child( grp.latin1(), "TQPopupMenu" ) ) ) { + menu = new TQPopupMenu( this, grp.latin1() ); menuBar()->insertItem( i18n( grp ), menu ); } - if ( !( tb = (QToolBar*)child( grp.latin1(), "QToolBar" ) ) ) { - tb = new QToolBar( this, grp.latin1() ); - tb->setCloseMode( QDockWindow::Undocked ); + if ( !( tb = (TQToolBar*)child( grp.latin1(), "TQToolBar" ) ) ) { + tb = new TQToolBar( this, grp.latin1() ); + tb->setCloseMode( TQDockWindow::Undocked ); addToolBar( tb, grp ); } @@ -2954,7 +2954,7 @@ void MainWindow::setupActionManager() } } -void MainWindow::editFunction( const QString &func, bool rereadSource ) +void MainWindow::editFunction( const TQString &func, bool rereadSource ) { if ( !formWindow() ) return; @@ -2963,9 +2963,9 @@ void MainWindow::editFunction( const QString &func, bool rereadSource ) if ( !formWindow()->formFile()->setupUihFile(FALSE) ) return; - QString lang = currentProject->language(); + TQString lang = currentProject->language(); if ( !MetaDataBase::hasEditor( lang ) ) { - QMessageBox::information( this, i18n( "Edit Source" ), + TQMessageBox::information( this, i18n( "Edit Source" ), i18n( "There is no plugin for editing %1 code installed.\n" "Note: Plugins are not available in static Qt configurations." ).arg( lang ) ); return; @@ -2986,7 +2986,7 @@ void MainWindow::setupRecentlyFilesMenu() { recentlyFilesMenu->clear(); int id = 0; - for ( QStringList::ConstIterator it = recentlyFiles.begin(); it != recentlyFiles.end(); ++it ) { + for ( TQStringList::ConstIterator it = recentlyFiles.begin(); it != recentlyFiles.end(); ++it ) { recentlyFilesMenu->insertItem( *it, id ); id++; } @@ -2996,16 +2996,16 @@ void MainWindow::setupRecentlyProjectsMenu() { recentlyProjectsMenu->clear(); int id = 0; - for ( QStringList::ConstIterator it = recentlyProjects.begin(); it != recentlyProjects.end(); ++it ) { + for ( TQStringList::ConstIterator it = recentlyProjects.begin(); it != recentlyProjects.end(); ++it ) { recentlyProjectsMenu->insertItem( *it, id ); id++; } } -QPtrList MainWindow::projectList() const +TQPtrList MainWindow::projectList() const { - QPtrList list; - QMapConstIterator it = projects.begin(); + TQPtrList list; + TQMapConstIterator it = projects.begin(); while( it != projects.end() ) { Project *p = it.data(); @@ -3016,25 +3016,25 @@ QPtrList MainWindow::projectList() const return list; } -QStringList MainWindow::projectNames() const +TQStringList MainWindow::projectNames() const { - QStringList res; - for ( QMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) + TQStringList res; + for ( TQMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) res << (*it)->projectName(); return res; } -QStringList MainWindow::projectFileNames() const +TQStringList MainWindow::projectFileNames() const { - QStringList res; - for ( QMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) + TQStringList res; + for ( TQMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) res << (*it)->makeRelative( (*it)->fileName() ); return res; } -Project *MainWindow::findProject( const QString &projectName ) const +Project *MainWindow::findProject( const TQString &projectName ) const { - for ( QMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { + for ( TQMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { if ( (*it)->projectName() == projectName ) return *it; } @@ -3043,7 +3043,7 @@ Project *MainWindow::findProject( const QString &projectName ) const void MainWindow::setCurrentProject( Project *pro ) { - for ( QMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { + for ( TQMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { if ( *it == pro ) { projectSelected( it.key() ); return; @@ -3051,9 +3051,9 @@ void MainWindow::setCurrentProject( Project *pro ) } } -void MainWindow::setCurrentProjectByFilename( const QString& proFilename ) +void MainWindow::setCurrentProjectByFilename( const TQString& proFilename ) { - for ( QMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { + for ( TQMap::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { if ( (*it)->makeRelative( (*it)->fileName() ) == proFilename ) { projectSelected( it.key() ); return; @@ -3065,15 +3065,15 @@ void MainWindow::setCurrentProjectByFilename( const QString& proFilename ) void MainWindow::recentlyFilesMenuActivated( int id ) { if ( id != -1 ) { - if ( !QFile::exists( *recentlyFiles.at( id ) ) ) { - QMessageBox::warning( this, i18n( "Open File" ), + if ( !TQFile::exists( *recentlyFiles.at( id ) ) ) { + TQMessageBox::warning( this, i18n( "Open File" ), i18n( "Could not open '%1'. File does not exist." ). arg( *recentlyFiles.at( id ) ) ); recentlyFiles.remove( recentlyFiles.at( id ) ); return; } fileOpen( "", "", *recentlyFiles.at( id ) ); - QString fn( *recentlyFiles.at( id ) ); + TQString fn( *recentlyFiles.at( id ) ); addRecentlyOpened( fn, recentlyFiles ); } } @@ -3081,24 +3081,24 @@ void MainWindow::recentlyFilesMenuActivated( int id ) void MainWindow::recentlyProjectsMenuActivated( int id ) { if ( id != -1 ) { - if ( !QFile::exists( *recentlyProjects.at( id ) ) ) { - QMessageBox::warning( this, i18n( "Open Project" ), + if ( !TQFile::exists( *recentlyProjects.at( id ) ) ) { + TQMessageBox::warning( this, i18n( "Open Project" ), i18n( "Could not open '%1'. File does not exist." ). arg( *recentlyProjects.at( id ) ) ); recentlyProjects.remove( recentlyProjects.at( id ) ); return; } openProject( *recentlyProjects.at( id ) ); - QString fn( *recentlyProjects.at( id ) ); + TQString fn( *recentlyProjects.at( id ) ); addRecentlyOpened( fn, recentlyProjects ); } } -void MainWindow::addRecentlyOpened( const QString &fn, QStringList &lst ) +void MainWindow::addRecentlyOpened( const TQString &fn, TQStringList &lst ) { - QFileInfo fi( fn ); + TQFileInfo fi( fn ); fi.convertToAbs(); - QString f = fi.filePath(); + TQString f = fi.filePath(); if ( lst.find( f ) != lst.end() ) lst.remove( f ); if ( lst.count() >= 10 ) @@ -3106,7 +3106,7 @@ void MainWindow::addRecentlyOpened( const QString &fn, QStringList &lst ) lst.prepend( f ); } -TemplateWizardInterface * MainWindow::templateWizardInterface( const QString& className ) +TemplateWizardInterface * MainWindow::templateWizardInterface( const TQString& className ) { TemplateWizardInterface* iface = 0; templateWizardPluginManager->queryInterface( className, & iface ); @@ -3115,23 +3115,23 @@ TemplateWizardInterface * MainWindow::templateWizardInterface( const QString& cl void MainWindow::setupPluginManagers() { - editorPluginManager = new QPluginManager( IID_Editor, QApplication::libraryPaths(), "/kdevdesigner" ); + editorPluginManager = new QPluginManager( IID_Editor, TQApplication::libraryPaths(), "/kdevdesigner" ); MetaDataBase::setEditor( editorPluginManager->featureList() ); templateWizardPluginManager = - new QPluginManager( IID_TemplateWizard, QApplication::libraryPaths(), pluginDirectory() ); + new QPluginManager( IID_TemplateWizard, TQApplication::libraryPaths(), pluginDirectory() ); MetaDataBase::setupInterfaceManagers( "/designer" ); preferencePluginManager = - new QPluginManager( IID_Preference, QApplication::libraryPaths(), pluginDirectory() ); + new QPluginManager( IID_Preference, TQApplication::libraryPaths(), pluginDirectory() ); projectSettingsPluginManager = - new QPluginManager( IID_ProjectSettings, QApplication::libraryPaths(), pluginDirectory() ); + new QPluginManager( IID_ProjectSettings, TQApplication::libraryPaths(), pluginDirectory() ); sourceTemplatePluginManager = - new QPluginManager( IID_SourceTemplate, QApplication::libraryPaths(), pluginDirectory() ); + new QPluginManager( IID_SourceTemplate, TQApplication::libraryPaths(), pluginDirectory() ); if ( preferencePluginManager ) { - QStringList lst = preferencePluginManager->featureList(); - for ( QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + TQStringList lst = preferencePluginManager->featureList(); + for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { PreferenceInterface *i = 0; preferencePluginManager->queryInterface( *it, &i ); if ( !i ) @@ -3146,8 +3146,8 @@ void MainWindow::setupPluginManagers() } } if ( projectSettingsPluginManager ) { - QStringList lst = projectSettingsPluginManager->featureList(); - for ( QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + TQStringList lst = projectSettingsPluginManager->featureList(); + for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { ProjectSettingsInterface *i = 0; projectSettingsPluginManager->queryInterface( *it, &i ); if ( !i ) @@ -3163,7 +3163,7 @@ void MainWindow::setupPluginManagers() } } -void MainWindow::addPreferencesTab( QWidget *tab, const QString &title, QObject *receiver, const char *init_slot, const char *accept_slot ) +void MainWindow::addPreferencesTab( TQWidget *tab, const TQString &title, TQObject *receiver, const char *init_slot, const char *accept_slot ) { Tab t; t.w = tab; @@ -3174,7 +3174,7 @@ void MainWindow::addPreferencesTab( QWidget *tab, const QString &title, QObject preferenceTabs << t; } -void MainWindow::addProjectTab( QWidget *tab, const QString &title, QObject *receiver, const char *init_slot, const char *accept_slot ) +void MainWindow::addProjectTab( TQWidget *tab, const TQString &title, TQObject *receiver, const char *init_slot, const char *accept_slot ) { Tab t; t.w = tab; @@ -3185,9 +3185,9 @@ void MainWindow::addProjectTab( QWidget *tab, const QString &title, QObject *rec projectTabs << t; } -void MainWindow::setModified( bool b, QWidget *window ) +void MainWindow::setModified( bool b, TQWidget *window ) { - QWidget *w = window; + TQWidget *w = window; while ( w ) { if ( ::qt_cast(w) ) { ( (FormWindow*)w )->modificationChanged( b ); @@ -3236,7 +3236,7 @@ void MainWindow::updateFunctionList() LanguageInterface *iface = MetaDataBase::languageInterface( currentProject->language() ); if ( !iface ) return; - QValueList conns; + TQValueList conns; iface->connections( se->text(), &conns ); MetaDataBase::setupConnections( se->formWindow(), conns ); propertyEditor->eventList()->setup(); @@ -3248,7 +3248,7 @@ void MainWindow::updateWorkspace() wspace->setCurrentProject( currentProject ); } -void MainWindow::showDebugStep( QObject *o, int line ) +void MainWindow::showDebugStep( TQObject *o, int line ) { for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) e->clearStep(); @@ -3257,24 +3257,24 @@ void MainWindow::showDebugStep( QObject *o, int line ) showSourceLine( o, line, Step ); } -void MainWindow::showStackFrame( QObject *o, int line ) +void MainWindow::showStackFrame( TQObject *o, int line ) { if ( !o || line == -1 ) return; showSourceLine( o, line, StackFrame ); } -void MainWindow::showErrorMessage( QObject *o, int errorLine, const QString &errorMessage ) +void MainWindow::showErrorMessage( TQObject *o, int errorLine, const TQString &errorMessage ) { if ( o ) { errorLine--; // ###### - QValueList l; + TQValueList l; l << ( errorLine + 1 ); - QStringList l2; + TQStringList l2; l2 << errorMessage; - QObjectList ol; + TQObjectList ol; ol.append( o ); - QStringList ll; + TQStringList ll; ll << currentProject->locationOfObject( o ); oWindow->setErrorMessages( l2, l, TRUE, ll, ol ); showSourceLine( o, errorLine, Error ); @@ -3298,21 +3298,21 @@ void MainWindow::finishedRun() void MainWindow::enableAll( bool enable ) { menuBar()->setEnabled( enable ); - QObjectList *l = queryList( "QDockWindow" ); - for ( QObject *o = l->first(); o; o = l->next() ) { + TQObjectList *l = queryList( "TQDockWindow" ); + for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o == wspace->parentWidget() || o == oWindow->parentWidget() || o == hierarchyView->parentWidget() ) continue; - ( (QWidget*)o )->setEnabled( enable ); + ( (TQWidget*)o )->setEnabled( enable ); } delete l; } -void MainWindow::showSourceLine( QObject *o, int line, LineMode lm ) +void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) { - QWidgetList windows = qworkspace->windowList(); - for ( QWidget *w = windows.first(); w; w = windows.next() ) { + TQWidgetList windows = qworkspace->windowList(); + for ( TQWidget *w = windows.first(); w; w = windows.next() ) { FormWindow *fw = 0; SourceEditor *se = 0; SourceFile *sf = 0; @@ -3387,7 +3387,7 @@ void MainWindow::showSourceLine( QObject *o, int line, LineMode lm ) } if ( ::qt_cast(o) ) { - for ( QPtrListIterator sources = currentProject->sourceFiles(); + for ( TQPtrListIterator sources = currentProject->sourceFiles(); sources.current(); ++sources ) { SourceFile* f = sources.current(); if ( f == o ) { @@ -3422,7 +3422,7 @@ void MainWindow::showSourceLine( QObject *o, int line, LineMode lm ) mblockNewForms = TRUE; if ( !fw ) - openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (QWidget*)o ) ) ); + openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (TQWidget*)o ) ) ); else fw->formFile()->showEditor( FALSE ); qApp->processEvents(); // give all views the chance to get the formwindow @@ -3444,14 +3444,14 @@ void MainWindow::showSourceLine( QObject *o, int line, LineMode lm ) } -QObject *MainWindow::findRealObject( QObject *o ) +TQObject *MainWindow::findRealObject( TQObject *o ) { - QWidgetList windows = qWorkspace()->windowList(); - for ( QWidget *w = windows.first(); w; w = windows.next() ) { - if ( ::qt_cast(w) && QString( w->name() ) == QString( o->name() ) ) + TQWidgetList windows = qWorkspace()->windowList(); + for ( TQWidget *w = windows.first(); w; w = windows.next() ) { + if ( ::qt_cast(w) && TQString( w->name() ) == TQString( o->name() ) ) return w; else if ( ::qt_cast(w) && ( (SourceEditor*)w )->formWindow() && - QString( ( (SourceEditor*)w )->formWindow()->name() ) == QString( o->name() ) ) + TQString( ( (SourceEditor*)w )->formWindow()->name() ) == TQString( o->name() ) ) return w; else if ( ::qt_cast(w) && ( (SourceEditor*)w )->sourceFile() && ( (SourceEditor*)w )->sourceFile() == o ) @@ -3485,13 +3485,13 @@ void MainWindow::breakPointsChanged() if ( !interpreterPluginManager ) { interpreterPluginManager = new QPluginManager( IID_Interpreter, - QApplication::libraryPaths(), + TQApplication::libraryPaths(), "/qsa" ); } InterpreterInterface *iiface = 0; if ( interpreterPluginManager ) { - QString lang = currentProject->language(); + TQString lang = currentProject->language(); iiface = 0; interpreterPluginManager->queryInterface( lang, &iiface ); if ( !iiface ) @@ -3500,7 +3500,7 @@ void MainWindow::breakPointsChanged() e->saveBreakPoints(); - for ( QObject *o = debuggingForms.first(); o; o = debuggingForms.next() ) { + for ( TQObject *o = debuggingForms.first(); o; o = debuggingForms.next() ) { if ( qstrcmp( o->name(), e->object()->name() ) == 0 ) { iiface->setBreakPoints( o, MetaDataBase::breakPoints( e->object() ) ); break; @@ -3509,7 +3509,7 @@ void MainWindow::breakPointsChanged() for ( e = sourceEditors.first(); e; e = sourceEditors.next() ) { if ( e->project() == currentProject && e->sourceFile() ) { - QValueList bps = MetaDataBase::breakPoints( e->sourceFile() ); + TQValueList bps = MetaDataBase::breakPoints( e->sourceFile() ); iiface->setBreakPoints( e->object(), bps ); } } @@ -3560,18 +3560,18 @@ bool MainWindow::openProjectSettings( Project *pro ) { ProjectSettings dia( pro, this, 0, TRUE ); SenderObject *senderObject = new SenderObject( designerInterface() ); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for ( it = projectTabs.begin(); it != projectTabs.end(); ++it ) { Tab t = *it; if ( t.title != pro->language() ) continue; dia.tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia.buttonOk, SIGNAL( clicked() ), senderObject, SLOT( emitAcceptSignal() ) ); - connect( senderObject, SIGNAL( acceptSignal( QUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia.buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQT_SIGNAL( acceptSignal( QUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot ); } } @@ -3585,44 +3585,44 @@ bool MainWindow::openProjectSettings( Project *pro ) for ( it = projectTabs.begin(); it != projectTabs.end(); ++it ) { Tab t = *it; dia.tabWidget->removePage( t.w ); - t.w->reparent( 0, QPoint(0,0), FALSE ); + t.w->reparent( 0, TQPoint(0,0), FALSE ); } - return res == QDialog::Accepted; + return res == TQDialog::Accepted; } -void MainWindow::popupProjectMenu( const QPoint &pos ) +void MainWindow::popupProjectMenu( const TQPoint &pos ) { projectMenu->exec( pos ); } -QStringList MainWindow::sourceTemplates() const +TQStringList MainWindow::sourceTemplates() const { return sourceTemplatePluginManager->featureList(); } -SourceTemplateInterface* MainWindow::sourceTemplateInterface( const QString& templ ) +SourceTemplateInterface* MainWindow::sourceTemplateInterface( const TQString& templ ) { SourceTemplateInterface *iface = 0; sourceTemplatePluginManager->queryInterface( templ, &iface); return iface; } -QString MainWindow::whatsThisFrom( const QString &key ) +TQString MainWindow::whatsThisFrom( const TQString &key ) { if ( menuHelpFile.isEmpty() ) { - QString fn( documentationPath() ); + TQString fn( documentationPath() ); fn += "/designer-manual-11.html"; - QFile f( fn ); + TQFile f( fn ); if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); + TQTextStream ts( &f ); menuHelpFile = ts.read(); } } int i = menuHelpFile.find( key ); if ( i == -1 ) - return QString::null; + return TQString::null; int start = i; int end = i; start = menuHelpFile.findRev( "

  • ", i ) + 4; @@ -3635,11 +3635,11 @@ void MainWindow::setSingleProject( Project *pro ) if ( eProject ) { Project *pro = eProject; pro->save(); - QWidgetList windows = qWorkspace()->windowList(); + TQWidgetList windows = qWorkspace()->windowList(); qWorkspace()->blockSignals( TRUE ); - QWidgetListIt wit( windows ); + TQWidgetListIt wit( windows ); while ( wit.current() ) { - QWidget *w = wit.current(); + TQWidget *w = wit.current(); ++wit; if ( ::qt_cast(w) ) { if ( ( (FormWindow*)w )->project() == pro ) { @@ -3655,12 +3655,12 @@ void MainWindow::setSingleProject( Project *pro ) windows = qWorkspace()->windowList(); qWorkspace()->blockSignals( FALSE ); currentProject = 0; - updateUndoRedo( FALSE, FALSE, QString::null, QString::null ); + updateUndoRedo( FALSE, FALSE, TQString::null, TQString::null ); } singleProject = TRUE; projects.clear(); - QAction *a = new QAction( i18n( pro->name() ), i18n( pro->name() ), 0, + TQAction *a = new TQAction( i18n( pro->name() ), i18n( pro->name() ), 0, actionGroupProjects, 0, TRUE ); eProject = pro; projects.insert( a, eProject ); @@ -3682,9 +3682,9 @@ void MainWindow::showGUIStuff( bool b ) return; guiStuffVisible = b; if ( !b ) { - setAppropriate( (QDockWindow*)toolBox->parentWidget(), FALSE ); + setAppropriate( (TQDockWindow*)toolBox->parentWidget(), FALSE ); toolBox->parentWidget()->hide(); - for ( QToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) { + for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) { tb->hide(); setAppropriate( tb, FALSE ); } @@ -3696,17 +3696,17 @@ void MainWindow::showGUIStuff( bool b ) menubar->removeItem( toolsMenuId ); menubar->removeItem( toolsMenuId + 1 ); menubar->removeItem( toolsMenuId + 2 ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditAccels, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditFunctions, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditConnections, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditSource, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, SLOT( setEnabled(bool) ) ); + disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); + disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); + disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); + disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); + disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( FALSE ); actionEditSource->setEnabled( FALSE ); actionEditConnections->setEnabled( FALSE ); actionEditFunctions->setEnabled( FALSE ); actionEditAccels->setEnabled( FALSE ); - ( (QDockWindow*)propertyEditor->parentWidget() )-> + ( (TQDockWindow*)propertyEditor->parentWidget() )-> setCaption( i18n( "Signal Handlers" ) ); actionGroupNew->removeFrom( fileMenu ); actionGroupNew->removeFrom( projectToolBar ); @@ -3719,9 +3719,9 @@ void MainWindow::showGUIStuff( bool b ) actionFileSave->addTo( projectToolBar ); actionFileExit->addTo( fileMenu ); } else { - setAppropriate( (QDockWindow*)toolBox->parentWidget(), TRUE ); + setAppropriate( (TQDockWindow*)toolBox->parentWidget(), TRUE ); toolBox->parentWidget()->show(); - for ( QToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) { + for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) { setAppropriate( tb, TRUE ); tb->hide(); } @@ -3733,17 +3733,17 @@ void MainWindow::showGUIStuff( bool b ) menubar->insertItem( i18n( "&Tools" ), toolsMenu, toolsMenuId, toolsMenuIndex ); menubar->insertItem( i18n( "&Layout" ), layoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 ); menubar->insertItem( i18n( "&Preview" ), previewMenu, toolsMenuId + 2, toolsMenuIndex + 2 ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditAccels, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFunctions, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditConnections, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditSource, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, SLOT( setEnabled(bool) ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( TRUE ); actionEditSource->setEnabled( TRUE ); actionEditConnections->setEnabled( TRUE ); actionEditFunctions->setEnabled( TRUE ); actionEditAccels->setEnabled( TRUE ); - ( (QDockWindow*)propertyEditor->parentWidget() )-> + ( (TQDockWindow*)propertyEditor->parentWidget() )-> setCaption( i18n( "Property Editor/Signal Handlers" ) ); actionFileSave->removeFrom( fileMenu ); actionFileSave->removeFrom( projectToolBar ); @@ -3761,11 +3761,11 @@ void MainWindow::setEditorsReadOnly( bool b ) editorsReadOnly = b; } -void MainWindow::setPluginDirectory( const QString &pd ) +void MainWindow::setPluginDirectory( const TQString &pd ) { pluginDir = pd; if ( !qwf_plugin_dir ) - qwf_plugin_dir = new QString( pd ); + qwf_plugin_dir = new TQString( pd ); else *qwf_plugin_dir = pd; } @@ -3778,7 +3778,7 @@ void MainWindow::toggleSignalHandlers( bool show ) propertyEditor->setSignalHandlersEnabled( show ); } -void MainWindow::statusMessage( const QString &msg ) +void MainWindow::statusMessage( const TQString &msg ) { m_part->statusMessage(msg); } diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h index 43a4974a..1720229e 100644 --- a/kdevdesigner/designer/mainwindow.h +++ b/kdevdesigner/designer/mainwindow.h @@ -39,12 +39,12 @@ #include "../interfaces/sourcetemplateiface.h" #include "sourceeditor.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include class QToolBox; class PropertyEditor; @@ -69,7 +69,7 @@ class QAssistantClient; class DesignerAction; #if defined(Q_FULL_TEMPLATE_INSTANTIATION) -#include +#include #else class QToolBar; #endif @@ -84,7 +84,7 @@ class MainWindow : public QMainWindow public: enum LineMode { Error, Step, StackFrame }; - MainWindow( KDevDesignerPart *part, bool asClient, bool single = FALSE, const QString &plgDir = "/designer" ); + MainWindow( KDevDesignerPart *part, bool asClient, bool single = FALSE, const TQString &plgDir = "/designer" ); ~MainWindow(); HierarchyView *objectHierarchy() const; @@ -99,35 +99,35 @@ public: bool unregisterClient( FormWindow *w ); void editorClosed( SourceEditor *e ); - QWidget *isAFormWindowChild( QObject *o ) const; - QWidget *isAToolBarChild( QObject *o ) const; + TQWidget *isAFormWindowChild( TQObject *o ) const; + TQWidget *isAToolBarChild( TQObject *o ) const; void insertFormWindow( FormWindow *fw ); - QWorkspace *qWorkspace() const; + TQWorkspace *qWorkspace() const; - void popupFormWindowMenu( const QPoint &gp, FormWindow *fw ); - void popupWidgetMenu( const QPoint &gp, FormWindow *fw, QWidget *w ); + void popupFormWindowMenu( const TQPoint &gp, FormWindow *fw ); + void popupWidgetMenu( const TQPoint &gp, FormWindow *fw, TQWidget *w ); - QPopupMenu *setupNormalHierarchyMenu( QWidget *parent ); - QPopupMenu *setupTabWidgetHierarchyMenu( QWidget *parent, const char *addSlot, const char *removeSlot ); + TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent ); + TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot ); - FormWindow *openFormWindow( const QString &fn, bool validFileName = TRUE, FormFile *ff = 0 ); + FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 ); bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w ); - void setGrid( const QPoint &p ); + void setGrid( const TQPoint &p ); void setShowGrid( bool b ); void setSnapGrid( bool b ); - QPoint grid() const { return grd; } + TQPoint grid() const { return grd; } bool showGrid() const { return sGrid; } bool snapGrid() const { return snGrid && sGrid; } - QString documentationPath() const; + TQString documentationPath() const; static MainWindow *self; - QString templatePath() const { return templPath; } + TQString templatePath() const { return templPath; } - void editFunction( const QString &func, bool rereadSource = FALSE ); + void editFunction( const TQString &func, bool rereadSource = FALSE ); bool isPreviewing() const { return previewing; } @@ -135,25 +135,25 @@ public: FormWindow *activeForm() const { return lastActiveFormWindow; } - TemplateWizardInterface* templateWizardInterface( const QString& className ); - QStringList sourceTemplates() const; - SourceTemplateInterface* sourceTemplateInterface( const QString& templ ); + TemplateWizardInterface* templateWizardInterface( const TQString& className ); + TQStringList sourceTemplates() const; + SourceTemplateInterface* sourceTemplateInterface( const TQString& templ ); QUnknownInterface* designerInterface() const { return desInterface; } - QPtrList projectList() const; - QStringList projectNames() const; - QStringList projectFileNames() const; - Project *findProject( const QString &projectName ) const; + TQPtrList projectList() const; + TQStringList projectNames() const; + TQStringList projectFileNames() const; + Project *findProject( const TQString &projectName ) const; void setCurrentProject( Project *pro ); - void setCurrentProjectByFilename( const QString& proFilename ); + void setCurrentProjectByFilename( const TQString& proFilename ); OutputWindow *outputWindow() const { return oWindow; } - void addPreferencesTab( QWidget *tab, const QString &title, QObject *receiver, const char *init_slot, const char *accept_slot ); - void addProjectTab( QWidget *tab, const QString &title, QObject *receiver, const char *init_slot, const char *accept_slot ); - void setModified( bool b, QWidget *window ); + void addPreferencesTab( TQWidget *tab, const TQString &title, TQObject *receiver, const char *init_slot, const char *accept_slot ); + void addProjectTab( TQWidget *tab, const TQString &title, TQObject *receiver, const char *init_slot, const char *accept_slot ); + void setModified( bool b, TQWidget *window ); void functionsChanged(); void updateFunctionList(); void updateWorkspace(); void runProjectPrecondition(); - void runProjectPostcondition( QObjectList *l ); + void runProjectPostcondition( TQObjectList *l ); void formNameChanged( FormWindow *fw ); @@ -164,15 +164,15 @@ public: void resetBreakPoints(); SourceFile *sourceFile(); - void createNewProject( const QString &lang ); + void createNewProject( const TQString &lang ); - void popupProjectMenu( const QPoint &pos ); - QObject *findRealObject( QObject *o ); + void popupProjectMenu( const TQPoint &pos ); + TQObject *findRealObject( TQObject *o ); void setSingleProject( Project *pro ); bool singleProjectMode() const { return singleProject; } - void showSourceLine( QObject *o, int line, LineMode lm ); + void showSourceLine( TQObject *o, int line, LineMode lm ); void shuttingDown(); void showGUIStuff( bool b ); @@ -182,26 +182,26 @@ public: bool showSignalHandlers() const { return sSignalHandlers; } void writeConfig(); - void openProject( const QString &fn ); - void setPluginDirectory( const QString &pd ); - QString pluginDirectory() const { return pluginDir; } + void openProject( const TQString &fn ); + void setPluginDirectory( const TQString &pd ); + TQString pluginDirectory() const { return pluginDir; } QAssistantClient* assistantClient() const { return assistant; } - void addRecentlyOpenedFile( const QString &fn ) { addRecentlyOpened( fn, recentlyFiles ); } + void addRecentlyOpenedFile( const TQString &fn ) { addRecentlyOpened( fn, recentlyFiles ); } - void statusMessage(const QString &msg); + void statusMessage(const TQString &msg); //integration KDevDesignerPart *part() const { return m_part; } public slots: - void showProperties( QObject *w ); - void updateProperties( QObject *w ); + void showProperties( TQObject *w ); + void updateProperties( TQObject *w ); void showDialogHelp(); - void showDebugStep( QObject *o, int line ); - void showStackFrame( QObject *o, int line ); - void showErrorMessage( QObject *o, int line, const QString &errorMessage ); + void showDebugStep( TQObject *o, int line ); + void showStackFrame( TQObject *o, int line ); + void showErrorMessage( TQObject *o, int line, const TQString &errorMessage ); void finishedRun(); void breakPointsChanged(); @@ -218,8 +218,8 @@ signals: void editorChanged(); protected: - bool eventFilter( QObject *o, QEvent *e ); - void closeEvent( QCloseEvent *e ); + bool eventFilter( TQObject *o, TQEvent *e ); + void closeEvent( TQCloseEvent *e ); public slots: void fileNew(); @@ -229,7 +229,7 @@ public slots: void fileQuit(); void fileCloseProject(); // not visible in menu, called from fileClose void fileOpen(); - void fileOpen( const QString &filter, const QString &extension, const QString &filename = "" , bool inProject = TRUE ); + void fileOpen( const TQString &filter, const TQString &extension, const TQString &filename = "" , bool inProject = TRUE ); bool fileSave(); bool fileSaveForm(); // not visible in menu, called from fileSave bool fileSaveProject(); // not visible in menu, called from fileSaveProject @@ -263,9 +263,9 @@ public slots: SourceEditor *editSource(); SourceEditor *editSource( SourceFile *f ); SourceEditor *openSourceEditor(); - SourceEditor *createSourceEditor( QObject *object, Project *project, - const QString &lang = QString::null, - const QString &func = QString::null, + SourceEditor *createSourceEditor( TQObject *object, Project *project, + const TQString &lang = TQString::null, + const TQString &func = TQString::null, bool rereadSource = FALSE ); void editFormSettings(); void editProjectSettings(); @@ -283,7 +283,7 @@ public slots: void searchGotoLine(); void previewForm(); - void previewForm( const QString& ); + void previewForm( const TQString& ); void toolsCustomWidget(); void toolsConfigure(); @@ -295,11 +295,11 @@ public slots: void helpRegister(); private slots: - void activeWindowChanged( QWidget *w ); - void updateUndoRedo( bool, bool, const QString &, const QString & ); + void activeWindowChanged( TQWidget *w ); + void updateUndoRedo( bool, bool, const TQString &, const TQString & ); void updateEditorUndoRedo(); - void toolSelected( QAction* ); + void toolSelected( TQAction* ); void clipboardChanged(); void selectionChanged(); @@ -308,7 +308,7 @@ private slots: void setupWindowActions(); void createNewTemplate(); - void projectSelected( QAction *a ); + void projectSelected( TQAction *a ); void setupRecentlyFilesMenu(); void setupRecentlyProjectsMenu(); @@ -344,24 +344,24 @@ private: void enableAll( bool enable ); - QWidget* previewFormInternal( QStyle* style = 0, QPalette* pal = 0 ); + TQWidget* previewFormInternal( TQStyle* style = 0, TQPalette* pal = 0 ); void readConfig(); - void setupRMBProperties( QValueList &ids, QMap &props, QWidget *w ); - void handleRMBProperties( int id, QMap &props, QWidget *w ); - void setupRMBSpecialCommands( QValueList &ids, QMap &commands, QWidget *w ); - void handleRMBSpecialCommands( int id, QMap &commands, QWidget *w ); - void setupRMBSpecialCommands( QValueList &ids, QMap &commands, FormWindow *w ); - void handleRMBSpecialCommands( int id, QMap &commands, FormWindow *w ); - bool openEditor( QWidget *w, FormWindow *fw ); + void setupRMBProperties( TQValueList &ids, TQMap &props, TQWidget *w ); + void handleRMBProperties( int id, TQMap &props, TQWidget *w ); + void setupRMBSpecialCommands( TQValueList &ids, TQMap &commands, TQWidget *w ); + void handleRMBSpecialCommands( int id, TQMap &commands, TQWidget *w ); + void setupRMBSpecialCommands( TQValueList &ids, TQMap &commands, FormWindow *w ); + void handleRMBSpecialCommands( int id, TQMap &commands, FormWindow *w ); + bool openEditor( TQWidget *w, FormWindow *fw ); void rebuildCustomWidgetGUI(); void rebuildCommonWidgetsToolBoxPage(); void checkTempFiles(); - void addRecentlyOpened( const QString &fn, QStringList &lst ); + void addRecentlyOpened( const TQString &fn, TQStringList &lst ); - QString whatsThisFrom( const QString &key ); + TQString whatsThisFrom( const TQString &key ); private slots: void doFunctionsChanged(); @@ -370,9 +370,9 @@ private slots: private: struct Tab { - QWidget *w; - QString title; - QObject *receiver; + TQWidget *w; + TQString title; + TQObject *receiver; const char *init_slot, *accept_slot; Q_DUMMY_COMPARISON_OPERATOR( Tab ) }; @@ -381,19 +381,19 @@ private: PropertyEditor *propertyEditor; HierarchyView *hierarchyView; Workspace *wspace; - QWidget *lastPressWidget; - QWorkspace *qworkspace; - QMenuBar *menubar; - QGuardedPtr lastActiveFormWindow; + TQWidget *lastPressWidget; + TQWorkspace *qworkspace; + TQMenuBar *menubar; + TQGuardedPtr lastActiveFormWindow; bool breakLayout, layoutChilds, layoutSelected; - QPoint grd; + TQPoint grd; bool sGrid, snGrid; bool restoreConfig; bool backPix; bool splashScreen; - QString fileFilter; + TQString fileFilter; - QMap projects; + TQMap projects; DesignerAction *actionEditUndo, *actionEditRedo, *actionEditCut, *actionEditCopy, *actionEditPaste, *actionEditDelete, *actionEditAdjustSize, @@ -401,10 +401,10 @@ private: *actionEditSplitHorizontal, *actionEditSplitVertical, *actionEditSelectAll, *actionEditBreakLayout, *actionEditFunctions, *actionEditConnections, *actionEditLower, *actionEditRaise; - QAction *actionInsertSpacer; - QActionGroup *actionGroupTools, *actionGroupProjects; - QAction* actionPointerTool, *actionConnectTool, *actionOrderTool, *actionBuddyTool; - QAction* actionCurrentTool; + TQAction *actionInsertSpacer; + TQActionGroup *actionGroupTools, *actionGroupProjects; + TQAction* actionPointerTool, *actionConnectTool, *actionOrderTool, *actionBuddyTool; + TQAction* actionCurrentTool; DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutQt, *actionHelpWhatsThis; DesignerAction *actionHelpManual; #if defined(QT_NON_COMMERCIAL) @@ -419,20 +419,20 @@ private: DesignerAction *actionSearchFind, *actionSearchIncremetal, *actionSearchReplace, *actionSearchGotoLine; DesignerAction *actionProjectAddFile, *actionEditPixmapCollection, *actionEditDatabaseConnections, *actionEditProjectSettings, *actionPreview; - QActionGroup *actionGroupNew; + TQActionGroup *actionGroupNew; - QPopupMenu *rmbWidgets; - QPopupMenu *rmbFormWindow; - QPopupMenu *customWidgetMenu, *windowMenu, *fileMenu, *recentlyFilesMenu, *recentlyProjectsMenu; - QPopupMenu *toolsMenu, *layoutMenu, *previewMenu; - QToolBar *customWidgetToolBar, *layoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar; - QToolBar *commonWidgetsToolBar; - QPtrList widgetToolBars; + TQPopupMenu *rmbWidgets; + TQPopupMenu *rmbFormWindow; + TQPopupMenu *customWidgetMenu, *windowMenu, *fileMenu, *recentlyFilesMenu, *recentlyProjectsMenu; + TQPopupMenu *toolsMenu, *layoutMenu, *previewMenu; + TQToolBar *customWidgetToolBar, *layoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar; + TQToolBar *commonWidgetsToolBar; + TQPtrList widgetToolBars; Preferences *prefDia; - QMap propertyDocumentation; + TQMap propertyDocumentation; bool client; - QString templPath; + TQString templPath; ActionEditor *actionEditor; Project *currentProject; QPluginManager *actionPluginManager; @@ -442,47 +442,47 @@ private: QPluginManager *preferencePluginManager; QPluginManager *projectSettingsPluginManager; QPluginManager *sourceTemplatePluginManager; - QPtrList sourceEditors; + TQPtrList sourceEditors; bool previewing; QUnknownInterface *desInterface; - QStringList recentlyFiles; - QStringList recentlyProjects; + TQStringList recentlyFiles; + TQStringList recentlyProjects; OutputWindow *oWindow; - QValueList preferenceTabs; - QValueList projectTabs; + TQValueList preferenceTabs; + TQValueList projectTabs; bool databaseAutoEdit; - QTimer *updateFunctionsTimer; - QTimer *autoSaveTimer; + TQTimer *updateFunctionsTimer; + TQTimer *autoSaveTimer; bool autoSaveEnabled; int autoSaveInterval; - QLineEdit *incrementalSearch; - QGuardedPtr findDialog; - QGuardedPtr replaceDialog; - QGuardedPtr gotoLineDialog; + TQLineEdit *incrementalSearch; + TQGuardedPtr findDialog; + TQGuardedPtr replaceDialog; + TQGuardedPtr gotoLineDialog; Project *eProject; bool inDebugMode; - QObjectList debuggingForms; - QString lastOpenFilter; - QGuardedPtr previewedForm; - QPopupMenu *projectMenu; - QString menuHelpFile; + TQObjectList debuggingForms; + TQString lastOpenFilter; + TQGuardedPtr previewedForm; + TQPopupMenu *projectMenu; + TQString menuHelpFile; bool singleProject; - QToolBox *toolBox; + TQToolBox *toolBox; int toolsMenuId, toolsMenuIndex; uint guiStuffVisible : 1; uint editorsReadOnly : 1; uint savePluginPaths : 1; QAssistantClient *assistant; bool shStartDialog; - QString pluginDir; + TQString pluginDir; bool sSignalHandlers; KDevDesignerPart *m_part; public: - QString lastSaveFilter; - QPtrList toolActions; - QPtrList commonWidgetsPage; + TQString lastSaveFilter; + TQPtrList toolActions; + TQPtrList commonWidgetsPage; friend class KDevDesignerPart; }; diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index d6ed0982..ebbccdad 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -32,24 +32,24 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "defs.h" #include "project.h" @@ -76,7 +76,7 @@ #include "dbconnectionimpl.h" #endif #include "widgetaction.h" -#include +#include #include "startdialogimpl.h" #include "designerappiface.h" #include "connectiondialog.h" @@ -107,18 +107,18 @@ static const char * whatsthis_image[] = { " ooo ", " ooo "}; -const QString toolbarHelp = "

    Toolbars contain a number of buttons to " +const TQString toolbarHelp = "

    Toolbars contain a number of buttons to " "provide quick access to often used functions.%1" "
    Click on the toolbar handle to hide the toolbar, " "or drag and place the toolbar to a different location.

    "; -static QIconSet createIconSet( const QString &name ) +static TQIconSet createIconSet( const TQString &name ) { - QIconSet ic( BarIcon( "" + name, KDevDesignerPartFactory::instance() ) ); - QString prefix = "designer_"; + TQIconSet ic( BarIcon( "" + name, KDevDesignerPartFactory::instance() ) ); + TQString prefix = "designer_"; int right = name.length() - prefix.length(); ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), KDevDesignerPartFactory::instance() ), - QIconSet::Small, QIconSet::Disabled ); + TQIconSet::Small, TQIconSet::Disabled ); return ic; } @@ -127,105 +127,105 @@ void MainWindow::setupEditActions() actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, this, 0 ); actionEditUndo->setStatusTip( i18n( "Undoes the last action" ) ); actionEditUndo->setWhatsThis( whatsThisFrom( "Edit|Undo" ) ); - connect( actionEditUndo, SIGNAL( activated() ), this, SLOT( editUndo() ) ); + connect( actionEditUndo, TQT_SIGNAL( activated() ), this, TQT_SLOT( editUndo() ) ); actionEditUndo->setEnabled( FALSE ); actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, this, 0 ); actionEditRedo->setStatusTip( i18n( "Redoes the last undone operation") ); actionEditRedo->setWhatsThis( whatsThisFrom( "Edit|Redo" ) ); - connect( actionEditRedo, SIGNAL( activated() ), this, SLOT( editRedo() ) ); + connect( actionEditRedo, TQT_SIGNAL( activated() ), this, TQT_SLOT( editRedo() ) ); actionEditRedo->setEnabled( FALSE ); actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, this, 0 ); actionEditCut->setStatusTip( i18n( "Cuts the selected widgets and puts them on the clipboard" ) ); actionEditCut->setWhatsThis( whatsThisFrom( "Edit|Cut" ) ); - connect( actionEditCut, SIGNAL( activated() ), this, SLOT( editCut() ) ); + connect( actionEditCut, TQT_SIGNAL( activated() ), this, TQT_SLOT( editCut() ) ); actionEditCut->setEnabled( FALSE ); actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, this, 0 ); actionEditCopy->setStatusTip( i18n( "Copies the selected widgets to the clipboard" ) ); actionEditCopy->setWhatsThis( whatsThisFrom( "Edit|Copy" ) ); - connect( actionEditCopy, SIGNAL( activated() ), this, SLOT( editCopy() ) ); + connect( actionEditCopy, TQT_SIGNAL( activated() ), this, TQT_SLOT( editCopy() ) ); actionEditCopy->setEnabled( FALSE ); actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, this, 0 ); actionEditPaste->setStatusTip( i18n( "Pastes the clipboard's contents" ) ); actionEditPaste->setWhatsThis( whatsThisFrom( "Edit|Paste" ) ); - connect( actionEditPaste, SIGNAL( activated() ), this, SLOT( editPaste() ) ); + connect( actionEditPaste, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPaste() ) ); actionEditPaste->setEnabled( FALSE ); - actionEditDelete = new DesignerAction( i18n( "Delete" ), QPixmap(), i18n( "&Delete" ), Key_Delete, this, 0 ); + actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, this, 0 ); actionEditDelete->setStatusTip( i18n( "Deletes the selected widgets" ) ); actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) ); - connect( actionEditDelete, SIGNAL( activated() ), this, SLOT( editDelete() ) ); + connect( actionEditDelete, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDelete() ) ); actionEditDelete->setEnabled( FALSE ); #ifdef Q_WS_MAC - QAction *macDelete = new DesignerAction( i18n( "Delete" ), QPixmap(), i18n( "&Delete" ), Key_Backspace, this, 0 ); - connect( macDelete, SIGNAL( activated() ), this, SLOT( editDelete() ) ); + TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, this, 0 ); + connect( macDelete, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDelete() ) ); #endif - actionEditSelectAll = new DesignerAction( i18n( "Select All" ), QPixmap(), i18n( "Select &All" ), CTRL + Key_A, this, 0 ); + actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, this, 0 ); actionEditSelectAll->setStatusTip( i18n( "Selects all widgets" ) ); actionEditSelectAll->setWhatsThis( whatsThisFrom( "Edit|Select All" ) ); - connect( actionEditSelectAll, SIGNAL( activated() ), this, SLOT( editSelectAll() ) ); + connect( actionEditSelectAll, TQT_SIGNAL( activated() ), this, TQT_SLOT( editSelectAll() ) ); actionEditSelectAll->setEnabled( TRUE ); actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, this, 0 ); actionEditRaise->setStatusTip( i18n( "Raises the selected widgets" ) ); actionEditRaise->setWhatsThis( i18n( "Raises the selected widgets" ) ); - connect( actionEditRaise, SIGNAL( activated() ), this, SLOT( editRaise() ) ); + connect( actionEditRaise, TQT_SIGNAL( activated() ), this, TQT_SLOT( editRaise() ) ); actionEditRaise->setEnabled( FALSE ); actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, this, 0 ); actionEditLower->setStatusTip( i18n( "Lowers the selected widgets" ) ); actionEditLower->setWhatsThis( i18n( "Lowers the selected widgets" ) ); - connect( actionEditLower, SIGNAL( activated() ), this, SLOT( editLower() ) ); + connect( actionEditLower, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLower() ) ); actionEditLower->setEnabled( FALSE ); - actionEditAccels = new DesignerAction( i18n( "Check Accelerators" ), QPixmap(), + actionEditAccels = new DesignerAction( i18n( "Check Accelerators" ), TQPixmap(), i18n( "Chec&k Accelerators" ), ALT + Key_R, this, 0 ); actionEditAccels->setStatusTip( i18n("Checks if the accelerators used in the form are unique") ); actionEditAccels->setWhatsThis( whatsThisFrom( "Edit|Check Accelerator" ) ); - connect( actionEditAccels, SIGNAL( activated() ), this, SLOT( editAccels() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditAccels, SLOT( setEnabled(bool) ) ); + connect( actionEditAccels, TQT_SIGNAL( activated() ), this, TQT_SLOT( editAccels() ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); actionEditFunctions = new DesignerAction( i18n( "Slots" ), createIconSet("designer_editslots.png"), i18n( "S&lots..." ), 0, this, 0 ); actionEditFunctions->setStatusTip( i18n("Opens a dialog for editing slots") ); actionEditFunctions->setWhatsThis( whatsThisFrom( "Edit|Slots" ) ); - connect( actionEditFunctions, SIGNAL( activated() ), this, SLOT( editFunctions() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFunctions, SLOT( setEnabled(bool) ) ); + connect( actionEditFunctions, TQT_SIGNAL( activated() ), this, TQT_SLOT( editFunctions() ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); actionEditConnections = new DesignerAction( i18n( "Connections" ), createIconSet("designer_connecttool.png"), i18n( "Co&nnections..." ), 0, this, 0 ); actionEditConnections->setStatusTip( i18n("Opens a dialog for editing connections") ); actionEditConnections->setWhatsThis( whatsThisFrom( "Edit|Connections" ) ); - connect( actionEditConnections, SIGNAL( activated() ), this, SLOT( editConnections() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditConnections, SLOT( setEnabled(bool) ) ); + connect( actionEditConnections, TQT_SIGNAL( activated() ), this, TQT_SLOT( editConnections() ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); - actionEditSource = new DesignerAction( i18n( "Source" ), QIconSet(), + actionEditSource = new DesignerAction( i18n( "Source" ), TQIconSet(), i18n( "&Source..." ), CTRL + Key_E, this, 0 ); actionEditSource->setStatusTip( i18n("Opens an editor to edit the form's source code") ); actionEditSource->setWhatsThis( whatsThisFrom( "Edit|Source" ) ); - connect( actionEditSource, SIGNAL( activated() ), this, SLOT( editSource() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditSource, SLOT( setEnabled(bool) ) ); + connect( actionEditSource, TQT_SIGNAL( activated() ), this, TQT_SLOT( editSource() ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); - actionEditFormSettings = new DesignerAction( i18n( "Form Settings" ), QPixmap(), + actionEditFormSettings = new DesignerAction( i18n( "Form Settings" ), TQPixmap(), i18n( "&Form Settings..." ), 0, this, 0 ); actionEditFormSettings->setStatusTip( i18n("Opens a dialog to change the form's settings") ); actionEditFormSettings->setWhatsThis( whatsThisFrom( "Edit|Form Settings" ) ); - connect( actionEditFormSettings, SIGNAL( activated() ), this, SLOT( editFormSettings() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, SLOT( setEnabled(bool) ) ); + connect( actionEditFormSettings, TQT_SIGNAL( activated() ), this, TQT_SLOT( editFormSettings() ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); - actionEditPreferences = new DesignerAction( i18n( "Preferences" ), QPixmap(), + actionEditPreferences = new DesignerAction( i18n( "Preferences" ), TQPixmap(), i18n( "Preferences..." ), 0, this, 0 ); actionEditPreferences->setStatusTip( i18n("Opens a dialog to change preferences") ); actionEditPreferences->setWhatsThis( whatsThisFrom( "Edit|Preferences" ) ); - connect( actionEditPreferences, SIGNAL( activated() ), this, SLOT( editPreferences() ) ); + connect( actionEditPreferences, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPreferences() ) ); -/* QToolBar *tb = new QToolBar( this, "Edit" ); - tb->setCloseMode( QDockWindow::Undocked ); - QWhatsThis::add( tb, i18n( "The Edit toolbar%1").arg(i18n(toolbarHelp).arg("")) ); +/* TQToolBar *tb = new TQToolBar( this, "Edit" ); + tb->setCloseMode( TQDockWindow::Undocked ); + TQWhatsThis::add( tb, i18n( "The Edit toolbar%1").arg(i18n(toolbarHelp).arg("")) ); addToolBar( tb, i18n( "Edit" ) ); actionEditUndo->addTo( tb ); actionEditRedo->addTo( tb ); @@ -239,8 +239,8 @@ void MainWindow::setupEditActions() actionEditRaise->addTo( tb ); #endif - QPopupMenu *menu = new QPopupMenu( this, "Edit" ); - connect( menu, SIGNAL( aboutToShow() ), this, SLOT( updateEditorUndoRedo() ) ); + TQPopupMenu *menu = new TQPopupMenu( this, "Edit" ); + connect( menu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( updateEditorUndoRedo() ) ); menubar->insertItem( i18n( "&Edit" ), menu ); actionEditUndo->addTo( menu ); actionEditRedo->addTo( menu ); @@ -270,43 +270,43 @@ void MainWindow::setupSearchActions() { actionSearchFind = new DesignerAction( i18n( "Find" ), createIconSet( "designer_searchfind.png" ), i18n( "&Find..." ), CTRL + Key_F, this, 0 ); - connect( actionSearchFind, SIGNAL( activated() ), this, SLOT( searchFind() ) ); + connect( actionSearchFind, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchFind() ) ); actionSearchFind->setEnabled( FALSE ); actionSearchFind->setWhatsThis( whatsThisFrom( "Search|Find" ) ); - actionSearchIncremetal = new DesignerAction( i18n( "Find Incremental" ), QIconSet(), + actionSearchIncremetal = new DesignerAction( i18n( "Find Incremental" ), TQIconSet(), i18n( "Find &Incremental" ), ALT + Key_I, this, 0 ); - connect( actionSearchIncremetal, SIGNAL( activated() ), this, SLOT( searchIncremetalFindMenu() ) ); + connect( actionSearchIncremetal, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchIncremetalFindMenu() ) ); actionSearchIncremetal->setEnabled( FALSE ); actionSearchIncremetal->setWhatsThis( whatsThisFrom( "Search|Find Incremental" ) ); - actionSearchReplace = new DesignerAction( i18n( "Replace" ), QIconSet(), + actionSearchReplace = new DesignerAction( i18n( "Replace" ), TQIconSet(), i18n( "&Replace..." ), CTRL + Key_R, this, 0 ); - connect( actionSearchReplace, SIGNAL( activated() ), this, SLOT( searchReplace() ) ); + connect( actionSearchReplace, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchReplace() ) ); actionSearchReplace->setEnabled( FALSE ); actionSearchReplace->setWhatsThis( whatsThisFrom( "Search|Replace" ) ); - actionSearchGotoLine = new DesignerAction( i18n( "Goto Line" ), QIconSet(), + actionSearchGotoLine = new DesignerAction( i18n( "Goto Line" ), TQIconSet(), i18n( "&Goto Line..." ), ALT + Key_G, this, 0 ); - connect( actionSearchGotoLine, SIGNAL( activated() ), this, SLOT( searchGotoLine() ) ); + connect( actionSearchGotoLine, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchGotoLine() ) ); actionSearchGotoLine->setEnabled( FALSE ); actionSearchGotoLine->setWhatsThis( whatsThisFrom( "Search|Goto line" ) ); -/* QToolBar *tb = new QToolBar( this, "Search" ); - tb->setCloseMode( QDockWindow::Undocked ); +/* TQToolBar *tb = new TQToolBar( this, "Search" ); + tb->setCloseMode( TQDockWindow::Undocked ); addToolBar( tb, i18n( "Search" ) ); actionSearchFind->addTo( tb );*/ - incrementalSearch = new QLineEdit( 0 ); + incrementalSearch = new TQLineEdit( 0 ); incrementalSearch->hide(); - QToolTip::add( incrementalSearch, i18n( "Incremental search (Alt+I)" ) ); - connect( incrementalSearch, SIGNAL( textChanged( const QString & ) ), - this, SLOT( searchIncremetalFind() ) ); - connect( incrementalSearch, SIGNAL( returnPressed() ), - this, SLOT( searchIncremetalFindNext() ) ); + TQToolTip::add( incrementalSearch, i18n( "Incremental search (Alt+I)" ) ); + connect( incrementalSearch, TQT_SIGNAL( textChanged( const TQString & ) ), + this, TQT_SLOT( searchIncremetalFind() ) ); + connect( incrementalSearch, TQT_SIGNAL( returnPressed() ), + this, TQT_SLOT( searchIncremetalFindNext() ) ); incrementalSearch->setEnabled( FALSE ); - QPopupMenu *menu = new QPopupMenu( this, "Search" ); + TQPopupMenu *menu = new TQPopupMenu( this, "Search" ); menubar->insertItem( i18n( "&Search" ), menu ); actionSearchFind->addTo( menu ); actionSearchIncremetal->addTo( menu ); @@ -318,62 +318,62 @@ void MainWindow::setupSearchActions() void MainWindow::setupLayoutActions() { if ( !actionGroupTools ) { - actionGroupTools = new QActionGroup( this ); + actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, SIGNAL( selected(QAction*) ), this, SLOT( toolSelected(QAction*) ) ); + connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), this, TQT_SLOT( toolSelected(TQAction*) ) ); } actionEditAdjustSize = new DesignerAction( i18n( "Adjust Size" ), createIconSet("designer_adjustsize.png"), i18n( "Adjust &Size" ), CTRL + Key_J, this, 0 ); actionEditAdjustSize->setStatusTip(i18n("Adjusts the size of the selected widget") ); actionEditAdjustSize->setWhatsThis( whatsThisFrom( "Layout|Adjust Size" ) ); - connect( actionEditAdjustSize, SIGNAL( activated() ), this, SLOT( editAdjustSize() ) ); + connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), this, TQT_SLOT( editAdjustSize() ) ); actionEditAdjustSize->setEnabled( FALSE ); actionEditHLayout = new DesignerAction( i18n( "Lay Out Horizontally" ), createIconSet("designer_edithlayout.png"), i18n( "Lay Out &Horizontally" ), CTRL + Key_H, this, 0 ); actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") ); actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally" ) ); - connect( actionEditHLayout, SIGNAL( activated() ), this, SLOT( editLayoutHorizontal() ) ); + connect( actionEditHLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutHorizontal() ) ); actionEditHLayout->setEnabled( FALSE ); actionEditVLayout = new DesignerAction( i18n( "Lay Out Vertically" ), createIconSet("designer_editvlayout.png"), i18n( "Lay Out &Vertically" ), CTRL + Key_L, this, 0 ); actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") ); actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically" ) ); - connect( actionEditVLayout, SIGNAL( activated() ), this, SLOT( editLayoutVertical() ) ); + connect( actionEditVLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutVertical() ) ); actionEditVLayout->setEnabled( FALSE ); actionEditGridLayout = new DesignerAction( i18n( "Lay Out in a Grid" ), createIconSet("designer_editgrid.png"), i18n( "Lay Out in a &Grid" ), CTRL + Key_G, this, 0 ); actionEditGridLayout->setStatusTip(i18n("Lays out the selected widgets in a grid") ); actionEditGridLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out in a Grid" ) ); - connect( actionEditGridLayout, SIGNAL( activated() ), this, SLOT( editLayoutGrid() ) ); + connect( actionEditGridLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutGrid() ) ); actionEditGridLayout->setEnabled( FALSE ); actionEditSplitHorizontal = new DesignerAction( i18n( "Lay Out Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"), i18n( "Lay Out Horizontally (in S&plitter)" ), 0, this, 0 ); actionEditSplitHorizontal->setStatusTip(i18n("Lays out the selected widgets horizontally in a splitter") ); actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally (in Splitter)" ) ); - connect( actionEditSplitHorizontal, SIGNAL( activated() ), this, SLOT( editLayoutHorizontalSplit() ) ); + connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutHorizontalSplit() ) ); actionEditSplitHorizontal->setEnabled( FALSE ); actionEditSplitVertical = new DesignerAction( i18n( "Lay Out Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"), i18n( "Lay Out Vertically (in Sp&litter)" ), 0, this, 0 ); actionEditSplitVertical->setStatusTip(i18n("Lays out the selected widgets vertically in a splitter") ); actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically (in Splitter)" ) ); - connect( actionEditSplitVertical, SIGNAL( activated() ), this, SLOT( editLayoutVerticalSplit() ) ); + connect( actionEditSplitVertical, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutVerticalSplit() ) ); actionEditSplitVertical->setEnabled( FALSE ); actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"), i18n( "&Break Layout" ), CTRL + Key_B, this, 0 ); actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") ); actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) ); - connect( actionEditBreakLayout, SIGNAL( activated() ), this, SLOT( editBreakLayout() ) ); + connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editBreakLayout() ) ); actionEditBreakLayout->setEnabled( FALSE ); int id = WidgetDatabase::idFromClassName( "Spacer" ); - actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, QString::number( id ).latin1() ); + actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() ); actionInsertSpacer->setToggleAction( TRUE ); actionInsertSpacer->setText( WidgetDatabase::className( id ) ); actionInsertSpacer->setMenuText( i18n( "Add %1").arg( WidgetDatabase::className( id ) ) ); @@ -389,10 +389,10 @@ void MainWindow::setupLayoutActions() actionInsertSpacer->addTo( commonWidgetsToolBar ); commonWidgetsPage.append( actionInsertSpacer ); - QWidget *w; - commonWidgetsToolBar->setStretchableWidget( ( w = new QWidget( commonWidgetsToolBar ) ) ); + TQWidget *w; + commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) ); w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() ); - QWhatsThis::add( layoutToolBar, i18n( "The Layout toolbar%1" ).arg(i18n(toolbarHelp).arg("")) ); + TQWhatsThis::add( layoutToolBar, i18n( "The Layout toolbar%1" ).arg(i18n(toolbarHelp).arg("")) ); actionEditAdjustSize->addTo( layoutToolBar ); layoutToolBar->addSeparator(); actionEditHLayout->addTo( layoutToolBar ); @@ -404,7 +404,7 @@ void MainWindow::setupLayoutActions() layoutToolBar->addSeparator(); actionInsertSpacer->addTo( layoutToolBar ); - QPopupMenu *menu = new QPopupMenu( this, "Layout" ); + TQPopupMenu *menu = new TQPopupMenu( this, "Layout" ); layoutMenu = menu; menubar->insertItem( i18n( "&Layout" ), menu, toolsMenuId + 1 ); actionEditAdjustSize->addTo( menu ); @@ -422,16 +422,16 @@ void MainWindow::setupLayoutActions() void MainWindow::setupToolActions() { if ( !actionGroupTools ) { - actionGroupTools = new QActionGroup( this ); + actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, SIGNAL( selected(QAction*) ), - this, SLOT( toolSelected(QAction*) ) ); + connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), + this, TQT_SLOT( toolSelected(TQAction*) ) ); } actionPointerTool = new DesignerAction( i18n("Pointer"), createIconSet("designer_pointer.png"), i18n("&Pointer"), Key_F2, actionGroupTools, - QString::number(POINTER_TOOL).latin1(), TRUE ); + TQString::number(POINTER_TOOL).latin1(), TRUE ); actionPointerTool->setStatusTip( i18n("Selects the pointer tool") ); actionPointerTool->setWhatsThis( whatsThisFrom( "Tools|Pointer" ) ); @@ -440,37 +440,37 @@ void MainWindow::setupToolActions() i18n("&Connect Signal/Slots"), singleProjectMode() ? 0 : Key_F3, actionGroupTools, - QString::number(CONNECT_TOOL).latin1(), TRUE ); + TQString::number(CONNECT_TOOL).latin1(), TRUE ); actionConnectTool->setStatusTip( i18n("Selects the connection tool") ); actionConnectTool->setWhatsThis( whatsThisFrom( "Tools|Connect Signals and Slots" ) ); actionOrderTool = new DesignerAction( i18n("Tab Order"), createIconSet("designer_ordertool.png"), i18n("Tab &Order"), Key_F4, actionGroupTools, - QString::number(ORDER_TOOL).latin1(), TRUE ); + TQString::number(ORDER_TOOL).latin1(), TRUE ); actionOrderTool->setStatusTip( i18n("Selects the tab order tool") ); actionOrderTool->setWhatsThis( whatsThisFrom( "Tools|Tab Order" ) ); actionBuddyTool = new DesignerAction( i18n( "Set Buddy" ), createIconSet( "designer_setbuddy.png" ), i18n( "Set &Buddy" ), Key_F12, - actionGroupTools, QString::number( BUDDY_TOOL ).latin1(), + actionGroupTools, TQString::number( BUDDY_TOOL ).latin1(), TRUE ); actionBuddyTool->setStatusTip( i18n( "Sets a buddy to a label" ) ); actionBuddyTool->setWhatsThis( whatsThisFrom( "Tools|Set Buddy" ) ); - QToolBar *tb = new QToolBar( this, "Tools" ); - tb->setCloseMode( QDockWindow::Undocked ); + TQToolBar *tb = new TQToolBar( this, "Tools" ); + tb->setCloseMode( TQDockWindow::Undocked ); toolsToolBar = tb; - QWhatsThis::add( tb, i18n( "The Tools toolbar%1" ).arg(i18n(toolbarHelp).arg("")) ); + TQWhatsThis::add( tb, i18n( "The Tools toolbar%1" ).arg(i18n(toolbarHelp).arg("")) ); - addToolBar( tb, i18n( "Tools" ), QMainWindow::DockTop, FALSE ); + addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE ); actionPointerTool->addTo( tb ); if ( !singleProjectMode() ) actionConnectTool->addTo( tb ); actionOrderTool->addTo( tb ); actionBuddyTool->addTo( tb ); - QPopupMenu *mmenu = new QPopupMenu( this, "Tools" ); + TQPopupMenu *mmenu = new TQPopupMenu( this, "Tools" ); toolsMenu = mmenu; toolsMenuId = 100; menubar->insertItem( i18n( "&Tools" ), mmenu, toolsMenuId ); @@ -492,34 +492,34 @@ void MainWindow::setupToolActions() "custom widgets") ); actionToolsCustomWidget->setWhatsThis( whatsThisFrom( "Tools|Custom|Edit Custom" "Widgets" ) ); - connect( actionToolsCustomWidget, SIGNAL( activated() ), - this, SLOT( toolsCustomWidget() ) ); + connect( actionToolsCustomWidget, TQT_SIGNAL( activated() ), + this, TQT_SLOT( toolsCustomWidget() ) ); for ( int j = 0; j < WidgetDatabase::numWidgetGroups(); ++j ) { - QString grp = WidgetDatabase::widgetGroup( j ); + TQString grp = WidgetDatabase::widgetGroup( j ); if ( !WidgetDatabase::isGroupVisible( grp ) || WidgetDatabase::isGroupEmpty( grp ) ) continue; - QToolBar *tb = new QToolBar( this, grp.latin1() ); - tb->setCloseMode( QDockWindow::Undocked ); + TQToolBar *tb = new TQToolBar( this, grp.latin1() ); + tb->setCloseMode( TQDockWindow::Undocked ); widgetToolBars.append( tb ); bool plural = grp[(int)grp.length()-1] == 's'; if ( plural ) { - QWhatsThis::add( tb, i18n( "The %1%2" ).arg(grp).arg(i18n(toolbarHelp). + TQWhatsThis::add( tb, i18n( "The %1%2" ).arg(grp).arg(i18n(toolbarHelp). arg( i18n(" Click on a button to insert a single widget, " "or double click to insert multiple %1.") ).arg(grp)) ); } else { - QWhatsThis::add( tb, i18n( "The %1 Widgets%2" ).arg(grp).arg(i18n(toolbarHelp). + TQWhatsThis::add( tb, i18n( "The %1 Widgets%2" ).arg(grp).arg(i18n(toolbarHelp). arg( i18n(" Click on a button to insert a single %1 widget, " "or double click to insert multiple widgets.") ).arg(grp)) ); } addToolBar( tb, grp ); tb->hide(); - QPopupMenu *menu = new QPopupMenu( this, grp.latin1() ); + TQPopupMenu *menu = new TQPopupMenu( this, grp.latin1() ); mmenu->insertItem( grp, menu ); - QToolBar *tb2 = new QToolBar( grp, 0, toolBox, FALSE, grp.latin1() ); - tb2->setFrameStyle( QFrame::NoFrame ); + TQToolBar *tb2 = new TQToolBar( grp, 0, toolBox, FALSE, grp.latin1() ); + tb2->setFrameStyle( TQFrame::NoFrame ); tb2->setOrientation( Qt::Vertical ); tb2->setBackgroundMode( PaletteBase ); toolBox->addItem( tb2, grp ); @@ -537,9 +537,9 @@ void MainWindow::setupToolActions() if ( WidgetDatabase::group( i ) != grp ) continue; // only widgets, i.e. not forms and temp stuff WidgetAction* a = - new WidgetAction( grp, actionGroupTools, QString::number( i ).latin1() ); + new WidgetAction( grp, actionGroupTools, TQString::number( i ).latin1() ); a->setToggleAction( TRUE ); - QString atext = WidgetDatabase::className( i ); + TQString atext = WidgetDatabase::className( i ); if ( atext[0] == 'Q' ) atext = atext.mid(1); while ( atext.length() && atext[0] >= 'a' && atext[0] <= 'z' ) @@ -547,16 +547,16 @@ void MainWindow::setupToolActions() if ( atext.isEmpty() ) atext = WidgetDatabase::className( i ); a->setText( atext ); - QString ttip = WidgetDatabase::toolTip( i ); + TQString ttip = WidgetDatabase::toolTip( i ); a->setIconSet( WidgetDatabase::iconSet( i ) ); a->setToolTip( ttip ); if ( !WidgetDatabase::isWhatsThisLoaded() ) WidgetDatabase::loadWhatsThis( documentationPath() ); a->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::className( i )) ); - QString whats = i18n("A %1").arg( WidgetDatabase::className( i ) ); + TQString whats = i18n("A %1").arg( WidgetDatabase::className( i ) ); if ( !WidgetDatabase::whatsThis( i ).isEmpty() ) - whats += QString("

    %1

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

    %1

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

    Double click on this tool to keep it selected.

    ") ); if ( grp != "KDE" ) @@ -568,15 +568,15 @@ void MainWindow::setupToolActions() commonWidgetsPage.append( a ); } } - QWidget *w; - tb2->setStretchableWidget( ( w = new QWidget( tb2 ) ) ); + TQWidget *w; + tb2->setStretchableWidget( ( w = new TQWidget( tb2 ) ) ); w->setBackgroundMode( tb2->backgroundMode() ); } if ( !customWidgetToolBar ) { - QToolBar *tb = new QToolBar( this, "Custom Widgets" ); - tb->setCloseMode( QDockWindow::Undocked ); - QWhatsThis::add( tb, i18n( "The Custom Widgets toolbar%1" + TQToolBar *tb = new TQToolBar( this, "Custom Widgets" ); + tb->setCloseMode( TQDockWindow::Undocked ); + TQWhatsThis::add( tb, i18n( "The Custom Widgets toolbar%1" "

    Click Edit Custom Widgets..." "in the Tools|Custom menu to " "add and change custom widgets

    " ). @@ -587,25 +587,25 @@ void MainWindow::setupToolActions() tb->hide(); widgetToolBars.append( tb ); customWidgetToolBar = tb; - QPopupMenu *menu = new QPopupMenu( this, "Custom Widgets" ); + TQPopupMenu *menu = new TQPopupMenu( this, "Custom Widgets" ); mmenu->insertItem( "Custom", menu ); customWidgetMenu = menu; customWidgetToolBar->hide(); actionToolsCustomWidget->addTo( customWidgetMenu ); customWidgetMenu->insertSeparator(); - QToolBar *tb2 = new QToolBar( "Custom Widgets", 0, + TQToolBar *tb2 = new TQToolBar( "Custom Widgets", 0, toolBox, FALSE, "Custom Widgets" ); tb2->setBackgroundMode(PaletteBase); tb2->setOrientation( Qt::Vertical ); - tb2->setFrameStyle( QFrame::NoFrame ); + tb2->setFrameStyle( TQFrame::NoFrame ); toolBox->addItem( tb2, "Custom Widgets" ); customWidgetToolBar2 = tb2; } - QAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, this ); + TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, this ); a->setStatusTip( i18n( "Opens a dialog to configure the common " "widgets page of the toolbox") ); - connect( a, SIGNAL( activated() ), this, SLOT( toolsConfigure() ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( toolsConfigure() ) ); mmenu->insertSeparator(); a->addTo( mmenu ); resetTool(); @@ -613,13 +613,13 @@ void MainWindow::setupToolActions() void MainWindow::setupFileActions() { - QToolBar* tb = new QToolBar( this, "File" ); - tb->setCloseMode( QDockWindow::Undocked ); + TQToolBar* tb = new TQToolBar( this, "File" ); + tb->setCloseMode( TQDockWindow::Undocked ); projectToolBar = tb; - QWhatsThis::add( tb, i18n( "The File toolbar%1" ).arg(i18n(toolbarHelp).arg("")) ); + TQWhatsThis::add( tb, i18n( "The File toolbar%1" ).arg(i18n(toolbarHelp).arg("")) ); addToolBar( tb, i18n( "File" ) ); - fileMenu = new QPopupMenu( this, "File" ); + fileMenu = new TQPopupMenu( this, "File" ); menubar->insertItem( i18n( "&File" ), fileMenu ); DesignerAction *a = 0; @@ -633,27 +633,27 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_N ); a->setStatusTip( i18n( "Creates a new project, form or source file." ) ); a->setWhatsThis( whatsThisFrom( "File|New" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNew() ) ); a->addTo( tb ); a->addTo( fileMenu ); actionNewFile = a; } else { - actionGroupNew = new QActionGroup( this, 0, FALSE ); - QActionGroup* a = actionGroupNew; - ( (QActionGroup*)a )->setUsesDropDown( TRUE ); + actionGroupNew = new TQActionGroup( this, 0, FALSE ); + TQActionGroup* a = actionGroupNew; + ( (TQActionGroup*)a )->setUsesDropDown( TRUE ); a->setText( i18n( "New" ) ); a->setMenuText( i18n( "&New..." ) ); a->setIconSet( createIconSet("designer_form.png") ); a->setStatusTip( i18n( "Creates a new dialog or file" ) ); a->setWhatsThis( whatsThisFrom( "File|New" ) ); - QAction *newForm = new DesignerAction( a, 0 ); + TQAction *newForm = new DesignerAction( a, 0 ); newForm->setText( i18n( "New Dialog" ) ); newForm->setMenuText( i18n( "&Dialog..." ) ); newForm->setIconSet( createIconSet("designer_form.png") ); newForm->setAccel( CTRL + Key_N ); newForm->setStatusTip( i18n( "Creates a new dialog." ) ); - connect( newForm, SIGNAL( activated() ), this, SLOT( fileNewDialog() ) ); + connect( newForm, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNewDialog() ) ); DesignerAction *newFile = new DesignerAction( a, 0 ); newFile->setText( i18n( "New File" ) ); @@ -661,7 +661,7 @@ void MainWindow::setupFileActions() newFile->setIconSet( createIconSet("designer_filenew.png") ); newFile->setAccel( ALT + Key_N ); newFile->setStatusTip( i18n( "Creates a new file." ) ); - connect( newFile, SIGNAL( activated() ), this, SLOT( fileNewFile() ) ); + connect( newFile, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNewFile() ) ); actionNewFile = newFile; a->addTo( tb ); @@ -677,7 +677,7 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_O ); a->setStatusTip( i18n( "Opens an existing project, form or source file ") ); a->setWhatsThis( whatsThisFrom( "File|Open" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileOpen() ) ); if ( !singleProject ) { a->addTo( tb ); a->addTo( fileMenu ); @@ -691,8 +691,8 @@ void MainWindow::setupFileActions() a->setMenuText( i18n( "&Close" ) ); a->setStatusTip( i18n( "Closes the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Close" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileClose() ) ); - connect( this, SIGNAL( hasActiveWindowOrProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileClose() ) ); + connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); @@ -706,8 +706,8 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_S ); a->setStatusTip( i18n( "Saves the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Save" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) ); - connect( this, SIGNAL( hasActiveWindowOrProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSave() ) ); + connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); a->addTo( tb ); a->addTo( fileMenu ); @@ -717,8 +717,8 @@ void MainWindow::setupFileActions() a->setMenuText( i18n( "Save &As..." ) ); a->setStatusTip( i18n( "Saves the current form with a new filename" ) ); a->setWhatsThis( whatsThisFrom( "File|Save As" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) ); - connect( this, SIGNAL( hasActiveWindow(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSaveAs() ) ); + connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( fileMenu ); @@ -728,8 +728,8 @@ void MainWindow::setupFileActions() a->setMenuText( i18n( "Sa&ve All" ) ); a->setStatusTip( i18n( "Saves all open documents" ) ); a->setWhatsThis( whatsThisFrom( "File|Save All" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAll() ) ); - connect( this, SIGNAL( hasActiveWindowOrProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSaveAll() ) ); + connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); @@ -740,29 +740,29 @@ void MainWindow::setupFileActions() a->setMenuText( i18n( "Create &Template..." ) ); a->setStatusTip( i18n( "Creates a new template" ) ); a->setWhatsThis( whatsThisFrom( "File|Create Template" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileCreateTemplate() ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileCreateTemplate() ) ); if ( !singleProject ) a->addTo( fileMenu ); if ( !singleProject ) fileMenu->insertSeparator(); - recentlyFilesMenu = new QPopupMenu( this ); - recentlyProjectsMenu = new QPopupMenu( this ); + recentlyFilesMenu = new TQPopupMenu( this ); + recentlyProjectsMenu = new TQPopupMenu( this ); if ( !singleProject ) { fileMenu->insertItem( i18n( "Recently Opened Files " ), recentlyFilesMenu ); fileMenu->insertItem( i18n( "Recently Opened Projects" ), recentlyProjectsMenu ); } - connect( recentlyFilesMenu, SIGNAL( aboutToShow() ), - this, SLOT( setupRecentlyFilesMenu() ) ); - connect( recentlyProjectsMenu, SIGNAL( aboutToShow() ), - this, SLOT( setupRecentlyProjectsMenu() ) ); - connect( recentlyFilesMenu, SIGNAL( activated( int ) ), - this, SLOT( recentlyFilesMenuActivated( int ) ) ); - connect( recentlyProjectsMenu, SIGNAL( activated( int ) ), - this, SLOT( recentlyProjectsMenuActivated( int ) ) ); + connect( recentlyFilesMenu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( setupRecentlyFilesMenu() ) ); + connect( recentlyProjectsMenu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( setupRecentlyProjectsMenu() ) ); + connect( recentlyFilesMenu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( recentlyFilesMenuActivated( int ) ) ); + connect( recentlyProjectsMenu, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( recentlyProjectsMenuActivated( int ) ) ); if ( !singleProject ) fileMenu->insertSeparator(); @@ -778,22 +778,22 @@ void MainWindow::setupFileActions() a->setText( i18n( "Close" ) ); a->setMenuText( i18n( "&Close" ) ); } - connect( a, SIGNAL( activated() ), this, SLOT( fileQuit() ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileQuit() ) ); a->addTo( fileMenu ); } void MainWindow::setupProjectActions() { - projectMenu = new QPopupMenu( this, "Project" ); + projectMenu = new TQPopupMenu( this, "Project" ); menubar->insertItem( i18n( "Pr&oject" ), projectMenu ); - QActionGroup *ag = new QActionGroup( this, 0 ); + TQActionGroup *ag = new TQActionGroup( this, 0 ); ag->setText( i18n( "Active Project" ) ); ag->setMenuText( i18n( "Active Project" ) ); ag->setExclusive( TRUE ); ag->setUsesDropDown( TRUE ); - connect( ag, SIGNAL( selected( QAction * ) ), this, SLOT( projectSelected( QAction * ) ) ); - connect( ag, SIGNAL( selected( QAction * ) ), this, SIGNAL( projectChanged() ) ); + connect( ag, TQT_SIGNAL( selected( TQAction * ) ), this, TQT_SLOT( projectSelected( TQAction * ) ) ); + connect( ag, TQT_SIGNAL( selected( TQAction * ) ), this, TQT_SIGNAL( projectChanged() ) ); DesignerAction *a = new DesignerAction( i18n( "" ), i18n( "" ), 0, ag, 0, TRUE ); eProject = new Project( "", i18n( "" ), projectSettingsPluginManager, TRUE ); projects.insert( a, eProject ); @@ -805,44 +805,44 @@ void MainWindow::setupProjectActions() if ( !singleProject ) projectMenu->insertSeparator(); - a = new DesignerAction( i18n( "Add File" ), QPixmap(), i18n( "&Add File..." ), 0, this, 0 ); + a = new DesignerAction( i18n( "Add File" ), TQPixmap(), i18n( "&Add File..." ), 0, this, 0 ); actionProjectAddFile = a; a->setStatusTip( i18n("Adds a file to the current project") ); a->setWhatsThis( whatsThisFrom( "Project|Add File" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( projectInsertFile() ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( projectInsertFile() ) ); a->setEnabled( FALSE ); - connect( this, SIGNAL( hasNonDummyProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( projectMenu ); - actionEditPixmapCollection = new DesignerAction( i18n( "Image Collection..." ), QPixmap(), + actionEditPixmapCollection = new DesignerAction( i18n( "Image Collection..." ), TQPixmap(), i18n( "&Image Collection..." ), 0, this, 0 ); actionEditPixmapCollection->setStatusTip( i18n("Opens a dialog for editing the current project's image collection") ); actionEditPixmapCollection->setWhatsThis( whatsThisFrom( "Project|Image Collection" ) ); - connect( actionEditPixmapCollection, SIGNAL( activated() ), this, SLOT( editPixmapCollection() ) ); + connect( actionEditPixmapCollection, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPixmapCollection() ) ); actionEditPixmapCollection->setEnabled( FALSE ); - connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, SLOT( setEnabled(bool) ) ); + connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQT_SLOT( setEnabled(bool) ) ); actionEditPixmapCollection->addTo( projectMenu ); #ifndef QT_NO_SQL - actionEditDatabaseConnections = new DesignerAction( i18n( "Database Connections..." ), QPixmap(), + actionEditDatabaseConnections = new DesignerAction( i18n( "Database Connections..." ), TQPixmap(), i18n( "&Database Connections..." ), 0, this, 0 ); actionEditDatabaseConnections->setStatusTip( i18n("Opens a dialog for editing the current project's database connections") ); actionEditDatabaseConnections->setWhatsThis( whatsThisFrom( "Project|Database Connections" ) ); - connect( actionEditDatabaseConnections, SIGNAL( activated() ), this, SLOT( editDatabaseConnections() ) ); + connect( actionEditDatabaseConnections, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDatabaseConnections() ) ); //actionEditDatabaseConnections->setEnabled( FALSE ); - //connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, SLOT( setEnabled(bool) ) ); + //connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQT_SLOT( setEnabled(bool) ) ); if ( !singleProject ) actionEditDatabaseConnections->addTo( projectMenu ); #endif - actionEditProjectSettings = new DesignerAction( i18n( "Project Settings..." ), QPixmap(), + actionEditProjectSettings = new DesignerAction( i18n( "Project Settings..." ), TQPixmap(), i18n( "&Project Settings..." ), 0, this, 0 ); actionEditProjectSettings->setStatusTip( i18n("Opens a dialog to change the project's settings") ); actionEditProjectSettings->setWhatsThis( whatsThisFrom( "Project|Project Settings" ) ); - connect( actionEditProjectSettings, SIGNAL( activated() ), this, SLOT( editProjectSettings() ) ); + connect( actionEditProjectSettings, TQT_SIGNAL( activated() ), this, TQT_SLOT( editProjectSettings() ) ); actionEditProjectSettings->setEnabled( FALSE ); - connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, SLOT( setEnabled(bool) ) ); + connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQT_SLOT( setEnabled(bool) ) ); actionEditProjectSettings->addTo( projectMenu ); } @@ -850,26 +850,26 @@ void MainWindow::setupProjectActions() void MainWindow::setupPreviewActions() { DesignerAction* a = 0; - QPopupMenu *menu = new QPopupMenu( this, "Preview" ); + TQPopupMenu *menu = new TQPopupMenu( this, "Preview" ); layoutMenu = menu; menubar->insertItem( i18n( "&Preview" ), menu, toolsMenuId + 2 ); - a = new DesignerAction( i18n( "Preview Form" ), QPixmap(), i18n( "Preview &Form" ), 0, this, 0 ); + a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, this, 0 ); actionPreview = a; a->setAccel( CTRL + Key_T ); a->setStatusTip( i18n("Opens a preview") ); a->setWhatsThis( whatsThisFrom( "Preview|Preview Form" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( previewForm() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( previewForm() ) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); a->addTo( menu ); menu->insertSeparator(); - QSignalMapper *mapper = new QSignalMapper( this ); - connect( mapper, SIGNAL(mapped(const QString&)), this, SLOT(previewForm(const QString&)) ); - QStringList styles = QStyleFactory::keys(); - for ( QStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { - QString info; + TQSignalMapper *mapper = new TQSignalMapper( this ); + connect( mapper, TQT_SIGNAL(mapped(const TQString&)), this, TQT_SLOT(previewForm(const TQString&)) ); + TQStringList styles = TQStyleFactory::keys(); + for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { + TQString info; if ( *it == "Motif" ) info = i18n( "The preview will use the Motif look and feel which is used as the default style on most UNIX systems." ); else if ( *it == "Windows" ) @@ -883,15 +883,15 @@ void MainWindow::setupPreviewActions() else if ( *it == "MotifPlus" ) info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." ); - a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), QPixmap(), + a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(), i18n( "... in %1 Style" ).arg( *it ), 0, this, 0 ); a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) ); a->setWhatsThis( i18n("Open a preview in %1 style." "

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

    ").arg( *it ).arg( info ) ); mapper->setMapping( a, *it ); - connect( a, SIGNAL(activated()), mapper, SLOT(map()) ); - connect( this, SIGNAL( hasActiveForm(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) ); + connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); a->addTo( menu ); } } @@ -905,38 +905,38 @@ void MainWindow::setupWindowActions() actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, this ); actionWindowTile->setStatusTip( i18n("Tiles the windows so that they are all visible") ); actionWindowTile->setWhatsThis( whatsThisFrom( "Window|Tile" ) ); - connect( actionWindowTile, SIGNAL( activated() ), qworkspace, SLOT( tile() ) ); + connect( actionWindowTile, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( tile() ) ); actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, this ); actionWindowCascade->setStatusTip( i18n("Cascades the windows so that all their title bars are visible") ); actionWindowCascade->setWhatsThis( whatsThisFrom( "Window|Cascade" ) ); - connect( actionWindowCascade, SIGNAL( activated() ), qworkspace, SLOT( cascade() ) ); + connect( actionWindowCascade, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( cascade() ) ); actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, this ); actionWindowClose->setStatusTip( i18n( "Closes the active window") ); actionWindowClose->setWhatsThis( whatsThisFrom( "Window|Close" ) ); - connect( actionWindowClose, SIGNAL( activated() ), qworkspace, SLOT( closeActiveWindow() ) ); + connect( actionWindowClose, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeActiveWindow() ) ); actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, this ); actionWindowCloseAll->setStatusTip( i18n( "Closes all form windows") ); actionWindowCloseAll->setWhatsThis( whatsThisFrom( "Window|Close All" ) ); - connect( actionWindowCloseAll, SIGNAL( activated() ), qworkspace, SLOT( closeAllWindows() ) ); + connect( actionWindowCloseAll, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeAllWindows() ) ); actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, this ); actionWindowNext->setStatusTip( i18n( "Activates the next window" ) ); actionWindowNext->setWhatsThis( whatsThisFrom( "Window|Next" ) ); - connect( actionWindowNext, SIGNAL( activated() ), qworkspace, SLOT( activateNextWindow() ) ); + connect( actionWindowNext, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activateNextWindow() ) ); actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, this ); actionWindowPrevious->setStatusTip( i18n( "Activates the previous window" ) ); actionWindowPrevious->setWhatsThis( whatsThisFrom( "Window|Previous" ) ); - connect( actionWindowPrevious, SIGNAL( activated() ), qworkspace, SLOT( activatePreviousWindow() ) ); + connect( actionWindowPrevious, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activatePreviousWindow() ) ); // } if ( !windowMenu ) { - windowMenu = new QPopupMenu( this, "Window" ); + windowMenu = new TQPopupMenu( this, "Window" ); menubar->insertItem( i18n( "&Window" ), windowMenu ); - connect( windowMenu, SIGNAL( aboutToShow() ), - this, SLOT( setupWindowActions() ) ); + connect( windowMenu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( setupWindowActions() ) ); } else { windowMenu->clear(); } @@ -952,26 +952,26 @@ void MainWindow::setupWindowActions() windowMenu->insertSeparator(); windowMenu->insertItem( i18n( "Vie&ws" ), createDockWindowMenu( NoToolBars ) ); windowMenu->insertItem( i18n( "Tool&bars" ), createDockWindowMenu( OnlyToolBars ) ); - QWidgetList windows = qworkspace->windowList(); + TQWidgetList windows = qworkspace->windowList(); if ( windows.count() && formWindow() ) windowMenu->insertSeparator(); int j = 0; for ( int i = 0; i < int( windows.count() ); ++i ) { - QWidget *w = windows.at( i ); + TQWidget *w = windows.at( i ); if ( !::qt_cast(w) && !::qt_cast(w) ) continue; if ( ::qt_cast(w) && ( ( (FormWindow*)w )->isFake() ) ) continue; j++; - QString itemText; + TQString itemText; if ( j < 10 ) - itemText = QString("&%1 ").arg( j ); + itemText = TQString("&%1 ").arg( j ); if ( ::qt_cast(w) ) itemText += w->name(); else itemText += w->caption(); - int id = windowMenu->insertItem( itemText, this, SLOT( windowsMenuActivated( int ) ) ); + int id = windowMenu->insertItem( itemText, this, TQT_SLOT( windowsMenuActivated( int ) ) ); windowMenu->setItemParameter( id, i ); windowMenu->setItemChecked( id, qworkspace->activeWindow() == windows.at( i ) ); } @@ -982,44 +982,44 @@ void MainWindow::setupHelpActions() actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, this, 0 ); actionHelpContents->setStatusTip( i18n("Opens the online help") ); actionHelpContents->setWhatsThis( whatsThisFrom( "Help|Contents" ) ); - connect( actionHelpContents, SIGNAL( activated() ), this, SLOT( helpContents() ) ); + connect( actionHelpContents, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpContents() ) ); actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, this, 0 ); actionHelpManual->setStatusTip( i18n("Opens the Qt Designer manual") ); actionHelpManual->setWhatsThis( whatsThisFrom( "Help|Manual" ) ); - connect( actionHelpManual, SIGNAL( activated() ), this, SLOT( helpManual() ) ); + connect( actionHelpManual, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpManual() ) ); - actionHelpAbout = new DesignerAction( i18n("About"), QPixmap(), i18n("&About"), 0, this, 0 ); + actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, this, 0 ); actionHelpAbout->setStatusTip( i18n("Displays information about Qt Designer") ); actionHelpAbout->setWhatsThis( whatsThisFrom( "Help|About" ) ); - connect( actionHelpAbout, SIGNAL( activated() ), this, SLOT( helpAbout() ) ); + connect( actionHelpAbout, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpAbout() ) ); - actionHelpAboutQt = new DesignerAction( i18n("About Qt"), QPixmap(), i18n("About &Qt"), 0, this, 0 ); + actionHelpAboutQt = new DesignerAction( i18n("About Qt"), TQPixmap(), i18n("About &Qt"), 0, this, 0 ); actionHelpAboutQt->setStatusTip( i18n("Displays information about the Qt Toolkit") ); actionHelpAboutQt->setWhatsThis( whatsThisFrom( "Help|About Qt" ) ); - connect( actionHelpAboutQt, SIGNAL( activated() ), this, SLOT( helpAboutQt() ) ); + connect( actionHelpAboutQt, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpAboutQt() ) ); #if 0 //defined(QT_NON_COMMERCIAL) // ### not used anymore -- should be deleted? - actionHelpRegister = new DesignerAction( i18n("Register Qt"), QPixmap(), i18n("&Register Qt..."), 0, this, 0 ); + actionHelpRegister = new DesignerAction( i18n("Register Qt"), TQPixmap(), i18n("&Register Qt..."), 0, this, 0 ); actionHelpRegister->setStatusTip( i18n("Opens a web browser at the evaluation form on www.trolltech.com") ); actionHelpRegister->setWhatsThis( i18n("Register with Trolltech") ); - connect( actionHelpRegister, SIGNAL( activated() ), this, SLOT( helpRegister() ) ); + connect( actionHelpRegister, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpRegister() ) ); #endif - actionHelpWhatsThis = new DesignerAction( i18n("What's This?"), QIconSet( whatsthis_image, whatsthis_image ), + actionHelpWhatsThis = new DesignerAction( i18n("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ), i18n("What's This?"), SHIFT + Key_F1, this, 0 ); actionHelpWhatsThis->setStatusTip( i18n("\"What's This?\" context sensitive help") ); actionHelpWhatsThis->setWhatsThis( whatsThisFrom( "Help|What's This?" ) ); - connect( actionHelpWhatsThis, SIGNAL( activated() ), this, SLOT( whatsThis() ) ); + connect( actionHelpWhatsThis, TQT_SIGNAL( activated() ), this, TQT_SLOT( whatsThis() ) ); -/* QToolBar *tb = new QToolBar( this, "Help" ); - tb->setCloseMode( QDockWindow::Undocked ); - QWhatsThis::add( tb, i18n( "The Help toolbar%1" ).arg(i18n(toolbarHelp).arg("") )); +/* TQToolBar *tb = new TQToolBar( this, "Help" ); + tb->setCloseMode( TQDockWindow::Undocked ); + TQWhatsThis::add( tb, i18n( "The Help toolbar%1" ).arg(i18n(toolbarHelp).arg("") )); addToolBar( tb, i18n( "Help" ) ); actionHelpWhatsThis->addTo( tb );*/ - QPopupMenu *menu = new QPopupMenu( this, "Help" ); + TQPopupMenu *menu = new TQPopupMenu( this, "Help" ); menubar->insertSeparator(); menubar->insertItem( i18n( "&Help" ), menu ); actionHelpContents->addTo( menu ); @@ -1047,9 +1047,9 @@ void MainWindow::fileNew() void MainWindow::fileNewDialog() { static int forms = 0; - QString n = "Dialog" + QString::number( ++forms ); + TQString n = "Dialog" + TQString::number( ++forms ); while ( currentProject->findFormFile( n + ".ui" ) ) - n = "Dialog" + QString::number( ++forms ); + n = "Dialog" + TQString::number( ++forms ); FormWindow *fw = 0; FormFile *ff = new FormFile( n + ".ui", FALSE, currentProject ); fw = new FormWindow( ff, MainWindow::self, MainWindow::self->qWorkspace(), n ); @@ -1058,7 +1058,7 @@ void MainWindow::fileNewDialog() workspace()->update(); fw->setProject( currentProject ); MetaDataBase::addEntry( fw ); - QWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QDialog" ), fw, n.latin1() ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() ); fw->setMainContainer( w ); fw->setCaption( n ); fw->resize( 600, 480 ); @@ -1072,7 +1072,7 @@ void MainWindow::fileNewDialog() void MainWindow::fileNewFile() { - QString name = QInputDialog::getText( i18n( "Name of File" ), i18n( "Enter the name of the new source file:" ) ); + TQString name = QInputDialog::getText( i18n( "Name of File" ), i18n( "Enter the name of the new source file:" ) ); if ( name.isEmpty() ) return; if ( name.right( 3 ) != ".qs" ) @@ -1096,7 +1096,7 @@ void MainWindow::fileClose() if ( !currentProject->isDummy() ) { fileCloseProject(); } else { - QWidget *w = qworkspace->activeWindow(); + TQWidget *w = qworkspace->activeWindow(); if ( w ) { if ( ::qt_cast(w) ) ( (FormWindow*)w )->formFile()->close(); @@ -1112,9 +1112,9 @@ void MainWindow::fileCloseProject() if ( currentProject->isDummy() ) return; Project *pro = currentProject; - QAction* a = 0; - QAction* lastValid = 0; - for ( QMap::Iterator it = projects.begin(); it != projects.end(); ++it ) { + TQAction* a = 0; + TQAction* lastValid = 0; + for ( TQMap::Iterator it = projects.begin(); it != projects.end(); ++it ) { if ( it.data() == pro ) { a = it.key(); if ( lastValid ) @@ -1124,7 +1124,7 @@ void MainWindow::fileCloseProject() } if ( a ) { if ( pro->isModified() ) { - switch ( QMessageBox::warning( this, i18n( "Save Project Settings" ), + switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ), i18n( "Save changes to '%1'?" ).arg( pro->fileName() ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save @@ -1139,11 +1139,11 @@ void MainWindow::fileCloseProject() } } - QWidgetList windows = qWorkspace()->windowList(); + TQWidgetList windows = qWorkspace()->windowList(); qWorkspace()->blockSignals( TRUE ); - QWidgetListIt wit( windows ); + TQWidgetListIt wit( windows ); while ( wit.current() ) { - QWidget *w = wit.current(); + TQWidget *w = wit.current(); ++wit; if ( ::qt_cast(w) ) { if ( ( (FormWindow*)w )->project() == pro ) { @@ -1169,7 +1169,7 @@ void MainWindow::fileCloseProject() statusMessage( i18n( "Selected project '%1'" ).arg( currentProject->projectName() ) ); } if ( !windows.isEmpty() ) { - for ( QWidget *w = windows.first(); w; w = windows.next() ) { + for ( TQWidget *w = windows.first(); w; w = windows.next() ) { if ( !::qt_cast(w) ) continue; w->setFocus(); @@ -1179,7 +1179,7 @@ void MainWindow::fileCloseProject() } else { emit hasActiveWindow( FALSE ); emit hasActiveForm( FALSE ); - updateUndoRedo( FALSE, FALSE, QString::null, QString::null ); + updateUndoRedo( FALSE, FALSE, TQString::null, TQString::null ); } } } @@ -1194,26 +1194,26 @@ void MainWindow::projectInsertFile() fileOpen( "", "" ); } -void MainWindow::fileOpen( const QString &filter, const QString &extension, const QString &fn, bool inProject ) +void MainWindow::fileOpen( const TQString &filter, const TQString &extension, const TQString &fn, bool inProject ) { statusMessage( i18n( "Open a file...") ); - QPluginManager manager( IID_ImportFilter, QApplication::libraryPaths(), pluginDirectory() ); + QPluginManager manager( IID_ImportFilter, TQApplication::libraryPaths(), pluginDirectory() ); Project* project = inProject ? currentProject : eProject; - QStringList additionalSources; + TQStringList additionalSources; { - QStringList filterlist; + TQStringList filterlist; if ( filter.isEmpty() ) { if ( !inProject ) filterlist << i18n( "*.ui *.pro|Designer Files" ); filterlist << i18n( "*.ui|Qt User-Interface Files" ); if ( !inProject ) filterlist << i18n( "*.pro|QMAKE Project Files" ); - QStringList list = manager.featureList(); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + TQStringList list = manager.featureList(); + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) filterlist << *it; LanguageInterface *iface = MetaDataBase::languageInterface( project->language() ); if ( iface ) { @@ -1225,26 +1225,26 @@ void MainWindow::fileOpen( const QString &filter, const QString &extension, cons filterlist << filter; } - QString filters = filterlist.join( "\n" ); + TQString filters = filterlist.join( "\n" ); - QStringList filenames; + TQStringList filenames; if ( fn.isEmpty() ) { if ( !inProject ) { - QString f = KFileDialog::getOpenFileName( QString::null, filters, this, /*0,*/ + TQString f = KFileDialog::getOpenFileName( TQString::null, filters, this, /*0,*/ i18n("Open" )/*, &lastOpenFilter */); filenames << f; } else { - filenames = KFileDialog::getOpenFileNames( QString::null, filters, this, /*0,*/ + filenames = KFileDialog::getOpenFileNames( TQString::null, filters, this, /*0,*/ i18n("Add")/*, &lastOpenFilter */); } } else { filenames << fn; } - for ( QStringList::Iterator fit = filenames.begin(); fit != filenames.end(); ++fit ) { - QString filename = *fit; + for ( TQStringList::Iterator fit = filenames.begin(); fit != filenames.end(); ++fit ) { + TQString filename = *fit; if ( !filename.isEmpty() ) { - QFileInfo fi( filename ); + TQFileInfo fi( filename ); if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.find( ";pro" ) != -1 ) ) { addRecentlyOpened( filename, recentlyProjects ); @@ -1261,8 +1261,8 @@ void MainWindow::fileOpen( const QString &filter, const QString &extension, cons sf = new SourceFile( project->makeRelative( filename ), FALSE, project ); editSource( sf ); } else if ( extension.isEmpty() ) { - QString filter; - for ( QStringList::Iterator it2 = filterlist.begin(); it2 != filterlist.end(); ++it2 ) { + TQString filter; + for ( TQStringList::Iterator it2 = filterlist.begin(); it2 != filterlist.end(); ++it2 ) { if ( (*it2).contains( "." + fi.extension( FALSE ), FALSE ) ) { filter = *it2; break; @@ -1277,7 +1277,7 @@ void MainWindow::fileOpen( const QString &filter, const QString &extension, cons return; } statusMessage( i18n( "Importing '%1' using import filter ...").arg( filename ) ); - QStringList list = iface->import( filter, filename ); + TQStringList list = iface->import( filter, filename ); iface->release(); if ( list.isEmpty() ) { statusMessage( i18n( "Nothing to load in '%1'").arg( filename )/*, 3000*/ ); @@ -1286,9 +1286,9 @@ void MainWindow::fileOpen( const QString &filter, const QString &extension, cons if ( !inProject ) setCurrentProject( eProject ); addRecentlyOpened( filename, recentlyFiles ); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { openFormWindow( *it, FALSE ); - QFile::remove( *it ); + TQFile::remove( *it ); } statusBar()->clear(); } @@ -1297,19 +1297,19 @@ void MainWindow::fileOpen( const QString &filter, const QString &extension, cons } } -FormWindow *MainWindow::openFormWindow( const QString &filename, bool validFileName, FormFile *ff ) +FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFileName, FormFile *ff ) { if ( filename.isEmpty() ) return 0; bool makeNew = FALSE; - if ( !QFile::exists( filename ) ) { + if ( !TQFile::exists( filename ) ) { makeNew = TRUE; } else { - QFile f( filename ); + TQFile f( filename ); f.open( IO_ReadOnly ); - QTextStream ts( &f ); + TQTextStream ts( &f ); makeNew = ts.read().length() < 2; } if ( makeNew ) { @@ -1328,20 +1328,20 @@ FormWindow *MainWindow::openFormWindow( const QString &filename, bool validFileN if ( ff2 ) ff = ff2; - QApplication::setOverrideCursor( WaitCursor ); + TQApplication::setOverrideCursor( WaitCursor ); Resource resource( this ); if ( !ff ) ff = new FormFile( currentProject->makeRelative( filename ), FALSE, currentProject ); bool b = resource.load( ff ) && (FormWindow*)resource.widget(); if ( !validFileName && resource.widget() ) - ( (FormWindow*)resource.widget() )->setFileName( QString::null ); - QApplication::restoreOverrideCursor(); + ( (FormWindow*)resource.widget() )->setFileName( TQString::null ); + TQApplication::restoreOverrideCursor(); if ( b ) { rebuildCustomWidgetGUI(); statusMessage( i18n( "Loaded file '%1'").arg( filename )/*, 3000 */); } else { statusMessage( i18n( "Failed to load file '%1'").arg( filename )/*, 5000 */); - QMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").arg( filename ) ); + TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").arg( filename ) ); delete ff; } return (FormWindow*)resource.widget(); @@ -1365,7 +1365,7 @@ bool MainWindow::fileSaveForm() FormWindow *fw = 0; - QWidget *w = qWorkspace()->activeWindow(); + TQWidget *w = qWorkspace()->activeWindow(); if ( w ) { if ( ::qt_cast(w) ) { SourceEditor *se = (SourceEditor*)w; @@ -1382,7 +1382,7 @@ bool MainWindow::fileSaveForm() fw = formWindow(); if ( !fw || !fw->formFile()->save() ) return FALSE; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); return TRUE; } @@ -1397,7 +1397,7 @@ bool MainWindow::fileSaveAs() { statusMessage( i18n( "Enter a filename..." ) ); - QWidget *w = qworkspace->activeWindow(); + TQWidget *w = qworkspace->activeWindow(); if ( !w ) return TRUE; if ( ::qt_cast(w) ) @@ -1409,7 +1409,7 @@ bool MainWindow::fileSaveAs() void MainWindow::fileSaveAll() { - for ( QMap::Iterator it = projects.begin(); it != projects.end(); ++it ) + for ( TQMap::Iterator it = projects.begin(); it != projects.end(); ++it ) (*it)->save(); } @@ -1425,54 +1425,54 @@ void MainWindow::fileCreateTemplate() } for ( i = 0; i < WidgetDatabase::count(); ++i ) { if ( WidgetDatabase::isContainer( i ) && !WidgetDatabase::isForm(i) && - WidgetDatabase::className( i ) != "QTabWidget" && WidgetDatabase::group( i ) != "Temp" ) { + WidgetDatabase::className( i ) != "TQTabWidget" && WidgetDatabase::group( i ) != "Temp" ) { dia.listClass->insertItem( WidgetDatabase::className( i ) ); } } - QPtrList *lst = MetaDataBase::customWidgets(); + TQPtrList *lst = MetaDataBase::customWidgets(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { if ( w->isContainer ) dia.listClass->insertItem( w->className ); } dia.editName->setText( i18n( "NewTemplate" ) ); - connect( dia.buttonCreate, SIGNAL( clicked() ), - this, SLOT( createNewTemplate() ) ); + connect( dia.buttonCreate, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( createNewTemplate() ) ); dia.exec(); } void MainWindow::createNewTemplate() { CreateTemplate *dia = (CreateTemplate*)sender()->parent(); - QString fn = dia->editName->text(); - QString cn = dia->listClass->currentText(); + TQString fn = dia->editName->text(); + TQString cn = dia->listClass->currentText(); if ( fn.isEmpty() || cn.isEmpty() ) { - QMessageBox::information( this, i18n( "Create Template" ), i18n( "Could not create the template." ) ); + TQMessageBox::information( this, i18n( "Create Template" ), i18n( "Could not create the template." ) ); return; } - QStringList templRoots; + TQStringList templRoots; const char *qtdir = getenv( "QTDIR" ); if(qtdir) templRoots << qtdir; templRoots << qInstallPathData(); if(qtdir) //try the tools/designer directory last! - templRoots << (QString(qtdir) + "/tools/designer"); - QFile f; - for ( QStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) { - if ( QFile::exists( (*it) + "/templates/" )) { - QString tmpfn = (*it) + "/templates/" + fn + ".ui"; + templRoots << (TQString(qtdir) + "/tools/designer"); + TQFile f; + for ( TQStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) { + if ( TQFile::exists( (*it) + "/templates/" )) { + TQString tmpfn = (*it) + "/templates/" + fn + ".ui"; f.setName(tmpfn); if(f.open(IO_WriteOnly)) break; } } if ( !f.isOpen() ) { - QMessageBox::information( this, i18n( "Create Template" ), i18n( "Could not create the template." ) ); + TQMessageBox::information( this, i18n( "Create Template" ), i18n( "Could not create the template." ) ); return; } - QTextStream ts( &f ); + TQTextStream ts( &f ); ts << "" << endl; ts << "" << endl; @@ -1550,8 +1550,8 @@ void MainWindow::editPaste() if ( !formWindow() ) return; - QWidget *w = formWindow()->mainContainer(); - QWidgetList l( formWindow()->selectedWidgets() ); + TQWidget *w = formWindow()->mainContainer(); + TQWidgetList l( formWindow()->selectedWidgets() ); if ( l.count() == 1 ) { w = l.first(); if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout || @@ -1565,7 +1565,7 @@ void MainWindow::editPaste() hierarchyView->widgetInserted( 0 ); formWindow()->commandHistory()->setModified( TRUE ); } else { - QMessageBox::information( this, i18n( "Paste Error" ), + TQMessageBox::information( this, i18n( "Paste Error" ), i18n( "Cannot paste widgets. Designer could not find a container\n" "to paste into which does not contain a layout. Break the layout\n" "of the container you want to paste into and select this container\n" @@ -1653,8 +1653,8 @@ void MainWindow::editLayoutContainerVertical() { if ( !formWindow() ) return; - QWidget *w = formWindow()->mainContainer(); - QWidgetList l( formWindow()->selectedWidgets() ); + TQWidget *w = formWindow()->mainContainer(); + TQWidgetList l( formWindow()->selectedWidgets() ); if ( l.count() == 1 ) w = l.first(); if ( w ) @@ -1665,8 +1665,8 @@ void MainWindow::editLayoutContainerHorizontal() { if ( !formWindow() ) return; - QWidget *w = formWindow()->mainContainer(); - QWidgetList l( formWindow()->selectedWidgets() ); + TQWidget *w = formWindow()->mainContainer(); + TQWidgetList l( formWindow()->selectedWidgets() ); if ( l.count() == 1 ) w = l.first(); if ( w ) @@ -1677,8 +1677,8 @@ void MainWindow::editLayoutContainerGrid() { if ( !formWindow() ) return; - QWidget *w = formWindow()->mainContainer(); - QWidgetList l( formWindow()->selectedWidgets() ); + TQWidget *w = formWindow()->mainContainer(); + TQWidgetList l( formWindow()->selectedWidgets() ); if ( l.count() == 1 ) w = l.first(); if ( w ) @@ -1689,7 +1689,7 @@ void MainWindow::editBreakLayout() { if ( !formWindow() || !breakLayout ) return; - QWidget *w = formWindow()->mainContainer(); + TQWidget *w = formWindow()->mainContainer(); if ( formWindow()->currentWidget() ) w = formWindow()->currentWidget(); if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout || @@ -1697,7 +1697,7 @@ void MainWindow::editBreakLayout() formWindow()->breakLayout( w ); return; } else { - QWidgetList widgets = formWindow()->selectedWidgets(); + TQWidgetList widgets = formWindow()->selectedWidgets(); for ( w = widgets.first(); w; w = widgets.next() ) { if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout || w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) @@ -1757,9 +1757,9 @@ SourceEditor *MainWindow::openSourceEditor() if ( !formWindow() ) return 0; - QString lang = currentProject->language(); + TQString lang = currentProject->language(); if ( !MetaDataBase::hasEditor( lang ) ) { - QMessageBox::information( this, i18n( "Edit Source" ), + TQMessageBox::information( this, i18n( "Edit Source" ), i18n( "There is no plugin for editing %1 code installed.\n" "Note: Plugins are not available in static Qt configurations." ).arg( lang ) ); return 0; @@ -1780,9 +1780,9 @@ SourceEditor *MainWindow::openSourceEditor() SourceEditor *MainWindow::editSource( SourceFile *f ) { - QString lang = currentProject->language(); + TQString lang = currentProject->language(); if ( !MetaDataBase::hasEditor( lang ) ) { - QMessageBox::information( this, i18n( "Edit Source" ), + TQMessageBox::information( this, i18n( "Edit Source" ), i18n( "There is no plugin for editing %1 code installed.\n" "Note: Plugins are not available in static Qt configurations." ).arg( lang ) ); return 0; @@ -1798,8 +1798,8 @@ SourceEditor *MainWindow::editSource( SourceFile *f ) return editor; } -SourceEditor *MainWindow::createSourceEditor( QObject *object, Project *project, - const QString &lang, const QString &func, +SourceEditor *MainWindow::createSourceEditor( TQObject *object, Project *project, + const TQString &lang, const TQString &func, bool rereadSource ) { SourceEditor *editor = 0; @@ -1810,14 +1810,14 @@ SourceEditor *MainWindow::createSourceEditor( QObject *object, Project *project, LanguageInterface *lIface = MetaDataBase::languageInterface( lang ); if ( !lIface ) return 0; - QApplication::setOverrideCursor( WaitCursor ); + TQApplication::setOverrideCursor( WaitCursor ); editor = new SourceEditor( qWorkspace(), eIface, lIface ); eIface->release(); lIface->release(); editor->setLanguage( lang ); sourceEditors.append( editor ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); if ( editor->object() != object ) editor->setObject( object, project ); @@ -1870,7 +1870,7 @@ void MainWindow::editPreferences() statusMessage( i18n( "Edit preferences..." ) ); Preferences *dia = new Preferences( this, 0, TRUE ); prefDia = dia; - connect( dia->helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( dia->helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); dia->buttonColor->setEditor( StyledButton::ColorEditor ); dia->buttonPixmap->setEditor( StyledButton::PixmapEditor ); dia->groupBoxGrid->setChecked( sGrid ); @@ -1880,7 +1880,7 @@ void MainWindow::editPreferences() dia->checkBoxWorkspace->setChecked( restoreConfig ); dia->checkBoxTextLabels->setChecked( usesTextLabel() ); dia->buttonColor->setColor( qworkspace->backgroundColor() ); - QString pluginPaths = QApplication::libraryPaths().join("\n"); + TQString pluginPaths = TQApplication::libraryPaths().join("\n"); dia->textEditPluginPaths->setText(pluginPaths); if ( qworkspace->backgroundPixmap() ) dia->buttonPixmap->setPixmap( *qworkspace->backgroundPixmap() ); @@ -1895,33 +1895,33 @@ void MainWindow::editPreferences() int h = autoSaveInterval / 3600; int m = ( autoSaveInterval - h * 3600 ) / 60; int s = autoSaveInterval - ( h * 3600 + m * 60 ); - QTime t( h, m, s ); + TQTime t( h, m, s ); dia->timeEditAutoSave->setTime( t ); SenderObject *senderObject = new SenderObject( designerInterface() ); - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = preferenceTabs.begin(); it != preferenceTabs.end(); ++it ) { Tab t = *it; dia->tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia->buttonOk, SIGNAL( clicked() ), senderObject, SLOT( emitAcceptSignal() ) ); - connect( senderObject, SIGNAL( acceptSignal( QUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia->buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQT_SIGNAL( acceptSignal( QUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot ); } } - if ( dia->exec() == QDialog::Accepted ) { + if ( dia->exec() == TQDialog::Accepted ) { setSnapGrid( dia->checkBoxSnapGrid->isChecked() ); setShowGrid( dia->groupBoxGrid->isChecked() ); - setGrid( QPoint( dia->spinGridX->value(), + setGrid( TQPoint( dia->spinGridX->value(), dia->spinGridY->value() ) ); restoreConfig = dia->checkBoxWorkspace->isChecked(); setUsesTextLabel( dia->checkBoxTextLabels->isChecked() ); if (dia->textEditPluginPaths->isModified()) { pluginPaths = dia->textEditPluginPaths->text(); - QApplication::setLibraryPaths(QStringList::split("\n", pluginPaths)); + TQApplication::setLibraryPaths(TQStringList::split("\n", pluginPaths)); savePluginPaths = TRUE; } @@ -1936,7 +1936,7 @@ void MainWindow::editPreferences() databaseAutoEdit = !dia->checkAutoEdit->isChecked(); shStartDialog = dia->checkBoxStartDialog->isChecked(); autoSaveEnabled = dia->checkBoxAutoSave->isChecked(); - QTime time = dia->timeEditAutoSave->time(); + TQTime time = dia->timeEditAutoSave->time(); autoSaveInterval = time.hour() * 3600 + time.minute() * 60 + time.second(); if ( autoSaveEnabled ) autoSaveTimer->start( autoSaveInterval * 1000 ); @@ -1947,7 +1947,7 @@ void MainWindow::editPreferences() for ( it = preferenceTabs.begin(); it != preferenceTabs.end(); ++it ) { Tab t = *it; dia->tabWidget->removePage( t.w ); - t.w->reparent( 0, QPoint(0,0), FALSE ); + t.w->reparent( 0, TQPoint(0,0), FALSE ); } for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) @@ -2045,7 +2045,7 @@ void MainWindow::toolsCustomWidget() void MainWindow::toolsConfigure() { ConfigToolboxDialog dlg( this ); - if ( dlg.exec() != QDialog::Accepted ) + if ( dlg.exec() != TQDialog::Accepted ) return; rebuildCommonWidgetsToolBoxPage(); } @@ -2055,7 +2055,7 @@ void MainWindow::showStartDialog() if ( singleProjectMode() ) return; for ( int i = 1; i < qApp->argc(); ++i ) { - QString arg = qApp->argv()[i]; + TQString arg = qApp->argv()[i]; if ( arg[0] != '-' ) return; } diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp index 33cf923e..0c123886 100644 --- a/kdevdesigner/designer/menubareditor.cpp +++ b/kdevdesigner/designer/menubareditor.cpp @@ -24,14 +24,14 @@ ** **********************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "command.h" #include "formwindow.h" #include "menubareditor.h" @@ -39,7 +39,7 @@ #include -extern void find_accel( const QString &txt, QMap &accels, QWidget *w ); +extern void find_accel( const TQString &txt, TQMap &accels, TQWidget *w ); // Drag Object Declaration ------------------------------------------- @@ -47,35 +47,35 @@ class MenuBarEditorItemPtrDrag : public QStoredDrag { public: MenuBarEditorItemPtrDrag( MenuBarEditorItem * item, - QWidget * parent = 0, + TQWidget * parent = 0, const char * name = 0 ); ~MenuBarEditorItemPtrDrag() {}; - static bool canDecode( QDragMoveEvent * e ); - static bool decode( QDropEvent * e, MenuBarEditorItem ** i ); + static bool canDecode( TQDragMoveEvent * e ); + static bool decode( TQDropEvent * e, MenuBarEditorItem ** i ); }; // Drag Object Implementation --------------------------------------- MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item, - QWidget * parent, + TQWidget * parent, const char * name ) - : QStoredDrag( "qt/menubareditoritemptr", parent, name ) + : TQStoredDrag( "qt/menubareditoritemptr", parent, name ) { - QByteArray data( sizeof( Q_LONG ) ); - QDataStream stream( data, IO_WriteOnly ); + TQByteArray data( sizeof( Q_LONG ) ); + TQDataStream stream( data, IO_WriteOnly ); stream << ( Q_LONG ) item; setEncodedData( data ); } -bool MenuBarEditorItemPtrDrag::canDecode( QDragMoveEvent * e ) +bool MenuBarEditorItemPtrDrag::canDecode( TQDragMoveEvent * e ) { return e->provides( "qt/menubareditoritemptr" ); } -bool MenuBarEditorItemPtrDrag::decode( QDropEvent * e, MenuBarEditorItem ** i ) +bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i ) { - QByteArray data = e->encodedData( "qt/menubareditoritemptr" ); - QDataStream stream( data, IO_ReadOnly ); + TQByteArray data = e->encodedData( "qt/menubareditoritemptr" ); + TQDataStream stream( data, IO_ReadOnly ); if ( !data.size() ) return FALSE; @@ -89,8 +89,8 @@ bool MenuBarEditorItemPtrDrag::decode( QDropEvent * e, MenuBarEditorItem ** i ) // MenuBarEditorItem --------------------------------------------------- -MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, QObject * parent, const char * name ) - : QObject( parent, name ), +MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), visible( TRUE ), @@ -99,8 +99,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, QObject * parent, con { } MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, - QObject * parent, const char * name ) - : QObject( parent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( menu ), visible( TRUE ), @@ -110,9 +110,9 @@ MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * ba text = menu->name(); } -MenuBarEditorItem::MenuBarEditorItem( QActionGroup * actionGroup, MenuBarEditor * bar, - QObject * parent, const char * name ) - : QObject( parent, name ), +MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar, + TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), visible( TRUE ), @@ -124,8 +124,8 @@ MenuBarEditorItem::MenuBarEditorItem( QActionGroup * actionGroup, MenuBarEditor popupMenu->insert( actionGroup ); } -MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, QObject * parent, const char * name ) - : QObject( parent, name ), +MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( item->menuBar ), popupMenu( 0 ), text( item->text ), @@ -141,8 +141,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, QObject * parent int MenuBarEditor::clipboardOperation = 0; MenuBarEditorItem * MenuBarEditor::clipboardItem = 0; -MenuBarEditor::MenuBarEditor( FormWindow * fw, QWidget * parent, const char * name ) - : QMenuBar( parent, name ), +MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * name ) + : TQMenuBar( parent, name ), formWnd( fw ), draggedItem( 0 ), currentIndex( 0 ), @@ -157,15 +157,15 @@ MenuBarEditor::MenuBarEditor( FormWindow * fw, QWidget * parent, const char * na addItem.setMenuText( i18n("new menu") ); addSeparator.setMenuText( i18n("new separator") ); - lineEdit = new QLineEdit( this, "menubar lineedit" ); + lineEdit = new TQLineEdit( this, "menubar lineedit" ); lineEdit->hide(); - lineEdit->setFrameStyle(QFrame::Plain | QFrame::NoFrame); + lineEdit->setFrameStyle(TQFrame::Plain | TQFrame::NoFrame); lineEdit->polish(); lineEdit->setBackgroundMode(PaletteButton); lineEdit->setBackgroundOrigin(ParentOrigin); lineEdit->installEventFilter( this ); - dropLine = new QWidget( this, "menubar dropline", Qt::WStyle_NoBorder | WStyle_StaysOnTop ); + dropLine = new TQWidget( this, "menubar dropline", Qt::WStyle_NoBorder | WStyle_StaysOnTop ); dropLine->setBackgroundColor( Qt::red ); dropLine->hide(); @@ -185,7 +185,7 @@ FormWindow * MenuBarEditor::formWindow() MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack ) { MenuBarEditorItem * i = - new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( QWidget * ) parent() ), this ); + new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) parent() ), this ); if ( addToCmdStack ) { AddMenuCommand * cmd = new AddMenuCommand( i18n( "Add Menu" ), formWnd, this, i, index ); formWnd->commandHistory()->addCommand( cmd ); @@ -215,7 +215,7 @@ void MenuBarEditor::insertItem( MenuBarEditorItem * item, int index ) update(); } -void MenuBarEditor::insertItem( QString text, PopupMenuEditor * menu, int index ) +void MenuBarEditor::insertItem( TQString text, PopupMenuEditor * menu, int index ) { MenuBarEditorItem * item = new MenuBarEditorItem( menu, this ); if ( !text.isNull() ) @@ -223,7 +223,7 @@ void MenuBarEditor::insertItem( QString text, PopupMenuEditor * menu, int index insertItem( item, index ); } -void MenuBarEditor::insertItem( QString text, QActionGroup * group, int index ) +void MenuBarEditor::insertItem( TQString text, TQActionGroup * group, int index ) { MenuBarEditorItem * item = new MenuBarEditorItem( group, this ); if ( !text.isNull() ) @@ -289,14 +289,14 @@ int MenuBarEditor::findItem( PopupMenuEditor * menu ) return -1; } -int MenuBarEditor::findItem( QPoint & pos ) +int MenuBarEditor::findItem( TQPoint & pos ) { int x = borderSize(); int dx = 0; int y = 0; int w = width(); - QSize s; - QRect r; + TQSize s; + TQRect r; MenuBarEditorItem * i = itemList.first(); @@ -312,7 +312,7 @@ int MenuBarEditor::findItem( QPoint & pos ) x = borderSize(); } - r = QRect( x, y, s.width(), s.height() ); + r = TQRect( x, y, s.width(), s.height() ); if ( r.contains( pos ) ) return itemList.at(); @@ -332,7 +332,7 @@ int MenuBarEditor::findItem( QPoint & pos ) x = borderSize(); } - r = QRect( x, y, s.width(), s.height() ); + r = TQRect( x, y, s.width(), s.height() ); if ( r.contains( pos ) ) return itemList.count(); @@ -437,7 +437,7 @@ void MenuBarEditor::showLineEdit( int index ) // open edit field for item name lineEdit->setText( i->menuText() ); lineEdit->selectAll(); - QPoint pos = itemPos( index ); + TQPoint pos = itemPos( index ); lineEdit->move( pos.x() + borderSize(), pos.y() - ( borderSize() / 2 ) ); lineEdit->resize( itemSize( i ) ); lineEdit->show(); @@ -454,7 +454,7 @@ void MenuBarEditor::showItem( int index ) if ( i->isSeparator() || draggedItem ) return; PopupMenuEditor * m = i->menu(); - QPoint pos = itemPos( index ); + TQPoint pos = itemPos( index ); m->move( pos.x(), pos.y() + itemHeight - 1 ); m->raise(); m->show(); @@ -502,9 +502,9 @@ void MenuBarEditor::deleteItem( int index ) } } -QSize MenuBarEditor::sizeHint() const +TQSize MenuBarEditor::sizeHint() const { - return QSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) ); + return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) ); } int MenuBarEditor::heightForWidth( int max_width ) const @@ -513,7 +513,7 @@ int MenuBarEditor::heightForWidth( int max_width ) const int x = borderSize(); int y = 0; - QPainter p( this ); + TQPainter p( this ); that->itemHeight = that->itemSize( &(that->addItem) ).height(); MenuBarEditorItem * i = that->itemList.first(); @@ -531,16 +531,16 @@ int MenuBarEditor::heightForWidth( int max_width ) const void MenuBarEditor::show() { - QWidget::show(); + TQWidget::show(); resizeInternals(); - QResizeEvent e( parentWidget()->size(), parentWidget()->size() ); - QApplication::sendEvent( parentWidget(), &e ); + TQResizeEvent e( parentWidget()->size(), parentWidget()->size() ); + TQApplication::sendEvent( parentWidget(), &e ); } -void MenuBarEditor::checkAccels( QMap &accels ) +void MenuBarEditor::checkAccels( TQMap &accels ) { - QString t; + TQString t; MenuBarEditorItem * i = itemList.first(); while ( i ) { t = i->menuText(); @@ -569,28 +569,28 @@ void MenuBarEditor::paste() // protected -bool MenuBarEditor::eventFilter( QObject * o, QEvent * e ) +bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e ) { - if ( o == lineEdit && e->type() == QEvent::FocusOut ) { + if ( o == lineEdit && e->type() == TQEvent::FocusOut ) { leaveEditMode(); lineEdit->hide(); update(); - } else if ( e->type() == QEvent::LayoutHint ) { + } else if ( e->type() == TQEvent::LayoutHint ) { resize( sizeHint() ); } - return QMenuBar::eventFilter( o, e ); + return TQMenuBar::eventFilter( o, e ); } -void MenuBarEditor::paintEvent( QPaintEvent * ) +void MenuBarEditor::paintEvent( TQPaintEvent * ) { - QPainter p( this ); - QRect r = rect(); - style().drawPrimitive( QStyle::PE_PanelMenuBar, &p, + TQPainter p( this ); + TQRect r = rect(); + style().drawPrimitive( TQStyle::PE_PanelMenuBar, &p, r, colorGroup() ); drawItems( p ); } -void MenuBarEditor::mousePressEvent( QMouseEvent * e ) +void MenuBarEditor::mousePressEvent( TQMouseEvent * e ) { mousePressPos = e->pos(); hideItem(); @@ -601,7 +601,7 @@ void MenuBarEditor::mousePressEvent( QMouseEvent * e ) e->accept(); } -void MenuBarEditor::mouseDoubleClickEvent( QMouseEvent * e ) +void MenuBarEditor::mouseDoubleClickEvent( TQMouseEvent * e ) { mousePressPos = e->pos(); currentIndex = findItem( mousePressPos ); @@ -614,7 +614,7 @@ void MenuBarEditor::mouseDoubleClickEvent( QMouseEvent * e ) } } -void MenuBarEditor::mouseMoveEvent( QMouseEvent * e ) +void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) { if ( e->state() & Qt::LeftButton ) { if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { @@ -647,7 +647,7 @@ void MenuBarEditor::mouseMoveEvent( QMouseEvent * e ) // we will have two instances of the same pointer // in the list. itemList.find( draggedItem ); - QLNode * node = itemList.currentNode(); + TQLNode * node = itemList.currentNode(); dropConfirmed = FALSE; d->dragCopy(); // dragevents and stuff happens if ( draggedItem ) { // item was not dropped @@ -673,7 +673,7 @@ void MenuBarEditor::mouseMoveEvent( QMouseEvent * e ) } } -void MenuBarEditor::dragEnterEvent( QDragEnterEvent * e ) +void MenuBarEditor::dragEnterEvent( TQDragEnterEvent * e ) { if ( MenuBarEditorItemPtrDrag::canDecode( e ) ) { e->accept(); @@ -681,15 +681,15 @@ void MenuBarEditor::dragEnterEvent( QDragEnterEvent * e ) } } -void MenuBarEditor::dragLeaveEvent( QDragLeaveEvent * ) +void MenuBarEditor::dragLeaveEvent( TQDragLeaveEvent * ) { dropLine->hide(); } -void MenuBarEditor::dragMoveEvent( QDragMoveEvent * e ) +void MenuBarEditor::dragMoveEvent( TQDragMoveEvent * e ) { - QPoint pos = e->pos(); + TQPoint pos = e->pos(); dropLine->move( snapToItem( pos ) ); int idx = findItem( pos ); @@ -700,7 +700,7 @@ void MenuBarEditor::dragMoveEvent( QDragMoveEvent * e ) } } -void MenuBarEditor::dropEvent( QDropEvent * e ) +void MenuBarEditor::dropEvent( TQDropEvent * e ) { MenuBarEditorItem * i = 0; @@ -714,7 +714,7 @@ void MenuBarEditor::dropEvent( QDropEvent * e ) dropLine->hide(); } -void MenuBarEditor::keyPressEvent( QKeyEvent * e ) +void MenuBarEditor::keyPressEvent( TQKeyEvent * e ) { if ( lineEdit->isHidden() ) { // In navigation mode switch ( e->key() ) { @@ -789,7 +789,7 @@ void MenuBarEditor::keyPressEvent( QKeyEvent * e ) default: if ( e->ascii() >= 32 || e->ascii() == 0 ) { showLineEdit(); - QApplication::sendEvent( lineEdit, e ); + TQApplication::sendEvent( lineEdit, e ); e->accept(); } else { e->ignore(); @@ -815,9 +815,9 @@ void MenuBarEditor::keyPressEvent( QKeyEvent * e ) update(); } -void MenuBarEditor::focusOutEvent( QFocusEvent * e ) +void MenuBarEditor::focusOutEvent( TQFocusEvent * e ) { - QWidget * fw = qApp->focusWidget(); + TQWidget * fw = qApp->focusWidget(); if ( e->lostFocus() && !::qt_cast(fw) ) hideItem(); update(); @@ -829,9 +829,9 @@ void MenuBarEditor::resizeInternals() updateGeometry(); } -void MenuBarEditor::drawItems( QPainter & p ) +void MenuBarEditor::drawItems( TQPainter & p ) { - QPoint pos( borderSize(), 0 ); + TQPoint pos( borderSize(), 0 ); uint c = 0; p.setPen( colorGroup().buttonText() ); @@ -849,10 +849,10 @@ void MenuBarEditor::drawItems( QPainter & p ) drawItem( p, &addSeparator, c, pos ); } -void MenuBarEditor::drawItem( QPainter & p, +void MenuBarEditor::drawItem( TQPainter & p, MenuBarEditorItem * i, int idx, - QPoint & pos ) + TQPoint & pos ) { int w = itemSize( i ).width(); @@ -865,7 +865,7 @@ void MenuBarEditor::drawItem( QPainter & p, if ( i->isSeparator() ) { drawSeparator( p, pos ); } else { - int flags = QPainter::AlignLeft | QPainter::AlignVCenter | + int flags = TQPainter::AlignLeft | TQPainter::AlignVCenter | Qt::ShowPrefix | Qt::SingleLine; p.drawText( pos.x() + borderSize(), pos.y(), w - borderSize(), itemHeight, flags, i->menuText() ); @@ -877,7 +877,7 @@ void MenuBarEditor::drawItem( QPainter & p, pos.rx() += w; } -void MenuBarEditor::drawSeparator( QPainter & p, QPoint & pos ) +void MenuBarEditor::drawSeparator( TQPainter & p, TQPoint & pos ) { p.save(); p.setPen( darkBlue ); @@ -892,17 +892,17 @@ void MenuBarEditor::drawSeparator( QPainter & p, QPoint & pos ) p.fillRect( left, pos.y() + borderSize() * 2, separatorWidth - 1, itemHeight - borderSize() * 4, - QBrush( darkBlue, Qt::Dense5Pattern ) ); + TQBrush( darkBlue, Qt::Dense5Pattern ) ); p.restore(); } -QSize MenuBarEditor::itemSize( MenuBarEditorItem * i ) +TQSize MenuBarEditor::itemSize( MenuBarEditorItem * i ) { if ( i->isSeparator() ) - return QSize( separatorWidth, itemHeight ); - QRect r = fontMetrics().boundingRect( i->menuText().remove( "&") ); - return QSize( r.width() + borderSize() * 2, r.height() + borderSize() * 4 ); + return TQSize( separatorWidth, itemHeight ); + TQRect r = fontMetrics().boundingRect( i->menuText().remove( "&") ); + return TQSize( r.width() + borderSize() * 2, r.height() + borderSize() * 4 ); } void MenuBarEditor::addItemSizeToCoords( MenuBarEditorItem * i, int & x, int & y, int w ) @@ -915,7 +915,7 @@ void MenuBarEditor::addItemSizeToCoords( MenuBarEditorItem * i, int & x, int & y x += dx; } -QPoint MenuBarEditor::itemPos( int index ) +TQPoint MenuBarEditor::itemPos( int index ) { int x = borderSize(); int y = 0; @@ -933,7 +933,7 @@ QPoint MenuBarEditor::itemPos( int index ) x = borderSize(); } if ( c == index ) - return QPoint( x, y ); + return TQPoint( x, y ); x += dx; c++; } @@ -945,10 +945,10 @@ QPoint MenuBarEditor::itemPos( int index ) x = borderSize(); } - return QPoint( x, y ); + return TQPoint( x, y ); } -QPoint MenuBarEditor::snapToItem( const QPoint & pos ) +TQPoint MenuBarEditor::snapToItem( const TQPoint & pos ) { int x = borderSize(); int y = 0; @@ -966,17 +966,17 @@ QPoint MenuBarEditor::snapToItem( const QPoint & pos ) if ( pos.y() > y && pos.y() < y + itemHeight && pos.x() < x + dx / 2 ) { - return QPoint( x, y ); + return TQPoint( x, y ); } x += dx; } n = itemList.next(); } - return QPoint( x, y ); + return TQPoint( x, y ); } -void MenuBarEditor::dropInPlace( MenuBarEditorItem * i, const QPoint & pos ) +void MenuBarEditor::dropInPlace( MenuBarEditorItem * i, const TQPoint & pos ) { int x = borderSize(); int y = 0; @@ -1110,15 +1110,15 @@ void MenuBarEditor::leaveEditMode() showItem(); } -QPixmap MenuBarEditor::createTextPixmap( const QString &text ) +TQPixmap MenuBarEditor::createTextPixmap( const TQString &text ) { - QSize sz( fontMetrics().boundingRect( text ).size() ); - QPixmap pix( sz.width() + 20, sz.height() * 2 ); + TQSize sz( fontMetrics().boundingRect( text ).size() ); + TQPixmap pix( sz.width() + 20, sz.height() * 2 ); pix.fill( white ); - QPainter p( &pix, this ); + TQPainter p( &pix, this ); p.drawText( 2, 0, pix.width(), pix.height(), 0, text ); p.end(); - QBitmap bm( pix.size() ); + TQBitmap bm( pix.size() ); bm.fill( color0 ); p.begin( &bm ); p.setPen( color1 ); diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h index c8dc2b63..699420c3 100644 --- a/kdevdesigner/designer/menubareditor.h +++ b/kdevdesigner/designer/menubareditor.h @@ -27,8 +27,8 @@ #ifndef MENUBAREDITOR_H #define MENUBAREDITOR_H -#include -#include +#include +#include class PopupMenuEditor; class MenuBarEditor; @@ -40,21 +40,21 @@ class MenuBarEditorItem : public QObject friend class MenuBarEditor; - MenuBarEditorItem( MenuBarEditor * bar = 0, QObject * parent = 0, const char * name = 0 ); + MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * parent = 0, const char * name = 0 ); public: MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, - QObject * parent = 0, const char * name = 0); - MenuBarEditorItem( QActionGroup * actionGroup, MenuBarEditor * bar, - QObject * parent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); + MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar, + TQObject * parent = 0, const char * name = 0); MenuBarEditorItem( MenuBarEditorItem * item, - QObject * parent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); ~MenuBarEditorItem() { }; PopupMenuEditor * menu() { return popupMenu; } - void setMenuText( const QString t ) { text = t; }; - QString menuText() { return text; } + void setMenuText( const TQString t ) { text = t; }; + TQString menuText() { return text; } void setVisible( bool enable ) { visible = enable; } bool isVisible() { return visible; } @@ -69,7 +69,7 @@ protected: private: MenuBarEditor * menuBar; PopupMenuEditor * popupMenu; - QString text; + TQString text; uint visible : 1; uint separator : 1; uint removable : 1; @@ -83,15 +83,15 @@ class MenuBarEditor : public QMenuBar Q_OBJECT public: - MenuBarEditor( FormWindow * fw, QWidget * parent = 0, const char * name = 0 ); + MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); ~MenuBarEditor(); FormWindow * formWindow(); MenuBarEditorItem * createItem( int index = -1, bool addToCmdStack = TRUE ); void insertItem( MenuBarEditorItem * item, int index = -1 ); - void insertItem( QString text, PopupMenuEditor * menu, int index = -1 ); - void insertItem( QString text, QActionGroup * group, int index = -1 ); + void insertItem( TQString text, PopupMenuEditor * menu, int index = -1 ); + void insertItem( TQString text, TQActionGroup * group, int index = -1 ); void insertSeparator( int index = -1 ); @@ -100,7 +100,7 @@ public: int findItem( MenuBarEditorItem * item ); int findItem( PopupMenuEditor * menu ); - int findItem( QPoint & pos ); + int findItem( TQPoint & pos ); MenuBarEditorItem * item( int index = -1 ); @@ -118,14 +118,14 @@ public: void focusItem( int index = -1 ); void deleteItem( int index = -1 ); - QSize sizeHint() const; - QSize minimumSize() const { return sizeHint(); } - QSize minimumSizeHint() const { return sizeHint(); } + TQSize sizeHint() const; + TQSize minimumSize() const { return sizeHint(); } + TQSize minimumSizeHint() const { return sizeHint(); } int heightForWidth( int max_width ) const; void show(); - void checkAccels( QMap &accels ); + void checkAccels( TQMap &accels ); public slots: void cut(); @@ -133,31 +133,31 @@ public slots: void paste(); protected: - bool eventFilter( QObject * o, QEvent * e ); - void paintEvent( QPaintEvent * e ); - void mousePressEvent( QMouseEvent * e ); - void mouseDoubleClickEvent( QMouseEvent * e ); - void mouseMoveEvent( QMouseEvent * e ); - void dragEnterEvent( QDragEnterEvent * e ); - void dragLeaveEvent( QDragLeaveEvent * e ); - void dragMoveEvent( QDragMoveEvent * e ); - void dropEvent( QDropEvent * e ); - void keyPressEvent( QKeyEvent * e ); - void focusOutEvent( QFocusEvent * e ); - void resizeEvent( QResizeEvent * e ) { QFrame::resizeEvent( e ); } + bool eventFilter( TQObject * o, TQEvent * e ); + void paintEvent( TQPaintEvent * e ); + void mousePressEvent( TQMouseEvent * e ); + void mouseDoubleClickEvent( TQMouseEvent * e ); + void mouseMoveEvent( TQMouseEvent * e ); + void dragEnterEvent( TQDragEnterEvent * e ); + void dragLeaveEvent( TQDragLeaveEvent * e ); + void dragMoveEvent( TQDragMoveEvent * e ); + void dropEvent( TQDropEvent * e ); + void keyPressEvent( TQKeyEvent * e ); + void focusOutEvent( TQFocusEvent * e ); + void resizeEvent( TQResizeEvent * e ) { TQFrame::resizeEvent( e ); } void resizeInternals(); - void drawItems( QPainter & p ); - void drawItem( QPainter & p, MenuBarEditorItem * i, int idx, QPoint & pos ); - void drawSeparator( QPainter & p, QPoint & pos ); + void drawItems( TQPainter & p ); + void drawItem( TQPainter & p, MenuBarEditorItem * i, int idx, TQPoint & pos ); + void drawSeparator( TQPainter & p, TQPoint & pos ); - QSize itemSize( MenuBarEditorItem * i ); + TQSize itemSize( MenuBarEditorItem * i ); void addItemSizeToCoords( MenuBarEditorItem * i, int & x, int & y, int w ); - QPoint itemPos( int index ); - QPoint snapToItem( const QPoint & pos ); - void dropInPlace( MenuBarEditorItem * i, const QPoint & pos ); + TQPoint itemPos( int index ); + TQPoint snapToItem( const TQPoint & pos ); + void dropInPlace( MenuBarEditorItem * i, const TQPoint & pos ); void safeDec(); void safeInc(); @@ -167,18 +167,18 @@ protected: void enterEditMode(); void leaveEditMode(); - QPixmap createTextPixmap( const QString &text ); + TQPixmap createTextPixmap( const TQString &text ); int borderSize() const { return margin() + 4; } // add 4 pixels to the margin private: FormWindow * formWnd; - QLineEdit * lineEdit; - QWidget * dropLine; - QPtrList itemList; + TQLineEdit * lineEdit; + TQWidget * dropLine; + TQPtrList itemList; MenuBarEditorItem addItem; MenuBarEditorItem addSeparator; MenuBarEditorItem * draggedItem; - QPoint mousePressPos; + TQPoint mousePressPos; int currentIndex; int itemHeight; int separatorWidth; diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp index 3a97b680..5fc1960f 100644 --- a/kdevdesigner/designer/metadatabase.cpp +++ b/kdevdesigner/designer/metadatabase.cpp @@ -40,54 +40,54 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include class MetaDataBaseRecord { public: - QObject *object; - QStringList changedProperties; - QMap fakeProperties; - QMap propertyComments; + TQObject *object; + TQStringList changedProperties; + TQMap fakeProperties; + TQMap propertyComments; int spacing, margin; - QString resizeMode; - QValueList connections; - QValueList functionList; - QValueList includes; - QValueList variables; - QStringList forwards, sigs; - QWidgetList tabOrder; + TQString resizeMode; + TQValueList connections; + TQValueList functionList; + TQValueList includes; + TQValueList variables; + TQStringList forwards, sigs; + TQWidgetList tabOrder; MetaDataBase::MetaInfo metaInfo; - QCursor cursor; - QMap pixmapArguments; - QMap pixmapKeys; - QMap columnFields; - QValueList breakPoints; - QMap breakPointConditions; - QString exportMacro; + TQCursor cursor; + TQMap pixmapArguments; + TQMap pixmapKeys; + TQMap columnFields; + TQValueList breakPoints; + TQMap breakPointConditions; + TQString exportMacro; }; -static QPtrDict *db = 0; -static QPtrList *cWidgets = 0; +static TQPtrDict *db = 0; +static TQPtrList *cWidgets = 0; static bool doUpdate = TRUE; -static QStringList langList; -static QStringList editorLangList; +static TQStringList langList; +static TQStringList editorLangList; static QPluginManager *languageInterfaceManager = 0; /*! @@ -106,9 +106,9 @@ MetaDataBase::MetaDataBase() inline void setupDataBase() { if ( !db || !cWidgets ) { - db = new QPtrDict( 1481 ); + db = new TQPtrDict( 1481 ); db->setAutoDelete( TRUE ); - cWidgets = new QPtrList; + cWidgets = new TQPtrList; cWidgets->setAutoDelete( TRUE ); } } @@ -121,7 +121,7 @@ void MetaDataBase::clearDataBase() cWidgets = 0; } -void MetaDataBase::addEntry( QObject *o ) +void MetaDataBase::addEntry( TQObject *o ) { if ( !o ) return; @@ -136,13 +136,13 @@ void MetaDataBase::addEntry( QObject *o ) WidgetFactory::initChangedProperties( o ); } -void MetaDataBase::removeEntry( QObject *o ) +void MetaDataBase::removeEntry( TQObject *o ) { setupDataBase(); db->remove( o ); } -void MetaDataBase::setPropertyChanged( QObject *o, const QString &property, bool changed ) +void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bool changed ) { setupDataBase(); if ( o->isA( "PropertyObject" ) ) { @@ -183,7 +183,7 @@ void MetaDataBase::setPropertyChanged( QObject *o, const QString &property, bool } } -bool MetaDataBase::isPropertyChanged( QObject *o, const QString &property ) +bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property ) { setupDataBase(); if ( o->isA( "PropertyObject" ) ) @@ -198,21 +198,21 @@ bool MetaDataBase::isPropertyChanged( QObject *o, const QString &property ) return r->changedProperties.findIndex( property ) != -1; } -QStringList MetaDataBase::changedProperties( QObject *o ) +TQStringList MetaDataBase::changedProperties( TQObject *o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QStringList(); + return TQStringList(); } - QStringList lst( r->changedProperties ); + TQStringList lst( r->changedProperties ); return lst; } -void MetaDataBase::setPropertyComment( QObject *o, const QString &property, const QString &comment ) +void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, const TQString &comment ) { setupDataBase(); if ( o->isA( "PropertyObject" ) ) { @@ -229,7 +229,7 @@ void MetaDataBase::setPropertyComment( QObject *o, const QString &property, cons r->propertyComments.insert( property, comment ); } -QString MetaDataBase::propertyComment( QObject *o, const QString &property ) +TQString MetaDataBase::propertyComment( TQObject *o, const TQString &property ) { setupDataBase(); if ( o->isA( "PropertyObject" ) ) @@ -238,13 +238,13 @@ QString MetaDataBase::propertyComment( QObject *o, const QString &property ) if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QString::null; + return TQString::null; } return *r->propertyComments.find( property ); } -void MetaDataBase::setFakeProperty( QObject *o, const QString &property, const QVariant& value ) +void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value ) { setupDataBase(); if ( o->isA( "PropertyObject" ) ) { @@ -260,7 +260,7 @@ void MetaDataBase::setFakeProperty( QObject *o, const QString &property, const Q r->fakeProperties[property] = value; } -QVariant MetaDataBase::fakeProperty( QObject * o, const QString &property) +TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property) { setupDataBase(); if ( o->isA( "PropertyObject" ) ) @@ -269,16 +269,16 @@ QVariant MetaDataBase::fakeProperty( QObject * o, const QString &property) if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QVariant(); + return TQVariant(); } - QMap::Iterator it = r->fakeProperties.find( property ); + TQMap::Iterator it = r->fakeProperties.find( property ); if ( it != r->fakeProperties.end() ) return r->fakeProperties[property]; return WidgetFactory::defaultValue( o, property ); } -QMap* MetaDataBase::fakeProperties( QObject* o ) +TQMap* MetaDataBase::fakeProperties( TQObject* o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -290,7 +290,7 @@ QMap* MetaDataBase::fakeProperties( QObject* o ) return &r->fakeProperties; } -void MetaDataBase::setSpacing( QObject *o, int spacing ) +void MetaDataBase::setSpacing( TQObject *o, int spacing ) { if ( !o ) return; @@ -303,8 +303,8 @@ void MetaDataBase::setSpacing( QObject *o, int spacing ) } r->spacing = spacing; - QLayout * layout = 0; - WidgetFactory::layoutType( (QWidget*)o, layout ); + TQLayout * layout = 0; + WidgetFactory::layoutType( (TQWidget*)o, layout ); if ( layout ) { int spadef = 6; if ( MainWindow::self->formWindow() ) @@ -316,13 +316,13 @@ void MetaDataBase::setSpacing( QObject *o, int spacing ) } } -int MetaDataBase::spacing( QObject *o ) +int MetaDataBase::spacing( TQObject *o ) { if ( !o ) return -1; setupDataBase(); - if ( ::qt_cast(o) ) - o = ( (QMainWindow*)o )->centralWidget(); + if ( ::qt_cast(o) ) + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -333,7 +333,7 @@ int MetaDataBase::spacing( QObject *o ) return r->spacing; } -void MetaDataBase::setMargin( QObject *o, int margin ) +void MetaDataBase::setMargin( TQObject *o, int margin ) { if ( !o ) return; @@ -346,12 +346,12 @@ void MetaDataBase::setMargin( QObject *o, int margin ) } r->margin = margin; - QLayout * layout = 0; - WidgetFactory::layoutType( (QWidget*)o, layout ); + TQLayout * layout = 0; + WidgetFactory::layoutType( (TQWidget*)o, layout ); bool isInnerLayout = TRUE; - QWidget *widget = (QWidget*)o; + TQWidget *widget = (TQWidget*)o; if ( widget && !::qt_cast(widget) && ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) || widget && widget->parentWidget() && ::qt_cast(widget->parentWidget()) ) ) @@ -373,13 +373,13 @@ void MetaDataBase::setMargin( QObject *o, int margin ) } } -int MetaDataBase::margin( QObject *o ) +int MetaDataBase::margin( TQObject *o ) { if ( !o ) return -1; setupDataBase(); - if ( ::qt_cast(o) ) - o = ( (QMainWindow*)o )->centralWidget(); + if ( ::qt_cast(o) ) + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -389,7 +389,7 @@ int MetaDataBase::margin( QObject *o ) return r->margin; } -void MetaDataBase::setResizeMode( QObject *o, const QString &mode ) +void MetaDataBase::setResizeMode( TQObject *o, const TQString &mode ) { if ( !o ) return; @@ -404,24 +404,24 @@ void MetaDataBase::setResizeMode( QObject *o, const QString &mode ) r->resizeMode = mode; } -QString MetaDataBase::resizeMode( QObject *o ) +TQString MetaDataBase::resizeMode( TQObject *o ) { if ( !o ) - return QString::null; + return TQString::null; setupDataBase(); - if ( ::qt_cast(o) ) - o = ( (QMainWindow*)o )->centralWidget(); + if ( ::qt_cast(o) ) + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QString::null; + return TQString::null; } return r->resizeMode; } -void MetaDataBase::addConnection( QObject *o, QObject *sender, const QCString &signal, - QObject *receiver, const QCString &slot, bool addCode ) +void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString &signal, + TQObject *receiver, const TQCString &slot, bool addCode ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -439,10 +439,10 @@ void MetaDataBase::addConnection( QObject *o, QObject *sender, const QCString &s conn.slot = slot; r->connections.append( conn ); if ( addCode ) { - QString rec = receiver->name(); + TQString rec = receiver->name(); if ( ::qt_cast(o) && receiver == ( (FormWindow*)o )->mainContainer() ) rec = "this"; - QString sen = sender->name(); + TQString sen = sender->name(); if ( ::qt_cast(o) && sender == ( (FormWindow*)o )->mainContainer() ) sen = "this"; FormFile *ff = 0; @@ -454,8 +454,8 @@ void MetaDataBase::addConnection( QObject *o, QObject *sender, const QCString &s } } -void MetaDataBase::removeConnection( QObject *o, QObject *sender, const QCString &signal, - QObject *receiver, const QCString &slot ) +void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCString &signal, + TQObject *receiver, const TQCString &slot ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -466,7 +466,7 @@ void MetaDataBase::removeConnection( QObject *o, QObject *sender, const QCString } if ( !(sender && receiver) ) return; - for ( QValueList::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) { + for ( TQValueList::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) { Connection conn = *it; if ( conn.sender == sender && conn.signal == signal && @@ -477,14 +477,14 @@ void MetaDataBase::removeConnection( QObject *o, QObject *sender, const QCString } } if ( ::qt_cast(o) ) { - QString rec = receiver->name(); + TQString rec = receiver->name(); if ( receiver == ( (FormWindow*)o )->mainContainer() ) rec = "this"; ( (FormWindow*)o )->formFile()->removeConnection( sender->name(), signal, rec, slot ); } } -void MetaDataBase::setupConnections( QObject *o, const QValueList &conns ) +void MetaDataBase::setupConnections( TQObject *o, const TQValueList &conns ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -501,13 +501,13 @@ void MetaDataBase::setupConnections( QObject *o, const QValueListconnections.clear(); - for ( QValueList::ConstIterator cit = conns.begin(); + for ( TQValueList::ConstIterator cit = conns.begin(); cit != conns.end(); ++cit ) { // #### get the correct sender object out of Bla.Blub.sender - QString senderName = (*cit).sender; + TQString senderName = (*cit).sender; if ( senderName.find( '.' ) != -1 ) senderName = senderName.mid( senderName.findRev( '.' ) + 1 ); - QObject *sender = 0; + TQObject *sender = 0; if ( formfile->formWindow() ) sender = formfile->formWindow()->child( senderName ); if ( !sender && formfile->isFake() ) @@ -519,8 +519,8 @@ void MetaDataBase::setupConnections( QObject *o, const QValueListformWindow() ? - (QObject*)formfile->formWindow() : - (QObject*)formfile, + (TQObject*)formfile->formWindow() : + (TQObject*)formfile, sender, (*cit).signal.latin1(), formfile->formWindow() ? @@ -531,8 +531,8 @@ void MetaDataBase::setupConnections( QObject *o, const QValueListfind( (void*)o ); @@ -542,7 +542,7 @@ bool MetaDataBase::hasConnection( QObject *o, QObject *sender, const QCString &s return FALSE; } - for ( QValueList::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) { + for ( TQValueList::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) { Connection conn = *it; if ( conn.sender == sender && conn.signal == signal && @@ -554,31 +554,31 @@ bool MetaDataBase::hasConnection( QObject *o, QObject *sender, const QCString &s } -QValueList MetaDataBase::connections( QObject *o ) +TQValueList MetaDataBase::connections( TQObject *o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QValueList(); + return TQValueList(); } return r->connections; } -QValueList MetaDataBase::connections( QObject *o, QObject *sender, - QObject *receiver ) +TQValueList MetaDataBase::connections( TQObject *o, TQObject *sender, + TQObject *receiver ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QValueList(); + return TQValueList(); } - QValueList::Iterator it = r->connections.begin(); - QValueList ret; - QValueList::Iterator conn; + TQValueList::Iterator it = r->connections.begin(); + TQValueList ret; + TQValueList::Iterator conn; while ( ( conn = it ) != r->connections.end() ) { ++it; if ( (*conn).sender == sender && @@ -589,18 +589,18 @@ QValueList MetaDataBase::connections( QObject *o, QObj return ret; } -QValueList MetaDataBase::connections( QObject *o, QObject *object ) +TQValueList MetaDataBase::connections( TQObject *o, TQObject *object ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QValueList(); + return TQValueList(); } - QValueList::Iterator it = r->connections.begin(); - QValueList ret; - QValueList::Iterator conn; + TQValueList::Iterator it = r->connections.begin(); + TQValueList ret; + TQValueList::Iterator conn; while ( ( conn = it ) != r->connections.end() ) { ++it; if ( (*conn).sender == object || @@ -610,7 +610,7 @@ QValueList MetaDataBase::connections( QObject *o, QObj return ret; } -void MetaDataBase::doConnections( QObject *o ) +void MetaDataBase::doConnections( TQObject *o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -620,9 +620,9 @@ void MetaDataBase::doConnections( QObject *o ) return; } - QObject *sender = 0, *receiver = 0; - QObjectList *l = 0; - QValueList::Iterator it = r->connections.begin(); + TQObject *sender = 0, *receiver = 0; + TQObjectList *l = 0; + TQValueList::Iterator it = r->connections.begin(); for ( ; it != r->connections.end(); ++it ) { Connection conn = *it; if ( qstrcmp( conn.sender->name(), o->name() ) == 0 ) { @@ -647,24 +647,24 @@ void MetaDataBase::doConnections( QObject *o ) receiver = l->first(); delete l; } - QString s = "2""%1"; + TQString s = "2""%1"; s = s.arg( conn.signal ); - QString s2 = "1""%1"; + TQString s2 = "1""%1"; s2 = s2.arg( conn.slot ); - QStrList signalList = sender->metaObject()->signalNames( TRUE ); - QStrList slotList = receiver->metaObject()->slotNames( TRUE ); + TQStrList signalList = sender->metaObject()->signalNames( TRUE ); + TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); // avoid warnings if ( signalList.find( conn.signal ) == -1 || slotList.find( conn.slot ) == -1 ) continue; - QObject::connect( sender, s, receiver, s2 ); + TQObject::connect( sender, s, receiver, s2 ); } } -bool MetaDataBase::hasSlot( QObject *o, const QCString &slot, bool onlyCustom ) +bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -675,7 +675,7 @@ bool MetaDataBase::hasSlot( QObject *o, const QCString &slot, bool onlyCustom ) } if ( !onlyCustom ) { - QStrList slotList = o->metaObject()->slotNames( TRUE ); + TQStrList slotList = o->metaObject()->slotNames( TRUE ); if ( slotList.find( slot ) != -1 ) return TRUE; @@ -689,8 +689,8 @@ bool MetaDataBase::hasSlot( QObject *o, const QCString &slot, bool onlyCustom ) //if ( ::qt_cast(o) ) { if ( o->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *w = ( (::CustomWidget*)o )->customWidget(); - for ( QValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) { - QCString s = (*it).function; + for ( TQValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) { + TQCString s = (*it).function; if ( !s.data() ) continue; if ( s == slot ) @@ -699,7 +699,7 @@ bool MetaDataBase::hasSlot( QObject *o, const QCString &slot, bool onlyCustom ) } } - for ( QValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { + for ( TQValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { Function f = *it; if ( normalizeFunction( f.function ) == normalizeFunction( slot ) && f.type == "slot" ) return TRUE; @@ -708,7 +708,7 @@ bool MetaDataBase::hasSlot( QObject *o, const QCString &slot, bool onlyCustom ) return FALSE; } -bool MetaDataBase::isSlotUsed( QObject *o, const QCString &slot ) +bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -718,8 +718,8 @@ bool MetaDataBase::isSlotUsed( QObject *o, const QCString &slot ) return FALSE; } - QValueList conns = connections( o ); - for ( QValueList::Iterator it = conns.begin(); it != conns.end(); ++it ) { + TQValueList conns = connections( o ); + for ( TQValueList::Iterator it = conns.begin(); it != conns.end(); ++it ) { if ( (*it).slot == slot ) return TRUE; } @@ -727,9 +727,9 @@ bool MetaDataBase::isSlotUsed( QObject *o, const QCString &slot ) } -void MetaDataBase::addFunction( QObject *o, const QCString &function, const QString &specifier, - const QString &access, const QString &type, const QString &language, - const QString &returnType ) +void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQString &specifier, + const TQString &access, const TQString &type, const TQString &language, + const TQString &returnType ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -746,14 +746,14 @@ void MetaDataBase::addFunction( QObject *o, const QCString &function, const QStr f.type = type; f.language = language; f.returnType = returnType; - QValueList::Iterator it = r->functionList.find( f ); + TQValueList::Iterator it = r->functionList.find( f ); if ( it != r->functionList.end() ) r->functionList.remove( it ); r->functionList.append( f ); ( (FormWindow*)o )->formFile()->addFunctionCode( f ); } -void MetaDataBase::setFunctionList( QObject *o, const QValueList &functionList ) +void MetaDataBase::setFunctionList( TQObject *o, const TQValueList &functionList ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -765,9 +765,9 @@ void MetaDataBase::setFunctionList( QObject *o, const QValueList &func r->functionList = functionList; } -void MetaDataBase::removeFunction( QObject *o, const QCString &function, const QString &specifier, - const QString &access, const QString &type, const QString &language, - const QString &returnType ) +void MetaDataBase::removeFunction( TQObject *o, const TQCString &function, const TQString &specifier, + const TQString &access, const TQString &type, const TQString &language, + const TQString &returnType ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -776,7 +776,7 @@ void MetaDataBase::removeFunction( QObject *o, const QCString &function, const Q o, o->name(), o->className() ); return; } - for ( QValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { + for ( TQValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { if ( MetaDataBase::normalizeFunction( (*it).function ) == MetaDataBase::normalizeFunction( function ) && (*it).specifier == specifier && @@ -791,7 +791,7 @@ void MetaDataBase::removeFunction( QObject *o, const QCString &function, const Q } } -void MetaDataBase::removeFunction( QObject *o, const QString &function ) +void MetaDataBase::removeFunction( TQObject *o, const TQString &function ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -800,7 +800,7 @@ void MetaDataBase::removeFunction( QObject *o, const QString &function ) o, o->name(), o->className() ); return; } - for ( QValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { + for ( TQValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { if ( normalizeFunction( (*it).function ) == normalizeFunction( function ) ) { ( (FormWindow*)o )->formFile()->removeFunctionCode( *it ); r->functionList.remove( it ); @@ -809,44 +809,44 @@ void MetaDataBase::removeFunction( QObject *o, const QString &function ) } } -QValueList MetaDataBase::functionList( QObject *o, bool onlyFunctions ) +TQValueList MetaDataBase::functionList( TQObject *o, bool onlyFunctions ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QValueList(); + return TQValueList(); } if ( !onlyFunctions ) return r->functionList; - QValueList fList; - for ( QValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { + TQValueList fList; + for ( TQValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { if ( (*it).type == "function" ) fList.append( *it ); } return fList; } -QValueList MetaDataBase::slotList( QObject *o ) +TQValueList MetaDataBase::slotList( TQObject *o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QValueList(); + return TQValueList(); } - QValueList slotList; - for ( QValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { + TQValueList slotList; + for ( TQValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { if ( (*it).type == "slot" ) slotList.append( *it ); } return slotList; } -void MetaDataBase::changeFunction( QObject *o, const QString &function, const QString &newName, - const QString &returnType ) +void MetaDataBase::changeFunction( TQObject *o, const TQString &function, const TQString &newName, + const TQString &returnType ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -856,7 +856,7 @@ void MetaDataBase::changeFunction( QObject *o, const QString &function, const QS return; } - for ( QValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { + for ( TQValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { Function f = *it; if ( normalizeFunction( f.function ) == normalizeFunction( function ) ) { (*it).function = newName; @@ -867,10 +867,10 @@ void MetaDataBase::changeFunction( QObject *o, const QString &function, const QS } } -void MetaDataBase::changeFunctionAttributes( QObject *o, const QString &oldName, const QString &newName, - const QString &specifier, const QString &access, - const QString &type, const QString &language, - const QString &returnType ) +void MetaDataBase::changeFunctionAttributes( TQObject *o, const TQString &oldName, const TQString &newName, + const TQString &specifier, const TQString &access, + const TQString &type, const TQString &language, + const TQString &returnType ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -880,7 +880,7 @@ void MetaDataBase::changeFunctionAttributes( QObject *o, const QString &oldName, return; } - for ( QValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { + for ( TQValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { Function f = *it; if ( normalizeFunction( f.function ) == normalizeFunction( oldName ) ) { (*it).function = newName; @@ -894,7 +894,7 @@ void MetaDataBase::changeFunctionAttributes( QObject *o, const QString &oldName, } } -bool MetaDataBase::hasFunction( QObject *o, const QCString &function, bool onlyCustom ) +bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onlyCustom ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -905,7 +905,7 @@ bool MetaDataBase::hasFunction( QObject *o, const QCString &function, bool onlyC } if ( !onlyCustom ) { - QStrList functionList = o->metaObject()->slotNames( TRUE ); + TQStrList functionList = o->metaObject()->slotNames( TRUE ); if ( functionList.find( function ) != -1 ) return TRUE; @@ -919,8 +919,8 @@ bool MetaDataBase::hasFunction( QObject *o, const QCString &function, bool onlyC //if ( ::qt_cast(o) ) { if ( o->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *w = ( (::CustomWidget*)o )->customWidget(); - for ( QValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) { - QCString s = (*it).function; + for ( TQValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) { + TQCString s = (*it).function; if ( !s.data() ) continue; if ( s == function ) @@ -929,7 +929,7 @@ bool MetaDataBase::hasFunction( QObject *o, const QCString &function, bool onlyC } } - for ( QValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { + for ( TQValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { Function f = *it; if ( normalizeFunction( f.function ) == normalizeFunction( function ) ) return TRUE; @@ -938,22 +938,22 @@ bool MetaDataBase::hasFunction( QObject *o, const QCString &function, bool onlyC return FALSE; } -QString MetaDataBase::languageOfFunction( QObject *o, const QCString &function ) +TQString MetaDataBase::languageOfFunction( TQObject *o, const TQCString &function ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QString::null; + return TQString::null; } - QString fu = normalizeFunction( function ); - for ( QValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { + TQString fu = normalizeFunction( function ); + for ( TQValueList::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { if ( fu == normalizeFunction( (*it).function ) ) return (*it).language; } - return QString::null; + return TQString::null; } bool MetaDataBase::addCustomWidget( CustomWidget *wid ) @@ -962,15 +962,15 @@ bool MetaDataBase::addCustomWidget( CustomWidget *wid ) for ( CustomWidget *w = cWidgets->first(); w; w = cWidgets->next() ) { if ( *wid == *w ) { - for ( QValueList::ConstIterator it = wid->lstSignals.begin(); it != wid->lstSignals.end(); ++it ) { + for ( TQValueList::ConstIterator it = wid->lstSignals.begin(); it != wid->lstSignals.end(); ++it ) { if ( !w->hasSignal( *it ) ) w->lstSignals.append( *it ); } - for ( QValueList::ConstIterator it2 = wid->lstSlots.begin(); it2 != wid->lstSlots.end(); ++it2 ) { + for ( TQValueList::ConstIterator it2 = wid->lstSlots.begin(); it2 != wid->lstSlots.end(); ++it2 ) { if ( !w->hasSlot( MetaDataBase::normalizeFunction( (*it2).function ).latin1() ) ) w->lstSlots.append( *it2 ); } - for ( QValueList::ConstIterator it3 = wid->lstProperties.begin(); it3 != wid->lstProperties.end(); ++it3 ) { + for ( TQValueList::ConstIterator it3 = wid->lstProperties.begin(); it3 != wid->lstProperties.end(); ++it3 ) { if ( !w->hasProperty( (*it3).property ) ) w->lstProperties.append( *it3 ); } @@ -984,7 +984,7 @@ bool MetaDataBase::addCustomWidget( CustomWidget *wid ) r->name = wid->className; r->group = WidgetDatabase::widgetGroup( "Custom" ); r->toolTip = wid->className; - r->icon = new QIconSet( *wid->pixmap, *wid->pixmap ); + r->icon = new TQIconSet( *wid->pixmap, *wid->pixmap ); r->isContainer = wid->isContainer; wid->id = WidgetDatabase::addCustomWidget( r ); cWidgets->append( wid ); @@ -996,7 +996,7 @@ void MetaDataBase::removeCustomWidget( CustomWidget *w ) cWidgets->removeRef( w ); } -QPtrList *MetaDataBase::customWidgets() +TQPtrList *MetaDataBase::customWidgets() { setupDataBase(); return cWidgets; @@ -1022,7 +1022,7 @@ bool MetaDataBase::isWidgetNameUsed( CustomWidget *wid ) return FALSE; } -bool MetaDataBase::hasCustomWidget( const QString &className ) +bool MetaDataBase::hasCustomWidget( const TQString &className ) { for ( CustomWidget *w = cWidgets->first(); w; w = cWidgets->next() ) { if ( w->className == className ) @@ -1031,7 +1031,7 @@ bool MetaDataBase::hasCustomWidget( const QString &className ) return FALSE; } -void MetaDataBase::setTabOrder( QWidget *w, const QWidgetList &order ) +void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*) w ); @@ -1044,20 +1044,20 @@ void MetaDataBase::setTabOrder( QWidget *w, const QWidgetList &order ) r->tabOrder = order; } -QWidgetList MetaDataBase::tabOrder( QWidget *w ) +TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); - return QWidgetList(); + return TQWidgetList(); } return r->tabOrder; } -void MetaDataBase::setIncludes( QObject *o, const QValueList &incs ) +void MetaDataBase::setIncludes( TQObject *o, const TQValueList &incs ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -1070,20 +1070,20 @@ void MetaDataBase::setIncludes( QObject *o, const QValueList &incs ) r->includes = incs; } -QValueList MetaDataBase::includes( QObject *o ) +TQValueList MetaDataBase::includes( TQObject *o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QValueList(); + return TQValueList(); } return r->includes; } -void MetaDataBase::setForwards( QObject *o, const QStringList &fwds ) +void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -1096,20 +1096,20 @@ void MetaDataBase::setForwards( QObject *o, const QStringList &fwds ) r->forwards = fwds; } -QStringList MetaDataBase::forwards( QObject *o ) +TQStringList MetaDataBase::forwards( TQObject *o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QStringList(); + return TQStringList(); } return r->forwards; } -void MetaDataBase::setVariables( QObject *o, const QValueList &vars ) +void MetaDataBase::setVariables( TQObject *o, const TQValueList &vars ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -1122,7 +1122,7 @@ void MetaDataBase::setVariables( QObject *o, const QValueList &vars ) r->variables = vars; } -void MetaDataBase::addVariable( QObject *o, const QString &name, const QString &access ) +void MetaDataBase::addVariable( TQObject *o, const TQString &name, const TQString &access ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -1137,7 +1137,7 @@ void MetaDataBase::addVariable( QObject *o, const QString &name, const QString & r->variables << v; } -void MetaDataBase::removeVariable( QObject *o, const QString &name ) +void MetaDataBase::removeVariable( TQObject *o, const TQString &name ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -1146,7 +1146,7 @@ void MetaDataBase::removeVariable( QObject *o, const QString &name ) o, o->name(), o->className() ); return; } - QValueList::Iterator it = r->variables.begin(); + TQValueList::Iterator it = r->variables.begin(); for ( ; it != r->variables.end(); ++it ) { if ( (*it).varName == name ) { r->variables.remove( it ); @@ -1155,20 +1155,20 @@ void MetaDataBase::removeVariable( QObject *o, const QString &name ) } } -QValueList MetaDataBase::variables( QObject *o ) +TQValueList MetaDataBase::variables( TQObject *o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QValueList(); + return TQValueList(); } return r->variables; } -bool MetaDataBase::hasVariable( QObject *o, const QString &name ) +bool MetaDataBase::hasVariable( TQObject *o, const TQString &name ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -1178,7 +1178,7 @@ bool MetaDataBase::hasVariable( QObject *o, const QString &name ) return FALSE; } - QValueList::Iterator it = r->variables.begin(); + TQValueList::Iterator it = r->variables.begin(); for ( ; it != r->variables.end(); ++it ) { if ( extractVariableName( name ) == extractVariableName( (*it).varName ) ) return TRUE; @@ -1186,9 +1186,9 @@ bool MetaDataBase::hasVariable( QObject *o, const QString &name ) return FALSE; } -QString MetaDataBase::extractVariableName( const QString &name ) +TQString MetaDataBase::extractVariableName( const TQString &name ) { - QString n = name.right( name.length() - name.findRev( ' ' ) - 1 ); + TQString n = name.right( name.length() - name.findRev( ' ' ) - 1 ); if ( n[ 0 ] == '*' || n[ 0 ] == '&' ) n[ 0 ] = ' '; if ( n[ (int)n.length() - 1 ] == ';' ) @@ -1196,7 +1196,7 @@ QString MetaDataBase::extractVariableName( const QString &name ) return n.simplifyWhiteSpace(); } -void MetaDataBase::setSignalList( QObject *o, const QStringList &sigs ) +void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -1208,8 +1208,8 @@ void MetaDataBase::setSignalList( QObject *o, const QStringList &sigs ) r->sigs.clear(); - for ( QStringList::ConstIterator it = sigs.begin(); it != sigs.end(); ++it ) { - QString s = (*it).simplifyWhiteSpace(); + for ( TQStringList::ConstIterator it = sigs.begin(); it != sigs.end(); ++it ) { + TQString s = (*it).simplifyWhiteSpace(); bool hasSemicolon = s.endsWith( ";" ); if ( hasSemicolon ) s = s.left( s.length() - 1 ); @@ -1229,20 +1229,20 @@ void MetaDataBase::setSignalList( QObject *o, const QStringList &sigs ) } } -QStringList MetaDataBase::signalList( QObject *o ) +TQStringList MetaDataBase::signalList( TQObject *o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QStringList(); + return TQStringList(); } return r->sigs; } -void MetaDataBase::setMetaInfo( QObject *o, MetaInfo mi ) +void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -1255,7 +1255,7 @@ void MetaDataBase::setMetaInfo( QObject *o, MetaInfo mi ) r->metaInfo = mi; } -MetaDataBase::MetaInfo MetaDataBase::metaInfo( QObject *o ) +MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQObject *o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -1276,10 +1276,10 @@ MetaDataBase::CustomWidget::CustomWidget() className = "MyCustomWidget"; includeFile = "mywidget.h"; includePolicy = Local; - sizeHint = QSize( -1, -1 ); - pixmap = new QPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) ); + sizeHint = TQSize( -1, -1 ); + pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) ); id = -1; - sizePolicy = QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); + sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); isContainer = FALSE; } @@ -1290,14 +1290,14 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w ) includePolicy = w.includePolicy; sizeHint = w.sizeHint; if ( w.pixmap ) - pixmap = new QPixmap( *w.pixmap ); + pixmap = new TQPixmap( *w.pixmap ); else pixmap = 0; id = w.id; isContainer = w.isContainer; } -void MetaDataBase::setCursor( QWidget *w, const QCursor &c ) +void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c ) { setupDataBase(); if ( w->isA( "PropertyObject" ) ) { @@ -1314,7 +1314,7 @@ void MetaDataBase::setCursor( QWidget *w, const QCursor &c ) r->cursor = c; } -QCursor MetaDataBase::cursor( QWidget *w ) +TQCursor MetaDataBase::cursor( TQWidget *w ) { setupDataBase(); if ( w->isA( "PropertyObject" ) ) @@ -1341,7 +1341,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW includePolicy = w.includePolicy; sizeHint = w.sizeHint; if ( w.pixmap ) - pixmap = new QPixmap( *w.pixmap ); + pixmap = new TQPixmap( *w.pixmap ); else pixmap = 0; lstSignals = w.lstSignals; @@ -1352,45 +1352,45 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW return *this; } -bool MetaDataBase::CustomWidget::hasSignal( const QCString &signal ) const +bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const { - QStrList sigList = QWidget::staticMetaObject()->signalNames( TRUE ); + TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE ); if ( sigList.find( signal ) != -1 ) return TRUE; - for ( QValueList::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { + for ( TQValueList::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { if ( normalizeFunction( *it ) == normalizeFunction( signal ) ) return TRUE; } return FALSE; } -bool MetaDataBase::CustomWidget::hasSlot( const QCString &slot ) const +bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { - QStrList slotList = QWidget::staticMetaObject()->slotNames( TRUE ); + TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE ); if ( slotList.find( normalizeFunction( slot ) ) != -1 ) return TRUE; - for ( QValueList::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { + for ( TQValueList::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { if ( normalizeFunction( (*it).function ) == normalizeFunction( slot ) ) return TRUE; } return FALSE; } -bool MetaDataBase::CustomWidget::hasProperty( const QCString &prop ) const +bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const { - QStrList propList = QWidget::staticMetaObject()->propertyNames( TRUE ); + TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE ); if ( propList.find( prop ) != -1 ) return TRUE; - for ( QValueList::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) { + for ( TQValueList::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) { if ( (*it).property == prop ) return TRUE; } return FALSE; } -void MetaDataBase::setPixmapArgument( QObject *o, int pixmap, const QString &arg ) +void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &arg ) { if ( !o ) return; @@ -1406,22 +1406,22 @@ void MetaDataBase::setPixmapArgument( QObject *o, int pixmap, const QString &arg r->pixmapArguments.insert( pixmap, arg ); } -QString MetaDataBase::pixmapArgument( QObject *o, int pixmap ) +TQString MetaDataBase::pixmapArgument( TQObject *o, int pixmap ) { if ( !o ) - return QString::null; + return TQString::null; setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QString::null; + return TQString::null; } return *r->pixmapArguments.find( pixmap ); } -void MetaDataBase::clearPixmapArguments( QObject *o ) +void MetaDataBase::clearPixmapArguments( TQObject *o ) { if ( !o ) return; @@ -1437,7 +1437,7 @@ void MetaDataBase::clearPixmapArguments( QObject *o ) } -void MetaDataBase::setPixmapKey( QObject *o, int pixmap, const QString &arg ) +void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg ) { if ( !o ) return; @@ -1457,10 +1457,10 @@ void MetaDataBase::setPixmapKey( QObject *o, int pixmap, const QString &arg ) r->pixmapKeys.insert( pixmap, arg ); } -QString MetaDataBase::pixmapKey( QObject *o, int pixmap ) +TQString MetaDataBase::pixmapKey( TQObject *o, int pixmap ) { if ( !o ) - return QString::null; + return TQString::null; setupDataBase(); if ( o->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdPixmapKey( pixmap ); @@ -1468,21 +1468,21 @@ QString MetaDataBase::pixmapKey( QObject *o, int pixmap ) if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QString::null; + return TQString::null; } - QString s = *r->pixmapKeys.find( pixmap ); + TQString s = *r->pixmapKeys.find( pixmap ); if ( !s.isNull() ) return s; if ( !o->isWidgetType() ) return s; - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; if ( w->icon() ) return *r->pixmapKeys.find( w->icon()->serialNumber() ); return s; } -void MetaDataBase::clearPixmapKeys( QObject *o ) +void MetaDataBase::clearPixmapKeys( TQObject *o ) { if ( !o ) return; @@ -1499,7 +1499,7 @@ void MetaDataBase::clearPixmapKeys( QObject *o ) -void MetaDataBase::setColumnFields( QObject *o, const QMap &columnFields ) +void MetaDataBase::setColumnFields( TQObject *o, const TQMap &columnFields ) { if ( !o ) return; @@ -1514,37 +1514,37 @@ void MetaDataBase::setColumnFields( QObject *o, const QMap &co r->columnFields = columnFields; } -QMap MetaDataBase::columnFields( QObject *o ) +TQMap MetaDataBase::columnFields( TQObject *o ) { if ( !o ) - return QMap(); + return TQMap(); setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QMap(); + return TQMap(); } return r->columnFields; } -void MetaDataBase::setEditor( const QStringList &langs ) +void MetaDataBase::setEditor( const TQStringList &langs ) { editorLangList = langs; } -bool MetaDataBase::hasEditor( const QString &lang ) +bool MetaDataBase::hasEditor( const TQString &lang ) { return editorLangList.find( lang ) != editorLangList.end(); } -void MetaDataBase::setupInterfaceManagers( const QString &plugDir ) +void MetaDataBase::setupInterfaceManagers( const TQString &plugDir ) { if ( !languageInterfaceManager ) { languageInterfaceManager = new QPluginManager( IID_Language, - QApplication::libraryPaths(), + TQApplication::libraryPaths(), // kapp->dirs()->resourceDirs("qtplugins"), plugDir ); @@ -1554,34 +1554,34 @@ void MetaDataBase::setupInterfaceManagers( const QString &plugDir ) } } -QStringList MetaDataBase::languages() +TQStringList MetaDataBase::languages() { return langList; } -QString MetaDataBase::normalizeFunction( const QString &f ) +TQString MetaDataBase::normalizeFunction( const TQString &f ) { return Parser::cleanArgs( f ); } -LanguageInterface *MetaDataBase::languageInterface( const QString &lang ) +LanguageInterface *MetaDataBase::languageInterface( const TQString &lang ) { LanguageInterface* iface = 0; languageInterfaceManager->queryInterface( lang, &iface ); return iface; } -void MetaDataBase::clear( QObject *o ) +void MetaDataBase::clear( TQObject *o ) { if ( !o ) return; setupDataBase(); db->remove( (void*)o ); - for ( QPtrDictIterator it( *( (FormWindow*)o )->widgets() ); it.current(); ++it ) + for ( TQPtrDictIterator it( *( (FormWindow*)o )->widgets() ); it.current(); ++it ) db->remove( (void*)it.current() ); } -void MetaDataBase::setBreakPoints( QObject *o, const QValueList &l ) +void MetaDataBase::setBreakPoints( TQObject *o, const TQValueList &l ) { if ( !o ) return; @@ -1595,7 +1595,7 @@ void MetaDataBase::setBreakPoints( QObject *o, const QValueList &l ) r->breakPoints = l; - QMap::Iterator it = r->breakPointConditions.begin(); + TQMap::Iterator it = r->breakPointConditions.begin(); while ( it != r->breakPointConditions.end() ) { int line = it.key(); ++it; @@ -1604,22 +1604,22 @@ void MetaDataBase::setBreakPoints( QObject *o, const QValueList &l ) } } -QValueList MetaDataBase::breakPoints( QObject *o ) +TQValueList MetaDataBase::breakPoints( TQObject *o ) { if ( !o ) - return QValueList(); + return TQValueList(); setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QValueList(); + return TQValueList(); } return r->breakPoints; } -void MetaDataBase::setBreakPointCondition( QObject *o, int line, const QString &condition ) +void MetaDataBase::setBreakPointCondition( TQObject *o, int line, const TQString &condition ) { if ( !o ) return; @@ -1633,24 +1633,24 @@ void MetaDataBase::setBreakPointCondition( QObject *o, int line, const QString & r->breakPointConditions.replace( line, condition ); } -QString MetaDataBase::breakPointCondition( QObject *o, int line ) +TQString MetaDataBase::breakPointCondition( TQObject *o, int line ) { if ( !o ) - return QString::null; + return TQString::null; setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return QString::null; + return TQString::null; } - QMap::Iterator it = r->breakPointConditions.find( line ); + TQMap::Iterator it = r->breakPointConditions.find( line ); if ( it == r->breakPointConditions.end() ) - return QString::null; + return TQString::null; return *it; } -void MetaDataBase::setExportMacro( QObject *o, const QString ¯o ) +void MetaDataBase::setExportMacro( TQObject *o, const TQString ¯o ) { if ( !o ) return; @@ -1669,7 +1669,7 @@ void MetaDataBase::setExportMacro( QObject *o, const QString ¯o ) r->exportMacro = macro; } -QString MetaDataBase::exportMacro( QObject *o ) +TQString MetaDataBase::exportMacro( TQObject *o ) { if ( !o ) return ""; @@ -1686,7 +1686,7 @@ QString MetaDataBase::exportMacro( QObject *o ) return r->exportMacro; } -bool MetaDataBase::hasObject( QObject *o ) +bool MetaDataBase::hasObject( TQObject *o ) { return !!db->find( o ); } diff --git a/kdevdesigner/designer/metadatabase.h b/kdevdesigner/designer/metadatabase.h index f7ce5088..6ded68d6 100644 --- a/kdevdesigner/designer/metadatabase.h +++ b/kdevdesigner/designer/metadatabase.h @@ -27,15 +27,15 @@ #ifndef METADATABASE_H #define METADATABASE_H -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "pixmapchooser.h" #include "../interfaces/languageinterface.h" @@ -49,8 +49,8 @@ class MetaDataBase public: struct Connection { - QObject *sender, *receiver; - QCString signal, slot; + TQObject *sender, *receiver; + TQCString signal, slot; bool operator==( const Connection &c ) const { return sender == c.sender && receiver == c.receiver && signal == c.signal && slot == c.slot ; @@ -59,12 +59,12 @@ public: struct Function { - QString returnType; - QCString function; - QString specifier; - QString access; - QString type; - QString language; + TQString returnType; + TQCString function; + TQString specifier; + TQString access; + TQString type; + TQString language; bool operator==( const Function &f ) const { return ( returnType == f.returnType && function == f.function && @@ -78,8 +78,8 @@ public: struct Property { - QCString property; - QString type; + TQCString property; + TQString type; bool operator==( const Property &p ) const { return property == p.property && type == p.type; @@ -94,20 +94,20 @@ public: bool operator==( const CustomWidget &w ) const; CustomWidget &operator=( const CustomWidget &w ); - bool hasSignal( const QCString &signal ) const; - bool hasSlot( const QCString &slot ) const; - bool hasProperty( const QCString &prop ) const; + bool hasSignal( const TQCString &signal ) const; + bool hasSlot( const TQCString &slot ) const; + bool hasProperty( const TQCString &prop ) const; enum IncludePolicy { Global, Local }; - QString className; - QString includeFile; + TQString className; + TQString includeFile; IncludePolicy includePolicy; - QSize sizeHint; - QSizePolicy sizePolicy; - QPixmap *pixmap; - QValueList lstSignals; - QValueList lstSlots; - QValueList lstProperties; + TQSize sizeHint; + TQSizePolicy sizePolicy; + TQPixmap *pixmap; + TQValueList lstSignals; + TQValueList lstSlots; + TQValueList lstProperties; int id; bool isContainer; }; @@ -115,18 +115,18 @@ public: struct Include { Include() : header(), location(), implDecl( "in implementation" ) {} - QString header; - QString location; + TQString header; + TQString location; bool operator==( const Include &i ) const { return header == i.header && location == i.location; } - QString implDecl; + TQString implDecl; }; struct Variable { - QString varName; - QString varAccess; + TQString varName; + TQString varAccess; bool operator==( const Variable &v ) const { return varName == v.varName && varAccess == v.varAccess; @@ -136,133 +136,133 @@ public: struct MetaInfo { MetaInfo() : classNameChanged( FALSE ) { } - QString className; + TQString className; bool classNameChanged; - QString comment; - QString author; + TQString comment; + TQString author; }; MetaDataBase(); static void clearDataBase(); - static void addEntry( QObject *o ); - static void removeEntry( QObject *o ); - static void setPropertyChanged( QObject *o, const QString &property, bool changed ); - static bool isPropertyChanged( QObject *o, const QString &property ); - static void setPropertyComment( QObject *o, const QString &property, const QString &comment ); - static QString propertyComment( QObject *o, const QString &property ); - static QStringList changedProperties( QObject *o ); - - static void setFakeProperty( QObject *o, const QString &property, const QVariant& value ); - static QVariant fakeProperty( QObject * o, const QString &property ); - static QMap* fakeProperties( QObject* o ); - - static void setSpacing( QObject *o, int spacing ); - static int spacing( QObject *o ); - static void setMargin( QObject *o, int margin ); - static int margin( QObject *o ); - - static void setResizeMode( QObject *o, const QString &mode ); - static QString resizeMode( QObject *o ); - - static void addConnection( QObject *o, QObject *sender, const QCString &signal, - QObject *receiver, const QCString &slot, bool addCode = TRUE ); - static void removeConnection( QObject *o, QObject *sender, const QCString &signal, - QObject *receiver, const QCString &slot ); - static bool hasConnection( QObject *o, QObject *sender, const QCString &signal, - QObject *receiver, const QCString &slot ); - static void setupConnections( QObject *o, const QValueList &conns ); - static QValueList connections( QObject *o ); - static QValueList connections( QObject *o, QObject *sender, QObject *receiver ); - static QValueList connections( QObject *o, QObject *object ); - static void doConnections( QObject *o ); - - static void addFunction( QObject *o, const QCString &function, const QString &specifier, - const QString &access, const QString &type, const QString &language, - const QString &returnType ); - static void removeFunction( QObject *o, const QCString &function, const QString &specifier, - const QString &access, const QString &type, const QString &language, - const QString &returnType ); - static void removeFunction( QObject *o, const QString &function ); - static QValueList functionList( QObject *o, bool onlyFunctions = FALSE ); - static QValueList slotList( QObject *o ); - static bool isSlotUsed( QObject *o, const QCString &slot ); - static bool hasFunction( QObject *o, const QCString &function, bool onlyCustom = FALSE ); - static bool hasSlot( QObject *o, const QCString &slot, bool onlyCustom = FALSE ); - static void changeFunction( QObject *o, const QString &function, const QString &newName, - const QString &returnType ); - static void changeFunctionAttributes( QObject *o, const QString &oldName, const QString &newName, - const QString &specifier, const QString &access, - const QString &type, const QString &language, - const QString &returnType ); - static QString languageOfFunction( QObject *o, const QCString &function ); - static void setFunctionList( QObject *o, const QValueList &functionList ); + static void addEntry( TQObject *o ); + static void removeEntry( TQObject *o ); + static void setPropertyChanged( TQObject *o, const TQString &property, bool changed ); + static bool isPropertyChanged( TQObject *o, const TQString &property ); + static void setPropertyComment( TQObject *o, const TQString &property, const TQString &comment ); + static TQString propertyComment( TQObject *o, const TQString &property ); + static TQStringList changedProperties( TQObject *o ); + + static void setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value ); + static TQVariant fakeProperty( TQObject * o, const TQString &property ); + static TQMap* fakeProperties( TQObject* o ); + + static void setSpacing( TQObject *o, int spacing ); + static int spacing( TQObject *o ); + static void setMargin( TQObject *o, int margin ); + static int margin( TQObject *o ); + + static void setResizeMode( TQObject *o, const TQString &mode ); + static TQString resizeMode( TQObject *o ); + + static void addConnection( TQObject *o, TQObject *sender, const TQCString &signal, + TQObject *receiver, const TQCString &slot, bool addCode = TRUE ); + static void removeConnection( TQObject *o, TQObject *sender, const TQCString &signal, + TQObject *receiver, const TQCString &slot ); + static bool hasConnection( TQObject *o, TQObject *sender, const TQCString &signal, + TQObject *receiver, const TQCString &slot ); + static void setupConnections( TQObject *o, const TQValueList &conns ); + static TQValueList connections( TQObject *o ); + static TQValueList connections( TQObject *o, TQObject *sender, TQObject *receiver ); + static TQValueList connections( TQObject *o, TQObject *object ); + static void doConnections( TQObject *o ); + + static void addFunction( TQObject *o, const TQCString &function, const TQString &specifier, + const TQString &access, const TQString &type, const TQString &language, + const TQString &returnType ); + static void removeFunction( TQObject *o, const TQCString &function, const TQString &specifier, + const TQString &access, const TQString &type, const TQString &language, + const TQString &returnType ); + static void removeFunction( TQObject *o, const TQString &function ); + static TQValueList functionList( TQObject *o, bool onlyFunctions = FALSE ); + static TQValueList slotList( TQObject *o ); + static bool isSlotUsed( TQObject *o, const TQCString &slot ); + static bool hasFunction( TQObject *o, const TQCString &function, bool onlyCustom = FALSE ); + static bool hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom = FALSE ); + static void changeFunction( TQObject *o, const TQString &function, const TQString &newName, + const TQString &returnType ); + static void changeFunctionAttributes( TQObject *o, const TQString &oldName, const TQString &newName, + const TQString &specifier, const TQString &access, + const TQString &type, const TQString &language, + const TQString &returnType ); + static TQString languageOfFunction( TQObject *o, const TQCString &function ); + static void setFunctionList( TQObject *o, const TQValueList &functionList ); static bool addCustomWidget( CustomWidget *w ); static void removeCustomWidget( CustomWidget *w ); - static QPtrList *customWidgets(); + static TQPtrList *customWidgets(); static CustomWidget *customWidget( int id ); static bool isWidgetNameUsed( CustomWidget *w ); - static bool hasCustomWidget( const QString &className ); + static bool hasCustomWidget( const TQString &className ); - static void setTabOrder( QWidget *w, const QWidgetList &order ); - static QWidgetList tabOrder( QWidget *w ); + static void setTabOrder( TQWidget *w, const TQWidgetList &order ); + static TQWidgetList tabOrder( TQWidget *w ); - static void setIncludes( QObject *o, const QValueList &incs ); - static QValueList includes( QObject *o ); + static void setIncludes( TQObject *o, const TQValueList &incs ); + static TQValueList includes( TQObject *o ); - static void setForwards( QObject *o, const QStringList &fwds ); - static QStringList forwards( QObject *o ); + static void setForwards( TQObject *o, const TQStringList &fwds ); + static TQStringList forwards( TQObject *o ); - static void setVariables( QObject *o, const QValueList &vars ); - static void addVariable( QObject *o, const QString &name, const QString &access ); - static void removeVariable( QObject *o, const QString &name ); - static QValueList variables( QObject *o ); - static bool hasVariable( QObject *o, const QString &name ); - static QString extractVariableName( const QString &name ); + static void setVariables( TQObject *o, const TQValueList &vars ); + static void addVariable( TQObject *o, const TQString &name, const TQString &access ); + static void removeVariable( TQObject *o, const TQString &name ); + static TQValueList variables( TQObject *o ); + static bool hasVariable( TQObject *o, const TQString &name ); + static TQString extractVariableName( const TQString &name ); - static void setSignalList( QObject *o, const QStringList &sigs ); - static QStringList signalList( QObject *o ); + static void setSignalList( TQObject *o, const TQStringList &sigs ); + static TQStringList signalList( TQObject *o ); - static void setMetaInfo( QObject *o, MetaInfo mi ); - static MetaInfo metaInfo( QObject *o ); + static void setMetaInfo( TQObject *o, MetaInfo mi ); + static MetaInfo metaInfo( TQObject *o ); - static void setCursor( QWidget *w, const QCursor &c ); - static QCursor cursor( QWidget *w ); + static void setCursor( TQWidget *w, const TQCursor &c ); + static TQCursor cursor( TQWidget *w ); - static void setPixmapArgument( QObject *o, int pixmap, const QString &arg ); - static QString pixmapArgument( QObject *o, int pixmap ); - static void clearPixmapArguments( QObject *o ); + static void setPixmapArgument( TQObject *o, int pixmap, const TQString &arg ); + static TQString pixmapArgument( TQObject *o, int pixmap ); + static void clearPixmapArguments( TQObject *o ); - static void setPixmapKey( QObject *o, int pixmap, const QString &arg ); - static QString pixmapKey( QObject *o, int pixmap ); - static void clearPixmapKeys( QObject *o ); + static void setPixmapKey( TQObject *o, int pixmap, const TQString &arg ); + static TQString pixmapKey( TQObject *o, int pixmap ); + static void clearPixmapKeys( TQObject *o ); - static void setColumnFields( QObject *o, const QMap &columnFields ); - static QMap columnFields( QObject *o ); + static void setColumnFields( TQObject *o, const TQMap &columnFields ); + static TQMap columnFields( TQObject *o ); - static void setEditor( const QStringList &langs ); - static bool hasEditor( const QString &lang ); + static void setEditor( const TQStringList &langs ); + static bool hasEditor( const TQString &lang ); - static void setupInterfaceManagers( const QString &plugDir ); - static QStringList languages(); + static void setupInterfaceManagers( const TQString &plugDir ); + static TQStringList languages(); - static LanguageInterface *languageInterface( const QString &lang ); + static LanguageInterface *languageInterface( const TQString &lang ); - static QString normalizeFunction( const QString &f ); + static TQString normalizeFunction( const TQString &f ); - static void clear( QObject *o ); + static void clear( TQObject *o ); - static void setBreakPoints( QObject *o, const QValueList &l ); - static void setBreakPointCondition( QObject *o, int line, const QString &condition ); - static QValueList breakPoints( QObject *o ); - static QString breakPointCondition( QObject *o, int line ); + static void setBreakPoints( TQObject *o, const TQValueList &l ); + static void setBreakPointCondition( TQObject *o, int line, const TQString &condition ); + static TQValueList breakPoints( TQObject *o ); + static TQString breakPointCondition( TQObject *o, int line ); - static void setExportMacro( QObject *o, const QString ¯o ); - static QString exportMacro( QObject *o ); + static void setExportMacro( TQObject *o, const TQString ¯o ); + static TQString exportMacro( TQObject *o ); - static bool hasObject( QObject *o ); + static bool hasObject( TQObject *o ); }; diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp index 3d7f5afc..1d859211 100644 --- a/kdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -35,28 +35,28 @@ #include #include "kdevdesigner_part.h" -#include +#include #include <./private/qrichtext_p.h> -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -ToolBarItem::ToolBarItem( QWidget *parent, QWidget *toolBar, - const QString &label, const QString &tagstr, - const QIconSet &icon, const QKeySequence &key ) - : QAction( parent ) +ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, + const TQString &label, const TQString &tagstr, + const TQIconSet &icon, const TQKeySequence &key ) + : TQAction( parent ) { setIconSet( icon ); setText( label ); setAccel( key ); addTo( toolBar ); tag = tagstr; - connect( this, SIGNAL( activated() ), this, SLOT( wasActivated() ) ); + connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( wasActivated() ) ); } ToolBarItem::~ToolBarItem() @@ -69,21 +69,21 @@ void ToolBarItem::wasActivated() emit clicked( tag ); } -TextEdit::TextEdit( QWidget *parent, const char *name ) - : QTextEdit( parent, name ) +TextEdit::TextEdit( TQWidget *parent, const char *name ) + : TQTextEdit( parent, name ) { setTextFormat( Qt::PlainText ); } QTextParagraph* TextEdit::paragraph() { - QTextCursor *tc = new QTextCursor( QTextEdit::document() ); + QTextCursor *tc = new QTextCursor( TQTextEdit::document() ); return tc->paragraph(); } -MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, QWidget *parent, QWidget *editWidget, - FormWindow *fw, const QString &text ) +MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, + FormWindow *fw, const TQString &text ) : MultiLineEditorBase( parent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE ) { callStatic = call_static; @@ -95,149 +95,149 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, QWidget * Layout4->insertWidget( 0, textEdit ); if ( richtextMode ) { - QPopupMenu *stylesMenu = new QPopupMenu( this ); + TQPopupMenu *stylesMenu = new TQPopupMenu( this ); menuBar->insertItem( i18n( "&Styles" ), stylesMenu ); - basicToolBar = new QToolBar( i18n( "Basics" ), this, DockTop ); + basicToolBar = new TQToolBar( i18n( "Basics" ), this, DockTop ); ToolBarItem *it = new ToolBarItem( this, basicToolBar, i18n( "Italic" ), "i", BarIcon( "designer_textitalic.png", KDevDesignerPartFactory::instance() ), CTRL+Key_I ); it->addTo( stylesMenu ); - connect( it, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( it, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *b = new ToolBarItem( this, basicToolBar, i18n( "Bold" ), "b", BarIcon( "designer_textbold.png", KDevDesignerPartFactory::instance() ), CTRL+Key_B ); b->addTo( stylesMenu ); - connect( b, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( b, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *ul = new ToolBarItem( this, basicToolBar, i18n( "Underline" ), "u", BarIcon( "designer_textunderline.png" , KDevDesignerPartFactory::instance()), CTRL+Key_U ); ul->addTo( stylesMenu ); - connect( ul, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( ul, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *tt = new ToolBarItem( this, basicToolBar, i18n( "Typewriter" ), "tt", BarIcon( "designer_textteletext.png", KDevDesignerPartFactory::instance() ) ); tt->addTo( stylesMenu ); - connect( tt, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( tt, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); basicToolBar->addSeparator(); - QPopupMenu *layoutMenu = new QPopupMenu( this ); + TQPopupMenu *layoutMenu = new TQPopupMenu( this ); menuBar->insertItem( i18n( "&Layout" ), layoutMenu ); - QAction *brAction = new QAction( this ); + TQAction *brAction = new TQAction( this ); brAction->setIconSet( BarIcon( "designer_textlinebreak.png", KDevDesignerPartFactory::instance() ) ); brAction->setText( i18n("Break" ) ); brAction->addTo( basicToolBar ); brAction->addTo( layoutMenu ); - connect( brAction, SIGNAL( activated() ) , this, SLOT( insertBR() ) ); + connect( brAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( insertBR() ) ); ToolBarItem *p = new ToolBarItem( this, basicToolBar, i18n( "Paragraph" ), "p", BarIcon( "designer_textparagraph.png", KDevDesignerPartFactory::instance() ) ); p->addTo( layoutMenu ); - connect( p, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( p, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); layoutMenu->insertSeparator(); basicToolBar->addSeparator(); ToolBarItem *al = new ToolBarItem( this, basicToolBar, i18n( "Align left" ), "p align=\"left\"", BarIcon( "designer_textleft.png", KDevDesignerPartFactory::instance() ) ); al->addTo( layoutMenu ); - connect( al, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( al, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *ac = new ToolBarItem( this, basicToolBar, i18n( "Align center" ), "p align=\"center\"", BarIcon( "designer_textcenter.png", KDevDesignerPartFactory::instance() ) ); ac->addTo( layoutMenu ); - connect( ac, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( ac, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *ar = new ToolBarItem( this, basicToolBar, i18n( "Align right" ), "p align=\"right\"", BarIcon( "designer_textright.png", KDevDesignerPartFactory::instance() ) ); ar->addTo( layoutMenu ); - connect( ar, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( ar, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *block = new ToolBarItem( this, basicToolBar, i18n( "Blockquote" ), "blockquote", BarIcon( "designer_textjustify.png", KDevDesignerPartFactory::instance() ) ); block->addTo( layoutMenu ); - connect( block, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( block, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); - QPopupMenu *fontMenu = new QPopupMenu( this ); + TQPopupMenu *fontMenu = new TQPopupMenu( this ); menuBar->insertItem( i18n( "&Font" ), fontMenu ); - fontToolBar = new QToolBar( "Fonts", this, DockTop ); + fontToolBar = new TQToolBar( "Fonts", this, DockTop ); - QAction *fontAction = new QAction( this ); + TQAction *fontAction = new TQAction( this ); fontAction->setIconSet( BarIcon( "designer_textfont.png", KDevDesignerPartFactory::instance() ) ); fontAction->setText( i18n("Font" ) ); fontAction->addTo( fontToolBar ); fontAction->addTo( fontMenu ); - connect( fontAction, SIGNAL( activated() ) , this, SLOT( showFontDialog() ) ); + connect( fontAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( showFontDialog() ) ); ToolBarItem *fp1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize +1" ), "font size=\"+1\"", BarIcon( "designer_textlarger.png", KDevDesignerPartFactory::instance() ) ); - connect( fp1, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( fp1, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *fm1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize -1" ), "font size=\"-1\"", BarIcon( "designer_textsmaller.png", KDevDesignerPartFactory::instance() ) ); - connect( fm1, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( fm1, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *h1 = new ToolBarItem( this, fontToolBar, i18n( "Headline 1" ), "h1", BarIcon( "designer_texth1.png", KDevDesignerPartFactory::instance() ) ); - connect( h1, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( h1, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *h2 = new ToolBarItem( this, fontToolBar, i18n( "Headline 2" ), "h2", BarIcon( "designer_texth2.png", KDevDesignerPartFactory::instance() ) ); - connect( h2, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( h2, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *h3 = new ToolBarItem( this, fontToolBar, i18n( "Headline 3" ), "h3", BarIcon( "designer_texth3.png", KDevDesignerPartFactory::instance() ) ); - connect( h3, SIGNAL( clicked( const QString& ) ), - this, SLOT( insertTags( const QString& ))); + connect( h3, TQT_SIGNAL( clicked( const TQString& ) ), + this, TQT_SLOT( insertTags( const TQString& ))); - QPopupMenu *optionsMenu = new QPopupMenu( this ); + TQPopupMenu *optionsMenu = new TQPopupMenu( this ); menuBar->insertItem( i18n( "O&ptions" ), optionsMenu ); - optionsToolBar = new QToolBar( "Options", this, DockTop ); - wrapAction = new QAction( this ); + optionsToolBar = new TQToolBar( "Options", this, DockTop ); + wrapAction = new TQAction( this ); wrapAction->setToggleAction( TRUE ); wrapAction->setIconSet( BarIcon( "designer_wordwrap.png", KDevDesignerPartFactory::instance() ) ); wrapAction->setText( i18n( "Word Wrapping" ) ); wrapAction->addTo( optionsToolBar ); wrapAction->addTo( optionsMenu ); - connect( wrapAction, SIGNAL( toggled( bool ) ), this, SLOT( changeWrapMode( bool ) ) ); + connect( wrapAction, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( changeWrapMode( bool ) ) ); oldDoWrap = doWrap; wrapAction->setOn( doWrap ); - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); textEdit->document()->setFormatter( new QTextFormatterBreakInWords ); textEdit->document()->setUseFormatCollection( FALSE ); textEdit->document()->setPreProcessor( new SyntaxHighlighter_HTML ); - if ( !callStatic && ::qt_cast(editWidget) ) { - mlined = (QTextEdit*)editWidget; + if ( !callStatic && ::qt_cast(editWidget) ) { + mlined = (TQTextEdit*)editWidget; mlined->setReadOnly( TRUE ); - const QMetaProperty *wordWrap = mlined->metaObject()->property( + const TQMetaProperty *wordWrap = mlined->metaObject()->property( mlined->metaObject()->findProperty( "wordWrap", TRUE ), TRUE ); oldWrapMode = 0; oldWrapString = "NoWrap"; if ( wordWrap ) { oldWrapMode = mlined->property( "wordWrap" ); - oldWrapString = QString( wordWrap->valueToKey( oldWrapMode.toInt() ) ); + oldWrapString = TQString( wordWrap->valueToKey( oldWrapMode.toInt() ) ); if ( oldWrapString != "NoWrap" ) doWrap = TRUE; } @@ -282,18 +282,18 @@ void MultiLineEditor::applyClicked() formwindow->commandHistory()->addCommand( cmd ); if ( oldDoWrap != doWrap ) { - QString pn( i18n( "Set 'wordWrap' of '%2'" ).arg( mlined->name() ) ); + TQString pn( i18n( "Set 'wordWrap' of '%2'" ).arg( mlined->name() ) ); SetPropertyCommand *propcmd; if ( doWrap ) propcmd = new SetPropertyCommand( pn, formwindow, mlined, MainWindow::self->propertyeditor(), "wordWrap", WidgetFactory::property( mlined, "wordWrap" ), - QVariant( 1 ), "WidgetWidth", oldWrapString ); + TQVariant( 1 ), "WidgetWidth", oldWrapString ); else propcmd = new SetPropertyCommand( pn, formwindow, mlined, MainWindow::self->propertyeditor(), "wordWrap", WidgetFactory::property( mlined, "wordWrap" ), - QVariant( 0 ), "NoWrap", oldWrapString ); + TQVariant( 0 ), "NoWrap", oldWrapString ); propcmd->execute(); formwindow->commandHistory()->addCommand( propcmd, TRUE ); @@ -311,21 +311,21 @@ void MultiLineEditor::cancelClicked() close(); } -void MultiLineEditor::closeEvent( QCloseEvent *e ) +void MultiLineEditor::closeEvent( TQCloseEvent *e ) { qApp->exit_loop(); MultiLineEditorBase::closeEvent( e ); } -void MultiLineEditor::insertTags( const QString &tag ) +void MultiLineEditor::insertTags( const TQString &tag ) { int pfrom, pto, ifrom, ito; - QString tagend( tag.simplifyWhiteSpace() ); + TQString tagend( tag.simplifyWhiteSpace() ); tagend.remove( tagend.find( ' ', 0 ), tagend.length() ); if ( textEdit->hasSelectedText() ) { textEdit->getSelection( &pfrom, &ifrom, &pto, &ito ); - QString buf = textEdit->selectedText(); - buf = QString( "<%1>%3" ).arg( tag ).arg( tagend ).arg( buf ); + TQString buf = textEdit->selectedText(); + buf = TQString( "<%1>%3" ).arg( tag ).arg( tagend ).arg( buf ); textEdit->removeSelectedText(); textEdit->insertAt( buf, pfrom, ifrom ); textEdit->setCursorPosition( pto, ito + 2 + tag.length() ); @@ -333,7 +333,7 @@ void MultiLineEditor::insertTags( const QString &tag ) else { int para, index; textEdit->getCursorPosition( ¶, &index ); - textEdit->insert( QString( "<%1>" ).arg( tag ).arg( tagend ) ); + textEdit->insert( TQString( "<%1>" ).arg( tag ).arg( tagend ) ); index += 2 + tag.length(); textEdit->setCursorPosition( para, index ); } @@ -353,16 +353,16 @@ void MultiLineEditor::showFontDialog() selText = TRUE; } RichTextFontDialog *fd = new RichTextFontDialog( this ); - if ( fd->exec() == QDialog::Accepted ) { - QString size, font; + if ( fd->exec() == TQDialog::Accepted ) { + TQString size, font; if ( fd->getSize() != "0" ) size = "size=\"" + fd->getSize() + "\""; - QString color; + TQString color; if ( !fd->getColor().isEmpty() && fd->getColor() != "#000000" ) color = "color=\"" + fd->getColor() + "\""; if ( fd->getFont() != "default" ) font = "face=\"" + fd->getFont() + "\""; - QString tag( QString( "font %1 %2 %3" ) + TQString tag( TQString( "font %1 %2 %3" ) .arg( color ).arg( size ).arg( font ) ); if ( selText ) @@ -373,21 +373,21 @@ void MultiLineEditor::showFontDialog() textEdit->setSelection( pfrom, ifrom, pto, ito ); } -QString MultiLineEditor::getStaticText() +TQString MultiLineEditor::getStaticText() { return staticText.stripWhiteSpace(); } -QString MultiLineEditor::getText( QWidget *parent, const QString &text, bool richtextMode, bool *useWrap ) +TQString MultiLineEditor::getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap ) { MultiLineEditor medit( TRUE, richtextMode, parent, 0, 0, text ); if ( richtextMode ) medit.setUseWrapping( *useWrap ); - if ( medit.exec() == QDialog::Accepted ) { + if ( medit.exec() == TQDialog::Accepted ) { *useWrap = medit.useWrapping(); return medit.getStaticText(); } - return QString::null; + return TQString::null; } void MultiLineEditor::changeWrapMode( bool b ) @@ -397,9 +397,9 @@ void MultiLineEditor::changeWrapMode( bool b ) if ( oldDoWrap ) textEdit->setProperty( "wordWrap", oldWrapMode ); else - textEdit->setWordWrap( QTextEdit::WidgetWidth ); + textEdit->setWordWrap( TQTextEdit::WidgetWidth ); } else { - textEdit->setWordWrap( QTextEdit::NoWrap ); + textEdit->setWordWrap( TQTextEdit::NoWrap ); } } diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h index 5abf5339..89a22db2 100644 --- a/kdevdesigner/designer/multilineeditorimpl.h +++ b/kdevdesigner/designer/multilineeditorimpl.h @@ -27,8 +27,8 @@ #ifndef MULTILINEEDITORIMPL_H #define MULTILINEEDITORIMPL_H -#include -#include +#include +#include #include #include "multilineeditor.h" @@ -41,8 +41,8 @@ class TextEdit : public QTextEdit Q_OBJECT public: - TextEdit( QWidget *parent = 0, const char *name = 0 ); - QTextDocument *document() const { return QTextEdit::document(); } + TextEdit( TQWidget *parent = 0, const char *name = 0 ); + QTextDocument *document() const { return TQTextEdit::document(); } QTextParagraph *paragraph(); }; @@ -52,17 +52,17 @@ class ToolBarItem : public QAction Q_OBJECT public: - ToolBarItem( QWidget *parent, QWidget *toolBar, - const QString &label, const QString &tagstr, - const QIconSet &icon, const QKeySequence &key = 0 ); + ToolBarItem( TQWidget *parent, TQWidget *toolBar, + const TQString &label, const TQString &tagstr, + const TQIconSet &icon, const TQKeySequence &key = 0 ); ~ToolBarItem(); signals: - void clicked( const QString &t ); + void clicked( const TQString &t ); protected slots: void wasActivated(); private: - QString tag; + TQString tag; }; @@ -71,39 +71,39 @@ class MultiLineEditor : public MultiLineEditorBase Q_OBJECT public: - MultiLineEditor( bool call_static, bool richtextMode, QWidget *parent, QWidget *editWidget, - FormWindow *fw, const QString &text = QString::null ); + MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, + FormWindow *fw, const TQString &text = TQString::null ); bool useWrapping() const; void setUseWrapping( bool ); - static QString getText( QWidget *parent, const QString &text, bool richtextMode, bool *useWrap ); + static TQString getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap ); int exec(); protected slots: void okClicked(); void applyClicked(); void cancelClicked(); - void insertTags( const QString& ); + void insertTags( const TQString& ); void insertBR(); void showFontDialog(); void changeWrapMode( bool ); - void closeEvent( QCloseEvent *e ); + void closeEvent( TQCloseEvent *e ); private: - QString getStaticText(); + TQString getStaticText(); TextEdit *textEdit; - QTextEdit *mlined; + TQTextEdit *mlined; FormWindow *formwindow; - QToolBar *basicToolBar; - QToolBar *fontToolBar; - QToolBar *optionsToolBar; - QAction *wrapAction; + TQToolBar *basicToolBar; + TQToolBar *fontToolBar; + TQToolBar *optionsToolBar; + TQAction *wrapAction; int res; - QString staticText; + TQString staticText; bool callStatic; bool oldDoWrap, doWrap; - QVariant oldWrapMode; - QString oldWrapString; + TQVariant oldWrapMode; + TQString oldWrapString; }; #endif diff --git a/kdevdesigner/designer/myiconloader.cpp b/kdevdesigner/designer/myiconloader.cpp index 8ad6abc8..80bbc5ba 100644 --- a/kdevdesigner/designer/myiconloader.cpp +++ b/kdevdesigner/designer/myiconloader.cpp @@ -21,12 +21,12 @@ #include "kdevdesigner_part.h" #include -QPixmap BarIcon2( const QString & name ) +TQPixmap BarIcon2( const TQString & name ) { return BarIcon(name, KDevDesignerPartFactory::instance()); } -QPixmap SmallIcon2( const QString & name) +TQPixmap SmallIcon2( const TQString & name) { return SmallIcon(name, KDevDesignerPartFactory::instance()); } diff --git a/kdevdesigner/designer/myiconloader.h b/kdevdesigner/designer/myiconloader.h index e91208bc..4fcc5ed5 100644 --- a/kdevdesigner/designer/myiconloader.h +++ b/kdevdesigner/designer/myiconloader.h @@ -20,13 +20,13 @@ #ifndef MY_ICON_LOADER #define MY_ICON_LOADER -#include -#include +#include +#include class KInstance; -QPixmap BarIcon2 (const QString &name); -QPixmap SmallIcon2 (const QString &name); +TQPixmap BarIcon2 (const TQString &name); +TQPixmap SmallIcon2 (const TQString &name); #endif diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp index 9ff44d01..80bc6463 100644 --- a/kdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -41,19 +41,19 @@ #include "kdevdesigner_part.h" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include static int forms = 0; -ProjectItem::ProjectItem( QIconView *view, const QString &text ) +ProjectItem::ProjectItem( TQIconView *view, const TQString &text ) : NewItem( view, text ) { } @@ -65,32 +65,32 @@ void ProjectItem::insert( Project * ) -FormItem::FormItem( QIconView *view, const QString &text ) +FormItem::FormItem( TQIconView *view, const TQString &text ) : NewItem( view, text ) { } void FormItem::insert( Project *pro ) { - QString n = "Form" + QString::number( ++forms ); + TQString n = "Form" + TQString::number( ++forms ); FormWindow *fw = 0; FormFile *ff = new FormFile( FormFile::createUnnamedFileName(), TRUE, pro ); fw = new FormWindow( ff, MainWindow::self, MainWindow::self->qWorkspace(), n ); fw->setProject( pro ); MetaDataBase::addEntry( fw ); if ( fType == Widget ) { - QWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QWidget" ), + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ), fw, n.latin1() ); fw->setMainContainer( w ); } else if ( fType == Dialog ) { - QWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QDialog" ), fw, n.latin1() ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() ); fw->setMainContainer( w ); } else if ( fType == Wizard ) { - QWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QWizard" ), + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWizard" ), fw, n.latin1() ); fw->setMainContainer( w ); } else if ( fType == MainWindow ) { - QWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "QMainWindow" ), + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQMainWindow" ), fw, n.latin1() ); fw->setMainContainer( w ); } @@ -123,16 +123,16 @@ void FormItem::insert( Project *pro ) -CustomFormItem::CustomFormItem( QIconView *view, const QString &text ) +CustomFormItem::CustomFormItem( TQIconView *view, const TQString &text ) : NewItem( view, text ) { } -static void unifyFormName( FormWindow *fw, QWorkspace *qworkspace ) +static void unifyFormName( FormWindow *fw, TQWorkspace *qworkspace ) { - QStringList lst; - QWidgetList windows = qworkspace->windowList(); - for ( QWidget *w =windows.first(); w; w = windows.next() ) { + TQStringList lst; + TQWidgetList windows = qworkspace->windowList(); + for ( TQWidget *w =windows.first(); w; w = windows.next() ) { if ( w == fw ) continue; lst << w->name(); @@ -140,11 +140,11 @@ static void unifyFormName( FormWindow *fw, QWorkspace *qworkspace ) if ( lst.findIndex( fw->name() ) == -1 ) return; - QString origName = fw->name(); - QString n = origName; + TQString origName = fw->name(); + TQString n = origName; int i = 1; while ( lst.findIndex( n ) != -1 ) { - n = origName + QString::number( i++ ); + n = origName + TQString::number( i++ ); } fw->setName( n ); fw->setCaption( n ); @@ -152,19 +152,19 @@ static void unifyFormName( FormWindow *fw, QWorkspace *qworkspace ) void CustomFormItem::insert( Project *pro ) { - QString filename = templateFileName(); - if ( !filename.isEmpty() && QFile::exists( filename ) ) { + TQString filename = templateFileName(); + if ( !filename.isEmpty() && TQFile::exists( filename ) ) { Resource resource( MainWindow::self ); FormFile *ff = new FormFile( filename, TRUE, pro ); if ( !resource.load( ff ) ) { - QMessageBox::information( MainWindow::self, i18n("Load Template"), + TQMessageBox::information( MainWindow::self, i18n("Load Template"), i18n("Could not load form description from template '%1'" ).arg( filename ) ); delete ff; return; } - ff->setFileName( QString::null ); + ff->setFileName( TQString::null ); if ( MainWindow::self->formWindow() ) { - MainWindow::self->formWindow()->setFileName( QString::null ); + MainWindow::self->formWindow()->setFileName( TQString::null ); unifyFormName( MainWindow::self->formWindow(), MainWindow::self->qWorkspace() ); if ( !pro->isDummy() ) { MainWindow::self->formWindow()->setSavePixmapInProject( TRUE ); @@ -176,7 +176,7 @@ void CustomFormItem::insert( Project *pro ) -SourceFileItem::SourceFileItem( QIconView *view, const QString &text ) +SourceFileItem::SourceFileItem( TQIconView *view, const TQString &text ) : NewItem( view, text ), visible( TRUE ) { } @@ -189,7 +189,7 @@ void SourceFileItem::insert( Project *pro ) void SourceFileItem::setProject( Project *pro ) { - QIconView *iv = iconView(); + TQIconView *iv = iconView(); bool v = lang == pro->language(); if ( !iv || v == visible ) return; @@ -202,7 +202,7 @@ void SourceFileItem::setProject( Project *pro ) -SourceTemplateItem::SourceTemplateItem( QIconView *view, const QString &text ) +SourceTemplateItem::SourceTemplateItem( TQIconView *view, const TQString &text ) : NewItem( view, text ), visible( TRUE ) { } @@ -231,7 +231,7 @@ void SourceTemplateItem::insert( Project *pro ) void SourceTemplateItem::setProject( Project *pro ) { - QIconView *iv = iconView(); + TQIconView *iv = iconView(); bool v = !pro->isDummy() && lang == pro->language(); if ( !iv || v == visible ) return; @@ -242,11 +242,11 @@ void SourceTemplateItem::setProject( Project *pro ) iv->insertItem( this ); } -void NewForm::insertTemplates( QIconView *tView, - const QString &templatePath ) +void NewForm::insertTemplates( TQIconView *tView, + const TQString &templatePath ) { - QStringList::Iterator it; - QStringList languages = MetaDataBase::languages(); + TQStringList::Iterator it; + TQStringList languages = MetaDataBase::languages(); if ( !MainWindow::self->singleProjectMode() ) { for ( it = languages.begin(); it != languages.end(); ++it ) { ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).arg( *it ) ); @@ -256,7 +256,7 @@ void NewForm::insertTemplates( QIconView *tView, pi->setDragEnabled( FALSE ); } } - QIconViewItem *cur = 0; + TQIconViewItem *cur = 0; FormItem *fi = new FormItem( tView,i18n( "Dialog" ) ); allItems.append( fi ); fi->setFormType( FormItem::Dialog ); @@ -280,32 +280,32 @@ void NewForm::insertTemplates( QIconView *tView, fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); fi->setDragEnabled( FALSE ); - QString templPath = templatePath; - QStringList templRoots; + TQString templPath = templatePath; + TQStringList templRoots; const char *qtdir = getenv( "QTDIR" ); if(qtdir) templRoots << qtdir; templRoots << qInstallPathData(); if(qtdir) //try the tools/designer directory last! - templRoots << (QString(qtdir) + "/tools/designer"); - for ( QStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) { - QString path = (*it) + "/templates"; - if ( QFile::exists( path )) { + templRoots << (TQString(qtdir) + "/tools/designer"); + for ( TQStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) { + TQString path = (*it) + "/templates"; + if ( TQFile::exists( path )) { templPath = path; break; } } if ( !templPath.isEmpty() ) { - QDir dir( templPath ); - const QFileInfoList *filist = dir.entryInfoList( QDir::DefaultFilter, QDir::DirsFirst | QDir::Name ); + TQDir dir( templPath ); + const QFileInfoList *filist = dir.entryInfoList( TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name ); if ( filist ) { QFileInfoListIterator it( *filist ); - QFileInfo *fi; + TQFileInfo *fi; while ( ( fi = it.current() ) != 0 ) { ++it; if ( !fi->isFile() || fi->extension() != "ui" ) continue; - QString name = fi->baseName(); + TQString name = fi->baseName(); name = name.replace( '_', ' ' ); CustomFormItem *ci = new CustomFormItem( tView, name ); allItems.append( ci ); @@ -320,9 +320,9 @@ void NewForm::insertTemplates( QIconView *tView, for ( it = languages.begin(); it != languages.end(); ++it ) { LanguageInterface *iface = MetaDataBase::languageInterface( *it ); if ( iface ) { - QMap extensionMap; + TQMap extensionMap; iface->preferedExtensions( extensionMap ); - for ( QMap::Iterator eit = extensionMap.begin(); + for ( TQMap::Iterator eit = extensionMap.begin(); eit != extensionMap.end(); ++eit ) { SourceFileItem * si = new SourceFileItem( tView, *eit ); allItems.append( si ); @@ -336,8 +336,8 @@ void NewForm::insertTemplates( QIconView *tView, } if ( !MainWindow::self->singleProjectMode() ) { - QStringList sourceTemplates = MainWindow::self->sourceTemplates(); - for ( QStringList::Iterator sit = sourceTemplates.begin(); sit != sourceTemplates.end(); ++sit ) { + TQStringList sourceTemplates = MainWindow::self->sourceTemplates(); + for ( TQStringList::Iterator sit = sourceTemplates.begin(); sit != sourceTemplates.end(); ++sit ) { SourceTemplateInterface *siface = MainWindow::self->sourceTemplateInterface( *sit ); if ( !siface ) continue; @@ -358,17 +358,17 @@ void NewForm::insertTemplates( QIconView *tView, adjustSize(); } -NewForm::NewForm( QIconView *templateView, const QString &templatePath ) +NewForm::NewForm( TQIconView *templateView, const TQString &templatePath ) { insertTemplates( templateView, templatePath ); projectChanged( i18n( "" ) ); } -NewForm::NewForm( QWidget *parent, const QStringList& projects, - const QString& currentProject, const QString &templatePath ) +NewForm::NewForm( TQWidget *parent, const TQStringList& projects, + const TQString& currentProject, const TQString &templatePath ) : NewFormBase( parent, 0, TRUE ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); projectCombo->insertStringList( projects ); projectCombo->setCurrentText( currentProject ); @@ -390,25 +390,25 @@ void NewForm::accept() ( (NewItem*)templateView->currentItem() )->insert( pro ); } -void NewForm::projectChanged( const QString &project ) +void NewForm::projectChanged( const TQString &project ) { Project *pro = MainWindow::self->findProject( project ); if ( !pro ) return; - QIconViewItem *i; + TQIconViewItem *i; for ( i = allItems.first(); i; i = allItems.next() ) ( (NewItem*)i )->setProject( pro ); templateView->setCurrentItem( templateView->firstItem() ); templateView->arrangeItemsInGrid( TRUE ); } -void NewForm::itemChanged( QIconViewItem *item ) +void NewForm::itemChanged( TQIconViewItem *item ) { labelProject->setEnabled( item->rtti() != NewItem::ProjectType ); projectCombo->setEnabled( item->rtti() != NewItem::ProjectType ); } -QPtrList NewForm::allViewItems() +TQPtrList NewForm::allViewItems() { return allItems; } diff --git a/kdevdesigner/designer/newformimpl.h b/kdevdesigner/designer/newformimpl.h index acd597bf..b85e36c9 100644 --- a/kdevdesigner/designer/newformimpl.h +++ b/kdevdesigner/designer/newformimpl.h @@ -28,7 +28,7 @@ #define NEWFORMIMPL_H #include "newform.h" -#include +#include class Project; @@ -43,8 +43,8 @@ public: SourceTemplateType }; - NewItem( QIconView *view, const QString &text ) - : QIconViewItem( view, text ) {} + NewItem( TQIconView *view, const TQString &text ) + : TQIconViewItem( view, text ) {} virtual void insert( Project *pro ) = 0; virtual void setProject( Project * ) {} @@ -53,15 +53,15 @@ public: class ProjectItem : public NewItem { public: - ProjectItem( QIconView *view, const QString &text ); + ProjectItem( TQIconView *view, const TQString &text ); void insert( Project *pro ); int rtti() const { return (int)ProjectType; } - void setLanguage( const QString &l ) { lang = l; } - QString language() const { return lang; } + void setLanguage( const TQString &l ) { lang = l; } + TQString language() const { return lang; } private: - QString lang; + TQString lang; }; @@ -75,7 +75,7 @@ public: MainWindow }; - FormItem( QIconView *view, const QString &text ); + FormItem( TQIconView *view, const TQString &text ); void insert( Project *pro ); int rtti() const { return (int)Form; } @@ -90,33 +90,33 @@ private: class CustomFormItem : public NewItem { public: - CustomFormItem( QIconView *view, const QString &text ); + CustomFormItem( TQIconView *view, const TQString &text ); void insert( Project *pro ); int rtti() const { return (int)CustomForm; } - void setTemplateFile( const QString &tf ) { templFile = tf; } - QString templateFileName() const { return templFile; } + void setTemplateFile( const TQString &tf ) { templFile = tf; } + TQString templateFileName() const { return templFile; } private: - QString templFile; + TQString templFile; }; class SourceFileItem : public NewItem { public: - SourceFileItem( QIconView *view, const QString &text ); + SourceFileItem( TQIconView *view, const TQString &text ); void insert( Project *pro ); int rtti() const { return (int)SourceFileType; } - void setExtension( const QString &e ) { ext = e; } - QString extension() const { return ext; } - void setLanguage( const QString &l ) { lang = l; } + void setExtension( const TQString &e ) { ext = e; } + TQString extension() const { return ext; } + void setLanguage( const TQString &l ) { lang = l; } void setProject( Project *pro ); private: - QString ext; - QString lang; + TQString ext; + TQString lang; bool visible; }; @@ -124,18 +124,18 @@ private: class SourceTemplateItem : public NewItem { public: - SourceTemplateItem( QIconView *view, const QString &text ); + SourceTemplateItem( TQIconView *view, const TQString &text ); void insert( Project *pro ); int rtti() const { return (int)SourceTemplateType; } - void setTemplate( const QString &t ) { templ = t; } - QString tenplate() const { return templ; } - void setLanguage( const QString &l ) { lang = l; } + void setTemplate( const TQString &t ) { templ = t; } + TQString tenplate() const { return templ; } + void setLanguage( const TQString &l ) { lang = l; } void setProject( Project *pro ); private: - QString templ; - QString lang; + TQString templ; + TQString lang; bool visible; }; @@ -145,19 +145,19 @@ class NewForm : public NewFormBase Q_OBJECT public: - NewForm( QIconView *templateView, const QString &templatePath ); - NewForm( QWidget *parent, const QStringList& projects, - const QString& currentProject, const QString &templatePath ); - void insertTemplates( QIconView*, const QString& ); + NewForm( TQIconView *templateView, const TQString &templatePath ); + NewForm( TQWidget *parent, const TQStringList& projects, + const TQString& currentProject, const TQString &templatePath ); + void insertTemplates( TQIconView*, const TQString& ); void accept(); - QPtrList allViewItems(); + TQPtrList allViewItems(); protected slots: - void projectChanged( const QString &project ); - void itemChanged( QIconViewItem *item ); + void projectChanged( const TQString &project ); + void itemChanged( TQIconViewItem *item ); private: - QPtrList allItems; + TQPtrList allItems; }; diff --git a/kdevdesigner/designer/orderindicator.cpp b/kdevdesigner/designer/orderindicator.cpp index 08ed16b8..f3c50feb 100644 --- a/kdevdesigner/designer/orderindicator.cpp +++ b/kdevdesigner/designer/orderindicator.cpp @@ -24,17 +24,17 @@ ** **********************************************************************/ -#include // HP-UX compiler need this here +#include // HP-UX compiler need this here #include "orderindicator.h" #include "formwindow.h" -#include -#include -#include +#include +#include +#include -OrderIndicator::OrderIndicator( int i, QWidget* w, FormWindow *fw ) - : QWidget( fw, "order_indicator", WMouseNoMask ), formWindow( fw ) +OrderIndicator::OrderIndicator( int i, TQWidget* w, FormWindow *fw ) + : TQWidget( fw, "order_indicator", WMouseNoMask ), formWindow( fw ) { order = -1; widget = w; @@ -49,7 +49,7 @@ OrderIndicator::~OrderIndicator() } -void OrderIndicator::setOrder( int i, QWidget* wid ) +void OrderIndicator::setOrder( int i, TQWidget* wid ) { if ( widget != wid ) return; @@ -64,9 +64,9 @@ void OrderIndicator::setOrder( int i, QWidget* wid ) return; } order = i; - int w = fontMetrics().width( QString::number( i ) ) + 10; + int w = fontMetrics().width( TQString::number( i ) ) + 10; int h = fontMetrics().lineSpacing() * 3 / 2; - QFont f( font() ); + TQFont f( font() ); f.setBold( TRUE ); setFont( f ); resize( QMAX( w, h ), h ); @@ -78,27 +78,27 @@ void OrderIndicator::setOrder( int i, QWidget* wid ) void OrderIndicator::reposition() { - QPoint p =parentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) ); - move( p - QPoint( width()/3, height()/3 ) ); + TQPoint p =parentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) ); + move( p - TQPoint( width()/3, height()/3 ) ); } -void OrderIndicator::paintEvent( QPaintEvent * ) +void OrderIndicator::paintEvent( TQPaintEvent * ) { - QPainter p( this ); + TQPainter p( this ); p.setPen( white ); p.setBrush( blue ); p.drawEllipse( rect() ); - p.drawText( rect(), AlignCenter, QString::number( order ) ); + p.drawText( rect(), AlignCenter, TQString::number( order ) ); } void OrderIndicator::updateMask() { - QBitmap bm( size() ); + TQBitmap bm( size() ); bm.fill( color0 ); { - QPainter p( &bm, this ); + TQPainter p( &bm, this ); p.setPen( color1 ); p.setBrush( color1 ); p.drawEllipse( rect() ); @@ -106,7 +106,7 @@ void OrderIndicator::updateMask() setMask( bm ); } -void OrderIndicator::mousePressEvent( QMouseEvent *e ) +void OrderIndicator::mousePressEvent( TQMouseEvent *e ) { - QApplication::sendEvent( widget, e ); + TQApplication::sendEvent( widget, e ); } diff --git a/kdevdesigner/designer/orderindicator.h b/kdevdesigner/designer/orderindicator.h index 35962b7a..5dd0185b 100644 --- a/kdevdesigner/designer/orderindicator.h +++ b/kdevdesigner/designer/orderindicator.h @@ -27,7 +27,7 @@ #ifndef ORDERINDICATOR_H #define ORDERINDICATOR_H -#include +#include class FormWindow; @@ -36,20 +36,20 @@ class OrderIndicator : public QWidget Q_OBJECT public: - OrderIndicator( int i, QWidget* w, FormWindow* fw ); + OrderIndicator( int i, TQWidget* w, FormWindow* fw ); ~OrderIndicator(); - void setOrder( int i, QWidget* w ); + void setOrder( int i, TQWidget* w ); void reposition(); protected: - void paintEvent( QPaintEvent * ); - void mousePressEvent( QMouseEvent *e ); + void paintEvent( TQPaintEvent * ); + void mousePressEvent( TQMouseEvent *e ); void updateMask(); private: int order; - QWidget* widget; + TQWidget* widget; FormWindow *formWindow; }; diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index f51a54a3..17477a95 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -29,23 +29,23 @@ #include "metadatabase.h" #include "mainwindow.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include #include -static QTextEdit *debugoutput = 0; +static TQTextEdit *debugoutput = 0; bool debugToStderr = FALSE; QtMsgHandler OutputWindow::oldMsgHandler = 0; -OutputWindow::OutputWindow( QWidget *parent ) - : QTabWidget( parent, "output_window" ), debugView( 0 ), errorView( 0 ) +OutputWindow::OutputWindow( TQWidget *parent ) + : TQTabWidget( parent, "output_window" ), debugView( 0 ), errorView( 0 ) { setupDebug(); setupError(); @@ -69,12 +69,12 @@ void OutputWindow::shuttingDown() void OutputWindow::setupError() { - errorView = new QListView( this, "OutputWindow::errorView" ); + errorView = new TQListView( this, "OutputWindow::errorView" ); errorView->setSorting( -1 ); - connect( errorView, SIGNAL( currentChanged( QListViewItem* ) ), - this, SLOT( currentErrorChanged( QListViewItem* ) ) ); - connect( errorView, SIGNAL( clicked( QListViewItem* ) ), - this, SLOT( currentErrorChanged( QListViewItem* ) ) ); + connect( errorView, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), + this, TQT_SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQT_SIGNAL( clicked( TQListViewItem* ) ), + this, TQT_SLOT( currentErrorChanged( TQListViewItem* ) ) ); if ( MetaDataBase::languages().count() > 1 ) addTab( errorView, i18n( "Warnings/Errors" ) ); @@ -84,7 +84,7 @@ void OutputWindow::setupError() errorView->addColumn( i18n( "Message" ) ); errorView->addColumn( i18n( "Line" ) ); errorView->addColumn( i18n( "Location" ) ); - errorView->setResizeMode( QListView::LastColumn ); + errorView->setResizeMode( TQListView::LastColumn ); errorView->setColumnWidth( 0, errorView->fontMetrics().width( "WARNING1234" ) ); errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOP" ) ); errorView->setColumnWidth( 2, errorView->fontMetrics().width( "9999999" ) ); @@ -94,7 +94,7 @@ void OutputWindow::setupError() static void debugMessageOutput( QtMsgType type, const char *msg ) { - QString s( msg ); + TQString s( msg ); s += "\n"; if ( type != QtFatalMsg ) { @@ -114,7 +114,7 @@ static void debugMessageOutput( QtMsgType type, const char *msg ) void OutputWindow::setupDebug() { - debugoutput = debugView = new QTextEdit( this, "OutputWindow::debugView" ); + debugoutput = debugView = new TQTextEdit( this, "OutputWindow::debugView" ); //debugView->setReadOnly( TRUE ); addTab( debugView, "Debug Output" ); @@ -122,18 +122,18 @@ void OutputWindow::setupDebug() oldMsgHandler = qInstallMsgHandler( debugMessageOutput ); } -void OutputWindow::setErrorMessages( const QStringList &errors, const QValueList &lines, - bool clear, const QStringList &locations, - const QObjectList &locationObjects ) +void OutputWindow::setErrorMessages( const TQStringList &errors, const TQValueList &lines, + bool clear, const TQStringList &locations, + const TQObjectList &locationObjects ) { if ( clear ) errorView->clear(); - QStringList::ConstIterator mit = errors.begin(); - QValueList::ConstIterator lit = lines.begin(); - QStringList::ConstIterator it = locations.begin(); - QObjectList objects = (QObjectList)locationObjects; - QObject *o = objects.first(); - QListViewItem *after = 0; + TQStringList::ConstIterator mit = errors.begin(); + TQValueList::ConstIterator lit = lines.begin(); + TQStringList::ConstIterator it = locations.begin(); + TQObjectList objects = (TQObjectList)locationObjects; + TQObject *o = objects.first(); + TQListViewItem *after = 0; for ( ; lit != lines.end() && mit != errors.end(); ++lit, ++mit, ++it, o = objects.next() ) after = new ErrorItem( errorView, after, *mit, *lit, *it, o ); setCurrentPage( 1 ); @@ -144,7 +144,7 @@ DesignerOutputDock *OutputWindow::iFace() return iface; } -void OutputWindow::appendDebug( const QString &text ) +void OutputWindow::appendDebug( const TQString &text ) { debugView->append( text + "\n" ); } @@ -164,7 +164,7 @@ void OutputWindow::showDebugTab() showPage( debugView ); } -void OutputWindow::currentErrorChanged( QListViewItem *i ) +void OutputWindow::currentErrorChanged( TQListViewItem *i ) { if ( !i ) return; @@ -175,17 +175,17 @@ void OutputWindow::currentErrorChanged( QListViewItem *i ) -ErrorItem::ErrorItem( QListView *parent, QListViewItem *after, const QString &message, int line, - const QString &locationString, QObject *locationObject ) - : QListViewItem( parent, after ) +ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line, + const TQString &locationString, TQObject *locationObject ) + : TQListViewItem( parent, after ) { setMultiLinesEnabled( TRUE ); - QString m( message ); + TQString m( message ); type = m.startsWith( "Warning: " ) ? Warning : Error; m = m.mid( m.find( ':' ) + 1 ); setText( 0, type == Error ? "Error" : "Warning" ); setText( 1, m ); - setText( 2, QString::number( line ) ); + setText( 2, TQString::number( line ) ); setText( 3, locationString ); object = locationObject; read = !after; @@ -195,15 +195,15 @@ ErrorItem::ErrorItem( QListView *parent, QListViewItem *after, const QString &me } } -void ErrorItem::paintCell( QPainter *p, const QColorGroup & cg, +void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg, int column, int width, int alignment ) { - QColorGroup g( cg ); - g.setColor( QColorGroup::Text, type == Error ? Qt::red : Qt::darkYellow ); + TQColorGroup g( cg ); + g.setColor( TQColorGroup::Text, type == Error ? Qt::red : Qt::darkYellow ); if ( !read ) { - QFont f( p->font() ); + TQFont f( p->font() ); f.setBold( TRUE ); p->setFont( f ); } - QListViewItem::paintCell( p, g, column, width, alignment ); + TQListViewItem::paintCell( p, g, column, width, alignment ); } diff --git a/kdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h index e61c92c0..c1f196c5 100644 --- a/kdevdesigner/designer/outputwindow.h +++ b/kdevdesigner/designer/outputwindow.h @@ -27,10 +27,10 @@ #ifndef OUTPUTWINDOW_H #define OUTPUTWINDOW_H -#include -#include -#include -#include +#include +#include +#include +#include struct DesignerOutputDock; class QTextEdit; @@ -41,19 +41,19 @@ class ErrorItem : public QListViewItem public: enum Type { Error, Warning }; - ErrorItem( QListView *parent, QListViewItem *after, const QString &message, int line, - const QString &locationString, QObject *locationObject ); + ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line, + const TQString &locationString, TQObject *locationObject ); - void paintCell( QPainter *, const QColorGroup & cg, + void paintCell( TQPainter *, const TQColorGroup & cg, int column, int width, int alignment ); void setRead( bool b ) { read = b; repaint(); } - QObject *location() const { return object; } + TQObject *location() const { return object; } int line() const { return text( 2 ).toInt(); } private: - QObject *object; + TQObject *object; Type type; bool read; @@ -64,13 +64,13 @@ class OutputWindow : public QTabWidget Q_OBJECT public: - OutputWindow( QWidget *parent ); + OutputWindow( TQWidget *parent ); ~OutputWindow(); - void setErrorMessages( const QStringList &errors, const QValueList &lines, - bool clear, const QStringList &locations, - const QObjectList &locationObjects ); - void appendDebug( const QString& ); + void setErrorMessages( const TQStringList &errors, const TQValueList &lines, + bool clear, const TQStringList &locations, + const TQObjectList &locationObjects ); + void appendDebug( const TQString& ); void clearErrorMessages(); void clearDebug(); void showDebugTab(); @@ -82,14 +82,14 @@ public: static QtMsgHandler oldMsgHandler; private slots: - void currentErrorChanged( QListViewItem *i ); + void currentErrorChanged( TQListViewItem *i ); private: void setupError(); void setupDebug(); - QTextEdit *debugView; - QListView *errorView; + TQTextEdit *debugView; + TQListView *errorView; DesignerOutputDock *iface; diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp index 8faebba4..86399bdf 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp @@ -29,13 +29,13 @@ #include "mainwindow.h" #include "formwindow.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /*! Class used by PaletteEditor for bold combobox items @@ -44,36 +44,36 @@ class BoldListBoxText : public QListBoxText { public: - BoldListBoxText( QString text, QListBox* lb = 0 ); + BoldListBoxText( TQString text, TQListBox* lb = 0 ); protected: - virtual void paint( QPainter* ); + virtual void paint( TQPainter* ); }; -BoldListBoxText::BoldListBoxText( QString text, QListBox* lb ) - : QListBoxText( lb ) +BoldListBoxText::BoldListBoxText( TQString text, TQListBox* lb ) + : TQListBoxText( lb ) { setText( text ); } -void BoldListBoxText::paint( QPainter* painter ) +void BoldListBoxText::paint( TQPainter* painter ) { - QFont f = painter->font(); + TQFont f = painter->font(); f.setBold( TRUE ); painter->setFont( f ); - QListBoxText::paint( painter ); + TQListBoxText::paint( painter ); } -PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, QWidget * parent, +PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); - editPalette = QApplication::palette(); + editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); buttonPixmap->setFormWindow( formWindow ); @@ -193,58 +193,58 @@ void PaletteEditorAdvanced::onToggleBuildEffects( bool on ) buildDisabledEffect(); } -QColorGroup::ColorRole PaletteEditorAdvanced::centralFromItem( int item ) +TQColorGroup::ColorRole PaletteEditorAdvanced::centralFromItem( int item ) { switch( item ) { case 0: - return QColorGroup::Background; + return TQColorGroup::Background; case 1: - return QColorGroup::Foreground; + return TQColorGroup::Foreground; case 2: - return QColorGroup::Button; + return TQColorGroup::Button; case 3: - return QColorGroup::Base; + return TQColorGroup::Base; case 4: - return QColorGroup::Text; + return TQColorGroup::Text; case 5: - return QColorGroup::BrightText; + return TQColorGroup::BrightText; case 6: - return QColorGroup::ButtonText; + return TQColorGroup::ButtonText; case 7: - return QColorGroup::Highlight; + return TQColorGroup::Highlight; case 8: - return QColorGroup::HighlightedText; + return TQColorGroup::HighlightedText; case 9: - return QColorGroup::Link; + return TQColorGroup::Link; case 10: - return QColorGroup::LinkVisited; + return TQColorGroup::LinkVisited; default: - return QColorGroup::NColorRoles; + return TQColorGroup::NColorRoles; } } -QColorGroup::ColorRole PaletteEditorAdvanced::effectFromItem( int item ) +TQColorGroup::ColorRole PaletteEditorAdvanced::effectFromItem( int item ) { switch( item ) { case 0: - return QColorGroup::Light; + return TQColorGroup::Light; case 1: - return QColorGroup::Midlight; + return TQColorGroup::Midlight; case 2: - return QColorGroup::Mid; + return TQColorGroup::Mid; case 3: - return QColorGroup::Dark; + return TQColorGroup::Dark; case 4: - return QColorGroup::Shadow; + return TQColorGroup::Shadow; default: - return QColorGroup::NColorRoles; + return TQColorGroup::NColorRoles; } } void PaletteEditorAdvanced::onCentral( int item ) { - QPixmap* p = 0; - QColor c; + TQPixmap* p = 0; + TQColor c; switch(selectedPalette) { case 0: @@ -267,12 +267,12 @@ void PaletteEditorAdvanced::onCentral( int item ) if (p) buttonPixmap->setPixmap( *p ); else - buttonPixmap->setPixmap( QPixmap() ); + buttonPixmap->setPixmap( TQPixmap() ); } void PaletteEditorAdvanced::onEffect( int item ) { - QColor c; + TQColor c; switch(selectedPalette) { case 0: default: @@ -288,9 +288,9 @@ void PaletteEditorAdvanced::onEffect( int item ) buttonEffect->setColor(c); } -void PaletteEditorAdvanced::mapToActiveCentralRole( const QColor& c ) +void PaletteEditorAdvanced::mapToActiveCentralRole( const TQColor& c ) { - QColorGroup cg = editPalette.active(); + TQColorGroup cg = editPalette.active(); cg.setColor( centralFromItem(comboCentral->currentItem()), c ); editPalette.setActive( cg ); @@ -303,9 +303,9 @@ void PaletteEditorAdvanced::mapToActiveCentralRole( const QColor& c ) setPreviewPalette( editPalette ); } -void PaletteEditorAdvanced::mapToActiveEffectRole( const QColor& c ) +void PaletteEditorAdvanced::mapToActiveEffectRole( const TQColor& c ) { - QColorGroup cg = editPalette.active(); + TQColorGroup cg = editPalette.active(); cg.setColor( effectFromItem(comboEffect->currentItem()), c ); editPalette.setActive( cg ); @@ -317,14 +317,14 @@ void PaletteEditorAdvanced::mapToActiveEffectRole( const QColor& c ) setPreviewPalette( editPalette ); } -void PaletteEditorAdvanced::mapToActivePixmapRole( const QPixmap& pm ) +void PaletteEditorAdvanced::mapToActivePixmapRole( const TQPixmap& pm ) { - QColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem()); - QColorGroup cg = editPalette.active(); + TQColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem()); + TQColorGroup cg = editPalette.active(); if ( !pm.isNull() ) - cg.setBrush( role, QBrush( cg.color( role ), pm ) ); + cg.setBrush( role, TQBrush( cg.color( role ), pm ) ); else - cg.setBrush( role, QBrush( cg.color( role ) ) ); + cg.setBrush( role, TQBrush( cg.color( role ) ) ); editPalette.setActive( cg ); @@ -337,9 +337,9 @@ void PaletteEditorAdvanced::mapToActivePixmapRole( const QPixmap& pm ) setPreviewPalette( editPalette ); } -void PaletteEditorAdvanced::mapToInactiveCentralRole( const QColor& c ) +void PaletteEditorAdvanced::mapToInactiveCentralRole( const TQColor& c ) { - QColorGroup cg = editPalette.inactive(); + TQColorGroup cg = editPalette.inactive(); cg.setColor( centralFromItem(comboCentral->currentItem()), c ); editPalette.setInactive( cg ); @@ -348,31 +348,31 @@ void PaletteEditorAdvanced::mapToInactiveCentralRole( const QColor& c ) setPreviewPalette( editPalette ); } -void PaletteEditorAdvanced::mapToInactiveEffectRole( const QColor& c ) +void PaletteEditorAdvanced::mapToInactiveEffectRole( const TQColor& c ) { - QColorGroup cg = editPalette.inactive(); + TQColorGroup cg = editPalette.inactive(); cg.setColor( effectFromItem(comboEffect->currentItem()), c ); editPalette.setInactive( cg ); setPreviewPalette( editPalette ); } -void PaletteEditorAdvanced::mapToInactivePixmapRole( const QPixmap& pm ) +void PaletteEditorAdvanced::mapToInactivePixmapRole( const TQPixmap& pm ) { - QColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem()); - QColorGroup cg = editPalette.inactive(); + TQColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem()); + TQColorGroup cg = editPalette.inactive(); if ( !pm.isNull() ) - cg.setBrush( role, QBrush( cg.color( role ), pm ) ); + cg.setBrush( role, TQBrush( cg.color( role ), pm ) ); else - cg.setBrush( role, QBrush( cg.color( role ) ) ); + cg.setBrush( role, TQBrush( cg.color( role ) ) ); editPalette.setInactive( cg ); setPreviewPalette( editPalette ); } -void PaletteEditorAdvanced::mapToDisabledCentralRole( const QColor& c ) +void PaletteEditorAdvanced::mapToDisabledCentralRole( const TQColor& c ) { - QColorGroup cg = editPalette.disabled(); + TQColorGroup cg = editPalette.disabled(); cg.setColor( centralFromItem(comboCentral->currentItem()), c ); editPalette.setDisabled( cg ); @@ -381,23 +381,23 @@ void PaletteEditorAdvanced::mapToDisabledCentralRole( const QColor& c ) setPreviewPalette( editPalette ); } -void PaletteEditorAdvanced::mapToDisabledEffectRole( const QColor& c ) +void PaletteEditorAdvanced::mapToDisabledEffectRole( const TQColor& c ) { - QColorGroup cg = editPalette.disabled(); + TQColorGroup cg = editPalette.disabled(); cg.setColor( effectFromItem(comboEffect->currentItem()), c ); editPalette.setDisabled( cg ); setPreviewPalette( editPalette ); } -void PaletteEditorAdvanced::mapToDisabledPixmapRole( const QPixmap& pm ) +void PaletteEditorAdvanced::mapToDisabledPixmapRole( const TQPixmap& pm ) { - QColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem()); - QColorGroup cg = editPalette.disabled(); + TQColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem()); + TQColorGroup cg = editPalette.disabled(); if ( !pm.isNull() ) - cg.setBrush( role, QBrush( cg.color( role ), pm ) ); + cg.setBrush( role, TQBrush( cg.color( role ), pm ) ); else - cg.setBrush( role, QBrush( cg.color( role ) ) ); + cg.setBrush( role, TQBrush( cg.color( role ) ) ); editPalette.setDisabled( cg ); @@ -406,10 +406,10 @@ void PaletteEditorAdvanced::mapToDisabledPixmapRole( const QPixmap& pm ) void PaletteEditorAdvanced::buildActiveEffect() { - QColorGroup cg = editPalette.active(); - QColor btn = cg.color( QColorGroup::Button ); + TQColorGroup cg = editPalette.active(); + TQColor btn = cg.color( TQColorGroup::Button ); - QPalette temp( btn, btn ); + TQPalette temp( btn, btn ); for (int i = 0; i<5; i++) cg.setColor( effectFromItem(i), temp.active().color( effectFromItem(i) ) ); @@ -428,10 +428,10 @@ void PaletteEditorAdvanced::buildInactive() void PaletteEditorAdvanced::buildInactiveEffect() { - QColorGroup cg = editPalette.inactive(); + TQColorGroup cg = editPalette.inactive(); - QColor light, midlight, mid, dark, shadow; - QColor btn = cg.color( QColorGroup::Button ); + TQColor light, midlight, mid, dark, shadow; + TQColor btn = cg.color( TQColorGroup::Button ); light = btn.light(150); midlight = btn.light(115); @@ -439,11 +439,11 @@ void PaletteEditorAdvanced::buildInactiveEffect() dark = btn.dark(); shadow = black; - cg.setColor( QColorGroup::Light, light ); - cg.setColor( QColorGroup::Midlight, midlight ); - cg.setColor( QColorGroup::Mid, mid ); - cg.setColor( QColorGroup::Dark, dark ); - cg.setColor( QColorGroup::Shadow, shadow ); + cg.setColor( TQColorGroup::Light, light ); + cg.setColor( TQColorGroup::Midlight, midlight ); + cg.setColor( TQColorGroup::Mid, mid ); + cg.setColor( TQColorGroup::Dark, dark ); + cg.setColor( TQColorGroup::Shadow, shadow ); editPalette.setInactive( cg ); setPreviewPalette( editPalette ); @@ -452,9 +452,9 @@ void PaletteEditorAdvanced::buildInactiveEffect() void PaletteEditorAdvanced::buildDisabled() { - QColorGroup cg = editPalette.active(); - cg.setColor( QColorGroup::ButtonText, darkGray ); - cg.setColor( QColorGroup::Foreground, darkGray ); + TQColorGroup cg = editPalette.active(); + cg.setColor( TQColorGroup::ButtonText, darkGray ); + cg.setColor( TQColorGroup::Foreground, darkGray ); editPalette.setDisabled( cg ); buildDisabledEffect(); @@ -462,10 +462,10 @@ void PaletteEditorAdvanced::buildDisabled() void PaletteEditorAdvanced::buildDisabledEffect() { - QColorGroup cg = editPalette.disabled(); + TQColorGroup cg = editPalette.disabled(); - QColor light, midlight, mid, dark, shadow; - QColor btn = cg.color( QColorGroup::Button ); + TQColor light, midlight, mid, dark, shadow; + TQColor btn = cg.color( TQColorGroup::Button ); light = btn.light(150); midlight = btn.light(115); @@ -473,20 +473,20 @@ void PaletteEditorAdvanced::buildDisabledEffect() dark = btn.dark(); shadow = black; - cg.setColor( QColorGroup::Light, light ); - cg.setColor( QColorGroup::Midlight, midlight ); - cg.setColor( QColorGroup::Mid, mid ); - cg.setColor( QColorGroup::Dark, dark ); - cg.setColor( QColorGroup::Shadow, shadow ); + cg.setColor( TQColorGroup::Light, light ); + cg.setColor( TQColorGroup::Midlight, midlight ); + cg.setColor( TQColorGroup::Mid, mid ); + cg.setColor( TQColorGroup::Dark, dark ); + cg.setColor( TQColorGroup::Shadow, shadow ); editPalette.setDisabled( cg ); setPreviewPalette( editPalette ); updateStyledButtons(); } -void PaletteEditorAdvanced::setPreviewPalette( const QPalette& pal ) +void PaletteEditorAdvanced::setPreviewPalette( const TQPalette& pal ) { - QColorGroup cg; + TQColorGroup cg; switch (selectedPalette) { case 0: @@ -507,8 +507,8 @@ void PaletteEditorAdvanced::setPreviewPalette( const QPalette& pal ) void PaletteEditorAdvanced::updateStyledButtons() { - QColor central, effect; - QPixmap *pm = 0; + TQColor central, effect; + TQPixmap *pm = 0; switch (selectedPalette) { case 0: default: @@ -533,17 +533,17 @@ void PaletteEditorAdvanced::updateStyledButtons() if ( pm && !pm->isNull() ) buttonPixmap->setPixmap( *pm ); else - buttonPixmap->setPixmap(QPixmap()); + buttonPixmap->setPixmap(TQPixmap()); } -void PaletteEditorAdvanced::setPal( const QPalette& pal ) +void PaletteEditorAdvanced::setPal( const TQPalette& pal ) { editPalette = pal; setPreviewPalette( pal ); updateStyledButtons(); } -QPalette PaletteEditorAdvanced::pal() const +TQPalette PaletteEditorAdvanced::pal() const { return editPalette; } @@ -605,32 +605,32 @@ void PaletteEditorAdvanced::setupBackgroundMode( BackgroundMode mode ) if (initRole > 8 ) { comboEffect->setCurrentItem( initRole - 9 ); if ( comboEffect->listBox() ) { - QString text = comboEffect->currentText(); + TQString text = comboEffect->currentText(); comboEffect->listBox()->changeItem( new BoldListBoxText( text ), initRole - 9 ); } } else { comboCentral->setCurrentItem( initRole ); if ( comboCentral->listBox() ) { - QString text = comboCentral->currentText(); + TQString text = comboCentral->currentText(); comboCentral->listBox()->changeItem( new BoldListBoxText( text ), initRole ); } } } -QPalette PaletteEditorAdvanced::getPalette( bool *ok, const QPalette &init, - BackgroundMode mode, QWidget* parent, +TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, + BackgroundMode mode, TQWidget* parent, const char* name, FormWindow *fw ) { PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, TRUE ); dlg->setupBackgroundMode( mode ); - if ( init != QPalette() ) + if ( init != TQPalette() ) dlg->setPal( init ); int resultCode = dlg->exec(); - QPalette result = init; - if ( resultCode == QDialog::Accepted ) { + TQPalette result = init; + if ( resultCode == TQDialog::Accepted ) { if ( ok ) *ok = TRUE; result = dlg->pal(); diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.h b/kdevdesigner/designer/paletteeditoradvancedimpl.h index 4f7076df..1794d91f 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.h +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.h @@ -35,12 +35,12 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase { Q_OBJECT public: - PaletteEditorAdvanced( FormWindow *fw, QWidget * parent=0, const char * name=0, + PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditorAdvanced(); - static QPalette getPalette( bool *ok, const QPalette &pal, BackgroundMode mode = PaletteBackground, - QWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); + static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground, + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected slots: void paletteSelected(int); @@ -57,15 +57,15 @@ protected slots: void onToggleBuildDisabled( bool ); protected: - void mapToActiveCentralRole( const QColor& ); - void mapToActiveEffectRole( const QColor& ); - void mapToActivePixmapRole( const QPixmap& ); - void mapToInactiveCentralRole( const QColor& ); - void mapToInactiveEffectRole( const QColor& ); - void mapToInactivePixmapRole( const QPixmap& ); - void mapToDisabledCentralRole( const QColor& ); - void mapToDisabledEffectRole( const QColor& ); - void mapToDisabledPixmapRole( const QPixmap& ); + void mapToActiveCentralRole( const TQColor& ); + void mapToActiveEffectRole( const TQColor& ); + void mapToActivePixmapRole( const TQPixmap& ); + void mapToInactiveCentralRole( const TQColor& ); + void mapToInactiveEffectRole( const TQColor& ); + void mapToInactivePixmapRole( const TQPixmap& ); + void mapToDisabledCentralRole( const TQColor& ); + void mapToDisabledEffectRole( const TQColor& ); + void mapToDisabledPixmapRole( const TQPixmap& ); void buildPalette(); @@ -76,17 +76,17 @@ protected: void buildDisabledEffect(); private: - void setPreviewPalette( const QPalette& ); + void setPreviewPalette( const TQPalette& ); void updateStyledButtons(); void setupBackgroundMode( BackgroundMode ); - QPalette pal() const; - void setPal( const QPalette& ); + TQPalette pal() const; + void setPal( const TQPalette& ); - QColorGroup::ColorRole centralFromItem( int ); - QColorGroup::ColorRole effectFromItem( int ); - QPalette editPalette; - QPalette previewPalette; + TQColorGroup::ColorRole centralFromItem( int ); + TQColorGroup::ColorRole effectFromItem( int ); + TQPalette editPalette; + TQPalette previewPalette; FormWindow *formWindow; diff --git a/kdevdesigner/designer/paletteeditorimpl.cpp b/kdevdesigner/designer/paletteeditorimpl.cpp index 56e6fd2f..a6489370 100644 --- a/kdevdesigner/designer/paletteeditorimpl.cpp +++ b/kdevdesigner/designer/paletteeditorimpl.cpp @@ -31,21 +31,21 @@ #include "mainwindow.h" #include "formwindow.h" -#include -#include -#include -#include +#include +#include +#include +#include -PaletteEditor::PaletteEditor( FormWindow *fw, QWidget * parent, const char * name, bool modal, WFlags f ) +PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); - editPalette = QApplication::palette(); + editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); - buttonMainColor->setColor( editPalette.active().color( QColorGroup::Button ) ); - buttonMainColor2->setColor( editPalette.active().color( QColorGroup::Background ) ); + buttonMainColor->setColor( editPalette.active().color( TQColorGroup::Button ) ); + buttonMainColor2->setColor( editPalette.active().color( TQColorGroup::Background ) ); } PaletteEditor::~PaletteEditor() @@ -55,7 +55,7 @@ PaletteEditor::~PaletteEditor() void PaletteEditor::onTune() { bool ok; - QPalette pal = PaletteEditorAdvanced::getPalette( &ok, editPalette, backgroundMode, this, "tune_palette", formWindow); + TQPalette pal = PaletteEditorAdvanced::getPalette( &ok, editPalette, backgroundMode, this, "tune_palette", formWindow); if (!ok) return; editPalette = pal; @@ -77,59 +77,59 @@ void PaletteEditor::paletteSelected(int) setPreviewPalette(editPalette); } -QColorGroup::ColorRole PaletteEditor::centralFromItem( int item ) +TQColorGroup::ColorRole PaletteEditor::centralFromItem( int item ) { switch( item ) { case 0: - return QColorGroup::Background; + return TQColorGroup::Background; case 1: - return QColorGroup::Foreground; + return TQColorGroup::Foreground; case 2: - return QColorGroup::Button; + return TQColorGroup::Button; case 3: - return QColorGroup::Base; + return TQColorGroup::Base; case 4: - return QColorGroup::Text; + return TQColorGroup::Text; case 5: - return QColorGroup::BrightText; + return TQColorGroup::BrightText; case 6: - return QColorGroup::ButtonText; + return TQColorGroup::ButtonText; case 7: - return QColorGroup::Highlight; + return TQColorGroup::Highlight; case 8: - return QColorGroup::HighlightedText; + return TQColorGroup::HighlightedText; default: - return QColorGroup::NColorRoles; + return TQColorGroup::NColorRoles; } } -QColorGroup::ColorRole PaletteEditor::effectFromItem( int item ) +TQColorGroup::ColorRole PaletteEditor::effectFromItem( int item ) { switch( item ) { case 0: - return QColorGroup::Light; + return TQColorGroup::Light; case 1: - return QColorGroup::Midlight; + return TQColorGroup::Midlight; case 2: - return QColorGroup::Mid; + return TQColorGroup::Mid; case 3: - return QColorGroup::Dark; + return TQColorGroup::Dark; case 4: - return QColorGroup::Shadow; + return TQColorGroup::Shadow; default: - return QColorGroup::NColorRoles; + return TQColorGroup::NColorRoles; } } void PaletteEditor::buildPalette() { int i; - QColorGroup cg; - QColor btn = buttonMainColor->color(); - QColor back = buttonMainColor2->color(); - QPalette automake( btn, back ); + TQColorGroup cg; + TQColor btn = buttonMainColor->color(); + TQColor back = buttonMainColor2->color(); + TQPalette automake( btn, back ); for (i = 0; i<9; i++) cg.setColor( centralFromItem(i), automake.active().color( centralFromItem(i) ) ); @@ -139,8 +139,8 @@ void PaletteEditor::buildPalette() cg = editPalette.inactive(); - QPalette temp( editPalette.active().color( QColorGroup::Button ), - editPalette.active().color( QColorGroup::Background ) ); + TQPalette temp( editPalette.active().color( TQColorGroup::Button ), + editPalette.active().color( TQColorGroup::Background ) ); for (i = 0; i<9; i++) cg.setColor( centralFromItem(i), temp.inactive().color( centralFromItem(i) ) ); @@ -161,10 +161,10 @@ void PaletteEditor::buildPalette() void PaletteEditor::buildActiveEffect() { - QColorGroup cg = editPalette.active(); - QColor btn = cg.color( QColorGroup::Button ); + TQColorGroup cg = editPalette.active(); + TQColor btn = cg.color( TQColorGroup::Button ); - QPalette temp( btn, btn ); + TQPalette temp( btn, btn ); for (int i = 0; i<5; i++) cg.setColor( effectFromItem(i), temp.active().color( effectFromItem(i) ) ); @@ -183,10 +183,10 @@ void PaletteEditor::buildInactive() void PaletteEditor::buildInactiveEffect() { - QColorGroup cg = editPalette.inactive(); + TQColorGroup cg = editPalette.inactive(); - QColor light, midlight, mid, dark, shadow; - QColor btn = cg.color( QColorGroup::Button ); + TQColor light, midlight, mid, dark, shadow; + TQColor btn = cg.color( TQColorGroup::Button ); light = btn.light(150); midlight = btn.light(115); @@ -194,11 +194,11 @@ void PaletteEditor::buildInactiveEffect() dark = btn.dark(); shadow = black; - cg.setColor( QColorGroup::Light, light ); - cg.setColor( QColorGroup::Midlight, midlight ); - cg.setColor( QColorGroup::Mid, mid ); - cg.setColor( QColorGroup::Dark, dark ); - cg.setColor( QColorGroup::Shadow, shadow ); + cg.setColor( TQColorGroup::Light, light ); + cg.setColor( TQColorGroup::Midlight, midlight ); + cg.setColor( TQColorGroup::Mid, mid ); + cg.setColor( TQColorGroup::Dark, dark ); + cg.setColor( TQColorGroup::Shadow, shadow ); editPalette.setInactive( cg ); setPreviewPalette( editPalette ); @@ -207,9 +207,9 @@ void PaletteEditor::buildInactiveEffect() void PaletteEditor::buildDisabled() { - QColorGroup cg = editPalette.active(); - cg.setColor( QColorGroup::ButtonText, darkGray ); - cg.setColor( QColorGroup::Foreground, darkGray ); + TQColorGroup cg = editPalette.active(); + cg.setColor( TQColorGroup::ButtonText, darkGray ); + cg.setColor( TQColorGroup::Foreground, darkGray ); editPalette.setDisabled( cg ); buildDisabledEffect(); @@ -217,10 +217,10 @@ void PaletteEditor::buildDisabled() void PaletteEditor::buildDisabledEffect() { - QColorGroup cg = editPalette.disabled(); + TQColorGroup cg = editPalette.disabled(); - QColor light, midlight, mid, dark, shadow; - QColor btn = cg.color( QColorGroup::Button ); + TQColor light, midlight, mid, dark, shadow; + TQColor btn = cg.color( TQColorGroup::Button ); light = btn.light(150); midlight = btn.light(115); @@ -228,20 +228,20 @@ void PaletteEditor::buildDisabledEffect() dark = btn.dark(); shadow = black; - cg.setColor( QColorGroup::Light, light ); - cg.setColor( QColorGroup::Midlight, midlight ); - cg.setColor( QColorGroup::Mid, mid ); - cg.setColor( QColorGroup::Dark, dark ); - cg.setColor( QColorGroup::Shadow, shadow ); + cg.setColor( TQColorGroup::Light, light ); + cg.setColor( TQColorGroup::Midlight, midlight ); + cg.setColor( TQColorGroup::Mid, mid ); + cg.setColor( TQColorGroup::Dark, dark ); + cg.setColor( TQColorGroup::Shadow, shadow ); editPalette.setDisabled( cg ); setPreviewPalette( editPalette ); updateStyledButtons(); } -void PaletteEditor::setPreviewPalette( const QPalette& pal ) +void PaletteEditor::setPreviewPalette( const TQPalette& pal ) { - QColorGroup cg; + TQColorGroup cg; switch (paletteCombo->currentItem()) { case 0: @@ -264,34 +264,34 @@ void PaletteEditor::setPreviewPalette( const QPalette& pal ) void PaletteEditor::updateStyledButtons() { - buttonMainColor->setColor( editPalette.active().color( QColorGroup::Button )); - buttonMainColor2->setColor( editPalette.active().color( QColorGroup::Background )); + buttonMainColor->setColor( editPalette.active().color( TQColorGroup::Button )); + buttonMainColor2->setColor( editPalette.active().color( TQColorGroup::Background )); } -void PaletteEditor::setPal( const QPalette& pal ) +void PaletteEditor::setPal( const TQPalette& pal ) { editPalette = pal; setPreviewPalette( pal ); updateStyledButtons(); } -QPalette PaletteEditor::pal() const +TQPalette PaletteEditor::pal() const { return editPalette; } -QPalette PaletteEditor::getPalette( bool *ok, const QPalette &init, BackgroundMode mode, - QWidget* parent, const char* name, FormWindow *fw ) +TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, BackgroundMode mode, + TQWidget* parent, const char* name, FormWindow *fw ) { PaletteEditor* dlg = new PaletteEditor( fw, parent, name, TRUE ); dlg->setupBackgroundMode( mode ); - if ( init != QPalette() ) + if ( init != TQPalette() ) dlg->setPal( init ); int resultCode = dlg->exec(); - QPalette result = init; - if ( resultCode == QDialog::Accepted ) { + TQPalette result = init; + if ( resultCode == TQDialog::Accepted ) { if ( ok ) *ok = TRUE; result = dlg->pal(); diff --git a/kdevdesigner/designer/paletteeditorimpl.h b/kdevdesigner/designer/paletteeditorimpl.h index fc3ee231..ed911faa 100644 --- a/kdevdesigner/designer/paletteeditorimpl.h +++ b/kdevdesigner/designer/paletteeditorimpl.h @@ -36,11 +36,11 @@ class PaletteEditor : public PaletteEditorBase Q_OBJECT public: - PaletteEditor( FormWindow *fw, QWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); + PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditor(); - static QPalette getPalette( bool *ok, const QPalette &pal, BackgroundMode mode = PaletteBackground, - QWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); + static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground, + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected slots: void onChooseMainColor(); @@ -57,17 +57,17 @@ protected: void buildDisabledEffect(); private: - void setPreviewPalette( const QPalette& ); + void setPreviewPalette( const TQPalette& ); void updateStyledButtons(); void setupBackgroundMode( BackgroundMode mode ) { backgroundMode = mode; } - QPalette pal() const; - void setPal( const QPalette& ); + TQPalette pal() const; + void setPal( const TQPalette& ); - QColorGroup::ColorRole centralFromItem( int ); - QColorGroup::ColorRole effectFromItem( int ); - QPalette editPalette; - QPalette previewPalette; + TQColorGroup::ColorRole centralFromItem( int ); + TQColorGroup::ColorRole effectFromItem( int ); + TQPalette editPalette; + TQPalette previewPalette; FormWindow *formWindow; BackgroundMode backgroundMode; diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index aaac22c0..28912c62 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include // HP-UX compiler needs this here #include #include @@ -45,41 +45,41 @@ #include "pixmapcollection.h" #include "project.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #if defined(DESIGNER) static ImageIconProvider *imageIconProvider = 0; #endif -PixmapView::PixmapView( QWidget *parent ) - : QScrollView( parent ) +PixmapView::PixmapView( TQWidget *parent ) + : TQScrollView( parent ) { viewport()->setBackgroundMode( PaletteBase ); } -void PixmapView::setPixmap( const QPixmap &pix ) +void PixmapView::setPixmap( const TQPixmap &pix ) { pixmap = pix; resizeContents( pixmap.size().width(), pixmap.size().height() ); viewport()->repaint( FALSE ); } -void PixmapView::drawContents( QPainter *p, int cx, int cy, int cw, int ch ) +void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch ) { - p->fillRect( cx, cy, cw, ch, colorGroup().brush( QColorGroup::Base ) ); + p->fillRect( cx, cy, cw, ch, colorGroup().brush( TQColorGroup::Base ) ); p->drawPixmap( 0, 0, pixmap ); } -void PixmapView::previewUrl( const QUrl &u ) +void PixmapView::previewUrl( const TQUrl &u ) { if ( u.isLocalFile() ) { - QString path = u.path(); - QPixmap pix( path ); + TQString path = u.path(); + TQPixmap pix( path ); if ( !pix.isNull() ) setPixmap( pix ); } else { @@ -87,12 +87,12 @@ void PixmapView::previewUrl( const QUrl &u ) } } -static void buildImageFormatList( QString &filter, QString &all ) +static void buildImageFormatList( TQString &filter, TQString &all ) { all = qApp->translate( "qChoosePixmap", "All Pixmaps (" ); - for ( uint i = 0; i < QImageIO::outputFormats().count(); i++ ) { - QString outputFormat = QImageIO::outputFormats().at( i ); - QString outputExtension; + for ( uint i = 0; i < TQImageIO::outputFormats().count(); i++ ) { + TQString outputFormat = TQImageIO::outputFormats().at( i ); + TQString outputExtension; if ( outputFormat != "JPEG" ) outputExtension = outputFormat.lower(); else @@ -105,28 +105,28 @@ static void buildImageFormatList( QString &filter, QString &all ) filter += qApp->translate( "qChoosePixmap", "All Files (*)" ); } -QStringList qChoosePixmaps( QWidget *parent ) +TQStringList qChoosePixmaps( TQWidget *parent ) { -/* if ( !imageIconProvider && !QFileDialog::iconProvider() ) - QFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) ); +/* if ( !imageIconProvider && !TQFileDialog::iconProvider() ) + TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) ); - QString filter; - QString all; + TQString filter; + TQString all; buildImageFormatList( filter, all ); - QFileDialog fd( QString::null, filter, parent, 0, TRUE ); - fd.setMode( QFileDialog::ExistingFiles ); + TQFileDialog fd( TQString::null, filter, parent, 0, TRUE ); + fd.setMode( TQFileDialog::ExistingFiles ); fd.setContentsPreviewEnabled( TRUE ); PixmapView *pw = new PixmapView( &fd ); fd.setContentsPreview( pw, pw ); - fd.setViewMode( QFileDialog::List ); - fd.setPreviewMode( QFileDialog::Contents ); + fd.setViewMode( TQFileDialog::List ); + fd.setPreviewMode( TQFileDialog::Contents ); fd.setCaption( qApp->translate( "qChoosePixmap", "Choose Images..." ) ); - if ( fd.exec() == QDialog::Accepted ) + if ( fd.exec() == TQDialog::Accepted ) return fd.selectedFiles(); - return QStringList();*/ - QStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading ); - KFileDialog dlg(QString::null, mimetypes.join(" "), parent, "filedialog", true); + return TQStringList();*/ + TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading ); + KFileDialog dlg(TQString::null, mimetypes.join(" "), parent, "filedialog", true); dlg.setOperationMode( KFileDialog::Opening ); dlg.setCaption( qApp->translate( "qChoosePixmap", "Choose Images..." ) ); dlg.setMode( KFile::Files ); @@ -134,36 +134,36 @@ QStringList qChoosePixmaps( QWidget *parent ) dlg.setPreviewWidget( ip ); if (dlg.exec()) return dlg.selectedFiles(); - return QStringList(); + return TQStringList(); } -QPixmap qChoosePixmap( QWidget *parent, FormWindow *fw, const QPixmap &old, QString *fn ) +TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, TQString *fn ) { #if defined(DESIGNER) if ( !fw || fw->savePixmapInline() ) { -/* if ( !imageIconProvider && !QFileDialog::iconProvider() ) - QFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) ); +/* if ( !imageIconProvider && !TQFileDialog::iconProvider() ) + TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) ); - QString filter; - QString all; + TQString filter; + TQString all; buildImageFormatList( filter, all ); - QFileDialog fd( QString::null, filter, parent, 0, TRUE ); + TQFileDialog fd( TQString::null, filter, parent, 0, TRUE ); fd.setContentsPreviewEnabled( TRUE ); PixmapView *pw = new PixmapView( &fd ); fd.setContentsPreview( pw, pw ); - fd.setViewMode( QFileDialog::List ); - fd.setPreviewMode( QFileDialog::Contents ); + fd.setViewMode( TQFileDialog::List ); + fd.setPreviewMode( TQFileDialog::Contents ); fd.setCaption( qApp->translate( "qChoosePixmap", "Choose Pixmap" ) ); - if ( fd.exec() == QDialog::Accepted ) { - QPixmap pix( fd.selectedFile() ); + if ( fd.exec() == TQDialog::Accepted ) { + TQPixmap pix( fd.selectedFile() ); if ( fn ) *fn = fd.selectedFile(); MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), fd.selectedFile() ); return pix; }*/ - QStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading ); - KFileDialog dlg(QString::null, mimetypes.join(" "), parent, "filedialog", true); + TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading ); + KFileDialog dlg(TQString::null, mimetypes.join(" "), parent, "filedialog", true); dlg.setOperationMode( KFileDialog::Opening ); dlg.setCaption( qApp->translate( "qChoosePixmap", "Choose Pixmap" ) ); dlg.setMode( KFile::File ); @@ -171,7 +171,7 @@ QPixmap qChoosePixmap( QWidget *parent, FormWindow *fw, const QPixmap &old, QStr dlg.setPreviewWidget( ip ); if (dlg.exec()) { - QPixmap pix( dlg.selectedURL().path() ); + TQPixmap pix( dlg.selectedURL().path() ); if ( fn ) *fn = dlg.selectedURL().path(); MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dlg.selectedURL().path() ); @@ -182,19 +182,19 @@ QPixmap qChoosePixmap( QWidget *parent, FormWindow *fw, const QPixmap &old, QStr dia.setProject( fw->project() ); dia.setChooserMode( TRUE ); dia.setCurrentItem( MetaDataBase::pixmapKey( fw, old.serialNumber() ) ); - if ( dia.exec() == QDialog::Accepted ) { - QPixmap pix( fw->project()->pixmapCollection()->pixmap( dia.viewPixmaps->currentItem()->text() ) ); + if ( dia.exec() == TQDialog::Accepted ) { + TQPixmap pix( fw->project()->pixmapCollection()->pixmap( dia.viewPixmaps->currentItem()->text() ) ); MetaDataBase::setPixmapKey( fw, pix.serialNumber(), dia.viewPixmaps->currentItem()->text() ); return pix; } } else { PixmapFunction dia( parent, 0, TRUE ); - QObject::connect( dia.helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); - if ( dia.exec() == QDialog::Accepted ) { - QPixmap pix; + if ( dia.exec() == TQDialog::Accepted ) { + TQPixmap pix; // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that pix.convertFromImage( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ).convertToImage() ); @@ -207,25 +207,25 @@ QPixmap qChoosePixmap( QWidget *parent, FormWindow *fw, const QPixmap &old, QStr Q_UNUSED( fw ); Q_UNUSED( old ); #endif - return QPixmap(); + return TQPixmap(); } -ImageIconProvider::ImageIconProvider( QWidget *parent, const char *name ) - : QFileIconProvider( parent, name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) ) +ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) + : TQFileIconProvider( parent, name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) ) { - fmts = QImage::inputFormats(); + fmts = TQImage::inputFormats(); } ImageIconProvider::~ImageIconProvider() { } -const QPixmap * ImageIconProvider::pixmap( const QFileInfo &fi ) +const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi ) { - QString ext = fi.extension().upper(); + TQString ext = fi.extension().upper(); if ( fmts.contains( ext ) ) { return &imagepm; } else { - return QFileIconProvider::pixmap( fi ); + return TQFileIconProvider::pixmap( fi ); } } diff --git a/kdevdesigner/designer/pixmapchooser.h b/kdevdesigner/designer/pixmapchooser.h index cea45bfd..a03c6878 100644 --- a/kdevdesigner/designer/pixmapchooser.h +++ b/kdevdesigner/designer/pixmapchooser.h @@ -27,26 +27,26 @@ #ifndef PIXMAPCHOOSER_H #define PIXMAPCHOOSER_H -#include -#include -#include -#include +#include +#include +#include +#include class FormWindow; -class PixmapView : public QScrollView, +class PixmapView : public TQScrollView, public QFilePreview { Q_OBJECT public: - PixmapView( QWidget *parent ); - void setPixmap( const QPixmap &pix ); - void drawContents( QPainter *p, int, int, int, int ); - void previewUrl( const QUrl &u ); + PixmapView( TQWidget *parent ); + void setPixmap( const TQPixmap &pix ); + void drawContents( TQPainter *p, int, int, int, int ); + void previewUrl( const TQUrl &u ); private: - QPixmap pixmap; + TQPixmap pixmap; }; @@ -55,18 +55,18 @@ class ImageIconProvider : public QFileIconProvider Q_OBJECT public: - ImageIconProvider( QWidget *parent = 0, const char *name = 0 ); + ImageIconProvider( TQWidget *parent = 0, const char *name = 0 ); ~ImageIconProvider(); - const QPixmap *pixmap( const QFileInfo &fi ); + const TQPixmap *pixmap( const TQFileInfo &fi ); private: - QStrList fmts; - QPixmap imagepm; + TQStrList fmts; + TQPixmap imagepm; }; -QPixmap qChoosePixmap( QWidget *parent, FormWindow *fw = 0, const QPixmap &old = QPixmap(), QString *fn = 0 ); -QStringList qChoosePixmaps( QWidget *parent ); +TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 ); +TQStringList qChoosePixmaps( TQWidget *parent ); #endif diff --git a/kdevdesigner/designer/pixmapcollection.cpp b/kdevdesigner/designer/pixmapcollection.cpp index c8b14ffa..d0692de1 100644 --- a/kdevdesigner/designer/pixmapcollection.cpp +++ b/kdevdesigner/designer/pixmapcollection.cpp @@ -27,17 +27,17 @@ #include "pixmapcollection.h" #include "project.h" #include "mainwindow.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include PixmapCollection::PixmapCollection( Project *pro ) : project( pro ) { iface = new DesignerPixmapCollectionImpl( this ); - mimeSourceFactory = new QMimeSourceFactory(); + mimeSourceFactory = new TQMimeSourceFactory(); } PixmapCollection::~PixmapCollection() @@ -52,7 +52,7 @@ bool PixmapCollection::addPixmap( const Pixmap &pix, bool force ) savePixmap( pixmap ); if ( !force ) { - for ( QValueList::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { + for ( TQValueList::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { if ( (*it).name == pixmap.name ) return FALSE; } @@ -64,9 +64,9 @@ bool PixmapCollection::addPixmap( const Pixmap &pix, bool force ) return TRUE; } -void PixmapCollection::removePixmap( const QString &name ) +void PixmapCollection::removePixmap( const TQString &name ) { - for ( QValueList::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { + for ( TQValueList::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { if ( (*it).name == name ) { pixList.remove( it ); break; @@ -75,24 +75,24 @@ void PixmapCollection::removePixmap( const QString &name ) project->setModified( TRUE ); } -QValueList PixmapCollection::pixmaps() const +TQValueList PixmapCollection::pixmaps() const { return pixList; } -QString PixmapCollection::unifyName( const QString &n ) +TQString PixmapCollection::unifyName( const TQString &n ) { - QString name = n; + TQString name = n; bool restart = FALSE; int added = 1; - for ( QValueList::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { + for ( TQValueList::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { if ( restart ) it = pixList.begin(); restart = FALSE; if ( name == (*it).name ) { name = n; - name += "_" + QString::number( added ); + name += "_" + TQString::number( added ); ++added; restart = TRUE; } @@ -104,28 +104,28 @@ QString PixmapCollection::unifyName( const QString &n ) void PixmapCollection::setActive( bool b ) { if ( b ) - QMimeSourceFactory::defaultFactory()->addFactory( mimeSourceFactory ); + TQMimeSourceFactory::defaultFactory()->addFactory( mimeSourceFactory ); else - QMimeSourceFactory::defaultFactory()->removeFactory( mimeSourceFactory ); + TQMimeSourceFactory::defaultFactory()->removeFactory( mimeSourceFactory ); } -QPixmap PixmapCollection::pixmap( const QString &name ) +TQPixmap PixmapCollection::pixmap( const TQString &name ) { - for ( QValueList::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { + for ( TQValueList::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { if ( (*it).name == name ) return (*it).pix; } - return QPixmap(); + return TQPixmap(); } void PixmapCollection::savePixmap( Pixmap &pix ) { if ( pix.absname == imageDir() + "/" + pix.name ) return; // no need to save, it is already there - QString rel = project->makeRelative( pix.absname ); + TQString rel = project->makeRelative( pix.absname ); if ( rel[0] == '/' || ( rel[1] == ':' && rel[2] == '/' ) ) { // only save if file is outside the project mkdir(); - pix.name = unifyName( QFileInfo( pix.absname ).baseName() ) + ".png"; + pix.name = unifyName( TQFileInfo( pix.absname ).baseName() ) + ".png"; pix.absname = imageDir() + "/" + pix.name; pix.pix.save( pix.absname, "PNG" ); } else if ( rel.isEmpty() ) { @@ -136,34 +136,34 @@ void PixmapCollection::savePixmap( Pixmap &pix ) } } -QString PixmapCollection::imageDir() const +TQString PixmapCollection::imageDir() const { - return QFileInfo( project->fileName() ).dirPath( TRUE ) + "/images"; + return TQFileInfo( project->fileName() ).dirPath( TRUE ) + "/images"; } void PixmapCollection::mkdir() { - QString f = project->fileName(); - QDir d( QFileInfo( f ).dirPath( TRUE ) ); + TQString f = project->fileName(); + TQDir d( TQFileInfo( f ).dirPath( TRUE ) ); d.mkdir( "images" ); } -void PixmapCollection::load( const QString& filename ) +void PixmapCollection::load( const TQString& filename ) { if ( filename.isEmpty() ) return; - QString absfile; + TQString absfile; if ( filename[0] == '/' ) absfile = filename; else - absfile = QFileInfo( project->fileName() ).dirPath( TRUE ) + "/" + filename; + absfile = TQFileInfo( project->fileName() ).dirPath( TRUE ) + "/" + filename; - QPixmap pm( absfile ); + TQPixmap pm( absfile ); if ( pm.isNull() ) return; Pixmap pix; - pix.name = QFileInfo( absfile ).fileName(); + pix.name = TQFileInfo( absfile ).fileName(); pix.absname = absfile; pix.pix = pm; addPixmap( pix, TRUE ); diff --git a/kdevdesigner/designer/pixmapcollection.h b/kdevdesigner/designer/pixmapcollection.h index ed36ecb8..6993c146 100644 --- a/kdevdesigner/designer/pixmapcollection.h +++ b/kdevdesigner/designer/pixmapcollection.h @@ -27,9 +27,9 @@ #ifndef PIXMAPCOLLECTION_H #define PIXMAPCOLLECTION_H -#include -#include -#include +#include +#include +#include #include "designerappiface.h" class QMimeSourceFactory; @@ -40,9 +40,9 @@ class PixmapCollection public: struct Pixmap { - QPixmap pix; - QString name; - QString absname; + TQPixmap pix; + TQString name; + TQString absname; Q_DUMMY_COMPARISON_OPERATOR( Pixmap ) }; @@ -50,28 +50,28 @@ public: ~PixmapCollection(); bool addPixmap( const Pixmap &pix, bool force = TRUE ); - void removePixmap( const QString &name ); - QPixmap pixmap( const QString &name ); + void removePixmap( const TQString &name ); + TQPixmap pixmap( const TQString &name ); - QValueList pixmaps() const; + TQValueList pixmaps() const; bool isEmpty() const; void setActive( bool b ); - void load( const QString& filename ); + void load( const TQString& filename ); DesignerPixmapCollection *iFace(); private: - QString unifyName( const QString &n ); + TQString unifyName( const TQString &n ); void savePixmap( Pixmap &pix ); - QString imageDir() const; + TQString imageDir() const; void mkdir(); private: - QValueList pixList; - QMimeSourceFactory *mimeSourceFactory; + TQValueList pixList; + TQMimeSourceFactory *mimeSourceFactory; Project *project; DesignerPixmapCollectionImpl *iface; diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h index 4d82f3f3..03cd300c 100644 --- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h +++ b/kdevdesigner/designer/pixmapcollectioneditor.ui.h @@ -40,19 +40,19 @@ void PixmapCollectionEditor::addPixmap() if ( !project ) return; - QString f; - QStringList pixmaps = qChoosePixmaps( this ); + TQString f; + TQStringList pixmaps = qChoosePixmaps( this ); if ( pixmaps.isEmpty() ) return; - QString lastName; - for ( QStringList::ConstIterator it = pixmaps.begin(); it != pixmaps.end(); ++it ) { - QPixmap pm( *it ); + TQString lastName; + for ( TQStringList::ConstIterator it = pixmaps.begin(); it != pixmaps.end(); ++it ) { + TQPixmap pm( *it ); if ( pm.isNull() ) continue; PixmapCollection::Pixmap pixmap; pixmap.pix = pm; - QFileInfo fi ( *it ); + TQFileInfo fi ( *it ); pixmap.name = fi.fileName(); pixmap.absname = fi.filePath(); if ( !project->pixmapCollection()->addPixmap( pixmap, FALSE ) ) @@ -61,7 +61,7 @@ void PixmapCollectionEditor::addPixmap() } updateView(); - QIconViewItem *item = viewPixmaps->findItem( lastName ); + TQIconViewItem *item = viewPixmaps->findItem( lastName ); if ( item ) { viewPixmaps->setCurrentItem( item ); viewPixmaps->ensureItemVisible( item ); @@ -84,10 +84,10 @@ void PixmapCollectionEditor::updateView() viewPixmaps->clear(); - QValueList pixmaps = project->pixmapCollection()->pixmaps(); - for ( QValueList::Iterator it = pixmaps.begin(); it != pixmaps.end(); ++it ) { + TQValueList pixmaps = project->pixmapCollection()->pixmaps(); + for ( TQValueList::Iterator it = pixmaps.begin(); it != pixmaps.end(); ++it ) { // #### might need to scale down the pixmap - QIconViewItem *item = new QIconViewItem( viewPixmaps, (*it).name, scaledPixmap( (*it).pix ) ); + TQIconViewItem *item = new TQIconViewItem( viewPixmaps, (*it).name, scaledPixmap( (*it).pix ) ); //item->setRenameEnabled( TRUE ); // this will be a bit harder to implement item->setDragEnabled( FALSE ); item->setDropEnabled( FALSE ); @@ -96,7 +96,7 @@ void PixmapCollectionEditor::updateView() currentChanged( viewPixmaps->firstItem() ); } -void PixmapCollectionEditor::currentChanged( QIconViewItem * i ) +void PixmapCollectionEditor::currentChanged( TQIconViewItem * i ) { buttonOk->setEnabled( !!i ); } @@ -110,8 +110,8 @@ void PixmapCollectionEditor::setChooserMode( bool c ) buttonCancel->show(); buttonOk->setEnabled( FALSE ); buttonOk->setDefault( TRUE ); - connect( viewPixmaps, SIGNAL( doubleClicked( QIconViewItem * ) ), buttonOk, SIGNAL( clicked() ) ); - connect( viewPixmaps, SIGNAL( returnPressed( QIconViewItem * ) ), buttonOk, SIGNAL( clicked() ) ); + connect( viewPixmaps, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, TQT_SIGNAL( clicked() ) ); + connect( viewPixmaps, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, TQT_SIGNAL( clicked() ) ); setCaption( i18n( "Choose Image" ) ); } else { buttonClose->show(); @@ -122,9 +122,9 @@ void PixmapCollectionEditor::setChooserMode( bool c ) updateView(); } -void PixmapCollectionEditor::setCurrentItem( const QString & name ) +void PixmapCollectionEditor::setCurrentItem( const TQString & name ) { - QIconViewItem *i = viewPixmaps->findItem( name ); + TQIconViewItem *i = viewPixmaps->findItem( name ); if ( i ) { viewPixmaps->setCurrentItem( i ); currentChanged( i ); @@ -137,12 +137,12 @@ void PixmapCollectionEditor::setProject( Project * pro ) updateView(); } -QPixmap PixmapCollectionEditor::scaledPixmap( const QPixmap & p ) +TQPixmap PixmapCollectionEditor::scaledPixmap( const TQPixmap & p ) { - QPixmap pix( p ); + TQPixmap pix( p ); if ( pix.width() < 50 && pix.height() < 50 ) return pix; - QImage img; + TQImage img; img = pix; img = img.smoothScale( 50, 50 ); pix.convertFromImage( img ); diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp index 198880f9..40d77fd1 100644 --- a/kdevdesigner/designer/popupmenueditor.cpp +++ b/kdevdesigner/designer/popupmenueditor.cpp @@ -24,18 +24,18 @@ ** **********************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "actiondnd.h" #include "actioneditorimpl.h" #include "command.h" @@ -54,34 +54,34 @@ class PopupMenuEditorItemPtrDrag : public QStoredDrag { public: - PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, QWidget * parent = 0, + PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * parent = 0, const char * name = 0 ); ~PopupMenuEditorItemPtrDrag() {}; - static bool canDecode( QDragMoveEvent * e ); - static bool decode( QDropEvent * e, PopupMenuEditorItem ** i ); + static bool canDecode( TQDragMoveEvent * e ); + static bool decode( TQDropEvent * e, PopupMenuEditorItem ** i ); }; // Drag Object Implementation --------------------------------------- PopupMenuEditorItemPtrDrag::PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, - QWidget * parent, const char * name ) - : QStoredDrag( "qt/popupmenueditoritemptr", parent, name ) + TQWidget * parent, const char * name ) + : TQStoredDrag( "qt/popupmenueditoritemptr", parent, name ) { - QByteArray data( sizeof( Q_LONG ) ); - QDataStream stream( data, IO_WriteOnly ); + TQByteArray data( sizeof( Q_LONG ) ); + TQDataStream stream( data, IO_WriteOnly ); stream << ( Q_LONG ) item; setEncodedData( data ); } -bool PopupMenuEditorItemPtrDrag::canDecode( QDragMoveEvent * e ) +bool PopupMenuEditorItemPtrDrag::canDecode( TQDragMoveEvent * e ) { return e->provides( "qt/popupmenueditoritemptr" ); } -bool PopupMenuEditorItemPtrDrag::decode( QDropEvent * e, PopupMenuEditorItem ** i ) +bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** i ) { - QByteArray data = e->encodedData( "qt/popupmenueditoritemptr" ); - QDataStream stream( data, IO_ReadOnly ); + TQByteArray data = e->encodedData( "qt/popupmenueditoritemptr" ); + TQDataStream stream( data, IO_ReadOnly ); if ( !data.size() ) return FALSE; @@ -95,8 +95,8 @@ bool PopupMenuEditorItemPtrDrag::decode( QDropEvent * e, PopupMenuEditorItem ** // PopupMenuEditorItem Implementation ----------------------------------- -PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, QObject * parent, const char * name ) - : QObject( parent, name ), +PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * parent, const char * name ) + : TQObject( parent, name ), a( 0 ), s( 0 ), m( menu ), @@ -104,14 +104,14 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, QObject * pare removable( FALSE ) { init(); - a = new QAction( this ); - QObject::connect( a, SIGNAL( destroyed() ), this, SLOT( selfDestruct() ) ); + a = new TQAction( this ); + TQObject::connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( selfDestruct() ) ); } -PopupMenuEditorItem::PopupMenuEditorItem( QAction * action, PopupMenuEditor * menu, - QObject * parent, const char * name ) - : QObject( parent, name ), +PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu, + TQObject * parent, const char * name ) + : TQObject( parent, name ), a( action ), s( 0 ), m( menu ), @@ -126,8 +126,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( QAction * action, PopupMenuEditor * me } PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu, - QObject * parent, const char * name ) - : QObject( parent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), a( item->a ), s( 0 ), m( menu ), @@ -135,7 +135,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuE removable( item->removable ) { init(); - if ( ::qt_cast(a) ) + if ( ::qt_cast(a) ) a->installEventFilter( this ); } @@ -147,10 +147,10 @@ PopupMenuEditorItem::~PopupMenuEditorItem() void PopupMenuEditorItem::init() { if ( a ) { - QObject::connect( a, SIGNAL( destroyed() ), this, SLOT( selfDestruct() ) ); + TQObject::connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( selfDestruct() ) ); if ( m && !isSeparator() ) { s = new PopupMenuEditor( m->formWindow(), m ); - QString n = "PopupMenuEditor"; + TQString n = "PopupMenuEditor"; m->formWindow()->unify( s, n, TRUE ); s->setName( n ); MetaDataBase::addEntry( s ); @@ -175,7 +175,7 @@ void PopupMenuEditorItem::setVisible( bool enable ) bool PopupMenuEditorItem::isVisible() const { - QActionGroup *g = ::qt_cast(a); + TQActionGroup *g = ::qt_cast(a); if ( g ) return ( g->isVisible() && g->usesDropDown() ); else if ( a ) @@ -212,25 +212,25 @@ int PopupMenuEditorItem::count() const { if ( s ) { return s->count(); - } else if ( ::qt_cast(a) ) { - const QObjectList * l = a->children(); + } else if ( ::qt_cast(a) ) { + const TQObjectList * l = a->children(); if ( l ) return l->count(); } return 0; } -bool PopupMenuEditorItem::eventFilter( QObject * o, QEvent * event ) +bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) { - if ( ! ::qt_cast( o ) ) + if ( ! ::qt_cast( o ) ) return FALSE; - if ( event->type() == QEvent::ChildInserted ) { - QChildEvent * ce = ( QChildEvent * ) event; - QObject * c = ce->child(); - QAction * action = ::qt_cast( c ); + if ( event->type() == TQEvent::ChildInserted ) { + TQChildEvent * ce = ( TQChildEvent * ) event; + TQObject * c = ce->child(); + TQAction * action = ::qt_cast( c ); if ( s->find( action ) != -1 ) // avoid duplicates return FALSE; - QActionGroup * actionGroup = ::qt_cast( c ); + TQActionGroup * actionGroup = ::qt_cast( c ); if ( actionGroup ) s->insert( actionGroup ); else if ( action ) @@ -255,8 +255,8 @@ PopupMenuEditorItem * PopupMenuEditor::draggedItem = 0; int PopupMenuEditor::clipboardOperation = 0; PopupMenuEditorItem * PopupMenuEditor::clipboardItem = 0; -PopupMenuEditor::PopupMenuEditor( FormWindow * fw, QWidget * parent, const char * name ) - : QWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase | WResizeNoErase ), +PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * parent, const char * name ) + : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase | WResizeNoErase ), formWnd( fw ), parentMenu( parent ), iconWidth( 0 ), @@ -271,8 +271,8 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, QWidget * parent, const char } PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, - QWidget * parent, const char * name ) - : QWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase ), + TQWidget * parent, const char * name ) + : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase ), formWnd( fw ), parentMenu( parent ), iconWidth( menu->iconWidth ), @@ -298,7 +298,7 @@ PopupMenuEditor::~PopupMenuEditor() void PopupMenuEditor::init() { - reparent( ( QMainWindow * ) formWnd->mainContainer(), pos() ); + reparent( ( TQMainWindow * ) formWnd->mainContainer(), pos() ); addItem.action()->setMenuText( i18n("new item") ); addSeparator.action()->setMenuText( i18n("new separator") ); @@ -306,15 +306,15 @@ void PopupMenuEditor::init() setAcceptDrops( TRUE ); setFocusPolicy( StrongFocus ); - lineEdit = new QLineEdit( this ); + lineEdit = new TQLineEdit( this ); lineEdit->hide(); - lineEdit->setFrameStyle(QFrame::Plain | QFrame::NoFrame); + lineEdit->setFrameStyle(TQFrame::Plain | TQFrame::NoFrame); lineEdit->polish(); lineEdit->setBackgroundOrigin(ParentOrigin); lineEdit->setBackgroundMode(PaletteButton); lineEdit->installEventFilter( this ); - dropLine = new QWidget( this, 0, Qt::WStyle_NoBorder | WStyle_StaysOnTop ); + dropLine = new TQWidget( this, 0, Qt::WStyle_NoBorder | WStyle_StaysOnTop ); dropLine->setBackgroundColor( Qt::red ); dropLine->hide(); @@ -342,39 +342,39 @@ void PopupMenuEditor::insert( PopupMenuEditorItem * item, int index ) emit inserted( item->action() ); } -void PopupMenuEditor::insert( QAction * action, int index ) +void PopupMenuEditor::insert( TQAction * action, int index ) { if ( !action ) return; insert( new PopupMenuEditorItem( action, this, 0, action->name() ), index ); } -void PopupMenuEditor::insert( QActionGroup * actionGroup, int index ) +void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index ) { if ( !actionGroup ) return; bool dropdown = actionGroup->usesDropDown(); - PopupMenuEditorItem *i = new PopupMenuEditorItem( (QAction *)actionGroup, this, 0, - QString( actionGroup->name() ) + "Menu" ); - QActionGroup *g = 0; - QObjectList *l = actionGroup->queryList( "QAction", 0, FALSE, FALSE ); - QObjectListIterator it( *l ); + PopupMenuEditorItem *i = new PopupMenuEditorItem( (TQAction *)actionGroup, this, 0, + TQString( actionGroup->name() ) + "Menu" ); + TQActionGroup *g = 0; + TQObjectList *l = actionGroup->queryList( "TQAction", 0, FALSE, FALSE ); + TQObjectListIterator it( *l ); insert( i, index ); for ( ; it.current(); ++it ) { - g = ::qt_cast(it.current()); + g = ::qt_cast(it.current()); if ( g ) { if ( dropdown ) i->s->insert( g ); else insert( g ); } else { - i->s->insert( (QAction*)it.current() ); + i->s->insert( (TQAction*)it.current() ); } } delete l; } -int PopupMenuEditor::find( const QAction * action ) +int PopupMenuEditor::find( const TQAction * action ) { PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -469,9 +469,9 @@ void PopupMenuEditor::paste( int index ) } } -void PopupMenuEditor::insertedActions( QPtrList & list ) +void PopupMenuEditor::insertedActions( TQPtrList & list ) { - QAction * a = 0; + TQAction * a = 0; PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -485,7 +485,7 @@ void PopupMenuEditor::insertedActions( QPtrList & list ) void PopupMenuEditor::show() { resizeToContents(); - QWidget::show(); + TQWidget::show(); } void PopupMenuEditor::choosePixmap( int index ) @@ -493,7 +493,7 @@ void PopupMenuEditor::choosePixmap( int index ) int idx = ( index == -1 ? currentIndex : index ); PopupMenuEditorItem * i = 0; - QAction * a = 0; + TQAction * a = 0; if ( idx < (int)itemList.count() ) { i = itemList.at( idx ); @@ -503,7 +503,7 @@ void PopupMenuEditor::choosePixmap( int index ) } hide(); // qChoosePixmap hides the menu - QIconSet icons( qChoosePixmap( 0, formWnd, 0, 0 ) ); + TQIconSet icons( qChoosePixmap( 0, formWnd, 0, 0 ) ); SetActionIconsCommand * cmd = new SetActionIconsCommand( i18n( "Set Icon" ), formWnd, a, this, icons ); formWnd->commandHistory()->addCommand( cmd ); @@ -557,22 +557,22 @@ void PopupMenuEditor::setAccelerator( int key, Qt::ButtonState state, int index int alt = ( state & Qt::AltButton ? Qt::ALT : 0 ); int meta = ( state & Qt::MetaButton ? Qt::META : 0 ); - QAction * a = i->action(); - QKeySequence ks = a->accel(); + TQAction * a = i->action(); + TQKeySequence ks = a->accel(); int keys[4] = { ks[0], ks[1], ks[2], ks[3] }; int n = 0; while ( n < 4 && ks[n++] ); n--; if ( n < 4 ) keys[n] = key | shift | ctrl | alt | meta; - a->setAccel( QKeySequence( keys[0], keys[1], keys[2], keys[3] ) ); + a->setAccel( TQKeySequence( keys[0], keys[1], keys[2], keys[3] ) ); MetaDataBase::setPropertyChanged( a, "accel", TRUE ); resizeToContents(); } void PopupMenuEditor::resizeToContents() { - QSize s = contentsSize(); + TQSize s = contentsSize(); dropLine->resize( s.width(), 2 ); s.rwidth() += borderSize * 2; s.rheight() += borderSize * 2; @@ -618,13 +618,13 @@ void PopupMenuEditor::remove( int index ) } } -PopupMenuEditorItem * PopupMenuEditor::createItem( QAction * a ) +PopupMenuEditorItem * PopupMenuEditor::createItem( TQAction * a ) { ActionEditor * ae = (ActionEditor *) formWindow()->mainWindow()->child( 0, "ActionEditor" ); if ( !a ) a = ae->newActionEx(); PopupMenuEditorItem * i = new PopupMenuEditorItem( a, this ); - QString n = QString( a->name() ) + "Item"; + TQString n = TQString( a->name() ) + "Item"; formWindow()->unify( i, n, FALSE ); i->setName( n ); AddActionToPopupCommand * cmd = @@ -677,7 +677,7 @@ PopupMenuEditorItem * PopupMenuEditor::itemAt( int y ) return &addSeparator; } -void PopupMenuEditor::setFocusAt( const QPoint & pos ) +void PopupMenuEditor::setFocusAt( const TQPoint & pos ) { hideSubMenu(); lineEdit->hide(); @@ -712,30 +712,30 @@ void PopupMenuEditor::setFocusAt( const QPoint & pos ) showSubMenu(); } -bool PopupMenuEditor::eventFilter( QObject * o, QEvent * e ) +bool PopupMenuEditor::eventFilter( TQObject * o, TQEvent * e ) { - if ( o == lineEdit && e->type() == QEvent::FocusOut ) { + if ( o == lineEdit && e->type() == TQEvent::FocusOut ) { leaveEditMode( 0 ); update(); } - return QWidget::eventFilter( o, e ); + return TQWidget::eventFilter( o, e ); } -void PopupMenuEditor::paintEvent( QPaintEvent * ) +void PopupMenuEditor::paintEvent( TQPaintEvent * ) { - QPainter p( this ); + TQPainter p( this ); p.save(); - QRegion reg( rect() ); - QRegion mid( borderSize, borderSize, + TQRegion reg( rect() ); + TQRegion mid( borderSize, borderSize, rect().width() - borderSize * 2, rect().height() - borderSize * 2 ); reg -= mid; p.setClipRegion( reg ); - style().drawPrimitive( QStyle::PE_PanelPopup, &p, rect(), colorGroup() ); + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() ); p.restore(); drawItems( &p ); } -void PopupMenuEditor::mousePressEvent( QMouseEvent * e ) +void PopupMenuEditor::mousePressEvent( TQMouseEvent * e ) { mousePressPos = e->pos(); setFocusAt( mousePressPos ); @@ -743,7 +743,7 @@ void PopupMenuEditor::mousePressEvent( QMouseEvent * e ) update(); } -void PopupMenuEditor::mouseDoubleClickEvent( QMouseEvent * ) +void PopupMenuEditor::mouseDoubleClickEvent( TQMouseEvent * ) { setFocusAt( mousePressPos ); if ( currentItem() == &addSeparator ) { @@ -759,7 +759,7 @@ void PopupMenuEditor::mouseDoubleClickEvent( QMouseEvent * ) } } -void PopupMenuEditor::mouseMoveEvent( QMouseEvent * e ) +void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) { if ( e->state() & Qt::LeftButton ) { if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { @@ -787,7 +787,7 @@ void PopupMenuEditor::mouseMoveEvent( QMouseEvent * e ) // we will have two instances of the same pointer // in the list. We use node instead. int idx = itemList.find( draggedItem ); - QLNode * node = itemList.currentNode(); + TQLNode * node = itemList.currentNode(); d->dragCopy(); // dragevents and stuff happens @@ -810,7 +810,7 @@ void PopupMenuEditor::mouseMoveEvent( QMouseEvent * e ) } } -void PopupMenuEditor::dragEnterEvent( QDragEnterEvent * e ) +void PopupMenuEditor::dragEnterEvent( TQDragEnterEvent * e ) { if ( e->provides( "qt/popupmenueditoritemptr" ) || e->provides( "application/x-designer-actions" ) || @@ -820,14 +820,14 @@ void PopupMenuEditor::dragEnterEvent( QDragEnterEvent * e ) } } -void PopupMenuEditor::dragLeaveEvent( QDragLeaveEvent * ) +void PopupMenuEditor::dragLeaveEvent( TQDragLeaveEvent * ) { dropLine->hide(); } -void PopupMenuEditor::dragMoveEvent( QDragMoveEvent * e ) +void PopupMenuEditor::dragMoveEvent( TQDragMoveEvent * e ) { - QPoint pos = e->pos(); + TQPoint pos = e->pos(); dropLine->move( borderSize, snapToItem( pos.y() ) ); if ( currentItem() != itemAt( pos.y() ) ) { @@ -837,7 +837,7 @@ void PopupMenuEditor::dragMoveEvent( QDragMoveEvent * e ) } } -void PopupMenuEditor::dropEvent( QDropEvent * e ) +void PopupMenuEditor::dropEvent( TQDropEvent * e ) { if ( !( e->provides( "qt/popupmenueditoritemptr" ) || e->provides( "application/x-designer-actions" ) || @@ -847,7 +847,7 @@ void PopupMenuEditor::dropEvent( QDropEvent * e ) // Hide the sub menu of the current item, but do it later if ( currentIndex < (int)itemList.count() ) { PopupMenuEditor *s = itemList.at( currentIndex )->s; - QTimer::singleShot( 0, s, SLOT( hide() ) ); + TQTimer::singleShot( 0, s, TQT_SLOT( hide() ) ); } draggedItem = 0; @@ -857,43 +857,43 @@ void PopupMenuEditor::dropEvent( QDropEvent * e ) PopupMenuEditorItemPtrDrag::decode( e, &i ); } else { if ( e->provides( "application/x-designer-actiongroup" ) ) { - QActionGroup * g = ::qt_cast(ActionDrag::action()); + TQActionGroup * g = ::qt_cast(ActionDrag::action()); if ( g->usesDropDown() ) { i = new PopupMenuEditorItem( g, this ); - QString n = QString( g->name() ) + "Item"; + TQString n = TQString( g->name() ) + "Item"; formWindow()->unify( i, n, FALSE ); i->setName( n ); - QObjectList *l = g->queryList( "QAction", 0, FALSE, FALSE ); - QObjectListIterator it( *l ); + TQObjectList *l = g->queryList( "TQAction", 0, FALSE, FALSE ); + TQObjectListIterator it( *l ); for ( ; it.current(); ++it ) { - g = ::qt_cast(it.current()); + g = ::qt_cast(it.current()); if ( g ) i->s->insert( g ); else - i->s->insert( (QAction*)it.current() ); + i->s->insert( (TQAction*)it.current() ); } delete l; } else { dropInPlace( g, e->pos().y() ); } } else if ( e->provides( "application/x-designer-actions" ) ) { - QAction *a = ::qt_cast(ActionDrag::action()); + TQAction *a = ::qt_cast(ActionDrag::action()); i = new PopupMenuEditorItem( a, this ); } } if ( i ) { dropInPlace( i, e->pos().y() ); - QTimer::singleShot( 0, this, SLOT( resizeToContents() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( resizeToContents() ) ); } - QTimer::singleShot( 0, this, SLOT( showSubMenu() ) ); - QTimer::singleShot( 0, this, SLOT( setFocus() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( showSubMenu() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( setFocus() ) ); dropLine->hide(); e->accept(); } -void PopupMenuEditor::keyPressEvent( QKeyEvent * e ) +void PopupMenuEditor::keyPressEvent( TQKeyEvent * e ) { if ( lineEdit->isHidden() ) { // In navigation mode @@ -978,7 +978,7 @@ void PopupMenuEditor::keyPressEvent( QKeyEvent * e ) return; if ( currentField == 1 ) { showLineEdit(); - QApplication::sendEvent( lineEdit, e ); + TQApplication::sendEvent( lineEdit, e ); e->accept(); return; } else if ( currentField == 2 ) { @@ -1002,21 +1002,21 @@ void PopupMenuEditor::keyPressEvent( QKeyEvent * e ) update(); } -void PopupMenuEditor::focusInEvent( QFocusEvent * ) +void PopupMenuEditor::focusInEvent( TQFocusEvent * ) { showSubMenu(); update(); parentMenu->update(); } -void PopupMenuEditor::focusOutEvent( QFocusEvent * ) +void PopupMenuEditor::focusOutEvent( TQFocusEvent * ) { - QWidget * fw = qApp->focusWidget(); + TQWidget * fw = qApp->focusWidget(); if ( !fw || ( !::qt_cast(fw) && fw != lineEdit ) ) { hideSubMenu(); if ( fw && ::qt_cast(fw) ) return; - QWidget * w = this; + TQWidget * w = this; while ( w && w != fw && ::qt_cast(w) ) { // hide all popups w->hide(); w = ((PopupMenuEditor *)w)->parentEditor(); @@ -1024,52 +1024,52 @@ void PopupMenuEditor::focusOutEvent( QFocusEvent * ) } } -void PopupMenuEditor::drawItem( QPainter * p, PopupMenuEditorItem * i, - const QRect & r, int f ) const +void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i, + const TQRect & r, int f ) const { int x = r.x(); int y = r.y(); int h = r.height(); - p->fillRect( r, colorGroup().brush( QColorGroup::Background ) ); + p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); if ( i->isSeparator() ) { - style().drawPrimitive( QStyle::PE_Separator, p, - QRect( r.x(), r.y() + 2, r.width(), 1 ), - colorGroup(), QStyle::Style_Sunken | f ); + style().drawPrimitive( TQStyle::PE_Separator, p, + TQRect( r.x(), r.y() + 2, r.width(), 1 ), + colorGroup(), TQStyle::Style_Sunken | f ); return; } - const QAction * a = i->action(); + const TQAction * a = i->action(); if ( a->isToggleAction() && a->isOn() ) { - style().drawPrimitive( QStyle::PE_CheckMark, p, - QRect( x , y, iconWidth, h ), + style().drawPrimitive( TQStyle::PE_CheckMark, p, + TQRect( x , y, iconWidth, h ), colorGroup(), f ); } else { - QPixmap icon = a->iconSet().pixmap( QIconSet::Automatic, QIconSet::Normal ); + TQPixmap icon = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal ); p->drawPixmap( x + ( iconWidth - icon.width() ) / 2, y + ( h - icon.height() ) / 2, icon ); } x += iconWidth; p->drawText( x, y, textWidth, h, - QPainter::AlignLeft | - QPainter::AlignVCenter | + TQPainter::AlignLeft | + TQPainter::AlignVCenter | Qt::ShowPrefix | Qt::SingleLine, a->menuText() ); x += textWidth + borderSize * 3; p->drawText( x, y, accelWidth, h, - QPainter::AlignLeft | QPainter::AlignVCenter, + TQPainter::AlignLeft | TQPainter::AlignVCenter, a->accel() ); if ( i->count() ) // Item has submenu - style().drawPrimitive( QStyle::PE_ArrowRight, p, - QRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ), + style().drawPrimitive( TQStyle::PE_ArrowRight, p, + TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ), colorGroup(), f ); } -void PopupMenuEditor::drawWinFocusRect( QPainter * p, const QRect & r ) const +void PopupMenuEditor::drawWinFocusRect( TQPainter * p, const TQRect & r ) const { if ( currentIndex < (int)itemList.count() && ((PopupMenuEditor*)this)->itemList.at( currentIndex )->isSeparator() ) { @@ -1087,15 +1087,15 @@ void PopupMenuEditor::drawWinFocusRect( QPainter * p, const QRect & r ) const borderSize * 3, y, accelWidth, h ); } -void PopupMenuEditor::drawItems( QPainter * p ) +void PopupMenuEditor::drawItems( TQPainter * p ) { int flags = 0; int idx = 0; - QColorGroup enabled = colorGroup(); - QColorGroup disabled = palette().disabled(); - QRect focus; - QRect rect( borderSize, borderSize, width() - borderSize * 2, 0 ); + TQColorGroup enabled = colorGroup(); + TQColorGroup disabled = palette().disabled(); + TQRect focus; + TQRect rect( borderSize, borderSize, width() - borderSize * 2, 0 ); PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -1104,10 +1104,10 @@ void PopupMenuEditor::drawItems( QPainter * p ) if ( idx == currentIndex ) focus = rect; if ( i->action()->isEnabled() ) { - flags = QStyle::Style_Enabled; + flags = TQStyle::Style_Enabled; p->setPen( enabled.buttonText() ); } else { - flags = QStyle::Style_Default; + flags = TQStyle::Style_Default; p->setPen( disabled.buttonText() ); } drawItem( p, i, rect, flags ); @@ -1122,22 +1122,22 @@ void PopupMenuEditor::drawItems( QPainter * p ) rect.setHeight( itemHeight( &addItem ) ); if ( idx == currentIndex ) focus = rect; - drawItem( p, &addItem, rect, QStyle::Style_Default ); + drawItem( p, &addItem, rect, TQStyle::Style_Default ); rect.moveBy( 0, rect.height() ); idx++; rect.setHeight( itemHeight( &addSeparator ) ); if ( idx == currentIndex ) focus = rect; - drawItem( p, &addSeparator, rect, QStyle::Style_Default ); + drawItem( p, &addSeparator, rect, TQStyle::Style_Default ); idx++; if ( hasFocus() && !draggedItem ) drawWinFocusRect( p, focus ); } -QSize PopupMenuEditor::contentsSize() +TQSize PopupMenuEditor::contentsSize() { - QRect textRect = fontMetrics().boundingRect( addSeparator.action()->menuText() ); + TQRect textRect = fontMetrics().boundingRect( addSeparator.action()->menuText() ); textWidth = textRect.width(); accelWidth = textRect.height(); // default size iconWidth = textRect.height(); @@ -1145,12 +1145,12 @@ QSize PopupMenuEditor::contentsSize() int w = 0; int h = itemHeight( &addItem ) + itemHeight( &addSeparator ); PopupMenuEditorItem * i = itemList.first(); - QAction * a = 0; + TQAction * a = 0; while ( i ) { if ( i->isVisible() ) { if ( !i->isSeparator() ) { a = i->action(); - w = a->iconSet().pixmap( QIconSet::Automatic, QIconSet::Normal ).rect().width() + + w = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal ).rect().width() + borderSize; // padding iconWidth = QMAX( iconWidth, w ); w = fontMetrics().boundingRect( a->menuText() ).width(); @@ -1164,7 +1164,7 @@ QSize PopupMenuEditor::contentsSize() } int width = iconWidth + textWidth + borderSize * 3 + accelWidth + arrowWidth; - return QSize( width, h ); + return TQSize( width, h ); } int PopupMenuEditor::itemHeight( const PopupMenuEditorItem * item ) const @@ -1174,8 +1174,8 @@ int PopupMenuEditor::itemHeight( const PopupMenuEditorItem * item ) const if ( item->isSeparator() ) return 4; // FIXME: hardcoded ( get from styles )r int padding = + borderSize * 6; - QAction * a = item->action(); - int h = a->iconSet().pixmap( QIconSet::Automatic, QIconSet::Normal ).rect().height(); + TQAction * a = item->action(); + int h = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal ).rect().height(); h = QMAX( h, fontMetrics().boundingRect( a->menuText() ).height() + padding ); h = QMAX( h, fontMetrics().boundingRect( a->accel() ).height() + padding ); return h; @@ -1237,14 +1237,14 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y ) currentField = 1; } -void PopupMenuEditor::dropInPlace( QActionGroup * g, int y ) +void PopupMenuEditor::dropInPlace( TQActionGroup * g, int y ) { if (!g->children()) return; - QObjectList l = *g->children(); + TQObjectList l = *g->children(); for ( int i = 0; i < (int)l.count(); ++i ) { - QAction *a = ::qt_cast(l.at(i)); - QActionGroup *g = ::qt_cast(l.at(i)); + TQAction *a = ::qt_cast(l.at(i)); + TQActionGroup *g = ::qt_cast(l.at(i)); if ( g ) dropInPlace( g, y ); else if ( a ) @@ -1283,7 +1283,7 @@ void PopupMenuEditor::clearCurrentField() if ( i->isSeparator() ) return; if ( currentField == 0 ) { - QIconSet icons( 0 ); + TQIconSet icons( 0 ); SetActionIconsCommand * cmd = new SetActionIconsCommand( i18n( "Remove Icon" ), formWnd, i->action(), @@ -1375,7 +1375,7 @@ void PopupMenuEditor::navigateRight() } } -void PopupMenuEditor::enterEditMode( QKeyEvent * e ) +void PopupMenuEditor::enterEditMode( TQKeyEvent * e ) { PopupMenuEditorItem * i = currentItem(); @@ -1395,7 +1395,7 @@ void PopupMenuEditor::enterEditMode( QKeyEvent * e ) return; } -void PopupMenuEditor::leaveEditMode( QKeyEvent * e ) +void PopupMenuEditor::leaveEditMode( TQKeyEvent * e ) { setFocus(); lineEdit->hide(); @@ -1408,14 +1408,14 @@ void PopupMenuEditor::leaveEditMode( QKeyEvent * e ) if ( currentIndex >= (int)itemList.count() ) { // new item was created - QAction * a = formWnd->mainWindow()->actioneditor()->newActionEx(); - QString actionText = lineEdit->text(); + TQAction * a = formWnd->mainWindow()->actioneditor()->newActionEx(); + TQString actionText = lineEdit->text(); actionText.replace("&&", "&"); - QString menuText = lineEdit->text(); + TQString menuText = lineEdit->text(); a->setText( actionText ); a->setMenuText( menuText ); i = createItem( a ); - QString n = constructName( i ); + TQString n = constructName( i ); formWindow()->unify( a, n, TRUE ); a->setName( n ); MetaDataBase::addEntry( a ); @@ -1444,22 +1444,22 @@ void PopupMenuEditor::leaveEditMode( QKeyEvent * e ) showSubMenu(); } -QString PopupMenuEditor::constructName( PopupMenuEditorItem *item ) +TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item ) { - QString s; - QString name = item->action()->menuText(); - QWidget *e = parentEditor(); + TQString s; + TQString name = item->action()->menuText(); + TQWidget *e = parentEditor(); PopupMenuEditor *p = ::qt_cast(e); if ( p ) { int idx = p->find( item->m ); PopupMenuEditorItem * i = ( idx > -1 ? p->at( idx ) : 0 ); - s = ( i ? QString( i->action()->name() ).remove( "Action" ) : QString( "" ) ); + s = ( i ? TQString( i->action()->name() ).remove( "Action" ) : TQString( "" ) ); } else { MenuBarEditor *b = ::qt_cast(e); if ( b ) { int idx = b->findItem( item->m ); MenuBarEditorItem * i = ( idx > -1 ? b->item( idx ) : 0 ); - s = ( i ? i->menuText().lower() : QString( "" ) ); + s = ( i ? i->menuText().lower() : TQString( "" ) ); } } // replace illegal characters diff --git a/kdevdesigner/designer/popupmenueditor.h b/kdevdesigner/designer/popupmenueditor.h index ca14205b..8adc0d68 100644 --- a/kdevdesigner/designer/popupmenueditor.h +++ b/kdevdesigner/designer/popupmenueditor.h @@ -27,9 +27,9 @@ #ifndef POPUPMENUEDITOR_H #define POPUPMENUEDITOR_H -#include -#include -#include +#include +#include +#include class PopupMenuEditor; class QMenuItem; @@ -40,7 +40,7 @@ class PopupMenuEditorItem : public QObject friend class PopupMenuEditor; - PopupMenuEditorItem( PopupMenuEditor * menu = 0, QObject * parent = 0, const char * name = 0 ); + PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * parent = 0, const char * name = 0 ); public: enum ItemType { @@ -49,16 +49,16 @@ public: Action = 1 }; - PopupMenuEditorItem( QAction * action, PopupMenuEditor * menu, - QObject * parent = 0, const char * name = 0 ); + PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu, + TQObject * parent = 0, const char * name = 0 ); PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu, - QObject * parent = 0, const char * name = 0 ); + TQObject * parent = 0, const char * name = 0 ); ~PopupMenuEditorItem(); void init(); ItemType type() const; - QAction * action() const { return a; } + TQAction * action() const { return a; } void setVisible( bool enable ); bool isVisible() const; @@ -76,7 +76,7 @@ public: int count() const; - bool eventFilter( QObject *, QEvent * event ); + bool eventFilter( TQObject *, TQEvent * event ); public slots: void selfDestruct(); @@ -84,7 +84,7 @@ public slots: protected: private: - QAction * a; + TQAction * a; PopupMenuEditor * s; PopupMenuEditor * m; uint separator : 1; @@ -95,7 +95,7 @@ class FormWindow; class MainWindow; class QLineEdit; -#include +#include class PopupMenuEditor : public QWidget { @@ -106,27 +106,27 @@ class PopupMenuEditor : public QWidget friend class Resource; public: - PopupMenuEditor( FormWindow * fw, QWidget * parent = 0, const char * name = 0 ); - PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, QWidget * parent, const char * name = 0 ); + PopupMenuEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); + PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * parent, const char * name = 0 ); ~PopupMenuEditor(); void init(); void insert( PopupMenuEditorItem * item, int index = -1 ); - void insert( QAction * action, int index = -1 ); - void insert( QActionGroup * actionGroup, int index = -1 ); - int find( const QAction * action ); + void insert( TQAction * action, int index = -1 ); + void insert( TQActionGroup * actionGroup, int index = -1 ); + int find( const TQAction * action ); int find( PopupMenuEditor * menu ); int count(); PopupMenuEditorItem * at( int index ); - PopupMenuEditorItem * at( QPoint pos ) { return itemAt( pos.y() ); } + PopupMenuEditorItem * at( TQPoint pos ) { return itemAt( pos.y() ); } void exchange( int a, int b ); void cut( int index ); void copy( int index ); void paste( int index ); - void insertedActions( QPtrList & list ); + void insertedActions( TQPtrList & list ); void show(); void choosePixmap( int index = -1 ); @@ -136,13 +136,13 @@ public: FormWindow * formWindow() { return formWnd; } bool isCreatingAccelerator() { return ( currentField == 2 ); } - QPtrList * items() { return &itemList; } + TQPtrList * items() { return &itemList; } - QWidget * parentEditor() { return parentMenu; } + TQWidget * parentEditor() { return parentMenu; } signals: - void inserted( QAction * ); - void removed( QAction * ); + void inserted( TQAction * ); + void removed( TQAction * ); public slots: @@ -151,7 +151,7 @@ public slots: void paste() { paste( currentIndex ); } void remove( int index ); - void remove( QAction * a ) { remove( find( a ) ); } + void remove( TQAction * a ) { remove( find( a ) ); } void resizeToContents(); void showSubMenu(); @@ -159,36 +159,36 @@ public slots: void focusOnSubMenu(); protected: - PopupMenuEditorItem * createItem( QAction * a = 0 ); + PopupMenuEditorItem * createItem( TQAction * a = 0 ); void removeItem( int index = -1 ); PopupMenuEditorItem * currentItem(); PopupMenuEditorItem * itemAt( int y ); - void setFocusAt( const QPoint & pos ); - - bool eventFilter( QObject * o, QEvent * e ); - void paintEvent( QPaintEvent * e ); - void mousePressEvent( QMouseEvent * e ); - void mouseDoubleClickEvent( QMouseEvent * e ); - void mouseMoveEvent( QMouseEvent * e ); - void dragEnterEvent( QDragEnterEvent * e ); - void dragLeaveEvent( QDragLeaveEvent * e ); - void dragMoveEvent( QDragMoveEvent * e ); - void dropEvent( QDropEvent * e ); - void keyPressEvent( QKeyEvent * e ); - void focusInEvent( QFocusEvent * e ); - void focusOutEvent( QFocusEvent * e ); - - void drawItems( QPainter * p ); - void drawItem( QPainter * p, PopupMenuEditorItem * i, const QRect & r, int f ) const; - void drawWinFocusRect( QPainter * p, const QRect & r ) const; - - QSize contentsSize(); + void setFocusAt( const TQPoint & pos ); + + bool eventFilter( TQObject * o, TQEvent * e ); + void paintEvent( TQPaintEvent * e ); + void mousePressEvent( TQMouseEvent * e ); + void mouseDoubleClickEvent( TQMouseEvent * e ); + void mouseMoveEvent( TQMouseEvent * e ); + void dragEnterEvent( TQDragEnterEvent * e ); + void dragLeaveEvent( TQDragLeaveEvent * e ); + void dragMoveEvent( TQDragMoveEvent * e ); + void dropEvent( TQDropEvent * e ); + void keyPressEvent( TQKeyEvent * e ); + void focusInEvent( TQFocusEvent * e ); + void focusOutEvent( TQFocusEvent * e ); + + void drawItems( TQPainter * p ); + void drawItem( TQPainter * p, PopupMenuEditorItem * i, const TQRect & r, int f ) const; + void drawWinFocusRect( TQPainter * p, const TQRect & r ) const; + + TQSize contentsSize(); int itemHeight( const PopupMenuEditorItem * item ) const; int itemPos( const PopupMenuEditorItem * item ) const; int snapToItem( int y ); void dropInPlace( PopupMenuEditorItem * i, int y ); - void dropInPlace( QActionGroup * g, int y ); + void dropInPlace( TQActionGroup * g, int y ); void safeDec(); void safeInc(); @@ -198,19 +198,19 @@ protected: void navigateDown( bool ctrl ); void navigateLeft(); void navigateRight(); - void enterEditMode( QKeyEvent * e ); - void leaveEditMode( QKeyEvent * e ); + void enterEditMode( TQKeyEvent * e ); + void leaveEditMode( TQKeyEvent * e ); - QString constructName( PopupMenuEditorItem *item ); + TQString constructName( PopupMenuEditorItem *item ); private: FormWindow * formWnd; - QLineEdit * lineEdit; - QWidget * dropLine; - QPtrList itemList; + TQLineEdit * lineEdit; + TQWidget * dropLine; + TQPtrList itemList; PopupMenuEditorItem addItem; PopupMenuEditorItem addSeparator; - QWidget * parentMenu; + TQWidget * parentMenu; int iconWidth; int textWidth; @@ -220,7 +220,7 @@ private: int currentField; int currentIndex; - QPoint mousePressPos; + TQPoint mousePressPos; static PopupMenuEditorItem * draggedItem; enum ClipboardOperation { diff --git a/kdevdesigner/designer/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp index 2d14fb7b..98c3c9b0 100644 --- a/kdevdesigner/designer/previewframe.cpp +++ b/kdevdesigner/designer/previewframe.cpp @@ -24,16 +24,16 @@ ** **********************************************************************/ -#include -#include +#include +#include #include "previewframe.h" -PreviewFrame::PreviewFrame( QWidget *parent, const char *name ) - : QVBox( parent, name ) +PreviewFrame::PreviewFrame( TQWidget *parent, const char *name ) + : TQVBox( parent, name ) { setMinimumSize(200, 200); - setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); setLineWidth(1); PreviewWorkspace * w = new PreviewWorkspace( this ); @@ -42,15 +42,15 @@ PreviewFrame::PreviewFrame( QWidget *parent, const char *name ) previewWidget->move( 10, 10 ); } -void PreviewFrame::setPreviewPalette(QPalette pal) +void PreviewFrame::setPreviewPalette(TQPalette pal) { previewWidget->setPalette(pal); } -void PreviewWorkspace::paintEvent( QPaintEvent* ) +void PreviewWorkspace::paintEvent( TQPaintEvent* ) { - QPainter p ( this ); - p.setPen( QPen( white ) ); + TQPainter p ( this ); + p.setPen( TQPen( white ) ); p.drawText ( 0, height() / 2, width(), height(), AlignHCenter, "The moose in the noose\nate the goose who was loose." ); } diff --git a/kdevdesigner/designer/previewframe.h b/kdevdesigner/designer/previewframe.h index 632e8b9a..0834c178 100644 --- a/kdevdesigner/designer/previewframe.h +++ b/kdevdesigner/designer/previewframe.h @@ -27,8 +27,8 @@ #ifndef PREVIEWFRAME_H #define PREVIEWFRAME_H -#include -#include +#include +#include #include "previewwidgetimpl.h" @@ -36,12 +36,12 @@ class PreviewWorkspace : public QWorkspace { Q_OBJECT public: - PreviewWorkspace( QWidget* parent = 0, const char* name = 0 ) - : QWorkspace( parent, name ) {} + PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 ) + : TQWorkspace( parent, name ) {} ~PreviewWorkspace() {} protected: - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); }; class PreviewFrame : public QVBox @@ -49,8 +49,8 @@ class PreviewFrame : public QVBox Q_OBJECT public: - PreviewFrame( QWidget *parent = 0, const char *name = 0 ); - void setPreviewPalette(QPalette); + PreviewFrame( TQWidget *parent = 0, const char *name = 0 ); + void setPreviewPalette(TQPalette); private: PreviewWidget *previewWidget; diff --git a/kdevdesigner/designer/previewwidgetimpl.cpp b/kdevdesigner/designer/previewwidgetimpl.cpp index 2c2c6528..4f79ae57 100644 --- a/kdevdesigner/designer/previewwidgetimpl.cpp +++ b/kdevdesigner/designer/previewwidgetimpl.cpp @@ -24,39 +24,39 @@ ** **********************************************************************/ -#include "qobjectlist.h" +#include "tqobjectlist.h" #include "previewwidgetimpl.h" -PreviewWidget::PreviewWidget( QWidget *parent, const char *name ) +PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) : PreviewWidgetBase( parent, name ) { // install event filter on child widgets - QObjectList *l = queryList("QWidget"); - QObjectListIt it(*l); - QObject * obj; + TQObjectList *l = queryList("TQWidget"); + TQObjectListIt it(*l); + TQObject * obj; while ((obj = it.current()) != 0) { ++it; obj->installEventFilter(this); - ((QWidget*)obj)->setFocusPolicy(NoFocus); + ((TQWidget*)obj)->setFocusPolicy(NoFocus); } } -void PreviewWidget::closeEvent(QCloseEvent *e) +void PreviewWidget::closeEvent(TQCloseEvent *e) { e->ignore(); } -bool PreviewWidget::eventFilter(QObject *, QEvent *e) +bool PreviewWidget::eventFilter(TQObject *, TQEvent *e) { switch ( e->type() ) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: - case QEvent::KeyPress: - case QEvent::KeyRelease: - case QEvent::Enter: - case QEvent::Leave: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::MouseButtonDblClick: + case TQEvent::MouseMove: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: + case TQEvent::Enter: + case TQEvent::Leave: return TRUE; // ignore; default: break; diff --git a/kdevdesigner/designer/previewwidgetimpl.h b/kdevdesigner/designer/previewwidgetimpl.h index 63227cdd..497e2fe0 100644 --- a/kdevdesigner/designer/previewwidgetimpl.h +++ b/kdevdesigner/designer/previewwidgetimpl.h @@ -34,10 +34,10 @@ class PreviewWidget : public PreviewWidgetBase Q_OBJECT public: - PreviewWidget( QWidget *parent = 0, const char *name = 0 ); + PreviewWidget( TQWidget *parent = 0, const char *name = 0 ); - void closeEvent(QCloseEvent *); - bool eventFilter(QObject *, QEvent *); + void closeEvent(TQCloseEvent *); + bool eventFilter(TQObject *, TQEvent *); }; #endif diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp index 2a261d20..0ab960ea 100644 --- a/kdevdesigner/designer/project.cpp +++ b/kdevdesigner/designer/project.cpp @@ -33,25 +33,25 @@ #include "dbconnectionimpl.h" #endif #include "resource.h" -#include +#include #include "outputwindow.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "mainwindow.h" -#include +#include #ifndef QT_NO_SQL -#include -#include -#include +#include +#include +#include #endif #include @@ -74,11 +74,11 @@ bool DatabaseConnection::refreshCatalog() return TRUE; if ( !open() ) return FALSE; - tbls = conn->tables( QSql::TableType( QSql::Tables | QSql::Views ) ); + tbls = conn->tables( TQSql::TableType( TQSql::Tables | TQSql::Views ) ); flds.clear(); - for ( QStringList::Iterator it = tbls.begin(); it != tbls.end(); ++it ) { - QSqlRecord fil = conn->record( *it ); - QStringList lst; + for ( TQStringList::Iterator it = tbls.begin(); it != tbls.end(); ++it ) { + TQSqlRecord fil = conn->record( *it ); + TQStringList lst; for ( uint j = 0; j < fil.count(); ++j ) lst << fil.field( j )->name(); flds.insert( *it, lst ); @@ -95,9 +95,9 @@ bool DatabaseConnection::refreshCatalog() void DatabaseConnection::remove() { if ( nm == "(default)" ) - QSqlDatabase::removeDatabase( QSqlDatabase::defaultConnection ); + TQSqlDatabase::removeDatabase( TQSqlDatabase::defaultConnection ); else - QSqlDatabase::removeDatabase( nm ); + TQSqlDatabase::removeDatabase( nm ); // the above will effectively delete the current connection conn = 0; } @@ -108,15 +108,15 @@ bool DatabaseConnection::open( bool suppressDialog ) #ifndef QT_NO_SQL // register our name, if nec if ( nm == "(default)" ) { - if ( !QSqlDatabase::contains() ) // default doesn't exists? - conn = QSqlDatabase::addDatabase( drv ); + if ( !TQSqlDatabase::contains() ) // default doesn't exists? + conn = TQSqlDatabase::addDatabase( drv ); else - conn = QSqlDatabase::database(); + conn = TQSqlDatabase::database(); } else { - if ( !QSqlDatabase::contains( nm ) ) - conn = QSqlDatabase::addDatabase( drv, nm ); + if ( !TQSqlDatabase::contains( nm ) ) + conn = TQSqlDatabase::addDatabase( drv, nm ); else - conn = QSqlDatabase::database( nm ); + conn = TQSqlDatabase::database( nm ); } conn->setDatabaseName( dbName ); conn->setUserName( uname ); @@ -129,10 +129,10 @@ bool DatabaseConnection::open( bool suppressDialog ) if ( !success ) { DatabaseConnectionEditor dia( this, 0 , 0 , TRUE ); switch( dia.exec() ) { - case QDialog::Accepted: + case TQDialog::Accepted: done = FALSE; break; - case QDialog::Rejected: + case TQDialog::Rejected: done = TRUE; break; } @@ -145,14 +145,14 @@ bool DatabaseConnection::open( bool suppressDialog ) conn->setPort( prt ); success = conn->open(); if ( !success ) { - switch( QMessageBox::warning( project->messageBoxParent(), i18n( "Connection" ), + switch( TQMessageBox::warning( project->messageBoxParent(), i18n( "Connection" ), i18n( "Could not connect to the database.\n" "Press 'OK' to continue or 'Cancel' to " "specify different\nconnection information.\n" ) - + QString( "[" + conn->lastError().driverText() + "\n" + + + TQString( "[" + conn->lastError().driverText() + "\n" + conn->lastError().databaseText() + "]\n" ), i18n( "&OK" ), - i18n( "&Cancel" ), QString::null, 0, 1 ) ) { + i18n( "&Cancel" ), TQString::null, 0, 1 ) ) { case 0: // OK or Enter continue; case 1: // Cancel or Escape @@ -201,9 +201,9 @@ bool Project::isDummy() const return isDummyProject; } -Project::Project( const QString &fn, const QString &pName, +Project::Project( const TQString &fn, const TQString &pName, QPluginManager *pm, bool isDummy, - const QString &l ) + const TQString &l ) : proName( pName ), projectSettingsPluginManager( pm ), isDummyProject( isDummy ) { modified = TRUE; @@ -237,7 +237,7 @@ void Project::setModified( bool b ) } #ifndef QT_NO_SQL -DatabaseConnection *Project::databaseConnection( const QString &name ) +DatabaseConnection *Project::databaseConnection( const TQString &name ) { for ( DatabaseConnection *conn = dbConnections.first(); conn; @@ -249,32 +249,32 @@ DatabaseConnection *Project::databaseConnection( const QString &name ) } #endif -void Project::setFileName( const QString &fn, bool doClear ) +void Project::setFileName( const TQString &fn, bool doClear ) { if ( fn == filename ) return; if ( singleProjectMode() ) { - QString qsa = QString( getenv( "HOME" ) ) + QString( "/.qsa" ); - if ( !QFile::exists( qsa ) ) { - QDir d; + TQString qsa = TQString( getenv( "HOME" ) ) + TQString( "/.qsa" ); + if ( !TQFile::exists( qsa ) ) { + TQDir d; d.mkdir( qsa ); } if ( fn == singleProFileName ) return; singleProFileName = fn; static int counter = 0; - QString str_counter = QString::number( counter++ ); + TQString str_counter = TQString::number( counter++ ); str_counter = "/.qsa/" + str_counter; LanguageInterface *iface = MetaDataBase::languageInterface( language() ); - filename = QString( getenv( "HOME" ) + str_counter + QString( "tmp_" ) + - QFileInfo( fn ).baseName() + "/" + QFileInfo( fn ).baseName() + ".pro" ); + filename = TQString( getenv( "HOME" ) + str_counter + TQString( "tmp_" ) + + TQFileInfo( fn ).baseName() + "/" + TQFileInfo( fn ).baseName() + ".pro" ); removeTempProject(); if ( iface && iface->supports( LanguageInterface::CompressProject ) ) { filename = iface->uncompressProject( makeAbsolute( singleProFileName ), - QString( getenv( "HOME" ) + - str_counter + QString( "tmp_" ) + - QFileInfo( fn ).baseName() ) ); + TQString( getenv( "HOME" ) + + str_counter + TQString( "tmp_" ) + + TQFileInfo( fn ).baseName() ) ); proName = makeAbsolute( singleProFileName ); } } else { @@ -291,34 +291,34 @@ void Project::setFileName( const QString &fn, bool doClear ) if ( !doClear ) return; clear(); - if ( QFile::exists( filename ) ) + if ( TQFile::exists( filename ) ) parse(); } -QString Project::fileName( bool singlePro ) const +TQString Project::fileName( bool singlePro ) const { if ( singlePro ) return singleProFileName; return filename; } -QString Project::databaseDescription() const +TQString Project::databaseDescription() const { return dbFile; } -QString Project::projectName() const +TQString Project::projectName() const { return proName; } -static QString parse_part( const QString &part ) +static TQString parse_part( const TQString &part ) { - QString res; + TQString res; bool inName = FALSE; - QString currName; + TQString currName; for ( int i = 0; i < (int)part.length(); ++i ) { - QChar c = part[ i ]; + TQChar c = part[ i ]; if ( !inName ) { if ( c != ' ' && c != '\t' && c != '\n' && c != '=' && c != '\\' && c != '+' ) inName = TRUE; @@ -334,16 +334,16 @@ static QString parse_part( const QString &part ) return res; } -QStringList parse_multiline_part( const QString &contents, const QString &key, int *start = 0 ) +TQStringList parse_multiline_part( const TQString &contents, const TQString &key, int *start = 0 ) { if ( start ) *start = -1; - QString lastWord; + TQString lastWord; // Account for things like win32: SOURCES int extraWhiteSpaceCount = 0; int braceCount = 0; for ( int i = 0; i < (int)contents.length(); ++i ) { - QChar c( contents[ i ] ); + TQChar c( contents[ i ] ); switch ( c ) { case '{': braceCount++; @@ -372,9 +372,9 @@ QStringList parse_multiline_part( const QString &contents, const QString &key, i if ( lastWord == key && braceCount == 0 ) { if ( start ) *start = i - lastWord.length() - extraWhiteSpaceCount + 1; - QStringList lst; + TQStringList lst; bool inName = FALSE; - QString currName; + TQString currName; bool hadEqual = FALSE; for ( ; i < (int)contents.length(); ++i ) { c = contents[ i ]; @@ -389,7 +389,7 @@ QStringList parse_multiline_part( const QString &contents, const QString &key, i c == '$' || c == '-' || c == '(' || c == ')' || c == ':' || c == '+' || c == ',' || c == '~' ) && c != ' ' && c != '\t' && c != '\n' ) { if ( !inName ) - currName = QString::null; + currName = TQString::null; if ( c != '\\' || contents[i+1] != '\n' ) { currName += c; inName = TRUE; @@ -408,27 +408,27 @@ QStringList parse_multiline_part( const QString &contents, const QString &key, i } } - return QStringList(); + return TQStringList(); } void Project::parse() { - QFile f( filename ); + TQFile f( filename ); if ( !f.exists() || !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); - QString contents = ts.read(); + TQTextStream ts( &f ); + TQString contents = ts.read(); f.close(); - proName = QFileInfo( filename ).baseName(); + proName = TQFileInfo( filename ).baseName(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int i = contents.find( "LANGUAGE" ); if ( i != -1 ) { lang = ""; is_cpp = FALSE; - QString part = contents.mid( i + QString( "LANGUAGE" ).length() ); + TQString part = contents.mid( i + TQString( "LANGUAGE" ).length() ); lang = parse_part( part ); is_cpp = lang == "C++"; } @@ -436,11 +436,11 @@ void Project::parse() i = contents.find( "DBFILE" ); if ( i != -1 ) { dbFile = ""; - QString part = contents.mid( i + QString( "DBFILE" ).length() ); + TQString part = contents.mid( i + TQString( "DBFILE" ).length() ); dbFile = parse_part( part ); } - QStringList uifiles = parse_multiline_part( contents, "FORMS" ); + TQStringList uifiles = parse_multiline_part( contents, "FORMS" ); uifiles += parse_multiline_part( contents, "INTERFACES" ); // compatibility for ( it = uifiles.begin(); it != uifiles.end(); ++it ) { if ( (*it).startsWith( "__APPOBJ" ) ) @@ -452,7 +452,7 @@ void Project::parse() i = contents.find( "TEMPLATE" ); if ( i != -1 ) { templ = ""; - QString part = contents.mid( i + QString( "TEMPLATE" ).length() ); + TQString part = contents.mid( i + TQString( "TEMPLATE" ).length() ); templ = parse_part( part ); } @@ -465,11 +465,11 @@ void Project::parse() LanguageInterface *iface = MetaDataBase::languageInterface( lang ); if ( iface ) { - QStringList sourceKeys; + TQStringList sourceKeys; iface->sourceProjectKeys( sourceKeys ); - for ( QStringList::Iterator it = sourceKeys.begin(); it != sourceKeys.end(); ++it ) { - QStringList lst = parse_multiline_part( contents, *it ); - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + for ( TQStringList::Iterator it = sourceKeys.begin(); it != sourceKeys.end(); ++it ) { + TQStringList lst = parse_multiline_part( contents, *it ); + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) (void) new SourceFile( *it, FALSE, this ); } } @@ -479,8 +479,8 @@ void Project::parse() for ( it = csList.begin(); it != csList.end(); ++it ) { i = contents.find( *it ); if ( i != -1 ) { - QString val = ""; - QString part = contents.mid( i + QString( *it ).length() ); + TQString val = ""; + TQString part = contents.mid( i + TQString( *it ).length() ); val = parse_part( part ); customSettings.replace( *it, val ); } @@ -488,17 +488,17 @@ void Project::parse() loadConnections(); - QStringList images = parse_multiline_part( contents, "IMAGES" ); + TQStringList images = parse_multiline_part( contents, "IMAGES" ); // ### remove that for the final - this is beta-compatibility - if ( images.isEmpty() && QDir( QFileInfo( filename ).dirPath( TRUE ) + "/images" ).exists() ) { - images = QDir( QFileInfo( filename ).dirPath( TRUE ) + "/images" ).entryList(); + if ( images.isEmpty() && TQDir( TQFileInfo( filename ).dirPath( TRUE ) + "/images" ).exists() ) { + images = TQDir( TQFileInfo( filename ).dirPath( TRUE ) + "/images" ).entryList(); for ( int i = 0; i < (int)images.count(); ++i ) images[ i ].prepend( "images/" ); modified = TRUE; } - for ( QStringList::ConstIterator pit = images.begin(); pit != images.end(); ++pit ) + for ( TQStringList::ConstIterator pit = images.begin(); pit != images.end(); ++pit ) pixCollection->load( *pit ); } @@ -521,17 +521,17 @@ bool Project::removeSourceFile( SourceFile *sf ) return TRUE; } -void Project::setDatabaseDescription( const QString &db ) +void Project::setDatabaseDescription( const TQString &db ) { dbFile = db; } -void Project::setDescription( const QString &s ) +void Project::setDescription( const TQString &s ) { desc = s; } -QString Project::description() const +TQString Project::description() const { return desc; } @@ -546,28 +546,28 @@ bool Project::isValid() const return TRUE; } -QString Project::makeAbsolute( const QString &f ) +TQString Project::makeAbsolute( const TQString &f ) { if ( isDummy() ) return f; - QString encodedUrl = QFileInfo( filename ).dirPath( TRUE ); - QUrl::encode( encodedUrl ); - QUrl u( encodedUrl, f ); + TQString encodedUrl = TQFileInfo( filename ).dirPath( TRUE ); + TQUrl::encode( encodedUrl ); + TQUrl u( encodedUrl, f ); return u.path(); } -QString Project::makeRelative( const QString &f ) +TQString Project::makeRelative( const TQString &f ) { if ( isDummy() ) return f; - QString p = QFileInfo( filename ).dirPath( TRUE ); - QString f2 = f; + TQString p = TQFileInfo( filename ).dirPath( TRUE ); + TQString f2 = f; if ( f2.left( p.length() ) == p ) f2.remove( 0, p.length() + 1 ); return f2; } -static void remove_contents( QString &contents, const QString &s ) +static void remove_contents( TQString &contents, const TQString &s ) { int i = contents.find( s ); if ( i != -1 ) { @@ -579,7 +579,7 @@ static void remove_contents( QString &contents, const QString &s ) } } -static void remove_multiline_contents( QString &contents, const QString &s, int *strt = 0 ) +static void remove_multiline_contents( TQString &contents, const TQString &s, int *strt = 0 ) { int i = contents.find( s ); if ( strt ) @@ -631,13 +631,13 @@ void Project::save( bool onlyProjectFile ) return; } - QFile f( filename ); - QString original = ""; + TQFile f( filename ); + TQString original = ""; // read the existing file bool hasPreviousContents = FALSE; if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); + TQTextStream ts( &f ); original = ts.read(); f.close(); hasPreviousContents = TRUE; @@ -654,12 +654,12 @@ void Project::save( bool onlyProjectFile ) remove_multiline_contents( original, "FORMS" ); remove_multiline_contents( original, "INTERFACES" ); // compatibility remove_multiline_contents( original, "IMAGES" ); - for ( QStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) + for ( TQStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) remove_contents( original, *it ); } // the contents of the saved file - QString contents; + TQString contents; // template contents += "TEMPLATE\t= " + templ + "\n"; @@ -672,9 +672,9 @@ void Project::save( bool onlyProjectFile ) writePlatformSettings( contents, "CONFIG", cfg ); LanguageInterface *iface = MetaDataBase::languageInterface( lang ); if ( iface ) { - QStringList sourceKeys; + TQStringList sourceKeys; iface->sourceProjectKeys( sourceKeys ); - for ( QStringList::Iterator spit = sourceKeys.begin(); spit != sourceKeys.end(); ++spit ) + for ( TQStringList::Iterator spit = sourceKeys.begin(); spit != sourceKeys.end(); ++spit ) remove_multiline_contents( contents, *spit ); } contents += "\n"; @@ -699,19 +699,19 @@ void Project::save( bool onlyProjectFile ) // sources if ( !sourcefiles.isEmpty() && iface ) { - QMap sourceToKey; + TQMap sourceToKey; for ( SourceFile *f = sourcefiles.first(); f; f = sourcefiles.next() ) { - QString key = iface->projectKeyForExtension( QFileInfo( f->fileName() ).extension() ); - QStringList lst = sourceToKey[ key ]; + TQString key = iface->projectKeyForExtension( TQFileInfo( f->fileName() ).extension() ); + TQStringList lst = sourceToKey[ key ]; lst << makeRelative( f->fileName() ); sourceToKey.replace( key, lst ); } - for ( QMap::Iterator skit = sourceToKey.begin(); + for ( TQMap::Iterator skit = sourceToKey.begin(); skit != sourceToKey.end(); ++skit ) { - QString part = skit.key() + "\t+= "; - QStringList lst = *skit; - for ( QStringList::Iterator sit = lst.begin(); sit != lst.end(); ++sit ) { + TQString part = skit.key() + "\t+= "; + TQStringList lst = *skit; + for ( TQStringList::Iterator sit = lst.begin(); sit != lst.end(); ++sit ) { part += *sit; part += ++sit != lst.end() ? " \\\n\t" : ""; --sit; @@ -724,7 +724,7 @@ void Project::save( bool onlyProjectFile ) // forms and interfaces if ( !formfiles.isEmpty() ) { contents += "FORMS\t= "; - for ( QPtrListIterator fit = formfiles; fit.current(); ++fit ) { + for ( TQPtrListIterator fit = formfiles; fit.current(); ++fit ) { contents += fit.current()->fileName() + (fit != formfiles.last() ? " \\\n\t" : ""); } @@ -734,8 +734,8 @@ void Project::save( bool onlyProjectFile ) // images if ( !pixCollection->isEmpty() ) { contents += "IMAGES\t= "; - QValueList pixmaps = pixCollection->pixmaps(); - for ( QValueList::Iterator it = pixmaps.begin(); + TQValueList pixmaps = pixCollection->pixmaps(); + for ( TQValueList::Iterator it = pixmaps.begin(); it != pixmaps.end(); ++it ) { contents += makeRelative( (*it).absname ); contents += ++it != pixmaps.end() ? " \\\n\t" : ""; @@ -750,19 +750,19 @@ void Project::save( bool onlyProjectFile ) contents += "\n"; // custom settings - for ( QStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) { - QString val = *customSettings.find( *it ); + for ( TQStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) { + TQString val = *customSettings.find( *it ); if ( !val.isEmpty() ) contents += *it + "\t= " + val + "\n"; } if ( !f.open( IO_WriteOnly | IO_Translate ) ) { - QMessageBox::warning( messageBoxParent(), + TQMessageBox::warning( messageBoxParent(), "Save Project Failed", "Couldn't write project file " + filename ); return; } - QTextStream os( &f ); + TQTextStream os( &f ); os << contents; if (hasPreviousContents) os << original; @@ -779,14 +779,14 @@ void Project::save( bool onlyProjectFile ) } #ifndef QT_NO_SQL -QPtrList Project::databaseConnections() const +TQPtrList Project::databaseConnections() const { return dbConnections; } #endif #ifndef QT_NO_SQL -void Project::setDatabaseConnections( const QPtrList &lst ) +void Project::setDatabaseConnections( const TQPtrList &lst ) { dbConnections = lst; } @@ -801,7 +801,7 @@ void Project::addDatabaseConnection( DatabaseConnection *conn ) #endif #ifndef QT_NO_SQL -void Project::removeDatabaseConnection( const QString &c ) +void Project::removeDatabaseConnection( const TQString &c ) { for ( DatabaseConnection *conn = dbConnections.first(); conn; conn = dbConnections.next() ) { if ( conn->name() == c ) { @@ -815,9 +815,9 @@ void Project::removeDatabaseConnection( const QString &c ) #endif #ifndef QT_NO_SQL -QStringList Project::databaseConnectionList() +TQStringList Project::databaseConnectionList() { - QStringList lst; + TQStringList lst; for ( DatabaseConnection *conn = dbConnections.first(); conn; conn = dbConnections.next() ) lst << conn->name(); return lst; @@ -825,37 +825,37 @@ QStringList Project::databaseConnectionList() #endif #ifndef QT_NO_SQL -QStringList Project::databaseTableList( const QString &connection ) +TQStringList Project::databaseTableList( const TQString &connection ) { DatabaseConnection *conn = databaseConnection( connection ); if ( !conn ) { - return QStringList(); + return TQStringList(); } return conn->tables(); } #endif #ifndef QT_NO_SQL -QStringList Project::databaseFieldList( const QString &connection, const QString &table ) +TQStringList Project::databaseFieldList( const TQString &connection, const TQString &table ) { DatabaseConnection *conn = databaseConnection( connection ); if ( !conn ) - return QStringList(); + return TQStringList(); return conn->fields( table ); } #endif #ifndef QT_NO_SQL -static QString makeIndent( int indent ) +static TQString makeIndent( int indent ) { - QString s; + TQString s; s.fill( ' ', indent * 4 ); return s; } #endif #ifndef QT_NO_SQL -static void saveSingleProperty( QTextStream &ts, const QString& name, const QString& value, int indent ) +static void saveSingleProperty( TQTextStream &ts, const TQString& name, const TQString& value, int indent ) { ts << makeIndent( indent ) << "" << endl; ++indent; @@ -869,11 +869,11 @@ void Project::saveConnections() { #ifndef QT_NO_SQL if ( dbFile.isEmpty() ) { - QFileInfo fi( fileName() ); + TQFileInfo fi( fileName() ); setDatabaseDescription( fi.baseName() + ".db" ); } - QFile f( makeAbsolute( dbFile ) ); + TQFile f( makeAbsolute( dbFile ) ); if ( dbConnections.isEmpty() ) { if ( f.exists() ) @@ -885,8 +885,8 @@ void Project::saveConnections() /* .db xml */ if ( f.open( IO_WriteOnly | IO_Translate ) ) { - QTextStream ts( &f ); - ts.setCodec( QTextCodec::codecForName( "UTF-8" ) ); + TQTextStream ts( &f ); + ts.setCodec( TQTextCodec::codecForName( "UTF-8" ) ); ts << "" << endl; /* db connections */ @@ -899,19 +899,19 @@ void Project::saveConnections() saveSingleProperty( ts, "database", conn->database(), indent ); saveSingleProperty( ts, "username", conn->username(), indent ); saveSingleProperty( ts, "hostname", conn->hostname(), indent ); - saveSingleProperty( ts, "port", QString::number( conn->port() ), indent ); + saveSingleProperty( ts, "port", TQString::number( conn->port() ), indent ); /* connection tables */ - QStringList tables = conn->tables(); - for ( QStringList::Iterator it = tables.begin(); + TQStringList tables = conn->tables(); + for ( TQStringList::Iterator it = tables.begin(); it != tables.end(); ++it ) { ts << makeIndent( indent ) << "" << endl; ++indent; saveSingleProperty( ts, "name", (*it), indent ); /* tables fields */ - QStringList fields = conn->fields( *it ); - for ( QStringList::Iterator it2 = fields.begin(); + TQStringList fields = conn->fields( *it ); + for ( TQStringList::Iterator it2 = fields.begin(); it2 != fields.end(); ++it2 ) { ts << makeIndent( indent ) << "" << endl; ++indent; @@ -935,9 +935,9 @@ void Project::saveConnections() } #ifndef QT_NO_SQL -static QDomElement loadSingleProperty( QDomElement e, const QString& name ) +static TQDomElement loadSingleProperty( TQDomElement e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { @@ -951,31 +951,31 @@ static QDomElement loadSingleProperty( QDomElement e, const QString& name ) void Project::loadConnections() { #ifndef QT_NO_SQL - if ( dbFile.isEmpty() || !QFile::exists( makeAbsolute( dbFile ) ) ) + if ( dbFile.isEmpty() || !TQFile::exists( makeAbsolute( dbFile ) ) ) return; - QFile f( makeAbsolute( dbFile ) ); + TQFile f( makeAbsolute( dbFile ) ); if ( f.open( IO_ReadOnly ) ) { - QDomDocument doc; - QString errMsg; + TQDomDocument doc; + TQString errMsg; int errLine; if ( doc.setContent( &f, &errMsg, &errLine ) ) { - QDomElement e; + TQDomElement e; e = doc.firstChild().toElement(); /* connections */ - QDomNodeList connections = e.toElement().elementsByTagName( "connection" ); + TQDomNodeList connections = e.toElement().elementsByTagName( "connection" ); for ( uint i = 0; i < connections.length(); i++ ) { - QDomElement connection = connections.item(i).toElement(); - QDomElement connectionName = loadSingleProperty( connection, "name" ); - QDomElement connectionDriver = loadSingleProperty( connection, "driver" ); - QDomElement connectionDatabase = loadSingleProperty( connection, + TQDomElement connection = connections.item(i).toElement(); + TQDomElement connectionName = loadSingleProperty( connection, "name" ); + TQDomElement connectionDriver = loadSingleProperty( connection, "driver" ); + TQDomElement connectionDatabase = loadSingleProperty( connection, "database" ); - QDomElement connectionUsername = loadSingleProperty( connection, + TQDomElement connectionUsername = loadSingleProperty( connection, "username" ); - QDomElement connectionHostname = loadSingleProperty( connection, + TQDomElement connectionHostname = loadSingleProperty( connection, "hostname" ); - QDomElement connectionPort = loadSingleProperty( connection, + TQDomElement connectionPort = loadSingleProperty( connection, "port" ); DatabaseConnection *conn = new DatabaseConnection( this ); @@ -984,21 +984,21 @@ void Project::loadConnections() conn->setDatabase( connectionDatabase.firstChild().firstChild().toText().data() ); conn->setUsername( connectionUsername.firstChild().firstChild().toText().data() ); conn->setHostname( connectionHostname.firstChild().firstChild().toText().data() ); - conn->setPort( QString( connectionPort.firstChild().firstChild().toText().data() ).toInt() ); + conn->setPort( TQString( connectionPort.firstChild().firstChild().toText().data() ).toInt() ); /* connection tables */ - QDomNodeList tables = connection.toElement().elementsByTagName( "table" ); + TQDomNodeList tables = connection.toElement().elementsByTagName( "table" ); for ( uint j = 0; j < tables.length(); j++ ) { - QDomElement table = tables.item(j).toElement(); - QDomElement tableName = loadSingleProperty( table, "name" ); + TQDomElement table = tables.item(j).toElement(); + TQDomElement tableName = loadSingleProperty( table, "name" ); conn->addTable( tableName.firstChild().firstChild().toText().data() ); /* table fields */ - QStringList fieldList; - QDomNodeList fields = table.toElement().elementsByTagName( "field" ); + TQStringList fieldList; + TQDomNodeList fields = table.toElement().elementsByTagName( "field" ); for ( uint k = 0; k < fields.length(); k++ ) { - QDomElement field = fields.item(k).toElement(); - QDomElement fieldName = loadSingleProperty( field, "name" ); + TQDomElement field = fields.item(k).toElement(); + TQDomElement fieldName = loadSingleProperty( field, "name" ); fieldList.append( fieldName.firstChild().firstChild().toText().data() ); } conn->setFields( tableName.firstChild().firstChild().toText().data(), @@ -1008,7 +1008,7 @@ void Project::loadConnections() dbConnections.append( conn ); } } else { - qDebug( QString("Parse error: ") + errMsg + QString(" in line %d"), errLine ); + qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); } f.close(); } @@ -1019,7 +1019,7 @@ void Project::loadConnections() can be closed again with closeDatabase(). */ -bool Project::openDatabase( const QString &connection, bool suppressDialog ) +bool Project::openDatabase( const TQString &connection, bool suppressDialog ) { #ifndef QT_NO_SQL DatabaseConnection *conn = databaseConnection( connection ); @@ -1038,7 +1038,7 @@ bool Project::openDatabase( const QString &connection, bool suppressDialog ) /*! Closes the database \a connection. */ -void Project::closeDatabase( const QString &connection ) +void Project::closeDatabase( const TQString &connection ) { #ifndef QT_NO_SQL DatabaseConnection *conn = databaseConnection( connection ); @@ -1057,16 +1057,16 @@ void Project::closeDatabase( const QString &connection ) // formWindows.remove( fw ); // } -QObjectList *Project::formList( bool resolveFakeObjects ) const +TQObjectList *Project::formList( bool resolveFakeObjects ) const { - QObjectList *l = new QObjectList; - for ( QPtrListIterator forms(formfiles); forms.current(); ++forms ) { + TQObjectList *l = new QObjectList; + for ( TQPtrListIterator forms(formfiles); forms.current(); ++forms ) { FormFile* f = forms.current(); if ( f->formWindow() ) { if ( resolveFakeObjects && f->formWindow()->isFake() ) l->append( objectForFakeForm( f->formWindow() ) ); else - l->append( f->formWindow()->child( 0, "QWidget" ) ); + l->append( f->formWindow()->child( 0, "TQWidget" ) ); } else if ( f->isFake() ) { l->append( objectForFakeFormFile( f ) ); } @@ -1081,7 +1081,7 @@ DesignerProject *Project::iFace() return iface; } -void Project::setLanguage( const QString &l ) +void Project::setLanguage( const TQString &l ) { if ( l == lang ) return; @@ -1091,19 +1091,19 @@ void Project::setLanguage( const QString &l ) modified = TRUE; } -QString Project::language() const +TQString Project::language() const { return lang; } -void Project::setCustomSetting( const QString &key, const QString &value ) +void Project::setCustomSetting( const TQString &key, const TQString &value ) { customSettings.remove( key ); customSettings.insert( key, value ); modified = TRUE; } -QString Project::customSetting( const QString &key ) const +TQString Project::customSetting( const TQString &key ) const { return *customSettings.find( key ); } @@ -1144,9 +1144,9 @@ void Project::addSourceFile( SourceFile *sf ) } -SourceFile* Project::findSourceFile( const QString& filename, SourceFile *ignore ) const +SourceFile* Project::findSourceFile( const TQString& filename, SourceFile *ignore ) const { - QPtrListIterator it(sourcefiles); + TQPtrListIterator it(sourcefiles); while ( it.current() ) { if ( it.current() != ignore && it.current()->fileName() == filename ) return it.current(); @@ -1155,9 +1155,9 @@ SourceFile* Project::findSourceFile( const QString& filename, SourceFile *ignore return 0; } -FormFile* Project::findFormFile( const QString& filename, FormFile *ignore ) const +FormFile* Project::findFormFile( const TQString& filename, FormFile *ignore ) const { - QPtrListIterator it(formfiles); + TQPtrListIterator it(formfiles); while ( it.current() ) { if ( it.current() != ignore && it.current()->fileName() == filename ) return it.current(); @@ -1166,7 +1166,7 @@ FormFile* Project::findFormFile( const QString& filename, FormFile *ignore ) con return 0; } -void Project::setIncludePath( const QString &platform, const QString &path ) +void Project::setIncludePath( const TQString &platform, const TQString &path ) { if ( inclPath[platform] == path ) return; @@ -1174,98 +1174,98 @@ void Project::setIncludePath( const QString &platform, const QString &path ) modified = TRUE; } -void Project::setLibs( const QString &platform, const QString &path ) +void Project::setLibs( const TQString &platform, const TQString &path ) { lbs.replace( platform, path ); } -void Project::setDefines( const QString &platform, const QString &path ) +void Project::setDefines( const TQString &platform, const TQString &path ) { defs.replace( platform, path ); } -void Project::setConfig( const QString &platform, const QString &config ) +void Project::setConfig( const TQString &platform, const TQString &config ) { cfg.replace( platform, config ); } -QString Project::config( const QString &platform ) const +TQString Project::config( const TQString &platform ) const { return cfg[ platform ]; } -QString Project::libs( const QString &platform ) const +TQString Project::libs( const TQString &platform ) const { return lbs[ platform ]; } -QString Project::defines( const QString &platform ) const +TQString Project::defines( const TQString &platform ) const { return defs[ platform ]; } -QString Project::includePath( const QString &platform ) const +TQString Project::includePath( const TQString &platform ) const { return inclPath[ platform ]; } -QString Project::templte() const +TQString Project::templte() const { return templ; } -void Project::setTemplate( const QString &t ) +void Project::setTemplate( const TQString &t ) { templ = t; } -void Project::readPlatformSettings( const QString &contents, - const QString &setting, - QMap &res ) +void Project::readPlatformSettings( const TQString &contents, + const TQString &setting, + TQMap &res ) { - const QString platforms[] = { "", "win32", "unix", "mac", QString::null }; - for ( int i = 0; platforms[ i ] != QString::null; ++i ) { - QString p = platforms[ i ]; + const TQString platforms[] = { "", "win32", "unix", "mac", TQString::null }; + for ( int i = 0; platforms[ i ] != TQString::null; ++i ) { + TQString p = platforms[ i ]; if ( !p.isEmpty() ) p += ":"; - QStringList lst = parse_multiline_part( contents, p + setting ); - QString s = lst.join( " " ); - QString key = platforms[ i ]; + TQStringList lst = parse_multiline_part( contents, p + setting ); + TQString s = lst.join( " " ); + TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; res.replace( key, s ); } } -void Project::removePlatformSettings( QString &contents, const QString &setting ) +void Project::removePlatformSettings( TQString &contents, const TQString &setting ) { - const QString platforms[] = { "win32", "unix", "mac", "", QString::null }; - for ( int i = 0; platforms[ i ] != QString::null; ++i ) { - QString p = platforms[ i ]; + const TQString platforms[] = { "win32", "unix", "mac", "", TQString::null }; + for ( int i = 0; platforms[ i ] != TQString::null; ++i ) { + TQString p = platforms[ i ]; if ( !p.isEmpty() ) p += ":"; remove_multiline_contents( contents, p + setting ); } } -void Project::writePlatformSettings( QString &contents, const QString &setting, - const QMap &input ) +void Project::writePlatformSettings( TQString &contents, const TQString &setting, + const TQMap &input ) { - const QString platforms[] = { "", "win32", "unix", "mac", QString::null }; + const TQString platforms[] = { "", "win32", "unix", "mac", TQString::null }; int i; LanguageInterface *iface = MetaDataBase::languageInterface( lang ); if (iface && (setting == "SOURCES" || setting == "HEADERS")) // The (all) part will be saved later on i = 1; else i = 0; - for (; platforms[ i ] != QString::null; ++i ) { - QString p = platforms[ i ]; + for (; platforms[ i ] != TQString::null; ++i ) { + TQString p = platforms[ i ]; if ( !p.isEmpty() ) p += ":"; - QString key = platforms[ i ]; + TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; - QMap::ConstIterator it = input.find( key ); + TQMap::ConstIterator it = input.find( key ); if ( it == input.end() || (*it).isEmpty() ) continue; contents += p + setting + "\t+= " + *it + "\n"; @@ -1291,29 +1291,29 @@ bool Project::removeFormFile( FormFile *ff ) return TRUE; } -void Project::addObject( QObject *o ) +void Project::addObject( TQObject *o ) { bool wasModified = modified; objs.append( o ); FormFile *ff = new FormFile( "", FALSE, this, "qt_fakewindow" ); - ff->setFileName( "__APPOBJ" + QString( o->name() ) + ".ui" ); + ff->setFileName( "__APPOBJ" + TQString( o->name() ) + ".ui" ); fakeFormFiles.insert( (void*)o, ff ); MetaDataBase::addEntry( o ); if ( hasGUI() ) { - QWidget *parent = MainWindow::self ? MainWindow::self->qWorkspace() : 0; + TQWidget *parent = MainWindow::self ? MainWindow::self->qWorkspace() : 0; FormWindow *fw = new FormWindow( ff, MainWindow::self, parent, "qt_fakewindow" ); fw->setProject( this ); - if ( QFile::exists( ff->absFileName() ) ) + if ( TQFile::exists( ff->absFileName() ) ) Resource::loadExtraSource( ff, ff->absFileName(), MetaDataBase::languageInterface( language() ), FALSE ); if ( MainWindow::self ) fw->setMainWindow( MainWindow::self ); if ( MainWindow::self ) { - QApplication::sendPostedEvents( MainWindow::self->qWorkspace(), QEvent::ChildInserted ); + TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), TQEvent::ChildInserted ); connect( fw, - SIGNAL( undoRedoChanged( bool, bool, const QString &, const QString & ) ), + TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), MainWindow::self, - SLOT( updateUndoRedo( bool, bool, const QString &, const QString & ) ) + TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); } if ( fw->parentWidget() ) { @@ -1321,7 +1321,7 @@ void Project::addObject( QObject *o ) fw->show(); } } else { - if ( QFile::exists( ff->absFileName() ) ) + if ( TQFile::exists( ff->absFileName() ) ) Resource::loadExtraSource( ff, ff->absFileName(), MetaDataBase::languageInterface( language() ), FALSE ); } @@ -1329,13 +1329,13 @@ void Project::addObject( QObject *o ) modified = wasModified; } -void Project::setObjects( const QObjectList &ol ) +void Project::setObjects( const TQObjectList &ol ) { - for ( QObjectListIt it( ol ); it.current(); ++it ) + for ( TQObjectListIt it( ol ); it.current(); ++it ) addObject( it.current() ); } -void Project::removeObject( QObject *o ) +void Project::removeObject( TQObject *o ) { bool wasModified = modified; objs.removeRef( o ); @@ -1345,31 +1345,31 @@ void Project::removeObject( QObject *o ) modified = wasModified; } -QObjectList Project::objects() const +TQObjectList Project::objects() const { return objs; } -FormFile *Project::fakeFormFileFor( QObject *o ) const +FormFile *Project::fakeFormFileFor( TQObject *o ) const { return fakeFormFiles.find( (void*)o ); } -QObject *Project::objectForFakeForm( FormWindow *fw ) const +TQObject *Project::objectForFakeForm( FormWindow *fw ) const { - for ( QPtrDictIterator it( fakeFormFiles ); it.current(); ++it ) { + for ( TQPtrDictIterator it( fakeFormFiles ); it.current(); ++it ) { if ( it.current()->formWindow() == fw || it.current() == fw->formFile() ) - return (QObject*)it.currentKey(); + return (TQObject*)it.currentKey(); } return 0; } -QObject *Project::objectForFakeFormFile( FormFile *ff ) const +TQObject *Project::objectForFakeFormFile( FormFile *ff ) const { - for ( QPtrDictIterator it( fakeFormFiles ); it.current(); ++it ) { + for ( TQPtrDictIterator it( fakeFormFiles ); it.current(); ++it ) { if ( it.current() == ff ) - return (QObject*)it.currentKey(); + return (TQObject*)it.currentKey(); } return 0; } @@ -1378,45 +1378,45 @@ void Project::removeTempProject() { if ( !singleProjectMode() ) return; - QDir d( QFileInfo( filename ).dirPath() ); - if ( !d.exists( QFileInfo( filename ).dirPath() ) ) + TQDir d( TQFileInfo( filename ).dirPath() ); + if ( !d.exists( TQFileInfo( filename ).dirPath() ) ) return; - QStringList files = d.entryList( QDir::Files ); - QStringList::Iterator it; + TQStringList files = d.entryList( TQDir::Files ); + TQStringList::Iterator it; for ( it = files.begin(); it != files.end(); ++it ) { d.remove( *it ); } - if ( d.exists( QFileInfo( filename ).dirPath() + "/images" ) ) { - d = QDir( QFileInfo( filename ).dirPath() + "/images" ); - files = d.entryList( QDir::Files ); + if ( d.exists( TQFileInfo( filename ).dirPath() + "/images" ) ) { + d = TQDir( TQFileInfo( filename ).dirPath() + "/images" ); + files = d.entryList( TQDir::Files ); for ( it = files.begin(); it != files.end(); ++it ) d.remove( *it ); - d = QDir( QFileInfo( filename ).dirPath() ); + d = TQDir( TQFileInfo( filename ).dirPath() ); d.remove( "images" ); } - d.remove( QFileInfo( filename ).dirPath() ); + d.remove( TQFileInfo( filename ).dirPath() ); #if defined(Q_OS_UNIX) // ##### implement for all platforms, ideally should be in Qt - ::rmdir( QFile::encodeName( d.absPath() ) ); + ::rmdir( TQFile::encodeName( d.absPath() ) ); #endif } -void Project::addAndEditFunction( const QString &function, const QString &functionBody, bool openDeveloper ) +void Project::addAndEditFunction( const TQString &function, const TQString &functionBody, bool openDeveloper ) { for ( SourceFile *f = sourcefiles.first(); f; f = sourcefiles.next() ) { - if ( QFileInfo( f->fileName() ).baseName() == "main" ) { - QValueList funcs; + if ( TQFileInfo( f->fileName() ).baseName() == "main" ) { + TQValueList funcs; LanguageInterface *iface = MetaDataBase::languageInterface( language() ); if ( !iface ) return; iface->functions( f->text(), &funcs ); - QString func = function; + TQString func = function; int i = func.find( '(' ); if ( i != -1 ) func = func.left( i ); bool found = FALSE; - for ( QValueList::Iterator it = funcs.begin(); + for ( TQValueList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { if ( (*it).name.left( (*it).name.find( '(' ) ) == func ) { found = TRUE; @@ -1425,7 +1425,7 @@ void Project::addAndEditFunction( const QString &function, const QString &functi } if ( !found ) { - QString code = f->text(); + TQString code = f->text(); if ( functionBody.isEmpty() ) code += "\n\n" + iface->createFunctionStart( "", func, "", "" ) + "()\n{\n\n}\n"; else @@ -1447,22 +1447,22 @@ void Project::addAndEditFunction( const QString &function, const QString &functi } } -bool Project::hasParentObject( QObject *o ) +bool Project::hasParentObject( TQObject *o ) { - for ( QObject *p = objs.first(); p; p = objs.next() ) { - QObject *c = p->child( o->name(), o->className() ); + for ( TQObject *p = objs.first(); p; p = objs.next() ) { + TQObject *c = p->child( o->name(), o->className() ); if ( c ) return TRUE; } return FALSE; } -QString Project::qualifiedName( QObject *o ) +TQString Project::qualifiedName( TQObject *o ) { - QString name = o->name(); - QObject *p = o->parent(); + TQString name = o->name(); + TQObject *p = o->parent(); while ( p ) { - name.prepend( QString( p->name() ) + "." ); + name.prepend( TQString( p->name() ) + "." ); if ( objs.findRef( p ) != -1 ) break; p = p->parent(); @@ -1475,7 +1475,7 @@ bool Project::singleProjectMode() const return !MainWindow::self || MainWindow::self->singleProjectMode(); } -QWidget *Project::messageBoxParent() const +TQWidget *Project::messageBoxParent() const { return MainWindow::self; } @@ -1487,13 +1487,13 @@ void Project::designerCreated() if ( !fw || fw->mainWindow() ) continue; fw->setMainWindow( MainWindow::self ); - connect( fw, SIGNAL( undoRedoChanged( bool, bool, const QString &, - const QString & ) ), - MainWindow::self, SLOT( updateUndoRedo( bool, bool, - const QString &, const QString & ) ) ); - fw->reparent( MainWindow::self->qWorkspace(), QPoint( 0, 0 ), FALSE ); - QApplication::sendPostedEvents( MainWindow::self->qWorkspace(), - QEvent::ChildInserted ); + connect( fw, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, + const TQString & ) ), + MainWindow::self, TQT_SLOT( updateUndoRedo( bool, bool, + const TQString &, const TQString & ) ) ); + fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), FALSE ); + TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), + TQEvent::ChildInserted ); fw->parentWidget()->setFixedSize( 1, 1 ); fw->show(); } @@ -1506,26 +1506,26 @@ void Project::formOpened( FormWindow *fw ) emit newFormOpened( fw ); } -QString Project::locationOfObject( QObject *o ) +TQString Project::locationOfObject( TQObject *o ) { if ( !o ) - return QString::null; + return TQString::null; if ( MainWindow::self ) { - QWidgetList windows = MainWindow::self->qWorkspace()->windowList(); - for ( QWidget *w = windows.first(); w; w = windows.next() ) { + TQWidgetList windows = MainWindow::self->qWorkspace()->windowList(); + for ( TQWidget *w = windows.first(); w; w = windows.next() ) { FormWindow *fw = ::qt_cast(w); SourceEditor *se = ::qt_cast(w); if ( fw ) { if ( fw->isFake() ) - return objectForFakeForm( fw )->name() + QString( " [Source]" ); + return objectForFakeForm( fw )->name() + TQString( " [Source]" ); else - return fw->name() + QString( " [Source]" ); + return fw->name() + TQString( " [Source]" ); } else if ( se ) { if ( !se->object() ) continue; if ( se->formWindow() ) - return se->formWindow()->name() + QString( " [Source]" ); + return se->formWindow()->name() + TQString( " [Source]" ); else return makeRelative( se->sourceFile()->fileName() ); } @@ -1533,7 +1533,7 @@ QString Project::locationOfObject( QObject *o ) } if ( ::qt_cast(o) ) { - for ( QPtrListIterator sources = sourceFiles(); + for ( TQPtrListIterator sources = sourceFiles(); sources.current(); ++sources ) { SourceFile* f = sources.current(); if ( f == o ) @@ -1541,18 +1541,18 @@ QString Project::locationOfObject( QObject *o ) } } - extern QMap *qwf_forms; + extern TQMap *qwf_forms; if ( !qwf_forms ) { qWarning( "Project::locationOfObject: qwf_forms is NULL!" ); - return QString::null; + return TQString::null; } - QString s = makeRelative( *qwf_forms->find( (QWidget*)o ) ); + TQString s = makeRelative( *qwf_forms->find( (TQWidget*)o ) ); s += " [Source]"; return s; } bool Project::hasGUI() const { - return qApp->type() != QApplication::Tty; + return qApp->type() != TQApplication::Tty; } diff --git a/kdevdesigner/designer/project.h b/kdevdesigner/designer/project.h index a2606ffa..fb447218 100644 --- a/kdevdesigner/designer/project.h +++ b/kdevdesigner/designer/project.h @@ -27,18 +27,18 @@ #ifndef PROJECT_H #define PROJECT_H -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "../interfaces/projectsettingsiface.h" #include "sourcefile.h" #include "formfile.h" -#include -#include +#include +#include #include "formfile.h" class QObjectList; @@ -66,40 +66,40 @@ public: DesignerDatabase *iFace(); bool isLoaded() const { return loaded; } - void setName( const QString& n ) { nm = n; } - QString name() const { return nm; } - void setDriver( const QString& d ) { drv = d; } - QString driver() const { return drv; } - void setDatabase( const QString& db ) { dbName = db; } - QString database() const { return dbName; } - void setUsername( const QString& u ) { uname = u; } - QString username() const { return uname; } - void setPassword( const QString& p ) { pword = p; } - QString password() const { return pword; } - void setHostname( const QString& h ) { hname = h; } - QString hostname() const { return hname; } + void setName( const TQString& n ) { nm = n; } + TQString name() const { return nm; } + void setDriver( const TQString& d ) { drv = d; } + TQString driver() const { return drv; } + void setDatabase( const TQString& db ) { dbName = db; } + TQString database() const { return dbName; } + void setUsername( const TQString& u ) { uname = u; } + TQString username() const { return uname; } + void setPassword( const TQString& p ) { pword = p; } + TQString password() const { return pword; } + void setHostname( const TQString& h ) { hname = h; } + TQString hostname() const { return hname; } void setPort( int p ) { prt = p; } int port() const { return prt; } - QString lastError() const { return dbErr; } - void addTable( const QString& t ) { tbls.append(t); } - void setFields( const QString& t, const QStringList& f ) { flds[t] = f; } - QStringList tables() const { return tbls; } - QStringList fields( const QString& t ) { return flds[t]; } - QMap fields() { return flds; } + TQString lastError() const { return dbErr; } + void addTable( const TQString& t ) { tbls.append(t); } + void setFields( const TQString& t, const TQStringList& f ) { flds[t] = f; } + TQStringList tables() const { return tbls; } + TQStringList fields( const TQString& t ) { return flds[t]; } + TQMap fields() { return flds; } #ifndef QT_NO_SQL - QSqlDatabase* connection() const { return conn; } + TQSqlDatabase* connection() const { return conn; } void remove(); #endif private: - QString nm; - QString drv, dbName, uname, pword, hname; - QString dbErr; + TQString nm; + TQString drv, dbName, uname, pword, hname; + TQString dbErr; int prt; - QStringList tbls; - QMap flds; + TQStringList tbls; + TQMap flds; #ifndef QT_NO_SQL - QSqlDatabase *conn; + TQSqlDatabase *conn; #endif Project *project; bool loaded; @@ -114,23 +114,23 @@ class Project : public QObject friend class DatabaseConnection; public: - Project( const QString &fn, const QString &pName = QString::null, + Project( const TQString &fn, const TQString &pName = TQString::null, QPluginManager *pm = 0, bool isDummy = FALSE, - const QString &l = "C++" ); + const TQString &l = "C++" ); ~Project(); - void setFileName( const QString &fn, bool doClear = TRUE ); - QString fileName( bool singlePro = FALSE ) const; - QString projectName() const; + void setFileName( const TQString &fn, bool doClear = TRUE ); + TQString fileName( bool singlePro = FALSE ) const; + TQString projectName() const; - void setDatabaseDescription( const QString &db ); - QString databaseDescription() const; + void setDatabaseDescription( const TQString &db ); + TQString databaseDescription() const; - void setDescription( const QString &s ); - QString description() const; + void setDescription( const TQString &s ); + TQString description() const; - void setLanguage( const QString &l ); - QString language() const; + void setLanguage( const TQString &l ); + TQString language() const; bool isValid() const; @@ -138,77 +138,77 @@ public: // returns TRUE if this project is the project bool isDummy() const; - QString makeAbsolute( const QString &f ); - QString makeRelative( const QString &f ); + TQString makeAbsolute( const TQString &f ); + TQString makeRelative( const TQString &f ); void save( bool onlyProjectFile = FALSE ); #ifndef QT_NO_SQL - QPtrList databaseConnections() const; - void setDatabaseConnections( const QPtrList &lst ); + TQPtrList databaseConnections() const; + void setDatabaseConnections( const TQPtrList &lst ); void addDatabaseConnection( DatabaseConnection *conn ); - void removeDatabaseConnection( const QString &conn ); - DatabaseConnection *databaseConnection( const QString &name ); - QStringList databaseConnectionList(); - QStringList databaseTableList( const QString &connection ); - QStringList databaseFieldList( const QString &connection, const QString &table ); + void removeDatabaseConnection( const TQString &conn ); + DatabaseConnection *databaseConnection( const TQString &name ); + TQStringList databaseConnectionList(); + TQStringList databaseTableList( const TQString &connection ); + TQStringList databaseFieldList( const TQString &connection, const TQString &table ); #endif void saveConnections(); void loadConnections(); - bool openDatabase( const QString &connection, bool suppressDialog = TRUE ); - void closeDatabase( const QString &connection ); + bool openDatabase( const TQString &connection, bool suppressDialog = TRUE ); + void closeDatabase( const TQString &connection ); - QObjectList *formList( bool resolveFakeObjects = FALSE ) const; + TQObjectList *formList( bool resolveFakeObjects = FALSE ) const; DesignerProject *iFace(); - void setCustomSetting( const QString &key, const QString &value ); - QString customSetting( const QString &key ) const; + void setCustomSetting( const TQString &key, const TQString &value ); + TQString customSetting( const TQString &key ) const; PixmapCollection *pixmapCollection() const { return pixCollection; } void setActive( bool b ); - QPtrListIterator sourceFiles() const { return QPtrListIterator(sourcefiles); } + TQPtrListIterator sourceFiles() const { return TQPtrListIterator(sourcefiles); } void addSourceFile( SourceFile *sf ); bool removeSourceFile( SourceFile *sf ); - SourceFile* findSourceFile( const QString& filename, SourceFile *ignore = 0 ) const; + SourceFile* findSourceFile( const TQString& filename, SourceFile *ignore = 0 ) const; - QPtrListIterator formFiles() const { return QPtrListIterator(formfiles); } + TQPtrListIterator formFiles() const { return TQPtrListIterator(formfiles); } void addFormFile( FormFile *ff ); bool removeFormFile( FormFile *ff ); - FormFile* findFormFile( const QString& filename, FormFile *ignore = 0 ) const; + FormFile* findFormFile( const TQString& filename, FormFile *ignore = 0 ) const; - void setIncludePath( const QString &platform, const QString &path ); - void setLibs( const QString &platform, const QString &path ); - void setDefines( const QString &platform, const QString &path ); - void setConfig( const QString &platform, const QString &config ); - void setTemplate( const QString &t ); + void setIncludePath( const TQString &platform, const TQString &path ); + void setLibs( const TQString &platform, const TQString &path ); + void setDefines( const TQString &platform, const TQString &path ); + void setConfig( const TQString &platform, const TQString &config ); + void setTemplate( const TQString &t ); - QString config( const QString &platform ) const; - QString libs( const QString &platform ) const; - QString defines( const QString &platform ) const; - QString includePath( const QString &platform ) const; - QString templte() const; + TQString config( const TQString &platform ) const; + TQString libs( const TQString &platform ) const; + TQString defines( const TQString &platform ) const; + TQString includePath( const TQString &platform ) const; + TQString templte() const; bool isModified() const { return !isDummy() && modified; } void setModified( bool b ); - void addObject( QObject *o ); - void setObjects( const QObjectList &ol ); - void removeObject( QObject *o ); - QObjectList objects() const; - FormFile *fakeFormFileFor( QObject *o ) const; - QObject *objectForFakeForm( FormWindow *fw ) const; - QObject *objectForFakeFormFile( FormFile *ff ) const; + void addObject( TQObject *o ); + void setObjects( const TQObjectList &ol ); + void removeObject( TQObject *o ); + TQObjectList objects() const; + FormFile *fakeFormFileFor( TQObject *o ) const; + TQObject *objectForFakeForm( FormWindow *fw ) const; + TQObject *objectForFakeFormFile( FormFile *ff ) const; - void addAndEditFunction( const QString &functionName, const QString &functionBody, + void addAndEditFunction( const TQString &functionName, const TQString &functionBody, bool openDeveloper ); void removeTempProject(); - bool hasParentObject( QObject *o ); - QString qualifiedName( QObject *o ); + bool hasParentObject( TQObject *o ); + TQString qualifiedName( TQObject *o ); bool isCpp() const { return is_cpp; } @@ -216,7 +216,7 @@ public: void formOpened( FormWindow *fw ); - QString locationOfObject( QObject *o ); + TQString locationOfObject( TQObject *o ); bool hasGUI() const; @@ -226,46 +226,46 @@ signals: void sourceFileRemoved( SourceFile* ); void formFileAdded( FormFile* ); void formFileRemoved( FormFile* ); - void objectAdded( QObject * ); - void objectRemoved( QObject * ); + void objectAdded( TQObject * ); + void objectRemoved( TQObject * ); void newFormOpened( FormWindow *fw ); private: void parse(); void clear(); void updateCustomSettings(); - void readPlatformSettings( const QString &contents, - const QString &setting, - QMap &res ); - void removePlatformSettings( QString &contents, const QString &setting ); - void writePlatformSettings( QString &contents, const QString &setting, - const QMap &input ); + void readPlatformSettings( const TQString &contents, + const TQString &setting, + TQMap &res ); + void removePlatformSettings( TQString &contents, const TQString &setting ); + void writePlatformSettings( TQString &contents, const TQString &setting, + const TQMap &input ); bool singleProjectMode() const; - QWidget *messageBoxParent() const; + TQWidget *messageBoxParent() const; private: - QString filename; - QString proName; - QString desc; - QString dbFile; + TQString filename; + TQString proName; + TQString desc; + TQString dbFile; #ifndef QT_NO_SQL - QPtrList dbConnections; + TQPtrList dbConnections; #endif - QString lang; + TQString lang; DesignerProject *iface; - QMap customSettings; - QStringList csList; + TQMap customSettings; + TQStringList csList; QPluginManager *projectSettingsPluginManager; PixmapCollection *pixCollection; - QPtrList sourcefiles; - QPtrList formfiles; - QMap inclPath, defs, lbs, cfg, sources, headers; - QString templ; + TQPtrList sourcefiles; + TQPtrList formfiles; + TQMap inclPath, defs, lbs, cfg, sources, headers; + TQString templ; bool isDummyProject; bool modified; - QObjectList objs; - QPtrDict fakeFormFiles; - QString singleProFileName; + TQObjectList objs; + TQPtrDict fakeFormFiles; + TQString singleProFileName; bool is_cpp; }; diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp index a1a2b6b1..8d213a0a 100644 --- a/kdevdesigner/designer/projectsettingsimpl.cpp +++ b/kdevdesigner/designer/projectsettingsimpl.cpp @@ -38,14 +38,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include /* * Constructs a ProjectSettings which is a child of 'parent', with the @@ -54,10 +54,10 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -ProjectSettings::ProjectSettings( Project *pro, QWidget* parent, const char* name, bool modal, WFlags fl ) +ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : ProjectSettingsBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); editProjectFile->setFocus(); @@ -93,7 +93,7 @@ ProjectSettings::~ProjectSettings() void ProjectSettings::chooseDatabaseFile() { - QString fn = KFileDialog::getSaveFileName( editDatabaseFile->text(), i18n( "*.db|Database Files\n*|All Files" ), this ); + TQString fn = KFileDialog::getSaveFileName( editDatabaseFile->text(), i18n( "*.db|Database Files\n*|All Files" ), this ); if ( fn.isEmpty() ) return; editDatabaseFile->setText( fn ); @@ -101,7 +101,7 @@ void ProjectSettings::chooseDatabaseFile() void ProjectSettings::chooseProjectFile() { - QString fn = KFileDialog::getSaveFileName( editDatabaseFile->text(), i18n( "*.pro|Project Files\n*|All Files" ), this ); + TQString fn = KFileDialog::getSaveFileName( editDatabaseFile->text(), i18n( "*.pro|Project Files\n*|All Files" ), this ); if ( fn.isEmpty() ) return; editProjectFile->setText( fn ); @@ -121,6 +121,6 @@ void ProjectSettings::okClicked() accept(); } -void ProjectSettings::languageChanged( const QString & ) +void ProjectSettings::languageChanged( const TQString & ) { } diff --git a/kdevdesigner/designer/projectsettingsimpl.h b/kdevdesigner/designer/projectsettingsimpl.h index 3833d813..ee5c6c72 100644 --- a/kdevdesigner/designer/projectsettingsimpl.h +++ b/kdevdesigner/designer/projectsettingsimpl.h @@ -39,7 +39,7 @@ class ProjectSettings : public ProjectSettingsBase Q_OBJECT public: - ProjectSettings( Project *pro, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ProjectSettings(); protected slots: @@ -47,7 +47,7 @@ protected slots: void chooseProjectFile(); void helpClicked(); void okClicked(); - void languageChanged( const QString &lang ); + void languageChanged( const TQString &lang ); private: Project *project; diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 06b8f93b..7ec9cc9b 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include // HP-UX compiler needs this here #include "propertyeditor.h" #include "formwindow.h" @@ -49,56 +49,56 @@ #include #include "kdevdesigner_part.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include // FIXME: obsolete -#include -#include -#include +#include +#include // FIXME: obsolete +#include +#include +#include #include -static QFontDatabase *fontDataBase = 0; -QString assistantPath(); +static TQFontDatabase *fontDataBase = 0; +TQString assistantPath(); #ifdef Q_WS_MAC -#include -static void setupStyle(QWidget *w) +#include +static void setupStyle(TQWidget *w) { - static QStyle *windowsStyle = 0; + static TQStyle *windowsStyle = 0; if(!windowsStyle) windowsStyle = new QWindowsStyle; w->setStyle(windowsStyle); @@ -113,7 +113,7 @@ static void cleanupFontDatabase() fontDataBase = 0; } -static QStringList getFontList() +static TQStringList getFontList() { if ( !fontDataBase ) { fontDataBase = new QFontDatabase; @@ -127,8 +127,8 @@ class PropertyWhatsThis : public QWhatsThis { public: PropertyWhatsThis( PropertyList *l ); - QString text( const QPoint &pos ); - bool clicked( const QString& href ); + TQString text( const TQPoint &pos ); + bool clicked( const TQString& href ); private: PropertyList *propertyList; @@ -136,20 +136,20 @@ private: }; PropertyWhatsThis::PropertyWhatsThis( PropertyList *l ) - : QWhatsThis( l->viewport() ), propertyList( l ) + : TQWhatsThis( l->viewport() ), propertyList( l ) { } -QString PropertyWhatsThis::text( const QPoint &pos ) +TQString PropertyWhatsThis::text( const TQPoint &pos ) { return propertyList->whatsThisAt( pos ); } -bool PropertyWhatsThis::clicked( const QString& href ) +bool PropertyWhatsThis::clicked( const TQString& href ) { if ( !href.isEmpty() ) { QAssistantClient *ac = MainWindow::self->assistantClient(); - ac->showPage( QString( qInstallPathDocs() ) + "/html/" + href ); + ac->showPage( TQString( qInstallPathDocs() ) + "/html/" + href ); } return FALSE; // do not hide window } @@ -170,8 +170,8 @@ bool PropertyWhatsThis::clicked( const QString& href ) \a prop as the parent item. */ -PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ) - : QListViewItem( l, after ), listview( l ), property( prop ), propertyName( propName ) +PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) + : TQListViewItem( l, after ), listview( l ), property( prop ), propertyName( propName ) { setSelectable( FALSE ); open = FALSE; @@ -206,10 +206,10 @@ void PropertyItem::updateBackColor() backColor = *backColor1; } -QColor PropertyItem::backgroundColor() +TQColor PropertyItem::backgroundColor() { updateBackColor(); - if ( (QListViewItem*)this == listview->currentItem() ) + if ( (TQListViewItem*)this == listview->currentItem() ) return *selectedBack; return backColor; } @@ -230,12 +230,12 @@ void PropertyItem::initChildren() { } -void PropertyItem::paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align ) +void PropertyItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ) { - QColorGroup g( cg ); - g.setColor( QColorGroup::Base, backgroundColor() ); - g.setColor( QColorGroup::Foreground, Qt::black ); - g.setColor( QColorGroup::Text, Qt::black ); + TQColorGroup g( cg ); + g.setColor( TQColorGroup::Base, backgroundColor() ); + g.setColor( TQColorGroup::Foreground, Qt::black ); + g.setColor( TQColorGroup::Text, Qt::black ); int indent = 0; if ( column == 0 ) { indent = 20 + ( property ? 20 : 0 ); @@ -246,16 +246,16 @@ void PropertyItem::paintCell( QPainter *p, const QColorGroup &cg, int column, in if ( isChanged() && column == 0 ) { p->save(); - QFont f = p->font(); + TQFont f = p->font(); f.setBold( TRUE ); p->setFont( f ); } if ( !hasCustomContents() || column != 1 ) { - QListViewItem::paintCell( p, g, column, width - indent, align ); + TQListViewItem::paintCell( p, g, column, width - indent, align ); } else { p->fillRect( 0, 0, width, height(), backgroundColor() ); - drawCustomContents( p, QRect( 0, 0, width, height() ) ); + drawCustomContents( p, TQRect( 0, 0, width, height() ) ); } if ( isChanged() && column == 0 ) @@ -273,29 +273,29 @@ void PropertyItem::paintCell( QPainter *p, const QColorGroup &cg, int column, in p->restore(); } p->save(); - p->setPen( QPen( cg.dark(), 1 ) ); + p->setPen( TQPen( cg.dark(), 1 ) ); p->drawLine( 0, height() - 1, width, height() - 1 ); p->drawLine( width - 1, 0, width - 1, height() ); p->restore(); if ( listview->currentItem() == this && column == 0 && !listview->hasFocus() && !listview->viewport()->hasFocus() ) - paintFocus( p, cg, QRect( 0, 0, width, height() ) ); + paintFocus( p, cg, TQRect( 0, 0, width, height() ) ); } -void PropertyItem::paintBranches( QPainter * p, const QColorGroup & cg, +void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg, int w, int y, int h ) { - QColorGroup g( cg ); - g.setColor( QColorGroup::Base, backgroundColor() ); - QListViewItem::paintBranches( p, g, w, y, h ); + TQColorGroup g( cg ); + g.setColor( TQColorGroup::Base, backgroundColor() ); + TQListViewItem::paintBranches( p, g, w, y, h ); } -void PropertyItem::paintFocus( QPainter *p, const QColorGroup &cg, const QRect &r ) +void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r ) { p->save(); - QApplication::style().drawPrimitive(QStyle::PE_Panel, p, r, cg, - QStyle::Style_Sunken, QStyleOption(1,1) ); + TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg, + TQStyle::Style_Sunken, TQStyleOption(1,1) ); p->restore(); } @@ -365,12 +365,12 @@ void PropertyItem::hideEditor() subclasses to init the editor */ -void PropertyItem::setValue( const QVariant &v ) +void PropertyItem::setValue( const TQVariant &v ) { val = v; } -QVariant PropertyItem::value() const +TQVariant PropertyItem::value() const { return val; } @@ -394,7 +394,7 @@ void PropertyItem::setChanged( bool b, bool updateDb ) updateResetButtonState(); } -QString PropertyItem::name() const +TQString PropertyItem::name() const { return propertyName; } @@ -405,22 +405,22 @@ void PropertyItem::createResetButton() resetButton->parentWidget()->lower(); return; } - const QPixmap DesignerResetPix = SmallIcon( "designer_resetproperty.png" , KDevDesignerPartFactory::instance()); + const TQPixmap DesignerResetPix = SmallIcon( "designer_resetproperty.png" , KDevDesignerPartFactory::instance()); - QHBox *hbox = new QHBox( listview->viewport() ); - hbox->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + TQHBox *hbox = new TQHBox( listview->viewport() ); + hbox->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); hbox->setLineWidth( 1 ); - resetButton = new QPushButton( hbox ); + resetButton = new TQPushButton( hbox ); setupStyle( resetButton ); resetButton->setPixmap( DesignerResetPix ); resetButton->setFixedWidth( resetButton->sizeHint().width() ); hbox->layout()->setAlignment( Qt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - QObject::connect( resetButton, SIGNAL( clicked() ), - listview, SLOT( resetProperty() ) ); - QToolTip::add( resetButton, i18n( "Reset the property to its default value" ) ); - QWhatsThis::add( resetButton, i18n( "Click this button to reset the property to its default value" ) ); + TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), + listview, TQT_SLOT( resetProperty() ) ); + TQToolTip::add( resetButton, i18n( "Reset the property to its default value" ) ); + TQWhatsThis::add( resetButton, i18n( "Click this button to reset the property to its default value" ) ); updateResetButtonState(); } @@ -438,10 +438,10 @@ void PropertyItem::updateResetButtonState() call it from showEditor()) */ -void PropertyItem::placeEditor( QWidget *w ) +void PropertyItem::placeEditor( TQWidget *w ) { createResetButton(); - QRect r = listview->itemRect( this ); + TQRect r = listview->itemRect( this ); if ( !r.size().isValid() ) { listview->ensureItemVisible( this ); #if defined(Q_WS_WIN) @@ -452,7 +452,7 @@ void PropertyItem::placeEditor( QWidget *w ) r.setX( listview->header()->sectionPos( 1 ) ); r.setWidth( listview->header()->sectionSize( 1 ) - 1 ); r.setWidth( r.width() - resetButton->width() - 2 ); - r = QRect( listview->viewportToContents( r.topLeft() ), r.size() ); + r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() ); w->resize( r.size() ); listview->moveChild( w, r.x(), r.y() ); resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() ); @@ -519,13 +519,13 @@ bool PropertyItem::hasCustomContents() const \sa hasCustomContents() */ -void PropertyItem::drawCustomContents( QPainter *, const QRect & ) +void PropertyItem::drawCustomContents( TQPainter *, const TQRect & ) { } -QString PropertyItem::currentItem() const +TQString PropertyItem::currentItem() const { - return QString::null; + return TQString::null; } int PropertyItem::currentIntItem() const @@ -533,7 +533,7 @@ int PropertyItem::currentIntItem() const return -1; } -void PropertyItem::setCurrentItem( const QString & ) +void PropertyItem::setCurrentItem( const TQString & ) { } @@ -546,12 +546,12 @@ int PropertyItem::currentIntItemFromObject() const return -1; } -QString PropertyItem::currentItemFromObject() const +TQString PropertyItem::currentItemFromObject() const { - return QString::null; + return TQString::null; } -void PropertyItem::setFocus( QWidget *w ) +void PropertyItem::setFocus( TQWidget *w ) { if ( !qApp->focusWidget() || listview->propertyEditor()->formWindow() && @@ -560,18 +560,18 @@ void PropertyItem::setFocus( QWidget *w ) w->setFocus(); } -void PropertyItem::setText( int col, const QString &t ) +void PropertyItem::setText( int col, const TQString &t ) { - QString txt( t ); + TQString txt( t ); if ( col == 1 ) txt = txt.replace( "\n", " " ); - QListViewItem::setText( col, txt ); + TQListViewItem::setText( col, txt ); } // -------------------------------------------------------------- PropertyTextItem::PropertyTextItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, bool comment, bool multiLine, bool ascii, bool a ) + const TQString &propName, bool comment, bool multiLine, bool ascii, bool a ) : PropertyItem( l, after, prop, propName ), withComment( comment ), hasMultiLines( multiLine ), asciiOnly( ascii ), accel( a ) { @@ -579,30 +579,30 @@ PropertyTextItem::PropertyTextItem( PropertyList *l, PropertyItem *after, Proper box = 0; } -QLineEdit *PropertyTextItem::lined() +TQLineEdit *PropertyTextItem::lined() { if ( lin ) return lin; if ( hasMultiLines ) { - box = new QHBox( listview->viewport() ); - box->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + box = new TQHBox( listview->viewport() ); + box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); box->setLineWidth( 2 ); box->hide(); } lin = 0; if ( hasMultiLines ) - lin = new QLineEdit( box ); + lin = new TQLineEdit( box ); else - lin = new QLineEdit( listview->viewport() ); + lin = new TQLineEdit( listview->viewport() ); if ( asciiOnly ) { if ( PropertyItem::name() == "name" ) { - lin->setValidator( new AsciiValidator( QString(":"), lin, "ascii_validator" ) ); + lin->setValidator( new AsciiValidator( TQString(":"), lin, "ascii_validator" ) ); if ( listview->propertyEditor()->formWindow()->isFake() ) lin->setEnabled( FALSE ); } else { - lin->setValidator( new AsciiValidator( QString("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" + lin->setValidator( new AsciiValidator( TQString("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9" "\xaa\xab\xac\xad\xae\xaf\xb1\xb2\xb3" "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc" @@ -611,30 +611,30 @@ QLineEdit *PropertyTextItem::lined() } if ( !hasMultiLines ) { lin->hide(); } else { - button = new QPushButton( "...", box ); + button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getText() ) ); + connect( button, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( getText() ) ); lin->setFrame( FALSE ); } - connect( lin, SIGNAL( returnPressed() ), - this, SLOT( setValue() ) ); - connect( lin, SIGNAL( textChanged( const QString & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQT_SIGNAL( returnPressed() ), + this, TQT_SLOT( setValue() ) ); + connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), + this, TQT_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, SIGNAL( returnPressed() ), + connect( lin, TQT_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - SLOT( checkCompressedCommand() ) ); + TQT_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } PropertyTextItem::~PropertyTextItem() { - delete (QLineEdit*)lin; + delete (TQLineEdit*)lin; lin = 0; - delete (QHBox*)box; + delete (TQHBox*)box; box = 0; } @@ -669,7 +669,7 @@ void PropertyTextItem::showEditor() lined()->blockSignals( FALSE ); } - QWidget* w; + TQWidget* w; if ( hasMultiLines ) w = box; else @@ -709,7 +709,7 @@ void PropertyTextItem::initChildren() void PropertyTextItem::hideEditor() { PropertyItem::hideEditor(); - QWidget* w; + TQWidget* w; if ( hasMultiLines ) w = box; else @@ -718,7 +718,7 @@ void PropertyTextItem::hideEditor() w->hide(); } -void PropertyTextItem::setValue( const QVariant &v ) +void PropertyTextItem::setValue( const TQVariant &v ) { if ( ( !hasSubItems() || !isOpen() ) && value() == v ) @@ -739,9 +739,9 @@ void PropertyTextItem::setValue( const QVariant &v ) void PropertyTextItem::setValue() { setText( 1, lined()->text() ); - QVariant v; + TQVariant v; if ( accel ) { - v = QVariant( QKeySequence( lined()->text() ) ); + v = TQVariant( TQKeySequence( lined()->text() ) ); if ( v.toString().isNull() ) return; // not yet valid input } else { @@ -753,10 +753,10 @@ void PropertyTextItem::setValue() void PropertyTextItem::getText() { - bool richText = !::qt_cast(listview->propertyEditor()->widget()) || + bool richText = !::qt_cast(listview->propertyEditor()->widget()) || ( text( 0 ) == "whatsThis" ); bool doWrap = FALSE; - QString txt = MultiLineEditor::getText( listview, value().toString(), richText, &doWrap ); + TQString txt = MultiLineEditor::getText( listview, value().toString(), richText, &doWrap ); if ( !txt.isEmpty() ) { setText( 1, txt ); PropertyItem::setValue( txt ); @@ -770,30 +770,30 @@ void PropertyTextItem::getText() // -------------------------------------------------------------- PropertyDoubleItem::PropertyDoubleItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ) + const TQString &propName ) : PropertyItem( l, after, prop, propName ) { lin = 0; } -QLineEdit *PropertyDoubleItem::lined() +TQLineEdit *PropertyDoubleItem::lined() { if ( lin ) return lin; - lin = new QLineEdit( listview->viewport() ); - lin->setValidator( new QDoubleValidator( lin, "double_validator" ) ); + lin = new TQLineEdit( listview->viewport() ); + lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, SIGNAL( returnPressed() ), - this, SLOT( setValue() ) ); - connect( lin, SIGNAL( textChanged( const QString & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQT_SIGNAL( returnPressed() ), + this, TQT_SLOT( setValue() ) ); + connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), + this, TQT_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } PropertyDoubleItem::~PropertyDoubleItem() { - delete (QLineEdit*)lin; + delete (TQLineEdit*)lin; lin = 0; } @@ -802,10 +802,10 @@ void PropertyDoubleItem::showEditor() PropertyItem::showEditor(); if ( !lin ) { lined()->blockSignals( TRUE ); - lined()->setText( QString::number( value().toDouble() ) ); + lined()->setText( TQString::number( value().toDouble() ) ); lined()->blockSignals( FALSE ); } - QWidget* w = lined(); + TQWidget* w = lined(); placeEditor( w ); if ( !w->isVisible() || !lined()->hasFocus() ) { @@ -818,11 +818,11 @@ void PropertyDoubleItem::showEditor() void PropertyDoubleItem::hideEditor() { PropertyItem::hideEditor(); - QWidget* w = lined(); + TQWidget* w = lined(); w->hide(); } -void PropertyDoubleItem::setValue( const QVariant &v ) +void PropertyDoubleItem::setValue( const TQVariant &v ) { if ( value() == v ) return; @@ -830,19 +830,19 @@ void PropertyDoubleItem::setValue( const QVariant &v ) lined()->blockSignals( TRUE ); int oldCursorPos; oldCursorPos = lin->cursorPosition(); - lined()->setText( QString::number( v.toDouble() ) ); + lined()->setText( TQString::number( v.toDouble() ) ); if ( oldCursorPos < (int)lin->text().length() ) lin->setCursorPosition( oldCursorPos ); lined()->blockSignals( FALSE ); } - setText( 1, QString::number( v.toDouble() ) ); + setText( 1, TQString::number( v.toDouble() ) ); PropertyItem::setValue( v ); } void PropertyDoubleItem::setValue() { setText( 1, lined()->text() ); - QVariant v = lined()->text().toDouble(); + TQVariant v = lined()->text().toDouble(); PropertyItem::setValue( v ); notifyValueChange(); } @@ -850,7 +850,7 @@ void PropertyDoubleItem::setValue() // -------------------------------------------------------------- -PropertyDateItem::PropertyDateItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ) +PropertyDateItem::PropertyDateItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) : PropertyItem( l, after, prop, propName ) { lin = 0; @@ -861,12 +861,12 @@ QDateEdit *PropertyDateItem::lined() if ( lin ) return lin; lin = new QDateEdit( listview->viewport() ); - QObjectList *l = lin->queryList( "QLineEdit" ); - for ( QObject *o = l->first(); o; o = l->next() ) + TQObjectList *l = lin->queryList( "TQLineEdit" ); + for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, SIGNAL( valueChanged( const QDate & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQT_SIGNAL( valueChanged( const TQDate & ) ), + this, TQT_SLOT( setValue() ) ); return lin; } @@ -898,7 +898,7 @@ void PropertyDateItem::hideEditor() lin->hide(); } -void PropertyDateItem::setValue( const QVariant &v ) +void PropertyDateItem::setValue( const TQVariant &v ) { if ( ( !hasSubItems() || !isOpen() ) && value() == v ) @@ -917,7 +917,7 @@ void PropertyDateItem::setValue( const QVariant &v ) void PropertyDateItem::setValue() { setText( 1, lined()->date().toString( ::Qt::ISODate ) ); - QVariant v; + TQVariant v; v = lined()->date(); PropertyItem::setValue( v ); notifyValueChange(); @@ -925,7 +925,7 @@ void PropertyDateItem::setValue() // -------------------------------------------------------------- -PropertyTimeItem::PropertyTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ) +PropertyTimeItem::PropertyTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) : PropertyItem( l, after, prop, propName ) { lin = 0; @@ -936,10 +936,10 @@ QTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new QTimeEdit( listview->viewport() ); - connect( lin, SIGNAL( valueChanged( const QTime & ) ), - this, SLOT( setValue() ) ); - QObjectList *l = lin->queryList( "QLineEdit" ); - for ( QObject *o = l->first(); o; o = l->next() ) + connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), + this, TQT_SLOT( setValue() ) ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); + for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; return lin; @@ -973,7 +973,7 @@ void PropertyTimeItem::hideEditor() lin->hide(); } -void PropertyTimeItem::setValue( const QVariant &v ) +void PropertyTimeItem::setValue( const TQVariant &v ) { if ( ( !hasSubItems() || !isOpen() ) && value() == v ) @@ -992,7 +992,7 @@ void PropertyTimeItem::setValue( const QVariant &v ) void PropertyTimeItem::setValue() { setText( 1, lined()->time().toString( ::Qt::ISODate ) ); - QVariant v; + TQVariant v; v = lined()->time(); PropertyItem::setValue( v ); notifyValueChange(); @@ -1000,7 +1000,7 @@ void PropertyTimeItem::setValue() // -------------------------------------------------------------- -PropertyDateTimeItem::PropertyDateTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ) +PropertyDateTimeItem::PropertyDateTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) : PropertyItem( l, after, prop, propName ) { lin = 0; @@ -1011,10 +1011,10 @@ QDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new QDateTimeEdit( listview->viewport() ); - connect( lin, SIGNAL( valueChanged( const QDateTime & ) ), - this, SLOT( setValue() ) ); - QObjectList *l = lin->queryList( "QLineEdit" ); - for ( QObject *o = l->first(); o; o = l->next() ) + connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQT_SLOT( setValue() ) ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); + for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; return lin; @@ -1048,7 +1048,7 @@ void PropertyDateTimeItem::hideEditor() lin->hide(); } -void PropertyDateTimeItem::setValue( const QVariant &v ) +void PropertyDateTimeItem::setValue( const TQVariant &v ) { if ( ( !hasSubItems() || !isOpen() ) && value() == v ) @@ -1067,7 +1067,7 @@ void PropertyDateTimeItem::setValue( const QVariant &v ) void PropertyDateTimeItem::setValue() { setText( 1, lined()->dateTime().toString( ::Qt::ISODate ) ); - QVariant v; + TQVariant v; v = lined()->dateTime(); PropertyItem::setValue( v ); notifyValueChange(); @@ -1075,36 +1075,36 @@ void PropertyDateTimeItem::setValue() // -------------------------------------------------------------- -PropertyBoolItem::PropertyBoolItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ) +PropertyBoolItem::PropertyBoolItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) : PropertyItem( l, after, prop, propName ) { comb = 0; } -QComboBox *PropertyBoolItem::combo() +TQComboBox *PropertyBoolItem::combo() { if ( comb ) return comb; - comb = new QComboBox( FALSE, listview->viewport() ); + comb = new TQComboBox( FALSE, listview->viewport() ); comb->hide(); comb->insertItem( i18n( "False" ) ); comb->insertItem( i18n( "True" ) ); - connect( comb, SIGNAL( activated( int ) ), - this, SLOT( setValue() ) ); + connect( comb, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } PropertyBoolItem::~PropertyBoolItem() { - delete (QComboBox*)comb; + delete (TQComboBox*)comb; comb = 0; } void PropertyBoolItem::toggle() { bool b = value().toBool(); - setValue( QVariant( !b, 0 ) ); + setValue( TQVariant( !b, 0 ) ); setValue(); } @@ -1132,7 +1132,7 @@ void PropertyBoolItem::hideEditor() combo()->hide(); } -void PropertyBoolItem::setValue( const QVariant &v ) +void PropertyBoolItem::setValue( const TQVariant &v ) { if ( ( !hasSubItems() || !isOpen() ) && value() == v ) @@ -1146,7 +1146,7 @@ void PropertyBoolItem::setValue( const QVariant &v ) combo()->setCurrentItem( 0 ); combo()->blockSignals( FALSE ); } - QString tmp = i18n( "True" ); + TQString tmp = i18n( "True" ); if ( !v.toBool() ) tmp = i18n( "False" ); setText( 1, tmp ); @@ -1159,41 +1159,41 @@ void PropertyBoolItem::setValue() return; setText( 1, combo()->currentText() ); bool b = combo()->currentItem() == 0 ? (bool)FALSE : (bool)TRUE; - PropertyItem::setValue( QVariant( b, 0 ) ); + PropertyItem::setValue( TQVariant( b, 0 ) ); notifyValueChange(); } // -------------------------------------------------------------- PropertyIntItem::PropertyIntItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, bool s ) + const TQString &propName, bool s ) : PropertyItem( l, after, prop, propName ), signedValue( s ) { spinBx = 0; } -QSpinBox *PropertyIntItem::spinBox() +TQSpinBox *PropertyIntItem::spinBox() { if ( spinBx ) return spinBx; if ( signedValue ) - spinBx = new QSpinBox( -INT_MAX, INT_MAX, 1, listview->viewport() ); + spinBx = new TQSpinBox( -INT_MAX, INT_MAX, 1, listview->viewport() ); else - spinBx = new QSpinBox( 0, INT_MAX, 1, listview->viewport() ); + spinBx = new TQSpinBox( 0, INT_MAX, 1, listview->viewport() ); spinBx->hide(); spinBx->installEventFilter( listview ); - QObjectList *ol = spinBx->queryList( "QLineEdit" ); + TQObjectList *ol = spinBx->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, SIGNAL( valueChanged( int ) ), - this, SLOT( setValue() ) ); + connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), + this, TQT_SLOT( setValue() ) ); return spinBx; } PropertyIntItem::~PropertyIntItem() { - delete (QSpinBox*)spinBx; + delete (TQSpinBox*)spinBx; spinBx = 0; } @@ -1221,7 +1221,7 @@ void PropertyIntItem::hideEditor() spinBox()->hide(); } -void PropertyIntItem::setValue( const QVariant &v ) +void PropertyIntItem::setValue( const TQVariant &v ) { if ( ( !hasSubItems() || !isOpen() ) && value() == v ) @@ -1237,9 +1237,9 @@ void PropertyIntItem::setValue( const QVariant &v ) } if ( signedValue ) - setText( 1, QString::number( v.toInt() ) ); + setText( 1, TQString::number( v.toInt() ) ); else - setText( 1, QString::number( v.toUInt() ) ); + setText( 1, TQString::number( v.toUInt() ) ); PropertyItem::setValue( v ); } @@ -1247,7 +1247,7 @@ void PropertyIntItem::setValue() { if ( !spinBx ) return; - setText( 1, QString::number( spinBox()->value() ) ); + setText( 1, TQString::number( spinBox()->value() ) ); if ( signedValue ) PropertyItem::setValue( spinBox()->value() ); else @@ -1258,7 +1258,7 @@ void PropertyIntItem::setValue() // -------------------------------------------------------------- PropertyLayoutItem::PropertyLayoutItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ) + const TQString &propName ) : PropertyItem( l, after, prop, propName ) { spinBx = 0; @@ -1266,24 +1266,24 @@ PropertyLayoutItem::PropertyLayoutItem( PropertyList *l, PropertyItem *after, Pr PropertyLayoutItem::~PropertyLayoutItem() { - delete (QSpinBox*)spinBx; + delete (TQSpinBox*)spinBx; spinBx = 0; } -QSpinBox* PropertyLayoutItem::spinBox() +TQSpinBox* PropertyLayoutItem::spinBox() { if ( spinBx ) return spinBx; - spinBx = new QSpinBox( -1, INT_MAX, 1, listview->viewport() ); + spinBx = new TQSpinBox( -1, INT_MAX, 1, listview->viewport() ); spinBx->setSpecialValueText( i18n( "default" ) ); spinBx->hide(); spinBx->installEventFilter( listview ); - QObjectList *ol = spinBx->queryList( "QLineEdit" ); + TQObjectList *ol = spinBx->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, SIGNAL( valueChanged( int ) ), - this, SLOT( setValue() ) ); + connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), + this, TQT_SLOT( setValue() ) ); return spinBx; } @@ -1308,14 +1308,14 @@ void PropertyLayoutItem::hideEditor() spinBox()->hide(); } -void PropertyLayoutItem::setValue( const QVariant &v ) +void PropertyLayoutItem::setValue( const TQVariant &v ) { if ( spinBx ) { spinBox()->blockSignals( TRUE ); spinBox()->setValue( v.toInt() ); spinBox()->blockSignals( FALSE ); } - QString s = v.toString(); + TQString s = v.toString(); if ( v.toInt() == -1 ) s = spinBox()->specialValueText(); setText( 1, s ); @@ -1334,24 +1334,24 @@ void PropertyLayoutItem::setValue() // -------------------------------------------------------------- PropertyListItem::PropertyListItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, bool e ) + const TQString &propName, bool e ) : PropertyItem( l, after, prop, propName ), editable( e ) { comb = 0; oldInt = -1; } -QComboBox *PropertyListItem::combo() +TQComboBox *PropertyListItem::combo() { if ( comb ) return comb; - comb = new QComboBox( editable, listview->viewport() ); + comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, SIGNAL( activated( int ) ), - this, SLOT( setValue() ) ); + connect( comb, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { - QObjectList *ol = comb->queryList( "QLineEdit" ); + TQObjectList *ol = comb->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; @@ -1361,7 +1361,7 @@ QComboBox *PropertyListItem::combo() PropertyListItem::~PropertyListItem() { - delete (QComboBox*)comb; + delete (TQComboBox*)comb; comb = 0; } @@ -1387,7 +1387,7 @@ void PropertyListItem::hideEditor() combo()->hide(); } -void PropertyListItem::setValue( const QVariant &v ) +void PropertyListItem::setValue( const TQVariant &v ) { if ( comb ) { combo()->blockSignals( TRUE ); @@ -1404,7 +1404,7 @@ void PropertyListItem::setValue() if ( !comb ) return; setText( 1, combo()->currentText() ); - QStringList lst; + TQStringList lst; for ( uint i = 0; i < combo()->listBox()->count(); ++i ) lst << combo()->listBox()->item( i )->text(); PropertyItem::setValue( lst ); @@ -1413,12 +1413,12 @@ void PropertyListItem::setValue() oldString = currentItem(); } -QString PropertyListItem::currentItem() const +TQString PropertyListItem::currentItem() const { return ( (PropertyListItem*)this )->combo()->currentText(); } -void PropertyListItem::setCurrentItem( const QString &s ) +void PropertyListItem::setCurrentItem( const TQString &s ) { if ( comb && currentItem().lower() == s.lower() ) return; @@ -1440,7 +1440,7 @@ void PropertyListItem::setCurrentItem( const QString &s ) oldString = currentItem(); } -void PropertyListItem::addItem( const QString &s ) +void PropertyListItem::addItem( const TQString &s ) { combo()->insertItem( s ); } @@ -1472,7 +1472,7 @@ int PropertyListItem::currentIntItemFromObject() const return oldInt; } -QString PropertyListItem::currentItemFromObject() const +TQString PropertyListItem::currentItemFromObject() const { return oldString; } @@ -1480,18 +1480,18 @@ QString PropertyListItem::currentItemFromObject() const // -------------------------------------------------------------- PropertyCoordItem::PropertyCoordItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, Type t ) + const TQString &propName, Type t ) : PropertyItem( l, after, prop, propName ), typ( t ) { lin = 0; } -QLineEdit *PropertyCoordItem::lined() +TQLineEdit *PropertyCoordItem::lined() { if ( lin ) return lin; - lin = new QLineEdit( listview->viewport() ); + lin = new TQLineEdit( listview->viewport() ); lin->setReadOnly( TRUE ); lin->installEventFilter( listview ); lin->hide(); @@ -1546,7 +1546,7 @@ void PropertyCoordItem::initChildren() PropertyCoordItem::~PropertyCoordItem() { - delete (QLineEdit*)lin; + delete (TQLineEdit*)lin; lin = 0; } @@ -1568,22 +1568,22 @@ void PropertyCoordItem::hideEditor() lined()->hide(); } -void PropertyCoordItem::setValue( const QVariant &v ) +void PropertyCoordItem::setValue( const TQVariant &v ) { if ( ( !hasSubItems() || !isOpen() ) && value() == v ) return; - QString s; + TQString s; if ( typ == Rect ) - s = "[ " + QString::number( v.toRect().x() ) + ", " + QString::number( v.toRect().y() ) + ", " + - QString::number( v.toRect().width() ) + ", " + QString::number( v.toRect().height() ) + " ]"; + s = "[ " + TQString::number( v.toRect().x() ) + ", " + TQString::number( v.toRect().y() ) + ", " + + TQString::number( v.toRect().width() ) + ", " + TQString::number( v.toRect().height() ) + " ]"; else if ( typ == Point ) - s = "[ " + QString::number( v.toPoint().x() ) + ", " + - QString::number( v.toPoint().y() ) + " ]"; + s = "[ " + TQString::number( v.toPoint().x() ) + ", " + + TQString::number( v.toPoint().y() ) + " ]"; else if ( typ == Size ) - s = "[ " + QString::number( v.toSize().width() ) + ", " + - QString::number( v.toSize().height() ) + " ]"; + s = "[ " + TQString::number( v.toSize().width() ) + ", " + + TQString::number( v.toSize().height() ) + " ]"; setText( 1, s ); if ( lin ) lined()->setText( s ); @@ -1598,7 +1598,7 @@ bool PropertyCoordItem::hasSubItems() const void PropertyCoordItem::childValueChanged( PropertyItem *child ) { if ( typ == Rect ) { - QRect r = value().toRect(); + TQRect r = value().toRect(); if ( child->name() == i18n( "x" ) ) r.moveBy( -r.x() + child->value().toInt(), 0 ); else if ( child->name() == i18n( "y" ) ) @@ -1609,14 +1609,14 @@ void PropertyCoordItem::childValueChanged( PropertyItem *child ) r.setHeight( child->value().toInt() ); setValue( r ); } else if ( typ == Point ) { - QPoint r = value().toPoint(); + TQPoint r = value().toPoint(); if ( child->name() == i18n( "x" ) ) r.setX( child->value().toInt() ); else if ( child->name() == i18n( "y" ) ) r.setY( child->value().toInt() ); setValue( r ); } else if ( typ == Size ) { - QSize r = value().toSize(); + TQSize r = value().toSize(); if ( child->name() == i18n( "width" ) ) r.setWidth( child->value().toInt() ); else if ( child->name() == i18n( "height" ) ) @@ -1629,28 +1629,28 @@ void PropertyCoordItem::childValueChanged( PropertyItem *child ) // -------------------------------------------------------------- PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, Type t ) + const TQString &propName, Type t ) : PropertyItem( l, after, prop, propName ), type( t ) { - box = new QHBox( listview->viewport() ); + box = new TQHBox( listview->viewport() ); box->hide(); - pixPrev = new QLabel( box ); - pixPrev->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Minimum ) ); - pixPrev->setBackgroundColor( pixPrev->colorGroup().color( QColorGroup::Base ) ); - button = new QPushButton( "...", box ); + pixPrev = new TQLabel( box ); + pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) ); + pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) ); + button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); - box->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); box->setLineWidth( 2 ); - pixPrev->setFrameStyle( QFrame::NoFrame ); + pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getPixmap() ) ); + connect( button, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() { - delete (QHBox*)box; + delete (TQHBox*)box; } void PropertyPixmapItem::showEditor() @@ -1669,9 +1669,9 @@ void PropertyPixmapItem::hideEditor() box->hide(); } -void PropertyPixmapItem::setValue( const QVariant &v ) +void PropertyPixmapItem::setValue( const TQVariant &v ) { - QString s; + TQString s; if ( type == Pixmap ) pixPrev->setPixmap( v.toPixmap() ); else if ( type == IconSet ) @@ -1684,12 +1684,12 @@ void PropertyPixmapItem::setValue( const QVariant &v ) void PropertyPixmapItem::getPixmap() { - QPixmap pix = qChoosePixmap( listview, listview->propertyEditor()->formWindow(), value().toPixmap() ); + TQPixmap pix = qChoosePixmap( listview, listview->propertyEditor()->formWindow(), value().toPixmap() ); if ( !pix.isNull() ) { if ( type == Pixmap ) setValue( pix ); else if ( type == IconSet ) - setValue( QIconSet( pix ) ); + setValue( TQIconSet( pix ) ); else setValue( pix.convertToImage() ); @@ -1702,9 +1702,9 @@ bool PropertyPixmapItem::hasCustomContents() const return TRUE; } -void PropertyPixmapItem::drawCustomContents( QPainter *p, const QRect &r ) +void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r ) { - QPixmap pix; + TQPixmap pix; if ( type == Pixmap ) pix = value().toPixmap(); else if ( type == IconSet ) @@ -1714,7 +1714,7 @@ void PropertyPixmapItem::drawCustomContents( QPainter *p, const QRect &r ) if ( !pix.isNull() ) { p->save(); - p->setClipRect( QRect( QPoint( (int)(p->worldMatrix().dx() + r.x()), + 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 ); @@ -1726,29 +1726,29 @@ void PropertyPixmapItem::drawCustomContents( QPainter *p, const QRect &r ) // -------------------------------------------------------------- PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, bool children ) + const TQString &propName, bool children ) : PropertyItem( l, after, prop, propName ), withChildren( children ) { - box = new QHBox( listview->viewport() ); + box = new TQHBox( listview->viewport() ); box->hide(); - colorPrev = new QFrame( box ); - button = new QPushButton( "...", box ); + colorPrev = new TQFrame( box ); + button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); - box->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); box->setLineWidth( 2 ); - colorPrev->setFrameStyle( QFrame::Plain | QFrame::Box ); + colorPrev->setFrameStyle( TQFrame::Plain | TQFrame::Box ); colorPrev->setLineWidth( 2 ); - QPalette pal = colorPrev->palette(); - QColorGroup cg = pal.active(); - cg.setColor( QColorGroup::Foreground, cg.color( QColorGroup::Base ) ); + TQPalette pal = colorPrev->palette(); + TQColorGroup cg = pal.active(); + cg.setColor( TQColorGroup::Foreground, cg.color( TQColorGroup::Base ) ); pal.setActive( cg ); pal.setInactive( cg ); pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getColor() ) ); + connect( button, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() @@ -1778,7 +1778,7 @@ void PropertyColorItem::initChildren() PropertyColorItem::~PropertyColorItem() { - delete (QHBox*)box; + delete (TQHBox*)box; } void PropertyColorItem::showEditor() @@ -1797,13 +1797,13 @@ void PropertyColorItem::hideEditor() box->hide(); } -void PropertyColorItem::setValue( const QVariant &v ) +void PropertyColorItem::setValue( const TQVariant &v ) { if ( ( !hasSubItems() || !isOpen() ) && value() == v ) return; - QString s; + TQString s; setText( 1, v.toColor().name() ); colorPrev->setBackgroundColor( v.toColor() ); PropertyItem::setValue( v ); @@ -1816,7 +1816,7 @@ bool PropertyColorItem::hasSubItems() const void PropertyColorItem::childValueChanged( PropertyItem *child ) { - QColor c( val.toColor() ); + TQColor c( val.toColor() ); if ( child->name() == i18n( "Red" ) ) c.setRgb( child->value().toInt(), c.green(), c.blue() ); else if ( child->name() == i18n( "Green" ) ) @@ -1829,7 +1829,7 @@ void PropertyColorItem::childValueChanged( PropertyItem *child ) void PropertyColorItem::getColor() { - QColor c = QColorDialog::getColor( val.asColor(), listview ); + TQColor c = QColorDialog::getColor( val.asColor(), listview ); if ( c.isValid() ) { setValue( c ); notifyValueChange(); @@ -1841,10 +1841,10 @@ bool PropertyColorItem::hasCustomContents() const return TRUE; } -void PropertyColorItem::drawCustomContents( QPainter *p, const QRect &r ) +void PropertyColorItem::drawCustomContents( TQPainter *p, const TQRect &r ) { p->save(); - p->setPen( QPen( black, 1 ) ); + p->setPen( TQPen( black, 1 ) ); p->setBrush( val.toColor() ); p->drawRect( r.x() + 2, r.y() + 2, r.width() - 5, r.height() - 5 ); p->restore(); @@ -1852,16 +1852,16 @@ void PropertyColorItem::drawCustomContents( QPainter *p, const QRect &r ) // -------------------------------------------------------------- -PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ) +PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) : PropertyItem( l, after, prop, propName ) { - box = new QHBox( listview->viewport() ); + box = new TQHBox( listview->viewport() ); box->hide(); - lined = new QLineEdit( box ); - button = new QPushButton( "...", box ); + lined = new TQLineEdit( box ); + button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); - box->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); box->setLineWidth( 2 ); lined->setFrame( FALSE ); lined->setReadOnly( TRUE ); @@ -1869,8 +1869,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getFont() ) ); + connect( button, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() @@ -1901,19 +1901,19 @@ void PropertyFontItem::initChildren() } else if ( item->name() == i18n( "Point Size" ) ) item->setValue( val.toFont().pointSize() ); else if ( item->name() == i18n( "Bold" ) ) - item->setValue( QVariant( val.toFont().bold(), 0 ) ); + item->setValue( TQVariant( val.toFont().bold(), 0 ) ); else if ( item->name() == i18n( "Italic" ) ) - item->setValue( QVariant( val.toFont().italic(), 0 ) ); + item->setValue( TQVariant( val.toFont().italic(), 0 ) ); else if ( item->name() == i18n( "Underline" ) ) - item->setValue( QVariant( val.toFont().underline(), 0 ) ); + item->setValue( TQVariant( val.toFont().underline(), 0 ) ); else if ( item->name() == i18n( "Strikeout" ) ) - item->setValue( QVariant( val.toFont().strikeOut(), 0 ) ); + item->setValue( TQVariant( val.toFont().strikeOut(), 0 ) ); } } PropertyFontItem::~PropertyFontItem() { - delete (QHBox*)box; + delete (TQHBox*)box; } void PropertyFontItem::showEditor() @@ -1932,20 +1932,20 @@ void PropertyFontItem::hideEditor() box->hide(); } -void PropertyFontItem::setValue( const QVariant &v ) +void PropertyFontItem::setValue( const TQVariant &v ) { if ( value() == v ) return; - setText( 1, v.toFont().family() + "-" + QString::number( v.toFont().pointSize() ) ); - lined->setText( v.toFont().family() + "-" + QString::number( v.toFont().pointSize() ) ); + setText( 1, v.toFont().family() + "-" + TQString::number( v.toFont().pointSize() ) ); + lined->setText( v.toFont().family() + "-" + TQString::number( v.toFont().pointSize() ) ); PropertyItem::setValue( v ); } void PropertyFontItem::getFont() { bool ok = FALSE; - QFont f = QFontDialog::getFont( &ok, val.toFont(), listview ); + TQFont f = QFontDialog::getFont( &ok, val.toFont(), listview ); if ( ok && f != val.toFont() ) { setValue( f ); notifyValueChange(); @@ -1959,7 +1959,7 @@ bool PropertyFontItem::hasSubItems() const void PropertyFontItem::childValueChanged( PropertyItem *child ) { - QFont f = val.toFont(); + TQFont f = val.toFont(); if ( child->name() == i18n( "Family" ) ) f.setFamily( ( (PropertyListItem*)child )->currentItem() ); else if ( child->name() == i18n( "Point Size" ) ) @@ -1979,16 +1979,16 @@ void PropertyFontItem::childValueChanged( PropertyItem *child ) // -------------------------------------------------------------- PropertyDatabaseItem::PropertyDatabaseItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, bool wField ) + const TQString &propName, bool wField ) : PropertyItem( l, after, prop, propName ), withField( wField ) { - box = new QHBox( listview->viewport() ); + box = new TQHBox( listview->viewport() ); box->hide(); - lined = new QLineEdit( box ); - button = new QPushButton( "...", box ); + lined = new TQLineEdit( box ); + button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); - box->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); box->setLineWidth( 2 ); lined->setFrame( FALSE ); lined->setReadOnly( TRUE ); @@ -2015,18 +2015,18 @@ void PropertyDatabaseItem::initChildren() { #ifndef QT_NO_SQL PropertyItem *item = 0; - QStringList lst = value().toStringList(); - QString conn, table; + TQStringList lst = value().toStringList(); + TQString conn, table; for ( int i = 0; i < childCount(); ++i ) { item = PropertyItem::child( i ); if ( item->name() == i18n( "Connection" ) ) { - QStringList cl = listview->propertyEditor()->formWindow()->project()->databaseConnectionList(); + TQStringList cl = listview->propertyEditor()->formWindow()->project()->databaseConnectionList(); if ( !cl.isEmpty() ) item->setValue( cl ); else if ( lst.count() > 0 ) - item->setValue( QStringList( lst[ 0 ] ) ); + item->setValue( TQStringList( lst[ 0 ] ) ); else if ( withField ) - item->setValue( QStringList( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), + item->setValue( TQStringList( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList()[ 0 ] ) ); if ( lst.count() > 0 && !lst[ 0 ].isEmpty() ) @@ -2038,13 +2038,13 @@ void PropertyDatabaseItem::initChildren() item->setCurrentItem( 0 ); conn = item->currentItem(); } else if ( item->name() == i18n( "Table" ) ) { - QStringList cl = listview->propertyEditor()->formWindow()->project()->databaseTableList( conn ); + TQStringList cl = listview->propertyEditor()->formWindow()->project()->databaseTableList( conn ); if ( !cl.isEmpty() ) item->setValue( cl ); else if ( lst.count() > 1 ) - item->setValue( QStringList( lst[ 1 ] ) ); + item->setValue( TQStringList( lst[ 1 ] ) ); else if ( withField ) { - QStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList(); + TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList(); if ( fakeLst.count() > 1 ) item->setValue( fakeLst[ 1 ] ); } @@ -2052,7 +2052,7 @@ void PropertyDatabaseItem::initChildren() if ( lst.count() > 1 && !lst[ 1 ].isEmpty() ) item->setCurrentItem( lst[ 1 ] ); else if ( !isChanged() && withField ) { - QStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList(); + TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList(); if ( fakeLst.count() > 1 ) item->setCurrentItem( fakeLst[ 1 ] ); else @@ -2061,11 +2061,11 @@ void PropertyDatabaseItem::initChildren() item->setCurrentItem( 0 ); table = item->currentItem(); } else if ( item->name() == i18n( "Field" ) ) { - QStringList cl = listview->propertyEditor()->formWindow()->project()->databaseFieldList( conn, table ); + TQStringList cl = listview->propertyEditor()->formWindow()->project()->databaseFieldList( conn, table ); if ( !cl.isEmpty() ) item->setValue( cl ); else if ( lst.count() > 2 ) - item->setValue( QStringList( lst[ 2 ] ) ); + item->setValue( TQStringList( lst[ 2 ] ) ); if ( lst.count() > 2 && !lst[ 2 ].isEmpty() ) item->setCurrentItem( lst[ 2 ] ); else @@ -2077,7 +2077,7 @@ void PropertyDatabaseItem::initChildren() PropertyDatabaseItem::~PropertyDatabaseItem() { - delete (QHBox*)box; + delete (TQHBox*)box; } void PropertyDatabaseItem::showEditor() @@ -2096,13 +2096,13 @@ void PropertyDatabaseItem::hideEditor() box->hide(); } -void PropertyDatabaseItem::setValue( const QVariant &v ) +void PropertyDatabaseItem::setValue( const TQVariant &v ) { if ( value() == v ) return; - QStringList lst = v.toStringList(); - QString s = lst.join( "." ); + TQStringList lst = v.toStringList(); + TQString s = lst.join( "." ); setText( 1, s ); lined->setText( s ); PropertyItem::setValue( v ); @@ -2116,7 +2116,7 @@ bool PropertyDatabaseItem::hasSubItems() const void PropertyDatabaseItem::childValueChanged( PropertyItem *c ) { #ifndef QT_NO_SQL - QStringList lst; + TQStringList lst; lst << ( (PropertyListItem*)PropertyItem::child( 0 ) )->currentItem() << ( (PropertyListItem*)PropertyItem::child( 1 ) )->currentItem(); if ( withField ) @@ -2146,17 +2146,17 @@ void PropertyDatabaseItem::childValueChanged( PropertyItem *c ) // -------------------------------------------------------------- PropertySizePolicyItem::PropertySizePolicyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ) + const TQString &propName ) : PropertyItem( l, after, prop, propName ) { lin = 0; } -QLineEdit *PropertySizePolicyItem::lined() +TQLineEdit *PropertySizePolicyItem::lined() { if ( lin ) return lin; - lin = new QLineEdit( listview->viewport() ); + lin = new TQLineEdit( listview->viewport() ); lin->hide(); lin->setReadOnly( TRUE ); return lin; @@ -2164,7 +2164,7 @@ QLineEdit *PropertySizePolicyItem::lined() void PropertySizePolicyItem::createChildren() { - QStringList lst; + TQStringList lst; lst << "Fixed" << "Minimum" << "Maximum" << "Preferred" << "MinimumExpanding" << "Expanding" << "Ignored"; PropertyItem *i = this; @@ -2183,7 +2183,7 @@ void PropertySizePolicyItem::createChildren() void PropertySizePolicyItem::initChildren() { PropertyItem *item = 0; - QSizePolicy sp = val.toSizePolicy(); + TQSizePolicy sp = val.toSizePolicy(); for ( int i = 0; i < childCount(); ++i ) { item = PropertyItem::child( i ); if ( item->name() == i18n( "hSizeType" ) ) @@ -2199,7 +2199,7 @@ void PropertySizePolicyItem::initChildren() PropertySizePolicyItem::~PropertySizePolicyItem() { - delete (QLineEdit*)lin; + delete (TQLineEdit*)lin; } void PropertySizePolicyItem::showEditor() @@ -2218,12 +2218,12 @@ void PropertySizePolicyItem::hideEditor() lined()->hide(); } -void PropertySizePolicyItem::setValue( const QVariant &v ) +void PropertySizePolicyItem::setValue( const TQVariant &v ) { if ( value() == v ) return; - QString s = i18n( "%1/%2/%3/%4" ); + TQString s = i18n( "%1/%2/%3/%4" ); s = s.arg( size_type_to_string( v.toSizePolicy().horData() ) ). arg( size_type_to_string( v.toSizePolicy().verData() ) ). arg( v.toSizePolicy().horStretch() ). @@ -2235,7 +2235,7 @@ void PropertySizePolicyItem::setValue( const QVariant &v ) void PropertySizePolicyItem::childValueChanged( PropertyItem *child ) { - QSizePolicy sp = val.toSizePolicy(); + TQSizePolicy sp = val.toSizePolicy(); if ( child->name() == i18n( "hSizeType" ) ) sp.setHorData( int_to_size_type( ( ( PropertyListItem*)child )->currentIntItem() ) ); else if ( child->name() == i18n( "vSizeType" ) ) @@ -2256,25 +2256,25 @@ bool PropertySizePolicyItem::hasSubItems() const // -------------------------------------------------------------- PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ) + const TQString &propName ) : PropertyItem( l, after, prop, propName ) { - box = new QHBox( listview->viewport() ); + box = new TQHBox( listview->viewport() ); box->hide(); - palettePrev = new QLabel( box ); - button = new QPushButton( "...", box ); + palettePrev = new TQLabel( box ); + button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); - box->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); box->setLineWidth( 2 ); - palettePrev->setFrameStyle( QFrame::NoFrame ); + palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getPalette() ) ); + connect( button, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { - delete (QHBox*)box; + delete (TQHBox*)box; } void PropertyPaletteItem::showEditor() @@ -2293,9 +2293,9 @@ void PropertyPaletteItem::hideEditor() box->hide(); } -void PropertyPaletteItem::setValue( const QVariant &v ) +void PropertyPaletteItem::setValue( const TQVariant &v ) { - QString s; + TQString s; palettePrev->setPalette( v.toPalette() ); PropertyItem::setValue( v ); repaint(); @@ -2306,10 +2306,10 @@ void PropertyPaletteItem::getPalette() if ( !listview->propertyEditor()->widget()->isWidgetType() ) return; bool ok = FALSE; - QWidget *w = (QWidget*)listview->propertyEditor()->widget(); - if ( ::qt_cast(w) ) - w = ( (QScrollView*)w )->viewport(); - QPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), + TQWidget *w = (TQWidget*)listview->propertyEditor()->widget(); + if ( ::qt_cast(w) ) + w = ( (TQScrollView*)w )->viewport(); + TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), #if defined(QT_NON_COMMERCIAL) w->backgroundMode(), listview->topLevelWidget(), #else @@ -2327,19 +2327,19 @@ bool PropertyPaletteItem::hasCustomContents() const return TRUE; } -void PropertyPaletteItem::drawCustomContents( QPainter *p, const QRect &r ) +void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r ) { - QPalette pal( value().toPalette() ); + TQPalette pal( value().toPalette() ); p->save(); - p->setClipRect( QRect( QPoint( (int)(p->worldMatrix().dx() + r.x()), + p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()), (int)(p->worldMatrix().dy() + r.y()) ), r.size() ) ); - QRect r2( r ); + TQRect r2( r ); r2.setX( r2.x() + 2 ); r2.setY( r2.y() + 2 ); r2.setWidth( r2.width() - 3 ); r2.setHeight( r2.height() - 3 ); - p->setPen( QPen( black, 1 ) ); + p->setPen( TQPen( black, 1 ) ); p->setBrush( pal.active().background() ); p->drawRect( r2 ); p->restore(); @@ -2348,62 +2348,62 @@ void PropertyPaletteItem::drawCustomContents( QPainter *p, const QRect &r ) // -------------------------------------------------------------- PropertyCursorItem::PropertyCursorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ) + const TQString &propName ) : PropertyItem( l, after, prop, propName ) { comb = 0; } -QComboBox *PropertyCursorItem::combo() +TQComboBox *PropertyCursorItem::combo() { if ( comb ) return comb; - comb = new QComboBox( FALSE, listview->viewport() ); + comb = new TQComboBox( FALSE, listview->viewport() ); comb->hide(); - QBitmap cur; - - const QPixmap ArrowPix = SmallIcon( "designer_arrow.png" , KDevDesignerPartFactory::instance()); - const QPixmap UpArrowPix = SmallIcon( "designer_uparrow.png" , KDevDesignerPartFactory::instance()); - const QPixmap CrossPix = SmallIcon( "designer_cross.png" , KDevDesignerPartFactory::instance()); - const QPixmap WaitPix = SmallIcon( "designer_wait.png" , KDevDesignerPartFactory::instance()); - const QPixmap IBeamPix = SmallIcon( "designer_ibeam.png" , KDevDesignerPartFactory::instance()); - const QPixmap SizeVPix = SmallIcon( "designer_sizev.png" , KDevDesignerPartFactory::instance()); - const QPixmap SizeHPix = SmallIcon( "designer_sizeh.png" , KDevDesignerPartFactory::instance()); - const QPixmap SizeFPix = SmallIcon( "designer_sizef.png" , KDevDesignerPartFactory::instance()); - const QPixmap SizeBPix = SmallIcon( "designer_sizeb.png" , KDevDesignerPartFactory::instance()); - const QPixmap SizeAllPix = SmallIcon( "designer_sizeall.png" , KDevDesignerPartFactory::instance()); - const QPixmap VSplitPix = SmallIcon( "designer_vsplit.png" , KDevDesignerPartFactory::instance()); - const QPixmap HSplitPix = SmallIcon( "designer_hsplit.png" , KDevDesignerPartFactory::instance()); - const QPixmap HandPix = SmallIcon( "designer_hand.png" , KDevDesignerPartFactory::instance()); - const QPixmap NoPix = SmallIcon( "designer_no.png" , KDevDesignerPartFactory::instance()); - - comb->insertItem( ArrowPix, i18n("Arrow"), QObject::ArrowCursor); - comb->insertItem( UpArrowPix, i18n("Up-Arrow"), QObject::UpArrowCursor ); - comb->insertItem( CrossPix, i18n("Cross"), QObject::CrossCursor ); - comb->insertItem( WaitPix, i18n("Waiting"), QObject::WaitCursor ); - comb->insertItem( IBeamPix, i18n("iBeam"), QObject::IbeamCursor ); - comb->insertItem( SizeVPix, i18n("Size Vertical"), QObject::SizeVerCursor ); - comb->insertItem( SizeHPix, i18n("Size Horizontal"), QObject::SizeHorCursor ); - comb->insertItem( SizeFPix, i18n("Size Slash"), QObject::SizeBDiagCursor ); - comb->insertItem( SizeBPix, i18n("Size Backslash"), QObject::SizeFDiagCursor ); - comb->insertItem( SizeAllPix, i18n("Size All"), QObject::SizeAllCursor ); - cur = QBitmap( 25, 25, 1 ); + TQBitmap cur; + + const TQPixmap ArrowPix = SmallIcon( "designer_arrow.png" , KDevDesignerPartFactory::instance()); + const TQPixmap UpArrowPix = SmallIcon( "designer_uparrow.png" , KDevDesignerPartFactory::instance()); + const TQPixmap CrossPix = SmallIcon( "designer_cross.png" , KDevDesignerPartFactory::instance()); + const TQPixmap WaitPix = SmallIcon( "designer_wait.png" , KDevDesignerPartFactory::instance()); + const TQPixmap IBeamPix = SmallIcon( "designer_ibeam.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeVPix = SmallIcon( "designer_sizev.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeHPix = SmallIcon( "designer_sizeh.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeFPix = SmallIcon( "designer_sizef.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeBPix = SmallIcon( "designer_sizeb.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeAllPix = SmallIcon( "designer_sizeall.png" , KDevDesignerPartFactory::instance()); + const TQPixmap VSplitPix = SmallIcon( "designer_vsplit.png" , KDevDesignerPartFactory::instance()); + const TQPixmap HSplitPix = SmallIcon( "designer_hsplit.png" , KDevDesignerPartFactory::instance()); + const TQPixmap HandPix = SmallIcon( "designer_hand.png" , KDevDesignerPartFactory::instance()); + const TQPixmap NoPix = SmallIcon( "designer_no.png" , KDevDesignerPartFactory::instance()); + + comb->insertItem( ArrowPix, i18n("Arrow"), TQObject::ArrowCursor); + comb->insertItem( UpArrowPix, i18n("Up-Arrow"), TQObject::UpArrowCursor ); + comb->insertItem( CrossPix, i18n("Cross"), TQObject::CrossCursor ); + comb->insertItem( WaitPix, i18n("Waiting"), TQObject::WaitCursor ); + comb->insertItem( IBeamPix, i18n("iBeam"), TQObject::IbeamCursor ); + comb->insertItem( SizeVPix, i18n("Size Vertical"), TQObject::SizeVerCursor ); + comb->insertItem( SizeHPix, i18n("Size Horizontal"), TQObject::SizeHorCursor ); + comb->insertItem( SizeFPix, i18n("Size Slash"), TQObject::SizeBDiagCursor ); + comb->insertItem( SizeBPix, i18n("Size Backslash"), TQObject::SizeFDiagCursor ); + comb->insertItem( SizeAllPix, i18n("Size All"), TQObject::SizeAllCursor ); + cur = TQBitmap( 25, 25, 1 ); cur.setMask( cur ); - comb->insertItem( cur, i18n("Blank"), QObject::BlankCursor ); - comb->insertItem( VSplitPix, i18n("Split Vertical"), QObject::SplitVCursor ); - comb->insertItem( HSplitPix, i18n("Split Horizontal"), QObject::SplitHCursor ); - comb->insertItem( HandPix, i18n("Pointing Hand"), QObject::PointingHandCursor ); - comb->insertItem( NoPix, i18n("Forbidden"), QObject::ForbiddenCursor ); - - connect( comb, SIGNAL( activated( int ) ), - this, SLOT( setValue() ) ); + comb->insertItem( cur, i18n("Blank"), TQObject::BlankCursor ); + comb->insertItem( VSplitPix, i18n("Split Vertical"), TQObject::SplitVCursor ); + comb->insertItem( HSplitPix, i18n("Split Horizontal"), TQObject::SplitHCursor ); + comb->insertItem( HandPix, i18n("Pointing Hand"), TQObject::PointingHandCursor ); + comb->insertItem( NoPix, i18n("Forbidden"), TQObject::ForbiddenCursor ); + + connect( comb, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } PropertyCursorItem::~PropertyCursorItem() { - delete (QComboBox*)comb; + delete (TQComboBox*)comb; } void PropertyCursorItem::showEditor() @@ -2427,7 +2427,7 @@ void PropertyCursorItem::hideEditor() combo()->hide(); } -void PropertyCursorItem::setValue( const QVariant &v ) +void PropertyCursorItem::setValue( const TQVariant &v ) { if ( ( !hasSubItems() || !isOpen() ) && value() == v ) @@ -2444,10 +2444,10 @@ void PropertyCursorItem::setValue() { if ( !comb ) return; - if ( QVariant( QCursor( combo()->currentItem() ) ) == val ) + if ( TQVariant( TQCursor( combo()->currentItem() ) ) == val ) return; setText( 1, combo()->currentText() ); - PropertyItem::setValue( QCursor( combo()->currentItem() ) ); + PropertyItem::setValue( TQCursor( combo()->currentItem() ) ); notifyValueChange(); } @@ -2456,21 +2456,21 @@ void PropertyCursorItem::setValue() PropertyKeysequenceItem::PropertyKeysequenceItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ) + const TQString &propName ) : PropertyItem( l, after, prop, propName ), k1( 0 ), k2( 0 ), k3( 0 ), k4( 0 ), num( 0 ), mouseEnter( FALSE ) { - box = new QHBox( listview->viewport() ); + box = new TQHBox( listview->viewport() ); box->hide(); - sequence = new QLineEdit( box ); - connect( sequence, SIGNAL(textChanged( const QString & )), - this, SLOT(setValue()) ); + sequence = new TQLineEdit( box ); + connect( sequence, TQT_SIGNAL(textChanged( const TQString & )), + this, TQT_SLOT(setValue()) ); sequence->installEventFilter( this ); } PropertyKeysequenceItem::~PropertyKeysequenceItem() { - delete (QHBox*)box; + delete (TQHBox*)box; } void PropertyKeysequenceItem::showEditor() @@ -2489,41 +2489,41 @@ void PropertyKeysequenceItem::hideEditor() box->hide(); } -bool PropertyKeysequenceItem::eventFilter( QObject *o, QEvent *e ) +bool PropertyKeysequenceItem::eventFilter( TQObject *o, TQEvent *e ) { Q_UNUSED( o ); - if ( e->type() == QEvent::KeyPress ) { - QKeyEvent *k = (QKeyEvent *)e; + if ( e->type() == TQEvent::KeyPress ) { + TQKeyEvent *k = (TQKeyEvent *)e; if ( !mouseEnter && - (k->key() == QObject::Key_Up || - k->key() == QObject::Key_Down) ) + (k->key() == TQObject::Key_Up || + k->key() == TQObject::Key_Down) ) return FALSE; handleKeyEvent( k ); return TRUE; - } else if ( (e->type() == QEvent::FocusIn) || - (e->type() == QEvent::MouseButtonPress) ) { + } else if ( (e->type() == TQEvent::FocusIn) || + (e->type() == TQEvent::MouseButtonPress) ) { mouseEnter = ( listview->lastEvent() == PropertyList::MouseEvent ) || - (e->type() == QEvent::MouseButtonPress); + (e->type() == TQEvent::MouseButtonPress); return TRUE; } // Lets eat accelerators now.. - if ( e->type() == QEvent::Accel || - e->type() == QEvent::AccelOverride || - e->type() == QEvent::KeyRelease ) + if ( e->type() == TQEvent::Accel || + e->type() == TQEvent::AccelOverride || + e->type() == TQEvent::KeyRelease ) return TRUE; return FALSE; } -void PropertyKeysequenceItem::handleKeyEvent( QKeyEvent *e ) +void PropertyKeysequenceItem::handleKeyEvent( TQKeyEvent *e ) { int nextKey = e->key(); if ( num > 3 || - nextKey == QObject::Key_Control || - nextKey == QObject::Key_Shift || - nextKey == QObject::Key_Meta || - nextKey == QObject::Key_Alt ) + nextKey == TQObject::Key_Control || + nextKey == TQObject::Key_Shift || + nextKey == TQObject::Key_Meta || + nextKey == TQObject::Key_Alt ) return; nextKey |= translateModifiers( e->state() ); @@ -2544,28 +2544,28 @@ void PropertyKeysequenceItem::handleKeyEvent( QKeyEvent *e ) break; } num++; - QKeySequence ks( k1, k2, k3, k4 ); + TQKeySequence ks( k1, k2, k3, k4 ); sequence->setText( ks ); } int PropertyKeysequenceItem::translateModifiers( int state ) { int result = 0; - if ( state & QObject::ShiftButton ) - result |= QObject::SHIFT; - if ( state & QObject::ControlButton ) - result |= QObject::CTRL; - if ( state & QObject::MetaButton ) - result |= QObject::META; - if ( state & QObject::AltButton ) - result |= QObject::ALT; + if ( state & TQObject::ShiftButton ) + result |= TQObject::SHIFT; + if ( state & TQObject::ControlButton ) + result |= TQObject::CTRL; + if ( state & TQObject::MetaButton ) + result |= TQObject::META; + if ( state & TQObject::AltButton ) + result |= TQObject::ALT; return result; } void PropertyKeysequenceItem::setValue() { - QVariant v; - v = QVariant( QKeySequence(sequence->text()) ); + TQVariant v; + v = TQVariant( TQKeySequence(sequence->text()) ); if ( v.toString().isNull() ) return; setText( 1, sequence->text() ); @@ -2575,9 +2575,9 @@ void PropertyKeysequenceItem::setValue() setChanged( TRUE ); } -void PropertyKeysequenceItem::setValue( const QVariant &v ) +void PropertyKeysequenceItem::setValue( const TQVariant &v ) { - QKeySequence ks = v.toKeySequence(); + TQKeySequence ks = v.toKeySequence(); if ( sequence ) { sequence->setText( ks ); } @@ -2592,13 +2592,13 @@ void PropertyKeysequenceItem::setValue( const QVariant &v ) // -------------------------------------------------------------- -EnumPopup::EnumPopup( QWidget *parent, const char *name, WFlags f ) - : QFrame( parent, name, f ) +EnumPopup::EnumPopup( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { setLineWidth( 1 ); setFrameStyle( Panel | Plain ); setPaletteBackgroundColor( Qt::white ); - popLayout = new QVBoxLayout( this, 3 ); + popLayout = new TQVBoxLayout( this, 3 ); checkBoxList.setAutoDelete( TRUE ); } @@ -2606,16 +2606,16 @@ EnumPopup::~EnumPopup() { } -void EnumPopup::insertEnums( QValueList lst ) +void EnumPopup::insertEnums( TQValueList lst ) { while ( checkBoxList.count() ) checkBoxList.removeFirst(); itemList = lst; - QCheckBox *cb; - QValueListConstIterator it = itemList.begin(); + TQCheckBox *cb; + TQValueListConstIterator it = itemList.begin(); for ( ; it != itemList.end(); ++it ) { - cb = new QCheckBox( this ); + cb = new TQCheckBox( this ); cb->setText( (*it).key ); cb->setChecked( (*it).selected ); if ( it == itemList.begin() ) @@ -2626,7 +2626,7 @@ void EnumPopup::insertEnums( QValueList lst ) } } -void EnumPopup::keyPressEvent( QKeyEvent *e ) +void EnumPopup::keyPressEvent( TQKeyEvent *e ) { if ( e->key() == Key_Escape ) { hide(); @@ -2638,7 +2638,7 @@ void EnumPopup::keyPressEvent( QKeyEvent *e ) void EnumPopup::closeWidget() { - QPtrListIterator it( checkBoxList ); + TQPtrListIterator it( checkBoxList ); int i = 0; while ( it.current() != 0 ) { itemList[i].selected = (*it)->isChecked(); @@ -2649,17 +2649,17 @@ void EnumPopup::closeWidget() emit closed(); } -QValueList EnumPopup::enumList() const +TQValueList EnumPopup::enumList() const { return itemList; } -EnumBox::EnumBox( QWidget *parent, const char *name ) - : QComboBox( parent, name ) +EnumBox::EnumBox( TQWidget *parent, const char *name ) + : TQComboBox( parent, name ) { - pop = new EnumPopup( this, "popup", QObject::WType_Popup ); - connect( pop, SIGNAL( hidden() ), this, SLOT( popupHidden() ) ); - connect( pop, SIGNAL( closed() ), this, SLOT( popupClosed() ) ); + pop = new EnumPopup( this, "popup", TQObject::WType_Popup ); + connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) ); + connect( pop, TQT_SIGNAL( closed() ), this, TQT_SLOT( popupClosed() ) ); popupShown = FALSE; arrowDown = FALSE; } @@ -2675,50 +2675,50 @@ void EnumBox::popupClosed() emit valueChanged(); } -void EnumBox::paintEvent( QPaintEvent * ) +void EnumBox::paintEvent( TQPaintEvent * ) { - QPainter p( this ); - const QColorGroup & g = colorGroup(); + TQPainter p( this ); + const TQColorGroup & g = colorGroup(); p.setPen(g.text()); - QStyle::SFlags flags = QStyle::Style_Default; + TQStyle::SFlags flags = TQStyle::Style_Default; if (isEnabled()) - flags |= QStyle::Style_Enabled; + flags |= TQStyle::Style_Enabled; if (hasFocus()) - flags |= QStyle::Style_HasFocus; + flags |= TQStyle::Style_HasFocus; if ( width() < 5 || height() < 5 ) { qDrawShadePanel( &p, rect().x(), rect().y(), rect().width(), rect().height(), g, FALSE, 2, - &g.brush( QColorGroup::Button ) ); + &g.brush( TQColorGroup::Button ) ); return; } - style().drawComplexControl( QStyle::CC_ComboBox, &p, this, rect(), g, - flags, QStyle::SC_All, + style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, + flags, TQStyle::SC_All, (arrowDown ? - QStyle::SC_ComboBoxArrow : - QStyle::SC_None )); + TQStyle::SC_ComboBoxArrow : + TQStyle::SC_None )); - QRect re = style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxEditField ); - re = QStyle::visualRect(re, this); + TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxEditField ); + re = TQStyle::visualRect(re, this); p.setClipRect( re ); if ( !str.isNull() ) { p.save(); p.setFont(font()); - QFontMetrics fm(font()); + TQFontMetrics fm(font()); int x = re.x(), y = re.y() + fm.ascent(); p.drawText( x, y, str ); p.restore(); } } -void EnumBox::insertEnums( QValueList lst ) +void EnumBox::insertEnums( TQValueList lst ) { pop->insertEnums( lst ); } -QValueList EnumBox::enumList() const +TQValueList EnumBox::enumList() const { return pop->enumList(); } @@ -2730,21 +2730,21 @@ void EnumBox::popup() popupShown = FALSE; return; } - pop->move( ((QWidget*)parent())->mapToGlobal( geometry().bottomLeft() ) ); + pop->move( ((TQWidget*)parent())->mapToGlobal( geometry().bottomLeft() ) ); pop->setMinimumWidth( width() ); emit aboutToShowPopup(); pop->show(); popupShown = TRUE; } -void EnumBox::mousePressEvent( QMouseEvent *e ) +void EnumBox::mousePressEvent( TQMouseEvent *e ) { if ( e->button() != LeftButton ) return; - QRect arrowRect = style().querySubControlMetrics( QStyle::CC_ComboBox, this, - QStyle::SC_ComboBoxArrow); - arrowRect = QStyle::visualRect(arrowRect, this); + TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQStyle::SC_ComboBoxArrow); + arrowRect = TQStyle::visualRect(arrowRect, this); arrowRect.setHeight( QMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); @@ -2754,14 +2754,14 @@ void EnumBox::mousePressEvent( QMouseEvent *e ) } popup(); - QTimer::singleShot( 100, this, SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQT_SLOT( restoreArrow() ) ); } -void EnumBox::keyPressEvent( QKeyEvent *e ) +void EnumBox::keyPressEvent( TQKeyEvent *e ) { if ( e->key() == Key_Space ) { popup(); - QTimer::singleShot( 100, this, SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQT_SLOT( restoreArrow() ) ); } else if ( e->key() == Key_Enter || e->key() == Key_Return ) { popup(); } @@ -2773,7 +2773,7 @@ void EnumBox::restoreArrow() repaint( FALSE ); } -void EnumBox::setText( const QString &text ) +void EnumBox::setText( const TQString &text ) { str = text; repaint( FALSE ); @@ -2784,14 +2784,14 @@ void EnumBox::setText( const QString &text ) PropertyEnumItem::PropertyEnumItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ) + const TQString &propName ) : PropertyItem( l, after, prop, propName ) { box = new EnumBox( listview->viewport() ); box->hide(); box->installEventFilter( listview ); - connect( box, SIGNAL( aboutToShowPopup() ), this, SLOT( insertEnums() ) ); - connect( box, SIGNAL( valueChanged() ), this, SLOT( setValue() ) ); + connect( box, TQT_SIGNAL( aboutToShowPopup() ), this, TQT_SLOT( insertEnums() ) ); + connect( box, TQT_SIGNAL( valueChanged() ), this, TQT_SLOT( setValue() ) ); } PropertyEnumItem::~PropertyEnumItem() @@ -2817,12 +2817,12 @@ void PropertyEnumItem::hideEditor() box->hide(); } -void PropertyEnumItem::setValue( const QVariant &v ) +void PropertyEnumItem::setValue( const TQVariant &v ) { enumString = ""; enumList.clear(); - QStringList lst = v.toStringList(); - QValueListConstIterator it = lst.begin(); + TQStringList lst = v.toStringList(); + TQValueListConstIterator it = lst.begin(); for ( ; it != lst.end(); ++it ) enumList.append( EnumItem( *it, FALSE ) ); enumList.first().selected = TRUE; @@ -2841,7 +2841,7 @@ void PropertyEnumItem::setValue() { enumList = box->enumList(); enumString = ""; - QValueListConstIterator it = enumList.begin(); + TQValueListConstIterator it = enumList.begin(); for ( ; it != enumList.end(); ++it ) { if ( (*it).selected ) enumString += "|" + (*it).key; @@ -2854,15 +2854,15 @@ void PropertyEnumItem::setValue() notifyValueChange(); } -void PropertyEnumItem::setCurrentValues( QStrList lst ) +void PropertyEnumItem::setCurrentValues( TQStrList lst ) { enumString =""; - QStrList::ConstIterator it = lst.begin(); - QValueList::Iterator eit = enumList.begin(); + TQStrList::ConstIterator it = lst.begin(); + TQValueList::Iterator eit = enumList.begin(); for ( ; eit != enumList.end(); ++eit ) { (*eit).selected = FALSE; for ( it = lst.begin(); it != lst.end(); ++it ) { - if ( QString( *it ) == (*eit).key ) { + if ( TQString( *it ) == (*eit).key ) { (*eit).selected = TRUE; enumString += "|" + (*eit).key; break; @@ -2875,12 +2875,12 @@ void PropertyEnumItem::setCurrentValues( QStrList lst ) setText( 1, enumString ); } -QString PropertyEnumItem::currentItem() const +TQString PropertyEnumItem::currentItem() const { return enumString; } -QString PropertyEnumItem::currentItemFromObject() const +TQString PropertyEnumItem::currentItemFromObject() const { return enumString; } @@ -2889,7 +2889,7 @@ QString PropertyEnumItem::currentItemFromObject() const /*! \class PropertyList propertyeditor.h - \brief PropertyList is a QListView derived class which is used for editing widget properties + \brief PropertyList is a TQListView derived class which is used for editing widget properties This class is used for widget properties. It has to be child of a PropertyEditor. @@ -2908,7 +2908,7 @@ QString PropertyEnumItem::currentItemFromObject() const */ PropertyList::PropertyList( PropertyEditor *e ) - : QListView( e ), editor( e ) + : TQListView( e ), editor( e ) { init_colors(); @@ -2916,21 +2916,21 @@ PropertyList::PropertyList( PropertyEditor *e ) showSorted = FALSE; header()->setMovingEnabled( FALSE ); header()->setStretchEnabled( TRUE ); - setResizePolicy( QScrollView::Manual ); + setResizePolicy( TQScrollView::Manual ); viewport()->setAcceptDrops( TRUE ); viewport()->installEventFilter( this ); addColumn( i18n( "Property" ) ); addColumn( i18n( "Value" ) ); - connect( header(), SIGNAL( sizeChange( int, int, int ) ), - this, SLOT( updateEditorSize() ) ); - disconnect( header(), SIGNAL( sectionClicked( int ) ), - this, SLOT( changeSortColumn( int ) ) ); - connect( header(), SIGNAL( sectionClicked( int ) ), - this, SLOT( toggleSort() ) ); - connect( this, SIGNAL( pressed( QListViewItem *, const QPoint &, int ) ), - this, SLOT( itemPressed( QListViewItem *, const QPoint &, int ) ) ); - connect( this, SIGNAL( doubleClicked( QListViewItem * ) ), - this, SLOT( toggleOpen( QListViewItem * ) ) ); + connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), + this, TQT_SLOT( updateEditorSize() ) ); + disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), + this, TQT_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQT_SIGNAL( sectionClicked( int ) ), + this, TQT_SLOT( toggleSort() ) ); + connect( this, TQT_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQT_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); @@ -2948,80 +2948,80 @@ void PropertyList::toggleSort() editor->setup(); } -void PropertyList::resizeEvent( QResizeEvent *e ) +void PropertyList::resizeEvent( TQResizeEvent *e ) { - QListView::resizeEvent( e ); + TQListView::resizeEvent( e ); if ( currentItem() ) ( ( PropertyItem* )currentItem() )->showEditor(); } -static QVariant::Type type_to_variant( const QString &s ) +static TQVariant::Type type_to_variant( const TQString &s ) { if ( s == "Invalid " ) - return QVariant::Invalid; + return TQVariant::Invalid; if ( s == "Map" ) - return QVariant::Map; + return TQVariant::Map; if ( s == "List" ) - return QVariant::List; + return TQVariant::List; if ( s == "String" ) - return QVariant::String; + return TQVariant::String; if ( s == "StringList" ) - return QVariant::StringList; + return TQVariant::StringList; if ( s == "Font" ) - return QVariant::Font; + return TQVariant::Font; if ( s == "Pixmap" ) - return QVariant::Pixmap; + return TQVariant::Pixmap; if ( s == "Brush" ) - return QVariant::Brush; + return TQVariant::Brush; if ( s == "Rect" ) - return QVariant::Rect; + return TQVariant::Rect; if ( s == "Size" ) - return QVariant::Size; + return TQVariant::Size; if ( s == "Color" ) - return QVariant::Color; + return TQVariant::Color; if ( s == "Palette" ) - return QVariant::Palette; + return TQVariant::Palette; if ( s == "ColorGroup" ) - return QVariant::ColorGroup; + return TQVariant::ColorGroup; if ( s == "IconSet" ) - return QVariant::IconSet; + return TQVariant::IconSet; if ( s == "Point" ) - return QVariant::Point; + return TQVariant::Point; if ( s == "Image" ) - return QVariant::Image; + return TQVariant::Image; if ( s == "Int" ) - return QVariant::Int; + return TQVariant::Int; if ( s == "UInt" ) - return QVariant::UInt; + return TQVariant::UInt; if ( s == "Bool" ) - return QVariant::Bool; + return TQVariant::Bool; if ( s == "Double" ) - return QVariant::Double; + return TQVariant::Double; if ( s == "CString" ) - return QVariant::CString; + return TQVariant::CString; if ( s == "PointArray" ) - return QVariant::PointArray; + return TQVariant::PointArray; if ( s == "Region" ) - return QVariant::Region; + return TQVariant::Region; if ( s == "Bitmap" ) - return QVariant::Bitmap; + return TQVariant::Bitmap; if ( s == "Cursor" ) - return QVariant::Cursor; + return TQVariant::Cursor; if ( s == "SizePolicy" ) - return QVariant::SizePolicy; + return TQVariant::SizePolicy; if ( s == "Date" ) - return QVariant::Date; + return TQVariant::Date; if ( s == "Time" ) - return QVariant::Time; + return TQVariant::Time; if ( s == "DateTime" ) - return QVariant::DateTime; - return QVariant::Invalid; + return TQVariant::DateTime; + return TQVariant::Invalid; } #ifndef QT_NO_SQL -static bool parent_is_data_aware( QWidget *w ) +static bool parent_is_data_aware( TQWidget *w ) { - QWidget *p = w ? w->parentWidget() : 0; + TQWidget *p = w ? w->parentWidget() : 0; while ( p && !p->isTopLevel() ) { if ( ::qt_cast(p) || ::qt_cast(p) ) return TRUE; @@ -3040,22 +3040,22 @@ void PropertyList::setupProperties() if ( !editor->widget() ) return; bool allProperties = !::qt_cast(editor->widget()); - QStrList lst = editor->widget()->metaObject()->propertyNames( allProperties ); + TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties ); PropertyItem *item = 0; - QMap unique; - QObject *w = editor->widget(); - QStringList valueSet; + TQMap unique; + TQObject *w = editor->widget(); + TQStringList valueSet; bool parentHasLayout = w->isWidgetType() && - !editor->formWindow()->isMainContainer( (QWidget*)w ) && ( (QWidget*)w )->parentWidget() && - WidgetFactory::layoutType( ( (QWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; - for ( QPtrListIterator it( lst ); it.current(); ++it ) { - const QMetaProperty* p = + !editor->formWindow()->isMainContainer( (TQWidget*)w ) && ( (TQWidget*)w )->parentWidget() && + WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; + for ( TQPtrListIterator it( lst ); it.current(); ++it ) { + const TQMetaProperty* p = editor->widget()->metaObject()-> property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties ); if ( !p ) continue; - if ( unique.contains( QString::fromLatin1( it.current() ) ) ) + if ( unique.contains( TQString::fromLatin1( it.current() ) ) ) continue; if ( ::qt_cast(editor->widget()) || ::qt_cast(editor->widget()) ) { @@ -3076,9 +3076,9 @@ void PropertyList::setupProperties() if ( qstrcmp( p->name(), "maximumSize" ) == 0 ) continue; } - unique.insert( QString::fromLatin1( it.current() ), TRUE ); + unique.insert( TQString::fromLatin1( it.current() ), TRUE ); if ( editor->widget()->isWidgetType() && - editor->formWindow()->isMainContainer( (QWidget*)editor->widget() ) ) { + editor->formWindow()->isMainContainer( (TQWidget*)editor->widget() ) ) { if ( qstrcmp( p->name(), "geometry" ) == 0 ) continue; } else { // hide some toplevel-only stuff @@ -3137,7 +3137,7 @@ void PropertyList::setupProperties() continue; } } - if ( ::qt_cast(w) ) { + if ( ::qt_cast(w) ) { if ( qstrcmp( p->name(), "usesDropDown" ) == 0 ) continue; if ( qstrcmp( p->name(), "toggleAction" ) == 0 ) @@ -3154,7 +3154,7 @@ void PropertyList::setupProperties() if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in Q_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || !editor->widget()->parent() || - !::qt_cast(editor->widget()->parent()) ) + !::qt_cast(editor->widget()->parent()) ) continue; } @@ -3164,8 +3164,8 @@ void PropertyList::setupProperties() isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) && ( !isPropertyObject || qstrcmp( p->name(), "name" ) != 0 ) ) { if ( p->isSetType() ) { - if ( QString( p->name() ) == "alignment" ) { - QStringList lst; + if ( TQString( p->name() ) == "alignment" ) { + TQStringList lst; lst << p->valueToKey( AlignAuto ) << p->valueToKey( AlignLeft ) << p->valueToKey( AlignHCenter ) @@ -3176,7 +3176,7 @@ void PropertyList::setupProperties() setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "hAlign" ) ) item->setChanged( TRUE, FALSE ); - if ( !::qt_cast(editor->widget()) ) { + if ( !::qt_cast(editor->widget()) ) { lst.clear(); lst << p->valueToKey( AlignTop ) << p->valueToKey( AlignVCenter ) @@ -3187,18 +3187,18 @@ void PropertyList::setupProperties() if ( MetaDataBase::isPropertyChanged( editor->widget(), "vAlign" ) ) item->setChanged( TRUE, FALSE ); item = new PropertyBoolItem( this, item, 0, "wordwrap" ); - if ( ::qt_cast(w) ) + if ( ::qt_cast(w) ) item->setVisible( FALSE ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "wordwrap" ) ) item->setChanged( TRUE, FALSE ); } } else { - QStrList lst( p->enumKeys() ); - QStringList l; - QPtrListIterator it( lst ); + TQStrList lst( p->enumKeys() ); + TQStringList l; + TQPtrListIterator it( lst ); while ( it.current() != 0 ) { - l << QString(*it); + l << TQString(*it); ++it; } item = new PropertyEnumItem( this, item, 0, p->name() ); @@ -3208,19 +3208,19 @@ void PropertyList::setupProperties() item->setChanged( TRUE, FALSE ); } } else if ( p->isEnumType() ) { - QStrList l = p->enumKeys(); - QStringList lst; + TQStrList l = p->enumKeys(); + TQStringList lst; for ( uint i = 0; i < l.count(); ++i ) { - QString k = l.at( i ); + TQString k = l.at( i ); // filter out enum-masks - if ( k[0] == 'M' && k[1].category() == QChar::Letter_Uppercase ) + if ( k[0] == 'M' && k[1].category() == TQChar::Letter_Uppercase ) continue; lst << k; } item = new PropertyListItem( this, item, 0, p->name(), FALSE ); item->setValue( lst ); } else { - QVariant::Type t = QVariant::nameToType( p->type() ); + TQVariant::Type t = TQVariant::nameToType( p->type() ); if ( !addPropertyItem( item, p->name(), t ) ) continue; } @@ -3235,8 +3235,8 @@ void PropertyList::setupProperties() } } - if ( !::qt_cast(w) && !::qt_cast(w) && !::qt_cast(w) && - w->isWidgetType() && WidgetFactory::layoutType( (QWidget*)w ) != WidgetFactory::NoLayout ) { + if ( !::qt_cast(w) && !::qt_cast(w) && !::qt_cast(w) && + w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) { item = new PropertyLayoutItem( this, item, 0, "layoutSpacing" ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "layoutSpacing" ) @@ -3251,15 +3251,15 @@ void PropertyList::setupProperties() layoutInitValue( item, TRUE ); else layoutInitValue( item ); - QWidget *widget = (QWidget*)w; + TQWidget *widget = (TQWidget*)w; if ( ( !::qt_cast(widget) && widget->parentWidget() && ::qt_cast(widget->parentWidget()) ) ) { item = new PropertyListItem( this, item, 0, "resizeMode", FALSE ); - QStringList lst; + TQStringList lst; lst << "Auto" << "FreeResize" << "Minimum" << "Fixed"; item->setValue( lst ); setPropertyValue( item ); - QString resizeMod = MetaDataBase::resizeMode( editor->widget() ); + TQString resizeMod = MetaDataBase::resizeMode( editor->widget() ); if ( !resizeMod.isEmpty() && resizeMod != WidgetFactory::defaultCurrentItem( editor->widget(), "resizeMode" ) ) { item->setChanged( TRUE, FALSE ); @@ -3281,16 +3281,16 @@ void PropertyList::setupProperties() } #ifndef QT_NO_SQL - if ( !::qt_cast(editor->widget()) && !::qt_cast(editor->widget()) && - !::qt_cast(editor->widget()) && parent_is_data_aware( ::qt_cast(editor->widget()) ) ) { + if ( !::qt_cast(editor->widget()) && !::qt_cast(editor->widget()) && + !::qt_cast(editor->widget()) && parent_is_data_aware( ::qt_cast(editor->widget()) ) ) { item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) item->setChanged( TRUE, FALSE ); } - if ( ::qt_cast(editor->widget()) || ::qt_cast(editor->widget()) || - ::qt_cast(editor->widget()) ) { + if ( ::qt_cast(editor->widget()) || ::qt_cast(editor->widget()) || + ::qt_cast(editor->widget()) ) { item = new PropertyDatabaseItem( this, item, 0, "database", FALSE ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) @@ -3303,8 +3303,8 @@ void PropertyList::setupProperties() #endif if ( w->isA("PropertyObject") ) { - const QWidgetList wl = ( (PropertyObject*)w )->widgetList(); - QPtrListIterator wIt( wl ); + const TQWidgetList wl = ( (PropertyObject*)w )->widgetList(); + TQPtrListIterator wIt( wl ); while ( *wIt ) { if ( (*wIt)->inherits("CustomWidget") ) { MetaDataBase::CustomWidget *cw = ( (CustomWidget*)*wIt )->customWidget(); @@ -3331,17 +3331,17 @@ void PropertyList::setupProperties() } void PropertyList::setupCusWidgetProperties( MetaDataBase::CustomWidget *cw, - QMap &unique, + TQMap &unique, PropertyItem *&item ) { if ( !cw ) return; - for ( QValueList::Iterator it = + for ( TQValueList::Iterator it = cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) { - if ( unique.contains( QString( (*it).property ) ) ) + if ( unique.contains( TQString( (*it).property ) ) ) continue; - unique.insert( QString( (*it).property ), TRUE ); + unique.insert( TQString( (*it).property ), TRUE ); addPropertyItem( item, (*it).property, type_to_variant( (*it).type ) ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), (*it).property ) ) @@ -3349,13 +3349,13 @@ void PropertyList::setupCusWidgetProperties( MetaDataBase::CustomWidget *cw, } } -bool PropertyList::addPropertyItem( PropertyItem *&item, const QCString &name, QVariant::Type t ) +bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, TQVariant::Type t ) { if ( name == "buddy" ) { PropertyListItem *itm = new PropertyListItem( this, item, 0, name, TRUE ); - QPtrDict *widgets = editor->formWindow()->widgets(); - QPtrDictIterator it( *widgets ); - QStringList l; + TQPtrDict *widgets = editor->formWindow()->widgets(); + TQPtrDictIterator it( *widgets ); + TQStringList l; l << ""; while ( it.current() ) { if ( editor->formWindow()->canBeBuddy( it.current() ) ) { @@ -3371,25 +3371,25 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const QCString &name, Q } switch ( t ) { - case QVariant::String: + case TQVariant::String: item = new PropertyTextItem( this, item, 0, name, TRUE, - ::qt_cast(editor->widget()) || - ::qt_cast(editor->widget()) || - ::qt_cast(editor->widget()) ); + ::qt_cast(editor->widget()) || + ::qt_cast(editor->widget()) || + ::qt_cast(editor->widget()) ); break; - case QVariant::CString: + case TQVariant::CString: item = new PropertyTextItem( this, item, 0, name, name == "name" && editor->widget() == editor->formWindow()->mainContainer(), FALSE, TRUE ); break; - case QVariant::Bool: + case TQVariant::Bool: item = new PropertyBoolItem( this, item, 0, name ); break; - case QVariant::Font: + case TQVariant::Font: item = new PropertyFontItem( this, item, 0, name ); break; - case QVariant::Int: + case TQVariant::Int: if ( name == "accel" ) item = new PropertyTextItem( this, item, 0, name, FALSE, FALSE, FALSE, TRUE ); else if ( name == "layoutSpacing" || name == "layoutMargin" ) @@ -3399,55 +3399,55 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const QCString &name, Q else item = new PropertyIntItem( this, item, 0, name, TRUE ); break; - case QVariant::Double: + case TQVariant::Double: item = new PropertyDoubleItem( this, item, 0, name ); break; - case QVariant::KeySequence: + case TQVariant::KeySequence: item = new PropertyKeysequenceItem( this, item, 0, name ); break; - case QVariant::UInt: + case TQVariant::UInt: item = new PropertyIntItem( this, item, 0, name, FALSE ); break; - case QVariant::StringList: + case TQVariant::StringList: item = new PropertyListItem( this, item, 0, name, TRUE ); break; - case QVariant::Rect: + case TQVariant::Rect: item = new PropertyCoordItem( this, item, 0, name, PropertyCoordItem::Rect ); break; - case QVariant::Point: + case TQVariant::Point: item = new PropertyCoordItem( this, item, 0, name, PropertyCoordItem::Point ); break; - case QVariant::Size: + case TQVariant::Size: item = new PropertyCoordItem( this, item, 0, name, PropertyCoordItem::Size ); break; - case QVariant::Color: + case TQVariant::Color: item = new PropertyColorItem( this, item, 0, name, TRUE ); break; - case QVariant::Pixmap: + case TQVariant::Pixmap: item = new PropertyPixmapItem( this, item, 0, name, PropertyPixmapItem::Pixmap ); break; - case QVariant::IconSet: + case TQVariant::IconSet: item = new PropertyPixmapItem( this, item, 0, name, PropertyPixmapItem::IconSet ); break; - case QVariant::Image: + case TQVariant::Image: item = new PropertyPixmapItem( this, item, 0, name, PropertyPixmapItem::Image ); break; - case QVariant::SizePolicy: + case TQVariant::SizePolicy: item = new PropertySizePolicyItem( this, item, 0, name ); break; - case QVariant::Palette: + case TQVariant::Palette: item = new PropertyPaletteItem( this, item, 0, name ); break; - case QVariant::Cursor: + case TQVariant::Cursor: item = new PropertyCursorItem( this, item, 0, name ); break; - case QVariant::Date: + case TQVariant::Date: item = new PropertyDateItem( this, item, 0, name ); break; - case QVariant::Time: + case TQVariant::Time: item = new PropertyTimeItem( this, item, 0, name ); break; - case QVariant::DateTime: + case TQVariant::DateTime: item = new PropertyDateTimeItem( this, item, 0, name ); break; default: @@ -3456,19 +3456,19 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const QCString &name, Q return TRUE; } -void PropertyList::paintEmptyArea( QPainter *p, const QRect &r ) +void PropertyList::paintEmptyArea( TQPainter *p, const TQRect &r ) { p->fillRect( r, *backColor2 ); } -void PropertyList::setCurrentItem( QListViewItem *i ) +void PropertyList::setCurrentItem( TQListViewItem *i ) { if ( !i ) return; if ( currentItem() ) ( (PropertyItem*)currentItem() )->hideEditor(); - QListView::setCurrentItem( i ); + TQListView::setCurrentItem( i ); ( (PropertyItem*)currentItem() )->showEditor(); } @@ -3486,7 +3486,7 @@ void PropertyList::valueChanged( PropertyItem *i ) { if ( !editor->widget() ) return; - QString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); + TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), WidgetFactory::property( editor->widget(), i->name() ), @@ -3500,7 +3500,7 @@ void PropertyList::layoutInitValue( PropertyItem *i, bool changed ) { if ( !editor->widget() ) return; - QString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); + TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), WidgetFactory::property( editor->widget(), i->name() ), @@ -3511,7 +3511,7 @@ void PropertyList::layoutInitValue( PropertyItem *i, bool changed ) i->setChanged( changed ); } -void PropertyList::itemPressed( QListViewItem *i, const QPoint &p, int c ) +void PropertyList::itemPressed( TQListViewItem *i, const TQPoint &p, int c ) { if ( !i ) return; @@ -3523,7 +3523,7 @@ void PropertyList::itemPressed( QListViewItem *i, const QPoint &p, int c ) toggleOpen( i ); } -void PropertyList::toggleOpen( QListViewItem *i ) +void PropertyList::toggleOpen( TQListViewItem *i ) { if ( !i ) return; @@ -3535,26 +3535,26 @@ void PropertyList::toggleOpen( QListViewItem *i ) } } -bool PropertyList::eventFilter( QObject *o, QEvent *e ) +bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) { if ( !o || !e ) return TRUE; PropertyItem *i = (PropertyItem*)currentItem(); - if ( e->type() == QEvent::KeyPress ) + if ( e->type() == TQEvent::KeyPress ) theLastEvent = KeyEvent; - else if ( e->type() == QEvent::MouseButtonPress ) + else if ( e->type() == TQEvent::MouseButtonPress ) theLastEvent = MouseEvent; - if ( o != this &&e->type() == QEvent::KeyPress ) { - QKeyEvent *ke = (QKeyEvent*)e; + if ( o != this &&e->type() == TQEvent::KeyPress ) { + TQKeyEvent *ke = (TQKeyEvent*)e; if ( ( ke->key() == Key_Up || ke->key() == Key_Down ) && ( o != this || o != viewport() ) && !( ke->state() & ControlButton ) ) { - QApplication::sendEvent( this, (QKeyEvent*)e ); + TQApplication::sendEvent( this, (TQKeyEvent*)e ); return TRUE; - } else if ( ( !::qt_cast(o) || - ( ::qt_cast(o) && ( (QLineEdit*)o )->isReadOnly() ) ) && + } else if ( ( !::qt_cast(o) || + ( ::qt_cast(o) && ( (TQLineEdit*)o )->isReadOnly() ) ) && i && i->hasSubItems() ) { if ( !i->isOpen() && ( ke->key() == Key_Plus || @@ -3564,19 +3564,19 @@ bool PropertyList::eventFilter( QObject *o, QEvent *e ) ( ke->key() == Key_Minus || ke->key() == Key_Left ) ) i->setOpen( FALSE ); - } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && ::qt_cast(o) ) { - QKeyEvent ke2( QEvent::KeyPress, Key_Space, 0, 0 ); - QApplication::sendEvent( o, &ke2 ); + } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && ::qt_cast(o) ) { + TQKeyEvent ke2( TQEvent::KeyPress, Key_Space, 0, 0 ); + TQApplication::sendEvent( o, &ke2 ); return TRUE; } - } else if ( e->type() == QEvent::FocusOut && ::qt_cast(o) && editor->formWindow() ) { - QTimer::singleShot( 100, editor->formWindow()->commandHistory(), SLOT( checkCompressedCommand() ) ); + } else if ( e->type() == TQEvent::FocusOut && ::qt_cast(o) && editor->formWindow() ) { + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); } else if ( o == viewport() ) { - QMouseEvent *me; + TQMouseEvent *me; PropertyListItem* i; switch ( e->type() ) { - case QEvent::MouseButtonPress: - me = (QMouseEvent*)e; + case TQEvent::MouseButtonPress: + me = (TQMouseEvent*)e; i = (PropertyListItem*) itemAt( me->pos() ); if ( i && ( ::qt_cast(i) || ::qt_cast(i) ) ) { pressItem = i; @@ -3584,20 +3584,20 @@ bool PropertyList::eventFilter( QObject *o, QEvent *e ) mousePressed = TRUE; } break; - case QEvent::MouseMove: - me = (QMouseEvent*)e; + case TQEvent::MouseMove: + me = (TQMouseEvent*)e; if ( me && me->state() & LeftButton && mousePressed) { i = (PropertyListItem*) itemAt( me->pos() ); if ( i && i == pressItem ) { - if (( pressPos - me->pos() ).manhattanLength() > QApplication::startDragDistance() ){ + if (( pressPos - me->pos() ).manhattanLength() > TQApplication::startDragDistance() ){ if ( ::qt_cast(i) ) { - QColor col = i->value().asColor(); - QColorDrag *drg = new QColorDrag( col, this ); - QPixmap pix( 25, 25 ); + TQColor col = i->value().asColor(); + TQColorDrag *drg = new TQColorDrag( col, this ); + TQPixmap pix( 25, 25 ); pix.fill( col ); - QPainter p( &pix ); + TQPainter p( &pix ); p.drawRect( 0, 0, pix.width(), pix.height() ); p.end(); drg->setPixmap( pix ); @@ -3605,10 +3605,10 @@ bool PropertyList::eventFilter( QObject *o, QEvent *e ) drg->dragCopy(); } else if ( ::qt_cast(i) ) { - QPixmap pix = i->value().asPixmap(); + TQPixmap pix = i->value().asPixmap(); if( !pix.isNull() ) { - QImage img = pix.convertToImage(); - QImageDrag *drg = new QImageDrag( img, this ); + TQImage img = pix.convertToImage(); + TQImageDrag *drg = new TQImageDrag( img, this ); drg->setPixmap( pix ); mousePressed = FALSE; drg->dragCopy(); @@ -3622,9 +3622,9 @@ bool PropertyList::eventFilter( QObject *o, QEvent *e ) break; } } else if ( o == header() ) { - if ( e->type() == QEvent::ContextMenu ) { - ((QContextMenuEvent *)e)->accept(); - QPopupMenu menu( 0 ); + if ( e->type() == TQEvent::ContextMenu ) { + ((TQContextMenuEvent *)e)->accept(); + TQPopupMenu menu( 0 ); menu.setCheckable( TRUE ); const int cat_id = 1; const int alpha_id = 2; @@ -3634,7 +3634,7 @@ bool PropertyList::eventFilter( QObject *o, QEvent *e ) menu.setItemChecked( alpha_id, TRUE ); else menu.setItemChecked( cat_id, TRUE ); - int res = menu.exec( ( (QContextMenuEvent*)e )->globalPos() ); + int res = menu.exec( ( (TQContextMenuEvent*)e )->globalPos() ); if ( res != -1 ) { bool newShowSorted = ( res == alpha ); if ( showSorted != newShowSorted ) { @@ -3647,7 +3647,7 @@ bool PropertyList::eventFilter( QObject *o, QEvent *e ) } } - return QListView::eventFilter( o, e ); + return TQListView::eventFilter( o, e ); } /*! This method re-initializes each item of the property list. @@ -3655,7 +3655,7 @@ bool PropertyList::eventFilter( QObject *o, QEvent *e ) void PropertyList::refetchData() { - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { PropertyItem *i = (PropertyItem*)it.current(); if ( !i->propertyParent() ) @@ -3675,7 +3675,7 @@ void PropertyList::refetchData() updateEditorSize(); } -static void clearAlignList( QStrList &l ) +static void clearAlignList( TQStrList &l ) { if ( l.count() == 1 ) return; @@ -3691,7 +3691,7 @@ static void clearAlignList( QStrList &l ) void PropertyList::setPropertyValue( PropertyItem *i ) { - const QMetaProperty *p = + const TQMetaProperty *p = editor->widget()->metaObject()-> property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE ); if ( !p ) { @@ -3700,7 +3700,7 @@ void PropertyList::setPropertyValue( PropertyItem *i ) p = editor->widget()->metaObject()-> property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE ); align &= ~AlignVertical_Mask; - QStrList l = p->valueToKeys( align ); + TQStrList l = p->valueToKeys( align ); clearAlignList( l ); ( (PropertyListItem*)i )->setCurrentItem( l.last() ); } else if ( i->name() == "vAlign" ) { @@ -3712,15 +3712,15 @@ void PropertyList::setPropertyValue( PropertyItem *i ) } else if ( i->name() == "wordwrap" ) { int align = editor->widget()->property( "alignment" ).toInt(); if ( align & WordBreak ) - i->setValue( QVariant( TRUE, 0 ) ); + i->setValue( TQVariant( TRUE, 0 ) ); else - i->setValue( QVariant( FALSE, 0 ) ); + i->setValue( TQVariant( FALSE, 0 ) ); } else if ( i->name() == "layoutSpacing" ) { - ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( (QWidget*)editor->widget() ) ) ); + ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) ); } else if ( i->name() == "layoutMargin" ) { - ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( (QWidget*)editor->widget() ) ) ); + ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) ); } else if ( i->name() == "resizeMode" ) { - ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( (QWidget*)editor->widget() ) ) ); + ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) ); } else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) { i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) ); } else if ( editor->widget()->inherits( "CustomWidget" ) ) { @@ -3741,14 +3741,14 @@ void PropertyList::setPropertyValue( PropertyItem *i ) i->setValue( editor->widget()->property( i->name() ) ); } -void PropertyList::setCurrentProperty( const QString &n ) +void PropertyList::setCurrentProperty( const TQString &n ) { if ( currentItem() && currentItem()->text( 0 ) == n || currentItem() && ( (PropertyItem*)currentItem() )->propertyParent() && ( (PropertyItem*)currentItem() )->propertyParent()->text( 0 ) == n ) return; - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { if ( it.current()->text( 0 ) == n ) { setCurrentItem( it.current() ); @@ -3769,7 +3769,7 @@ void PropertyList::resetProperty() PropertyItem *i = (PropertyItem*)currentItem(); if ( !MetaDataBase::isPropertyChanged( editor->widget(), i->PropertyItem::name() ) ) return; - QString pn( i18n( "Reset '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); + TQString pn( i18n( "Reset '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), i->value(), @@ -3782,7 +3782,7 @@ void PropertyList::resetProperty() i->initChildren(); } -void PropertyList::viewportDragEnterEvent( QDragEnterEvent *e ) +void PropertyList::viewportDragEnterEvent( TQDragEnterEvent *e ) { PropertyListItem *i = (PropertyListItem*) itemAt( e->pos() ); if( !i ) { @@ -3790,15 +3790,15 @@ void PropertyList::viewportDragEnterEvent( QDragEnterEvent *e ) return; } - if ( ::qt_cast(i) && QColorDrag::canDecode( e ) ) + if ( ::qt_cast(i) && TQColorDrag::canDecode( e ) ) e->accept(); - else if ( ::qt_cast(i) && QImageDrag::canDecode( e ) ) + else if ( ::qt_cast(i) && TQImageDrag::canDecode( e ) ) e->accept(); else e->ignore(); } -void PropertyList::viewportDragMoveEvent ( QDragMoveEvent *e ) +void PropertyList::viewportDragMoveEvent ( TQDragMoveEvent *e ) { PropertyListItem *i = (PropertyListItem*) itemAt( e->pos() ); if( !i ) { @@ -3806,15 +3806,15 @@ void PropertyList::viewportDragMoveEvent ( QDragMoveEvent *e ) return; } - if ( ::qt_cast(i) && QColorDrag::canDecode( e ) ) + if ( ::qt_cast(i) && TQColorDrag::canDecode( e ) ) e->accept(); - else if ( ::qt_cast(i) && QImageDrag::canDecode( e ) ) + else if ( ::qt_cast(i) && TQImageDrag::canDecode( e ) ) e->accept(); else e->ignore(); } -void PropertyList::viewportDropEvent ( QDropEvent *e ) +void PropertyList::viewportDropEvent ( TQDropEvent *e ) { PropertyListItem *i = (PropertyListItem*) itemAt( e->pos() ); if( !i ) { @@ -3822,19 +3822,19 @@ void PropertyList::viewportDropEvent ( QDropEvent *e ) return; } - if ( ::qt_cast(i) && QColorDrag::canDecode( e ) ) { - QColor color; - QColorDrag::decode( e, color ); - i->setValue( QVariant( color ) ); + if ( ::qt_cast(i) && TQColorDrag::canDecode( e ) ) { + TQColor color; + TQColorDrag::decode( e, color ); + i->setValue( TQVariant( color ) ); valueChanged( i ); e->accept(); } - else if ( ::qt_cast(i) && QImageDrag::canDecode( e ) ) { - QImage img; - QImageDrag::decode( e, img ); - QPixmap pm; + else if ( ::qt_cast(i) && TQImageDrag::canDecode( e ) ) { + TQImage img; + TQImageDrag::decode( e, img ); + TQPixmap pm; pm.convertFromImage( img ); - i->setValue( QVariant( pm ) ); + i->setValue( TQVariant( pm ) ); valueChanged( i ); e->accept(); } @@ -3842,7 +3842,7 @@ void PropertyList::viewportDropEvent ( QDropEvent *e ) e->ignore(); } -QString PropertyList::whatsThisAt( const QPoint &p ) +TQString PropertyList::whatsThisAt( const TQPoint &p ) { return whatsThisText( itemAt( p ) ); } @@ -3851,32 +3851,32 @@ void PropertyList::showCurrentWhatsThis() { if ( !currentItem() ) return; - QPoint p( 0, currentItem()->itemPos() ); + TQPoint p( 0, currentItem()->itemPos() ); p = viewport()->mapToGlobal( contentsToViewport( p ) ); - QWhatsThis::display( whatsThisText( currentItem() ), p, viewport() ); + TQWhatsThis::display( whatsThisText( currentItem() ), p, viewport() ); } -QString PropertyList::whatsThisText( QListViewItem *i ) +TQString PropertyList::whatsThisText( TQListViewItem *i ) { if ( !i || !editor->widget() ) - return QString::null; + return TQString::null; readPropertyDocs(); if ( ( (PropertyItem*)i )->propertyParent() ) i = ( (PropertyItem*)i )->propertyParent(); - const QMetaObject *mo = editor->widget()->metaObject(); - QString prop = ( (PropertyItem*)i )->name(); + const TQMetaObject *mo = editor->widget()->metaObject(); + TQString prop = ( (PropertyItem*)i )->name(); while ( mo ) { - QString s; - s = QString( mo->className() ) + "::" + prop; - QMap::Iterator it; + TQString s; + s = TQString( mo->className() ) + "::" + prop; + TQMap::Iterator it; if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) { return *it; } mo = mo->superClass(); } - return i18n( "

    QWidget::%1

    There is no documentation available for this property.

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

    TQWidget::%1

    There is no documentation available for this property.

    " ).arg( prop ); } void PropertyList::readPropertyDocs() @@ -3884,21 +3884,21 @@ void PropertyList::readPropertyDocs() if ( !propertyDocs.isEmpty() ) return; - QString docFile = MainWindow::self->documentationPath() + "/propertydocs"; - QFile f( docFile ); + TQString docFile = MainWindow::self->documentationPath() + "/propertydocs"; + TQFile f( docFile ); if ( !f.open( IO_ReadOnly ) ) return; - QDomDocument doc; - QString errMsg; + TQDomDocument doc; + TQString errMsg; int errLine; if ( !doc.setContent( &f, &errMsg, &errLine ) ) return; - QDomElement e = doc.firstChild().toElement().firstChild().toElement(); + TQDomElement e = doc.firstChild().toElement().firstChild().toElement(); for ( ; !e.isNull(); e = e.nextSibling().toElement() ) { - QDomElement n = e.firstChild().toElement(); - QString name; - QString doc; + TQDomElement n = e.firstChild().toElement(); + TQString name; + TQString doc; for ( ; !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "name" ) name = n.firstChild().toText().data(); @@ -3916,26 +3916,26 @@ PropertyList::LastEventType PropertyList::lastEvent() } // ------------------------------------------------------------ -EventList::EventList( QWidget *parent, FormWindow *fw, PropertyEditor *e ) +EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) : HierarchyList( parent, fw, TRUE ), editor( e ) { header()->hide(); removeColumn( 1 ); setRootIsDecorated( TRUE ); - connect( this, SIGNAL( itemRenamed( QListViewItem *, int, const QString & ) ), - this, SLOT( renamed( QListViewItem * ) ) ); + connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQT_SLOT( renamed( TQListViewItem * ) ) ); } -QString clean_arguments( const QString &s ) +TQString clean_arguments( const TQString &s ) { - QString slot = s; - QString arg = slot.mid( slot.find( '(' ) + 1 ); + TQString slot = s; + TQString arg = slot.mid( slot.find( '(' ) + 1 ); arg = arg.left( arg.findRev( ')' ) ); - QStringList args = QStringList::split( ',', arg ); + TQStringList args = TQStringList::split( ',', arg ); slot = slot.left( slot.find( '(' ) + 1 ); int num = 0; - for ( QStringList::Iterator it = args.begin(); it != args.end(); ++it, ++num ) { - QString a = *it; + for ( TQStringList::Iterator it = args.begin(); it != args.end(); ++it, ++num ) { + TQString a = *it; int i; if ( ( i =a.find( ':' ) ) == -1 ) slot += a.simplifyWhiteSpace(); @@ -3958,61 +3958,61 @@ void EventList::setup() if ( !formWindow ) return; LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); - const QPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()); - QStrList sigs; + const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()); + TQStrList sigs; if ( iface ) { sigs = iface->signalNames( editor->widget() ); } - QStrListIterator it( sigs ); + TQStrListIterator it( sigs ); while ( it.current() ) { HierarchyItem *eventItem = new HierarchyItem( HierarchyItem::Event, this, (HierarchyItem*)0, - it.current(), QString::null, QString::null ); + it.current(), TQString::null, TQString::null ); eventItem->setOpen( TRUE ); - QValueList conns = + TQValueList conns = MetaDataBase::connections( formWindow, editor->widget(), formWindow->mainContainer() ); HierarchyItem *item = 0; - for ( QValueList::Iterator cit = conns.begin(); + for ( TQValueList::Iterator cit = conns.begin(); cit != conns.end(); ++cit ) { - QString s = it.current(); - if ( MetaDataBase::normalizeFunction( clean_arguments( QString( (*cit).signal ) ) ) != + TQString s = it.current(); + if ( MetaDataBase::normalizeFunction( clean_arguments( TQString( (*cit).signal ) ) ) != MetaDataBase::normalizeFunction( clean_arguments( s ) ) ) continue; item = new HierarchyItem( HierarchyItem::EventFunction, eventItem, item, - (*cit).slot, QString::null, QString::null ); + (*cit).slot, TQString::null, TQString::null ); item->setPixmap( 0, DesignerEditSlotsPix ); } ++it; } } -extern QListViewItem *newItem; +extern TQListViewItem *newItem; -void EventList::contentsMouseDoubleClickEvent( QMouseEvent *e ) +void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { - QListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); + TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); if ( !i || i->parent() ) return; - QString s; + TQString s; if ( !formWindow->project()->isCpp() ) { - QString s1 = i->text( 0 ); + TQString s1 = i->text( 0 ); int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); - s = QString( editor->widget()->name() ) + "_" + s1; + s = TQString( editor->widget()->name() ) + "_" + s1; } else { - s = QString( editor->widget()->name() ) + "_" + i->text( 0 ); + s = TQString( editor->widget()->name() ) + "_" + i->text( 0 ); } - const QPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()); + const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()); insertEntry( i, DesignerEditSlotsPix , s ); } -void EventList::setCurrent( QWidget * ) +void EventList::setCurrent( TQWidget * ) { } -void EventList::objectClicked( QListViewItem *i ) +void EventList::objectClicked( TQListViewItem *i ) { if ( !i || !i->parent() ) return; @@ -4021,26 +4021,26 @@ void EventList::objectClicked( QListViewItem *i ) // formWindow->mainWindow()->editFunction( i->text( 0 ) ); } -void EventList::showRMBMenu( QListViewItem *i, const QPoint &pos ) +void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) { if ( !i ) return; - QPopupMenu menu; + TQPopupMenu menu; const int NEW_ITEM = 1; const int DEL_ITEM = 2; menu.insertItem( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()), i18n( "New Signal Handler" ), NEW_ITEM ); menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "Delete Signal Handler" ), DEL_ITEM ); int res = menu.exec( pos ); if ( res == NEW_ITEM ) { - QString s; + TQString s; if ( !formWindow->project()->isCpp() ) { - QString s1 = ( i->parent() ? i->parent() : i )->text( 0 ); + TQString s1 = ( i->parent() ? i->parent() : i )->text( 0 ); int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); - s = QString( editor->widget()->name() ) + "_" + s1; + s = TQString( editor->widget()->name() ) + "_" + s1; } else { - s = QString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 ); + s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 ); } insertEntry( i->parent() ? i->parent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s ); } else if ( res == DEL_ITEM && i->parent() ) { @@ -4059,13 +4059,13 @@ void EventList::showRMBMenu( QListViewItem *i, const QPoint &pos ) } } -void EventList::renamed( QListViewItem *i ) +void EventList::renamed( TQListViewItem *i ) { if ( newItem == i ) newItem = 0; if ( !i->parent() ) return; - QListViewItem *itm = i->parent()->firstChild(); + TQListViewItem *itm = i->parent()->firstChild(); bool del = FALSE; while ( itm ) { if ( itm != i && itm->text( 0 ) == i->text( 0 ) ) { @@ -4089,9 +4089,9 @@ void EventList::renamed( QListViewItem *i ) formWindow->commandHistory()->addCommand( cmd ); // #### we should look if the specified slot already // exists and if we can connect to this one - QString funcname = i->text( 0 ).latin1(); + TQString funcname = i->text( 0 ).latin1(); if ( funcname.find( '(' ) == -1 ) { // try to create a signature - QString sig = i->parent()->text( 0 ); + TQString sig = i->parent()->text( 0 ); sig = sig.mid( sig.find( '(' ) + 1 ); sig.remove( (int)sig.length() - 1, 1 ); LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); @@ -4118,10 +4118,10 @@ void EventList::renamed( QListViewItem *i ) } } -void EventList::save( QListViewItem *p ) +void EventList::save( TQListViewItem *p ) { - QStringList lst; - QListViewItem *i = p->firstChild(); + TQStringList lst; + TQListViewItem *i = p->firstChild(); while ( i ) { lst << i->text( 0 ); i = i->nextSibling(); @@ -4138,8 +4138,8 @@ void EventList::save( QListViewItem *p ) listview for editing properties. */ -PropertyEditor::PropertyEditor( QWidget *parent ) - : QTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | +PropertyEditor::PropertyEditor( TQWidget *parent ) + : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_StaysOnTop | WStyle_Tool |WStyle_MinMax | WStyle_SysMenu ) { setCaption( i18n( "Property Editor" ) ); @@ -4151,12 +4151,12 @@ PropertyEditor::PropertyEditor( QWidget *parent ) addTab( eList, i18n( "Signa&l Handlers" ) ); } -QObject *PropertyEditor::widget() const +TQObject *PropertyEditor::widget() const { return wid; } -void PropertyEditor::setWidget( QObject *w, FormWindow *fw ) +void PropertyEditor::setWidget( TQObject *w, FormWindow *fw ) { if ( fw && fw->isFake() ) w = fw->project()->objectForFakeForm( fw ); @@ -4165,8 +4165,8 @@ void PropertyEditor::setWidget( QObject *w, FormWindow *fw ) // if there is no properties displayed then we really should show them. // to do this check the number of properties in the list. bool ret = (listview->childCount() > 0) ? TRUE : FALSE; - if ( wid->isWidgetType() && WidgetFactory::layoutType( (QWidget*)wid ) != WidgetFactory::NoLayout ) { - QListViewItemIterator it( listview ); + if ( wid->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) { + TQListViewItemIterator it( listview ); ret = FALSE; while ( it.current() ) { if ( it.current()->text( 0 ) == "layoutSpacing" || it.current()->text( 0 ) == "layoutMargin" ) { @@ -4243,7 +4243,7 @@ void PropertyEditor::closed( FormWindow *w ) } } -void PropertyEditor::closeEvent( QCloseEvent *e ) +void PropertyEditor::closeEvent( TQCloseEvent *e ) { emit hidden(); e->accept(); @@ -4259,32 +4259,32 @@ FormWindow *PropertyEditor::formWindow() const return formwindow; } -QString PropertyEditor::currentProperty() const +TQString PropertyEditor::currentProperty() const { if ( !wid ) - return QString::null; + return TQString::null; if ( ( (PropertyItem*)listview->currentItem() )->propertyParent() ) return ( (PropertyItem*)listview->currentItem() )->propertyParent()->name(); return ( (PropertyItem*)listview->currentItem() )->name(); } -QString PropertyEditor::classOfCurrentProperty() const +TQString PropertyEditor::classOfCurrentProperty() const { if ( !wid ) - return QString::null; - QObject *o = wid; - QString curr = currentProperty(); - QMetaObject *mo = o->metaObject(); + return TQString::null; + TQObject *o = wid; + TQString curr = currentProperty(); + TQMetaObject *mo = o->metaObject(); while ( mo ) { - QStrList props = mo->propertyNames( FALSE ); + TQStrList props = mo->propertyNames( FALSE ); if ( props.find( curr.latin1() ) != -1 ) return mo->className(); mo = mo->superClass(); } - return QString::null; + return TQString::null; } -QMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const +TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const { if ( !wid ) return 0; @@ -4324,9 +4324,9 @@ void PropertyEditor::updateWindow() { if ( isHidden() && count() ) { parentWidget()->show(); - MainWindow::self->setAppropriate( (QDockWindow*)parentWidget(), TRUE ); + MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), TRUE ); } else if ( isShown() && !count() ) { parentWidget()->hide(); - MainWindow::self->setAppropriate( (QDockWindow*)parentWidget(), FALSE ); + MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), FALSE ); } } diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h index 3bdc19e3..ff9987a5 100644 --- a/kdevdesigner/designer/propertyeditor.h +++ b/kdevdesigner/designer/propertyeditor.h @@ -27,17 +27,17 @@ #ifndef PROPERTYEDITOR_H #define PROPERTYEDITOR_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "hierarchyview.h" #include "metadatabase.h" @@ -62,13 +62,13 @@ class QDateTimeEdit; class PropertyItem : public QListViewItem { public: - PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ); + PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); ~PropertyItem(); - void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align ); - void paintBranches( QPainter * p, const QColorGroup & cg, + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); + void paintBranches( TQPainter * p, const TQColorGroup & cg, int w, int y, int h ); - void paintFocus( QPainter *p, const QColorGroup &cg, const QRect &r ); + void paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r ); virtual bool hasSubItems() const; virtual void createChildren(); @@ -80,15 +80,15 @@ public: virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); - QVariant value() const; - QString name() const; + virtual void setValue( const TQVariant &v ); + TQVariant value() const; + TQString name() const; virtual void notifyValueChange(); virtual void setChanged( bool b, bool updateDb = TRUE ); bool isChanged() const; - virtual void placeEditor( QWidget *w ); + virtual void placeEditor( TQWidget *w ); virtual PropertyItem *propertyParent() const; virtual void childValueChanged( PropertyItem *child ); @@ -98,51 +98,51 @@ public: PropertyItem *child( int i ) const; virtual bool hasCustomContents() const; - virtual void drawCustomContents( QPainter *p, const QRect &r ); + virtual void drawCustomContents( TQPainter *p, const TQRect &r ); void updateBackColor(); - void setup() { QListViewItem::setup(); setHeight( QListViewItem::height() + 2 ); } + void setup() { TQListViewItem::setup(); setHeight( TQListViewItem::height() + 2 ); } - virtual QString currentItem() const; + virtual TQString currentItem() const; virtual int currentIntItem() const; - virtual void setCurrentItem( const QString &s ); + virtual void setCurrentItem( const TQString &s ); virtual void setCurrentItem( int i ); virtual int currentIntItemFromObject() const; - virtual QString currentItemFromObject() const; + virtual TQString currentItemFromObject() const; - void setFocus( QWidget *w ); + void setFocus( TQWidget *w ); virtual void toggle(); - void setText( int col, const QString &txt ); + void setText( int col, const TQString &txt ); protected: PropertyList *listview; - QVariant val; + TQVariant val; private: - QColor backgroundColor(); + TQColor backgroundColor(); void createResetButton(); void updateResetButtonState(); private: bool open, changed; PropertyItem *property; - QString propertyName; - QPtrList children; - QColor backColor; - QPushButton *resetButton; + TQString propertyName; + TQPtrList children; + TQColor backColor; + TQPushButton *resetButton; }; -class PropertyTextItem : public QObject, +class PropertyTextItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyTextItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, bool comment, bool multiLine, bool ascii = FALSE, bool a = FALSE ); + const TQString &propName, bool comment, bool multiLine, bool ascii = FALSE, bool a = FALSE ); ~PropertyTextItem(); virtual void createChildren(); @@ -151,7 +151,7 @@ public: virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); virtual bool hasSubItems() const; virtual void childValueChanged( PropertyItem *child ); @@ -162,153 +162,153 @@ private slots: void getText(); private: - QLineEdit *lined(); - QGuardedPtr lin; - QGuardedPtr box; - QPushButton *button; + TQLineEdit *lined(); + TQGuardedPtr lin; + TQGuardedPtr box; + TQPushButton *button; bool withComment, hasMultiLines, asciiOnly, accel; }; -class PropertyBoolItem : public QObject, +class PropertyBoolItem : public TQObject, public PropertyItem { Q_OBJECT public: - PropertyBoolItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ); + PropertyBoolItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); ~PropertyBoolItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); virtual void toggle(); private slots: void setValue(); private: - QComboBox *combo(); - QGuardedPtr comb; + TQComboBox *combo(); + TQGuardedPtr comb; }; -class PropertyIntItem : public QObject, +class PropertyIntItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyIntItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, bool s ); + const TQString &propName, bool s ); ~PropertyIntItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); private slots: void setValue(); private: - QSpinBox *spinBox(); - QGuardedPtr spinBx; + TQSpinBox *spinBox(); + TQGuardedPtr spinBx; bool signedValue; }; -class PropertyLayoutItem : public QObject, +class PropertyLayoutItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyLayoutItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ); + const TQString &propName ); ~PropertyLayoutItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); private slots: void setValue(); private: - QSpinBox *spinBox(); - QGuardedPtr spinBx; + TQSpinBox *spinBox(); + TQGuardedPtr spinBx; }; -class PropertyDoubleItem : public QObject, +class PropertyDoubleItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyDoubleItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ); + const TQString &propName ); ~PropertyDoubleItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); private slots: void setValue(); private: - QLineEdit *lined(); - QGuardedPtr lin; + TQLineEdit *lined(); + TQGuardedPtr lin; }; -class PropertyListItem : public QObject, +class PropertyListItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyListItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, bool editable ); + const TQString &propName, bool editable ); ~PropertyListItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); - QString currentItem() const; + TQString currentItem() const; int currentIntItem() const; - void setCurrentItem( const QString &s ); + void setCurrentItem( const TQString &s ); void setCurrentItem( int i ); int currentIntItemFromObject() const; - QString currentItemFromObject() const; - void addItem( const QString &s ); + TQString currentItemFromObject() const; + void addItem( const TQString &s ); private slots: void setValue(); private: - QComboBox *combo(); - QGuardedPtr comb; + TQComboBox *combo(); + TQGuardedPtr comb; int oldInt; bool editable; - QString oldString; + TQString oldString; }; -class PropertyFontItem : public QObject, +class PropertyFontItem : public TQObject, public PropertyItem { Q_OBJECT public: - PropertyFontItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ); + PropertyFontItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); ~PropertyFontItem(); virtual void createChildren(); @@ -317,7 +317,7 @@ public: virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); virtual bool hasSubItems() const; virtual void childValueChanged( PropertyItem *child ); @@ -325,13 +325,13 @@ private slots: void getFont(); private: - QGuardedPtr lined; - QGuardedPtr button; - QGuardedPtr box; + TQGuardedPtr lined; + TQGuardedPtr button; + TQGuardedPtr box; }; -class PropertyCoordItem : public QObject, +class PropertyCoordItem : public TQObject, public PropertyItem { Q_OBJECT @@ -340,7 +340,7 @@ public: enum Type { Rect, Size, Point }; PropertyCoordItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, Type t ); + const TQString &propName, Type t ); ~PropertyCoordItem(); virtual void createChildren(); @@ -349,25 +349,25 @@ public: virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); virtual bool hasSubItems() const; virtual void childValueChanged( PropertyItem *child ); private: - QLineEdit *lined(); - QGuardedPtr lin; + TQLineEdit *lined(); + TQGuardedPtr lin; Type typ; }; -class PropertyColorItem : public QObject, +class PropertyColorItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, bool children ); + const TQString &propName, bool children ); ~PropertyColorItem(); virtual void createChildren(); @@ -376,25 +376,25 @@ public: virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); virtual bool hasSubItems() const; virtual void childValueChanged( PropertyItem *child ); virtual bool hasCustomContents() const; - virtual void drawCustomContents( QPainter *p, const QRect &r ); + virtual void drawCustomContents( TQPainter *p, const TQRect &r ); private slots: void getColor(); private: - QGuardedPtr box; - QGuardedPtr colorPrev; - QGuardedPtr button; + TQGuardedPtr box; + TQGuardedPtr colorPrev; + TQGuardedPtr button; bool withChildren; }; -class PropertyPixmapItem : public QObject, +class PropertyPixmapItem : public TQObject, public PropertyItem { Q_OBJECT @@ -403,37 +403,37 @@ public: enum Type { Pixmap, IconSet, Image }; PropertyPixmapItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName, Type t ); + const TQString &propName, Type t ); ~PropertyPixmapItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); virtual bool hasCustomContents() const; - virtual void drawCustomContents( QPainter *p, const QRect &r ); + virtual void drawCustomContents( TQPainter *p, const TQRect &r ); private slots: void getPixmap(); private: - QGuardedPtr box; - QGuardedPtr pixPrev; - QPushButton *button; + TQGuardedPtr box; + TQGuardedPtr pixPrev; + TQPushButton *button; Type type; }; -class PropertySizePolicyItem : public QObject, +class PropertySizePolicyItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertySizePolicyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ); + const TQString &propName ); ~PropertySizePolicyItem(); virtual void createChildren(); @@ -442,105 +442,105 @@ public: virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); virtual bool hasSubItems() const; virtual void childValueChanged( PropertyItem *child ); private: - QLineEdit *lined(); - QGuardedPtr lin; + TQLineEdit *lined(); + TQGuardedPtr lin; }; -class PropertyPaletteItem : public QObject, +class PropertyPaletteItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyPaletteItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ); + const TQString &propName ); ~PropertyPaletteItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); virtual bool hasCustomContents() const; - virtual void drawCustomContents( QPainter *p, const QRect &r ); + virtual void drawCustomContents( TQPainter *p, const TQRect &r ); private slots: void getPalette(); private: - QGuardedPtr box; - QGuardedPtr palettePrev; - QGuardedPtr button; + TQGuardedPtr box; + TQGuardedPtr palettePrev; + TQGuardedPtr button; }; -class PropertyCursorItem : public QObject, +class PropertyCursorItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyCursorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ); + const TQString &propName ); ~PropertyCursorItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); private slots: void setValue(); private: - QComboBox *combo(); - QGuardedPtr comb; + TQComboBox *combo(); + TQGuardedPtr comb; }; -class PropertyKeysequenceItem : public QObject, +class PropertyKeysequenceItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyKeysequenceItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ); + const TQString &propName ); ~PropertyKeysequenceItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); private slots: void setValue(); private: - bool eventFilter( QObject *o, QEvent *e ); - void handleKeyEvent( QKeyEvent *e ); + bool eventFilter( TQObject *o, TQEvent *e ); + void handleKeyEvent( TQKeyEvent *e ); int translateModifiers( int state ); - QGuardedPtr sequence; - QGuardedPtr box; + TQGuardedPtr sequence; + TQGuardedPtr box; int k1,k2,k3,k4; int num; bool mouseEnter; }; -class PropertyDatabaseItem : public QObject, +class PropertyDatabaseItem : public TQObject, public PropertyItem { Q_OBJECT public: - PropertyDatabaseItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName, bool wField ); + PropertyDatabaseItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName, bool wField ); ~PropertyDatabaseItem(); virtual void createChildren(); @@ -549,26 +549,26 @@ public: virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); virtual bool hasSubItems() const; virtual void childValueChanged( PropertyItem *child ); private: - QGuardedPtr lined; - QGuardedPtr button; - QGuardedPtr box; + TQGuardedPtr lined; + TQGuardedPtr button; + TQGuardedPtr box; bool withField; }; struct EnumItem { - EnumItem( const QString &k, bool s ) + EnumItem( const TQString &k, bool s ) : key( k ), selected( s ) {} - EnumItem() : key( QString::null ), selected( FALSE ) {} + EnumItem() : key( TQString::null ), selected( FALSE ) {} bool operator==( const EnumItem &item ) const { return key == item.key; } - QString key; + TQString key; bool selected; }; @@ -577,10 +577,10 @@ class EnumPopup : public QFrame Q_OBJECT public: - EnumPopup( QWidget *parent, const char *name, WFlags f=0 ); + EnumPopup( TQWidget *parent, const char *name, WFlags f=0 ); ~EnumPopup(); - void insertEnums( QValueList lst ); - QValueList enumList() const; + void insertEnums( TQValueList lst ); + TQValueList enumList() const; void closeWidget(); signals: @@ -588,12 +588,12 @@ signals: void hidden(); protected: - void keyPressEvent( QKeyEvent *e ); + void keyPressEvent( TQKeyEvent *e ); private: - QValueList itemList; - QPtrList checkBoxList; - QVBoxLayout *popLayout; + TQValueList itemList; + TQPtrList checkBoxList; + TQVBoxLayout *popLayout; }; class EnumBox : public QComboBox @@ -601,20 +601,20 @@ class EnumBox : public QComboBox Q_OBJECT public: - EnumBox( QWidget *parent, const char *name = 0 ); + EnumBox( TQWidget *parent, const char *name = 0 ); ~EnumBox() {} - void setText( const QString &text ); - void insertEnums( QValueList lst ); - QValueList enumList() const; + void setText( const TQString &text ); + void insertEnums( TQValueList lst ); + TQValueList enumList() const; signals: void aboutToShowPopup(); void valueChanged(); protected: - void paintEvent( QPaintEvent * ); - void mousePressEvent( QMouseEvent *e ); - void keyPressEvent( QKeyEvent *e ); + void paintEvent( TQPaintEvent * ); + void mousePressEvent( TQMouseEvent *e ); + void keyPressEvent( TQKeyEvent *e ); protected slots: void restoreArrow(); @@ -624,36 +624,36 @@ protected slots: private: void popup(); bool arrowDown; - QString str; + TQString str; bool popupShown; EnumPopup *pop; }; -class PropertyEnumItem : public QObject, +class PropertyEnumItem : public TQObject, public PropertyItem { Q_OBJECT public: PropertyEnumItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const QString &propName ); + const TQString &propName ); ~PropertyEnumItem(); void showEditor(); void hideEditor(); - void setValue( const QVariant &v ); - QString currentItem() const; - QString currentItemFromObject() const; - void setCurrentValues( QStrList lst ); + void setValue( const TQVariant &v ); + TQString currentItem() const; + TQString currentItemFromObject() const; + void setCurrentValues( TQStrList lst ); private slots: void setValue(); void insertEnums(); private: - QGuardedPtr box; - QValueList enumList; - QString enumString; + TQGuardedPtr box; + TQValueList enumList; + TQString enumString; }; class PropertyList : public QListView @@ -665,15 +665,15 @@ public: virtual void setupProperties(); - virtual void setCurrentItem( QListViewItem *i ); + virtual void setCurrentItem( TQListViewItem *i ); virtual void valueChanged( PropertyItem *i ); virtual void refetchData(); virtual void setPropertyValue( PropertyItem *i ); - virtual void setCurrentProperty( const QString &n ); + virtual void setCurrentProperty( const TQString &n ); void layoutInitValue( PropertyItem *i, bool changed = FALSE ); PropertyEditor *propertyEditor() const; - QString whatsThisAt( const QPoint &p ); + TQString whatsThisAt( const TQPoint &p ); void showCurrentWhatsThis(); enum LastEventType { KeyEvent, MouseEvent }; @@ -685,18 +685,18 @@ public slots: void toggleSort(); private slots: - void itemPressed( QListViewItem *i, const QPoint &p, int c ); - void toggleOpen( QListViewItem *i ); - bool eventFilter( QObject *o, QEvent *e ); + void itemPressed( TQListViewItem *i, const TQPoint &p, int c ); + void toggleOpen( TQListViewItem *i ); + bool eventFilter( TQObject *o, TQEvent *e ); protected: - void resizeEvent( QResizeEvent *e ); - void paintEmptyArea( QPainter *p, const QRect &r ); - bool addPropertyItem( PropertyItem *&item, const QCString &name, QVariant::Type t ); + void resizeEvent( TQResizeEvent *e ); + void paintEmptyArea( TQPainter *p, const TQRect &r ); + bool addPropertyItem( PropertyItem *&item, const TQCString &name, TQVariant::Type t ); - void viewportDragEnterEvent( QDragEnterEvent * ); - void viewportDragMoveEvent ( QDragMoveEvent * ); - void viewportDropEvent ( QDropEvent * ); + void viewportDragEnterEvent( TQDragEnterEvent * ); + void viewportDragMoveEvent ( TQDragMoveEvent * ); + void viewportDropEvent ( TQDropEvent * ); protected: PropertyEditor *editor; @@ -704,16 +704,16 @@ protected: private: void readPropertyDocs(); void setupCusWidgetProperties( MetaDataBase::CustomWidget *cw, - QMap &unique, + TQMap &unique, PropertyItem *&item ); - QString whatsThisText( QListViewItem *i ); + TQString whatsThisText( TQListViewItem *i ); private: PropertyListItem* pressItem; - QPoint pressPos; + TQPoint pressPos; bool mousePressed; bool showSorted; - QMap propertyDocs; + TQMap propertyDocs; PropertyWhatsThis *whatsThis; LastEventType theLastEvent; }; @@ -723,21 +723,21 @@ class EventList : public HierarchyList Q_OBJECT public: - EventList( QWidget *parent, FormWindow *fw, PropertyEditor *e ); + EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ); void setup(); - void setCurrent( QWidget *w ); + void setCurrent( TQWidget *w ); protected: - void contentsMouseDoubleClickEvent( QMouseEvent *e ); + void contentsMouseDoubleClickEvent( TQMouseEvent *e ); private: - void save( QListViewItem *p ); + void save( TQListViewItem *p ); private slots: - void objectClicked( QListViewItem *i ); - void showRMBMenu( QListViewItem *, const QPoint & ); - void renamed( QListViewItem *i ); + void objectClicked( TQListViewItem *i ); + void showRMBMenu( TQListViewItem *, const TQPoint & ); + void renamed( TQListViewItem *i ); private: PropertyEditor *editor; @@ -750,9 +750,9 @@ class PropertyEditor : public QTabWidget Q_OBJECT public: - PropertyEditor( QWidget *parent ); + PropertyEditor( TQWidget *parent ); - QObject *widget() const; + TQObject *widget() const; void clear(); void setup(); @@ -766,9 +766,9 @@ public: FormWindow *formWindow() const; EventList *eventList() const; - QString currentProperty() const; - QString classOfCurrentProperty() const; - QMetaObject* metaObjectOfCurrentProperty() const; + TQString currentProperty() const; + TQString classOfCurrentProperty() const; + TQMetaObject* metaObjectOfCurrentProperty() const; void resetFocus(); @@ -779,88 +779,88 @@ signals: void hidden(); public slots: - void setWidget( QObject *w, FormWindow *fw ); + void setWidget( TQObject *w, FormWindow *fw ); protected: - void closeEvent( QCloseEvent *e ); + void closeEvent( TQCloseEvent *e ); private: void updateWindow(); private: - QObject *wid; + TQObject *wid; PropertyList *listview; EventList *eList; FormWindow *formwindow; }; -class PropertyDateItem : public QObject, +class PropertyDateItem : public TQObject, public PropertyItem { Q_OBJECT public: - PropertyDateItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ); + PropertyDateItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); ~PropertyDateItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); private slots: void setValue(); private: QDateEdit *lined(); - QGuardedPtr lin; + TQGuardedPtr lin; }; -class PropertyTimeItem : public QObject, +class PropertyTimeItem : public TQObject, public PropertyItem { Q_OBJECT public: - PropertyTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ); + PropertyTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); ~PropertyTimeItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); private slots: void setValue(); private: QTimeEdit *lined(); - QGuardedPtr lin; + TQGuardedPtr lin; }; -class PropertyDateTimeItem : public QObject, +class PropertyDateTimeItem : public TQObject, public PropertyItem { Q_OBJECT public: - PropertyDateTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const QString &propName ); + PropertyDateTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); ~PropertyDateTimeItem(); virtual void showEditor(); virtual void hideEditor(); - virtual void setValue( const QVariant &v ); + virtual void setValue( const TQVariant &v ); private slots: void setValue(); private: QDateTimeEdit *lined(); - QGuardedPtr lin; + TQGuardedPtr lin; }; diff --git a/kdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp index 8687033e..8053501e 100644 --- a/kdevdesigner/designer/propertyobject.cpp +++ b/kdevdesigner/designer/propertyobject.cpp @@ -26,21 +26,21 @@ #include "propertyobject.h" #include "metadatabase.h" -#include -#include -#include -#include +#include +#include +#include +#include -PropertyObject::PropertyObject( const QWidgetList &objs ) - : QObject(), objects( objs ), mobj( 0 ) +PropertyObject::PropertyObject( const TQWidgetList &objs ) + : TQObject(), objects( objs ), mobj( 0 ) { - QPtrVector > v; + TQPtrVector > v; v.resize( objects.count() ); v.setAutoDelete( TRUE ); - for ( QObject *o = objects.first(); o; o = objects.next() ) { - const QMetaObject *m = o->metaObject(); - QPtrList *mol = new QPtrList; + for ( TQObject *o = objects.first(); o; o = objects.next() ) { + const TQMetaObject *m = o->metaObject(); + TQPtrList *mol = new TQPtrList; while ( m ) { mol->insert( 0, m ); m = m->superClass(); @@ -58,7 +58,7 @@ PropertyObject::PropertyObject( const QWidgetList &objs ) minDepth = depth; } - const QMetaObject *m = v[0]->at( --minDepth ); + const TQMetaObject *m = v[0]->at( --minDepth ); for ( int j = 0; j < numObjects; ++j ) { if ( v[j]->at( minDepth ) != m ) { @@ -72,87 +72,87 @@ PropertyObject::PropertyObject( const QWidgetList &objs ) Q_ASSERT( mobj ); } -bool PropertyObject::setProperty( const char *name, const QVariant& value ) +bool PropertyObject::setProperty( const char *name, const TQVariant& value ) { - for ( QObject *o = objects.first(); o; o = objects.next() ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) o->setProperty( name, value ); return TRUE; } -QVariant PropertyObject::property( const char *name ) const +TQVariant PropertyObject::property( const char *name ) const { return ( (PropertyObject*)this )->objects.first()->property( name ); } -void PropertyObject::mdPropertyChanged( const QString &property, bool changed ) +void PropertyObject::mdPropertyChanged( const TQString &property, bool changed ) { - for ( QObject *o = objects.first(); o; o = objects.next() ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setPropertyChanged( o, property, changed ); } -bool PropertyObject::mdIsPropertyChanged( const QString &property ) +bool PropertyObject::mdIsPropertyChanged( const TQString &property ) { - for ( QObject *o = objects.first(); o; o = objects.next() ) { + for ( TQObject *o = objects.first(); o; o = objects.next() ) { if ( MetaDataBase::isPropertyChanged( o, property ) ) return TRUE; } return FALSE; } -void PropertyObject::mdSetPropertyComment( const QString &property, const QString &comment ) +void PropertyObject::mdSetPropertyComment( const TQString &property, const TQString &comment ) { - for ( QObject *o = objects.first(); o; o = objects.next() ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setPropertyComment( o, property, comment ); } -QString PropertyObject::mdPropertyComment( const QString &property ) +TQString PropertyObject::mdPropertyComment( const TQString &property ) { return MetaDataBase::propertyComment( objects.first(), property ); } -void PropertyObject::mdSetFakeProperty( const QString &property, const QVariant &value ) +void PropertyObject::mdSetFakeProperty( const TQString &property, const TQVariant &value ) { - for ( QObject *o = objects.first(); o; o = objects.next() ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setFakeProperty( o, property, value ); } -QVariant PropertyObject::mdFakeProperty( const QString &property ) +TQVariant PropertyObject::mdFakeProperty( const TQString &property ) { return MetaDataBase::fakeProperty( objects.first(), property ); } -void PropertyObject::mdSetCursor( const QCursor &c ) +void PropertyObject::mdSetCursor( const TQCursor &c ) { - for ( QObject *o = objects.first(); o; o = objects.next() ) { + for ( TQObject *o = objects.first(); o; o = objects.next() ) { if ( o->isWidgetType() ) - MetaDataBase::setCursor( (QWidget*)o, c ); + MetaDataBase::setCursor( (TQWidget*)o, c ); } } -QCursor PropertyObject::mdCursor() +TQCursor PropertyObject::mdCursor() { return MetaDataBase::cursor( objects.first() ); } -void PropertyObject::mdSetPixmapKey( int pixmap, const QString &arg ) +void PropertyObject::mdSetPixmapKey( int pixmap, const TQString &arg ) { - for ( QObject *o = objects.first(); o; o = objects.next() ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setPixmapKey( o, pixmap, arg ); } -QString PropertyObject::mdPixmapKey( int pixmap ) +TQString PropertyObject::mdPixmapKey( int pixmap ) { return MetaDataBase::pixmapKey( objects.first(), pixmap ); } -void PropertyObject::mdSetExportMacro( const QString ¯o ) +void PropertyObject::mdSetExportMacro( const TQString ¯o ) { - for ( QObject *o = objects.first(); o; o = objects.next() ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setExportMacro( o, macro ); } -QString PropertyObject::mdExportMacro() +TQString PropertyObject::mdExportMacro() { return MetaDataBase::exportMacro( objects.first() ); } diff --git a/kdevdesigner/designer/propertyobject.h b/kdevdesigner/designer/propertyobject.h index c8445239..784fa74b 100644 --- a/kdevdesigner/designer/propertyobject.h +++ b/kdevdesigner/designer/propertyobject.h @@ -1,42 +1,42 @@ #ifndef PROPERTYOBJECT_H #define PROPERTYOBJECT_H -#include -#include -#include +#include +#include +#include class PropertyObject : public QObject { public: - QMetaObject *metaObject() const { return (QMetaObject*)mobj; } + TQMetaObject *metaObject() const { return (TQMetaObject*)mobj; } const char *className() const { return "PropertyObject"; } - QObject* qObject() { return (QObject*)this; } + TQObject* qObject() { return (TQObject*)this; } private: - static QMetaObject *metaObj; + static TQMetaObject *metaObj; public: - PropertyObject( const QWidgetList &objs ); - - bool setProperty( const char *name, const QVariant& value ); - QVariant property( const char *name ) const; - - void mdPropertyChanged( const QString &property, bool changed ); - bool mdIsPropertyChanged( const QString &property ); - void mdSetPropertyComment( const QString &property, const QString &comment ); - QString mdPropertyComment( const QString &property ); - void mdSetFakeProperty( const QString &property, const QVariant &value ); - QVariant mdFakeProperty( const QString &property ); - void mdSetCursor( const QCursor &c ); - QCursor mdCursor(); - void mdSetPixmapKey( int pixmap, const QString &arg ); - QString mdPixmapKey( int pixmap ); - void mdSetExportMacro( const QString ¯o ); - QString mdExportMacro(); - QWidgetList widgetList() const { return objects; } + PropertyObject( const TQWidgetList &objs ); + + bool setProperty( const char *name, const TQVariant& value ); + TQVariant property( const char *name ) const; + + void mdPropertyChanged( const TQString &property, bool changed ); + bool mdIsPropertyChanged( const TQString &property ); + void mdSetPropertyComment( const TQString &property, const TQString &comment ); + TQString mdPropertyComment( const TQString &property ); + void mdSetFakeProperty( const TQString &property, const TQVariant &value ); + TQVariant mdFakeProperty( const TQString &property ); + void mdSetCursor( const TQCursor &c ); + TQCursor mdCursor(); + void mdSetPixmapKey( int pixmap, const TQString &arg ); + TQString mdPixmapKey( int pixmap ); + void mdSetExportMacro( const TQString ¯o ); + TQString mdExportMacro(); + TQWidgetList widgetList() const { return objects; } private: - QWidgetList objects; - const QMetaObject *mobj; + TQWidgetList objects; + const TQMetaObject *mobj; }; diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp index 9c735577..c00e9b84 100644 --- a/kdevdesigner/designer/qcompletionedit.cpp +++ b/kdevdesigner/designer/qcompletionedit.cpp @@ -25,28 +25,28 @@ **********************************************************************/ #include "qcompletionedit.h" -#include -#include -#include -#include +#include +#include +#include +#include -QCompletionEdit::QCompletionEdit( QWidget *parent, const char *name ) - : QLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE ) +QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) + : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE ) { - popup = new QVBox( 0, 0, WType_Popup ); - popup->setFrameStyle( QFrame::Box | QFrame::Plain ); + popup = new TQVBox( 0, 0, WType_Popup ); + popup->setFrameStyle( TQFrame::Box | TQFrame::Plain ); popup->setLineWidth( 1 ); popup->hide(); - listbox = new QListBox( popup ); - listbox->setFrameStyle( QFrame::NoFrame ); + listbox = new TQListBox( popup ); + listbox->setFrameStyle( TQFrame::NoFrame ); listbox->setLineWidth( 1 ); listbox->installEventFilter( this ); - listbox->setHScrollBarMode( QScrollView::AlwaysOn ); - listbox->setVScrollBarMode( QScrollView::AlwaysOn ); - listbox->setCornerWidget( new QSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, SIGNAL( textChanged( const QString & ) ), - this, SLOT( textDidChange( const QString & ) ) ); + listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); + listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); + listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); + connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), + this, TQT_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } @@ -56,12 +56,12 @@ bool QCompletionEdit::autoAdd() const return aAdd; } -QStringList QCompletionEdit::completionList() const +TQStringList QCompletionEdit::completionList() const { return compList; } -void QCompletionEdit::setCompletionList( const QStringList &l ) +void QCompletionEdit::setCompletionList( const TQStringList &l ) { compList = l; } @@ -71,7 +71,7 @@ void QCompletionEdit::setAutoAdd( bool add ) aAdd = add; } -void QCompletionEdit::textDidChange( const QString &text ) +void QCompletionEdit::textDidChange( const TQString &text ) { if ( text.isEmpty() ) { popup->close(); @@ -91,8 +91,8 @@ void QCompletionEdit::placeListBox() popup->resize( QMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 ); - QPoint p( mapToGlobal( QPoint( 0, 0 ) ) ); - if ( p.y() + height() + popup->height() <= QApplication::desktop()->height() ) + TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) ); + if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() ) popup->move( p.x(), p.y() + height() ); else popup->move( p.x(), p.y() - listbox->height() ); @@ -107,18 +107,18 @@ void QCompletionEdit::updateListBox() listbox->clear(); if ( compList.isEmpty() ) return; - for ( QStringList::Iterator it = compList.begin(); it != compList.end(); ++it ) { + for ( TQStringList::Iterator it = compList.begin(); it != compList.end(); ++it ) { if ( caseSensitive && (*it).left( text().length() ) == text() || !caseSensitive && (*it).left( text().length() ).lower() == text().lower() ) listbox->insertItem( *it ); } } -bool QCompletionEdit::eventFilter( QObject *o, QEvent *e ) +bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) { if ( o == popup || o == listbox || o == listbox->viewport() ) { - if ( e->type() == QEvent::KeyPress ) { - QKeyEvent *ke = (QKeyEvent*)e; + if ( e->type() == TQEvent::KeyPress ) { + TQKeyEvent *ke = (TQKeyEvent*)e; if ( ke->key() == Key_Enter || ke->key() == Key_Return || ke->key() == Key_Tab ) { if ( ke->key() == Key_Tab && listbox->count() > 1 && listbox->currentItem() < (int)listbox->count() - 1 ) { @@ -147,10 +147,10 @@ bool QCompletionEdit::eventFilter( QObject *o, QEvent *e ) popup->close(); setFocus(); } - QApplication::sendEvent( this, e ); + TQApplication::sendEvent( this, e ); return TRUE; } - } else if ( e->type() == QEvent::MouseButtonDblClick ) { + } else if ( e->type() == TQEvent::MouseButtonDblClick ) { popup->close(); setFocus(); blockSignals( TRUE ); @@ -160,8 +160,8 @@ bool QCompletionEdit::eventFilter( QObject *o, QEvent *e ) return TRUE; } } else if ( o == this ) { - if ( e->type() == QEvent::KeyPress ) { - QKeyEvent *ke = (QKeyEvent*)e; + if ( e->type() == TQEvent::KeyPress ) { + TQKeyEvent *ke = (TQKeyEvent*)e; if ( ke->key() == Key_Up || ke->key() == Key_Down || ke->key() == Key_Prior || @@ -170,15 +170,15 @@ bool QCompletionEdit::eventFilter( QObject *o, QEvent *e ) ke->key() == Key_Enter || ke->key() == Key_Tab || ke->key() == Key_Escape ) { - QApplication::sendEvent( listbox, e ); + TQApplication::sendEvent( listbox, e ); return TRUE; } } } - return QLineEdit::eventFilter( o, e ); + return TQLineEdit::eventFilter( o, e ); } -void QCompletionEdit::addCompletionEntry( const QString &entry ) +void QCompletionEdit::addCompletionEntry( const TQString &entry ) { if ( compList.find( entry ) == compList.end() ) { compList << entry; @@ -186,9 +186,9 @@ void QCompletionEdit::addCompletionEntry( const QString &entry ) } } -void QCompletionEdit::removeCompletionEntry( const QString &entry ) +void QCompletionEdit::removeCompletionEntry( const TQString &entry ) { - QStringList::Iterator it = compList.find( entry ); + TQStringList::Iterator it = compList.find( entry ); if ( it != compList.end() ) compList.remove( it ); } @@ -205,6 +205,6 @@ bool QCompletionEdit::isCaseSensitive() const void QCompletionEdit::clear() { - QLineEdit::clear(); + TQLineEdit::clear(); compList.clear(); } diff --git a/kdevdesigner/designer/qcompletionedit.h b/kdevdesigner/designer/qcompletionedit.h index 426e7202..2e55854d 100644 --- a/kdevdesigner/designer/qcompletionedit.h +++ b/kdevdesigner/designer/qcompletionedit.h @@ -27,8 +27,8 @@ #ifndef QCOMPLETIONEDIT_H #define QCOMPLETIONEDIT_H -#include -#include +#include +#include class QListBox; class QVBox; @@ -40,26 +40,26 @@ class QCompletionEdit : public QLineEdit Q_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) public: - QCompletionEdit( QWidget *parent = 0, const char *name = 0 ); + QCompletionEdit( TQWidget *parent = 0, const char *name = 0 ); bool autoAdd() const; - QStringList completionList() const; - bool eventFilter( QObject *o, QEvent *e ); + TQStringList completionList() const; + bool eventFilter( TQObject *o, TQEvent *e ); bool isCaseSensitive() const; public slots: - void setCompletionList( const QStringList &l ); + void setCompletionList( const TQStringList &l ); void setAutoAdd( bool add ); void clear(); - void addCompletionEntry( const QString &entry ); - void removeCompletionEntry( const QString &entry ); + void addCompletionEntry( const TQString &entry ); + void removeCompletionEntry( const TQString &entry ); void setCaseSensitive( bool b ); signals: - void chosen( const QString &text ); + void chosen( const TQString &text ); private slots: - void textDidChange( const QString &text ); + void textDidChange( const TQString &text ); private: void placeListBox(); @@ -67,9 +67,9 @@ private: private: bool aAdd; - QStringList compList; - QListBox *listbox; - QVBox *popup; + TQStringList compList; + TQListBox *listbox; + TQVBox *popup; bool caseSensitive; }; diff --git a/kdevdesigner/designer/replacedialog.ui.h b/kdevdesigner/designer/replacedialog.ui.h index 9fa0f546..7867d0c6 100644 --- a/kdevdesigner/designer/replacedialog.ui.h +++ b/kdevdesigner/designer/replacedialog.ui.h @@ -63,7 +63,7 @@ void ReplaceDialog::doReplaceAll() checkBegin->setChecked( FALSE ); } -void ReplaceDialog::setEditor( EditorInterface * e, QObject * fw ) +void ReplaceDialog::setEditor( EditorInterface * e, TQObject * fw ) { if ( fw != formWindow ) checkBegin->setChecked( TRUE ); diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index ca983a42..70768b5b 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -43,42 +43,42 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef QT_NO_TABLE -#include -#include +#include +#include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -87,16 +87,16 @@ #include "kdevdesigner_part.h" -static QString makeIndent( int indent ) +static TQString makeIndent( int indent ) { - QString s; + TQString s; s.fill( ' ', indent * 4 ); return s; } -static QString entitize( const QString &s, bool attribute = FALSE ) +static TQString entitize( const TQString &s, bool attribute = FALSE ) { - QString s2 = s; + TQString s2 = s; s2 = s2.replace( "&", "&" ); s2 = s2.replace( ">", ">" ); s2 = s2.replace( "<", "<" ); @@ -112,99 +112,99 @@ static struct { int key; const char* name; } keyname[] = { - { Qt::Key_Space, QT_TRANSLATE_NOOP( "QAccel", "Space" ) }, - { Qt::Key_Escape, QT_TRANSLATE_NOOP( "QAccel", "Esc" ) }, - { Qt::Key_Tab, QT_TRANSLATE_NOOP( "QAccel", "Tab" ) }, - { Qt::Key_Backtab, QT_TRANSLATE_NOOP( "QAccel", "Backtab" ) }, - { Qt::Key_Backspace, QT_TRANSLATE_NOOP( "QAccel", "Backspace" ) }, - { Qt::Key_Return, QT_TRANSLATE_NOOP( "QAccel", "Return" ) }, - { Qt::Key_Enter, QT_TRANSLATE_NOOP( "QAccel", "Enter" ) }, - { Qt::Key_Insert, QT_TRANSLATE_NOOP( "QAccel", "Ins" ) }, - { Qt::Key_Delete, QT_TRANSLATE_NOOP( "QAccel", "Del" ) }, - { Qt::Key_Pause, QT_TRANSLATE_NOOP( "QAccel", "Pause" ) }, - { Qt::Key_Print, QT_TRANSLATE_NOOP( "QAccel", "Print" ) }, - { Qt::Key_SysReq, QT_TRANSLATE_NOOP( "QAccel", "SysReq" ) }, - { Qt::Key_Home, QT_TRANSLATE_NOOP( "QAccel", "Home" ) }, - { Qt::Key_End, QT_TRANSLATE_NOOP( "QAccel", "End" ) }, - { Qt::Key_Left, QT_TRANSLATE_NOOP( "QAccel", "Left" ) }, - { Qt::Key_Up, QT_TRANSLATE_NOOP( "QAccel", "Up" ) }, - { Qt::Key_Right, QT_TRANSLATE_NOOP( "QAccel", "Right" ) }, - { Qt::Key_Down, QT_TRANSLATE_NOOP( "QAccel", "Down" ) }, - { Qt::Key_Prior, QT_TRANSLATE_NOOP( "QAccel", "PgUp" ) }, - { Qt::Key_Next, QT_TRANSLATE_NOOP( "QAccel", "PgDown" ) }, - { Qt::Key_CapsLock, QT_TRANSLATE_NOOP( "QAccel", "CapsLock" ) }, - { Qt::Key_NumLock, QT_TRANSLATE_NOOP( "QAccel", "NumLock" ) }, - { Qt::Key_ScrollLock, QT_TRANSLATE_NOOP( "QAccel", "ScrollLock" ) }, - { Qt::Key_Menu, QT_TRANSLATE_NOOP( "QAccel", "Menu" ) }, - { Qt::Key_Help, QT_TRANSLATE_NOOP( "QAccel", "Help" ) }, + { Qt::Key_Space, QT_TRANSLATE_NOOP( "TQAccel", "Space" ) }, + { Qt::Key_Escape, QT_TRANSLATE_NOOP( "TQAccel", "Esc" ) }, + { Qt::Key_Tab, QT_TRANSLATE_NOOP( "TQAccel", "Tab" ) }, + { Qt::Key_Backtab, QT_TRANSLATE_NOOP( "TQAccel", "Backtab" ) }, + { Qt::Key_Backspace, QT_TRANSLATE_NOOP( "TQAccel", "Backspace" ) }, + { Qt::Key_Return, QT_TRANSLATE_NOOP( "TQAccel", "Return" ) }, + { Qt::Key_Enter, QT_TRANSLATE_NOOP( "TQAccel", "Enter" ) }, + { Qt::Key_Insert, QT_TRANSLATE_NOOP( "TQAccel", "Ins" ) }, + { Qt::Key_Delete, QT_TRANSLATE_NOOP( "TQAccel", "Del" ) }, + { Qt::Key_Pause, QT_TRANSLATE_NOOP( "TQAccel", "Pause" ) }, + { Qt::Key_Print, QT_TRANSLATE_NOOP( "TQAccel", "Print" ) }, + { Qt::Key_SysReq, QT_TRANSLATE_NOOP( "TQAccel", "SysReq" ) }, + { Qt::Key_Home, QT_TRANSLATE_NOOP( "TQAccel", "Home" ) }, + { Qt::Key_End, QT_TRANSLATE_NOOP( "TQAccel", "End" ) }, + { Qt::Key_Left, QT_TRANSLATE_NOOP( "TQAccel", "Left" ) }, + { Qt::Key_Up, QT_TRANSLATE_NOOP( "TQAccel", "Up" ) }, + { Qt::Key_Right, QT_TRANSLATE_NOOP( "TQAccel", "Right" ) }, + { Qt::Key_Down, QT_TRANSLATE_NOOP( "TQAccel", "Down" ) }, + { Qt::Key_Prior, QT_TRANSLATE_NOOP( "TQAccel", "PgUp" ) }, + { Qt::Key_Next, QT_TRANSLATE_NOOP( "TQAccel", "PgDown" ) }, + { Qt::Key_CapsLock, QT_TRANSLATE_NOOP( "TQAccel", "CapsLock" ) }, + { Qt::Key_NumLock, QT_TRANSLATE_NOOP( "TQAccel", "NumLock" ) }, + { Qt::Key_ScrollLock, QT_TRANSLATE_NOOP( "TQAccel", "ScrollLock" ) }, + { Qt::Key_Menu, QT_TRANSLATE_NOOP( "TQAccel", "Menu" ) }, + { Qt::Key_Help, QT_TRANSLATE_NOOP( "TQAccel", "Help" ) }, // Multimedia keys - { Qt::Key_Back, QT_TRANSLATE_NOOP( "QAccel", "Back" ) }, - { Qt::Key_Forward, QT_TRANSLATE_NOOP( "QAccel", "Forward" ) }, - { Qt::Key_Stop, QT_TRANSLATE_NOOP( "QAccel", "Stop" ) }, - { Qt::Key_Refresh, QT_TRANSLATE_NOOP( "QAccel", "Refresh" ) }, - { Qt::Key_VolumeDown, QT_TRANSLATE_NOOP( "QAccel", "Volume Down" ) }, - { Qt::Key_VolumeMute, QT_TRANSLATE_NOOP( "QAccel", "Volume Mute" ) }, - { Qt::Key_VolumeUp, QT_TRANSLATE_NOOP( "QAccel", "Volume Up" ) }, - { Qt::Key_BassBoost, QT_TRANSLATE_NOOP( "QAccel", "Bass Boost" ) }, - { Qt::Key_BassUp, QT_TRANSLATE_NOOP( "QAccel", "Bass Up" ) }, - { Qt::Key_BassDown, QT_TRANSLATE_NOOP( "QAccel", "Bass Down" ) }, - { Qt::Key_TrebleUp, QT_TRANSLATE_NOOP( "QAccel", "Treble Up" ) }, - { Qt::Key_TrebleDown, QT_TRANSLATE_NOOP( "QAccel", "Treble Down" ) }, - { Qt::Key_MediaPlay, QT_TRANSLATE_NOOP( "QAccel", "Media Play" ) }, - { Qt::Key_MediaStop, QT_TRANSLATE_NOOP( "QAccel", "Media Stop" ) }, - { Qt::Key_MediaPrev, QT_TRANSLATE_NOOP( "QAccel", "Media Previous" ) }, - { Qt::Key_MediaNext, QT_TRANSLATE_NOOP( "QAccel", "Media Next" ) }, - { Qt::Key_MediaRecord, QT_TRANSLATE_NOOP( "QAccel", "Media Record" ) }, - { Qt::Key_HomePage, QT_TRANSLATE_NOOP( "QAccel", "Home" ) }, - { Qt::Key_Favorites, QT_TRANSLATE_NOOP( "QAccel", "Favorites" ) }, - { Qt::Key_Search, QT_TRANSLATE_NOOP( "QAccel", "Search" ) }, - { Qt::Key_Standby, QT_TRANSLATE_NOOP( "QAccel", "Standby" ) }, - { Qt::Key_OpenUrl, QT_TRANSLATE_NOOP( "QAccel", "Open URL" ) }, - { Qt::Key_LaunchMail, QT_TRANSLATE_NOOP( "QAccel", "Launch Mail" ) }, - { Qt::Key_LaunchMedia, QT_TRANSLATE_NOOP( "QAccel", "Launch Media" ) }, - { Qt::Key_Launch0, QT_TRANSLATE_NOOP( "QAccel", "Launch (0)" ) }, - { Qt::Key_Launch1, QT_TRANSLATE_NOOP( "QAccel", "Launch (1)" ) }, - { Qt::Key_Launch2, QT_TRANSLATE_NOOP( "QAccel", "Launch (2)" ) }, - { Qt::Key_Launch3, QT_TRANSLATE_NOOP( "QAccel", "Launch (3)" ) }, - { Qt::Key_Launch4, QT_TRANSLATE_NOOP( "QAccel", "Launch (4)" ) }, - { Qt::Key_Launch5, QT_TRANSLATE_NOOP( "QAccel", "Launch (5)" ) }, - { Qt::Key_Launch6, QT_TRANSLATE_NOOP( "QAccel", "Launch (6)" ) }, - { Qt::Key_Launch7, QT_TRANSLATE_NOOP( "QAccel", "Launch (7)" ) }, - { Qt::Key_Launch8, QT_TRANSLATE_NOOP( "QAccel", "Launch (8)" ) }, - { Qt::Key_Launch9, QT_TRANSLATE_NOOP( "QAccel", "Launch (9)" ) }, - { Qt::Key_LaunchA, QT_TRANSLATE_NOOP( "QAccel", "Launch (A)" ) }, - { Qt::Key_LaunchB, QT_TRANSLATE_NOOP( "QAccel", "Launch (B)" ) }, - { Qt::Key_LaunchC, QT_TRANSLATE_NOOP( "QAccel", "Launch (C)" ) }, - { Qt::Key_LaunchD, QT_TRANSLATE_NOOP( "QAccel", "Launch (D)" ) }, - { Qt::Key_LaunchE, QT_TRANSLATE_NOOP( "QAccel", "Launch (E)" ) }, - { Qt::Key_LaunchF, QT_TRANSLATE_NOOP( "QAccel", "Launch (F)" ) }, + { Qt::Key_Back, QT_TRANSLATE_NOOP( "TQAccel", "Back" ) }, + { Qt::Key_Forward, QT_TRANSLATE_NOOP( "TQAccel", "Forward" ) }, + { Qt::Key_Stop, QT_TRANSLATE_NOOP( "TQAccel", "Stop" ) }, + { Qt::Key_Refresh, QT_TRANSLATE_NOOP( "TQAccel", "Refresh" ) }, + { Qt::Key_VolumeDown, QT_TRANSLATE_NOOP( "TQAccel", "Volume Down" ) }, + { Qt::Key_VolumeMute, QT_TRANSLATE_NOOP( "TQAccel", "Volume Mute" ) }, + { Qt::Key_VolumeUp, QT_TRANSLATE_NOOP( "TQAccel", "Volume Up" ) }, + { Qt::Key_BassBoost, QT_TRANSLATE_NOOP( "TQAccel", "Bass Boost" ) }, + { Qt::Key_BassUp, QT_TRANSLATE_NOOP( "TQAccel", "Bass Up" ) }, + { Qt::Key_BassDown, QT_TRANSLATE_NOOP( "TQAccel", "Bass Down" ) }, + { Qt::Key_TrebleUp, QT_TRANSLATE_NOOP( "TQAccel", "Treble Up" ) }, + { Qt::Key_TrebleDown, QT_TRANSLATE_NOOP( "TQAccel", "Treble Down" ) }, + { Qt::Key_MediaPlay, QT_TRANSLATE_NOOP( "TQAccel", "Media Play" ) }, + { Qt::Key_MediaStop, QT_TRANSLATE_NOOP( "TQAccel", "Media Stop" ) }, + { Qt::Key_MediaPrev, QT_TRANSLATE_NOOP( "TQAccel", "Media Previous" ) }, + { Qt::Key_MediaNext, QT_TRANSLATE_NOOP( "TQAccel", "Media Next" ) }, + { Qt::Key_MediaRecord, QT_TRANSLATE_NOOP( "TQAccel", "Media Record" ) }, + { Qt::Key_HomePage, QT_TRANSLATE_NOOP( "TQAccel", "Home" ) }, + { Qt::Key_Favorites, QT_TRANSLATE_NOOP( "TQAccel", "Favorites" ) }, + { Qt::Key_Search, QT_TRANSLATE_NOOP( "TQAccel", "Search" ) }, + { Qt::Key_Standby, QT_TRANSLATE_NOOP( "TQAccel", "Standby" ) }, + { Qt::Key_OpenUrl, QT_TRANSLATE_NOOP( "TQAccel", "Open URL" ) }, + { Qt::Key_LaunchMail, QT_TRANSLATE_NOOP( "TQAccel", "Launch Mail" ) }, + { Qt::Key_LaunchMedia, QT_TRANSLATE_NOOP( "TQAccel", "Launch Media" ) }, + { Qt::Key_Launch0, QT_TRANSLATE_NOOP( "TQAccel", "Launch (0)" ) }, + { Qt::Key_Launch1, QT_TRANSLATE_NOOP( "TQAccel", "Launch (1)" ) }, + { Qt::Key_Launch2, QT_TRANSLATE_NOOP( "TQAccel", "Launch (2)" ) }, + { Qt::Key_Launch3, QT_TRANSLATE_NOOP( "TQAccel", "Launch (3)" ) }, + { Qt::Key_Launch4, QT_TRANSLATE_NOOP( "TQAccel", "Launch (4)" ) }, + { Qt::Key_Launch5, QT_TRANSLATE_NOOP( "TQAccel", "Launch (5)" ) }, + { Qt::Key_Launch6, QT_TRANSLATE_NOOP( "TQAccel", "Launch (6)" ) }, + { Qt::Key_Launch7, QT_TRANSLATE_NOOP( "TQAccel", "Launch (7)" ) }, + { Qt::Key_Launch8, QT_TRANSLATE_NOOP( "TQAccel", "Launch (8)" ) }, + { Qt::Key_Launch9, QT_TRANSLATE_NOOP( "TQAccel", "Launch (9)" ) }, + { Qt::Key_LaunchA, QT_TRANSLATE_NOOP( "TQAccel", "Launch (A)" ) }, + { Qt::Key_LaunchB, QT_TRANSLATE_NOOP( "TQAccel", "Launch (B)" ) }, + { Qt::Key_LaunchC, QT_TRANSLATE_NOOP( "TQAccel", "Launch (C)" ) }, + { Qt::Key_LaunchD, QT_TRANSLATE_NOOP( "TQAccel", "Launch (D)" ) }, + { Qt::Key_LaunchE, QT_TRANSLATE_NOOP( "TQAccel", "Launch (E)" ) }, + { Qt::Key_LaunchF, QT_TRANSLATE_NOOP( "TQAccel", "Launch (F)" ) }, // -------------------------------------------------------------- // More consistent namings - { Qt::Key_Print, QT_TRANSLATE_NOOP( "QAccel", "Print Screen" ) }, - { Qt::Key_Prior, QT_TRANSLATE_NOOP( "QAccel", "Page Up" ) }, - { Qt::Key_Next, QT_TRANSLATE_NOOP( "QAccel", "Page Down" ) }, - { Qt::Key_CapsLock, QT_TRANSLATE_NOOP( "QAccel", "Caps Lock" ) }, - { Qt::Key_NumLock, QT_TRANSLATE_NOOP( "QAccel", "Num Lock" ) }, - { Qt::Key_NumLock, QT_TRANSLATE_NOOP( "QAccel", "Number Lock" ) }, - { Qt::Key_ScrollLock, QT_TRANSLATE_NOOP( "QAccel", "Scroll Lock" ) }, - { Qt::Key_Insert, QT_TRANSLATE_NOOP( "QAccel", "Insert" ) }, - { Qt::Key_Delete, QT_TRANSLATE_NOOP( "QAccel", "Delete" ) }, - { Qt::Key_Escape, QT_TRANSLATE_NOOP( "QAccel", "Escape" ) }, - { Qt::Key_SysReq, QT_TRANSLATE_NOOP( "QAccel", "System Request" ) }, + { Qt::Key_Print, QT_TRANSLATE_NOOP( "TQAccel", "Print Screen" ) }, + { Qt::Key_Prior, QT_TRANSLATE_NOOP( "TQAccel", "Page Up" ) }, + { Qt::Key_Next, QT_TRANSLATE_NOOP( "TQAccel", "Page Down" ) }, + { Qt::Key_CapsLock, QT_TRANSLATE_NOOP( "TQAccel", "Caps Lock" ) }, + { Qt::Key_NumLock, QT_TRANSLATE_NOOP( "TQAccel", "Num Lock" ) }, + { Qt::Key_NumLock, QT_TRANSLATE_NOOP( "TQAccel", "Number Lock" ) }, + { Qt::Key_ScrollLock, QT_TRANSLATE_NOOP( "TQAccel", "Scroll Lock" ) }, + { Qt::Key_Insert, QT_TRANSLATE_NOOP( "TQAccel", "Insert" ) }, + { Qt::Key_Delete, QT_TRANSLATE_NOOP( "TQAccel", "Delete" ) }, + { Qt::Key_Escape, QT_TRANSLATE_NOOP( "TQAccel", "Escape" ) }, + { Qt::Key_SysReq, QT_TRANSLATE_NOOP( "TQAccel", "System Request" ) }, { 0, 0 } }; #endif -static QString platformNeutralKeySequence(const QKeySequence &ks) +static TQString platformNeutralKeySequence(const TQKeySequence &ks) { #ifndef Q_WS_MACX - return QString(ks); + return TQString(ks); #else uint k; - QString str; - QString p; + TQString str; + TQString p; for (k = 0; k < ks.count(); ++k) { int keycombo = ks[k]; int basekey = keycombo & ~(Qt::SHIFT | Qt::CTRL | Qt::ALT | Qt::META); @@ -217,22 +217,22 @@ static QString platformNeutralKeySequence(const QKeySequence &ks) if (keycombo & Qt::SHIFT) str += "Shift+"; - // begin copy and paste from QKeySequence :( + // begin copy and paste from TQKeySequence :( if (basekey & Qt::UNICODE_ACCEL) { // Note: This character should NOT be upper()'ed, since // the encoded string should indicate EXACTLY what the // key represents! Hence a 'Ctrl+Shift+c' is posible to // represent, but is clearly impossible to trigger... - p = QChar(basekey & 0xffff); + p = TQChar(basekey & 0xffff); } else if ( basekey >= Qt::Key_F1 && basekey <= Qt::Key_F35 ) { - p = QAccel::tr( "F%1" ).arg(basekey - Qt::Key_F1 + 1); + p = TQAccel::tr( "F%1" ).arg(basekey - Qt::Key_F1 + 1); } else if ( basekey > Qt::Key_Space && basekey <= Qt::Key_AsciiTilde ) { p.sprintf( "%c", basekey ); } else { int i = 0; while (keyname[i].name) { if (basekey == keyname[i].key) { - p = QAccel::tr(keyname[i].name); + p = TQAccel::tr(keyname[i].name); break; } ++i; @@ -243,7 +243,7 @@ static QString platformNeutralKeySequence(const QKeySequence &ks) // ( Really depends on you locale ) if ( !keyname[i].name ) // Note: This character should NOT be upper()'ed, see above! - p = QChar(basekey & 0xffff); + p = TQChar(basekey & 0xffff); } // end copy... str += p + ", "; @@ -253,7 +253,7 @@ static QString platformNeutralKeySequence(const QKeySequence &ks) #endif } -static QString mkBool( bool b ) +static TQString mkBool( bool b ) { return b? "true" : "false"; } @@ -304,7 +304,7 @@ void Resource::setWidget( FormWindow *w ) toplevel = w; } -QWidget *Resource::widget() const +TQWidget *Resource::widget() const { return toplevel; } @@ -316,7 +316,7 @@ bool Resource::load( FormFile *ff, Project *defProject ) currFileName = ff->absFileName(); mainContainerSet = FALSE; - QFile f( ff->absFileName() ); + TQFile f( ff->absFileName() ); f.open( IO_ReadOnly | IO_Translate ); bool b = load( ff, &f, defProject ); @@ -328,10 +328,10 @@ bool Resource::load( FormFile *ff, Project *defProject ) #undef signals #undef slots -bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) +bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) { - QDomDocument doc; - QString errMsg; + TQDomDocument doc; + TQString errMsg; int errLine; if ( !doc.setContent( dev, &errMsg, &errLine ) ) { return FALSE; @@ -339,7 +339,7 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) DomTool::fixDocument( doc ); - QWidget *p = mainwindow ? mainwindow->qWorkspace() : 0; + TQWidget *p = mainwindow ? mainwindow->qWorkspace() : 0; toplevel = formwindow = new FormWindow( ff, p, 0 ); if ( defProject ) formwindow->setProject( defProject ); @@ -350,7 +350,7 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) MetaDataBase::addEntry( formwindow ); if ( !langIface ) { - QString lang = "Qt Script"; + TQString lang = "Qt Script"; if ( mainwindow ) lang = mainwindow->currProject()->language(); langIface = MetaDataBase::languageInterface( lang ); @@ -359,62 +359,62 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) } uiFileVersion = doc.firstChild().toElement().attribute("version"); - QDomElement e = doc.firstChild().toElement().firstChild().toElement(); + TQDomElement e = doc.firstChild().toElement().firstChild().toElement(); - QDomElement forwards = e; + TQDomElement forwards = e; while ( forwards.tagName() != "forwards" && !forwards.isNull() ) forwards = forwards.nextSibling().toElement(); - QDomElement includes = e; + TQDomElement includes = e; while ( includes.tagName() != "includes" && !includes.isNull() ) includes = includes.nextSibling().toElement(); - QDomElement variables = e; + TQDomElement variables = e; while ( variables.tagName() != "variables" && !variables.isNull() ) variables = variables.nextSibling().toElement(); - QDomElement signals = e; + TQDomElement signals = e; while ( signals.tagName() != "signals" && !signals.isNull() ) signals = signals.nextSibling().toElement(); - QDomElement slots = e; + TQDomElement slots = e; while ( slots.tagName() != "slots" && !slots.isNull() ) slots = slots.nextSibling().toElement(); - QDomElement functions = e; + TQDomElement functions = e; while ( functions.tagName() != "functions" && !functions.isNull() ) functions = functions.nextSibling().toElement(); - QDomElement connections = e; + TQDomElement connections = e; while ( connections.tagName() != "connections" && !connections.isNull() ) connections = connections.nextSibling().toElement(); - QDomElement imageCollection = e; + TQDomElement imageCollection = e; images.clear(); while ( imageCollection.tagName() != "images" && !imageCollection.isNull() ) imageCollection = imageCollection.nextSibling().toElement(); - QDomElement customWidgets = e; + TQDomElement customWidgets = e; while ( customWidgets.tagName() != "customwidgets" && !customWidgets.isNull() ) customWidgets = customWidgets.nextSibling().toElement(); - QDomElement tabOrder = e; + TQDomElement tabOrder = e; while ( tabOrder.tagName() != "tabstops" && !tabOrder.isNull() ) tabOrder = tabOrder.nextSibling().toElement(); - QDomElement actions = e; + TQDomElement actions = e; while ( actions.tagName() != "actions" && !actions.isNull() ) actions = actions.nextSibling().toElement(); - QDomElement toolbars = e; + TQDomElement toolbars = e; while ( toolbars.tagName() != "toolbars" && !toolbars.isNull() ) toolbars = toolbars.nextSibling().toElement(); - QDomElement menubar = e; + TQDomElement menubar = e; while ( menubar.tagName() != "menubar" && !menubar.isNull() ) menubar = menubar.nextSibling().toElement(); - QDomElement widget; + TQDomElement widget; while ( !e.isNull() ) { if ( e.tagName() == "widget" ) { widgets.clear(); @@ -461,8 +461,8 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) } else if ( e.tagName() == "exportmacro" ) { exportMacro = e.firstChild().toText().data(); } else if ( e.tagName() == "layoutdefaults" ) { - formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", QString::number( formwindow->layoutDefaultSpacing() ) ).toInt() ); - formwindow->setLayoutDefaultMargin( e.attribute( "margin", QString::number( formwindow->layoutDefaultMargin() ) ).toInt() ); + formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->layoutDefaultSpacing() ) ).toInt() ); + formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->layoutDefaultMargin() ) ).toInt() ); } else if ( e.tagName() == "layoutfunctions" ) { formwindow->setSpacingFunction( e.attribute( "spacing" ) ); formwindow->setMarginFunction( e.attribute( "margin" ) ); @@ -480,7 +480,7 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) #if defined (QT_NON_COMMERCIAL) bool previewMode = MainWindow::self ? MainWindow::self->isPreviewing() : FALSE; - QWidget *w = (QWidget*)createObject( widget, !previewMode ? (QWidget*)formwindow : MainWindow::self ); + TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self ); if ( !w ) return FALSE; if ( previewMode ) @@ -491,13 +491,13 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) #endif if ( !forwards.isNull() ) { - for ( QDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) + for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) if ( n.tagName() == "forward" ) metaForwards << n.firstChild().toText().data(); } if ( !includes.isNull() ) { - for ( QDomElement n = includes.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) + for ( TQDomElement n = includes.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) if ( n.tagName() == "include" ) { if ( n.tagName() == "include" ) { MetaDataBase::Include inc; @@ -519,7 +519,7 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) } if ( !variables.isNull() ) { - for ( QDomElement n = variables.firstChild().toElement(); !n.isNull(); + for ( TQDomElement n = variables.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "variable" ) { MetaDataBase::Variable v; @@ -532,12 +532,12 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) } } if ( !signals.isNull() ) { - for ( QDomElement n = signals.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) + for ( TQDomElement n = signals.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) if ( n.tagName() == "signal" ) metaSignals << n.firstChild().toText().data(); } if ( !slots.isNull() ) { - for ( QDomElement n = slots.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) + for ( TQDomElement n = slots.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) if ( n.tagName() == "slot" ) { MetaDataBase::Function function; function.specifier = n.attribute( "specifier", "virtual" ); @@ -564,7 +564,7 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) } if ( !functions.isNull() ) { - for ( QDomElement n = functions.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { + for ( TQDomElement n = functions.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "function" ) { MetaDataBase::Function function; function.specifier = n.attribute( "specifier", "virtual" ); @@ -610,7 +610,7 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) MetaDataBase::setForwards( formwindow, metaForwards ); MetaDataBase::setVariables( formwindow, metaVariables ); MetaDataBase::setSignalList( formwindow, metaSignals ); - metaInfo.classNameChanged = metaInfo.className != QString( formwindow->name() ); + metaInfo.classNameChanged = metaInfo.className != TQString( formwindow->name() ); MetaDataBase::setMetaInfo( formwindow, metaInfo ); MetaDataBase::setExportMacro( formwindow->mainContainer(), exportMacro ); } @@ -634,23 +634,23 @@ bool Resource::load( FormFile *ff, QIODevice* dev, Project *defProject ) return TRUE; } -static bool saveCode( const QString &filename, const QString &code ) +static bool saveCode( const TQString &filename, const TQString &code ) { - QFile f( filename ); + TQFile f( filename ); if ( f.open(IO_WriteOnly | IO_Translate) ) { - QTextStream ts( &f ); + TQTextStream ts( &f ); ts << code; return TRUE; } return FALSE; } -bool Resource::save( const QString& filename, bool formCodeOnly ) +bool Resource::save( const TQString& filename, bool formCodeOnly ) { if ( !formwindow || filename.isEmpty() ) return FALSE; if (!langIface) { - QString lang = "Qt Script"; + TQString lang = "Qt Script"; if ( mainwindow ) lang = mainwindow->currProject()->language(); langIface = MetaDataBase::languageInterface( lang ); @@ -662,10 +662,10 @@ bool Resource::save( const QString& filename, bool formCodeOnly ) return TRUE; bool breakout = FALSE; FormFile *ff = formwindow->formFile(); - QString codeFile = ff->project()->makeAbsolute( ff->codeFile() ); - QString filter = langIface->fileFilterList().join("\n"); + TQString codeFile = ff->project()->makeAbsolute( ff->codeFile() ); + TQString filter = langIface->fileFilterList().join("\n"); while ( !breakout ) { - QString fn = KFileDialog::getSaveFileName( codeFile, filter ); + TQString fn = KFileDialog::getSaveFileName( codeFile, filter ); breakout = fn.isEmpty(); if ( !breakout ) { if ( saveCode(fn, ff->code()) ) @@ -675,7 +675,7 @@ bool Resource::save( const QString& filename, bool formCodeOnly ) } currFileName = filename; - QFile f( filename ); + TQFile f( filename ); if ( !f.open( IO_WriteOnly | IO_Translate ) ) return FALSE; bool b = save( &f ); @@ -683,13 +683,13 @@ bool Resource::save( const QString& filename, bool formCodeOnly ) return b; } -bool Resource::save( QIODevice* dev ) +bool Resource::save( TQIODevice* dev ) { if ( !formwindow ) return FALSE; if ( !langIface ) { - QString lang = "C++"; + TQString lang = "C++"; if ( mainwindow ) lang = mainwindow->currProject()->language(); langIface = MetaDataBase::languageInterface( lang ); @@ -697,19 +697,19 @@ bool Resource::save( QIODevice* dev ) langIface->addRef(); } - QTextStream ts( dev ); - ts.setCodec( QTextCodec::codecForName( "UTF-8" ) ); + TQTextStream ts( dev ); + ts.setCodec( TQTextCodec::codecForName( "UTF-8" ) ); ts << "" << endl; saveMetaInfoBefore( ts, 0 ); saveObject( formwindow->mainContainer(), 0, ts, 0 ); - if ( ::qt_cast(formwindow->mainContainer()) ) { - saveMenuBar( (QMainWindow*)formwindow->mainContainer(), ts, 0 ); - saveToolBars( (QMainWindow*)formwindow->mainContainer(), ts, 0 ); + if ( ::qt_cast(formwindow->mainContainer()) ) { + saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); + saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); - if ( ::qt_cast(formwindow->mainContainer()) ) + if ( ::qt_cast(formwindow->mainContainer()) ) saveActions( formwindow->actionList(), ts, 0 ); if ( !images.isEmpty() ) saveImageCollection( ts, 0 ); @@ -726,20 +726,20 @@ bool Resource::save( QIODevice* dev ) return ok; } -QString Resource::copy() +TQString Resource::copy() { if ( !formwindow ) - return QString::null; + return TQString::null; copying = TRUE; - QString s; - QTextOStream ts( &s ); + TQString s; + TQTextOStream ts( &s ); ts << "" << endl; - QWidgetList widgets = formwindow->selectedWidgets(); - QWidgetList tmp( widgets ); - for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { - QWidget *p = w->parentWidget(); + TQWidgetList widgets = formwindow->selectedWidgets(); + TQWidgetList tmp( widgets ); + for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { + TQWidget *p = w->parentWidget(); bool save = TRUE; while ( p ) { if ( tmp.findRef( p ) != -1 ) { @@ -761,26 +761,26 @@ QString Resource::copy() } -void Resource::paste( const QString &cb, QWidget *parent ) +void Resource::paste( const TQString &cb, TQWidget *parent ) { if ( !formwindow ) return; mainContainerSet = TRUE; pasting = TRUE; - QDomDocument doc; - QString errMsg; + TQDomDocument doc; + TQString errMsg; int errLine; doc.setContent( cb, &errMsg, &errLine ); - QDomElement firstWidget = doc.firstChild().toElement().firstChild().toElement(); + TQDomElement firstWidget = doc.firstChild().toElement().firstChild().toElement(); - QDomElement imageCollection = firstWidget; + TQDomElement imageCollection = firstWidget; images.clear(); while ( imageCollection.tagName() != "images" && !imageCollection.isNull() ) imageCollection = imageCollection.nextSibling().toElement(); - QDomElement customWidgets = firstWidget; + TQDomElement customWidgets = firstWidget; while ( customWidgets.tagName() != "customwidgets" && !customWidgets.isNull() ) customWidgets = customWidgets.nextSibling().toElement(); @@ -789,13 +789,13 @@ void Resource::paste( const QString &cb, QWidget *parent ) if ( !customWidgets.isNull() ) loadCustomWidgets( customWidgets, this ); - QWidgetList widgets; + TQWidgetList widgets; formwindow->clearSelection( FALSE ); formwindow->setPropertyShowingBlocked( TRUE ); formwindow->clearSelection( FALSE ); while ( !firstWidget.isNull() ) { if ( firstWidget.tagName() == "widget" ) { - QWidget *w = (QWidget*)createObject( firstWidget, parent, 0 ); + TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 ); if ( !w ) continue; widgets.append( w ); @@ -809,7 +809,7 @@ void Resource::paste( const QString &cb, QWidget *parent ) w->move( x, y ); formwindow->selectWidget( w ); } else if ( firstWidget.tagName() == "spacer" ) { - QWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); + TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); if ( !w ) continue; widgets.append( w ); @@ -832,31 +832,31 @@ void Resource::paste( const QString &cb, QWidget *parent ) formwindow->commandHistory()->addCommand( cmd ); } -void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream &ts, int indent ) +void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent ) { - if ( obj && obj->isWidgetType() && ( (QWidget*)obj )->isHidden() ) + if ( obj && obj->isWidgetType() && ( (TQWidget*)obj )->isHidden() ) return; - QString closeTag; + TQString closeTag; const char* className = WidgetFactory::classNameOf( obj ); int classID = WidgetDatabase::idFromClassName( className ); bool isPlugin = WidgetDatabase::isCustomPluginWidget( classID ); if ( obj->isWidgetType() ) { if ( obj->isA("CustomWidget") || isPlugin ) { - usedCustomWidgets << QString( className ); + usedCustomWidgets << TQString( className ); includeHints << WidgetDatabase::includeFile( classID ); } - if ( obj != formwindow && !formwindow->widgets()->find( (QWidget*)obj ) ) + if ( obj != formwindow && !formwindow->widgets()->find( (TQWidget*)obj ) ) return; // we don't know anything about this thing - QString attributes; + TQString attributes; if ( grid ) { - QDesignerGridLayout::Item item = grid->items[ (QWidget*)obj ]; - attributes += QString(" row=\"") + QString::number(item.row) + "\""; - attributes += QString(" column=\"") + QString::number(item.column) + "\""; + QDesignerGridLayout::Item item = grid->items[ (TQWidget*)obj ]; + attributes += TQString(" row=\"") + TQString::number(item.row) + "\""; + attributes += TQString(" column=\"") + TQString::number(item.column) + "\""; if ( item.rowspan * item.colspan != 1 ) { - attributes += QString(" rowspan=\"") + QString::number(item.rowspan) + "\""; - attributes += QString(" colspan=\"") + QString::number(item.colspan) + "\""; + attributes += TQString(" rowspan=\"") + TQString::number(item.rowspan) + "\""; + attributes += TQString(" colspan=\"") + TQString::number(item.colspan) + "\""; } } @@ -879,16 +879,16 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream QDesignerWidgetStack* ws = 0; - if ( ::qt_cast(obj) ) { - QTabWidget* tw = (QTabWidget*) obj; - QObjectList* tmpl = tw->queryList( "QWidgetStack" ); - QWidgetStack *ws = (QWidgetStack*)tmpl->first(); - QTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar(); + if ( ::qt_cast(obj) ) { + TQTabWidget* tw = (TQTabWidget*) obj; + TQObjectList* tmpl = tw->queryList( "TQWidgetStack" ); + TQWidgetStack *ws = (TQWidgetStack*)tmpl->first(); + TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar(); for ( int i = 0; i < tb->count(); ++i ) { - QTab *t = tb->tabAt( i ); + TQTab *t = tb->tabAt( i ); if ( !t ) continue; - QWidget *w = ws->widget( t->identifier() ); + TQWidget *w = ws->widget( t->identifier() ); if ( !w ) continue; if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ) == -1 ) @@ -913,7 +913,7 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream delete tmpl; } else if ( (ws = ::qt_cast(obj)) != 0 ) { for ( int i = 0; i < ws->count(); ++i ) { - QWidget *w = ws->page( i ); + TQWidget *w = ws->page( i ); if ( !w ) continue; if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) @@ -927,17 +927,17 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream ts << makeIndent( indent ) << "" << endl; ts << makeIndent( indent ) << "" << endl; indent++; - ts << makeIndent( indent ) << "" << QString::number(i) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number(i) << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "" << endl; } - } else if ( ::qt_cast(obj) ) { - QToolBox* tb = (QToolBox*)obj; + } else if ( ::qt_cast(obj) ) { + TQToolBox* tb = (TQToolBox*)obj; for ( int i = 0; i < tb->count(); ++i ) { - QWidget *w = tb->item( i ); + TQWidget *w = tb->item( i ); if ( !w ) continue; if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) @@ -951,7 +951,7 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream ts << makeIndent( indent ) << "" << endl; ts << makeIndent( indent ) << "" << endl; indent++; - saveEnumProperty( w, "backgroundMode", QVariant::Invalid, ts, indent ); + saveEnumProperty( w, "backgroundMode", TQVariant::Invalid, ts, indent ); indent--; ts << makeIndent( indent ) << "" << endl; ts << makeIndent( indent ) << "" << endl; @@ -963,10 +963,10 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream --indent; ts << makeIndent( indent ) << "" << endl; } - } else if ( ::qt_cast(obj) ) { - QWizard* wiz = (QWizard*)obj; + } else if ( ::qt_cast(obj) ) { + TQWizard* wiz = (TQWizard*)obj; for ( int i = 0; i < wiz->pageCount(); ++i ) { - QWidget *w = wiz->page( i ); + TQWidget *w = wiz->page( i ); if ( !w ) continue; if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) @@ -988,8 +988,8 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream --indent; ts << makeIndent( indent ) << "" << endl; } - } else if ( ::qt_cast(obj) ) { - saveChildrenOf( ( (QMainWindow*)obj )->centralWidget(), ts, indent ); + } else if ( ::qt_cast(obj) ) { + saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent ); } else { bool saved = FALSE; #ifdef QT_CONTAINER_CUSTOM_WIDGETS @@ -1001,11 +1001,11 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 ); if ( iface2 ) { if ( iface2->supportsPages( className ) ) { - QWidgetList containers = iface2->pages( className, (QWidget*)obj ); + TQWidgetList containers = iface2->pages( className, (TQWidget*)obj ); if ( !containers.isEmpty() ) { saved = TRUE; int i = 0; - for ( QWidget *w = containers.first(); w; w = containers.next(), ++i ) { + for ( TQWidget *w = containers.first(); w; w = containers.next(), ++i ) { if ( WidgetDatabase:: idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 ) continue; // we don't know this widget @@ -1022,7 +1022,7 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream ts << makeIndent( indent ) << "" << endl; indent++; ts << makeIndent( indent ) << "" - << entitize( iface2->pageLabel( className, (QWidget*)obj, i ) ) + << entitize( iface2->pageLabel( className, (TQWidget*)obj, i ) ) << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; @@ -1033,7 +1033,7 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream } } else { saved = TRUE; - QWidget *w = iface2->containerOfWidget( className, (QWidget*)obj ); + TQWidget *w = iface2->containerOfWidget( className, (TQWidget*)obj ); if ( obj != w ) { ts << makeIndent( indent ) << "className = className; cw->includeFile = WidgetDatabase::includeFile( classID ); - QStrList lst = w->metaObject()->signalNames( TRUE ); - for ( QPtrListIterator it(lst); it.current(); ++it ) + TQStrList lst = w->metaObject()->signalNames( TRUE ); + for ( TQPtrListIterator it(lst); it.current(); ++it ) cw->lstSignals.append(it.current()); int i; int total = w->metaObject()->numProperties( TRUE ); for ( i = 0; i < total; i++ ) { - const QMetaProperty *p = w->metaObject()->property( i, TRUE ); + const TQMetaProperty *p = w->metaObject()->property( i, TRUE ); if ( p->designable(w) ) { MetaDataBase::Property prop; prop.property = p->name(); - QString pType = p->type(); + TQString pType = p->type(); // *sigh* designer types are not normal types // Handle most cases, the ones it misses are // probably too difficult to deal with anyway... @@ -1121,56 +1121,56 @@ void Resource::saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream ts << closeTag; } -void Resource::saveItems( QObject *obj, QTextStream &ts, int indent ) +void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) { - if ( ::qt_cast(obj) || ::qt_cast(obj) ) { - QListBox *lb = 0; - if ( ::qt_cast(obj) ) - lb = (QListBox*)obj; + if ( ::qt_cast(obj) || ::qt_cast(obj) ) { + TQListBox *lb = 0; + if ( ::qt_cast(obj) ) + lb = (TQListBox*)obj; else - lb = ( (QComboBox*)obj )->listBox(); + lb = ( (TQComboBox*)obj )->listBox(); - QListBoxItem *i = lb->firstItem(); + TQListBoxItem *i = lb->firstItem(); for ( ; i; i = i->next() ) { ts << makeIndent( indent ) << "" << endl; indent++; - QStringList text; + TQStringList text; text << i->text(); - QPtrList pixmaps; + TQPtrList pixmaps; if ( i->pixmap() ) pixmaps.append( i->pixmap() ); saveItem( text, pixmaps, ts, indent ); indent--; ts << makeIndent( indent ) << "" << endl; } - } else if ( ::qt_cast(obj) ) { - QIconView *iv = (QIconView*)obj; + } else if ( ::qt_cast(obj) ) { + TQIconView *iv = (TQIconView*)obj; - QIconViewItem *i = iv->firstItem(); + TQIconViewItem *i = iv->firstItem(); for ( ; i; i = i->nextItem() ) { ts << makeIndent( indent ) << "" << endl; indent++; - QStringList text; + TQStringList text; text << i->text(); - QPtrList pixmaps; + TQPtrList pixmaps; if ( i->pixmap() ) pixmaps.append( i->pixmap() ); saveItem( text, pixmaps, ts, indent ); indent--; ts << makeIndent( indent ) << "" << endl; } - } else if ( ::qt_cast(obj) ) { - QListView *lv = (QListView*)obj; + } else if ( ::qt_cast(obj) ) { + TQListView *lv = (TQListView*)obj; int i; for ( i = 0; i < lv->header()->count(); ++i ) { ts << makeIndent( indent ) << "" << endl; indent++; - QStringList l; + TQStringList l; l << lv->header()->label( i ); - QPtrList pix; + TQPtrList pix; pix.setAutoDelete( TRUE ); if ( lv->header()->iconSet( i ) ) - pix.append( new QPixmap( lv->header()->iconSet( i )->pixmap() ) ); + pix.append( new TQPixmap( lv->header()->iconSet( i )->pixmap() ) ); saveItem( l, pix, ts, indent ); ts << makeIndent( indent ) << "" << endl; indent++; @@ -1188,12 +1188,12 @@ void Resource::saveItems( QObject *obj, QTextStream &ts, int indent ) saveItem( lv->firstChild(), ts, indent - 1 ); } #if !defined (QT_NO_TABLE) - else if ( ::qt_cast(obj) ) { - QTable *table = (QTable*)obj; + else if ( ::qt_cast(obj) ) { + TQTable *table = (TQTable*)obj; int i; - QMap columnFields = MetaDataBase::columnFields( table ); + TQMap columnFields = MetaDataBase::columnFields( table ); # ifndef QT_NO_SQL - bool isDataTable = ::qt_cast(table); + bool isDataTable = ::qt_cast(table); # else bool isDataTable = false; # endif @@ -1204,12 +1204,12 @@ void Resource::saveItems( QObject *obj, QTextStream &ts, int indent ) isDataTable ) { ts << makeIndent( indent ) << "" << endl; indent++; - QStringList l; + TQStringList l; l << table->horizontalHeader()->label( i ); - QPtrList pix; + TQPtrList pix; pix.setAutoDelete( TRUE ); if ( table->horizontalHeader()->iconSet( i ) ) - pix.append( new QPixmap( table->horizontalHeader()->iconSet( i )->pixmap() ) ); + pix.append( new TQPixmap( table->horizontalHeader()->iconSet( i )->pixmap() ) ); saveItem( l, pix, ts, indent ); if ( isDataTable && !columnFields.isEmpty() ) { ts << makeIndent( indent ) << "" << endl; @@ -1228,12 +1228,12 @@ void Resource::saveItems( QObject *obj, QTextStream &ts, int indent ) table->verticalHeader()->iconSet( i ) ) { ts << makeIndent( indent ) << "" << endl; indent++; - QStringList l; + TQStringList l; l << table->verticalHeader()->label( i ); - QPtrList pix; + TQPtrList pix; pix.setAutoDelete( TRUE ); if ( table->verticalHeader()->iconSet( i ) ) - pix.append( new QPixmap( table->verticalHeader()->iconSet( i )->pixmap() ) ); + pix.append( new TQPixmap( table->verticalHeader()->iconSet( i )->pixmap() ) ); saveItem( l, pix, ts, indent ); indent--; ts << makeIndent( indent ) << "" << endl; @@ -1243,15 +1243,15 @@ void Resource::saveItems( QObject *obj, QTextStream &ts, int indent ) #endif } -void Resource::saveItem( QListViewItem *i, QTextStream &ts, int indent ) +void Resource::saveItem( TQListViewItem *i, TQTextStream &ts, int indent ) { - QListView *lv = i->listView(); + TQListView *lv = i->listView(); while ( i ) { ts << makeIndent( indent ) << "" << endl; indent++; - QPtrList pixmaps; - QStringList textes; + TQPtrList pixmaps; + TQStringList textes; for ( int c = 0; c < lv->columns(); ++c ) { pixmaps.append( i->pixmap( c ) ); textes << i->text( c ); @@ -1267,7 +1267,7 @@ void Resource::saveItem( QListViewItem *i, QTextStream &ts, int indent ) } } -void Resource::savePixmap( const QPixmap &p, QTextStream &ts, int indent, const QString &tagname ) +void Resource::savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, const TQString &tagname ) { if ( p.isNull() ) { ts << makeIndent( indent ) << "<" << tagname << ">" << endl; @@ -1284,18 +1284,18 @@ void Resource::savePixmap( const QPixmap &p, QTextStream &ts, int indent, const << "" << endl; } -QPixmap Resource::loadPixmap( const QDomElement &e, const QString &/*tagname*/ ) +TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname*/ ) { - QString arg = e.firstChild().toText().data(); + TQString arg = e.firstChild().toText().data(); if ( formwindow && formwindow->savePixmapInline() ) { - QImage img = loadFromCollection( arg ); - QPixmap pix; + TQImage img = loadFromCollection( arg ); + TQPixmap pix; pix.convertFromImage( img ); MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } else if ( formwindow && formwindow->savePixmapInProject() ) { - QPixmap pix; + TQPixmap pix; if ( mainwindow && mainwindow->currProject() ) { pix = mainwindow->currProject()->pixmapCollection()->pixmap( arg ); } else { @@ -1307,18 +1307,18 @@ QPixmap Resource::loadPixmap( const QDomElement &e, const QString &/*tagname*/ ) MetaDataBase::setPixmapKey( formwindow, pix.serialNumber(), arg ); return pix; } - QPixmap pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ); + TQPixmap pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ); // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that pix.convertFromImage( pix.convertToImage() ); MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } -void Resource::saveItem( const QStringList &text, - const QPtrList &pixmaps, QTextStream &ts, +void Resource::saveItem( const TQStringList &text, + const TQPtrList &pixmaps, TQTextStream &ts, int indent ) { - QStringList::ConstIterator it = text.begin(); + TQStringList::ConstIterator it = text.begin(); for ( ; it != text.end(); ++it ) { ts << makeIndent( indent ) << "" << endl; indent++; @@ -1328,33 +1328,33 @@ void Resource::saveItem( const QStringList &text, } for ( int i = 0; i < (int)pixmaps.count(); ++i ) { - QPixmap *p = ( (QPtrList)pixmaps ).at( i ); + TQPixmap *p = ( (TQPtrList)pixmaps ).at( i ); ts << makeIndent( indent ) << "" << endl; indent++; if ( p ) savePixmap( *p, ts, indent ); else - savePixmap( QPixmap(), ts, indent ); + savePixmap( TQPixmap(), ts, indent ); indent--; ts << makeIndent( indent ) << "" << endl; } } -void Resource::saveChildrenOf( QObject* obj, QTextStream &ts, int indent ) +void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) { - const QObjectList *l = obj->children(); + const TQObjectList *l = obj->children(); if ( !l ) return; // no children to save - QString closeTag; + TQString closeTag; // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer - QLayout *layout = 0; + TQLayout *layout = 0; QDesignerGridLayout* grid = 0; - if ( !::qt_cast(obj) && + if ( !::qt_cast(obj) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && - WidgetFactory::layoutType( (QWidget*)obj, layout ) != WidgetFactory::NoLayout ) { - WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (QWidget*)obj, layout ); + WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) { + WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout ); switch ( lay ) { case WidgetFactory::HBox: closeTag = makeIndent( indent ) + ""; @@ -1382,9 +1382,9 @@ void Resource::saveChildrenOf( QObject* obj, QTextStream &ts, int indent ) } - QObject *o = 0; - for ( QPtrListIterator it ( *l ); ( o = it.current() ); ++it ) - if ( !QString( o->name() ).startsWith( "qt_dead_widget_" ) ) + TQObject *o = 0; + for ( TQPtrListIterator it ( *l ); ( o = it.current() ); ++it ) + if ( !TQString( o->name() ).startsWith( "qt_dead_widget_" ) ) saveObject( o, grid, ts, indent ); if ( !closeTag.isEmpty() ) { indent--; @@ -1392,10 +1392,10 @@ void Resource::saveChildrenOf( QObject* obj, QTextStream &ts, int indent ) } } -void Resource::saveObjectProperties( QObject *w, QTextStream &ts, int indent ) +void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) { - QStringList saved; - QStringList changed; + TQStringList saved; + TQStringList changed; changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( ::qt_cast(w) ) { @@ -1404,18 +1404,18 @@ void Resource::saveObjectProperties( QObject *w, QTextStream &ts, int indent ) if ( !changed.contains( "geometry" ) ) changed << "geometry"; } else { - QToolButton *tb = ::qt_cast(w); + TQToolButton *tb = ::qt_cast(w); if ( tb && !tb->iconSet().isNull() ) { changed << "iconSet"; } } - } else if ( ::qt_cast(w) ) { - if ( MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)w ) ) ) > -1 ) + } else if ( ::qt_cast(w) ) { + if ( MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ) > -1 ) changed << "spacing"; - if ( MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)w ) ) ) > -1 ) + if ( MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ) > -1 ) changed << "margin"; - if ( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)w ) ) ) != "Auto" - && !MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)w ) ) ).isEmpty() ) + if ( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ) != "Auto" + && !MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ).isEmpty() ) changed << "resizeMode"; } @@ -1429,22 +1429,22 @@ void Resource::saveObjectProperties( QObject *w, QTextStream &ts, int indent ) if ( changed.isEmpty() ) return; - bool inLayout = w != formwindow->mainContainer() && !copying && w->isWidgetType() && ( (QWidget*)w )->parentWidget() && - WidgetFactory::layoutType( ( (QWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; + bool inLayout = w != formwindow->mainContainer() && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && + WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; - QStrList lst = w->metaObject()->propertyNames( !::qt_cast(w) ); - for ( QPtrListIterator it( lst ); it.current(); ++it ) { - if ( changed.find( QString::fromLatin1( it.current() ) ) == changed.end() ) + TQStrList lst = w->metaObject()->propertyNames( !::qt_cast(w) ); + for ( TQPtrListIterator it( lst ); it.current(); ++it ) { + if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() ) continue; - if ( saved.find( QString::fromLatin1( it.current() ) ) != saved.end() ) + if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() ) continue; - saved << QString::fromLatin1( it.current() ); - const QMetaProperty* p = w->metaObject()-> + 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 ( ::qt_cast(w) && qstrcmp( p->name(), "pixmap" ) == 0 && - ( !( (QLabel*)w )->pixmap() || ( (QLabel*)w )->pixmap()->isNull() ) ) + if ( ::qt_cast(w) && qstrcmp( p->name(), "pixmap" ) == 0 && + ( !( (TQLabel*)w )->pixmap() || ( (TQLabel*)w )->pixmap()->isNull() ) ) continue; if ( ::qt_cast(w) && ( qstrcmp( p->name(), "itemName" ) == 0 || qstrcmp( p->name(), "itemNumber" ) == 0 || @@ -1460,22 +1460,22 @@ void Resource::saveObjectProperties( QObject *w, QTextStream &ts, int indent ) ts << " stdset=\"0\""; ts << ">" << endl; indent++; - if ( strcmp( it.current(), "resizeMode" ) == 0 && ::qt_cast(w) ) { - saveProperty( w, it.current(), "", QVariant::String, ts, indent ); + if ( strcmp( it.current(), "resizeMode" ) == 0 && ::qt_cast(w) ) { + saveProperty( w, it.current(), "", TQVariant::String, ts, indent ); } else if ( p->isSetType() ) { - saveSetProperty( w, it.current(), QVariant::nameToType( p->type() ), ts, indent ); + saveSetProperty( w, it.current(), TQVariant::nameToType( p->type() ), ts, indent ); } else if ( p->isEnumType() ) { - saveEnumProperty( w, it.current(), QVariant::nameToType( p->type() ), ts, indent ); + saveEnumProperty( w, it.current(), TQVariant::nameToType( p->type() ), ts, indent ); } else { - saveProperty( w, it.current(), w->property( p->name() ), QVariant::nameToType( p->type() ), ts, indent ); + saveProperty( w, it.current(), w->property( p->name() ), TQVariant::nameToType( p->type() ), ts, indent ); } indent--; ts << makeIndent( indent ) << "" << endl; } if ( w->isWidgetType() && MetaDataBase::fakeProperties( w ) ) { - QMap* fakeProperties = MetaDataBase::fakeProperties( w ); - for ( QMap::Iterator fake = fakeProperties->begin(); + TQMap* fakeProperties = MetaDataBase::fakeProperties( w ); + for ( TQMap::Iterator fake = fakeProperties->begin(); fake != fakeProperties->end(); ++fake ) { if ( MetaDataBase::isPropertyChanged( w, fake.key() ) ) { if ( w->inherits("CustomWidget") ) { @@ -1494,11 +1494,11 @@ void Resource::saveObjectProperties( QObject *w, QTextStream &ts, int indent ) } } -void Resource::saveSetProperty( QObject *w, const QString &name, QVariant::Type, QTextStream &ts, int indent ) +void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const QMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE ); - QStrList l( p->valueToKeys( w->property( name ).toInt() ) ); - QString v; + 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 ) { v += l.at( i ); if ( i < l.count() - 1 ) @@ -1507,13 +1507,13 @@ void Resource::saveSetProperty( QObject *w, const QString &name, QVariant::Type, ts << makeIndent( indent ) << "" << v << "" << endl; } -void Resource::saveEnumProperty( QObject *w, const QString &name, QVariant::Type, QTextStream &ts, int indent ) +void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const QMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE ); ts << makeIndent( indent ) << "" << p->valueToKey( w->property( name ).toInt() ) << "" << endl; } -void Resource::saveProperty( QObject *w, const QString &name, const QVariant &value, QVariant::Type t, QTextStream &ts, int indent ) +void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent ) { if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "layoutMargin" || name =="layoutSpacing" ) @@ -1521,13 +1521,13 @@ void Resource::saveProperty( QObject *w, const QString &name, const QVariant &va int num; uint unum; double dob; - QString comment; - if ( w && formwindow->widgets()->find( (QWidget*)w ) || formwindow->actionList().find( (QAction*)w ) ) + TQString comment; + if ( w && formwindow->widgets()->find( (TQWidget*)w ) || formwindow->actionList().find( (TQAction*)w ) ) comment = MetaDataBase::propertyComment( w, name ); switch ( t ) { - case QVariant::String: + case TQVariant::String: if ( name == "resizeMode" ) { - QString resmod = MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)w ) ) ); + TQString resmod = MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); if ( !resmod.isNull() && resmod != "Auto" ) { ts << makeIndent( indent ) << ""; ts << resmod; @@ -1540,100 +1540,100 @@ void Resource::saveProperty( QObject *w, const QString &name, const QVariant &va ts << makeIndent( indent ) << "" << entitize( comment ) << "" << endl; } break; - case QVariant::CString: + case TQVariant::CString: ts << makeIndent( indent ) << "" << entitize( value.toCString() ).latin1() << "" << endl; break; - case QVariant::Bool: + case TQVariant::Bool: ts << makeIndent( indent ) << "" << mkBool( value.toBool() ) << "" << endl; break; - case QVariant::Int: - if ( ::qt_cast(w) ) { + case TQVariant::Int: + if ( ::qt_cast(w) ) { num = -1; if ( name == "spacing" ) - num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)w ) ) ); + num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)w ) ) ); + num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); if ( num != -1 ) - ts << makeIndent( indent ) << "" << QString::number( num ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( num ) << "" << endl; } else { num = value.toInt(); - ts << makeIndent( indent ) << "" << QString::number( num ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( num ) << "" << endl; } break; - case QVariant::Double: + case TQVariant::Double: dob = value.toDouble(); - ts << makeIndent( indent ) << "" << QString::number( dob ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( dob ) << "" << endl; break; - case QVariant::KeySequence: + case TQVariant::KeySequence: ts << makeIndent( indent ) << "" << entitize(platformNeutralKeySequence(value.toKeySequence())) << "" << endl; break; - case QVariant::UInt: + case TQVariant::UInt: unum = value.toUInt(); - ts << makeIndent( indent ) << "" << QString::number( unum ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( unum ) << "" << endl; break; - case QVariant::Rect: { - QVariant v( value ); + case TQVariant::Rect: { + TQVariant v( value ); ts << makeIndent( indent ) << "" << endl; indent++; - ts << makeIndent( indent ) << "" << QString::number( v.toRect().x() ) << "" << endl; - ts << makeIndent( indent ) << "" << QString::number( v.toRect().y() ) << "" << endl; - ts << makeIndent( indent ) << "" << QString::number( v.toRect().width() ) << "" << endl; - ts << makeIndent( indent ) << "" << QString::number( v.toRect().height() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( v.toRect().x() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( v.toRect().y() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( v.toRect().width() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( v.toRect().height() ) << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; } break; - case QVariant::Point: { - QVariant v( value ); + case TQVariant::Point: { + TQVariant v( value ); ts << makeIndent( indent ) << "" << endl; indent++; - ts << makeIndent( indent ) << "" << QString::number( v.toPoint().x() ) << "" << endl; - ts << makeIndent( indent ) << "" << QString::number( v.toPoint().y() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( v.toPoint().x() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( v.toPoint().y() ) << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; } break; - case QVariant::Size: { - QVariant v( value ); + case TQVariant::Size: { + TQVariant v( value ); ts << makeIndent( indent ) << "" << endl; indent++; - ts << makeIndent( indent ) << "" << QString::number( v.toSize().width() ) << "" << endl; - ts << makeIndent( indent ) << "" << QString::number( v.toSize().height() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( v.toSize().width() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( v.toSize().height() ) << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; } break; - case QVariant::Color: { - QVariant v( value ); + case TQVariant::Color: { + TQVariant v( value ); ts << makeIndent( indent ) << "" << endl; indent++; saveColor( ts, indent, v.toColor() ); indent--; ts << makeIndent( indent ) << "" << endl; } break; - case QVariant::Font: { - QVariant v( value ); + case TQVariant::Font: { + TQVariant v( value ); ts << makeIndent( indent ) << "" << endl; - QFont f( qApp->font() ); - if ( w && w->isWidgetType() && ((QWidget*)w)->parentWidget() ) - f = ((QWidget*)w)->parentWidget()->font(); - QFont f2( v.toFont() ); + TQFont f( qApp->font() ); + if ( w && w->isWidgetType() && ((TQWidget*)w)->parentWidget() ) + f = ((TQWidget*)w)->parentWidget()->font(); + TQFont f2( v.toFont() ); indent++; if ( f.family() != f2.family() ) ts << makeIndent( indent ) << "" << f2.family() << "" << endl; if ( f.pointSize() != f2.pointSize() ) - ts << makeIndent( indent ) << "" << QString::number( f2.pointSize() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( f2.pointSize() ) << "" << endl; if ( f.bold() != f2.bold() ) - ts << makeIndent( indent ) << "" << QString::number( (int)f2.bold() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( (int)f2.bold() ) << "" << endl; if ( f.italic() != f2.italic() ) - ts << makeIndent( indent ) << "" << QString::number( (int)f2.italic() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( (int)f2.italic() ) << "" << endl; if ( f.underline() != f2.underline() ) - ts << makeIndent( indent ) << "" << QString::number( (int)f2.underline() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( (int)f2.underline() ) << "" << endl; if ( f.strikeOut() != f2.strikeOut() ) - ts << makeIndent( indent ) << "" << QString::number( (int)f2.strikeOut() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( (int)f2.strikeOut() ) << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; } break; - case QVariant::SizePolicy: { - QSizePolicy sp( value.toSizePolicy() ); + case TQVariant::SizePolicy: { + TQSizePolicy sp( value.toSizePolicy() ); ts << makeIndent( indent ) << "" << endl; indent++; ts << makeIndent( indent ) << "" << (int)sp.horData() << "" << endl; @@ -1644,17 +1644,17 @@ void Resource::saveProperty( QObject *w, const QString &name, const QVariant &va ts << makeIndent( indent ) << "" << endl; break; } - case QVariant::Pixmap: + case TQVariant::Pixmap: savePixmap( value.toPixmap(), ts, indent ); break; - case QVariant::IconSet: + case TQVariant::IconSet: savePixmap( value.toIconSet().pixmap(), ts, indent, "iconset" ); break; - case QVariant::Image: + case TQVariant::Image: ts << makeIndent( indent ) << "" << saveInCollection( value.toImage() ) << "" << endl; break; - case QVariant::Palette: { - QPalette p( value.toPalette() ); + case TQVariant::Palette: { + TQPalette p( value.toPalette() ); ts << makeIndent( indent ) << "" << endl; indent++; @@ -1679,11 +1679,11 @@ void Resource::saveProperty( QObject *w, const QString &name, const QVariant &va indent--; ts << makeIndent( indent ) << "" << endl; } break; - case QVariant::Cursor: + case TQVariant::Cursor: ts << makeIndent( indent ) << "" << value.toCursor().shape() << "" << endl; break; - case QVariant::StringList: { - QStringList lst = value.toStringList(); + case TQVariant::StringList: { + TQStringList lst = value.toStringList(); uint i = 0; ts << makeIndent( indent ) << "" << endl; indent++; @@ -1694,8 +1694,8 @@ void Resource::saveProperty( QObject *w, const QString &name, const QVariant &va indent--; ts << makeIndent( indent ) << "" << endl; } break; - case QVariant::Date: { - QDate d = value.toDate(); + case TQVariant::Date: { + TQDate d = value.toDate(); ts << makeIndent( indent ) << "" << endl; indent++; ts << makeIndent( indent ) << "" << d.year() << "" << endl; @@ -1705,8 +1705,8 @@ void Resource::saveProperty( QObject *w, const QString &name, const QVariant &va ts << makeIndent( indent ) << "" << endl; break; } - case QVariant::Time: { - QTime t = value.toTime(); + case TQVariant::Time: { + TQTime t = value.toTime(); ts << makeIndent( indent ) << "" << endl; break; } - case QVariant::DateTime: { - QDateTime dt = value.toDateTime(); + case TQVariant::DateTime: { + TQDateTime dt = value.toDateTime(); ts << makeIndent( indent ) << "" << endl; indent++; ts << makeIndent( indent ) << "" << dt.date().year() << "" << endl; @@ -1735,33 +1735,33 @@ void Resource::saveProperty( QObject *w, const QString &name, const QVariant &va } } -void Resource::saveColorGroup( QTextStream &ts, int indent, const QColorGroup &cg ) +void Resource::saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup &cg ) { - for( int r = 0 ; r < QColorGroup::NColorRoles ; r++ ) { + for( int r = 0 ; r < TQColorGroup::NColorRoles ; r++ ) { ts << makeIndent( indent ) << "" << endl; indent++; - saveColor( ts, indent, cg.color( (QColorGroup::ColorRole)r ) ); + saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) ); indent--; ts << makeIndent( indent ) << "" << endl; - QPixmap* pm = cg.brush( (QColorGroup::ColorRole)r ).pixmap(); + TQPixmap* pm = cg.brush( (TQColorGroup::ColorRole)r ).pixmap(); if ( pm && !pm->isNull() ) savePixmap( *pm, ts, indent ); } } -void Resource::saveColor( QTextStream &ts, int indent, const QColor &c ) +void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c ) { - ts << makeIndent( indent ) << "" << QString::number( c.red() ) << "" << endl; - ts << makeIndent( indent ) << "" << QString::number( c.green() ) << "" << endl; - ts << makeIndent( indent ) << "" << QString::number( c.blue() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( c.red() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( c.green() ) << "" << endl; + ts << makeIndent( indent ) << "" << TQString::number( c.blue() ) << "" << endl; } -QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout* layout ) +TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout ) { lastItem = 0; - QDomElement n = e.firstChild().toElement(); - QWidget *w = 0; // the widget that got created - QObject *obj = 0; // gets the properties + TQDomElement n = e.firstChild().toElement(); + TQWidget *w = 0; // the widget that got created + TQObject *obj = 0; // gets the properties int row = e.attribute( "row" ).toInt(); int col = e.attribute( "column" ).toInt(); @@ -1772,9 +1772,9 @@ QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout* if ( colspan < 1 ) colspan = 1; - QString className = e.attribute( "class", "QWidget" ); + TQString className = e.attribute( "class", "TQWidget" ); #ifdef QT_CONTAINER_CUSTOM_WIDGETS - QString parentClassName = WidgetFactory::classNameOf( parent ); + TQString parentClassName = WidgetFactory::classNameOf( parent ); bool isPlugin = WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) ); if ( isPlugin ) @@ -1784,7 +1784,7 @@ QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout* if ( !className.isNull() ) { obj = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE ); if ( !obj ) { - QMessageBox::critical( MainWindow::self, i18n( "Loading File" ), + TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ), i18n( "Error loading %1.\n" "The widget %2 could not be created." ). arg( currFileName ).arg( className ) ); @@ -1792,19 +1792,19 @@ QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout* } if ( !mainContainerSet ) { if ( formwindow ) - formwindow->setMainContainer( (QWidget*)obj ); + formwindow->setMainContainer( (TQWidget*)obj ); mainContainerSet = TRUE; } - w = (QWidget*)obj; - if ( ::qt_cast(w) ) - w = ( (QMainWindow*)w )->centralWidget(); + w = (TQWidget*)obj; + if ( ::qt_cast(w) ) + w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch ( WidgetFactory::layoutType( layout ) ) { case WidgetFactory::HBox: - ( (QHBoxLayout*)layout )->addWidget( w ); + ( (TQHBoxLayout*)layout )->addWidget( w ); break; case WidgetFactory::VBox: - ( (QVBoxLayout*)layout )->addWidget( w ); + ( (TQVBoxLayout*)layout )->addWidget( w ); break; case WidgetFactory::Grid: ( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1, @@ -1821,20 +1821,20 @@ QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout* if ( w && formwindow ) { if ( !parent || - ( !::qt_cast(parent) && - !::qt_cast(parent) && - !::qt_cast(parent) && - !::qt_cast(parent) + ( !::qt_cast(parent) && + !::qt_cast(parent) && + !::qt_cast(parent) && + !::qt_cast(parent) #ifdef QT_CONTAINER_CUSTOM_WIDGETS && !isPlugin #endif ) ) formwindow->insertWidget( w, pasting ); else if ( parent && - ( ::qt_cast(parent) || - ::qt_cast(parent) || - ::qt_cast(parent) || - ::qt_cast(parent) + ( ::qt_cast(parent) || + ::qt_cast(parent) || + ::qt_cast(parent) || + ::qt_cast(parent) #ifdef QT_CONTAINER_CUSTOM_WIDGETS || isPlugin #endif @@ -1843,8 +1843,8 @@ QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout* } } - QDomElement sizePolicyElement; - QObject *sizePolicyObject = 0; + TQDomElement sizePolicyElement; + TQObject *sizePolicyObject = 0; while ( !n.isNull() ) { if ( n.tagName() == "spacer" ) { @@ -1875,20 +1875,20 @@ QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout* setObjectProperty( obj, n.attribute( "name" ), n.firstChild().toElement() ); } } else if ( n.tagName() == "attribute" && w ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); - if ( ::qt_cast(parent) ) { + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); + if ( ::qt_cast(parent) ) { if ( attrib == "title" ) - ( (QTabWidget*)parent )->insertTab( w, v.toString() ); - } else if ( ::qt_cast(parent) ) { + ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); + } else if ( ::qt_cast(parent) ) { if ( attrib == "id" ) ( (QDesignerWidgetStack*)parent )->insertPage( w, v.toInt() ); - } else if ( ::qt_cast(parent) ) { + } else if ( ::qt_cast(parent) ) { if ( attrib == "label" ) - ( (QToolBox*)parent )->addItem( w, v.toString() ); - } else if ( ::qt_cast(parent) ) { + ( (TQToolBox*)parent )->addItem( w, v.toString() ); + } else if ( ::qt_cast(parent) ) { if ( attrib == "title" ) - ( (QWizard*)parent )->addPage( w, v.toString() ); + ( (TQWizard*)parent )->addPage( w, v.toString() ); #ifdef QT_CONTAINER_CUSTOM_WIDGETS } else if ( isPlugin ) { if ( attrib == "label" ) { @@ -1899,7 +1899,7 @@ QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout* iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 ); if ( iface2 ) { iface2->insertPage( parentClassName, - (QWidget*)parent, v.toString(), -1, w ); + (TQWidget*)parent, v.toString(), -1, w ); iface2->release(); } iface->release(); @@ -1929,22 +1929,22 @@ QObject *Resource::createObject( const QDomElement &e, QWidget *parent, QLayout* return w; } -void Resource::createColumn( const QDomElement &e, QWidget *widget ) +void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) { if ( !widget ) return; - if ( ::qt_cast(widget) && e.tagName() == "column" ) { - QListView *lv = (QListView*)widget; - QDomElement n = e.firstChild().toElement(); - QPixmap pix; + if ( ::qt_cast(widget) && e.tagName() == "column" ) { + TQListView *lv = (TQListView*)widget; + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; bool hasPixmap = FALSE; - QString txt; + TQString txt; bool clickable = TRUE, resizable = TRUE; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) txt = v.toString(); else if ( attrib == "pixmap" ) { @@ -1968,24 +1968,24 @@ void Resource::createColumn( const QDomElement &e, QWidget *widget ) lv->header()->setResizeEnabled( resizable, i ); } #ifndef QT_NO_TABLE - else if ( ::qt_cast(widget) ) { - QTable *table = (QTable*)widget; + else if ( ::qt_cast(widget) ) { + TQTable *table = (TQTable*)widget; bool isRow; if ( ( isRow = e.tagName() == "row" ) ) table->setNumRows( table->numRows() + 1 ); else table->setNumCols( table->numCols() + 1 ); - QDomElement n = e.firstChild().toElement(); - QPixmap pix; + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; bool hasPixmap = FALSE; - QString txt; - QString field; - QMap fieldMap = MetaDataBase::columnFields( table ); + TQString txt; + TQString field; + TQMap fieldMap = MetaDataBase::columnFields( table ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) txt = v.toString(); else if ( attrib == "pixmap" ) { @@ -1999,7 +1999,7 @@ void Resource::createColumn( const QDomElement &e, QWidget *widget ) } int i = isRow ? table->numRows() - 1 : table->numCols() - 1; - QHeader *h = !isRow ? table->horizontalHeader() : table->verticalHeader(); + TQHeader *h = !isRow ? table->horizontalHeader() : table->verticalHeader(); if ( hasPixmap ) h->setLabel( i, pix, txt ); else @@ -2011,14 +2011,14 @@ void Resource::createColumn( const QDomElement &e, QWidget *widget ) #endif } -void Resource::loadItem( const QDomElement &e, QPixmap &pix, QString &txt, bool &hasPixmap ) +void Resource::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap ) { - QDomElement n = e; + TQDomElement n = e; hasPixmap = FALSE; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) txt = v.toString(); else if ( attrib == "pixmap" ) { @@ -2030,59 +2030,59 @@ void Resource::loadItem( const QDomElement &e, QPixmap &pix, QString &txt, bool } } -void Resource::createItem( const QDomElement &e, QWidget *widget, QListViewItem *i ) +void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ), widget ) ) return; - if ( ::qt_cast(widget) || ::qt_cast(widget) ) { - QDomElement n = e.firstChild().toElement(); - QPixmap pix; + if ( ::qt_cast(widget) || ::qt_cast(widget) ) { + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; bool hasPixmap = FALSE; - QString txt; + TQString txt; loadItem( n, pix, txt, hasPixmap ); - QListBox *lb = 0; - if ( ::qt_cast(widget) ) - lb = (QListBox*)widget; + TQListBox *lb = 0; + if ( ::qt_cast(widget) ) + lb = (TQListBox*)widget; else - lb = ( (QComboBox*)widget)->listBox(); + lb = ( (TQComboBox*)widget)->listBox(); if ( hasPixmap ) { - new QListBoxPixmap( lb, pix, txt ); + new TQListBoxPixmap( lb, pix, txt ); } else { - new QListBoxText( lb, txt ); + new TQListBoxText( lb, txt ); } - } else if ( ::qt_cast(widget) ) { - QDomElement n = e.firstChild().toElement(); - QPixmap pix; + } else if ( ::qt_cast(widget) ) { + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; bool hasPixmap = FALSE; - QString txt; + TQString txt; loadItem( n, pix, txt, hasPixmap ); - QIconView *iv = (QIconView*)widget; + TQIconView *iv = (TQIconView*)widget; if ( hasPixmap ) - new QIconViewItem( iv, txt, pix ); + new TQIconViewItem( iv, txt, pix ); else - new QIconViewItem( iv, txt ); - } else if ( ::qt_cast(widget) ) { - QDomElement n = e.firstChild().toElement(); - QPixmap pix; - QValueList pixmaps; - QStringList textes; - QListViewItem *item = 0; - QListView *lv = (QListView*)widget; + new TQIconViewItem( iv, txt ); + } else if ( ::qt_cast(widget) ) { + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; + TQValueList pixmaps; + TQStringList textes; + TQListViewItem *item = 0; + TQListView *lv = (TQListView*)widget; if ( i ) - item = new QListViewItem( i, lastItem ); + item = new TQListViewItem( i, lastItem ); else - item = new QListViewItem( lv, lastItem ); + item = new TQListViewItem( lv, lastItem ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) textes << v.toString(); else if ( attrib == "pixmap" ) { - QString s = v.toString(); + TQString s = v.toString(); if ( s.isEmpty() ) { - pixmaps << QPixmap(); + pixmaps << TQPixmap(); } else { pix = loadPixmap( n.firstChild().toElement() ); pixmaps << pix; @@ -2104,9 +2104,9 @@ void Resource::createItem( const QDomElement &e, QWidget *widget, QListViewItem } } -QWidget *Resource::createSpacer( const QDomElement &e, QWidget *parent, QLayout *layout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); int col = e.attribute( "column" ).toInt(); int rowspan = e.attribute( "rowspan" ).toInt(); @@ -2129,8 +2129,8 @@ QWidget *Resource::createSpacer( const QDomElement &e, QWidget *parent, QLayout if ( formwindow ) formwindow->insertWidget( spacer, pasting ); if ( layout ) { - if ( ::qt_cast(layout) ) - ( (QBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() ); + if ( ::qt_cast(layout) ) + ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() ); else ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, spacer->alignment() ); @@ -2141,11 +2141,11 @@ QWidget *Resource::createSpacer( const QDomElement &e, QWidget *parent, QLayout /*! Attention: this function has to be in sync with Uic::setObjectProperty(). If you change one, change both. */ -void Resource::setObjectProperty( QObject* obj, const QString &prop, const QDomElement &e ) +void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const QMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, TRUE ), TRUE ); + const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, TRUE ), TRUE ); - if ( !::qt_cast(obj) ) {// no layouts in metadatabase... (RS) + if ( !::qt_cast(obj) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget(); if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" ) @@ -2154,16 +2154,16 @@ void Resource::setObjectProperty( QObject* obj, const QString &prop, const QDomE MetaDataBase::setPropertyChanged( obj, prop, TRUE ); } - QVariant defVarient; + TQVariant defVarient; if ( e.tagName() == "font" ) { - QFont f( qApp->font() ); - if ( obj->isWidgetType() && ( (QWidget*)obj )->parentWidget() ) - f = ( (QWidget*)obj )->parentWidget()->font(); - defVarient = QVariant( f ); + TQFont f( qApp->font() ); + if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() ) + f = ( (TQWidget*)obj )->parentWidget()->font(); + defVarient = TQVariant( f ); } - QString comment; - QVariant v( DomTool::elementToVariant( e, defVarient, comment ) ); + TQString comment; + TQVariant v( DomTool::elementToVariant( e, defVarient, comment ) ); if ( !comment.isEmpty() ) { MetaDataBase::addEntry( obj ); @@ -2171,24 +2171,24 @@ void Resource::setObjectProperty( QObject* obj, const QString &prop, const QDomE } if ( e.tagName() == "pixmap" ) { - QPixmap pix = loadPixmap( e ); + TQPixmap pix = loadPixmap( e ); if ( pix.isNull() ) return; - v = QVariant( pix ); + v = TQVariant( pix ); } else if ( e.tagName() == "iconset" ) { - QPixmap pix = loadPixmap( e, "iconset" ); + TQPixmap pix = loadPixmap( e, "iconset" ); if ( pix.isNull() ) return; - v = QVariant( QIconSet( pix ) ); + v = TQVariant( TQIconSet( pix ) ); } else if ( e.tagName() == "image" ) { - v = QVariant( loadFromCollection( v.toString() ) ); + v = TQVariant( loadFromCollection( v.toString() ) ); } if ( !p ) { MetaDataBase::setFakeProperty( obj, prop, v ); if ( obj->isWidgetType() ) { if ( prop == "database" && obj != toplevel ) { - QStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList(); + TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList(); if ( lst.count() > 2 ) dbControls.insert( obj->name(), lst[ 2 ] ); else if ( lst.count() == 2 ) @@ -2199,10 +2199,10 @@ void Resource::setObjectProperty( QObject* obj, const QString &prop, const QDomE } if ( e.tagName() == "palette" ) { - QDomElement n = e.firstChild().toElement(); - QPalette p; + TQDomElement n = e.firstChild().toElement(); + TQPalette p; while ( !n.isNull() ) { - QColorGroup cg; + TQColorGroup cg; if ( n.tagName() == "active" ) { cg = loadColorGroup( n ); p.setActive( cg ); @@ -2215,25 +2215,25 @@ void Resource::setObjectProperty( QObject* obj, const QString &prop, const QDomE } n = n.nextSibling().toElement(); } - v = QPalette( p ); + v = TQPalette( p ); } else if ( e.tagName() == "enum" && p && p->isEnumType() && prop != "resizeMode" ) { - QString key( v.toString() ); + TQString key( v.toString() ); int vi = p->keyToValue( key ); if ( p->valueToKey( vi ) != key ) return; // ignore invalid properties - v = QVariant( vi ); + v = TQVariant( vi ); } else if ( e.tagName() == "set" && p && p->isSetType() ) { - QString keys( v.toString() ); - QStringList lst = QStringList::split( '|', keys ); - QStrList l; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + TQString keys( v.toString() ); + TQStringList lst = TQStringList::split( '|', keys ); + TQStrList l; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) l.append( *it ); - v = QVariant( p->keysToValue( l ) ); + v = TQVariant( p->keysToValue( l ) ); } if ( prop == "caption" ) { - QCString s1 = v.toCString(); - QString s2 = v.toString(); + TQCString s1 = v.toCString(); + TQString s2 = v.toString(); if ( !s2.isEmpty() ) formwindow->setCaption( s2 ); else if ( !s1.isEmpty() ) @@ -2241,7 +2241,7 @@ void Resource::setObjectProperty( QObject* obj, const QString &prop, const QDomE } if ( prop == "icon" ) { formwindow->setIcon( v.toPixmap() ); - QString pmk = MetaDataBase::pixmapKey( formwindow, v.toPixmap().serialNumber() ); + TQString pmk = MetaDataBase::pixmapKey( formwindow, v.toPixmap().serialNumber() ); MetaDataBase::setPixmapKey( formwindow, formwindow->icon()->serialNumber(), pmk ); } @@ -2258,23 +2258,23 @@ void Resource::setObjectProperty( QObject* obj, const QString &prop, const QDomE } } - if ( ::qt_cast(obj) ) { + if ( ::qt_cast(obj) ) { if ( prop == "spacing" ) { - MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)obj ) ), v.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() ); return; } else if ( prop == "margin" ) { - MetaDataBase::setMargin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)obj ) ), v.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() ); return; } else if ( e.tagName() == "enum" && prop == "resizeMode" ) { - MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (QLayout*)obj ) ), v.toString() ); + MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toString() ); return; } } if ( prop == "name" ) { if ( pasting ) { - QString s = v.toString(); - formwindow->unify( (QWidget*)obj, s, TRUE ); + TQString s = v.toString(); + formwindow->unify( (TQWidget*)obj, s, TRUE ); obj->setName( s ); return; } else if ( formwindow && obj == formwindow->mainContainer() ) { @@ -2283,21 +2283,21 @@ void Resource::setObjectProperty( QObject* obj, const QString &prop, const QDomE } if ( prop == "sizePolicy" ) { - QSizePolicy sp = v.toSizePolicy(); - sp.setHeightForWidth( ( (QWidget*)obj )->sizePolicy().hasHeightForWidth() ); + TQSizePolicy sp = v.toSizePolicy(); + sp.setHeightForWidth( ( (TQWidget*)obj )->sizePolicy().hasHeightForWidth() ); } if ( prop == "cursor" ) - MetaDataBase::setCursor( (QWidget*)obj, v.toCursor() ); + MetaDataBase::setCursor( (TQWidget*)obj, v.toCursor() ); obj->setProperty( prop, v ); } -QString Resource::saveInCollection( const QImage &img ) +TQString Resource::saveInCollection( const TQImage &img ) { - QString imgName = "none"; - QValueList::Iterator it = images.begin(); + TQString imgName = "none"; + TQValueList::Iterator it = images.begin(); for ( ; it != images.end(); ++it ) { if ( img == ( *it ).img ) { imgName = ( *it ).name; @@ -2307,7 +2307,7 @@ QString Resource::saveInCollection( const QImage &img ) if ( imgName == "none" ) { Image i; - imgName = "image" + QString::number( images.count() ); + imgName = "image" + TQString::number( images.count() ); i.name = imgName; i.img = img; images.append( i ); @@ -2315,12 +2315,12 @@ QString Resource::saveInCollection( const QImage &img ) return imgName; } -void Resource::saveImageData( const QImage &img, QTextStream &ts, int indent ) +void Resource::saveImageData( const TQImage &img, TQTextStream &ts, int indent ) { - QByteArray ba; - QBuffer buf( ba ); + TQByteArray ba; + TQBuffer buf( ba ); buf.open( IO_WriteOnly | IO_Translate ); - QString format; + TQString format; bool compress = FALSE; if (img.hasAlphaBuffer()) { format = "PNG"; @@ -2328,11 +2328,11 @@ void Resource::saveImageData( const QImage &img, QTextStream &ts, int indent ) format = img.depth() > 1 ? "XPM" : "XBM"; compress = TRUE; } - QImageIO iio( &buf, format ); + TQImageIO iio( &buf, format ); iio.setImage( img ); iio.write(); buf.close(); - QByteArray bazip = ba; + TQByteArray bazip = ba; int i = 0; if (compress) { bazip = qCompress( ba ); @@ -2352,12 +2352,12 @@ void Resource::saveImageData( const QImage &img, QTextStream &ts, int indent ) ts << "" << endl; } -void Resource::saveImageCollection( QTextStream &ts, int indent ) +void Resource::saveImageCollection( TQTextStream &ts, int indent ) { ts << makeIndent( indent ) << "" << endl; indent++; - QValueList::Iterator it = images.begin(); + TQValueList::Iterator it = images.begin(); for ( ; it != images.end(); ++it ) { ts << makeIndent( indent ) << "" << endl; indent++; @@ -2370,10 +2370,10 @@ void Resource::saveImageCollection( QTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << endl; } -static QImage loadImageData( QDomElement &n2 ) +static TQImage loadImageData( TQDomElement &n2 ) { - QImage img; - QString data = n2.firstChild().toText().data(); + TQImage img; + TQString data = n2.firstChild().toText().data(); const int lengthOffset = 4; int baSize = data.length() / 2 + lengthOffset; uchar *ba = new uchar[ baSize ]; @@ -2392,7 +2392,7 @@ static QImage loadImageData( QDomElement &n2 ) r += l - 'a' + 10; ba[ i ] = r; } - QString format = n2.attribute( "format", "PNG" ); + TQString format = n2.attribute( "format", "PNG" ); if ( format == "XPM.GZ" || format == "XBM.GZ" ) { ulong len = n2.attribute( "length" ).toULong(); if ( len < data.length() * 5 ) @@ -2403,7 +2403,7 @@ static QImage loadImageData( QDomElement &n2 ) ba[1] = ( len & 0x00ff0000 ) >> 16; ba[2] = ( len & 0x0000ff00 ) >> 8; ba[3] = ( len & 0x000000ff ); - QByteArray baunzip = qUncompress( ba, baSize ); + TQByteArray baunzip = qUncompress( ba, baSize ); img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')) ); } else { img.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format ); @@ -2412,14 +2412,14 @@ static QImage loadImageData( QDomElement &n2 ) return img; } -void Resource::loadImageCollection( const QDomElement &e ) +void Resource::loadImageCollection( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "image" ) { Image img; img.name = n.attribute( "name" ); - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "data" ) img.img = loadImageData( n2 ); @@ -2431,32 +2431,32 @@ void Resource::loadImageCollection( const QDomElement &e ) } } -QImage Resource::loadFromCollection( const QString &name ) +TQImage Resource::loadFromCollection( const TQString &name ) { - QValueList::Iterator it = images.begin(); + TQValueList::Iterator it = images.begin(); for ( ; it != images.end(); ++it ) { if ( ( *it ).name == name ) return ( *it ).img; } - return QImage(); + return TQImage(); } -void Resource::saveConnections( QTextStream &ts, int indent ) +void Resource::saveConnections( TQTextStream &ts, int indent ) { - QValueList connections = MetaDataBase::connections( formwindow ); + TQValueList connections = MetaDataBase::connections( formwindow ); if ( connections.isEmpty() ) return; ts << makeIndent( indent ) << "" << endl; indent++; - QValueList::Iterator it = connections.begin(); + TQValueList::Iterator it = connections.begin(); for ( ; it != connections.end(); ++it ) { MetaDataBase::Connection conn = *it; - if ( ( knownNames.findIndex( QString( conn.sender->name() ) ) == -1 && + if ( ( knownNames.findIndex( TQString( conn.sender->name() ) ) == -1 && qstrcmp( conn.sender->name(), "this" ) != 0 ) || - ( knownNames.findIndex( QString( conn.receiver->name() ) ) == -1 && + ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; - if ( formwindow->isMainContainer( (QWidget*)(*it).receiver ) && + if ( formwindow->isMainContainer( (TQWidget*)(*it).receiver ) && !MetaDataBase::hasSlot( formwindow, MetaDataBase::normalizeFunction( (*it).slot ).latin1() ) ) continue; @@ -2482,29 +2482,29 @@ void Resource::saveConnections( QTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << endl; } - QString lang = formwindow->project()->language(); + TQString lang = formwindow->project()->language(); indent--; ts << makeIndent( indent ) << "" << endl; } -void Resource::loadConnections( const QDomElement &e ) +void Resource::loadConnections( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "connection" ) { - QString lang = n.attribute( "language", "C++" ); - QDomElement n2 = n.firstChild().toElement(); + TQString lang = n.attribute( "language", "C++" ); + TQDomElement n2 = n.firstChild().toElement(); MetaDataBase::Connection conn; while ( !n2.isNull() ) { if ( n2.tagName() == "sender" ) { conn.sender = 0; - QString name = n2.firstChild().toText().data(); + TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); - QObjectList *l = toplevel->queryList( 0, name, FALSE ); + TQObjectList *l = toplevel->queryList( 0, name, FALSE ); if ( l ) { if ( l->first() ) conn.sender = l->first(); @@ -2518,11 +2518,11 @@ void Resource::loadConnections( const QDomElement &e ) conn.signal = n2.firstChild().toText().data(); } else if ( n2.tagName() == "receiver" ) { conn.receiver = 0; - QString name = n2.firstChild().toText().data(); + TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { conn.receiver = toplevel; } else { - QObjectList *l = toplevel->queryList( 0, name, FALSE ); + TQObjectList *l = toplevel->queryList( 0, name, FALSE ); if ( l ) { if ( l->first() ) conn.receiver = l->first(); @@ -2574,12 +2574,12 @@ void Resource::loadConnections( const QDomElement &e ) } } -void Resource::saveCustomWidgets( QTextStream &ts, int indent ) +void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) { ts << makeIndent( indent ) << "" << endl; indent++; - QPtrList *lst = MetaDataBase::customWidgets(); + TQPtrList *lst = MetaDataBase::customWidgets(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { if ( usedCustomWidgets.findIndex( w->className ) == -1 ) continue; @@ -2606,16 +2606,16 @@ void Resource::saveCustomWidgets( QTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << endl; ts << makeIndent( indent ) << "" << saveInCollection( w->pixmap->convertToImage() ) << "" << endl; if ( !w->lstSignals.isEmpty() ) { - for ( QValueList::Iterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) + for ( TQValueList::Iterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) ts << makeIndent( indent ) << "" << entitize( *it ) << "" << endl; } if ( !w->lstSlots.isEmpty() ) { - for ( QValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) + for ( TQValueList::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) ts << makeIndent( indent ) << "" << entitize( (*it).function ) << "" << endl; } if ( !w->lstProperties.isEmpty() ) { - for ( QValueList::Iterator it = w->lstProperties.begin(); it != w->lstProperties.end(); ++it ) + for ( TQValueList::Iterator it = w->lstProperties.begin(); it != w->lstProperties.end(); ++it ) ts << makeIndent( indent ) << "" << entitize( (*it).property ) << "" << endl; } indent--; @@ -2627,25 +2627,25 @@ void Resource::saveCustomWidgets( QTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << endl; } -void Resource::loadCustomWidgets( const QDomElement &e, Resource *r ) +void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "customwidget" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); MetaDataBase::CustomWidget *w = new MetaDataBase::CustomWidget; while ( !n2.isNull() ) { if ( n2.tagName() == "class" ) { w->className = n2.firstChild().toText().data(); } else if ( n2.tagName() == "header" ) { w->includeFile = n2.firstChild().toText().data(); - QString s = n2.attribute( "location" ); + TQString s = n2.attribute( "location" ); if ( s != "local" ) w->includePolicy = MetaDataBase::CustomWidget::Global; else w->includePolicy = MetaDataBase::CustomWidget::Local; } else if ( n2.tagName() == "sizehint" ) { - QDomElement n3 = n2.firstChild().toElement(); + TQDomElement n3 = n2.firstChild().toElement(); while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() ); @@ -2654,12 +2654,12 @@ void Resource::loadCustomWidgets( const QDomElement &e, Resource *r ) n3 = n3.nextSibling().toElement(); } } else if ( n2.tagName() == "sizepolicy" ) { - QDomElement n3 = n2.firstChild().toElement(); + TQDomElement n3 = n2.firstChild().toElement(); while ( !n3.isNull() ) { if ( n3.tagName() == "hordata" ) - w->sizePolicy.setHorData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + w->sizePolicy.setHorData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "verdata" ) - w->sizePolicy.setVerData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + w->sizePolicy.setVerData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "horstretch" ) w->sizePolicy.setHorStretch( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "verstretch" ) @@ -2667,12 +2667,12 @@ void Resource::loadCustomWidgets( const QDomElement &e, Resource *r ) n3 = n3.nextSibling().toElement(); } } else if ( n2.tagName() == "pixmap" ) { - QPixmap pix; + TQPixmap pix; if ( r ) { pix = r->loadPixmap( n2 ); } else { - QDomElement n3 = n2.firstChild().toElement(); - QImage img; + TQDomElement n3 = n2.firstChild().toElement(); + TQImage img; while ( !n3.isNull() ) { if ( n3.tagName() == "data" ) { img = loadImageData( n3 ); @@ -2681,7 +2681,7 @@ void Resource::loadCustomWidgets( const QDomElement &e, Resource *r ) } pix.convertFromImage( img ); } - w->pixmap = new QPixmap( pix ); + w->pixmap = new TQPixmap( pix ); } else if ( n2.tagName() == "signal" ) { w->lstSignals.append( n2.firstChild().toText().data().latin1() ); } else if ( n2.tagName() == "container" ) { @@ -2706,16 +2706,16 @@ void Resource::loadCustomWidgets( const QDomElement &e, Resource *r ) } } -void Resource::saveTabOrder( QTextStream &ts, int indent ) +void Resource::saveTabOrder( TQTextStream &ts, int indent ) { - QWidgetList l = MetaDataBase::tabOrder( toplevel ); + TQWidgetList l = MetaDataBase::tabOrder( toplevel ); if ( l.isEmpty() ) return; ts << makeIndent( indent ) << "" << endl; indent++; - for ( QWidget *w = l.first(); w; w = l.next() ) { + for ( TQWidget *w = l.first(); w; w = l.next() ) { if ( w->testWState( Qt::WState_ForceHide ) || knownNames.findIndex( w->name() ) == -1 ) continue; ts << makeIndent( indent ) << "" << w->name() << "" << endl; @@ -2725,20 +2725,20 @@ void Resource::saveTabOrder( QTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << endl; } -void Resource::loadTabOrder( const QDomElement &e ) +void Resource::loadTabOrder( const TQDomElement &e ) { - QWidget *last = 0; - QDomElement n = e.firstChild().toElement(); - QWidgetList widgets; + TQWidget *last = 0; + TQDomElement n = e.firstChild().toElement(); + TQWidgetList widgets; while ( !n.isNull() ) { if ( n.tagName() == "tabstop" ) { - QString name = n.firstChild().toText().data(); + TQString name = n.firstChild().toText().data(); if ( name.isEmpty() ) continue; - QObjectList *l = toplevel->queryList( 0, name, FALSE ); + TQObjectList *l = toplevel->queryList( 0, name, FALSE ); if ( l ) { if ( l->first() ) { - QWidget *w = (QWidget*)l->first(); + TQWidget *w = (TQWidget*)l->first(); widgets.append( w ); if ( last ) toplevel->setTabOrder( last, w ); @@ -2754,10 +2754,10 @@ void Resource::loadTabOrder( const QDomElement &e ) MetaDataBase::setTabOrder( toplevel, widgets ); } -void Resource::saveMetaInfoBefore( QTextStream &ts, int indent ) +void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) { MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow ); - QString cn; + TQString cn; if ( info.classNameChanged && !info.className.isEmpty() ) cn = info.className; else @@ -2769,24 +2769,24 @@ void Resource::saveMetaInfoBefore( QTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << entitize( info.author ) << "" << endl; } -void Resource::saveMetaInfoAfter( QTextStream &ts, int indent ) +void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) { MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow ); if ( !langIface || formwindow->project()->isCpp() ) { - QValueList includes = MetaDataBase::includes( formwindow ); - QString extensionInclude; + TQValueList includes = MetaDataBase::includes( formwindow ); + TQString extensionInclude; bool needExtensionInclude = FALSE; if ( langIface && formwindow->formFile()->hasFormCode() && formwindow->formFile()->codeFileState() != FormFile::Deleted ) { - extensionInclude = QFileInfo( currFileName ).fileName() + langIface->formCodeExtension(); + extensionInclude = TQFileInfo( currFileName ).fileName() + langIface->formCodeExtension(); needExtensionInclude = TRUE; } if ( !includes.isEmpty() || needExtensionInclude ) { ts << makeIndent( indent ) << "" << endl; indent++; - for ( QValueList::Iterator it = includes.begin(); it != includes.end(); ++it ) { + for ( TQValueList::Iterator it = includes.begin(); it != includes.end(); ++it ) { ts << makeIndent( indent ) << "" << (*it).header << "" << endl; if ( needExtensionInclude ) @@ -2800,21 +2800,21 @@ void Resource::saveMetaInfoAfter( QTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << endl; } - QStringList forwards = MetaDataBase::forwards( formwindow ); + TQStringList forwards = MetaDataBase::forwards( formwindow ); if ( !forwards.isEmpty() ) { ts << makeIndent( indent ) << "" << endl; indent++; - for ( QStringList::Iterator it2 = forwards.begin(); it2 != forwards.end(); ++it2 ) + for ( TQStringList::Iterator it2 = forwards.begin(); it2 != forwards.end(); ++it2 ) ts << makeIndent( indent ) << "" << entitize( *it2 ) << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; } - QValueList varLst = MetaDataBase::variables( formwindow ); + TQValueList varLst = MetaDataBase::variables( formwindow ); if ( !varLst.isEmpty() ) { ts << makeIndent( indent ) << "" << endl; indent++; - QValueList::Iterator it = varLst.begin(); + TQValueList::Iterator it = varLst.begin(); for ( ; it != varLst.end(); ++it ) { ts << makeIndent( indent ) << "" << endl; } - QStringList sigs = MetaDataBase::signalList( formwindow ); + TQStringList sigs = MetaDataBase::signalList( formwindow ); if ( !sigs.isEmpty() ) { ts << makeIndent( indent ) << "" << endl; indent++; - for ( QStringList::Iterator it3 = sigs.begin(); it3 != sigs.end(); ++it3 ) + for ( TQStringList::Iterator it3 = sigs.begin(); it3 != sigs.end(); ++it3 ) ts << makeIndent( indent ) << "" << entitize( *it3 ) << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; } - QValueList slotList = MetaDataBase::slotList( formwindow ); + TQValueList slotList = MetaDataBase::slotList( formwindow ); if ( !slotList.isEmpty() ) { ts << makeIndent( indent ) << "" << endl; indent++; - QString lang = formwindow->project()->language(); - QValueList::Iterator it = slotList.begin(); + TQString lang = formwindow->project()->language(); + TQValueList::Iterator it = slotList.begin(); for ( ; it != slotList.end(); ++it ) { MetaDataBase::Function function = *it; ts << makeIndent( indent ) << "" << endl; } - QValueList functionList = MetaDataBase::functionList( formwindow, TRUE ); + TQValueList functionList = MetaDataBase::functionList( formwindow, TRUE ); if ( !functionList.isEmpty() ) { ts << makeIndent( indent ) << "" << endl; indent++; - QString lang = formwindow->project()->language(); - QValueList::Iterator it = functionList.begin(); + TQString lang = formwindow->project()->language(); + TQValueList::Iterator it = functionList.begin(); for ( ; it != functionList.end(); ++it ) { MetaDataBase::Function function = *it; ts << makeIndent( indent ) << "layoutDefaultSpacing() << "\" margin=\"" << formwindow->layoutDefaultMargin() << "\"/>" << endl; if ( formwindow->hasLayoutFunctions() ) { - QString s = ""; - QString m = ""; + TQString s = ""; + TQString m = ""; if ( !formwindow->spacingFunction().isEmpty() ) - s = QString( " spacing=\"%1\"" ).arg( formwindow->spacingFunction() ); + s = TQString( " spacing=\"%1\"" ).arg( formwindow->spacingFunction() ); if ( !formwindow->marginFunction().isEmpty() ) - m = QString( " margin=\"%1\"" ).arg( formwindow->marginFunction() ); + m = TQString( " margin=\"%1\"" ).arg( formwindow->marginFunction() ); ts << makeIndent( indent ) << "" << endl; } } } -void Resource::saveIncludeHints( QTextStream &ts, int indent ) +void Resource::saveIncludeHints( TQTextStream &ts, int indent ) { if ( includeHints.isEmpty() ) return; ts << makeIndent( indent ) << "" << endl; indent++; - for ( QStringList::Iterator it = includeHints.begin(); it != includeHints.end(); ++it ) + for ( TQStringList::Iterator it = includeHints.begin(); it != includeHints.end(); ++it ) ts << makeIndent( indent ) << "" << *it << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; } -QColorGroup Resource::loadColorGroup( const QDomElement &e ) +TQColorGroup Resource::loadColorGroup( const TQDomElement &e ) { - QColorGroup cg; + TQColorGroup cg; int r = -1; - QDomElement n = e.firstChild().toElement(); - QColor col; + TQDomElement n = e.firstChild().toElement(); + TQColor col; while ( !n.isNull() ) { if ( n.tagName() == "color" ) { r++; - cg.setColor( (QColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); + cg.setColor( (TQColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); } else if ( n.tagName() == "pixmap" ) { - QPixmap pix = loadPixmap( n ); - cg.setBrush( (QColorGroup::ColorRole)r, QBrush( col, pix ) ); + TQPixmap pix = loadPixmap( n ); + cg.setBrush( (TQColorGroup::ColorRole)r, TQBrush( col, pix ) ); } n = n.nextSibling().toElement(); } return cg; } -void Resource::saveChildActions( QAction *a, QTextStream &ts, int indent ) +void Resource::saveChildActions( TQAction *a, TQTextStream &ts, int indent ) { if ( !a->children() ) return; - QObjectListIt it( *a->children() ); + TQObjectListIt it( *a->children() ); while ( it.current() ) { - QObject *o = it.current(); + TQObject *o = it.current(); ++it; - if ( !::qt_cast(o) ) + if ( !::qt_cast(o) ) continue; - QAction *ac = (QAction*)o; - bool isGroup = ::qt_cast(ac); + TQAction *ac = (TQAction*)o; + bool isGroup = ::qt_cast(ac); if ( isGroup ) ts << makeIndent( indent ) << "" << endl; else @@ -2967,16 +2967,16 @@ void Resource::saveChildActions( QAction *a, QTextStream &ts, int indent ) } } -void Resource::saveActions( const QPtrList &actions, QTextStream &ts, int indent ) +void Resource::saveActions( const TQPtrList &actions, TQTextStream &ts, int indent ) { if ( actions.isEmpty() ) return; ts << makeIndent( indent ) << "" << endl; indent++; - QPtrListIterator it( actions ); + TQPtrListIterator it( actions ); while ( it.current() ) { - QAction *a = it.current(); - bool isGroup = ::qt_cast(a); + TQAction *a = it.current(); + bool isGroup = ::qt_cast(a); if ( isGroup ) ts << makeIndent( indent ) << "" << endl; else @@ -2999,42 +2999,42 @@ void Resource::saveActions( const QPtrList &actions, QTextStream &ts, i ts << makeIndent( indent ) << "" << endl; } -void Resource::loadChildAction( QObject *parent, const QDomElement &e ) +void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) { - QDomElement n = e; - QAction *a = 0; + TQDomElement n = e; + TQAction *a = 0; if ( n.tagName() == "action" ) { a = new QDesignerAction( parent ); MetaDataBase::addEntry( a ); - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { - QDomElement n3(n2); // don't modify n2 - QString prop = n3.attribute( "name" ); + TQDomElement n3(n2); // don't modify n2 + TQString prop = n3.attribute( "name" ); if (prop == "menuText") hasMenuText = TRUE; - QDomElement value(n3.firstChild().toElement()); + TQDomElement value(n3.firstChild().toElement()); setObjectProperty( a, prop, value ); if (!hasMenuText && uiFileVersion < "3.3" && prop == "text") setObjectProperty( a, "menuText", value ); } n2 = n2.nextSibling().toElement(); } - if ( !::qt_cast(parent) ) + if ( !::qt_cast(parent) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new QDesignerActionGroup( parent ); MetaDataBase::addEntry( a ); - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { - QDomElement n3(n2); // don't modify n2 - QString prop = n3.attribute( "name" ); + TQDomElement n3(n2); // don't modify n2 + TQString prop = n3.attribute( "name" ); if (prop == "menuText") hasMenuText = TRUE; - QDomElement value = n3.firstChild().toElement(); + TQDomElement value = n3.firstChild().toElement(); setObjectProperty( a, prop, value ); if (!hasMenuText && uiFileVersion < "3.3" && prop == "text") setObjectProperty( a, "menuText", value ); @@ -3044,14 +3044,14 @@ void Resource::loadChildAction( QObject *parent, const QDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !::qt_cast(parent) ) + if ( !::qt_cast(parent) ) formwindow->actionList().append( a ); } } -void Resource::loadActions( const QDomElement &e ) +void Resource::loadActions( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { loadChildAction( formwindow, n ); @@ -3062,35 +3062,35 @@ void Resource::loadActions( const QDomElement &e ) } } -void Resource::saveToolBars( QMainWindow *mw, QTextStream &ts, int indent ) +void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) { ts << makeIndent( indent ) << "" << endl; indent++; - QPtrList tbList; + TQPtrList tbList; for ( int i = 0; i <= (int)Qt::DockMinimized; ++i ) { tbList = mw->toolBars( (Qt::Dock)i ); if ( tbList.isEmpty() ) continue; - for ( QToolBar *tb = tbList.first(); tb; tb = tbList.next() ) { + for ( TQToolBar *tb = tbList.first(); tb; tb = tbList.next() ) { if ( tb->isHidden() ) continue; ts << makeIndent( indent ) << "" << endl; indent++; saveObjectProperties( tb, ts, indent ); - QPtrList actionList = ( (QDesignerToolBar*)tb )->insertedActions(); - for ( QAction *a = actionList.first(); a; a = actionList.next() ) { + TQPtrList actionList = ( (QDesignerToolBar*)tb )->insertedActions(); + for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( ::qt_cast(a) ) { ts << makeIndent( indent ) << "" << endl; } else { if ( ::qt_cast(a) && !( (QDesignerAction*)a )->supportsMenu() ) { - QWidget *w = ( (QDesignerAction*)a )->widget(); + TQWidget *w = ( (QDesignerAction*)a )->widget(); ts << makeIndent( indent ) << "" << endl; indent++; const char *className = WidgetFactory::classNameOf( w ); if ( w->isA( "CustomWidget" ) ) - usedCustomWidgets << QString( className ); + usedCustomWidgets << TQString( className ); if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) saveItems( w, ts, indent ); saveObjectProperties( w, ts, indent ); @@ -3109,7 +3109,7 @@ void Resource::saveToolBars( QMainWindow *mw, QTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << endl; } -void Resource::saveMenuBar( QMainWindow *mw, QTextStream &ts, int indent ) +void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) { MenuBarEditor *mb = (MenuBarEditor *)mw->child( 0, "MenuBarEditor" ); if ( !mb ) @@ -3138,10 +3138,10 @@ void Resource::saveMenuBar( QMainWindow *mw, QTextStream &ts, int indent ) ts << makeIndent( indent ) << "" << endl; } -void Resource::savePopupMenu( PopupMenuEditor *pm, QMainWindow *mw, QTextStream &ts, int indent ) +void Resource::savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent ) { for ( PopupMenuEditorItem *i = pm->items()->first(); i; i = pm->items()->next() ) { - QAction *a = i->action(); + TQAction *a = i->action(); if ( ::qt_cast(a) ) ts << makeIndent( indent ) << "" << endl; else if ( ::qt_cast(a) ) @@ -3150,7 +3150,7 @@ void Resource::savePopupMenu( PopupMenuEditor *pm, QMainWindow *mw, QTextStream ts << makeIndent( indent ) << "name() << "\"/>" << endl; PopupMenuEditor *s = i->subMenu(); if ( s && s->count() ) { - QString n = s->name(); + TQString n = s->name(); ts << makeIndent( indent ) << "menuText() ) << "\" name=\"" << entitize( n ) << "\" accel=\"" << entitize( a->accel() ) @@ -3163,29 +3163,29 @@ void Resource::savePopupMenu( PopupMenuEditor *pm, QMainWindow *mw, QTextStream } } -void Resource::loadToolBars( const QDomElement &e ) +void Resource::loadToolBars( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); - QMainWindow *mw = ( (QMainWindow*)formwindow->mainContainer() ); + TQDomElement n = e.firstChild().toElement(); + TQMainWindow *mw = ( (TQMainWindow*)formwindow->mainContainer() ); QDesignerToolBar *tb = 0; while ( !n.isNull() ) { if ( n.tagName() == "toolbar" ) { Qt::Dock dock = (Qt::Dock)n.attribute( "dock" ).toInt(); tb = new QDesignerToolBar( mw, dock ); - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { - QAction *a = formwindow->findAction( n2.attribute( "name" ) ); + TQAction *a = formwindow->findAction( n2.attribute( "name" ) ); if ( a ) { a->addTo( tb ); tb->addAction( a ); } } else if ( n2.tagName() == "separator" ) { - QAction *a = new QSeparatorAction( 0 ); + TQAction *a = new QSeparatorAction( 0 ); a->addTo( tb ); tb->addAction( a ); } else if ( n2.tagName() == "widget" ) { - QWidget *w = (QWidget*)createObject( n2, tb ); + TQWidget *w = (TQWidget*)createObject( n2, tb ); QDesignerAction *a = new QDesignerAction( w, tb ); a->addTo( tb ); tb->addAction( a ); @@ -3200,10 +3200,10 @@ void Resource::loadToolBars( const QDomElement &e ) } } -void Resource::loadMenuBar( const QDomElement &e ) +void Resource::loadMenuBar( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); - QMainWindow *mw = (QMainWindow*)formwindow->mainContainer(); + TQDomElement n = e.firstChild().toElement(); + TQMainWindow *mw = (TQMainWindow*)formwindow->mainContainer(); MenuBarEditor *mb = new MenuBarEditor( formwindow, mw ); MetaDataBase::addEntry( mb ); while ( !n.isNull() ) { @@ -3222,11 +3222,11 @@ void Resource::loadMenuBar( const QDomElement &e ) } } -void Resource::loadPopupMenu( PopupMenuEditor *p, const QDomElement &e ) +void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e ) { MetaDataBase::addEntry( p ); - QDomElement n = e.firstChild().toElement(); - QAction *a = 0; + TQDomElement n = e.firstChild().toElement(); + TQAction *a = 0; while ( !n.isNull() ) { if ( n.tagName() == "action" || n.tagName() == "actiongroup") { a = formwindow->findAction( n.attribute( "name" ) ); @@ -3236,7 +3236,7 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const QDomElement &e ) if ( n.tagName() == "item" ) { PopupMenuEditorItem *i = p->at( p->find( a ) ); if ( i ) { - QString name = n.attribute( "name" ); + TQString name = n.attribute( "name" ); formwindow->unify( i, name, TRUE ); i->setName( name ); MetaDataBase::addEntry( i ); @@ -3252,7 +3252,7 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const QDomElement &e ) bool Resource::saveFormCode( FormFile *formfile, LanguageInterface * /*langIface*/ ) { - QString lang = formfile->project()->language(); + TQString lang = formfile->project()->language(); if ( formfile->hasTempFileName() || formfile->code().isEmpty() || !formfile->hasFormCode() || @@ -3262,21 +3262,21 @@ bool Resource::saveFormCode( FormFile *formfile, LanguageInterface * /*langIface formfile->code() ); } -void Resource::loadExtraSource( FormFile *formfile, const QString &currFileName, +void Resource::loadExtraSource( FormFile *formfile, const TQString &currFileName, LanguageInterface *langIface, bool hasFunctions ) { - QString lang = "Qt Script"; + TQString lang = "Qt Script"; if ( MainWindow::self ) lang = MainWindow::self->currProject()->language(); LanguageInterface *iface = langIface; if ( hasFunctions || !iface ) return; - QValueList functions; - QStringList forwards; - QStringList includesImpl; - QStringList includesDecl; - QStringList vars; - QValueList connections; + TQValueList functions; + TQStringList forwards; + TQStringList includesImpl; + TQStringList includesDecl; + TQStringList vars; + TQValueList connections; iface->loadFormCode( formfile->formName(), currFileName + iface->formCodeExtension(), @@ -3284,10 +3284,10 @@ void Resource::loadExtraSource( FormFile *formfile, const QString &currFileName, vars, connections ); - QFile f( formfile->project()->makeAbsolute( formfile->codeFile() ) ); - QString code; + TQFile f( formfile->project()->makeAbsolute( formfile->codeFile() ) ); + TQString code; if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); + TQTextStream ts( &f ); code = ts.read(); } formfile->setCode( code ); @@ -3295,31 +3295,31 @@ void Resource::loadExtraSource( FormFile *formfile, const QString &currFileName, if ( !MainWindow::self || !MainWindow::self->currProject()->isCpp() ) MetaDataBase::setupConnections( formfile, connections ); - for ( QValueList::Iterator fit = functions.begin(); + for ( TQValueList::Iterator fit = functions.begin(); fit != functions.end(); ++fit ) { if ( MetaDataBase::hasFunction( formfile->formWindow() ? - (QObject*)formfile->formWindow() : - (QObject*)formfile, + (TQObject*)formfile->formWindow() : + (TQObject*)formfile, (*fit).name.latin1() ) ) { - QString access = (*fit).access; + TQString access = (*fit).access; if ( !MainWindow::self || !MainWindow::self->currProject()->isCpp() ) MetaDataBase::changeFunction( formfile->formWindow() ? - (QObject*)formfile->formWindow() : - (QObject*)formfile, + (TQObject*)formfile->formWindow() : + (TQObject*)formfile, (*fit).name, (*fit).name, - QString::null ); + TQString::null ); } else { - QString access = (*fit).access; + TQString access = (*fit).access; if ( access.isEmpty() ) access = "protected"; - QString type = "function"; + TQString type = "function"; if ( (*fit).returnType == "void" ) type = "slot"; MetaDataBase::addFunction( formfile->formWindow() ? - (QObject*)formfile->formWindow() : - (QObject*)formfile, + (TQObject*)formfile->formWindow() : + (TQObject*)formfile, (*fit).name.latin1(), "virtual", (*fit).access, type, lang, (*fit).returnType ); } diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h index abf21cc2..aa0cf295 100644 --- a/kdevdesigner/designer/resource.h +++ b/kdevdesigner/designer/resource.h @@ -27,11 +27,11 @@ #ifndef RESOURCE_H #define RESOURCE_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "actiondnd.h" #include "metadatabase.h" @@ -56,8 +56,8 @@ class Resource { public: struct Image { - QImage img; - QString name; + TQImage img; + TQString name; bool operator==( const Image &i ) const { return ( i.name == name && i.img == img ); @@ -69,97 +69,97 @@ public: ~Resource(); void setWidget( FormWindow *w ); - QWidget *widget() const; + TQWidget *widget() const; bool load( FormFile *ff, Project *defProject = 0 ); - bool load( FormFile *ff, QIODevice*, Project *defProject = 0 ); - QString copy(); + bool load( FormFile *ff, TQIODevice*, Project *defProject = 0 ); + TQString copy(); - bool save( const QString& filename, bool formCodeOnly = FALSE); - bool save( QIODevice* ); - void paste( const QString &cb, QWidget *parent ); + bool save( const TQString& filename, bool formCodeOnly = FALSE); + bool save( TQIODevice* ); + void paste( const TQString &cb, TQWidget *parent ); - static void saveImageData( const QImage &img, QTextStream &ts, int indent ); - static void loadCustomWidgets( const QDomElement &e, Resource *r ); - static void loadExtraSource( FormFile *formfile, const QString &currFileName, + static void saveImageData( const TQImage &img, TQTextStream &ts, int indent ); + static void loadCustomWidgets( const TQDomElement &e, Resource *r ); + static void loadExtraSource( FormFile *formfile, const TQString &currFileName, LanguageInterface *langIface, bool hasFunctions ); static bool saveFormCode( FormFile *formfile, LanguageInterface *langIface ); private: - void saveObject( QObject *obj, QDesignerGridLayout* grid, QTextStream &ts, int indent ); - void saveChildrenOf( QObject* obj, QTextStream &ts, int indent ); - void saveObjectProperties( QObject *w, QTextStream &ts, int indent ); - void saveSetProperty( QObject *w, const QString &name, QVariant::Type t, QTextStream &ts, int indent ); - void saveEnumProperty( QObject *w, const QString &name, QVariant::Type t, QTextStream &ts, int indent ); - void saveProperty( QObject *w, const QString &name, const QVariant &value, QVariant::Type t, QTextStream &ts, int indent ); - void saveProperty( const QVariant &value, QTextStream &ts, int indent ); - void saveItems( QObject *obj, QTextStream &ts, int indent ); - void saveItem( const QStringList &text, const QPtrList &pixmaps, QTextStream &ts, int indent ); - void saveItem( QListViewItem *i, QTextStream &ts, int indent ); - void saveConnections( QTextStream &ts, int indent ); - void saveCustomWidgets( QTextStream &ts, int indent ); - void saveTabOrder( QTextStream &ts, int indent ); - void saveColorGroup( QTextStream &ts, int indent, const QColorGroup &cg ); - void saveColor( QTextStream &ts, int indent, const QColor &c ); - void saveMetaInfoBefore( QTextStream &ts, int indent ); - void saveMetaInfoAfter( QTextStream &ts, int indent ); - void saveIncludeHints( QTextStream &ts, int indent ); - void savePixmap( const QPixmap &p, QTextStream &ts, int indent, const QString &tagname = "pixmap" ); - void saveActions( const QPtrList &actions, QTextStream &ts, int indent ); - void saveChildActions( QAction *a, QTextStream &ts, int indent ); - void saveToolBars( QMainWindow *mw, QTextStream &ts, int indent ); - void saveMenuBar( QMainWindow *mw, QTextStream &ts, int indent ); - void savePopupMenu( PopupMenuEditor *pm, QMainWindow *mw, QTextStream &ts, int indent ); - - QObject *createObject( const QDomElement &e, QWidget *parent, QLayout* layout = 0 ); - QWidget *createSpacer( const QDomElement &e, QWidget *parent, QLayout *layout, Qt::Orientation o ); - void createItem( const QDomElement &e, QWidget *widget, QListViewItem *i = 0 ); - void createColumn( const QDomElement &e, QWidget *widget ); - void setObjectProperty( QObject* widget, const QString &prop, const QDomElement &e); - QString saveInCollection( const QImage &img ); - QString saveInCollection( const QPixmap &pix ) { return saveInCollection( pix.convertToImage() ); } - QImage loadFromCollection( const QString &name ); - void saveImageCollection( QTextStream &ts, int indent ); - void loadImageCollection( const QDomElement &e ); - void loadConnections( const QDomElement &e ); - void loadTabOrder( const QDomElement &e ); - void loadItem( const QDomElement &n, QPixmap &pix, QString &txt, bool &hasPixmap ); - void loadActions( const QDomElement &n ); - void loadChildAction( QObject *parent, const QDomElement &e ); - void loadToolBars( const QDomElement &n ); - void loadMenuBar( const QDomElement &n ); - void loadPopupMenu( PopupMenuEditor *pm, const QDomElement &e ); - QColorGroup loadColorGroup( const QDomElement &e ); - QPixmap loadPixmap( const QDomElement &e, const QString &tagname = "pixmap" ); + void saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent ); + void saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ); + void saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ); + void saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type t, TQTextStream &ts, int indent ); + void saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type t, TQTextStream &ts, int indent ); + void saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent ); + void saveProperty( const TQVariant &value, TQTextStream &ts, int indent ); + void saveItems( TQObject *obj, TQTextStream &ts, int indent ); + void saveItem( const TQStringList &text, const TQPtrList &pixmaps, TQTextStream &ts, int indent ); + void saveItem( TQListViewItem *i, TQTextStream &ts, int indent ); + void saveConnections( TQTextStream &ts, int indent ); + void saveCustomWidgets( TQTextStream &ts, int indent ); + void saveTabOrder( TQTextStream &ts, int indent ); + void saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup &cg ); + void saveColor( TQTextStream &ts, int indent, const TQColor &c ); + void saveMetaInfoBefore( TQTextStream &ts, int indent ); + void saveMetaInfoAfter( TQTextStream &ts, int indent ); + void saveIncludeHints( TQTextStream &ts, int indent ); + void savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, const TQString &tagname = "pixmap" ); + void saveActions( const TQPtrList &actions, TQTextStream &ts, int indent ); + void saveChildActions( TQAction *a, TQTextStream &ts, int indent ); + void saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ); + void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ); + void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent ); + + TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ); + void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); + void createColumn( const TQDomElement &e, TQWidget *widget ); + void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); + TQString saveInCollection( const TQImage &img ); + TQString saveInCollection( const TQPixmap &pix ) { return saveInCollection( pix.convertToImage() ); } + TQImage loadFromCollection( const TQString &name ); + void saveImageCollection( TQTextStream &ts, int indent ); + void loadImageCollection( const TQDomElement &e ); + void loadConnections( const TQDomElement &e ); + void loadTabOrder( const TQDomElement &e ); + void loadItem( const TQDomElement &n, TQPixmap &pix, TQString &txt, bool &hasPixmap ); + void loadActions( const TQDomElement &n ); + void loadChildAction( TQObject *parent, const TQDomElement &e ); + void loadToolBars( const TQDomElement &n ); + void loadMenuBar( const TQDomElement &n ); + void loadPopupMenu( PopupMenuEditor *pm, const TQDomElement &e ); + TQColorGroup loadColorGroup( const TQDomElement &e ); + TQPixmap loadPixmap( const TQDomElement &e, const TQString &tagname = "pixmap" ); private: MainWindow *mainwindow; FormWindow *formwindow; - QWidget* toplevel; - QValueList images; + TQWidget* toplevel; + TQValueList images; bool copying, pasting; bool mainContainerSet; - QStringList knownNames; - QStringList usedCustomWidgets; - QListViewItem *lastItem; - - QValueList metaIncludes; - QValueList metaVariables; - QStringList metaForwards; - QStringList metaSignals; + TQStringList knownNames; + TQStringList usedCustomWidgets; + TQListViewItem *lastItem; + + TQValueList metaIncludes; + TQValueList metaVariables; + TQStringList metaForwards; + TQStringList metaSignals; MetaDataBase::MetaInfo metaInfo; - QMap dbControls; - QMap dbTables; - QMap widgets; - QString exportMacro; + TQMap dbControls; + TQMap dbTables; + TQMap widgets; + TQString exportMacro; bool hadGeometry; - QMap > langConnections; - QString currFileName; + TQMap > langConnections; + TQString currFileName; LanguageInterface *langIface; bool hasFunctions; - QStringList includeHints; + TQStringList includeHints; - QString uiFileVersion; + TQString uiFileVersion; }; #endif diff --git a/kdevdesigner/designer/richtextfontdialog.ui.h b/kdevdesigner/designer/richtextfontdialog.ui.h index 8a3dd4c8..d270b7d9 100644 --- a/kdevdesigner/designer/richtextfontdialog.ui.h +++ b/kdevdesigner/designer/richtextfontdialog.ui.h @@ -5,12 +5,12 @@ ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ -#include -#include +#include +#include void RichTextFontDialog::init() { - QFontDatabase *db = new QFontDatabase(); + TQFontDatabase *db = new TQFontDatabase(); fontCombo->insertStringList( db->families() ); } @@ -33,17 +33,17 @@ void RichTextFontDialog::reject() done( Rejected ); } -QString RichTextFontDialog::getSize() +TQString RichTextFontDialog::getSize() { return size; } -QString RichTextFontDialog::getColor() +TQString RichTextFontDialog::getColor() { return color.name(); } -QString RichTextFontDialog::getFont() +TQString RichTextFontDialog::getFont() { return font; } diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp index a63a3404..eef86747 100644 --- a/kdevdesigner/designer/sizehandle.cpp +++ b/kdevdesigner/designer/sizehandle.cpp @@ -24,19 +24,19 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include // HP-UX compiler needs this here #include "sizehandle.h" #include "formwindow.h" #include "widgetfactory.h" -#include -#include -#include +#include +#include +#include #include SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s ) - : QWidget( parent ) + : TQWidget( parent ) { active = TRUE; setBackgroundMode( active ? PaletteText : PaletteDark ); @@ -91,37 +91,37 @@ void SizeHandle::setActive( bool a ) updateCursor(); } -void SizeHandle::setWidget( QWidget *w ) +void SizeHandle::setWidget( TQWidget *w ) { widget = w; } -void SizeHandle::paintEvent( QPaintEvent * ) +void SizeHandle::paintEvent( TQPaintEvent * ) { if ( ( (FormWindow*)parentWidget() )->currentWidget() != widget ) return; - QPainter p( this ); + TQPainter p( this ); p.setPen( blue ); p.drawRect( 0, 0, width(), height() ); } -void SizeHandle::mousePressEvent( QMouseEvent *e ) +void SizeHandle::mousePressEvent( TQMouseEvent *e ) { if ( !widget || e->button() != LeftButton || !active ) return; oldPressPos = e->pos(); - geom = origGeom = QRect( widget->pos(), widget->size() ); + geom = origGeom = TQRect( widget->pos(), widget->size() ); } -void SizeHandle::mouseMoveEvent( QMouseEvent *e ) +void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) { if ( !widget || ( e->state() & LeftButton ) != LeftButton || !active ) return; - QPoint rp = mapFromGlobal( e->globalPos() ); - QPoint d = oldPressPos - rp; + TQPoint rp = mapFromGlobal( e->globalPos() ); + TQPoint d = oldPressPos - rp; oldPressPos = rp; - QPoint checkPos = widget->parentWidget()->mapFromGlobal( e->globalPos() ); - QRect pr = widget->parentWidget()->rect(); + TQPoint checkPos = widget->parentWidget()->mapFromGlobal( e->globalPos() ); + TQRect pr = widget->parentWidget()->rect(); // ##### move code around a bit to reduce duplicated code here switch ( dir ) { @@ -209,13 +209,13 @@ void SizeHandle::mouseMoveEvent( QMouseEvent *e ) } break; } - QPoint p = pos(); + TQPoint p = pos(); sel->updateGeometry(); oldPressPos += ( p - pos() ); formWindow->sizePreview()->setText( i18n( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) ); formWindow->sizePreview()->adjustSize(); - QRect lg( formWindow->mapFromGlobal( e->globalPos() ) + QPoint( 16, 16 ), + TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), formWindow->sizePreview()->size() ); formWindow->checkPreviewGeometry( lg ); formWindow->sizePreview()->setGeometry( lg ); @@ -225,7 +225,7 @@ void SizeHandle::mouseMoveEvent( QMouseEvent *e ) formWindow->updateChildSelections( widget ); } -void SizeHandle::mouseReleaseEvent( QMouseEvent *e ) +void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) { if ( e->button() != LeftButton || !active ) return; @@ -239,7 +239,7 @@ void SizeHandle::mouseReleaseEvent( QMouseEvent *e ) formWindow->emitUpdateProperties( widget ); } -void SizeHandle::trySetGeometry( QWidget *w, int x, int y, int width, int height ) +void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height ) { int minw = QMAX( w->minimumSizeHint().width(), w->minimumSize().width() ); minw = QMAX( minw, 2 * formWindow->grid().x() ); @@ -255,7 +255,7 @@ void SizeHandle::trySetGeometry( QWidget *w, int x, int y, int width, int height w->setGeometry( x, y, QMAX( minw, width ), QMAX( minh, height ) ); } -void SizeHandle::tryResize( QWidget *w, int width, int height ) +void SizeHandle::tryResize( TQWidget *w, int width, int height ) { int minw = QMAX( w->minimumSizeHint().width(), w->minimumSize().width() ); minw = QMAX( minw, 16 ); @@ -266,7 +266,7 @@ void SizeHandle::tryResize( QWidget *w, int width, int height ) // ------------------------------------------------------------------------ -WidgetSelection::WidgetSelection( FormWindow *parent, QPtrDict *selDict ) +WidgetSelection::WidgetSelection( FormWindow *parent, TQPtrDict *selDict ) : selectionDict( selDict ) { formWindow = parent; @@ -276,7 +276,7 @@ WidgetSelection::WidgetSelection( FormWindow *parent, QPtrDict hide(); } -void WidgetSelection::setWidget( QWidget *w, bool updateDict ) +void WidgetSelection::setWidget( TQWidget *w, bool updateDict ) { if ( !w ) { hide(); @@ -311,9 +311,9 @@ void WidgetSelection::updateGeometry() if ( !wid || !wid->parentWidget() ) return; - QPoint p = wid->parentWidget()->mapToGlobal( wid->pos() ); + TQPoint p = wid->parentWidget()->mapToGlobal( wid->pos() ); p = formWindow->mapFromGlobal( p ); - QRect r( p, wid->size() ); + TQRect r( p, wid->size() ); int w = 6; int h = 6; @@ -382,7 +382,7 @@ void WidgetSelection::update() } } -QWidget *WidgetSelection::widget() const +TQWidget *WidgetSelection::widget() const { return wid; } diff --git a/kdevdesigner/designer/sizehandle.h b/kdevdesigner/designer/sizehandle.h index 8d53977c..0603f1b2 100644 --- a/kdevdesigner/designer/sizehandle.h +++ b/kdevdesigner/designer/sizehandle.h @@ -27,9 +27,9 @@ #ifndef SIZEHANDLE_H #define SIZEHANDLE_H -#include -#include -#include +#include +#include +#include class QMouseEvent; class FormWindow; @@ -44,29 +44,29 @@ public: enum Direction { LeftTop, Top, RightTop, Right, RightBottom, Bottom, LeftBottom, Left }; SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s ); - void setWidget( QWidget *w ); + void setWidget( TQWidget *w ); void setActive( bool a ); void updateCursor(); void setEnabled( bool ) {} protected: - void paintEvent( QPaintEvent *e ); - void mousePressEvent( QMouseEvent *e ); - void mouseMoveEvent( QMouseEvent *e ); - void mouseReleaseEvent( QMouseEvent *e ); + void paintEvent( TQPaintEvent *e ); + void mousePressEvent( TQMouseEvent *e ); + void mouseMoveEvent( TQMouseEvent *e ); + void mouseReleaseEvent( TQMouseEvent *e ); private: - void trySetGeometry( QWidget *w, int x, int y, int width, int height ); - void tryResize( QWidget *w, int width, int height ); + void trySetGeometry( TQWidget *w, int x, int y, int width, int height ); + void tryResize( TQWidget *w, int width, int height ); private: - QWidget *widget; + TQWidget *widget; Direction dir; - QPoint oldPressPos; + TQPoint oldPressPos; FormWindow *formWindow; WidgetSelection *sel; - QRect geom, origGeom; + TQRect geom, origGeom; bool active; }; @@ -74,9 +74,9 @@ private: class WidgetSelection { public: - WidgetSelection( FormWindow *parent, QPtrDict *selDict ); + WidgetSelection( FormWindow *parent, TQPtrDict *selDict ); - void setWidget( QWidget *w, bool updateDict = TRUE ); + void setWidget( TQWidget *w, bool updateDict = TRUE ); bool isUsed() const; void updateGeometry(); @@ -84,13 +84,13 @@ public: void show(); void update(); - QWidget *widget() const; + TQWidget *widget() const; protected: - QIntDict handles; - QWidget *wid; + TQIntDict handles; + TQWidget *wid; FormWindow *formWindow; - QPtrDict *selectionDict; + TQPtrDict *selectionDict; }; diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp index f3a035b5..f5915664 100644 --- a/kdevdesigner/designer/sourceeditor.cpp +++ b/kdevdesigner/designer/sourceeditor.cpp @@ -32,22 +32,22 @@ #include "project.h" #include "mainwindow.h" #include "../interfaces/languageinterface.h" -#include +#include #include "project.h" #include "sourcefile.h" #include "hierarchyview.h" -#include -#include +#include +#include #include "kdevdesigner_part.h" -SourceEditor::SourceEditor( QWidget *parent, EditorInterface *iface, LanguageInterface *liface ) - : QVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) +SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ) + : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) { iFace->addRef(); lIface->addRef(); editor = iFace->editor( MainWindow::self->areEditorsReadOnly(), this, MainWindow::self->designerInterface() ); - iFace->onBreakPointChange( MainWindow::self, SLOT( breakPointsChanged() ) ); + iFace->onBreakPointChange( MainWindow::self, TQT_SLOT( breakPointsChanged() ) ); resize( 600, 400 ); setIcon( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) ); } @@ -69,7 +69,7 @@ SourceEditor::~SourceEditor() MainWindow::self->editorClosed( this ); } -void SourceEditor::setObject( QObject *o, Project *p ) +void SourceEditor::setObject( TQObject *o, Project *p ) { if ( sourceFile() ) sourceFile()->setEditor( 0 ); @@ -113,10 +113,10 @@ void SourceEditor::setObject( QObject *o, Project *p ) MainWindow::self->objectHierarchy()->showClasses( this ); } -QString SourceEditor::sourceOfObject( QObject *o, const QString &, +TQString SourceEditor::sourceOfObject( TQObject *o, const TQString &, EditorInterface *, LanguageInterface * ) { - QString txt; + TQString txt; if ( !o ) return txt; if ( ::qt_cast(o) ) @@ -126,17 +126,17 @@ QString SourceEditor::sourceOfObject( QObject *o, const QString &, return txt; } -void SourceEditor::setFunction( const QString &func, const QString &clss ) +void SourceEditor::setFunction( const TQString &func, const TQString &clss ) { iFace->scrollTo( lIface->createFunctionStart( obj->name(), func, "", "" ), clss ); } -void SourceEditor::setClass( const QString &clss ) +void SourceEditor::setClass( const TQString &clss ) { - iFace->scrollTo( clss, QString::null ); + iFace->scrollTo( clss, TQString::null ); } -void SourceEditor::closeEvent( QCloseEvent *e ) +void SourceEditor::closeEvent( TQCloseEvent *e ) { e->accept(); if ( !obj ) @@ -160,12 +160,12 @@ void SourceEditor::save() sourceFile()->setText( iFace->text() ); } -QString SourceEditor::language() const +TQString SourceEditor::language() const { return lang; } -void SourceEditor::setLanguage( const QString &l ) +void SourceEditor::setLanguage( const TQString &l ) { lang = l; } @@ -258,7 +258,7 @@ void SourceEditor::saveBreakPoints() { if ( !obj ) return; - QValueList l; + TQValueList l; iFace->breakPoints( l ); MetaDataBase::setBreakPoints( obj, l ); } @@ -278,7 +278,7 @@ void SourceEditor::resetBreakPoints() iFace->setBreakPoints( MetaDataBase::breakPoints( obj ) ); } -QString SourceEditor::text() const +TQString SourceEditor::text() const { return iFace->text(); } @@ -307,14 +307,14 @@ bool SourceEditor::saveAs() SourceFile *SourceEditor::sourceFile() const { - if ( !::qt_cast((QObject *)obj) ) + if ( !::qt_cast((TQObject *)obj) ) return 0; - return (SourceFile*)(QObject*)obj; + return (SourceFile*)(TQObject*)obj; } FormWindow *SourceEditor::formWindow() const { - if ( !::qt_cast((QObject *)obj) ) + if ( !::qt_cast((TQObject *)obj) ) return 0; - return (FormWindow*)(QObject*)obj; + return (FormWindow*)(TQObject*)obj; } diff --git a/kdevdesigner/designer/sourceeditor.h b/kdevdesigner/designer/sourceeditor.h index a554b80c..4873f5f1 100644 --- a/kdevdesigner/designer/sourceeditor.h +++ b/kdevdesigner/designer/sourceeditor.h @@ -28,8 +28,8 @@ #define SOURCEEDITOR_H #include "../interfaces/editorinterface.h" -#include -#include +#include +#include class FormWindow; class QCloseEvent; @@ -42,23 +42,23 @@ class SourceEditor : public QVBox Q_OBJECT public: - SourceEditor( QWidget *parent, EditorInterface *iface, LanguageInterface *liface ); + SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ); ~SourceEditor(); - void setObject( QObject *fw, Project *p ); - QObject *object() const { return obj; } + void setObject( TQObject *fw, Project *p ); + TQObject *object() const { return obj; } Project *project() const { return pro; } - void setFunction( const QString &func, const QString &clss = QString::null ); - void setClass( const QString &clss ); + void setFunction( const TQString &func, const TQString &clss = TQString::null ); + void setClass( const TQString &clss ); void save(); bool saveAs(); void setModified( bool b ); bool isModified() const; - static QString sourceOfObject( QObject *fw, const QString &lang, EditorInterface *iface, LanguageInterface *lIface ); + static TQString sourceOfObject( TQObject *fw, const TQString &lang, EditorInterface *iface, LanguageInterface *lIface ); - QString language() const; - void setLanguage( const QString &l ); + TQString language() const; + void setLanguage( const TQString &l ); void editCut(); void editCopy(); @@ -82,7 +82,7 @@ public: void clearStackFrame(); void resetBreakPoints(); - QString text() const; + TQString text() const; void checkTimeStamp(); @@ -90,16 +90,16 @@ public: FormWindow *formWindow() const; protected: - void closeEvent( QCloseEvent *e ); + void closeEvent( TQCloseEvent *e ); private: EditorInterface *iFace; LanguageInterface *lIface; - QGuardedPtr obj; + TQGuardedPtr obj; Project *pro; - QString lang; - QGuardedPtr editor; + TQString lang; + TQGuardedPtr editor; }; diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp index 327dc58c..8e103e85 100644 --- a/kdevdesigner/designer/sourcefile.cpp +++ b/kdevdesigner/designer/sourcefile.cpp @@ -25,14 +25,14 @@ **********************************************************************/ #include "sourcefile.h" -#include -#include +#include +#include #include "designerappiface.h" #include "sourceeditor.h" #include "metadatabase.h" #include "../interfaces/languageinterface.h" -#include -#include +#include +#include #include "mainwindow.h" #include "workspace.h" #include @@ -40,7 +40,7 @@ #include #include -SourceFile::SourceFile( const QString &fn, bool temp, Project *p ) +SourceFile::SourceFile( const TQString &fn, bool temp, Project *p ) : filename( fn ), ed( 0 ), fileNameTemp( temp ), timeStamp( 0, p->makeAbsolute( fn ) ), pro( p ), pkg( FALSE ) , accepted( TRUE ) @@ -64,12 +64,12 @@ SourceFile::~SourceFile() delete iface; } -QString SourceFile::text() const +TQString SourceFile::text() const { return txt; } -void SourceFile::setText( const QString &s ) +void SourceFile::setText( const TQString &s ) { txt = s; } @@ -83,29 +83,29 @@ bool SourceFile::save( bool ignoreModified ) if ( ed ) ed->save(); - if ( QFile::exists( pro->makeAbsolute( filename ) ) ) { - QString fn( pro->makeAbsolute( filename ) ); + if ( TQFile::exists( pro->makeAbsolute( filename ) ) ) { + TQString fn( pro->makeAbsolute( filename ) ); #if defined(Q_OS_WIN32) fn += ".bak"; #else fn += "~"; #endif - QFile f( pro->makeAbsolute( filename ) ); + TQFile f( pro->makeAbsolute( filename ) ); if ( f.open( IO_ReadOnly ) ) { - QFile f2( fn ); + TQFile f2( fn ); if ( f2.open( IO_WriteOnly | IO_Translate ) ) { - QCString data( f.size() ); + TQCString data( f.size() ); f.readBlock( data.data(), f.size() ); f2.writeBlock( data ); } } } - QFile f( pro->makeAbsolute( filename ) ); + TQFile f( pro->makeAbsolute( filename ) ); if ( !f.open( IO_WriteOnly | IO_Translate ) ) return saveAs(); - QTextStream ts( &f ); + TQTextStream ts( &f ); ts << txt; timeStamp.update(); setModified( FALSE ); @@ -115,18 +115,18 @@ bool SourceFile::save( bool ignoreModified ) bool SourceFile::saveAs( bool ignoreModified ) { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); - QString filter; + TQString filter; if ( iface ) filter = iface->fileFilterList().join("\n"); - QString old = filename; - QString initFn = pro->makeAbsolute( filename ); + TQString old = filename; + TQString initFn = pro->makeAbsolute( filename ); if ( ignoreModified ) { - QString dir = QStringList::split( ':', project()->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first(); - initFn = QFileInfo( initFn ).fileName(); + TQString dir = TQStringList::split( ':', project()->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first(); + initFn = TQFileInfo( initFn ).fileName(); initFn.prepend( dir + "/" ); } - QString fn = KFileDialog::getSaveFileName( initFn, filter ); + TQString fn = KFileDialog::getSaveFileName( initFn, filter ); if ( fn.isEmpty() ) return FALSE; fileNameTemp = FALSE; @@ -141,7 +141,7 @@ bool SourceFile::saveAs( bool ignoreModified ) ed->setCaption( i18n( "Edit %1" ).arg( filename ) ); setModified( TRUE ); if ( pro->isDummy() ) { - QObject *o = ed->parent(); + TQObject *o = ed->parent(); while ( o && !o->isA( "MainWindow" ) ) o = o->parent(); if ( o ) @@ -152,10 +152,10 @@ bool SourceFile::saveAs( bool ignoreModified ) bool SourceFile::load() { - QFile f( pro->makeAbsolute( filename ) ); + TQFile f( pro->makeAbsolute( filename ) ); if ( !f.open( IO_ReadOnly ) ) return FALSE; - QTextStream ts( &f ); + TQTextStream ts( &f ); txt = ts.read(); timeStamp.update(); return TRUE; @@ -180,13 +180,13 @@ bool SourceFile::isModified() const return ed->isModified(); } -static QMap *extensionCounter; -QString SourceFile::createUnnamedFileName( const QString &extension ) +static TQMap *extensionCounter; +TQString SourceFile::createUnnamedFileName( const TQString &extension ) { if ( !extensionCounter ) - extensionCounter = new QMap; + extensionCounter = new TQMap; int count = -1; - QMap::Iterator it; + TQMap::Iterator it; if ( ( it = extensionCounter->find( extension ) ) != extensionCounter->end() ) { count = *it; ++count; @@ -196,7 +196,7 @@ QString SourceFile::createUnnamedFileName( const QString &extension ) extensionCounter->insert( extension, count ); } - return "unnamed" + QString::number( count ) + "." + extension; + return "unnamed" + TQString::number( count ) + "." + extension; } void SourceFile::setModified( bool m ) @@ -219,7 +219,7 @@ bool SourceFile::closeEvent() if ( ed ) ed->save(); - switch ( QMessageBox::warning( MainWindow::self, i18n( "Save Code" ), + switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Code" ), i18n( "Save changes to '%1'?" ).arg( filename ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save @@ -263,7 +263,7 @@ void SourceFile::checkTimeStamp() if ( timeStamp.isUpToDate() ) return; timeStamp.update(); - if ( QMessageBox::information( MainWindow::self, i18n( "Qt Designer" ), + if ( TQMessageBox::information( MainWindow::self, i18n( "Qt Designer" ), i18n( "File '%1' has been changed outside Qt Designer.\n" "Do you want to reload it?" ).arg( filename ), i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { @@ -277,15 +277,15 @@ bool SourceFile::checkFileName( bool allowBreak ) { SourceFile *sf = pro->findSourceFile( filename, this ); if ( sf ) - QMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), + TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), i18n( "The project already contains a source file with \n" "filename '%1'. Please choose a new filename." ).arg( filename ) ); while ( sf ) { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); - QString filter; + TQString filter; if ( iface ) filter = iface->fileFilterList().join("\n"); - QString fn; + TQString fn; while ( fn.isEmpty() ) { fn = KFileDialog::getSaveFileName( pro->makeAbsolute( filename ), filter ); if ( allowBreak && fn.isEmpty() ) diff --git a/kdevdesigner/designer/sourcefile.h b/kdevdesigner/designer/sourcefile.h index 438d9b4c..79083c83 100644 --- a/kdevdesigner/designer/sourcefile.h +++ b/kdevdesigner/designer/sourcefile.h @@ -27,7 +27,7 @@ #ifndef SOURCEFILE_H #define SOURCEFILE_H -#include +#include #include "timestamp.h" struct DesignerSourceFile; @@ -39,10 +39,10 @@ class SourceFile : public QObject Q_OBJECT public: - SourceFile( const QString &fn, bool temp, Project *p ); + SourceFile( const TQString &fn, bool temp, Project *p ); ~SourceFile(); - void setText( const QString &s ); + void setText( const TQString &s ); void setModified( bool m ); bool save( bool ignoreModified = FALSE ); @@ -52,8 +52,8 @@ public: bool closeEvent(); Project *project() const; - QString text() const; - QString fileName() const { return filename; } + TQString text() const; + TQString fileName() const { return filename; } bool isModified() const; void checkTimeStamp(); @@ -63,7 +63,7 @@ public: void setEditor( SourceEditor *e ); SourceEditor *editor() const { return ed; } - static QString createUnnamedFileName( const QString &extension ); + static TQString createUnnamedFileName( const TQString &extension ); bool isAccepted() const { return accepted; } @@ -71,8 +71,8 @@ private: bool checkFileName( bool allowBreak ); private: - QString filename; - QString txt; + TQString filename; + TQString txt; DesignerSourceFile *iface; SourceEditor *ed; bool fileNameTemp; diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp index e408e8a5..cb4bec53 100644 --- a/kdevdesigner/designer/startdialogimpl.cpp +++ b/kdevdesigner/designer/startdialogimpl.cpp @@ -1,22 +1,22 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "kdevdesigner_part.h" @@ -26,8 +26,8 @@ #include -FileDialog::FileDialog( const QString &dir, QWidget *parent ) - : QFileDialog( dir, QString::null, parent ) +FileDialog::FileDialog( const TQString &dir, TQWidget *parent ) + : TQFileDialog( dir, TQString::null, parent ) { } @@ -37,7 +37,7 @@ void FileDialog::accept() } -StartDialog::StartDialog( QWidget *parent, const QString &templatePath ) +StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath ) : StartDialogBase( parent, 0 ) { newForm = new NewForm( templateView, templatePath ); @@ -45,13 +45,13 @@ StartDialog::StartDialog( QWidget *parent, const QString &templatePath ) initFileOpen(); showInFuture = TRUE; - connect( buttonHelp, SIGNAL( clicked() ), - MainWindow::self, SLOT( showDialogHelp() ) ); - connect( recentView, SIGNAL( doubleClicked(QIconViewItem*) ), - this, SLOT( accept() ) ); - connect( recentView, SIGNAL( returnPressed(QIconViewItem*) ), - this, SLOT( accept() ) ); - connect( fd, SIGNAL( fileSelected() ), this, SLOT( accept() ) ); + connect( buttonHelp, TQT_SIGNAL( clicked() ), + MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( recentView, TQT_SIGNAL( doubleClicked(TQIconViewItem*) ), + this, TQT_SLOT( accept() ) ); + connect( recentView, TQT_SIGNAL( returnPressed(TQIconViewItem*) ), + this, TQT_SLOT( accept() ) ); + connect( fd, TQT_SIGNAL( fileSelected() ), this, TQT_SLOT( accept() ) ); } void StartDialog::accept() @@ -60,7 +60,7 @@ void StartDialog::accept() showInFuture = !checkShowInFuture->isChecked(); // means don't show it anymore int tabindex = tabWidget->currentPageIndex(); - QString filename; + TQString filename; if( !tabindex ) { if ( !templateView->currentItem() ) return; @@ -76,7 +76,7 @@ void StartDialog::accept() } if ( tabindex ) { if ( !filename.isEmpty() ) { - QFileInfo fi( filename ); + TQFileInfo fi( filename ); if ( fi.extension() == "pro" ) MainWindow::self->openProject( filename ); else @@ -92,12 +92,12 @@ void StartDialog::reject() done( Rejected ); } -void StartDialog::recentItemChanged( QIconViewItem *item ) +void StartDialog::recentItemChanged( TQIconViewItem *item ) { - QString msg( recentFiles[item->index()] ); - QFileInfo f( recentFiles[item->index()] ); + TQString msg( recentFiles[item->index()] ); + TQFileInfo f( recentFiles[item->index()] ); uint s = f.size(); - QString unit( "B" ); + TQString unit( "B" ); if( s > 1024 ) { s /= 1024; unit = "KB"; @@ -106,9 +106,9 @@ void StartDialog::recentItemChanged( QIconViewItem *item ) s /= 1024; unit = "MB"; } - QDateTime dt( f.lastModified() ); - QString date( dt.toString( "MMMM dd hh:mm" )); - msg = QString( "%1 (%2 %3) %4" ).arg(msg).arg(s).arg(unit).arg(date); + TQDateTime dt( f.lastModified() ); + TQString date( dt.toString( "MMMM dd hh:mm" )); + msg = TQString( "%1 (%2 %3) %4" ).arg(msg).arg(s).arg(unit).arg(date); fileInfoLabel->setText( msg ); } @@ -117,26 +117,26 @@ void StartDialog::clearFileInfo() fileInfoLabel->clear(); } -void StartDialog::setRecentlyFiles( QStringList &files ) +void StartDialog::setRecentlyFiles( TQStringList &files ) { insertRecentItems( files, FALSE ); } -void StartDialog::setRecentlyProjects( QStringList &projects ) +void StartDialog::setRecentlyProjects( TQStringList &projects ) { insertRecentItems( projects, TRUE ); } -void StartDialog::insertRecentItems( QStringList &files, bool isProject ) +void StartDialog::insertRecentItems( TQStringList &files, bool isProject ) { - QString iconName = "designer_newform.png"; + TQString iconName = "designer_newform.png"; if ( isProject ) iconName = "designer_project.png"; - QIconViewItem *item; - QStringList::iterator it = files.begin(); + TQIconViewItem *item; + TQStringList::iterator it = files.begin(); for( ; it != files.end(); ++it ) { - QFileInfo fi( *it ); - item = new QIconViewItem( recentView, fi.fileName() ); + TQFileInfo fi( *it ); + item = new TQIconViewItem( recentView, fi.fileName() ); recentFiles[recentView->index( item )] = *it; item->setPixmap( BarIcon( iconName, KDevDesignerPartFactory::instance() ) ); item->setDragEnabled( FALSE ); @@ -145,37 +145,37 @@ void StartDialog::insertRecentItems( QStringList &files, bool isProject ) void StartDialog::initFileOpen() { - QString encode = QDir::currentDirPath(); - QUrl::encode( encode ); + TQString encode = TQDir::currentDirPath(); + TQUrl::encode( encode ); fd = new FileDialog( encode, this ); - QPoint point( 0, 0 ); + TQPoint point( 0, 0 ); fd->reparent( tab, point ); - QObjectList *l = fd->queryList( "QPushButton" ); - QObjectListIt it( *l ); - QObject *obj; + TQObjectList *l = fd->queryList( "TQPushButton" ); + TQObjectListIt it( *l ); + TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; - ((QPushButton*)obj)->hide(); + ((TQPushButton*)obj)->hide(); } delete l; fd->setSizeGripEnabled ( FALSE ); tabLayout->addWidget( fd ); - QPluginManager manager( IID_ImportFilter, QApplication::libraryPaths(), + QPluginManager manager( IID_ImportFilter, TQApplication::libraryPaths(), MainWindow::self->pluginDirectory() ); - QStringList filterlist; + TQStringList filterlist; filterlist << i18n( "Designer Files (*.ui *.pro)" ); filterlist << i18n( "Qt User-Interface Files (*.ui)" ); filterlist << i18n( "QMAKE Project Files (*.pro)" ); - QStringList list = manager.featureList(); - for ( QStringList::Iterator it2 = list.begin(); it2 != list.end(); ++it2 ) + TQStringList list = manager.featureList(); + for ( TQStringList::Iterator it2 = list.begin(); it2 != list.end(); ++it2 ) filterlist << *it2; filterlist << i18n( "All Files (*)" ); - QString filters = filterlist.join( ";;" ); + TQString filters = filterlist.join( ";;" ); fd->setFilters( filters ); fd->show(); diff --git a/kdevdesigner/designer/startdialogimpl.h b/kdevdesigner/designer/startdialogimpl.h index b29b5bf1..e17592b3 100644 --- a/kdevdesigner/designer/startdialogimpl.h +++ b/kdevdesigner/designer/startdialogimpl.h @@ -27,12 +27,12 @@ #ifndef STARTDIALOGIMPL_H #define STARTDIALOGIMPL_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "newformimpl.h" #include "startdialog.h" @@ -42,7 +42,7 @@ class FileDialog : public QFileDialog Q_OBJECT public: - FileDialog( const QString &dir, QWidget *parent ); + FileDialog( const TQString &dir, TQWidget *parent ); protected slots: void accept(); @@ -57,23 +57,23 @@ class StartDialog : public StartDialogBase Q_OBJECT public: - StartDialog( QWidget *parent, const QString &templatePath ); - void setRecentlyFiles( QStringList& ); - void setRecentlyProjects( QStringList& ); + StartDialog( TQWidget *parent, const TQString &templatePath ); + void setRecentlyFiles( TQStringList& ); + void setRecentlyProjects( TQStringList& ); bool showDialogInFuture() const { return showInFuture; } protected slots: - void recentItemChanged( QIconViewItem *item ); + void recentItemChanged( TQIconViewItem *item ); void clearFileInfo(); void accept(); void reject(); private: void initFileOpen(); - void insertRecentItems( QStringList &files, bool isProject ); + void insertRecentItems( TQStringList &files, bool isProject ); NewForm *newForm; FileDialog *fd; - QMap recentFiles; + TQMap recentFiles; bool showInFuture; }; diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp index 41389684..45c425b4 100644 --- a/kdevdesigner/designer/styledbutton.cpp +++ b/kdevdesigner/designer/styledbutton.cpp @@ -24,33 +24,33 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include // HP-UX compiler needs this here #include "styledbutton.h" #include "formwindow.h" #include "pixmapchooser.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -StyledButton::StyledButton(QWidget* parent, const char* name) - : QButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE ) +#include +#include +#include +#include +#include +#include +#include +#include +#include + +StyledButton::StyledButton(TQWidget* parent, const char* name) + : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE ) { setMinimumSize( minimumSizeHint() ); setAcceptDrops( TRUE ); - connect( this, SIGNAL(clicked()), SLOT(onEditor())); + connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); setEditor( ColorEditor ); } -StyledButton::StyledButton( const QBrush& b, QWidget* parent, const char* name, WFlags f ) - : QButton( parent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 ) +StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name, WFlags f ) + : TQButton( parent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 ) { col = b.color(); pix = b.pixmap(); @@ -75,17 +75,17 @@ StyledButton::EditorType StyledButton::editor() const return edit; } -void StyledButton::setColor( const QColor& c ) +void StyledButton::setColor( const TQColor& c ) { col = c; update(); } -void StyledButton::setPixmap( const QPixmap & pm ) +void StyledButton::setPixmap( const TQPixmap & pm ) { if ( !pm.isNull() ) { delete pix; - pix = new QPixmap( pm ); + pix = new TQPixmap( pm ); } else { delete pix; pix = 0; @@ -93,12 +93,12 @@ void StyledButton::setPixmap( const QPixmap & pm ) scalePixmap(); } -QColor StyledButton::color() const +TQColor StyledButton::color() const { return col; } -QPixmap* StyledButton::pixmap() const +TQPixmap* StyledButton::pixmap() const { return pix; } @@ -117,14 +117,14 @@ void StyledButton::setScale( bool on ) scalePixmap(); } -QSize StyledButton::sizeHint() const +TQSize StyledButton::sizeHint() const { - return QSize( 50, 25 ); + return TQSize( 50, 25 ); } -QSize StyledButton::minimumSizeHint() const +TQSize StyledButton::minimumSizeHint() const { - return QSize( 50, 25 ); + return TQSize( 50, 25 ); } void StyledButton::scalePixmap() @@ -132,8 +132,8 @@ void StyledButton::scalePixmap() delete spix; if ( pix ) { - spix = new QPixmap( 6*width()/8, 6*height()/8 ); - QImage img = pix->convertToImage(); + spix = new TQPixmap( 6*width()/8, 6*height()/8 ); + TQImage img = pix->convertToImage(); spix->convertFromImage( s? img.smoothScale( 6*width()/8, 6*height()/8 ) : img ); } else { @@ -143,39 +143,39 @@ void StyledButton::scalePixmap() update(); } -void StyledButton::resizeEvent( QResizeEvent* e ) +void StyledButton::resizeEvent( TQResizeEvent* e ) { scalePixmap(); - QButton::resizeEvent( e ); + TQButton::resizeEvent( e ); } -void StyledButton::drawButton( QPainter *paint ) +void StyledButton::drawButton( TQPainter *paint ) { - style().drawPrimitive(QStyle::PE_ButtonBevel, paint, rect(), colorGroup(), - isDown() ? QStyle::Style_Sunken : QStyle::Style_Raised); + style().drawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), + isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised); drawButtonLabel(paint); if (hasFocus()) - style().drawPrimitive(QStyle::PE_FocusRect, paint, - style().subRect(QStyle::SR_PushButtonFocusRect, this), - colorGroup(), QStyle::Style_Default); + style().drawPrimitive(TQStyle::PE_FocusRect, paint, + style().subRect(TQStyle::SR_PushButtonFocusRect, this), + colorGroup(), TQStyle::Style_Default); } -void StyledButton::drawButtonLabel( QPainter *paint ) +void StyledButton::drawButtonLabel( TQPainter *paint ) { - QColor pen = isEnabled() ? + TQColor pen = isEnabled() ? hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText() : palette().disabled().buttonText(); paint->setPen( pen ); if(!isEnabled()) { - paint->setBrush( QBrush( colorGroup().button() ) ); + paint->setBrush( TQBrush( colorGroup().button() ) ); } else if ( edit == PixmapEditor && spix ) { - paint->setBrush( QBrush( col, *spix ) ); + paint->setBrush( TQBrush( col, *spix ) ); paint->setBrushOrigin( width()/8, height()/8 ); } else - paint->setBrush( QBrush( col ) ); + paint->setBrush( TQBrush( col ) ); paint->drawRect( width()/8, height()/8, 6*width()/8, 6*height()/8 ); } @@ -184,18 +184,18 @@ void StyledButton::onEditor() { switch (edit) { case ColorEditor: { - QColor c = QColorDialog::getColor( palette().active().background(), this ); + TQColor c = QColorDialog::getColor( palette().active().background(), this ); if ( c.isValid() ) { setColor( c ); emit changed(); } } break; case PixmapEditor: { - QPixmap p; + TQPixmap p; if ( pixmap() ) p = qChoosePixmap( this, formWindow, *pixmap() ); else - p = qChoosePixmap( this, formWindow, QPixmap() ); + p = qChoosePixmap( this, formWindow, TQPixmap() ); if ( !p.isNull() ) { setPixmap( p ); emit changed(); @@ -206,25 +206,25 @@ void StyledButton::onEditor() } } -void StyledButton::mousePressEvent(QMouseEvent* e) +void StyledButton::mousePressEvent(TQMouseEvent* e) { - QButton::mousePressEvent(e); + TQButton::mousePressEvent(e); mousePressed = TRUE; pressPos = e->pos(); } -void StyledButton::mouseMoveEvent(QMouseEvent* e) +void StyledButton::mouseMoveEvent(TQMouseEvent* e) { - QButton::mouseMoveEvent( e ); + TQButton::mouseMoveEvent( e ); #ifndef QT_NO_DRAGANDDROP if ( !mousePressed ) return; - if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) { + if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) { if ( edit == ColorEditor ) { - QColorDrag *drg = new QColorDrag( col, this ); - QPixmap pix( 25, 25 ); + TQColorDrag *drg = new TQColorDrag( col, this ); + TQPixmap pix( 25, 25 ); pix.fill( col ); - QPainter p( &pix ); + TQPainter p( &pix ); p.drawRect( 0, 0, pix.width(), pix.height() ); p.end(); drg->setPixmap( pix ); @@ -232,8 +232,8 @@ void StyledButton::mouseMoveEvent(QMouseEvent* e) drg->dragCopy(); } else if ( edit == PixmapEditor && pix && !pix->isNull() ) { - QImage img = pix->convertToImage(); - QImageDrag *drg = new QImageDrag( img, this ); + TQImage img = pix->convertToImage(); + TQImageDrag *drg = new TQImageDrag( img, this ); if(spix) drg->setPixmap( *spix ); mousePressed = FALSE; @@ -244,46 +244,46 @@ void StyledButton::mouseMoveEvent(QMouseEvent* e) } #ifndef QT_NO_DRAGANDDROP -void StyledButton::dragEnterEvent( QDragEnterEvent *e ) +void StyledButton::dragEnterEvent( TQDragEnterEvent *e ) { setFocus(); - if ( edit == ColorEditor && QColorDrag::canDecode( e ) ) + if ( edit == ColorEditor && TQColorDrag::canDecode( e ) ) e->accept(); - else if ( edit == PixmapEditor && QImageDrag::canDecode( e ) ) + else if ( edit == PixmapEditor && TQImageDrag::canDecode( e ) ) e->accept(); else e->ignore(); } -void StyledButton::dragLeaveEvent( QDragLeaveEvent * ) +void StyledButton::dragLeaveEvent( TQDragLeaveEvent * ) { if ( hasFocus() ) parentWidget()->setFocus(); } -void StyledButton::dragMoveEvent( QDragMoveEvent *e ) +void StyledButton::dragMoveEvent( TQDragMoveEvent *e ) { - if ( edit == ColorEditor && QColorDrag::canDecode( e ) ) + if ( edit == ColorEditor && TQColorDrag::canDecode( e ) ) e->accept(); - else if ( edit == PixmapEditor && QImageDrag::canDecode( e ) ) + else if ( edit == PixmapEditor && TQImageDrag::canDecode( e ) ) e->accept(); else e->ignore(); } -void StyledButton::dropEvent( QDropEvent *e ) +void StyledButton::dropEvent( TQDropEvent *e ) { - if ( edit == ColorEditor && QColorDrag::canDecode( e ) ) { - QColor color; - QColorDrag::decode( e, color ); + if ( edit == ColorEditor && TQColorDrag::canDecode( e ) ) { + TQColor color; + TQColorDrag::decode( e, color ); setColor(color); emit changed(); e->accept(); } - else if ( edit == PixmapEditor && QImageDrag::canDecode( e ) ) { - QImage img; - QImageDrag::decode( e, img ); - QPixmap pm; + else if ( edit == PixmapEditor && TQImageDrag::canDecode( e ) ) { + TQImage img; + TQImageDrag::decode( e, img ); + TQPixmap pm; pm.convertFromImage(img); setPixmap(pm); emit changed(); diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h index 882090c7..16d0b396 100644 --- a/kdevdesigner/designer/styledbutton.h +++ b/kdevdesigner/designer/styledbutton.h @@ -27,8 +27,8 @@ #ifndef STYLEDBUTTON_H #define STYLEDBUTTON_H -#include -#include +#include +#include class QColor; class QBrush; @@ -38,8 +38,8 @@ class StyledButton : public QButton { Q_OBJECT - Q_PROPERTY( QColor color READ color WRITE setColor ) - Q_PROPERTY( QPixmap pixmap READ pixmap WRITE setPixmap ) + Q_PROPERTY( TQColor color READ color WRITE setColor ) + Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) Q_PROPERTY( EditorType editor READ editor WRITE setEditor ) Q_PROPERTY( bool scale READ scale WRITE setScale ) @@ -48,24 +48,24 @@ class StyledButton : public QButton public: enum EditorType { ColorEditor, PixmapEditor }; - StyledButton( QWidget* parent = 0, const char* name = 0 ); - StyledButton( const QBrush& b, QWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + StyledButton( TQWidget* parent = 0, const char* name = 0 ); + StyledButton( const TQBrush& b, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); ~StyledButton(); void setEditor( EditorType ); EditorType editor() const; - void setColor( const QColor& ); - void setPixmap( const QPixmap& ); + void setColor( const TQColor& ); + void setPixmap( const TQPixmap& ); - QPixmap* pixmap() const; - QColor color() const; + TQPixmap* pixmap() const; + TQColor color() const; void setScale( bool ); bool scale() const; - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; void setFormWindow( FormWindow *fw ) { formWindow = fw; } @@ -76,27 +76,27 @@ signals: void changed(); protected: - void mousePressEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent ( QDragEnterEvent * ); - void dragMoveEvent ( QDragMoveEvent * ); - void dragLeaveEvent ( QDragLeaveEvent * ); - void dropEvent ( QDropEvent * ); + void dragEnterEvent ( TQDragEnterEvent * ); + void dragMoveEvent ( TQDragMoveEvent * ); + void dragLeaveEvent ( TQDragLeaveEvent * ); + void dropEvent ( TQDropEvent * ); #endif // QT_NO_DRAGANDDROP - void drawButton( QPainter* ); - void drawButtonLabel( QPainter* ); - void resizeEvent( QResizeEvent* ); + void drawButton( TQPainter* ); + void drawButtonLabel( TQPainter* ); + void resizeEvent( TQResizeEvent* ); void scalePixmap(); private: - QPixmap* pix; - QPixmap* spix; // the pixmap scaled down to fit into the button - QColor col; + TQPixmap* pix; + TQPixmap* spix; // the pixmap scaled down to fit into the button + TQColor col; EditorType edit; bool s; FormWindow *formWindow; - QPoint pressPos; + TQPoint pressPos; bool mousePressed; }; diff --git a/kdevdesigner/designer/syntaxhighlighter_html.cpp b/kdevdesigner/designer/syntaxhighlighter_html.cpp index cd0c2760..76443305 100644 --- a/kdevdesigner/designer/syntaxhighlighter_html.cpp +++ b/kdevdesigner/designer/syntaxhighlighter_html.cpp @@ -26,20 +26,20 @@ **********************************************************************/ #include "syntaxhighlighter_html.h" -#include "qstring.h" -#include "qmap.h" -#include "qapplication.h" +#include "tqstring.h" +#include "tqmap.h" +#include "tqapplication.h" SyntaxHighlighter_HTML::SyntaxHighlighter_HTML() : QTextPreProcessor(), lastFormat( 0 ), lastFormatId( -1 ) { - QFont f( qApp->font() ); + TQFont f( qApp->font() ); - addFormat(Standard, new QTextFormat(f, qApp->palette().color(QPalette::Active, QColorGroup::Text))); - addFormat(Keyword, new QTextFormat(f, qApp->palette().color(QPalette::Active, QColorGroup::Dark))); - addFormat(Attribute, new QTextFormat(f, qApp->palette().color(QPalette::Active, QColorGroup::Link))); - addFormat(AttribValue, new QTextFormat(f, qApp->palette().color(QPalette::Active, QColorGroup::LinkVisited))); + addFormat(Standard, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Text))); + addFormat(Keyword, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Dark))); + addFormat(Attribute, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Link))); + addFormat(AttribValue, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::LinkVisited))); } SyntaxHighlighter_HTML::~SyntaxHighlighter_HTML() @@ -59,7 +59,7 @@ void SyntaxHighlighter_HTML::process( QTextDocument *doc, QTextParagraph *string const int StateAttribute = 2; const int StateAttribVal = 3; - QString buffer = ""; + TQString buffer = ""; int state = StateStandard; @@ -73,7 +73,7 @@ void SyntaxHighlighter_HTML::process( QTextDocument *doc, QTextParagraph *string int i = 0; for ( ;; ) { - QChar c = string->at( i )->c; + TQChar c = string->at( i )->c; if ( c == '<' ) { if ( state != StateStandard ) diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h index 4a135671..4a842ff5 100644 --- a/kdevdesigner/designer/syntaxhighlighter_html.h +++ b/kdevdesigner/designer/syntaxhighlighter_html.h @@ -50,7 +50,7 @@ private: QTextFormat *lastFormat; int lastFormatId; - QIntDict formats; + TQIntDict formats; }; diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp index b2a440de..d6ebba6c 100644 --- a/kdevdesigner/designer/tableeditorimpl.cpp +++ b/kdevdesigner/designer/tableeditorimpl.cpp @@ -26,40 +26,40 @@ #include "tableeditorimpl.h" #ifndef QT_NO_TABLE -#include +#include #endif #include "formwindow.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include "pixmapchooser.h" #include "command.h" -#include -#include -#include +#include +#include +#include #include "project.h" #include "metadatabase.h" #include "mainwindow.h" #include -TableEditor::TableEditor( QWidget* parent, QWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl ) +TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl ) : TableEditorBase( parent, name, modal, fl ), #ifndef QT_NO_TABLE - editTable( (QTable*)editWidget ), + editTable( (TQTable*)editWidget ), #endif formWindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); #ifndef QT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); #ifndef QT_NO_SQL - if ( !::qt_cast(editTable) ) + if ( !::qt_cast(editTable) ) #endif { labelFields->hide(); @@ -68,7 +68,7 @@ TableEditor::TableEditor( QWidget* parent, QWidget *editWidget, FormWindow *fw, labelTableValue->hide(); } #ifndef QT_NO_SQL - if ( ::qt_cast(editTable) ) { + if ( ::qt_cast(editTable) ) { // ## why does this behave weird? // TabWidget->removePage( rows_tab ); // rows_tab->hide(); @@ -76,10 +76,10 @@ TableEditor::TableEditor( QWidget* parent, QWidget *editWidget, FormWindow *fw, TabWidget->setTabEnabled( rows_tab, FALSE ); } - if ( formWindow->project() && ::qt_cast(editTable) ) { - QStringList lst = MetaDataBase::fakeProperty( editTable, "database" ).toStringList(); + if ( formWindow->project() && ::qt_cast(editTable) ) { + TQStringList lst = MetaDataBase::fakeProperty( editTable, "database" ).toStringList(); if ( lst.count() == 2 && !lst[ 0 ].isEmpty() && !lst[ 1 ].isEmpty() ) { - QStringList fields; + TQStringList fields; fields << ""; fields += formWindow->project()->databaseFieldList( lst[ 0 ], lst[ 1 ] ); comboFields->insertStringList( fields ); @@ -105,7 +105,7 @@ void TableEditor::columnDownClicked() return; saveFieldMap(); int index = listColumns->currentItem() + 1; - QListBoxItem *i = listColumns->item( listColumns->currentItem() ); + TQListBoxItem *i = listColumns->item( listColumns->currentItem() ); listColumns->takeItem( i ); listColumns->insertItem( i, index ); listColumns->setCurrentItem( i ); @@ -114,7 +114,7 @@ void TableEditor::columnDownClicked() currentColumnChanged( i ); } -void TableEditor::columnTextChanged( const QString &s ) +void TableEditor::columnTextChanged( const TQString &s ) { if ( listColumns->currentItem() == -1 ) return; @@ -137,7 +137,7 @@ void TableEditor::columnUpClicked() return; saveFieldMap(); int index = listColumns->currentItem() - 1; - QListBoxItem *i = listColumns->item( listColumns->currentItem() ); + TQListBoxItem *i = listColumns->item( listColumns->currentItem() ); listColumns->takeItem( i ); listColumns->insertItem( i, index ); listColumns->setCurrentItem( i ); @@ -146,7 +146,7 @@ void TableEditor::columnUpClicked() currentColumnChanged( i ); } -void TableEditor::currentColumnChanged( QListBoxItem *i ) +void TableEditor::currentColumnChanged( TQListBoxItem *i ) { if ( !i ) return; @@ -159,8 +159,8 @@ void TableEditor::currentColumnChanged( QListBoxItem *i ) editColumnText->blockSignals( FALSE ); #ifndef QT_NO_SQL - if ( ::qt_cast(editTable) ) { - QString s = *fieldMap.find( listColumns->index( i ) ); + if ( ::qt_cast(editTable) ) { + TQString s = *fieldMap.find( listColumns->index( i ) ); if ( s.isEmpty() ) comboFields->setCurrentItem( 0 ); else if ( comboFields->listBox()->findItem( s ) ) @@ -171,20 +171,20 @@ void TableEditor::currentColumnChanged( QListBoxItem *i ) #endif } -void TableEditor::currentFieldChanged( const QString &s ) +void TableEditor::currentFieldChanged( const TQString &s ) { if ( listColumns->currentItem() == -1 ) return; fieldMap.remove( listColumns->currentItem() ); fieldMap.insert( listColumns->currentItem(), s ); editColumnText->blockSignals( TRUE ); //## necessary - QString newColText = s.mid(0,1).upper() + s.mid(1); + TQString newColText = s.mid(0,1).upper() + s.mid(1); editColumnText->setText( newColText ); columnTextChanged( newColText ); editColumnText->blockSignals( FALSE ); } -void TableEditor::currentRowChanged( QListBoxItem *i ) +void TableEditor::currentRowChanged( TQListBoxItem *i ) { if ( !i ) return; @@ -231,20 +231,20 @@ void TableEditor::newColumnClicked() { #ifndef QT_NO_TABLE table->setNumCols( table->numCols() + 1 ); - QMap m; + TQMap m; for ( int i = 0; i < table->numCols() - 1; ++i ) m.insert( table->horizontalHeader()->label( i ), TRUE ); int n = table->numCols() - 1; - QString t = QString::number( n ); + TQString t = TQString::number( n ); while ( m.find( t ) != m.end() ) - t = QString::number( ++n ); + t = TQString::number( ++n ); table->horizontalHeader()->setLabel( table->numCols() - 1, t ); listColumns->insertItem( t ); - QListBoxItem *item = listColumns->item( listColumns->count() - 1 ); + TQListBoxItem *item = listColumns->item( listColumns->count() - 1 ); listColumns->setCurrentItem( item ); listColumns->setSelected( item, TRUE ); #ifndef QT_NO_SQL - if ( ::qt_cast(editTable) ) { + if ( ::qt_cast(editTable) ) { comboFields->setFocus(); } else #endif @@ -259,16 +259,16 @@ void TableEditor::newRowClicked() { #ifndef QT_NO_TABLE table->setNumRows( table->numRows() + 1 ); - QMap m; + TQMap m; for ( int i = 0; i < table->numRows() - 1; ++i ) m.insert( table->verticalHeader()->label( i ), TRUE ); int n = table->numRows() - 1; - QString t = QString::number( n ); + TQString t = TQString::number( n ); while ( m.find( t ) != m.end() ) - t = QString::number( ++n ); + t = TQString::number( ++n ); table->verticalHeader()->setLabel( table->numRows() - 1, t ); listRows->insertItem( t ); - QListBoxItem *item = listRows->item( listRows->count() - 1 ); + TQListBoxItem *item = listRows->item( listRows->count() - 1 ); listRows->setCurrentItem( item ); listRows->setSelected( item, TRUE ); #endif @@ -287,14 +287,14 @@ void TableEditor::rowDownClicked() listRows->count() < 2 ) return; int index = listRows->currentItem() + 1; - QListBoxItem *i = listRows->item( listRows->currentItem() ); + TQListBoxItem *i = listRows->item( listRows->currentItem() ); listRows->takeItem( i ); listRows->insertItem( i, index ); listRows->setCurrentItem( i ); readRows(); } -void TableEditor::rowTextChanged( const QString &s ) +void TableEditor::rowTextChanged( const TQString &s ) { if ( listRows->currentItem() == -1 ) return; @@ -314,7 +314,7 @@ void TableEditor::rowUpClicked() listRows->count() < 2 ) return; int index = listRows->currentItem() - 1; - QListBoxItem *i = listRows->item( listRows->currentItem() ); + TQListBoxItem *i = listRows->item( listRows->currentItem() ); listRows->takeItem( i ); listRows->insertItem( i, index ); listRows->setCurrentItem( i ); @@ -323,8 +323,8 @@ void TableEditor::rowUpClicked() void TableEditor::applyClicked() { - QValueList rows; - QValueList cols; + TQValueList rows; + TQValueList cols; int i = 0; #ifndef QT_NO_TABLE @@ -354,11 +354,11 @@ void TableEditor::chooseRowPixmapClicked() { if ( listRows->currentItem() == -1 ) return; - QPixmap pix; + TQPixmap pix; if ( listRows->item( listRows->currentItem() )->pixmap() ) pix = qChoosePixmap( this, formWindow, *listRows->item( listRows->currentItem() )->pixmap() ); else - pix = qChoosePixmap( this, formWindow, QPixmap() ); + pix = qChoosePixmap( this, formWindow, TQPixmap() ); if ( pix.isNull() ) return; @@ -374,7 +374,7 @@ void TableEditor::deleteRowPixmapClicked() if ( listRows->currentItem() == -1 ) return; #ifndef QT_NO_TABLE - table->verticalHeader()->setLabel( listRows->currentItem(), QPixmap(), table->verticalHeader()->label( listRows->currentItem() ) ); + table->verticalHeader()->setLabel( listRows->currentItem(), TQPixmap(), table->verticalHeader()->label( listRows->currentItem() ) ); listRows->changeItem( listRows->currentText(), listRows->currentItem() ); #endif } @@ -383,11 +383,11 @@ void TableEditor::chooseColPixmapClicked() { if ( listColumns->currentItem() == -1 ) return; - QPixmap pix; + TQPixmap pix; if ( listColumns->item( listColumns->currentItem() )->pixmap() ) pix = qChoosePixmap( this, formWindow, *listColumns->item( listColumns->currentItem() )->pixmap() ); else - pix = qChoosePixmap( this, formWindow, QPixmap() ); + pix = qChoosePixmap( this, formWindow, TQPixmap() ); if ( pix.isNull() ) return; @@ -402,7 +402,7 @@ void TableEditor::deleteColPixmapClicked() if ( listColumns->currentItem() == -1 ) return; #ifndef QT_NO_TABLE - table->horizontalHeader()->setLabel( listColumns->currentItem(), QPixmap(), table->horizontalHeader()->label( listColumns->currentItem() ) ); + table->horizontalHeader()->setLabel( listColumns->currentItem(), TQPixmap(), table->horizontalHeader()->label( listColumns->currentItem() ) ); listColumns->changeItem( listColumns->currentText(), listColumns->currentItem() ); #endif } @@ -410,9 +410,9 @@ void TableEditor::deleteColPixmapClicked() void TableEditor::readFromTable() { #ifndef QT_NO_TABLE - QHeader *cols = editTable->horizontalHeader(); + TQHeader *cols = editTable->horizontalHeader(); table->setNumCols( cols->count() ); - QMap columnFields = MetaDataBase::columnFields( editTable ); + TQMap columnFields = MetaDataBase::columnFields( editTable ); for ( int i = 0; i < cols->count(); ++i ) { if ( editTable->horizontalHeader()->iconSet( i ) ) { table->horizontalHeader()->setLabel( i, *editTable->horizontalHeader()->iconSet( i ), @@ -423,7 +423,7 @@ void TableEditor::readFromTable() table->horizontalHeader()->setLabel( i, editTable->horizontalHeader()->label( i ) ); listColumns->insertItem( editTable->horizontalHeader()->label( i ) ); } - QString cf = *columnFields.find( editTable->horizontalHeader()->label( i ) ); + TQString cf = *columnFields.find( editTable->horizontalHeader()->label( i ) ); fieldMap.insert( i, cf ); } @@ -432,7 +432,7 @@ void TableEditor::readFromTable() listColumns->setSelected( listColumns->firstItem(), TRUE ); } - QHeader *rows = editTable->verticalHeader(); + TQHeader *rows = editTable->verticalHeader(); table->setNumRows( rows->count() ); for ( int j = 0; j < rows->count(); ++j ) { if ( editTable->verticalHeader()->iconSet( j ) ) { @@ -457,7 +457,7 @@ void TableEditor::readColumns() { int j = 0; #ifndef QT_NO_TABLE - for ( QListBoxItem *i = listColumns->firstItem(); i; i = i->next(), ++j ) { + for ( TQListBoxItem *i = listColumns->firstItem(); i; i = i->next(), ++j ) { if ( i->pixmap() ) table->horizontalHeader()->setLabel( j, *i->pixmap(), i->text() ); else @@ -470,7 +470,7 @@ void TableEditor::readRows() { int j = 0; #ifndef QT_NO_TABLE - for ( QListBoxItem *i = listRows->firstItem(); i; i = i->next(), ++j ) { + for ( TQListBoxItem *i = listRows->firstItem(); i; i = i->next(), ++j ) { if ( i->pixmap() ) table->verticalHeader()->setLabel( j, *i->pixmap(), i->text() ); else @@ -482,13 +482,13 @@ void TableEditor::readRows() void TableEditor::saveFieldMap() { tmpFieldMap.clear(); - for ( QMap::Iterator it = fieldMap.begin(); it != fieldMap.end(); ++it ) + for ( TQMap::Iterator it = fieldMap.begin(); it != fieldMap.end(); ++it ) tmpFieldMap.insert( listColumns->item( it.key() ), *it ); } void TableEditor::restoreFieldMap() { fieldMap.clear(); - for ( QMap::Iterator it = tmpFieldMap.begin(); it != tmpFieldMap.end(); ++it ) + for ( TQMap::Iterator it = tmpFieldMap.begin(); it != tmpFieldMap.end(); ++it ) fieldMap.insert( listColumns->index( it.key() ), *it ); } diff --git a/kdevdesigner/designer/tableeditorimpl.h b/kdevdesigner/designer/tableeditorimpl.h index 8d5ed20d..22a0e362 100644 --- a/kdevdesigner/designer/tableeditorimpl.h +++ b/kdevdesigner/designer/tableeditorimpl.h @@ -28,7 +28,7 @@ #define TABLEEDITORIMPL_H #include "tableeditor.h" -#include +#include class QListBoxItem; class QTable; @@ -39,24 +39,24 @@ class TableEditor : public TableEditorBase Q_OBJECT public: - TableEditor( QWidget* parent = 0, QWidget *editWidget = 0, FormWindow *fw = 0, + TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~TableEditor(); protected slots: void columnDownClicked(); - void columnTextChanged( const QString & ); + void columnTextChanged( const TQString & ); void columnUpClicked(); - void currentColumnChanged( QListBoxItem * ); - void currentFieldChanged( const QString & ); - void currentRowChanged( QListBoxItem * ); + void currentColumnChanged( TQListBoxItem * ); + void currentFieldChanged( const TQString & ); + void currentRowChanged( TQListBoxItem * ); void deleteColumnClicked(); void deleteRowClicked(); void newColumnClicked(); void newRowClicked(); void okClicked(); void rowDownClicked(); - void rowTextChanged( const QString & ); + void rowTextChanged( const TQString & ); void rowUpClicked(); void applyClicked(); void chooseRowPixmapClicked(); @@ -72,10 +72,10 @@ private: void restoreFieldMap(); private: - QTable *editTable; + TQTable *editTable; FormWindow *formWindow; - QMap fieldMap; - QMap tmpFieldMap; + TQMap fieldMap; + TQMap tmpFieldMap; }; diff --git a/kdevdesigner/designer/timestamp.cpp b/kdevdesigner/designer/timestamp.cpp index 9cda96e6..e7267b40 100644 --- a/kdevdesigner/designer/timestamp.cpp +++ b/kdevdesigner/designer/timestamp.cpp @@ -25,26 +25,26 @@ **********************************************************************/ #include "timestamp.h" -#include -#include +#include +#include class QTimer; -TimeStamp::TimeStamp( QObject *parent, const QString &f ) - : QObject( parent ), filename( f ), autoCheck( FALSE ) +TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) + : TQObject( parent ), filename( f ), autoCheck( FALSE ) { - timer = new QTimer( this ); - connect( timer, SIGNAL( timeout() ), this, SLOT( autoCheckTimeStamp() ) ); + timer = new TQTimer( this ); + connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); update(); } -void TimeStamp::setFileName( const QString &f ) +void TimeStamp::setFileName( const TQString &f ) { filename = f; update(); } -QString TimeStamp::fileName() const +TQString TimeStamp::fileName() const { return filename; } @@ -60,18 +60,18 @@ void TimeStamp::setAutoCheckEnabled( bool a ) void TimeStamp::update() { - QFile f( filename ); + TQFile f( filename ); if ( !f.exists() ) return; - lastTimeStamp = QFileInfo( f ).lastModified(); + lastTimeStamp = TQFileInfo( f ).lastModified(); } bool TimeStamp::isUpToDate() const { - QFile f( filename ); + TQFile f( filename ); if ( !f.exists() ) return TRUE; - return lastTimeStamp == QFileInfo( f ).lastModified(); + return lastTimeStamp == TQFileInfo( f ).lastModified(); } bool TimeStamp::isAutoCheckEnabled() const diff --git a/kdevdesigner/designer/timestamp.h b/kdevdesigner/designer/timestamp.h index 373fb884..849a76f8 100644 --- a/kdevdesigner/designer/timestamp.h +++ b/kdevdesigner/designer/timestamp.h @@ -27,19 +27,19 @@ #ifndef TIMESTAMP_H #define TIMESTAMP_H -#include -#include -#include +#include +#include +#include class TimeStamp : public QObject { Q_OBJECT public: - TimeStamp( QObject *parent, const QString &f ); + TimeStamp( TQObject *parent, const TQString &f ); - void setFileName( const QString &f ); - QString fileName() const; + void setFileName( const TQString &f ); + TQString fileName() const; void setAutoCheckEnabled( bool a ); void update(); @@ -53,10 +53,10 @@ private slots: void autoCheckTimeStamp(); private: - QDateTime lastTimeStamp; - QString filename; + TQDateTime lastTimeStamp; + TQString filename; bool autoCheck; - QTimer *timer; + TQTimer *timer; }; diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp index abaa7c68..19af5e6c 100644 --- a/kdevdesigner/designer/variabledialogimpl.cpp +++ b/kdevdesigner/designer/variabledialogimpl.cpp @@ -24,11 +24,11 @@ ** **********************************************************************/ -#include -#include +#include +#include #include -#include -#include +#include +#include #include "metadatabase.h" #include "formwindow.h" @@ -40,14 +40,14 @@ #include -VariableDialog::VariableDialog( FormWindow *fw, QWidget *parent ) +VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent ) : VariableDialogBase( parent ), formWindow( fw ) { varView->setSorting( -1 ); - QValueList varLst = MetaDataBase::variables( formWindow ); - QValueList::Iterator it = varLst.begin(); + TQValueList varLst = MetaDataBase::variables( formWindow ); + TQValueList::Iterator it = varLst.begin(); for ( ; it != varLst.end(); ++it ) { - QListViewItem *i = new QListViewItem( varView ); + TQListViewItem *i = new TQListViewItem( varView ); i->setText( 0, (*it).varName ); i->setText( 1, (*it).varAccess ); } @@ -62,18 +62,18 @@ VariableDialog::~VariableDialog() { } -void VariableDialog::setCurrentItem( QString text ) +void VariableDialog::setCurrentItem( TQString text ) { - QListViewItem *i = varView->findItem( text, 0 ); + TQListViewItem *i = varView->findItem( text, 0 ); if ( i ) varView->setCurrentItem( i ); } void VariableDialog::okClicked() { - QValueList lst; + TQValueList lst; - QListViewItemIterator it( varView ); + TQListViewItemIterator it( varView ); while ( it.current() != 0 ) { MetaDataBase::Variable v; v.varName = it.current()->text( 0 ).simplifyWhiteSpace(); @@ -85,9 +85,9 @@ void VariableDialog::okClicked() } if ( !lst.isEmpty() ) { - QValueList invalidLst; - QValueList::Iterator it1 = lst.begin(); - QValueList::Iterator it2; + TQValueList invalidLst; + TQValueList::Iterator it1 = lst.begin(); + TQValueList::Iterator it2; for ( ; it1 != lst.end(); ++it1 ) { it2 = it1; ++it2; @@ -100,7 +100,7 @@ void VariableDialog::okClicked() } } if ( !invalidLst.isEmpty() ) { - if ( QMessageBox::information( this, i18n( "Edit Variables" ), + if ( TQMessageBox::information( this, i18n( "Edit Variables" ), i18n( "One variable has been declared twice.\n" "Remove this variable?" ), i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { for ( it2 = invalidLst.begin(); it2 != invalidLst.end(); ++it2 ) { @@ -127,7 +127,7 @@ void VariableDialog::okClicked() void VariableDialog::addVariable() { - QListViewItem *i = new QListViewItem( varView, varView->lastItem() ); + TQListViewItem *i = new TQListViewItem( varView, varView->lastItem() ); i->setText( 0, "int newVariable" ); i->setText( 1, "protected" ); varView->setCurrentItem( i ); @@ -138,7 +138,7 @@ void VariableDialog::addVariable() void VariableDialog::deleteVariable() { - QListViewItem *i = varView->selectedItem(); + TQListViewItem *i = varView->selectedItem(); if ( !i ) return; delete i; @@ -147,7 +147,7 @@ void VariableDialog::deleteVariable() varView->setSelected( varView->firstChild(), TRUE ); } -void VariableDialog::currentItemChanged( QListViewItem *i ) +void VariableDialog::currentItemChanged( TQListViewItem *i ) { if ( !i ) { varName->clear(); diff --git a/kdevdesigner/designer/variabledialogimpl.h b/kdevdesigner/designer/variabledialogimpl.h index 975e18d7..8c9a55cc 100644 --- a/kdevdesigner/designer/variabledialogimpl.h +++ b/kdevdesigner/designer/variabledialogimpl.h @@ -36,10 +36,10 @@ class VariableDialog : public VariableDialogBase { Q_OBJECT public: - VariableDialog( FormWindow *fw, QWidget* parent = 0 ); + VariableDialog( FormWindow *fw, TQWidget* parent = 0 ); ~VariableDialog(); - void setCurrentItem( QString text ); + void setCurrentItem( TQString text ); protected slots: void okClicked(); @@ -47,7 +47,7 @@ protected slots: void deleteVariable(); void nameChanged(); void accessChanged(); - void currentItemChanged( QListViewItem *i ); + void currentItemChanged( TQListViewItem *i ); private: FormWindow *formWindow; diff --git a/kdevdesigner/designer/widgetaction.cpp b/kdevdesigner/designer/widgetaction.cpp index 36a9c14c..7568a98c 100644 --- a/kdevdesigner/designer/widgetaction.cpp +++ b/kdevdesigner/designer/widgetaction.cpp @@ -25,22 +25,22 @@ **********************************************************************/ #include "widgetaction.h" -#include -#include +#include +#include #include "mainwindow.h" -#include -#include +#include +#include -static QStyle *windowsStyle = 0; +static TQStyle *windowsStyle = 0; -void WidgetAction::addedTo( QWidget *w, QWidget *container ) +void WidgetAction::addedTo( TQWidget *w, TQWidget *container ) { - if ( ::qt_cast(w) && ::qt_cast(container->parent()->parent()) ) { + if ( ::qt_cast(w) && ::qt_cast(container->parent()->parent()) ) { if ( !windowsStyle ) - windowsStyle = QStyleFactory::create( "windows" ); + windowsStyle = TQStyleFactory::create( "windows" ); w->setStyle( windowsStyle ); - ( (QToolButton*)w )->setUsesTextLabel( TRUE ); - ( (QToolButton*)w )->setTextPosition( QToolButton::Right ); + ( (TQToolButton*)w )->setUsesTextLabel( TRUE ); + ( (TQToolButton*)w )->setTextPosition( TQToolButton::Right ); w->setBackgroundMode( container->backgroundMode() ); } } @@ -51,7 +51,7 @@ WidgetAction::~WidgetAction() MainWindow::self->toolActions.removeRef( this ); } -void WidgetAction::init( const QString &g ) +void WidgetAction::init( const TQString &g ) { MainWindow::self->toolActions.append( this ); grp = g; diff --git a/kdevdesigner/designer/widgetaction.h b/kdevdesigner/designer/widgetaction.h index 6215d88d..fa3971c3 100644 --- a/kdevdesigner/designer/widgetaction.h +++ b/kdevdesigner/designer/widgetaction.h @@ -27,38 +27,38 @@ #ifndef WIDGETACTION_H #define WIDGETACTION_H -#include +#include class WidgetAction : public QAction { Q_OBJECT public: - WidgetAction( const QString &grp, QObject* parent, + WidgetAction( const TQString &grp, TQObject* parent, const char* name = 0, bool toggle = FALSE ) - : QAction( parent, name, toggle ) { init( grp ); } - WidgetAction( const QString &grp, const QString& text, - const QIconSet& icon, const QString& menuText, QKeySequence accel, - QObject* parent, const char* name = 0, bool toggle = FALSE ) - : QAction( text, icon, menuText, accel, parent, name, toggle ) { init( grp ); } - WidgetAction( const QString &grp, const QString& text, - const QString& menuText, QKeySequence accel, QObject* parent, + : TQAction( parent, name, toggle ) { init( grp ); } + WidgetAction( const TQString &grp, const TQString& text, + const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, + TQObject* parent, const char* name = 0, bool toggle = FALSE ) + : TQAction( text, icon, menuText, accel, parent, name, toggle ) { init( grp ); } + WidgetAction( const TQString &grp, const TQString& text, + const TQString& menuText, TQKeySequence accel, TQObject* parent, const char* name = 0, bool toggle = FALSE ) - : QAction( text, menuText, accel, parent, name, toggle ) { init( grp ); } + : TQAction( text, menuText, accel, parent, name, toggle ) { init( grp ); } ~WidgetAction(); #if !defined(Q_NO_USING_KEYWORD) - using QAction::addedTo; + using TQAction::addedTo; #endif - void addedTo( QWidget *, QWidget * ); + void addedTo( TQWidget *, TQWidget * ); - QString group() const { return grp; } + TQString group() const { return grp; } private: - void init( const QString &g ); + void init( const TQString &g ); private: - QString grp; + TQString grp; }; diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index 191fbb1f..410dab23 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler need this here +#include // HP-UX compiler need this here #include "widgetfactory.h" #include #include "metadatabase.h" @@ -49,60 +49,60 @@ #include -#include +#include -#include -#include -#include +#include +#include +#include #ifndef QT_NO_TABLE -#include +#include #endif #ifndef QT_NO_SQL -#include +#include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef QT_NO_SQL #include "database.h" #endif #define NO_STATIC_COLORS #include -#include +#include #include -FormWindow *find_formwindow( QWidget *w ) +FormWindow *find_formwindow( TQWidget *w ) { if ( !w ) return 0; @@ -115,16 +115,16 @@ FormWindow *find_formwindow( QWidget *w ) } } -void QLayoutWidget::paintEvent( QPaintEvent* ) +void QLayoutWidget::paintEvent( TQPaintEvent* ) { - QPainter p ( this ); + TQPainter p ( this ); p.setPen( red ); p.drawRect( rect() ); } -QDesignerTabWidget::QDesignerTabWidget( QWidget *parent, const char *name ) - : QTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) +QDesignerTabWidget::QDesignerTabWidget( TQWidget *parent, const char *name ) + : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) { tabBar()->setAcceptDrops( TRUE ); tabBar()->installEventFilter( this ); @@ -140,27 +140,27 @@ void QDesignerTabWidget::setCurrentPage( int i ) tabBar()->setCurrentTab( i ); } -QString QDesignerTabWidget::pageTitle() const +TQString QDesignerTabWidget::pageTitle() const { - return ((QTabWidget*)this)->tabLabel( QTabWidget::currentPage() ); + return ((TQTabWidget*)this)->tabLabel( TQTabWidget::currentPage() ); } -void QDesignerTabWidget::setPageTitle( const QString& title ) +void QDesignerTabWidget::setPageTitle( const TQString& title ) { - changeTab( QTabWidget::currentPage(), title ); + changeTab( TQTabWidget::currentPage(), title ); } -void QDesignerTabWidget::setPageName( const QCString& name ) +void QDesignerTabWidget::setPageName( const TQCString& name ) { - if ( QTabWidget::currentPage() ) - QTabWidget::currentPage()->setName( name ); + if ( TQTabWidget::currentPage() ) + TQTabWidget::currentPage()->setName( name ); } -QCString QDesignerTabWidget::pageName() const +TQCString QDesignerTabWidget::pageName() const { - if ( !QTabWidget::currentPage() ) + if ( !TQTabWidget::currentPage() ) return 0; - return QTabWidget::currentPage()->name(); + return TQTabWidget::currentPage()->name(); } int QDesignerTabWidget::count() const @@ -168,24 +168,24 @@ int QDesignerTabWidget::count() const return tabBar()->count(); } -bool QDesignerTabWidget::eventFilter( QObject *o, QEvent *e ) +bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) { if ( o != tabBar() ) return FALSE; switch ( e->type() ) { - case QEvent::MouseButtonPress: { + case TQEvent::MouseButtonPress: { mousePressed = TRUE; - QMouseEvent *me = (QMouseEvent*)e; + TQMouseEvent *me = (TQMouseEvent*)e; pressPoint = me->pos(); } break; - case QEvent::MouseMove: { - QMouseEvent *me = (QMouseEvent*)e; - if ( mousePressed && ( pressPoint - me->pos()).manhattanLength() > QApplication::startDragDistance() ) { - QTextDrag *drg = new QTextDrag( QString::number( (long) this ) , this ); + case TQEvent::MouseMove: { + TQMouseEvent *me = (TQMouseEvent*)e; + if ( mousePressed && ( pressPoint - me->pos()).manhattanLength() > TQApplication::startDragDistance() ) { + TQTextDrag *drg = new TQTextDrag( TQString::number( (long) this ) , this ); mousePressed = FALSE; - dragPage = QTabWidget::currentPage(); - dragLabel = QTabWidget::tabLabel( dragPage ); + dragPage = TQTabWidget::currentPage(); + dragLabel = TQTabWidget::tabLabel( dragPage ); int index = indexOf( dragPage ); @@ -199,24 +199,24 @@ bool QDesignerTabWidget::eventFilter( QObject *o, QEvent *e ) } } break; - case QEvent::DragLeave: { + case TQEvent::DragLeave: { if ( dropIndicator ) dropIndicator->hide(); } break; - case QEvent::DragMove: { - QDragEnterEvent *de = (QDragEnterEvent*) e; - if ( QTextDrag::canDecode( de ) ) { - QString text; - QTextDrag::decode( de, text ); - if ( text == QString::number( (long)this ) ) + case TQEvent::DragMove: { + TQDragEnterEvent *de = (TQDragEnterEvent*) e; + if ( TQTextDrag::canDecode( de ) ) { + TQString text; + TQTextDrag::decode( de, text ); + if ( text == TQString::number( (long)this ) ) de->accept(); else return FALSE; } int index = 0; - QRect rect; + TQRect rect; for ( ; index < tabBar()->count(); index++ ) { if ( tabBar()->tabAt( index )->rect().contains( de->pos() ) ) { rect = tabBar()->tabAt( index )->rect(); @@ -225,33 +225,33 @@ bool QDesignerTabWidget::eventFilter( QObject *o, QEvent *e ) } if ( index == tabBar()->count() -1 ) { - QRect rect2 = rect; + TQRect rect2 = rect; rect2.setLeft( rect2.left() + rect2.width() / 2 ); if ( rect2.contains( de->pos() ) ) index++; } if ( ! dropIndicator ) { - dropIndicator = new QWidget( this ); + dropIndicator = new TQWidget( this ); dropIndicator->setBackgroundColor( red ); } - QPoint pos; + TQPoint pos; if ( index == tabBar()->count() ) - pos = tabBar()->mapToParent( QPoint( rect.x() + rect.width(), rect.y() ) ); + pos = tabBar()->mapToParent( TQPoint( rect.x() + rect.width(), rect.y() ) ); else - pos = tabBar()->mapToParent( QPoint( rect.x(), rect.y() ) ); + pos = tabBar()->mapToParent( TQPoint( rect.x(), rect.y() ) ); dropIndicator->setGeometry( pos.x(), pos.y() , 3, rect.height() ); dropIndicator->show(); } break; - case QEvent::Drop: { - QDragEnterEvent *de = (QDragEnterEvent*) e; - if ( QTextDrag::canDecode( de ) ) { - QString text; - QTextDrag::decode( de, text ); - if ( text == QString::number( (long)this ) ) { + case TQEvent::Drop: { + TQDragEnterEvent *de = (TQDragEnterEvent*) e; + if ( TQTextDrag::canDecode( de ) ) { + TQString text; + TQTextDrag::decode( de, text ); + if ( text == TQString::number( (long)this ) ) { int newIndex = 0; for ( ; newIndex < tabBar()->count(); newIndex++ ) { @@ -260,7 +260,7 @@ bool QDesignerTabWidget::eventFilter( QObject *o, QEvent *e ) } if ( newIndex == tabBar()->count() -1 ) { - QRect rect2 = tabBar()->tabAt( newIndex )->rect(); + TQRect rect2 = tabBar()->tabAt( newIndex )->rect(); rect2.setLeft( rect2.left() + rect2.width() / 2 ); if ( rect2.contains( de->pos() ) ) newIndex++; @@ -290,19 +290,19 @@ bool QDesignerTabWidget::eventFilter( QObject *o, QEvent *e ) } -QDesignerWidgetStack::QDesignerWidgetStack( QWidget *parent, const char *name ) - : QWidgetStack( parent, name ) +QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name ) + : TQWidgetStack( parent, name ) { - prev = new QToolButton( Qt::LeftArrow, this, "designer_wizardstack_button" ); + prev = new TQToolButton( Qt::LeftArrow, this, "designer_wizardstack_button" ); prev->setAutoRaise( TRUE ); prev->setAutoRepeat( TRUE ); - prev->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored ) ); - next = new QToolButton( Qt::RightArrow, this, "designer_wizardstack_button" ); + prev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); + next = new TQToolButton( Qt::RightArrow, this, "designer_wizardstack_button" ); next->setAutoRaise( TRUE ); next->setAutoRepeat( TRUE ); - next->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored ) ); - connect( prev, SIGNAL( clicked() ), this, SLOT( prevPage() ) ); - connect( next, SIGNAL( clicked() ), this, SLOT( nextPage() ) ); + 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(); } @@ -346,14 +346,14 @@ void QDesignerWidgetStack::setCurrentPage( int i ) updateButtons(); } -QCString QDesignerWidgetStack::pageName() const +TQCString QDesignerWidgetStack::pageName() const { if ( !visibleWidget() ) return 0; return visibleWidget()->name(); } -void QDesignerWidgetStack::setPageName( const QCString& name ) +void QDesignerWidgetStack::setPageName( const TQCString& name ) { if ( visibleWidget() ) visibleWidget()->setName( name ); @@ -364,7 +364,7 @@ int QDesignerWidgetStack::count() const return pages.count(); } -QWidget* QDesignerWidgetStack::page( int i ) const +TQWidget* QDesignerWidgetStack::page( int i ) const { if ( i < 0 || i >= count() ) return 0; @@ -373,7 +373,7 @@ QWidget* QDesignerWidgetStack::page( int i ) const } -int QDesignerWidgetStack::insertPage( QWidget *p, int i ) +int QDesignerWidgetStack::insertPage( TQWidget *p, int i ) { if ( i < 0 ) pages.append( p ); @@ -382,12 +382,12 @@ int QDesignerWidgetStack::insertPage( QWidget *p, int i ) addWidget( p ); p->show(); raiseWidget( p ); - QApplication::sendPostedEvents(); + TQApplication::sendPostedEvents(); updateButtons(); return pages.find( p ); } -int QDesignerWidgetStack::removePage( QWidget *p ) +int QDesignerWidgetStack::removePage( TQWidget *p ) { int i = pages.find( p ); pages.remove( p ); @@ -429,30 +429,30 @@ void QDesignerWizard::setCurrentPage( int i ) } } -QString QDesignerWizard::pageTitle() const +TQString QDesignerWizard::pageTitle() const { return title( currentPage() ); } -void QDesignerWizard::setPageTitle( const QString& title ) +void QDesignerWizard::setPageTitle( const TQString& title ) { setTitle( currentPage(), title ); } -void QDesignerWizard::setPageName( const QCString& name ) +void QDesignerWizard::setPageName( const TQCString& name ) { - if ( QWizard::currentPage() ) - QWizard::currentPage()->setName( name ); + if ( TQWizard::currentPage() ) + TQWizard::currentPage()->setName( name ); } -QCString QDesignerWizard::pageName() const +TQCString QDesignerWizard::pageName() const { - if ( !QWizard::currentPage() ) + if ( !TQWizard::currentPage() ) return 0; - return QWizard::currentPage()->name(); + return TQWizard::currentPage()->name(); } -int QDesignerWizard::pageNum( QWidget *p ) +int QDesignerWizard::pageNum( TQWidget *p ) { for ( int i = 0; i < pageCount(); ++i ) { if ( page( i ) == p ) @@ -461,28 +461,28 @@ int QDesignerWizard::pageNum( QWidget *p ) return -1; } -void QDesignerWizard::addPage( QWidget *p, const QString &t ) +void QDesignerWizard::addPage( TQWidget *p, const TQString &t ) { - QWizard::addPage( p, t ); + TQWizard::addPage( p, t ); if ( removedPages.find( p ) ) removedPages.remove( p ); } -void QDesignerWizard::removePage( QWidget *p ) +void QDesignerWizard::removePage( TQWidget *p ) { - QWizard::removePage( p ); + TQWizard::removePage( p ); removedPages.insert( p, p ); } -void QDesignerWizard::insertPage( QWidget *p, const QString &t, int index ) +void QDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index ) { - QWizard::insertPage( p, t, index ); + TQWizard::insertPage( p, t, index ); if ( removedPages.find( p ) ) removedPages.remove( p ); } -QMap< int, QMap< QString, QVariant> > *defaultProperties = 0; -QMap< int, QStringList > *changedProperties = 0; +TQMap< int, TQMap< TQString, TQVariant> > *defaultProperties = 0; +TQMap< int, TQStringList > *changedProperties = 0; /*! \class WidgetFactory widgetfactory.h @@ -495,24 +495,24 @@ QMap< int, QStringList > *changedProperties = 0; */ -void WidgetFactory::saveDefaultProperties( QObject *w, int id ) +void WidgetFactory::saveDefaultProperties( TQObject *w, int id ) { - QMap< QString, QVariant> propMap; - QStrList lst = w->metaObject()->propertyNames( TRUE ); + TQMap< TQString, TQVariant> propMap; + TQStrList lst = w->metaObject()->propertyNames( TRUE ); for ( uint i = 0; i < lst.count(); ++i ) { - QVariant var = w->property( lst.at( i ) ); + TQVariant var = w->property( lst.at( i ) ); if ( !var.isValid() && qstrcmp( "pixmap", lst.at( i ) ) == 0 ) - var = QVariant( QPixmap() ); + var = TQVariant( TQPixmap() ); else if ( !var.isValid() && qstrcmp( "iconSet", lst.at( i ) ) == 0 ) - var = QVariant( QIconSet() ); + var = TQVariant( TQIconSet() ); propMap.replace( lst.at( i ), var ); } defaultProperties->replace( id, propMap ); } -void WidgetFactory::saveChangedProperties( QObject *w, int id ) +void WidgetFactory::saveChangedProperties( TQObject *w, int id ) { - QStringList l = MetaDataBase::changedProperties( w ); + TQStringList l = MetaDataBase::changedProperties( w ); changedProperties->insert( id, l ); } @@ -522,23 +522,23 @@ void WidgetFactory::saveChangedProperties( QObject *w, int id ) created. */ -QWidget *WidgetFactory::create( int id, QWidget *parent, const char *name, bool init, const QRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { - QString n = WidgetDatabase::className( id ); + TQString n = WidgetDatabase::className( id ); if ( n.isEmpty() ) return 0; if ( !defaultProperties ) { - defaultProperties = new QMap< int, QMap< QString, QVariant> >(); - changedProperties = new QMap< int, QStringList >(); + defaultProperties = new TQMap< int, TQMap< TQString, TQVariant> >(); + changedProperties = new TQMap< int, TQStringList >(); } - QWidget *w = 0; - QString str = WidgetDatabase::createWidgetName( id ); + TQWidget *w = 0; + TQString str = WidgetDatabase::createWidgetName( id ); const char *s = str.latin1(); w = createWidget( n, parent, name ? name : s, init, r, orient ); - if ( ::qt_cast(w) ) - ( (QScrollView*)w )->disableSizeHintCaching(); + if ( ::qt_cast(w) ) + ( (TQScrollView*)w )->disableSizeHintCaching(); if ( !w && WidgetDatabase::isCustomWidget( id ) ) w = createCustomWidget( parent, name ? name : s, MetaDataBase::customWidget( id ) ); if ( !w ) @@ -557,7 +557,7 @@ QWidget *WidgetFactory::create( int id, QWidget *parent, const char *name, bool which can be \c HBox, \c VBox or \c Grid. */ -QLayout *WidgetFactory::createLayout( QWidget *widget, QLayout *layout, LayoutType type ) +TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, LayoutType type ) { int spacing = MainWindow::self->currentLayoutDefaultSpacing(); int margin = 0; @@ -570,37 +570,37 @@ QLayout *WidgetFactory::createLayout( QWidget *widget, QLayout *layout, LayoutTy widget && ::qt_cast(widget->parentWidget()) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); - if ( !layout && ::qt_cast(widget) ) - widget = ((QTabWidget*)widget)->currentPage(); + if ( !layout && ::qt_cast(widget) ) + widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && ::qt_cast(widget) ) - widget = ((QWizard*)widget)->currentPage(); + if ( !layout && ::qt_cast(widget) ) + widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && ::qt_cast(widget) ) - widget = ((QMainWindow*)widget)->centralWidget(); + if ( !layout && ::qt_cast(widget) ) + widget = ((TQMainWindow*)widget)->centralWidget(); - if ( !layout && ::qt_cast(widget) ) - widget = ((QWidgetStack*)widget)->visibleWidget(); + if ( !layout && ::qt_cast(widget) ) + widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( !layout && ::qt_cast(widget) ) - widget = ((QToolBox*)widget)->currentItem(); + if ( !layout && ::qt_cast(widget) ) + widget = ((TQToolBox*)widget)->currentItem(); MetaDataBase::addEntry( widget ); - QLayout *l = 0; + TQLayout *l = 0; int align = 0; - if ( !layout && ::qt_cast(widget) ) { - QGroupBox *gb = (QGroupBox*)widget; + if ( !layout && ::qt_cast(widget) ) { + TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); layout = gb->layout(); layout->setMargin( 0 ); layout->setSpacing( 0 ); switch ( type ) { case HBox: - l = new QHBoxLayout( layout ); + l = new TQHBoxLayout( layout ); break; case VBox: - l = new QVBoxLayout( layout ); + l = new TQVBoxLayout( layout ); break; case Grid: l = new QDesignerGridLayout( layout ); @@ -615,10 +615,10 @@ QLayout *WidgetFactory::createLayout( QWidget *widget, QLayout *layout, LayoutTy if ( layout ) { switch ( type ) { case HBox: - l = new QHBoxLayout( layout ); + l = new TQHBoxLayout( layout ); break; case VBox: - l = new QVBoxLayout( layout ); + l = new TQVBoxLayout( layout ); break; case Grid: l = new QDesignerGridLayout( layout ); @@ -632,10 +632,10 @@ QLayout *WidgetFactory::createLayout( QWidget *widget, QLayout *layout, LayoutTy } else { switch ( type ) { case HBox: - l = new QHBoxLayout( widget ); + l = new TQHBoxLayout( widget ); break; case VBox: - l = new QVBoxLayout( widget ); + l = new TQVBoxLayout( widget ); break; case Grid: l = new QDesignerGridLayout( widget ); @@ -658,21 +658,21 @@ QLayout *WidgetFactory::createLayout( QWidget *widget, QLayout *layout, LayoutTy return l; } -void WidgetFactory::deleteLayout( QWidget *widget ) +void WidgetFactory::deleteLayout( TQWidget *widget ) { if ( !widget ) return; - if ( ::qt_cast(widget) ) - widget = ((QTabWidget*)widget)->currentPage(); - if ( ::qt_cast(widget) ) - widget = ((QWizard*)widget)->currentPage(); - if ( ::qt_cast(widget) ) - widget = ((QMainWindow*)widget)->centralWidget(); - if ( ::qt_cast(widget) ) - widget = ((QWidgetStack*)widget)->visibleWidget(); - if ( ::qt_cast(widget) ) - widget = ((QToolBox*)widget)->currentItem(); + if ( ::qt_cast(widget) ) + widget = ((TQTabWidget*)widget)->currentPage(); + if ( ::qt_cast(widget) ) + widget = ((TQWizard*)widget)->currentPage(); + if ( ::qt_cast(widget) ) + widget = ((TQMainWindow*)widget)->centralWidget(); + if ( ::qt_cast(widget) ) + widget = ((TQWidgetStack*)widget)->visibleWidget(); + if ( ::qt_cast(widget) ) + widget = ((TQToolBox*)widget)->currentItem(); delete widget->layout(); } @@ -683,76 +683,76 @@ void WidgetFactory::deleteLayout( QWidget *widget ) has to be in sync with the initChangedProperties() function! */ -QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, const char *name, bool init, - const QRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, + const TQRect *r, Qt::Orientation orient ) { - if ( className == "QPushButton" ) { - QPushButton *b = 0; + if ( className == "TQPushButton" ) { + TQPushButton *b = 0; if ( init ) { b = new QDesignerPushButton( parent, name ); - b->setText( QString::fromLatin1( name ) ); + b->setText( TQString::fromLatin1( name ) ); } else { b = new QDesignerPushButton( parent, name ); } - QWidget *w = find_formwindow( b ); - b->setAutoDefault( w && ::qt_cast(((FormWindow*)w)->mainContainer()) ); + TQWidget *w = find_formwindow( b ); + b->setAutoDefault( w && ::qt_cast(((FormWindow*)w)->mainContainer()) ); return b; - } else if ( className == "QToolButton" ) { + } else if ( className == "TQToolButton" ) { if ( init ) { QDesignerToolButton *tb = new QDesignerToolButton( parent, name ); - if ( ::qt_cast(widgetOfContainer(parent))) { + if ( ::qt_cast(widgetOfContainer(parent))) { tb->setUsesTextLabel(TRUE); tb->setTextLabel("..."); tb->setAutoRaise(TRUE); - tb->setTextPosition(QToolButton::BesideIcon); + tb->setTextPosition(TQToolButton::BesideIcon); } else { tb->setText( "..." ); } return tb; } return new QDesignerToolButton( parent, name ); - } else if ( className == "QCheckBox" ) { + } else if ( className == "TQCheckBox" ) { if ( init ) { QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name ); - cb->setText( QString::fromLatin1( name ) ); + cb->setText( TQString::fromLatin1( name ) ); return cb; } return new QDesignerCheckBox( parent, name ); - } else if ( className == "QRadioButton" ) { + } else if ( className == "TQRadioButton" ) { if ( init ) { QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name ); - rb->setText( QString::fromLatin1( name ) ); + rb->setText( TQString::fromLatin1( name ) ); return rb; } return new QDesignerRadioButton( parent, name ); - } else if ( className == "QGroupBox" ) { + } else if ( className == "TQGroupBox" ) { if ( init ) - return new QGroupBox( QString::fromLatin1( name ), parent, name ); - return new QGroupBox( parent, name ); - } else if ( className == "QButtonGroup" ) { + return new TQGroupBox( TQString::fromLatin1( name ), parent, name ); + return new TQGroupBox( parent, name ); + } else if ( className == "TQButtonGroup" ) { if ( init ) - return new QButtonGroup( QString::fromLatin1( name ), parent, name ); - return new QButtonGroup( parent, name ); - } else if ( className == "QIconView" ) { + return new TQButtonGroup( TQString::fromLatin1( name ), parent, name ); + return new TQButtonGroup( parent, name ); + } else if ( className == "TQIconView" ) { #if !defined(QT_NO_ICONVIEW) - QIconView* iv = new QIconView( parent, name ); + TQIconView* iv = new TQIconView( parent, name ); if ( init ) - (void) new QIconViewItem( iv, i18n( "New Item" ) ); + (void) new TQIconViewItem( iv, i18n( "New Item" ) ); return iv; #else return 0; #endif - } else if ( className == "QTable" ) { + } else if ( className == "TQTable" ) { #if !defined(QT_NO_TABLE) if ( init ) - return new QTable( 3, 3, parent, name ); - return new QTable( parent, name ); + return new TQTable( 3, 3, parent, name ); + return new TQTable( parent, name ); #else return 0; #endif #ifndef QT_NO_SQL - } else if ( className == "QDataTable" ) { - return new QDataTable( parent, name ); + } else if ( className == "TQDataTable" ) { + return new TQDataTable( parent, name ); #endif //QT_NO_SQL } else if ( className == "QDateEdit" ) { return new QDateEdit( parent, name ); @@ -761,35 +761,35 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, } else if ( className == "QDateTimeEdit" ) { return new QDateTimeEdit( parent, name ); } - else if ( className == "QListBox" ) { - QListBox* lb = new QListBox( parent, name ); + else if ( className == "TQListBox" ) { + TQListBox* lb = new TQListBox( parent, name ); if ( init ) { lb->insertItem( i18n( "New Item" ) ); lb->setCurrentItem( 0 ); } return lb; - } else if ( className == "QListView" ) { - QListView *lv = new QListView( parent, name ); + } else if ( className == "TQListView" ) { + TQListView *lv = new TQListView( parent, name ); lv->setSorting( -1 ); if ( init ) { lv->addColumn( i18n( "Column 1" ) ); - lv->setCurrentItem( new QListViewItem( lv, i18n( "New Item" ) ) ); + lv->setCurrentItem( new TQListViewItem( lv, i18n( "New Item" ) ) ); } return lv; - } else if ( className == "QLineEdit" ) - return new QLineEdit( parent, name ); - else if ( className == "QSpinBox" ) - return new QSpinBox( parent, name ); - else if ( className == "QSplitter" ) - return new QSplitter( parent, name ); - else if ( className == "QMultiLineEdit" ) - return new QMultiLineEdit( parent, name ); - else if ( className == "QTextEdit" ) - return new QTextEdit( parent, name ); - else if ( className == "QLabel" || className == "TextLabel" ) { + } else if ( className == "TQLineEdit" ) + return new TQLineEdit( parent, name ); + else if ( className == "TQSpinBox" ) + return new TQSpinBox( parent, name ); + else if ( className == "TQSplitter" ) + return new TQSplitter( parent, name ); + else if ( className == "TQMultiLineEdit" ) + return new TQMultiLineEdit( parent, name ); + else if ( className == "TQTextEdit" ) + return new TQTextEdit( parent, name ); + else if ( className == "TQLabel" || className == "TextLabel" ) { QDesignerLabel *l = new QDesignerLabel( parent, name ); if ( init ) { - l->setText( QString::fromLatin1( name ) ); + l->setText( TQString::fromLatin1( name ) ); MetaDataBase::addEntry( l ); MetaDataBase::setPropertyChanged( l, "text", TRUE ); } @@ -806,39 +806,39 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, return l; } else if ( className == "QLayoutWidget" ) return new QLayoutWidget( parent, name ); - else if ( className == "QTabWidget" ) { - QTabWidget *tw = new QDesignerTabWidget( parent, name ); + else if ( className == "TQTabWidget" ) { + TQTabWidget *tw = new QDesignerTabWidget( parent, name ); if ( init ) { FormWindow *fw = find_formwindow( parent ); - QWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new QWidget( tw, "tab" ); + TQWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, i18n("Tab 1") ); MetaDataBase::addEntry( w ); - w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new QWidget( tw, "tab" ); + w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, i18n("Tab 2") ); MetaDataBase::addEntry( tw ); MetaDataBase::addEntry( w ); } return tw; - } else if ( className == "QWidgetStack" ) { + } else if ( className == "TQWidgetStack" ) { QDesignerWidgetStack *ws = new QDesignerWidgetStack( parent, name ); if ( init ) { FormWindow *fw = find_formwindow( parent ); - QWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new QWidget( ws, "WStackPage" ); + TQWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); MetaDataBase::addEntry( w ); MetaDataBase::addEntry( ws ); } return ws; - } else if ( className == "QComboBox" ) { - return new QComboBox( FALSE, parent, name ); - } else if ( className == "QWidget" ) { + } else if ( className == "TQComboBox" ) { + return new TQComboBox( FALSE, parent, name ); + } else if ( className == "TQWidget" ) { if ( parent && ( ::qt_cast(parent) || - ::qt_cast(parent) || - ::qt_cast(parent) || - ::qt_cast(parent) || - ::qt_cast(parent) || - ::qt_cast(parent) ) ) { + ::qt_cast(parent) || + ::qt_cast(parent) || + ::qt_cast(parent) || + ::qt_cast(parent) || + ::qt_cast(parent) ) ) { FormWindow *fw = find_formwindow( parent ); if ( fw ) { QDesignerWidget *dw = new QDesignerWidget( fw, parent, name ); @@ -846,33 +846,33 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, return dw; } } - return new QWidget( parent, name ); - } else if ( className == "QDialog" ) { - QDialog *dia = 0; + return new TQWidget( parent, name ); + } else if ( className == "TQDialog" ) { + TQDialog *dia = 0; if ( ::qt_cast(parent) ) dia = new QDesignerDialog( (FormWindow*)parent, parent, name ); else - dia = new QDialog( parent, name ); + dia = new TQDialog( parent, name ); #if defined(QT_NON_COMMERCIAL) if ( ::qt_cast(parent) ) #else if ( parent ) #endif - dia->reparent( parent, QPoint( 0, 0 ), TRUE ); + dia->reparent( parent, TQPoint( 0, 0 ), TRUE ); return dia; - } else if ( className == "QWizard" ) { - QWizard *wiz = new QDesignerWizard( parent, name ); + } else if ( className == "TQWizard" ) { + TQWizard *wiz = new QDesignerWizard( parent, name ); #if defined(QT_NON_COMMERCIAL) if ( ::qt_cast(parent) ) #else if ( parent ) #endif - wiz->reparent( parent, QPoint( 0, 0 ), TRUE ); + wiz->reparent( parent, TQPoint( 0, 0 ), TRUE ); if ( init && ::qt_cast(parent) ) { QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); MetaDataBase::addEntry( dw ); wiz->addPage( dw, i18n( "Page" ) ); - QTimer::singleShot( 0, wiz, SLOT( next() ) ); + TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) ); } return wiz; } else if ( className == "Spacer" ) { @@ -889,18 +889,18 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, else s->setOrientation( Qt::Horizontal ); return s; - } else if ( className == "QLCDNumber" ) - return new QLCDNumber( parent, name ); - else if ( className == "QProgressBar" ) - return new QProgressBar( parent, name ); - else if ( className == "QTextView" ) - return new QTextView( parent, name ); - else if ( className == "QTextBrowser" ) - return new QTextBrowser( parent, name ); - else if ( className == "QDial" ) - return new QDial( parent, name ); - else if ( className == "QSlider" ) { - QSlider *s = new QSlider( parent, name ); + } else if ( className == "TQLCDNumber" ) + return new TQLCDNumber( parent, name ); + else if ( className == "TQProgressBar" ) + return new TQProgressBar( parent, name ); + else if ( className == "TQTextView" ) + return new TQTextView( parent, name ); + else if ( className == "TQTextBrowser" ) + return new TQTextBrowser( parent, name ); + else if ( className == "TQDial" ) + return new TQDial( parent, name ); + else if ( className == "TQSlider" ) { + TQSlider *s = new TQSlider( parent, name ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) @@ -910,8 +910,8 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, MetaDataBase::addEntry( s ); MetaDataBase::setPropertyChanged( s, "orientation", TRUE ); return s; - } else if ( className == "QScrollBar" ) { - QScrollBar *s = new QScrollBar( parent, name ); + } else if ( className == "TQScrollBar" ) { + TQScrollBar *s = new TQScrollBar( parent, name ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) @@ -921,11 +921,11 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, MetaDataBase::addEntry( s ); MetaDataBase::setPropertyChanged( s, "orientation", TRUE ); return s; - } else if ( className == "QFrame" ) { + } else if ( className == "TQFrame" ) { if ( !init ) - return new QFrame( parent, name ); - QFrame *f = new QFrame( parent, name ); - f->setFrameStyle( QFrame::StyledPanel | QFrame::Raised ); + return new TQFrame( parent, name ); + TQFrame *f = new TQFrame( parent, name ); + f->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); return f; } else if ( className == "Line" ) { Line *l = new Line( parent, name ); @@ -940,8 +940,8 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, else if ( r->width() < r->height() ) l->setOrientation( Qt::Vertical ); return l; - } else if ( className == "QMainWindow" ) { - QMainWindow *mw = new QMainWindow( parent, name, 0 ); + } else if ( className == "TQMainWindow" ) { + TQMainWindow *mw = new TQMainWindow( parent, name, 0 ); mw->setDockEnabled( Qt::DockMinimized, FALSE ); QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, mw, "central widget" ); mw->setDockMenuEnabled( FALSE ); @@ -950,31 +950,31 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, (void)mw->statusBar(); dw->show(); return mw; - } else if ( className == "QToolBox" ) { + } else if ( className == "TQToolBox" ) { if ( !init ) return new QDesignerToolBox( parent, name ); - QToolBox *tb = new QDesignerToolBox( parent, name ); + TQToolBox *tb = new QDesignerToolBox( parent, name ); FormWindow *fw = find_formwindow( parent ); - QWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) : - new QWidget( tb, "page1" ); + TQWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) : + new TQWidget( tb, "page1" ); tb->addItem( w, i18n("Page 1") ); MetaDataBase::addEntry( w ); - w = fw ? new QDesignerWidget( fw, tb, "page2" ) : new QWidget( tb, "page2" ); + w = fw ? new QDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" ); tb->addItem( w, i18n("Page 2") ); MetaDataBase::addEntry( tb ); MetaDataBase::addEntry( w ); return tb; } #ifndef QT_NO_SQL - else if ( className == "QDataBrowser" ) { - QWidget *w = new QDesignerDataBrowser( parent, name ); + else if ( className == "TQDataBrowser" ) { + TQWidget *w = new QDesignerDataBrowser( parent, name ); if ( parent ) - w->reparent( parent, QPoint( 0, 0 ), TRUE ); + w->reparent( parent, TQPoint( 0, 0 ), TRUE ); return w; - } else if ( className == "QDataView" ) { - QWidget *w = new QDesignerDataView( parent, name ); + } else if ( className == "TQDataView" ) { + TQWidget *w = new QDesignerDataView( parent, name ); if ( parent ) - w->reparent( parent, QPoint( 0, 0 ), TRUE ); + w->reparent( parent, TQPoint( 0, 0 ), TRUE ); return w; } #endif @@ -984,7 +984,7 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, if ( !iface ) return 0; - QWidget *w = iface->create( className, parent, name ); + TQWidget *w = iface->create( className, parent, name ); #ifdef QT_CONTAINER_CUSTOM_WIDGETS if ( init && WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( className ) ) ) { QWidgetContainerInterfacePrivate *iface2 = 0; @@ -1003,44 +1003,44 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, /*! Find out which type the layout of the widget is. Returns \c HBox, \c VBox, \c Grid or \c NoLayout. \a layout points to this - QWidget::layout() of \a w or to 0 after the function call. + TQWidget::layout() of \a w or to 0 after the function call. */ -WidgetFactory::LayoutType WidgetFactory::layoutType( QWidget *w, QLayout *&layout ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&layout ) { layout = 0; - if ( ::qt_cast(w) ) - w = ((QTabWidget*)w)->currentPage(); - if ( ::qt_cast(w) ) - w = ((QWizard*)w)->currentPage(); - if ( ::qt_cast(w) ) - w = ((QMainWindow*)w)->centralWidget(); - if ( ::qt_cast(w) ) - w = ((QWidgetStack*)w)->visibleWidget(); - if ( ::qt_cast(w) ) - w = ((QToolBox*)w)->currentItem(); + if ( ::qt_cast(w) ) + w = ((TQTabWidget*)w)->currentPage(); + if ( ::qt_cast(w) ) + w = ((TQWizard*)w)->currentPage(); + if ( ::qt_cast(w) ) + w = ((TQMainWindow*)w)->centralWidget(); + if ( ::qt_cast(w) ) + w = ((TQWidgetStack*)w)->visibleWidget(); + if ( ::qt_cast(w) ) + w = ((TQToolBox*)w)->currentItem(); - if ( ::qt_cast(w) ) - return ( (QSplitter*)w )->orientation() == Horizontal ? HBox : VBox; + if ( ::qt_cast(w) ) + return ( (TQSplitter*)w )->orientation() == Horizontal ? HBox : VBox; if ( !w || !w->layout() ) return NoLayout; - QLayout *lay = w->layout(); + TQLayout *lay = w->layout(); - if ( ::qt_cast(w) ) { - QObjectList *l = lay->queryList( "QLayout" ); + if ( ::qt_cast(w) ) { + TQObjectList *l = lay->queryList( "TQLayout" ); if ( l && l->first() ) - lay = (QLayout*)l->first(); + lay = (TQLayout*)l->first(); delete l; } layout = lay; - if ( ::qt_cast(lay) ) + if ( ::qt_cast(lay) ) return HBox; - else if ( ::qt_cast(lay) ) + else if ( ::qt_cast(lay) ) return VBox; - else if ( ::qt_cast(lay) ) + else if ( ::qt_cast(lay) ) return Grid; return NoLayout; } @@ -1048,13 +1048,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( QWidget *w, QLayout *&layou /*! \overload */ -WidgetFactory::LayoutType WidgetFactory::layoutType( QLayout *layout ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout ) { - if ( ::qt_cast(layout) ) + if ( ::qt_cast(layout) ) return HBox; - else if ( ::qt_cast(layout) ) + else if ( ::qt_cast(layout) ) return VBox; - else if ( ::qt_cast(layout) ) + else if ( ::qt_cast(layout) ) return Grid; return NoLayout; } @@ -1062,19 +1062,19 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( QLayout *layout ) /*! \overload */ -WidgetFactory::LayoutType WidgetFactory::layoutType( QWidget *w ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w ) { - QLayout *l = 0; + TQLayout *l = 0; return layoutType( w, l ); } -QWidget *WidgetFactory::layoutParent( QLayout *layout ) +TQWidget *WidgetFactory::layoutParent( TQLayout *layout ) { - QObject *o = layout; + TQObject *o = layout; while ( o ) { if ( o->isWidgetType() ) - return (QWidget*)o; + return (TQWidget*)o; o = o->parent(); } return 0; @@ -1089,20 +1089,20 @@ QWidget *WidgetFactory::layoutParent( QLayout *layout ) tabwidget. So in this case this function returns the current page of the tabwidget.) */ -QWidget* WidgetFactory::containerOfWidget( QWidget *w ) +TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) { if ( !w ) return w; - if ( ::qt_cast(w) ) - return ((QTabWidget*)w)->currentPage(); - if ( ::qt_cast(w) ) - return ((QWizard*)w)->currentPage(); - if ( ::qt_cast(w) ) - return ((QWidgetStack*)w)->visibleWidget(); - if ( ::qt_cast(w) ) - return ((QToolBox*)w)->currentItem(); - if ( ::qt_cast(w) ) - return ((QMainWindow*)w)->centralWidget(); + if ( ::qt_cast(w) ) + return ((TQTabWidget*)w)->currentPage(); + if ( ::qt_cast(w) ) + return ((TQWizard*)w)->currentPage(); + if ( ::qt_cast(w) ) + return ((TQWidgetStack*)w)->visibleWidget(); + if ( ::qt_cast(w) ) + return ((TQToolBox*)w)->currentItem(); + if ( ::qt_cast(w) ) + return ((TQMainWindow*)w)->centralWidget(); #ifdef QT_CONTAINER_CUSTOM_WIDGETS if ( !WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ) return w; @@ -1114,7 +1114,7 @@ QWidget* WidgetFactory::containerOfWidget( QWidget *w ) iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 ); if ( !iface2 ) return w; - QWidget *c = iface2->containerOfWidget( w->className(), w ); + TQWidget *c = iface2->containerOfWidget( w->className(), w ); iface2->release(); iface->release(); if ( c ) @@ -1131,13 +1131,13 @@ QWidget* WidgetFactory::containerOfWidget( QWidget *w ) function returns the tabwidget then.) */ -QWidget* WidgetFactory::widgetOfContainer( QWidget *w ) +TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w ) { - if ( w && ::qt_cast(w->parentWidget()) ) + if ( w && ::qt_cast(w->parentWidget()) ) w = w->parentWidget(); if ( w->parentWidget() && w->parentWidget()->parentWidget() && w->parentWidget()->parentWidget()->parentWidget() && - ::qt_cast(w->parentWidget()->parentWidget()->parentWidget()) ) + ::qt_cast(w->parentWidget()->parentWidget()->parentWidget()) ) return w->parentWidget()->parentWidget()->parentWidget(); while ( w ) { int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ); @@ -1154,27 +1154,27 @@ QWidget* WidgetFactory::widgetOfContainer( QWidget *w ) */ bool WidgetFactory::lastWasAPassiveInteractor = FALSE; -QGuardedPtr *WidgetFactory::lastPassiveInteractor = new QGuardedPtr(); +TQGuardedPtr *WidgetFactory::lastPassiveInteractor = new TQGuardedPtr(); -bool WidgetFactory::isPassiveInteractor( QObject* o ) +bool WidgetFactory::isPassiveInteractor( TQObject* o ) { - if ( lastPassiveInteractor && *lastPassiveInteractor && (QObject*)(*lastPassiveInteractor) == o ) + if ( lastPassiveInteractor && *lastPassiveInteractor && (TQObject*)(*lastPassiveInteractor) == o ) return lastWasAPassiveInteractor; lastWasAPassiveInteractor = FALSE; (*lastPassiveInteractor) = o; - if ( QApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things + if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things return ( lastWasAPassiveInteractor = TRUE ); - if ( ::qt_cast(o) ) + if ( ::qt_cast(o) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::qt_cast(o) ) + else if ( ::qt_cast(o) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::qt_cast(o) && - ( ::qt_cast(o->parent()) || ::qt_cast(o->parent()) ) ) + else if ( ::qt_cast(o) && + ( ::qt_cast(o->parent()) || ::qt_cast(o->parent()) ) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::qt_cast(o) && ::qt_cast(o->parent()) ) + else if ( ::qt_cast(o) && ::qt_cast(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::qt_cast(o) && ::qt_cast(o->parent()) ) + else if ( ::qt_cast(o) && ::qt_cast(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); // else if ( ::qt_cast(o) ) else if ( o->inherits( "QDockWindowHandle" ) ) @@ -1188,7 +1188,7 @@ bool WidgetFactory::isPassiveInteractor( QObject* o ) if ( !o->isWidgetType() ) return ( lastWasAPassiveInteractor = FALSE ); WidgetInterface *iface = 0; - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; while ( !iface && w && !::qt_cast(w) ) { widgetManager()->queryInterface( classNameOf( w ), &iface ); w = w->parentWidget(); @@ -1199,13 +1199,13 @@ bool WidgetFactory::isPassiveInteractor( QObject* o ) iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 ); if ( !iface2 ) return ( lastWasAPassiveInteractor = FALSE ); - QWidget *fw = MainWindow::self->isAFormWindowChild( (QWidget*)o ); + TQWidget *fw = MainWindow::self->isAFormWindowChild( (TQWidget*)o ); if ( !fw ) return ( lastWasAPassiveInteractor = FALSE ); - QWidget *dw = ( (FormWindow*)fw )->designerWidget( (QWidget*)o ); + TQWidget *dw = ( (FormWindow*)fw )->designerWidget( (TQWidget*)o ); if ( !dw ) return ( lastWasAPassiveInteractor = FALSE ); - lastWasAPassiveInteractor = iface2->isPassiveInteractor( dw->className(), (QWidget*)o ); + lastWasAPassiveInteractor = iface2->isPassiveInteractor( dw->className(), (TQWidget*)o ); iface2->release(); iface->release(); #endif // QT_CONTAINER_CUSTOM_WIDGETS @@ -1216,84 +1216,84 @@ bool WidgetFactory::isPassiveInteractor( QObject* o ) /*! Returns the class name of object \a o that should be used for externally (i.e. for saving) */ -const char* WidgetFactory::classNameOf( QObject* o ) +const char* WidgetFactory::classNameOf( TQObject* o ) { if ( o->isA( "PropertyObject" ) ) return o->className(); if (WidgetDatabase::isCustomPluginWidget(WidgetDatabase::idFromClassName(o->className()))) return o->className(); else if ( ::qt_cast(o) ) - return "QTabWidget"; + return "TQTabWidget"; else if ( ::qt_cast(o) ) - return "QWidgetStack"; - else if ( ::qt_cast(o) ) + return "TQWidgetStack"; + else if ( ::qt_cast(o) ) return "QWeDoNotWantToBreakTabWidget"; else if ( ::qt_cast(o) ) - return "QDialog"; + return "TQDialog"; else if ( ::qt_cast(o) ) - return "QWidget"; + return "TQWidget"; else if ( o->inherits( "CustomWidget" ) ) return ( (CustomWidget*)o )->realClassName().latin1(); else if ( ::qt_cast(o) ) - return "QLabel"; + return "TQLabel"; else if ( ::qt_cast(o) ) - return "QWizard"; + return "TQWizard"; else if ( ::qt_cast(o) ) - return "QPushButton"; + return "TQPushButton"; else if ( ::qt_cast(o) ) - return "QToolButton"; + return "TQToolButton"; else if ( ::qt_cast(o) ) - return "QRadioButton"; + return "TQRadioButton"; else if ( ::qt_cast(o) ) - return "QCheckBox"; + return "TQCheckBox"; else if ( ::qt_cast(o) ) - return "QMenuBar"; + return "TQMenuBar"; else if ( ::qt_cast(o) ) - return "QToolBar"; + return "TQToolBar"; else if ( ::qt_cast(o) ) - return "QAction"; + return "TQAction"; else if ( ::qt_cast(o) ) - return "QActionGroup"; + return "TQActionGroup"; else if ( ::qt_cast(o) ) - return "QPopupMenu"; + return "TQPopupMenu"; else if ( ::qt_cast(o) ) - return "QToolBox"; + return "TQToolBox"; #ifndef QT_NO_SQL else if ( ::qt_cast(o) ) - return "QDataBrowser"; + return "TQDataBrowser"; else if ( ::qt_cast(o) ) - return "QDataView"; + return "TQDataView"; #endif return o->className(); } -QString WidgetFactory::defaultSignal( QObject *w ) +TQString WidgetFactory::defaultSignal( TQObject *w ) { - if ( ::qt_cast(w) || ::qt_cast(w) ) + if ( ::qt_cast(w) || ::qt_cast(w) ) return "toggled"; - else if ( ::qt_cast(w) || ::qt_cast(w) ) + else if ( ::qt_cast(w) || ::qt_cast(w) ) return "clicked"; - else if ( ::qt_cast(w) ) + else if ( ::qt_cast(w) ) return "linkClicked"; - else if ( ::qt_cast(w) || ::qt_cast(w) ) + else if ( ::qt_cast(w) || ::qt_cast(w) ) return "textChanged"; - else if ( ::qt_cast(w) || ::qt_cast(w) || - ::qt_cast(w) || ::qt_cast(w) ) + else if ( ::qt_cast(w) || ::qt_cast(w) || + ::qt_cast(w) || ::qt_cast(w) ) return "selectionChanged"; - else if ( ::qt_cast(w) ) + else if ( ::qt_cast(w) ) return "selected"; - else if ( ::qt_cast(w) ) + else if ( ::qt_cast(w) ) return "currentChanged"; - else if ( ::qt_cast(w) ) + else if ( ::qt_cast(w) ) return "aboutToShow"; - else if ( ::qt_cast(w) || ::qt_cast(w) || - ::qt_cast(w) || ::qt_cast(w) || + else if ( ::qt_cast(w) || ::qt_cast(w) || + ::qt_cast(w) || ::qt_cast(w) || ::qt_cast(w) || ::qt_cast(w) || - ::qt_cast(w) ) + ::qt_cast(w) ) return "valueChanged"; - else if ( ::qt_cast(w) ) + else if ( ::qt_cast(w) ) return "activated"; - return QString::null; + return TQString::null; } /*! As some properties are set by default when creating a widget this @@ -1301,7 +1301,7 @@ QString WidgetFactory::defaultSignal( QObject *w ) createWidget()! */ -void WidgetFactory::initChangedProperties( QObject *o ) +void WidgetFactory::initChangedProperties( TQObject *o ) { if ( MainWindow::self && MainWindow::self->currProject() && MainWindow::self->currProject()->fakeFormFileFor( o ) ) @@ -1310,11 +1310,11 @@ void WidgetFactory::initChangedProperties( QObject *o ) if ( !::qt_cast(o) && !::qt_cast(o) ) MetaDataBase::setPropertyChanged( o, "geometry", TRUE ); - if ( ::qt_cast(o) || - ::qt_cast(o) || - ::qt_cast(o) || - ::qt_cast(o) ) { - if (::qt_cast(o) && ::qt_cast(widgetOfContainer((QWidget*)o->parent()))) { + if ( ::qt_cast(o) || + ::qt_cast(o) || + ::qt_cast(o) || + ::qt_cast(o) ) { + if (::qt_cast(o) && ::qt_cast(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); @@ -1323,19 +1323,19 @@ void WidgetFactory::initChangedProperties( QObject *o ) MetaDataBase::setPropertyChanged( o, "text", TRUE ); } } - else if ( ::qt_cast(o) ) + else if ( ::qt_cast(o) ) MetaDataBase::setPropertyChanged( o, "title", TRUE ); - else if ( o->isA( "QFrame" ) ) { + else if ( o->isA( "TQFrame" ) ) { MetaDataBase::setPropertyChanged( o, "frameShadow", TRUE ); MetaDataBase::setPropertyChanged( o, "frameShape", TRUE ); - } else if ( ::qt_cast(o) || ::qt_cast(o) ) { + } else if ( ::qt_cast(o) || ::qt_cast(o) ) { MetaDataBase::setPropertyChanged( o, "pageTitle", TRUE ); MetaDataBase::setPropertyChanged( o, "pageName", TRUE ); MetaDataBase::setPropertyChanged( o, "currentPage", TRUE ); - } else if ( ::qt_cast(o) ) { + } else if ( ::qt_cast(o) ) { MetaDataBase::setPropertyChanged( o, "currentPage", TRUE ); MetaDataBase::setPropertyChanged( o, "pageName", TRUE ); - } else if ( ::qt_cast(o) ) { + } else if ( ::qt_cast(o) ) { MetaDataBase::setPropertyChanged( o, "currentIndex", TRUE ); MetaDataBase::setPropertyChanged( o, "itemName", TRUE ); MetaDataBase::setPropertyChanged( o, "itemLabel", TRUE ); @@ -1343,21 +1343,21 @@ void WidgetFactory::initChangedProperties( QObject *o ) MetaDataBase::setPropertyChanged( o, "itemToolTip", TRUE ); MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", TRUE ); #ifndef QT_NO_TABLE - } else if ( ::qt_cast(o) ) { + } else if ( ::qt_cast(o) ) { # ifndef QT_NO_SQL - if (!::qt_cast(o) ) + if (!::qt_cast(o) ) # endif { MetaDataBase::setPropertyChanged( o, "numRows", TRUE ); MetaDataBase::setPropertyChanged( o, "numCols", TRUE ); - QTable *t = (QTable*)o; + TQTable *t = (TQTable*)o; for ( int i = 0; i < 3; ++i ) { - t->horizontalHeader()->setLabel( i, QString::number( i + 1 ) ); - t->verticalHeader()->setLabel( i, QString::number( i + 1 ) ); + t->horizontalHeader()->setLabel( i, TQString::number( i + 1 ) ); + t->verticalHeader()->setLabel( i, TQString::number( i + 1 ) ); } } #endif - } else if ( ::qt_cast(o) ) { + } else if ( ::qt_cast(o) ) { MetaDataBase::setPropertyChanged( o, "orientation", TRUE ); } else if ( ::qt_cast(o) ) { MetaDataBase::setPropertyChanged( o, "label", TRUE ); @@ -1368,9 +1368,9 @@ void WidgetFactory::initChangedProperties( QObject *o ) } } -bool WidgetFactory::hasSpecialEditor( int id, QObject *editorWidget ) +bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget ) { - QString className = WidgetDatabase::className( id ); + TQString className = WidgetDatabase::className( id ); if ( className.contains( "ListBox" ) ) return TRUE; @@ -1380,32 +1380,32 @@ bool WidgetFactory::hasSpecialEditor( int id, QObject *editorWidget ) return TRUE; if ( className.contains( "IconView" ) ) return TRUE; - if ( className == "QTextEdit" || className == "QMultiLineEdit" ) + if ( className == "TQTextEdit" || className == "TQMultiLineEdit" ) return TRUE; - if ( ::qt_cast(editorWidget) != 0 ) + if ( ::qt_cast(editorWidget) != 0 ) return TRUE; return FALSE; } -bool WidgetFactory::hasItems( int id, QObject *editorWidget ) +bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) { - QString className = WidgetDatabase::className( id ); + TQString className = WidgetDatabase::className( id ); if ( className.contains( "ListBox" ) || className.contains( "ListView" ) || className.contains( "IconView" ) || className.contains( "ComboBox" ) || - ::qt_cast(editorWidget) != 0 ) + ::qt_cast(editorWidget) != 0 ) return TRUE; return FALSE; } -void WidgetFactory::editWidget( int id, QWidget *parent, QWidget *editWidget, FormWindow *fw ) +void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) { - QString className = WidgetDatabase::className( id ); + TQString className = WidgetDatabase::className( id ); if ( className.contains( "ListBox" ) ) { - if ( !::qt_cast(editWidget) ) + if ( !::qt_cast(editWidget) ) return; ListBoxEditor *e = new ListBoxEditor( parent, editWidget, fw ); e->exec(); @@ -1414,9 +1414,9 @@ void WidgetFactory::editWidget( int id, QWidget *parent, QWidget *editWidget, Fo } if ( className.contains( "ComboBox" ) ) { - if ( !::qt_cast(editWidget) ) + if ( !::qt_cast(editWidget) ) return; - QComboBox *cb = (QComboBox*)editWidget; + TQComboBox *cb = (TQComboBox*)editWidget; ListBoxEditor *e = new ListBoxEditor( parent, cb->listBox(), fw ); e->exec(); delete e; @@ -1425,9 +1425,9 @@ void WidgetFactory::editWidget( int id, QWidget *parent, QWidget *editWidget, Fo } if ( className.contains( "ListView" ) ) { - if ( !::qt_cast(editWidget) ) + if ( !::qt_cast(editWidget) ) return; - QListView *lv = (QListView*)editWidget; + TQListView *lv = (TQListView*)editWidget; ListViewEditor *e = new ListViewEditor( parent, lv, fw ); e->exec(); delete e; @@ -1435,7 +1435,7 @@ void WidgetFactory::editWidget( int id, QWidget *parent, QWidget *editWidget, Fo } if ( className.contains( "IconView" ) ) { - if ( !::qt_cast(editWidget) ) + if ( !::qt_cast(editWidget) ) return; IconViewEditor *e = new IconViewEditor( parent, editWidget, fw ); e->exec(); @@ -1443,14 +1443,14 @@ void WidgetFactory::editWidget( int id, QWidget *parent, QWidget *editWidget, Fo return; } - if ( className == "QMultiLineEdit" || className == "QTextEdit" ) { + if ( className == "TQMultiLineEdit" || className == "TQTextEdit" ) { MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw ); e->exec(); delete e; return; } #ifndef QT_NO_TABLE - if (::qt_cast(editWidget) != 0) { + if (::qt_cast(editWidget) != 0) { TableEditor *e = new TableEditor( parent, editWidget, fw ); e->exec(); delete e; @@ -1459,44 +1459,44 @@ void WidgetFactory::editWidget( int id, QWidget *parent, QWidget *editWidget, Fo #endif } -bool WidgetFactory::canResetProperty( QObject *w, const QString &propName ) +bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName ) { if ( propName == "name" || propName == "geometry" ) return FALSE; - QStringList l = *changedProperties->find( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); + TQStringList l = *changedProperties->find( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); return l.findIndex( propName ) == -1; } -bool WidgetFactory::resetProperty( QObject *w, const QString &propName ) +bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) { - const QMetaProperty *p = w->metaObject()->property( w->metaObject()-> + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()-> findProperty( propName, TRUE ), TRUE ); if (!p ) return FALSE; return p->reset( w ); } -QVariant WidgetFactory::defaultValue( QObject *w, const QString &propName ) +TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) { if ( propName == "wordwrap" ) { int v = defaultValue( w, "alignment" ).toInt(); - return QVariant( ( v & WordBreak ) == WordBreak, 0 ); + return TQVariant( ( v & WordBreak ) == WordBreak, 0 ); } else if ( propName == "toolTip" || propName == "whatsThis" ) { - return QVariant( QString::fromLatin1( "" ) ); + return TQVariant( TQString::fromLatin1( "" ) ); } else if ( w->inherits( "CustomWidget" ) ) { - return QVariant(); + return TQVariant(); } else if ( propName == "frameworkCode" ) { - return QVariant( TRUE, 0 ); + return TQVariant( TRUE, 0 ); } else if ( propName == "layoutMargin" || propName == "layoutSpacing" ) { - return QVariant( -1 ); + return TQVariant( -1 ); } return *( *defaultProperties->find( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).find( propName ); } -QString WidgetFactory::defaultCurrentItem( QObject *w, const QString &propName ) +TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName ) { - const QMetaProperty *p = w->metaObject()-> + const TQMetaProperty *p = w->metaObject()-> property( w->metaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { int v = defaultValue( w, "alignment" ).toInt(); @@ -1521,23 +1521,23 @@ QString WidgetFactory::defaultCurrentItem( QObject *w, const QString &propName ) } else if ( propName == "resizeMode" ) { return "Auto"; } - return QString::null; + return TQString::null; } return p->valueToKey( defaultValue( w, propName ).toInt() ); } -QWidget *WidgetFactory::createCustomWidget( QWidget *parent, const char *name, MetaDataBase::CustomWidget *w ) +TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ) { if ( !w ) return 0; return new CustomWidget( parent, name, w ); } -QVariant WidgetFactory::property( QObject *w, const char *name ) +TQVariant WidgetFactory::property( TQObject *w, const char *name ) { int id = w->metaObject()->findProperty( name, TRUE ); - const QMetaProperty* p = w->metaObject()->property( id, TRUE ); + const TQMetaProperty* p = w->metaObject()->property( id, TRUE ); if ( !p || !p->isValid() ) return MetaDataBase::fakeProperty( w, name ); return w->property( name ); @@ -1549,70 +1549,70 @@ void QDesignerLabel::updateBuddy() if ( myBuddy.isEmpty() ) return; - QObjectList *l = topLevelWidget()->queryList( "QWidget", myBuddy, FALSE, TRUE ); + TQObjectList *l = topLevelWidget()->queryList( "TQWidget", myBuddy, FALSE, TRUE ); if ( !l || !l->first() ) { delete l; return; } - QLabel::setBuddy( (QWidget*)l->first() ); + TQLabel::setBuddy( (TQWidget*)l->first() ); delete l; } -void QDesignerWidget::resizeEvent( QResizeEvent* e) +void QDesignerWidget::resizeEvent( TQResizeEvent* e) { if ( need_frame ) { - QPainter p(this); + TQPainter p(this); p.setPen( backgroundColor() ); - p.drawRect( QRect( QPoint(0,0), e->oldSize() ) ); + p.drawRect( TQRect( TQPoint(0,0), e->oldSize() ) ); } } -void QDesignerWidget::paintEvent( QPaintEvent *e ) +void QDesignerWidget::paintEvent( TQPaintEvent *e ) { if ( need_frame ) { - QPainter p(this); + TQPainter p(this); p.setPen( backgroundColor().dark() ); p.drawRect( rect() ); } formwindow->paintGrid( this, e ); } -void QDesignerDialog::paintEvent( QPaintEvent *e ) +void QDesignerDialog::paintEvent( TQPaintEvent *e ) { formwindow->paintGrid( this, e ); } -QSizePolicy QLayoutWidget::sizePolicy() const +TQSizePolicy QLayoutWidget::sizePolicy() const { return sp; } -bool QLayoutWidget::event( QEvent *e ) +bool QLayoutWidget::event( TQEvent *e ) { - if ( e && ( e->type() == QEvent::ChildInserted || - e->type() == QEvent::ChildRemoved || - e->type() == QEvent::LayoutHint || - e->type() == QEvent::Reparent ) ) + if ( e && ( e->type() == TQEvent::ChildInserted || + e->type() == TQEvent::ChildRemoved || + e->type() == TQEvent::LayoutHint || + e->type() == TQEvent::Reparent ) ) updateSizePolicy(); - return QWidget::event( e ); + return TQWidget::event( e ); } /* This function must be called on QLayoutWidget creation and whenever the QLayoutWidget's parent layout changes (e.g., from a QHBoxLayout - to a QVBoxLayout), because of the (illogical) way layouting works. + to a TQVBoxLayout), because of the (illogical) way layouting works. */ void QLayoutWidget::updateSizePolicy() { if ( !children() || children()->count() == 0 ) { - sp = QWidget::sizePolicy(); + sp = TQWidget::sizePolicy(); return; } /* - QSizePolicy::MayShrink & friends are private. Here we assume the + TQSizePolicy::MayShrink & friends are private. Here we assume the following: Fixed = 0 @@ -1621,111 +1621,111 @@ void QLayoutWidget::updateSizePolicy() Preferred = MayShrink | MayGrow */ - int ht = (int) QSizePolicy::Preferred; - int vt = (int) QSizePolicy::Preferred; + int ht = (int) TQSizePolicy::Preferred; + int vt = (int) TQSizePolicy::Preferred; if ( layout() ) { /* parentLayout is set to the parent layout if there is one and if it is top level, in which case layouting is illogical. */ - QLayout *parentLayout = 0; + TQLayout *parentLayout = 0; if ( parent() && parent()->isWidgetType() ) { - parentLayout = ((QWidget *)parent())->layout(); + parentLayout = ((TQWidget *)parent())->layout(); if ( parentLayout && ::qt_cast(parentLayout->mainWidget()) ) parentLayout = 0; } - QObjectListIt it( *children() ); - QObject *o; + TQObjectListIt it( *children() ); + TQObject *o; - if ( ::qt_cast(layout()) ) { - if ( ::qt_cast(parentLayout) ) - vt = QSizePolicy::Minimum; + if ( ::qt_cast(layout()) ) { + if ( ::qt_cast(parentLayout) ) + vt = TQSizePolicy::Minimum; else - vt = QSizePolicy::Fixed; + vt = TQSizePolicy::Fixed; while ( ( o = it.current() ) ) { ++it; - if ( !o->isWidgetType() || ( (QWidget*)o )->testWState( WState_ForceHide ) ) + if ( !o->isWidgetType() || ( (TQWidget*)o )->testWState( WState_ForceHide ) ) continue; - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; if ( !w->sizePolicy().mayGrowHorizontally() ) - ht &= ~QSizePolicy::Minimum; + ht &= ~TQSizePolicy::Minimum; if ( !w->sizePolicy().mayShrinkHorizontally() ) - ht &= ~QSizePolicy::Maximum; + ht &= ~TQSizePolicy::Maximum; if ( w->sizePolicy().mayGrowVertically() ) - vt |= QSizePolicy::Minimum; + vt |= TQSizePolicy::Minimum; if ( w->sizePolicy().mayShrinkVertically() ) - vt |= QSizePolicy::Maximum; + vt |= TQSizePolicy::Maximum; } - } else if ( ::qt_cast(layout()) ) { - if ( ::qt_cast(parentLayout) ) - ht = QSizePolicy::Minimum; + } else if ( ::qt_cast(layout()) ) { + if ( ::qt_cast(parentLayout) ) + ht = TQSizePolicy::Minimum; else - ht = QSizePolicy::Fixed; + ht = TQSizePolicy::Fixed; while ( ( o = it.current() ) ) { ++it; - if ( !o->isWidgetType() || ( (QWidget*)o )->testWState( WState_ForceHide ) ) + if ( !o->isWidgetType() || ( (TQWidget*)o )->testWState( WState_ForceHide ) ) continue; - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; if ( w->sizePolicy().mayGrowHorizontally() ) - ht |= QSizePolicy::Minimum; + ht |= TQSizePolicy::Minimum; if ( w->sizePolicy().mayShrinkHorizontally() ) - ht |= QSizePolicy::Maximum; + ht |= TQSizePolicy::Maximum; if ( !w->sizePolicy().mayGrowVertically() ) - vt &= ~QSizePolicy::Minimum; + vt &= ~TQSizePolicy::Minimum; if ( !w->sizePolicy().mayShrinkVertically() ) - vt &= ~QSizePolicy::Maximum; + vt &= ~TQSizePolicy::Maximum; } - } else if ( ::qt_cast(layout()) ) { - ht = QSizePolicy::Fixed; - vt = QSizePolicy::Fixed; + } else if ( ::qt_cast(layout()) ) { + ht = TQSizePolicy::Fixed; + vt = TQSizePolicy::Fixed; if ( parentLayout ) { - if ( ::qt_cast(parentLayout) ) - ht = QSizePolicy::Minimum; - else if ( ::qt_cast(parentLayout) ) - vt = QSizePolicy::Minimum; + if ( ::qt_cast(parentLayout) ) + ht = TQSizePolicy::Minimum; + else if ( ::qt_cast(parentLayout) ) + vt = TQSizePolicy::Minimum; } while ( ( o = it.current() ) ) { ++it; - if ( !o->isWidgetType() || ( (QWidget*)o )->testWState( WState_ForceHide ) ) + if ( !o->isWidgetType() || ( (TQWidget*)o )->testWState( WState_ForceHide ) ) continue; - QWidget *w = (QWidget*)o; + TQWidget *w = (TQWidget*)o; if ( w->sizePolicy().mayGrowHorizontally() ) - ht |= QSizePolicy::Minimum; + ht |= TQSizePolicy::Minimum; if ( w->sizePolicy().mayShrinkHorizontally() ) - ht |= QSizePolicy::Maximum; + ht |= TQSizePolicy::Maximum; if ( w->sizePolicy().mayGrowVertically() ) - vt |= QSizePolicy::Minimum; + vt |= TQSizePolicy::Minimum; if ( w->sizePolicy().mayShrinkVertically() ) - vt |= QSizePolicy::Maximum; + vt |= TQSizePolicy::Maximum; } } - if ( layout()->expanding() & QSizePolicy::Horizontally ) - ht = QSizePolicy::Expanding; - if ( layout()->expanding() & QSizePolicy::Vertically ) - vt = QSizePolicy::Expanding; + if ( layout()->expanding() & TQSizePolicy::Horizontally ) + ht = TQSizePolicy::Expanding; + if ( layout()->expanding() & TQSizePolicy::Vertically ) + vt = TQSizePolicy::Expanding; layout()->invalidate(); } - sp = QSizePolicy( (QSizePolicy::SizeType) ht, (QSizePolicy::SizeType) vt ); + sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt ); updateGeometry(); } -void CustomWidget::paintEvent( QPaintEvent *e ) +void CustomWidget::paintEvent( TQPaintEvent *e ) { if ( ::qt_cast(parentWidget()) ) { ( (FormWindow*)parentWidget() )->paintGrid( this, e ); } else { - QPainter p( this ); + TQPainter p( this ); p.fillRect( rect(), colorGroup().dark() ); p.setPen( colorGroup().light() ); p.drawText( 2, 2, width() - 4, height() - 4, Qt::AlignAuto | Qt::AlignTop, cusw->className ); @@ -1740,7 +1740,7 @@ CustomWidgetFactory::CustomWidgetFactory() { } -QWidget *CustomWidgetFactory::createWidget( const QString &className, QWidget *parent, const char *name ) const +TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const { MetaDataBase::CustomWidget *w = MetaDataBase::customWidget( WidgetDatabase::idFromClassName( className ) ); if ( !w ) @@ -1749,27 +1749,27 @@ QWidget *CustomWidgetFactory::createWidget( const QString &className, QWidget *p } -QDesignerToolBox::QDesignerToolBox( QWidget *parent, const char *name ) - : QToolBox( parent, name ) +QDesignerToolBox::QDesignerToolBox( TQWidget *parent, const char *name ) + : TQToolBox( parent, name ) { } -QString QDesignerToolBox::itemLabel() const +TQString QDesignerToolBox::itemLabel() const { - return QToolBox::itemLabel( currentIndex() ); + return TQToolBox::itemLabel( currentIndex() ); } -void QDesignerToolBox::setItemLabel( const QString &l ) +void QDesignerToolBox::setItemLabel( const TQString &l ) { - QToolBox::setItemLabel( currentIndex(), l ); + TQToolBox::setItemLabel( currentIndex(), l ); } -QCString QDesignerToolBox::itemName() const +TQCString QDesignerToolBox::itemName() const { return currentItem() ? currentItem()->name() : 0; } -void QDesignerToolBox::setItemName( const QCString &n ) +void QDesignerToolBox::setItemName( const TQCString &n ) { if (currentItem()) currentItem()->setName( n ); @@ -1784,7 +1784,7 @@ Qt::BackgroundMode QDesignerToolBox::itemBackgroundMode() const void QDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode ) { for (int i = 0; i < count(); ++i) { - QWidget *w = item(i); + TQWidget *w = item(i); w->setBackgroundMode( bmode ); w->update(); } diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h index b235b8f4..dcf18e6c 100644 --- a/kdevdesigner/designer/widgetfactory.h +++ b/kdevdesigner/designer/widgetfactory.h @@ -27,30 +27,30 @@ #ifndef WIDGETFACTORY_H #define WIDGETFACTORY_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "metadatabase.h" -#include "qwidgetfactory.h" +#include "tqwidgetfactory.h" class QWidget; class QLayout; @@ -60,7 +60,7 @@ class CustomWidgetFactory : public QWidgetFactory { public: CustomWidgetFactory(); - QWidget *createWidget( const QString &className, QWidget *parent, const char *name ) const; + TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const; }; @@ -76,45 +76,45 @@ public: NoLayout }; - static QWidget *create( int id, QWidget *parent, const char *name = 0, bool init = TRUE, - const QRect *rect = 0, Qt::Orientation orient = Qt::Horizontal ); - static QLayout *createLayout( QWidget *widget, QLayout* layout, LayoutType type ); - static void deleteLayout( QWidget *widget ); + static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE, + const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal ); + static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type ); + static void deleteLayout( TQWidget *widget ); - static LayoutType layoutType( QWidget *w ); - static LayoutType layoutType( QWidget *w, QLayout *&layout ); - static LayoutType layoutType( QLayout *layout ); - static QWidget *layoutParent( QLayout *layout ); + static LayoutType layoutType( TQWidget *w ); + static LayoutType layoutType( TQWidget *w, TQLayout *&layout ); + static LayoutType layoutType( TQLayout *layout ); + static TQWidget *layoutParent( TQLayout *layout ); - static QWidget* containerOfWidget( QWidget *w ); - static QWidget* widgetOfContainer( QWidget *w ); + static TQWidget* containerOfWidget( TQWidget *w ); + static TQWidget* widgetOfContainer( TQWidget *w ); - static bool isPassiveInteractor( QObject* o ); - static const char* classNameOf( QObject* o ); + static bool isPassiveInteractor( TQObject* o ); + static const char* classNameOf( TQObject* o ); - static void initChangedProperties( QObject *o ); + static void initChangedProperties( TQObject *o ); - static bool hasSpecialEditor( int id, QObject *editorWidget ); - static bool hasItems( int id, QObject *editorWidget ); - static void editWidget( int id, QWidget *parent, QWidget *editWidget, FormWindow *fw ); + static bool hasSpecialEditor( int id, TQObject *editorWidget ); + static bool hasItems( int id, TQObject *editorWidget ); + static void editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); - static bool canResetProperty( QObject *w, const QString &propName ); - static bool resetProperty( QObject *w, const QString &propName ); - static QVariant defaultValue( QObject *w, const QString &propName ); - static QString defaultCurrentItem( QObject *w, const QString &propName ); + static bool canResetProperty( TQObject *w, const TQString &propName ); + static bool resetProperty( TQObject *w, const TQString &propName ); + static TQVariant defaultValue( TQObject *w, const TQString &propName ); + static TQString defaultCurrentItem( TQObject *w, const TQString &propName ); - static QVariant property( QObject *w, const char *name ); - static void saveDefaultProperties( QObject *w, int id ); - static void saveChangedProperties( QObject *w, int id ); + static TQVariant property( TQObject *w, const char *name ); + static void saveDefaultProperties( TQObject *w, int id ); + static void saveChangedProperties( TQObject *w, int id ); - static QString defaultSignal( QObject *w ); + static TQString defaultSignal( TQObject *w ); private: - static QWidget *createWidget( const QString &className, QWidget *parent, const char *name, bool init, - const QRect *r = 0, Qt::Orientation orient = Qt::Horizontal ); - static QWidget *createCustomWidget( QWidget *parent, const char *name, MetaDataBase::CustomWidget *w ); + static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, + const TQRect *r = 0, Qt::Orientation orient = Qt::Horizontal ); + static TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ); - static QGuardedPtr *lastPassiveInteractor; + static TQGuardedPtr *lastPassiveInteractor; static bool lastWasAPassiveInteractor; }; @@ -123,28 +123,28 @@ class QDesignerTabWidget : public QTabWidget { Q_OBJECT Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) - Q_PROPERTY( QString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) - Q_PROPERTY( QCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) + Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) + Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - QDesignerTabWidget( QWidget *parent, const char *name ); + QDesignerTabWidget( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); - QString pageTitle() const; - void setPageTitle( const QString& title ); - QCString pageName() const; - void setPageName( const QCString& name ); + TQString pageTitle() const; + void setPageTitle( const TQString& title ); + TQCString pageName() const; + void setPageName( const TQCString& name ); int count() const; - QTabBar *tabBar() const { return QTabWidget::tabBar(); } + TQTabBar *tabBar() const { return TQTabWidget::tabBar(); } - bool eventFilter( QObject*, QEvent* ); + bool eventFilter( TQObject*, TQEvent* ); private: - QPoint pressPoint; - QWidget *dropIndicator; - QWidget *dragPage; - QString dragLabel; + TQPoint pressPoint; + TQWidget *dropIndicator; + TQWidget *dragPage; + TQString dragLabel; bool mousePressed; }; @@ -152,32 +152,32 @@ class QDesignerWidgetStack : public QWidgetStack { Q_OBJECT Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) - Q_PROPERTY( QCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) + Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - QDesignerWidgetStack( QWidget *parent, const char *name ); + QDesignerWidgetStack( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); - QCString pageName() const; - void setPageName( const QCString& name ); + TQCString pageName() const; + void setPageName( const TQCString& name ); int count() const; - QWidget* page( int i ) const; + TQWidget* page( int i ) const; - int insertPage( QWidget *p, int i = -1 ); - int removePage( QWidget *p ); + int insertPage( TQWidget *p, int i = -1 ); + int removePage( TQWidget *p ); public slots: void updateButtons(); protected: - void resizeEvent( QResizeEvent *e ) { - QWidgetStack::resizeEvent( e ); + void resizeEvent( TQResizeEvent *e ) { + TQWidgetStack::resizeEvent( e ); updateButtons(); } - void showEvent( QShowEvent *e ) { - QWidgetStack::showEvent( e ); + void showEvent( TQShowEvent *e ) { + TQWidgetStack::showEvent( e ); updateButtons(); } @@ -186,8 +186,8 @@ private slots: void nextPage(); private: - QPtrList pages; - QToolButton *prev, *next; + TQPtrList pages; + TQToolButton *prev, *next; }; @@ -195,25 +195,25 @@ class QDesignerWizard : public QWizard { Q_OBJECT Q_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true ) - Q_PROPERTY( QString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) - Q_PROPERTY( QCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) + Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) + Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) Q_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - QDesignerWizard( QWidget *parent, const char *name ) - : QWizard( parent, name ), modal(FALSE) {} + QDesignerWizard( TQWidget *parent, const char *name ) + : TQWizard( parent, name ), modal(FALSE) {} int currentPageNum() const; void setCurrentPage( int i ); - QString pageTitle() const; - void setPageTitle( const QString& title ); - QCString pageName() const; - void setPageName( const QCString& name ); - int pageNum( QWidget *page ); - void addPage( QWidget *p, const QString & ); - void removePage( QWidget *p ); - void insertPage( QWidget *p, const QString &t, int index ); - bool isPageRemoved( QWidget *p ) { return (removedPages.find( p ) != 0); } + TQString pageTitle() const; + void setPageTitle( const TQString& title ); + TQCString pageName() const; + void setPageName( const TQCString& name ); + int pageNum( TQWidget *page ); + void addPage( TQWidget *p, const TQString & ); + void removePage( TQWidget *p ); + void insertPage( TQWidget *p, const TQString &t, int index ); + bool isPageRemoved( TQWidget *p ) { return (removedPages.find( p ) != 0); } bool isModal() const { return modal; } void setModal(bool b) { modal = b; } @@ -223,12 +223,12 @@ public: private: struct Page { - Page( QWidget *a, const QString &b ) : p( a ), t( b ) {} - Page() : p( 0 ), t( QString::null ) {} - QWidget *p; - QString t; + Page( TQWidget *a, const TQString &b ) : p( a ), t( b ) {} + Page() : p( 0 ), t( TQString::null ) {} + TQWidget *p; + TQString t; }; - QPtrDict removedPages; + TQPtrDict removedPages; bool modal; }; @@ -238,15 +238,15 @@ class QLayoutWidget : public QWidget Q_OBJECT public: - QLayoutWidget( QWidget *parent, const char *name ) : QWidget( parent, name ), sp( QWidget::sizePolicy() ) {} + QLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::sizePolicy() ) {} - QSizePolicy sizePolicy() const; + TQSizePolicy sizePolicy() const; void updateSizePolicy(); protected: - void paintEvent( QPaintEvent * ); - bool event( QEvent * ); - QSizePolicy sp; + void paintEvent( TQPaintEvent * ); + bool event( TQEvent * ); + TQSizePolicy sp; }; @@ -256,26 +256,26 @@ class CustomWidget : public QWidget Q_OBJECT public: - CustomWidget( QWidget *parent, const char *name, MetaDataBase::CustomWidget *cw ) - : QWidget( parent, name ), cusw( cw ) { + CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw ) + : TQWidget( parent, name ), cusw( cw ) { alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" ); setSizePolicy( cw->sizePolicy ); if ( !alwaysExpand ) setBackgroundMode( PaletteDark ); } - QSize sizeHint() const { - QSize sh = cusw->sizeHint; + TQSize sizeHint() const { + TQSize sh = cusw->sizeHint; if ( sh.isValid() ) return sh; - return QWidget::sizeHint(); + return TQWidget::sizeHint(); } - QString realClassName() { return cusw->className; } + TQString realClassName() { return cusw->className; } MetaDataBase::CustomWidget *customWidget() const { return cusw; } protected: - void paintEvent( QPaintEvent *e ); + void paintEvent( TQPaintEvent *e ); MetaDataBase::CustomWidget *cusw; bool alwaysExpand; @@ -290,11 +290,11 @@ class Line : public QFrame Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) Q_OVERRIDE( int frameWidth DESIGNABLE false ) Q_OVERRIDE( Shape frameShape DESIGNABLE false ) - Q_OVERRIDE( QRect frameRect DESIGNABLE false ) - Q_OVERRIDE( QRect contentsRect DESIGNABLE false ) + Q_OVERRIDE( TQRect frameRect DESIGNABLE false ) + Q_OVERRIDE( TQRect contentsRect DESIGNABLE false ) public: - Line( QWidget *parent, const char *name ) - : QFrame( parent, name, WMouseNoMask ) { + Line( TQWidget *parent, const char *name ) + : TQFrame( parent, name, WMouseNoMask ) { setFrameStyle( HLine | Sunken ); } @@ -313,23 +313,23 @@ class QDesignerLabel : public QLabel { Q_OBJECT - Q_PROPERTY( QCString buddy READ buddyWidget WRITE setBuddyWidget ) + Q_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) public: - QDesignerLabel( QWidget *parent = 0, const char *name = 0 ) - : QLabel( parent, name ) { myBuddy = 0; } + QDesignerLabel( TQWidget *parent = 0, const char *name = 0 ) + : TQLabel( parent, name ) { myBuddy = 0; } - void setBuddyWidget( const QCString &b ) { + void setBuddyWidget( const TQCString &b ) { myBuddy = b; updateBuddy(); } - QCString buddyWidget() const { + TQCString buddyWidget() const { return myBuddy; }; protected: - void showEvent( QShowEvent *e ) { - QLabel::showEvent( e ); + void showEvent( TQShowEvent *e ) { + TQLabel::showEvent( e ); updateBuddy(); } @@ -337,7 +337,7 @@ protected: private: void updateBuddy(); - QCString myBuddy; + TQCString myBuddy; }; @@ -346,14 +346,14 @@ class QDesignerWidget : public QWidget Q_OBJECT public: - QDesignerWidget( FormWindow *fw, QWidget *parent, const char *name ) - : QWidget( parent, name, WResizeNoErase ), formwindow( fw ) { + QDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WResizeNoErase ), formwindow( fw ) { need_frame = parent && parent->inherits("QDesignerWidgetStack" ); } protected: - void resizeEvent( QResizeEvent* e); - void paintEvent( QPaintEvent *e ); + void resizeEvent( TQResizeEvent* e); + void paintEvent( TQPaintEvent *e ); private: FormWindow *formwindow; @@ -367,14 +367,14 @@ class QDesignerDialog : public QDialog Q_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - QDesignerDialog( FormWindow *fw, QWidget *parent, const char *name ) - : QDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {} + QDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name ) + : TQDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {} bool isModal() const { return modal; } void setModal(bool b) { modal = b; } protected: - void paintEvent( QPaintEvent *e ); + void paintEvent( TQPaintEvent *e ); private: FormWindow *formwindow; @@ -388,19 +388,19 @@ class QDesignerToolButton : public QToolButton Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerToolButton( QWidget *parent, const char *name ) - : QToolButton( parent, name ) {} + QDesignerToolButton( TQWidget *parent, const char *name ) + : TQToolButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( "QButtonGroup" ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( "QButtonGroup" ) ? ( (QButtonGroup*)parentWidget() )->id( (QButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( "QButtonGroup" ) ) { - ( (QButtonGroup*)parentWidget() )->remove( this ); - ( (QButtonGroup*)parentWidget() )->insert( this, id ); + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { + ( (TQButtonGroup*)parentWidget() )->remove( this ); + ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } } }; @@ -411,19 +411,19 @@ class QDesignerRadioButton : public QRadioButton Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerRadioButton( QWidget *parent, const char *name ) - : QRadioButton( parent, name ) {} + QDesignerRadioButton( TQWidget *parent, const char *name ) + : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( "QButtonGroup" ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( "QButtonGroup" ) ? ( (QButtonGroup*)parentWidget() )->id( (QButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( "QButtonGroup" ) ) { - ( (QButtonGroup*)parentWidget() )->remove( this ); - ( (QButtonGroup*)parentWidget() )->insert( this, id ); + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { + ( (TQButtonGroup*)parentWidget() )->remove( this ); + ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } } @@ -435,19 +435,19 @@ class QDesignerPushButton : public QPushButton Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerPushButton( QWidget *parent, const char *name ) - : QPushButton( parent, name ) {} + QDesignerPushButton( TQWidget *parent, const char *name ) + : TQPushButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( "QButtonGroup" ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( "QButtonGroup" ) ? ( (QButtonGroup*)parentWidget() )->id( (QButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( "QButtonGroup" ) ) { - ( (QButtonGroup*)parentWidget() )->remove( this ); - ( (QButtonGroup*)parentWidget() )->insert( this, id ); + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { + ( (TQButtonGroup*)parentWidget() )->remove( this ); + ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } } @@ -459,19 +459,19 @@ class QDesignerCheckBox : public QCheckBox Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerCheckBox( QWidget *parent, const char *name ) - : QCheckBox( parent, name ) {} + QDesignerCheckBox( TQWidget *parent, const char *name ) + : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( "QButtonGroup" ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( "QButtonGroup" ) ? ( (QButtonGroup*)parentWidget() )->id( (QButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( "QButtonGroup" ) ) { - ( (QButtonGroup*)parentWidget() )->remove( this ); - ( (QButtonGroup*)parentWidget() )->insert( this, id ); + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { + ( (TQButtonGroup*)parentWidget() )->remove( this ); + ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } } @@ -480,17 +480,17 @@ public: class QDesignerToolBox : public QToolBox { Q_OBJECT - Q_PROPERTY( QString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true ) - Q_PROPERTY( QCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true ) + Q_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true ) + Q_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true ) Q_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true ) public: - QDesignerToolBox( QWidget *parent, const char *name ); + QDesignerToolBox( TQWidget *parent, const char *name ); - QString itemLabel() const; - void setItemLabel( const QString &l ); - QCString itemName() const; - void setItemName( const QCString &n ); + TQString itemLabel() const; + void setItemLabel( const TQString &l ); + TQCString itemName() const; + void setItemName( const TQCString &n ); BackgroundMode itemBackgroundMode() const; void setItemBackgroundMode( BackgroundMode ); diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp index 089bf746..21e20c63 100644 --- a/kdevdesigner/designer/wizardeditorimpl.cpp +++ b/kdevdesigner/designer/wizardeditorimpl.cpp @@ -31,29 +31,29 @@ #include "listboxdnd.h" #include "listboxrename.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -WizardEditor::WizardEditor( QWidget *parent, QWizard *w, FormWindow *fw ) +WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); fillListBox(); // Add drag and drop ListBoxDnd *listBoxDnd = new ListBoxDnd( listBox ); listBoxDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - QObject::connect( listBoxDnd, SIGNAL( dropped( QListBoxItem * ) ), - listBoxDnd, SLOT( confirmDrop( QListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), + listBoxDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); - QObject::connect( listBoxDnd, SIGNAL( dragged( QListBoxItem * ) ), - this, SLOT( itemDragged( QListBoxItem * ) ) ); - QObject::connect( listBoxDnd, SIGNAL( dropped( QListBoxItem * ) ), - this, SLOT( itemDropped( QListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQT_SIGNAL( dragged( TQListBoxItem * ) ), + this, TQT_SLOT( itemDragged( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), + this, TQT_SLOT( itemDropped( TQListBoxItem * ) ) ); // Add in-place rename new ListBoxRename( listBox ); @@ -90,7 +90,7 @@ void WizardEditor::applyClicked() // fix wizard buttons for ( int i = 0; i < wizard->pageCount(); i++ ) { - QWidget * page = wizard->page( i ); + TQWidget * page = wizard->page( i ); if ( i == 0 ) { // first page wizard->setBackEnabled( page, FALSE ); @@ -163,7 +163,7 @@ void WizardEditor::upClicked() int index2 = index1 - 1; // swap listbox items - QString item1 = listBox->text( index1 ); + TQString item1 = listBox->text( index1 ); listBox->removeItem( index1 ); listBox->insertItem( item1, index2 ); listBox->setCurrentItem( index2 ); @@ -183,7 +183,7 @@ void WizardEditor::downClicked() int index2 = index1 + 1; // swap listbox items - QString item1 = listBox->text( index1 ); + TQString item1 = listBox->text( index1 ); listBox->removeItem( index1 ); listBox->insertItem( item1, index2 ); listBox->setCurrentItem( index2 ); @@ -217,7 +217,7 @@ void WizardEditor::itemSelected( int index ) if ( index < 0 ) return; // Called when Qt::Key_Enter was pressed. // ListBoxRename has renamed the list item, so we only need to rename the page to the same name. - QString pn( i18n( "Rename page %1 of %2" ).arg( wizard->title( wizard->page( index ) ) ).arg( wizard->name() ) ); + TQString pn( i18n( "Rename page %1 of %2" ).arg( wizard->title( wizard->page( index ) ) ).arg( wizard->name() ) ); RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, listBox->text( index ) ); commands.append( cmd ); } @@ -234,13 +234,13 @@ void WizardEditor::updateButtons() buttonRemove->setEnabled( FALSE ); } -void WizardEditor::itemDragged( QListBoxItem * i ) +void WizardEditor::itemDragged( TQListBoxItem * i ) { // Store item index draggedItem = listBox->index( i ); } -void WizardEditor::itemDropped( QListBoxItem * i ) +void WizardEditor::itemDropped( TQListBoxItem * i ) { if ( draggedItem < 0 ) return; // The reorder the pages acording to the listBox list of items diff --git a/kdevdesigner/designer/wizardeditorimpl.h b/kdevdesigner/designer/wizardeditorimpl.h index 0089cb39..52d10752 100644 --- a/kdevdesigner/designer/wizardeditorimpl.h +++ b/kdevdesigner/designer/wizardeditorimpl.h @@ -30,7 +30,7 @@ class QWizard; class FormWindow; -#include +#include #include "wizardeditor.h" #include "command.h" @@ -40,7 +40,7 @@ class WizardEditor : public WizardEditorBase Q_OBJECT public: - WizardEditor( QWidget *parent, QWizard *wizard, FormWindow *fw ); + WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw ); ~WizardEditor(); protected slots: @@ -57,8 +57,8 @@ protected slots: void itemHighlighted( int ); void itemSelected( int ); - void itemDragged( QListBoxItem * ); - void itemDropped( QListBoxItem * ); + void itemDragged( TQListBoxItem * ); + void itemDropped( TQListBoxItem * ); private: void updateButtons(); @@ -66,8 +66,8 @@ private: private: FormWindow *formwindow; - QWizard *wizard; - QPtrList commands; + TQWizard *wizard; + TQPtrList commands; int draggedItem; }; diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index db9bd7be..9977c2ab 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -24,7 +24,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include // HP-UX compiler needs this here #include "workspace.h" #include "formwindow.h" #include "mainwindow.h" @@ -39,22 +39,22 @@ #include #include "kdevdesigner_part.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "qcompletionedit.h" #include -WorkspaceItem::WorkspaceItem( QListView *parent, Project* p ) - : QListViewItem( parent ) +WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) + : TQListViewItem( parent ) { init(); project = p; @@ -63,8 +63,8 @@ WorkspaceItem::WorkspaceItem( QListView *parent, Project* p ) setExpandable( FALSE ); } -WorkspaceItem::WorkspaceItem( QListViewItem *parent, SourceFile* sf ) - : QListViewItem( parent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf ) + : TQListViewItem( parent ) { init(); sourceFile = sf; @@ -72,27 +72,27 @@ WorkspaceItem::WorkspaceItem( QListViewItem *parent, SourceFile* sf ) setPixmap( 0, SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) ); } -WorkspaceItem::WorkspaceItem( QListViewItem *parent, QObject *o, Project *p ) - : QListViewItem( parent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) + : TQListViewItem( parent ) { init(); object = o; project = p; t = ObjectType; setPixmap( 0, SmallIcon( "designer_object.png" , KDevDesignerPartFactory::instance()) ); - QObject::connect( p->fakeFormFileFor( o ), SIGNAL( somethingChanged(FormFile*) ), - listView(), SLOT( update() ) ); + TQObject::connect( p->fakeFormFileFor( o ), TQT_SIGNAL( somethingChanged(FormFile*) ), + listView(), TQT_SLOT( update() ) ); } -WorkspaceItem::WorkspaceItem( QListViewItem *parent, FormFile* ff, Type type ) - : QListViewItem( parent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) + : TQListViewItem( parent ) { init(); formFile = ff; t = type; if ( type == FormFileType ) { setPixmap( 0, SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); - QObject::connect( ff, SIGNAL( somethingChanged(FormFile*) ), listView(), SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); if ( formFile->supportsCodeFile() ) { (void) new WorkspaceItem( this, formFile, FormSourceType ); } @@ -111,31 +111,31 @@ void WorkspaceItem::init() formFile = 0; } -void WorkspaceItem::paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align ) +void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ) { - QColorGroup g( cg ); - g.setColor( QColorGroup::Base, backgroundColor() ); - g.setColor( QColorGroup::Foreground, Qt::black ); + TQColorGroup g( cg ); + g.setColor( TQColorGroup::Base, backgroundColor() ); + g.setColor( TQColorGroup::Foreground, Qt::black ); if ( type() == FormSourceType && ( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) && parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project && ( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) { - g.setColor( QColorGroup::Text, listView()->palette().disabled().color( QColorGroup::Text) ); - g.setColor( QColorGroup::HighlightedText, listView()->palette().disabled().color( QColorGroup::Text) ); + g.setColor( TQColorGroup::Text, listView()->palette().disabled().color( TQColorGroup::Text) ); + g.setColor( TQColorGroup::HighlightedText, listView()->palette().disabled().color( TQColorGroup::Text) ); } else { - g.setColor( QColorGroup::Text, Qt::black ); + g.setColor( TQColorGroup::Text, Qt::black ); } p->save(); if ( isModified() ) { - QFont f = p->font(); + TQFont f = p->font(); f.setBold( TRUE ); p->setFont( f ); } - QListViewItem::paintCell( p, g, column, width, align ); - p->setPen( QPen( cg.dark(), 1 ) ); + TQListViewItem::paintCell( p, g, column, width, align ); + p->setPen( TQPen( cg.dark(), 1 ) ); if ( column == 0 ) p->drawLine( 0, 0, 0, height() - 1 ); if ( listView()->firstChild() != this ) { @@ -149,16 +149,16 @@ void WorkspaceItem::paintCell( QPainter *p, const QColorGroup &cg, int column, i p->restore(); } -QString WorkspaceItem::text( int column ) const +TQString WorkspaceItem::text( int column ) const { if ( column != 0 ) - return QListViewItem::text( column ); + return TQListViewItem::text( column ); switch( t ) { case ProjectType: if ( project->isDummy() ) { return i18n("" ); } else if ( MainWindow::self->singleProjectMode() ) { - return QFileInfo( project->fileName() ).baseName(); + return TQFileInfo( project->fileName() ).baseName(); } return project->makeRelative( project->fileName() ); case FormFileType: @@ -177,10 +177,10 @@ QString WorkspaceItem::text( int column ) const return project->qualifiedName( object ); } - return QString::null; // shut up compiler + return TQString::null; // shut up compiler } -void WorkspaceItem::fillCompletionList( QStringList& completion ) +void WorkspaceItem::fillCompletionList( TQStringList& completion ) { switch( t ) { case ProjectType: @@ -200,7 +200,7 @@ void WorkspaceItem::fillCompletionList( QStringList& completion ) } } -bool WorkspaceItem::checkCompletion( const QString& completion ) +bool WorkspaceItem::checkCompletion( const TQString& completion ) { switch( t ) { case ProjectType: @@ -237,9 +237,9 @@ bool WorkspaceItem::isModified() const return FALSE; // shut up compiler } -QString WorkspaceItem::key( int column, bool ) const +TQString WorkspaceItem::key( int column, bool ) const { - QString key = text( column ); + TQString key = text( column ); if ( t == FormFileType ) key.prepend( "0" ); else if ( t == ObjectType ) @@ -249,7 +249,7 @@ QString WorkspaceItem::key( int column, bool ) const return key; } -QColor WorkspaceItem::backgroundColor() +TQColor WorkspaceItem::backgroundColor() { bool b = useOddColor; if ( t == FormSourceType && parent() ) @@ -260,18 +260,18 @@ QColor WorkspaceItem::backgroundColor() void WorkspaceItem::setOpen( bool b ) { - QListViewItem::setOpen( b ); + TQListViewItem::setOpen( b ); autoOpen = FALSE; } void WorkspaceItem::setAutoOpen( bool b ) { - QListViewItem::setOpen( b ); + TQListViewItem::setOpen( b ); autoOpen = b; } -Workspace::Workspace( QWidget *parent, MainWindow *mw ) - : QListView( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | +Workspace::Workspace( TQWidget *parent, MainWindow *mw ) + : TQListView( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_Tool | WStyle_MinMax | WStyle_SysMenu ), mainWindow( mw ), project( 0 ), completionDirty( FALSE ) { @@ -283,21 +283,21 @@ Workspace::Workspace( QWidget *parent, MainWindow *mw ) header()->setStretchEnabled( TRUE ); header()->hide(); setSorting( 0 ); - setResizePolicy( QScrollView::Manual ); + setResizePolicy( TQScrollView::Manual ); #ifndef Q_WS_MAC - QPalette p( palette() ); - p.setColor( QColorGroup::Base, QColor( *backColor2 ) ); + TQPalette p( palette() ); + p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); #endif addColumn( i18n( "Files" ) ); setAllColumnsShowFocus( TRUE ); - connect( this, SIGNAL( mouseButtonClicked( int, QListViewItem *, const QPoint &, int ) ), - this, SLOT( itemClicked( int, QListViewItem *, const QPoint& ) ) ), - connect( this, SIGNAL( doubleClicked( QListViewItem * ) ), - this, SLOT( itemDoubleClicked( QListViewItem * ) ) ), - connect( this, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint &, int ) ), - this, SLOT( rmbClicked( QListViewItem *, const QPoint& ) ) ), + connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQT_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); viewport()->setAcceptDrops( TRUE ); @@ -306,7 +306,7 @@ Workspace::Workspace( QWidget *parent, MainWindow *mw ) } -void Workspace::projectDestroyed( QObject* o ) +void Workspace::projectDestroyed( TQObject* o ) { if ( o == project ) { project = 0; @@ -319,23 +319,23 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, SIGNAL( sourceFileAdded(SourceFile*) ), this, SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, SIGNAL( sourceFileRemoved(SourceFile*) ), this, SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, SIGNAL( formFileAdded(FormFile*) ), this, SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, SIGNAL( formFileRemoved(FormFile*) ), this, SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, SIGNAL( objectAdded(QObject*) ), this, SLOT( objectAdded(QObject*) ) ); - disconnect( project, SIGNAL( objectRemoved(QObject*) ), this, SLOT( objectRemoved(QObject*) ) ); - disconnect( project, SIGNAL( projectModified() ), this, SLOT( update() ) ); + disconnect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQT_SIGNAL( objectAdded(TQObject*) ), this, TQT_SLOT( objectAdded(TQObject*) ) ); + disconnect( project, TQT_SIGNAL( objectRemoved(TQObject*) ), this, TQT_SLOT( objectRemoved(TQObject*) ) ); + disconnect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); } project = pro; - connect( project, SIGNAL( sourceFileAdded(SourceFile*) ), this, SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, SIGNAL( sourceFileRemoved(SourceFile*) ), this, SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, SIGNAL( formFileAdded(FormFile*) ), this, SLOT( formFileAdded(FormFile*) ) ); - connect( project, SIGNAL( formFileRemoved(FormFile*) ), this, SLOT( formFileRemoved(FormFile*) ) ); - connect( project, SIGNAL( destroyed(QObject*) ), this, SLOT( projectDestroyed(QObject*) ) ); - connect( project, SIGNAL( objectAdded(QObject*) ), this, SLOT( objectAdded(QObject*) ) ); - connect( project, SIGNAL( objectRemoved(QObject*) ), this, SLOT( objectRemoved(QObject*) ) ); - connect( project, SIGNAL( projectModified() ), this, SLOT( update() ) ); + connect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQT_SIGNAL( destroyed(TQObject*) ), this, TQT_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQT_SIGNAL( objectAdded(TQObject*) ), this, TQT_SLOT( objectAdded(TQObject*) ) ); + connect( project, TQT_SIGNAL( objectRemoved(TQObject*) ), this, TQT_SLOT( objectRemoved(TQObject*) ) ); + connect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -345,13 +345,13 @@ void Workspace::setCurrentProject( Project *pro ) projectItem->setOpen( TRUE ); - for ( QPtrListIterator sources = project->sourceFiles(); + for ( TQPtrListIterator sources = project->sourceFiles(); sources.current(); ++sources ) { SourceFile* f = sources.current(); (void) new WorkspaceItem( projectItem, f ); } - for ( QPtrListIterator forms = project->formFiles(); + for ( TQPtrListIterator forms = project->formFiles(); forms.current(); ++forms ) { FormFile* f = forms.current(); if ( f->isFake() ) @@ -360,10 +360,10 @@ void Workspace::setCurrentProject( Project *pro ) (void) new WorkspaceItem( projectItem, f ); } - QObjectList l = project->objects(); - QObjectListIt objs( l ); + TQObjectList l = project->objects(); + TQObjectListIt objs( l ); for ( ;objs.current(); ++objs ) { - QObject* o = objs.current(); + TQObject* o = objs.current(); (void) new WorkspaceItem( projectItem, o, project ); } @@ -397,13 +397,13 @@ void Workspace::formFileRemoved( FormFile* ff ) updateColors(); } -void Workspace::objectAdded( QObject *o ) +void Workspace::objectAdded( TQObject *o ) { (void) new WorkspaceItem( projectItem, o, project ); updateColors(); } -void Workspace::objectRemoved( QObject *o ) +void Workspace::objectRemoved( TQObject *o ) { delete findItem( o ); updateColors(); @@ -417,7 +417,7 @@ void Workspace::update() void Workspace::update( FormFile* ff ) { - QListViewItem* i = findItem( ff ); + TQListViewItem* i = findItem( ff ); if ( i ) { i->repaint(); if ( (i = i->firstChild()) ) @@ -466,7 +466,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) WorkspaceItem *Workspace::findItem( FormFile* ff) { - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { if ( ( (WorkspaceItem*)it.current() )->formFile == ff ) return (WorkspaceItem*)it.current(); @@ -476,7 +476,7 @@ WorkspaceItem *Workspace::findItem( FormFile* ff) WorkspaceItem *Workspace::findItem( SourceFile *sf ) { - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { if ( ( (WorkspaceItem*)it.current() )->sourceFile == sf ) return (WorkspaceItem*)it.current(); @@ -484,9 +484,9 @@ WorkspaceItem *Workspace::findItem( SourceFile *sf ) return 0; } -WorkspaceItem *Workspace::findItem( QObject *o ) +WorkspaceItem *Workspace::findItem( TQObject *o ) { - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { if ( ( (WorkspaceItem*)it.current() )->object == o ) return (WorkspaceItem*)it.current(); @@ -496,7 +496,7 @@ WorkspaceItem *Workspace::findItem( QObject *o ) void Workspace::closeAutoOpenItems() { - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { WorkspaceItem* i = (WorkspaceItem*) it.current(); WorkspaceItem* ip = (WorkspaceItem*) i->parent(); @@ -510,18 +510,18 @@ void Workspace::closeAutoOpenItems() } -void Workspace::closeEvent( QCloseEvent *e ) +void Workspace::closeEvent( TQCloseEvent *e ) { e->accept(); } -void Workspace::itemDoubleClicked( QListViewItem *i ) +void Workspace::itemDoubleClicked( TQListViewItem *i ) { if ( ( (WorkspaceItem*)i)->type()== WorkspaceItem::ProjectType ) i->setOpen( TRUE ); } -void Workspace::itemClicked( int button, QListViewItem *i, const QPoint& ) +void Workspace::itemClicked( int button, TQListViewItem *i, const TQPoint& ) { if ( !i || button != LeftButton ) return; @@ -552,46 +552,46 @@ void Workspace::itemClicked( int button, QListViewItem *i, const QPoint& ) } } -void Workspace::contentsDropEvent( QDropEvent *e ) +void Workspace::contentsDropEvent( TQDropEvent *e ) { - if ( !QUriDrag::canDecode( e ) ) { + if ( !TQUriDrag::canDecode( e ) ) { e->ignore(); } else { - QStringList files; - QUriDrag::decodeLocalFiles( e, files ); + TQStringList files; + TQUriDrag::decodeLocalFiles( e, files ); if ( !files.isEmpty() ) { - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) { - QString fn = *it; + for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) { + TQString fn = *it; mainWindow->fileOpen( "", "", fn ); } } } } -void Workspace::contentsDragEnterEvent( QDragEnterEvent *e ) +void Workspace::contentsDragEnterEvent( TQDragEnterEvent *e ) { - if ( !QUriDrag::canDecode( e ) ) + if ( !TQUriDrag::canDecode( e ) ) e->ignore(); else e->accept(); } -void Workspace::contentsDragMoveEvent( QDragMoveEvent *e ) +void Workspace::contentsDragMoveEvent( TQDragMoveEvent *e ) { - if ( !QUriDrag::canDecode( e ) ) + if ( !TQUriDrag::canDecode( e ) ) e->ignore(); else e->accept(); } -void Workspace::rmbClicked( QListViewItem *i, const QPoint& pos ) +void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) { if ( !i ) return; WorkspaceItem* wi = (WorkspaceItem*)i; enum { OPEN_SOURCE, REMOVE_SOURCE, OPEN_FORM, REMOVE_FORM, OPEN_FORM_SOURCE, REMOVE_FORM_SOURCE, OPEN_OBJECT_SOURCE }; - QPopupMenu menu( this ); + TQPopupMenu menu( this ); menu.setCheckable( TRUE ); switch ( wi->type() ) { case WorkspaceItem::SourceFileType: @@ -645,19 +645,19 @@ void Workspace::rmbClicked( QListViewItem *i, const QPoint& pos ) } } -bool Workspace::eventFilter( QObject *o, QEvent * e ) +bool Workspace::eventFilter( TQObject *o, TQEvent * e ) { // Reggie, on what type of events do we have to execute updateBufferEdit() - if ( o ==bufferEdit && e->type() != QEvent::ChildRemoved ) + if ( o ==bufferEdit && e->type() != TQEvent::ChildRemoved ) updateBufferEdit(); - return QListView::eventFilter( o, e ); + return TQListView::eventFilter( o, e ); } void Workspace::setBufferEdit( QCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, SIGNAL( chosen( const QString & ) ), - this, SLOT( bufferChosen( const QString & ) ) ); + connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ), + this, TQT_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } @@ -666,8 +666,8 @@ void Workspace::updateBufferEdit() if ( !bufferEdit || !completionDirty || !MainWindow::self) return; completionDirty = FALSE; - QStringList completion = MainWindow::self->projectFileNames(); - QListViewItemIterator it( this ); + TQStringList completion = MainWindow::self->projectFileNames(); + TQListViewItemIterator it( this ); while ( it.current() ) { ( (WorkspaceItem*)it.current())->fillCompletionList( completion ); ++it; @@ -676,7 +676,7 @@ void Workspace::updateBufferEdit() bufferEdit->setCompletionList( completion ); } -void Workspace::bufferChosen( const QString &buffer ) +void Workspace::bufferChosen( const TQString &buffer ) { if ( bufferEdit ) bufferEdit->setText( "" ); @@ -686,10 +686,10 @@ void Workspace::bufferChosen( const QString &buffer ) return; } - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); while ( it.current() ) { if ( ( (WorkspaceItem*)it.current())->checkCompletion( buffer ) ) { - itemClicked( LeftButton, it.current(), QPoint() ); + itemClicked( LeftButton, it.current(), TQPoint() ); break; } ++it; @@ -698,7 +698,7 @@ void Workspace::bufferChosen( const QString &buffer ) void Workspace::updateColors() { - QListViewItem* i = firstChild(); + TQListViewItem* i = firstChild(); if ( i ) i = i->firstChild(); bool b = TRUE; diff --git a/kdevdesigner/designer/workspace.h b/kdevdesigner/designer/workspace.h index 8e710725..4e4f0d1a 100644 --- a/kdevdesigner/designer/workspace.h +++ b/kdevdesigner/designer/workspace.h @@ -27,7 +27,7 @@ #ifndef WORKSPACE_H #define WORKSPACE_H -#include +#include class FormWindow; class QResizeEvent; @@ -47,28 +47,28 @@ class WorkspaceItem : public QListViewItem public: enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType, ObjectType }; - WorkspaceItem( QListView *parent, Project* p ); - WorkspaceItem( QListViewItem *parent, SourceFile* sf ); - WorkspaceItem( QListViewItem *parent, FormFile* ff, Type t = FormFileType ); - WorkspaceItem( QListViewItem *parent, QObject *o, Project *p ); + WorkspaceItem( TQListView *parent, Project* p ); + WorkspaceItem( TQListViewItem *parent, SourceFile* sf ); + WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType ); + WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ); - void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align ); + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); Type type() const { return t; } bool isModified() const; - QString text( int ) const; + TQString text( int ) const; - void fillCompletionList( QStringList& completion ); - bool checkCompletion( const QString& completion ); + void fillCompletionList( TQStringList& completion ); + bool checkCompletion( const TQString& completion ); - QString key( int, bool ) const; // column sorting key + TQString key( int, bool ) const; // column sorting key Project* project; SourceFile* sourceFile; FormFile* formFile; - QObject *object; + TQObject *object; void setOpen( bool ); @@ -80,7 +80,7 @@ public: private: void init(); bool autoOpen; - QColor backgroundColor(); + TQColor backgroundColor(); Type t; }; @@ -89,13 +89,13 @@ class Workspace : public QListView Q_OBJECT public: - Workspace( QWidget *parent , MainWindow *mw ); + Workspace( TQWidget *parent , MainWindow *mw ); void setCurrentProject( Project *pro ); - void contentsDropEvent( QDropEvent *e ); - void contentsDragEnterEvent( QDragEnterEvent *e ); - void contentsDragMoveEvent( QDragMoveEvent *e ); + void contentsDropEvent( TQDropEvent *e ); + void contentsDragEnterEvent( TQDragEnterEvent *e ); + void contentsDragMoveEvent( TQDragMoveEvent *e ); void setBufferEdit( QCompletionEdit *edit ); @@ -108,17 +108,17 @@ public slots: void activeEditorChanged( SourceEditor *se ); protected: - void closeEvent( QCloseEvent *e ); - bool eventFilter( QObject *, QEvent * ); + void closeEvent( TQCloseEvent *e ); + bool eventFilter( TQObject *, TQEvent * ); private slots: - void itemClicked( int, QListViewItem *i, const QPoint& pos ); - void itemDoubleClicked( QListViewItem *i ); - void rmbClicked( QListViewItem *i, const QPoint& pos ); - void bufferChosen( const QString &buffer ); + void itemClicked( int, TQListViewItem *i, const TQPoint& pos ); + void itemDoubleClicked( TQListViewItem *i ); + void rmbClicked( TQListViewItem *i, const TQPoint& pos ); + void bufferChosen( const TQString &buffer ); - void projectDestroyed( QObject* ); + void projectDestroyed( TQObject* ); void sourceFileAdded( SourceFile* ); void sourceFileRemoved( SourceFile* ); @@ -126,13 +126,13 @@ private slots: void formFileAdded( FormFile* ); void formFileRemoved( FormFile* ); - void objectAdded( QObject* ); - void objectRemoved( QObject * ); + void objectAdded( TQObject* ); + void objectRemoved( TQObject * ); private: WorkspaceItem *findItem( FormFile *ff ); WorkspaceItem *findItem( SourceFile *sf ); - WorkspaceItem *findItem( QObject *o ); + WorkspaceItem *findItem( TQObject *o ); void closeAutoOpenItems(); diff --git a/kdevdesigner/interfaces/actioninterface.h b/kdevdesigner/interfaces/actioninterface.h index 75396f04..b394b136 100644 --- a/kdevdesigner/interfaces/actioninterface.h +++ b/kdevdesigner/interfaces/actioninterface.h @@ -57,19 +57,19 @@ public: /*! This functions is called to create the action with the name \a name. \a parent should be used as parent of the action. - In the implementation return the QAction object for the action + In the implementation return the TQAction object for the action \a name. */ - virtual QAction* create( const QString &name, QObject* parent = 0 ) = 0; + virtual TQAction* create( const TQString &name, TQObject* parent = 0 ) = 0; /*! In the implementation of the interface return the name of the group of the action \a name. */ - virtual QString group( const QString &name ) const = 0; + virtual TQString group( const TQString &name ) const = 0; /*! In the implementation of the interface return whether the action \a name should appear in the location \a l */ - virtual bool location( const QString &name, Location l ) const = 0; + virtual bool location( const TQString &name, Location l ) const = 0; /*! \internal */ virtual void connectTo( QUnknownInterface *appInterface ) = 0; diff --git a/kdevdesigner/interfaces/classbrowserinterface.h b/kdevdesigner/interfaces/classbrowserinterface.h index 2db43afe..c16741f6 100644 --- a/kdevdesigner/interfaces/classbrowserinterface.h +++ b/kdevdesigner/interfaces/classbrowserinterface.h @@ -41,7 +41,7 @@ // #include -#include +#include class QListView; // {4ede3c32-ae96-4b7a-9e38-9f1d93592391} @@ -53,11 +53,11 @@ struct ClassBrowserInterface : public QUnknownInterface { enum Type { Class, Function }; - virtual QListView *createClassBrowser( QWidget *parent ) const = 0; - virtual void update( const QString &code ) const = 0; + virtual TQListView *createClassBrowser( TQWidget *parent ) const = 0; + virtual void update( const TQString &code ) const = 0; virtual void clear() const = 0; - virtual void onClick( QObject *receiver, const char *slot ) = 0; + virtual void onClick( TQObject *receiver, const char *slot ) = 0; }; #endif diff --git a/kdevdesigner/interfaces/designerinterface.h b/kdevdesigner/interfaces/designerinterface.h index de7487e2..64ffb41c 100644 --- a/kdevdesigner/interfaces/designerinterface.h +++ b/kdevdesigner/interfaces/designerinterface.h @@ -41,12 +41,12 @@ // #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include struct DesignerProject; struct DesignerDatabase; @@ -79,109 +79,109 @@ struct DesignerInterface : public QUnknownInterface virtual DesignerProject *currentProject() const = 0; virtual DesignerFormWindow *currentForm() const = 0; virtual DesignerSourceFile *currentSourceFile() const = 0; - virtual QPtrList projectList() const = 0; - virtual void showStatusMessage( const QString &, int ms = 0 ) const = 0; + virtual TQPtrList projectList() const = 0; + virtual void showStatusMessage( const TQString &, int ms = 0 ) const = 0; virtual DesignerDock *createDock() const = 0; virtual DesignerOutputDock *outputDock() const = 0; - virtual void setModified( bool b, QWidget *window ) = 0; + virtual void setModified( bool b, TQWidget *window ) = 0; virtual void updateFunctionList() = 0; - virtual void onProjectChange( QObject *receiver, const char *slot ) = 0; - virtual void onFormChange( QObject *receiver, const char *slot ) = 0; + virtual void onProjectChange( TQObject *receiver, const char *slot ) = 0; + virtual void onFormChange( TQObject *receiver, const char *slot ) = 0; virtual bool singleProjectMode() const = 0; - virtual void showError( QWidget *widget, int line, const QString &message ) = 0; + virtual void showError( TQWidget *widget, int line, const TQString &message ) = 0; virtual void runFinished() = 0; - virtual void showStackFrame( QWidget *w, int line ) = 0; - virtual void showDebugStep( QWidget *w, int line ) = 0; + virtual void showStackFrame( TQWidget *w, int line ) = 0; + virtual void showDebugStep( TQWidget *w, int line ) = 0; virtual void runProjectPrecondition() = 0; - virtual void runProjectPostcondition( QObjectList *l ) = 0; + virtual void runProjectPostcondition( TQObjectList *l ) = 0; }; struct DesignerProject { - virtual QPtrList formList() const = 0; - virtual QStringList formNames() const = 0; - virtual QString formFileName( const QString &form ) const = 0; + virtual TQPtrList formList() const = 0; + virtual TQStringList formNames() const = 0; + virtual TQString formFileName( const TQString &form ) const = 0; virtual void addForm( DesignerFormWindow * ) = 0; virtual void removeForm( DesignerFormWindow * ) = 0; - virtual QString fileName() const = 0; - virtual void setFileName( const QString & ) = 0; - virtual QString projectName() const = 0; - virtual void setProjectName( const QString & ) = 0; - virtual QString databaseFile() const = 0; - virtual void setDatabaseFile( const QString & ) = 0; + virtual TQString fileName() const = 0; + virtual void setFileName( const TQString & ) = 0; + virtual TQString projectName() const = 0; + virtual void setProjectName( const TQString & ) = 0; + virtual TQString databaseFile() const = 0; + virtual void setDatabaseFile( const TQString & ) = 0; virtual void setupDatabases() const = 0; - virtual QPtrList databaseConnections() const = 0; + virtual TQPtrList databaseConnections() const = 0; virtual void addDatabase( DesignerDatabase * ) = 0; virtual void removeDatabase( DesignerDatabase * ) = 0; virtual void save() const = 0; - virtual void setLanguage( const QString & ) = 0; - virtual QString language() const = 0; - virtual void setCustomSetting( const QString &key, const QString &value ) = 0; - virtual QString customSetting( const QString &key ) const = 0; + virtual void setLanguage( const TQString & ) = 0; + virtual TQString language() const = 0; + virtual void setCustomSetting( const TQString &key, const TQString &value ) = 0; + virtual TQString customSetting( const TQString &key ) const = 0; virtual DesignerPixmapCollection *pixmapCollection() const = 0; - virtual void breakPoints( QMap > &bps ) const = 0; - virtual QString breakPointCondition( QObject *o, int line ) const = 0; - virtual void setBreakPointCondition( QObject *o, int line, const QString &condition ) = 0; + virtual void breakPoints( TQMap > &bps ) const = 0; + virtual TQString breakPointCondition( TQObject *o, int line ) const = 0; + virtual void setBreakPointCondition( TQObject *o, int line, const TQString &condition ) = 0; virtual void clearAllBreakpoints() const = 0; - virtual void setIncludePath( const QString &platform, const QString &path ) = 0; - virtual void setLibs( const QString &platform, const QString &path ) = 0; - virtual void setDefines( const QString &platform, const QString &path ) = 0; - virtual void setConfig( const QString &platform, const QString &config ) = 0; - virtual void setTemplate( const QString &t ) = 0; - virtual QString config( const QString &platform ) const = 0; - virtual QString libs( const QString &platform ) const = 0; - virtual QString defines( const QString &platform ) const = 0; - virtual QString includePath( const QString &platform ) const = 0; - virtual QString templte() const = 0; - virtual bool isGenericObject( QObject *o ) const = 0; + virtual void setIncludePath( const TQString &platform, const TQString &path ) = 0; + virtual void setLibs( const TQString &platform, const TQString &path ) = 0; + virtual void setDefines( const TQString &platform, const TQString &path ) = 0; + virtual void setConfig( const TQString &platform, const TQString &config ) = 0; + virtual void setTemplate( const TQString &t ) = 0; + virtual TQString config( const TQString &platform ) const = 0; + virtual TQString libs( const TQString &platform ) const = 0; + virtual TQString defines( const TQString &platform ) const = 0; + virtual TQString includePath( const TQString &platform ) const = 0; + virtual TQString templte() const = 0; + virtual bool isGenericObject( TQObject *o ) const = 0; }; struct DesignerDatabase { - virtual QString name() const = 0; - virtual void setName( const QString & ) = 0; - virtual QString driver() const = 0; - virtual void setDriver( const QString & ) = 0; - virtual QString database() const = 0; - virtual void setDatabase( const QString & ) = 0; - virtual QString userName() const = 0; - virtual void setUserName( const QString & ) = 0; - virtual QString password() const = 0; - virtual void setPassword( const QString & ) = 0; - virtual QString hostName() const = 0; - virtual void setHostName( const QString & ) = 0; - virtual QStringList tables() const = 0; - virtual void setTables( const QStringList & ) = 0; - virtual QMap fields() const = 0; - virtual void setFields( const QMap & ) = 0; + virtual TQString name() const = 0; + virtual void setName( const TQString & ) = 0; + virtual TQString driver() const = 0; + virtual void setDriver( const TQString & ) = 0; + virtual TQString database() const = 0; + virtual void setDatabase( const TQString & ) = 0; + virtual TQString userName() const = 0; + virtual void setUserName( const TQString & ) = 0; + virtual TQString password() const = 0; + virtual void setPassword( const TQString & ) = 0; + virtual TQString hostName() const = 0; + virtual void setHostName( const TQString & ) = 0; + virtual TQStringList tables() const = 0; + virtual void setTables( const TQStringList & ) = 0; + virtual TQMap fields() const = 0; + virtual void setFields( const TQMap & ) = 0; virtual void open( bool suppressDialog = FALSE ) const = 0; virtual void close() const = 0; - virtual QSqlDatabase* connection() = 0; + virtual TQSqlDatabase* connection() = 0; }; struct DesignerPixmapCollection { - virtual void addPixmap( const QPixmap &p, const QString &name, bool force ) = 0; - virtual QPixmap pixmap( const QString &name ) const = 0; + virtual void addPixmap( const TQPixmap &p, const TQString &name, bool force ) = 0; + virtual TQPixmap pixmap( const TQString &name ) const = 0; }; struct DesignerFormWindow { - virtual QString name() const = 0; - virtual void setName( const QString &n ) = 0; - virtual QString fileName() const = 0; - virtual void setFileName( const QString & ) = 0; + virtual TQString name() const = 0; + virtual void setName( const TQString &n ) = 0; + virtual TQString fileName() const = 0; + virtual void setFileName( const TQString & ) = 0; virtual void save() const = 0; virtual bool isModified() const = 0; - virtual void insertWidget( QWidget * ) = 0; - virtual void removeWidget( QWidget * ) = 0; - virtual QWidget *create( const char *className, QWidget *parent, const char *name ) = 0; - virtual QWidgetList widgets() const = 0; + virtual void insertWidget( TQWidget * ) = 0; + virtual void removeWidget( TQWidget * ) = 0; + virtual TQWidget *create( const char *className, TQWidget *parent, const char *name ) = 0; + virtual TQWidgetList widgets() const = 0; virtual void undo() = 0; virtual void redo() = 0; virtual void cut() = 0; @@ -195,66 +195,66 @@ struct DesignerFormWindow virtual void layoutHSplit() = 0; virtual void layoutVSplit() = 0; virtual void layoutG() = 0; - virtual void layoutHContainer( QWidget* w ) = 0; - virtual void layoutVContainer( QWidget* w ) = 0; - virtual void layoutGContainer( QWidget* w ) = 0; + virtual void layoutHContainer( TQWidget* w ) = 0; + virtual void layoutVContainer( TQWidget* w ) = 0; + virtual void layoutGContainer( TQWidget* w ) = 0; virtual void breakLayout() = 0; - virtual void selectWidget( QWidget * w ) = 0; + virtual void selectWidget( TQWidget * w ) = 0; virtual void selectAll() = 0; virtual void clearSelection() = 0; - virtual bool isWidgetSelected( QWidget * ) const = 0; - virtual QWidgetList selectedWidgets() const = 0; - virtual QWidget *currentWidget() const = 0; - virtual QWidget *form() const = 0; - virtual void setCurrentWidget( QWidget * ) = 0; - virtual QPtrList actionList() const = 0; - virtual QAction *createAction( const QString& text, const QIconSet& icon, const QString& menuText, int accel, - QObject* parent, const char* name = 0, bool toggle = FALSE ) = 0; - virtual void addAction( QAction * ) = 0; - virtual void removeAction( QAction * ) = 0; + virtual bool isWidgetSelected( TQWidget * ) const = 0; + virtual TQWidgetList selectedWidgets() const = 0; + virtual TQWidget *currentWidget() const = 0; + virtual TQWidget *form() const = 0; + virtual void setCurrentWidget( TQWidget * ) = 0; + virtual TQPtrList actionList() const = 0; + virtual TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, + TQObject* parent, const char* name = 0, bool toggle = FALSE ) = 0; + virtual void addAction( TQAction * ) = 0; + virtual void removeAction( TQAction * ) = 0; virtual void preview() const = 0; - virtual void addFunction( const QCString &slot, const QString &specifier, const QString &access, - const QString &type, const QString &language, const QString &returnType ) = 0; - virtual void addConnection( QObject *sender, const char *signal, QObject *receiver, const char *slot ) = 0; - virtual void setProperty( QObject *o, const char *property, const QVariant &value ) = 0; - virtual QVariant property( QObject *o, const char *property ) const = 0; - virtual void setPropertyChanged( QObject *o, const char *property, bool changed ) = 0; - virtual bool isPropertyChanged( QObject *o, const char *property ) const = 0; - virtual void setColumnFields( QObject *o, const QMap & ) = 0; - virtual QStringList implementationIncludes() const = 0; - virtual QStringList declarationIncludes() const = 0; - virtual void setImplementationIncludes( const QStringList &lst ) = 0; - virtual void setDeclarationIncludes( const QStringList &lst ) = 0; - virtual QStringList forwardDeclarations() const = 0; - virtual void setForwardDeclarations( const QStringList &lst ) = 0; - virtual QStringList signalList() const = 0; - virtual void setSignalList( const QStringList &lst ) = 0; - virtual void addMenu( const QString &text, const QString &name ) = 0; - virtual void addMenuAction( const QString &menu, QAction *a ) = 0; - virtual void addMenuSeparator( const QString &menu ) = 0; - virtual void addToolBar( const QString &text, const QString &name ) = 0; - virtual void addToolBarAction( const QString &tb, QAction *a ) = 0; - virtual void addToolBarSeparator( const QString &tb ) = 0; + virtual void addFunction( const TQCString &slot, const TQString &specifier, const TQString &access, + const TQString &type, const TQString &language, const TQString &returnType ) = 0; + virtual void addConnection( TQObject *sender, const char *signal, TQObject *receiver, const char *slot ) = 0; + virtual void setProperty( TQObject *o, const char *property, const TQVariant &value ) = 0; + virtual TQVariant property( TQObject *o, const char *property ) const = 0; + virtual void setPropertyChanged( TQObject *o, const char *property, bool changed ) = 0; + virtual bool isPropertyChanged( TQObject *o, const char *property ) const = 0; + virtual void setColumnFields( TQObject *o, const TQMap & ) = 0; + virtual TQStringList implementationIncludes() const = 0; + virtual TQStringList declarationIncludes() const = 0; + virtual void setImplementationIncludes( const TQStringList &lst ) = 0; + virtual void setDeclarationIncludes( const TQStringList &lst ) = 0; + virtual TQStringList forwardDeclarations() const = 0; + virtual void setForwardDeclarations( const TQStringList &lst ) = 0; + virtual TQStringList signalList() const = 0; + virtual void setSignalList( const TQStringList &lst ) = 0; + virtual void addMenu( const TQString &text, const TQString &name ) = 0; + virtual void addMenuAction( const TQString &menu, TQAction *a ) = 0; + virtual void addMenuSeparator( const TQString &menu ) = 0; + virtual void addToolBar( const TQString &text, const TQString &name ) = 0; + virtual void addToolBarAction( const TQString &tb, TQAction *a ) = 0; + virtual void addToolBarSeparator( const TQString &tb ) = 0; - virtual void onModificationChange( QObject *receiver, const char *slot ) = 0; + virtual void onModificationChange( TQObject *receiver, const char *slot ) = 0; }; struct DesignerSourceFile { - virtual QString fileName() const = 0; + virtual TQString fileName() const = 0; }; struct DesignerDock { - virtual QDockWindow *dockWindow() const = 0; + virtual TQDockWindow *dockWindow() const = 0; }; struct DesignerOutputDock { - virtual QWidget *addView( const QString &pageName ) = 0; - virtual void appendDebug( const QString & ) = 0; + virtual TQWidget *addView( const TQString &pageName ) = 0; + virtual void appendDebug( const TQString & ) = 0; virtual void clearDebug() = 0; - virtual void appendError( const QString &, int ) = 0; + virtual void appendError( const TQString &, int ) = 0; virtual void clearError() = 0; }; diff --git a/kdevdesigner/interfaces/editorinterface.h b/kdevdesigner/interfaces/editorinterface.h index 0aff6c4f..f7ca66b5 100644 --- a/kdevdesigner/interfaces/editorinterface.h +++ b/kdevdesigner/interfaces/editorinterface.h @@ -41,8 +41,8 @@ // #include -#include -#include +#include +#include class QWidget; class QObjectList; @@ -61,12 +61,12 @@ struct EditorInterface : public QUnknownInterface Debugging }; - virtual QWidget *editor( bool readOnly, - QWidget *parent, + virtual TQWidget *editor( bool readOnly, + TQWidget *parent, QUnknownInterface *designerIface ) = 0; - virtual void setText( const QString &txt ) = 0; - virtual QString text() const = 0; + virtual void setText( const TQString &txt ) = 0; + virtual TQString text() const = 0; virtual bool isUndoAvailable() const = 0; virtual bool isRedoAvailable() const = 0; virtual void undo() = 0; @@ -75,13 +75,13 @@ struct EditorInterface : public QUnknownInterface virtual void copy() = 0; virtual void paste() = 0; virtual void selectAll() = 0; - virtual bool find( const QString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0; - virtual bool replace( const QString &find, const QString &replace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ) = 0; + virtual bool find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0; + virtual bool replace( const TQString &find, const TQString &replace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ) = 0; virtual void gotoLine( int line ) = 0; virtual void indent() = 0; - virtual void scrollTo( const QString &txt, const QString &first ) = 0; + virtual void scrollTo( const TQString &txt, const TQString &first ) = 0; virtual void splitView() = 0; - virtual void setContext( QObject *this_ ) = 0; + virtual void setContext( TQObject *this_ ) = 0; virtual void setError( int line ) = 0; virtual void setStep( int line ) = 0; virtual void setStackFrame( int line ) = 0; @@ -91,11 +91,11 @@ struct EditorInterface : public QUnknownInterface virtual void setModified( bool m ) = 0; virtual bool isModified() const = 0; virtual int numLines() const = 0; - virtual void breakPoints( QValueList &l ) const = 0; - virtual void setBreakPoints( const QValueList &l ) = 0; + virtual void breakPoints( TQValueList &l ) const = 0; + virtual void setBreakPoints( const TQValueList &l ) = 0; virtual void setMode( Mode m ) = 0; - virtual void onBreakPointChange( QObject *receiver, const char *slot ) = 0; + virtual void onBreakPointChange( TQObject *receiver, const char *slot ) = 0; }; diff --git a/kdevdesigner/interfaces/filterinterface.h b/kdevdesigner/interfaces/filterinterface.h index 98abd250..bb6b94b8 100644 --- a/kdevdesigner/interfaces/filterinterface.h +++ b/kdevdesigner/interfaces/filterinterface.h @@ -50,7 +50,7 @@ struct ImportFilterInterface : public QFeatureListInterface back one or more .ui files, which it can open then. In the implementation of the interface you have to return these filenames, which the filter created, in this function.*/ - virtual QStringList import( const QString &filter, const QString &filename ) = 0; + virtual TQStringList import( const TQString &filter, const TQString &filename ) = 0; }; // *************** INTERNAL ************************* @@ -62,7 +62,7 @@ struct ImportFilterInterface : public QFeatureListInterface struct ExportFilterInterface : public QFeatureListInterface { -// virtual QStringList export( const QString& filter, const QString& filename ) = 0; +// virtual TQStringList export( const TQString& filter, const TQString& filename ) = 0; }; #endif diff --git a/kdevdesigner/interfaces/interpreterinterface.h b/kdevdesigner/interfaces/interpreterinterface.h index 8a64e6fc..ef94f184 100644 --- a/kdevdesigner/interfaces/interpreterinterface.h +++ b/kdevdesigner/interfaces/interpreterinterface.h @@ -51,7 +51,7 @@ class QObject; struct InterpreterInterface : public QUnknownInterface { - virtual void setBreakPoints( QObject *obj, const QValueList &lst ) = 0; + virtual void setBreakPoints( TQObject *obj, const TQValueList &lst ) = 0; }; diff --git a/kdevdesigner/interfaces/languageinterface.h b/kdevdesigner/interfaces/languageinterface.h index 6fc0b8f9..4b12e5b9 100644 --- a/kdevdesigner/interfaces/languageinterface.h +++ b/kdevdesigner/interfaces/languageinterface.h @@ -41,10 +41,10 @@ // #include -#include -#include -#include -#include +#include +#include +#include +#include // {f208499a-6f69-4883-9219-6e936e55a330} #ifndef IID_Language @@ -55,13 +55,13 @@ struct LanguageInterface : public QUnknownInterface { struct Function { - QString name; - QString body; - QString returnType; - QString comments; + TQString name; + TQString body; + TQString returnType; + TQString comments; int start; int end; - QString access; + TQString access; bool operator==( const Function &f ) const { return ( name == f.name && body == f.body && @@ -72,9 +72,9 @@ struct LanguageInterface : public QUnknownInterface struct Connection { - QString sender; - QString signal; - QString slot; + TQString sender; + TQString signal; + TQString slot; bool operator==( const Connection &c ) const { return ( sender == c.sender && signal == c.signal && @@ -89,42 +89,42 @@ struct LanguageInterface : public QUnknownInterface CompressProject }; - virtual void functions( const QString &code, QValueList *funcs ) const = 0; - virtual void connections( const QString &code, QValueList *connections ) const = 0; - virtual QString createFunctionStart( const QString &className, const QString &func, - const QString &returnType, const QString &access ) = 0; - virtual QString createArguments( const QString &cpp_signature ) = 0; - virtual QString createEmptyFunction() = 0; - virtual QStringList definitions() const = 0; - virtual QStringList definitionEntries( const QString &definition, QUnknownInterface *designerIface ) const = 0; - virtual void setDefinitionEntries( const QString &definition, const QStringList &entries, QUnknownInterface *designerIface ) = 0; + virtual void functions( const TQString &code, TQValueList *funcs ) const = 0; + virtual void connections( const TQString &code, TQValueList *connections ) const = 0; + virtual TQString createFunctionStart( const TQString &className, const TQString &func, + const TQString &returnType, const TQString &access ) = 0; + virtual TQString createArguments( const TQString &cpp_signature ) = 0; + virtual TQString createEmptyFunction() = 0; + virtual TQStringList definitions() const = 0; + virtual TQStringList definitionEntries( const TQString &definition, QUnknownInterface *designerIface ) const = 0; + virtual void setDefinitionEntries( const TQString &definition, const TQStringList &entries, QUnknownInterface *designerIface ) = 0; virtual bool supports( Support s ) const = 0; - virtual QStringList fileFilterList() const = 0; - virtual QStringList fileExtensionList() const = 0; - virtual void preferedExtensions( QMap &extensionMap ) const = 0; - virtual QString projectKeyForExtension( const QString &extension ) const = 0; - virtual void sourceProjectKeys( QStringList &keys ) const = 0; - virtual QString cleanSignature( const QString &sig ) = 0; - virtual void loadFormCode( const QString &form, const QString &filename, - QValueList &functions, - QStringList &vars, - QValueList &connections ) = 0; - virtual QString formCodeExtension() const = 0; + virtual TQStringList fileFilterList() const = 0; + virtual TQStringList fileExtensionList() const = 0; + virtual void preferedExtensions( TQMap &extensionMap ) const = 0; + virtual TQString projectKeyForExtension( const TQString &extension ) const = 0; + virtual void sourceProjectKeys( TQStringList &keys ) const = 0; + virtual TQString cleanSignature( const TQString &sig ) = 0; + virtual void loadFormCode( const TQString &form, const TQString &filename, + TQValueList &functions, + TQStringList &vars, + TQValueList &connections ) = 0; + virtual TQString formCodeExtension() const = 0; - virtual bool canConnect( const QString &signal, const QString &slot ) = 0; + virtual bool canConnect( const TQString &signal, const TQString &slot ) = 0; - virtual void compressProject( const QString &projectFile, const QString &compressedFile, + virtual void compressProject( const TQString &projectFile, const TQString &compressedFile, bool withWarning ) = 0; - virtual QString uncompressProject( const QString &projectFile, const QString &destDir ) = 0; - virtual QString aboutText() const = 0; + virtual TQString uncompressProject( const TQString &projectFile, const TQString &destDir ) = 0; + virtual TQString aboutText() const = 0; - virtual void addConnection( const QString &sender, const QString &signal, - const QString &receiver, const QString &slot, - QString *code ) = 0; - virtual void removeConnection( const QString &sender, const QString &signal, - const QString &receiver, const QString &slot, - QString *code ) = 0; - virtual QStrList signalNames( QObject *obj ) const = 0; + virtual void addConnection( const TQString &sender, const TQString &signal, + const TQString &receiver, const TQString &slot, + TQString *code ) = 0; + virtual void removeConnection( const TQString &sender, const TQString &signal, + const TQString &receiver, const TQString &slot, + TQString *code ) = 0; + virtual TQStrList signalNames( TQObject *obj ) const = 0; }; diff --git a/kdevdesigner/interfaces/preferenceinterface.h b/kdevdesigner/interfaces/preferenceinterface.h index 880fe285..43f72019 100644 --- a/kdevdesigner/interfaces/preferenceinterface.h +++ b/kdevdesigner/interfaces/preferenceinterface.h @@ -41,8 +41,8 @@ // #include -#include -#include +#include +#include // {5c168ee7-4bee-469f-9995-6afdb04ce5a2} #ifndef IID_Preference @@ -53,9 +53,9 @@ struct PreferenceInterface : public QUnknownInterface { struct Preference { - QWidget *tab; - QString title; - QObject *receiver; + TQWidget *tab; + TQString title; + TQObject *receiver; const char *init_slot; const char *accept_slot; }; diff --git a/kdevdesigner/interfaces/projectsettingsiface.h b/kdevdesigner/interfaces/projectsettingsiface.h index ee571a7b..9bbfc31c 100644 --- a/kdevdesigner/interfaces/projectsettingsiface.h +++ b/kdevdesigner/interfaces/projectsettingsiface.h @@ -41,8 +41,8 @@ // #include -#include -#include +#include +#include // {d332785d-17fb-4894-84fe-50dbd0ad9512} #ifndef IID_ProjectSettings @@ -53,15 +53,15 @@ struct ProjectSettingsInterface : public QUnknownInterface { struct ProjectSettings { - QWidget *tab; - QString title; - QObject *receiver; + TQWidget *tab; + TQString title; + TQObject *receiver; const char *init_slot; const char *accept_slot; }; virtual ProjectSettings *projectSetting() = 0; - virtual QStringList projectSettings() const = 0; + virtual TQStringList projectSettings() const = 0; virtual void connectTo( QUnknownInterface *appInterface ) = 0; virtual void deleteProjectSettingsObject( ProjectSettings * ) = 0; }; diff --git a/kdevdesigner/interfaces/sourcetemplateiface.h b/kdevdesigner/interfaces/sourcetemplateiface.h index c1dc2a74..b9c58b8d 100644 --- a/kdevdesigner/interfaces/sourcetemplateiface.h +++ b/kdevdesigner/interfaces/sourcetemplateiface.h @@ -41,7 +41,7 @@ // #include -#include +#include // {1b3446a4-1c71-424b-8789-1f34eb5697d8} #ifndef IID_SourceTemplate @@ -52,13 +52,13 @@ struct SourceTemplateInterface : public QFeatureListInterface { struct Source { - QString code; + TQString code; enum Type { FileName, Unnamed, Invalid } type; - QString filename; - QString extension; + TQString filename; + TQString extension; }; - virtual Source create( const QString &templ, QUnknownInterface *appIface ) = 0; - virtual QString language( const QString &templ ) const = 0; + virtual Source create( const TQString &templ, QUnknownInterface *appIface ) = 0; + virtual TQString language( const TQString &templ ) const = 0; }; diff --git a/kdevdesigner/interfaces/templatewizardiface.h b/kdevdesigner/interfaces/templatewizardiface.h index 82b204da..36724e34 100644 --- a/kdevdesigner/interfaces/templatewizardiface.h +++ b/kdevdesigner/interfaces/templatewizardiface.h @@ -53,7 +53,7 @@ struct DesignerFormWindow; class TemplateWizardInterface : public QFeatureListInterface { public: - virtual void setup( const QString &templ, QWidget *widget, DesignerFormWindow *fw, QUnknownInterface *appIface ) = 0; + virtual void setup( const TQString &templ, TQWidget *widget, DesignerFormWindow *fw, QUnknownInterface *appIface ) = 0; }; diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp index 37077922..53ce2ba8 100644 --- a/kdevdesigner/plugins/languageinterfaceimpl.cpp +++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp @@ -26,11 +26,11 @@ **********************************************************************/ #include "languageinterfaceimpl.h" -#include +#include #include "../interfaces/designerinterface.h" -#include +#include //#include "yyreg.h" -#include +#include LanguageInterfaceImpl::LanguageInterfaceImpl( QUnknownInterface *outer ) : parent( outer ), ref( 0 ) @@ -74,15 +74,15 @@ QRESULT LanguageInterfaceImpl::queryInterface( const QUuid &uuid, QUnknownInterf class NormalizeObject : public QObject { public: - NormalizeObject() : QObject() {} - static QCString normalizeSignalSlot( const char *signalSlot ) { return QObject::normalizeSignalSlot( signalSlot ); } + NormalizeObject() : TQObject() {} + static TQCString normalizeSignalSlot( const char *signalSlot ) { return TQObject::normalizeSignalSlot( signalSlot ); } }; -void LanguageInterfaceImpl::functions( const QString &code, QValueList *functionMap ) const +void LanguageInterfaceImpl::functions( const TQString &code, TQValueList *functionMap ) const { -/* QValueList l; +/* TQValueList l; extractCppFunctions( code, &l ); - for ( QValueList::Iterator it = l.begin(); it != l.end(); ++it ) { + for ( TQValueList::Iterator it = l.begin(); it != l.end(); ++it ) { Function func; func.name = (*it).prototype(); func.name.remove( 0, (*it).returnType().length() ); @@ -97,30 +97,30 @@ void LanguageInterfaceImpl::functions( const QString &code, QValueList }*/ } -QString LanguageInterfaceImpl::createFunctionStart( const QString &className, const QString &func, - const QString &returnType, - const QString & ) +TQString LanguageInterfaceImpl::createFunctionStart( const TQString &className, const TQString &func, + const TQString &returnType, + const TQString & ) { return returnType + " " + className + "::" + func; } -QStringList LanguageInterfaceImpl::definitions() const +TQStringList LanguageInterfaceImpl::definitions() const { - QStringList lst; + TQStringList lst; lst << "Includes (in Implementation)" << "Includes (in Declaration)" << "Forward Declarations" << "Signals"; return lst; } -QStringList LanguageInterfaceImpl::definitionEntries( const QString &definition, QUnknownInterface *designerIface ) const +TQStringList LanguageInterfaceImpl::definitionEntries( const TQString &definition, QUnknownInterface *designerIface ) const { DesignerInterface *iface = 0; designerIface->queryInterface( IID_Designer, (QUnknownInterface**) &iface ); if ( !iface ) - return QStringList(); + return TQStringList(); DesignerFormWindow *fw = iface->currentForm(); if ( !fw ) - return QStringList(); - QStringList lst; + return TQStringList(); + TQStringList lst; if ( definition == "Includes (in Implementation)" ) { lst = fw->implementationIncludes(); } else if ( definition == "Includes (in Declaration)" ) { @@ -134,7 +134,7 @@ QStringList LanguageInterfaceImpl::definitionEntries( const QString &definition, return lst; } -void LanguageInterfaceImpl::setDefinitionEntries( const QString &definition, const QStringList &entries, QUnknownInterface *designerIface ) +void LanguageInterfaceImpl::setDefinitionEntries( const TQString &definition, const TQStringList &entries, QUnknownInterface *designerIface ) { DesignerInterface *iface = 0; designerIface->queryInterface( IID_Designer, (QUnknownInterface**) &iface ); @@ -155,7 +155,7 @@ void LanguageInterfaceImpl::setDefinitionEntries( const QString &definition, con iface->release(); } -QString LanguageInterfaceImpl::createEmptyFunction() +TQString LanguageInterfaceImpl::createEmptyFunction() { return "{\n\n}\n"; } @@ -169,28 +169,28 @@ bool LanguageInterfaceImpl::supports( Support s ) const return FALSE; } -QStringList LanguageInterfaceImpl::fileFilterList() const +TQStringList LanguageInterfaceImpl::fileFilterList() const { - QStringList f; + TQStringList f; f << "C++ Files (*.cpp *.C *.cxx *.c++ *.ocl *.c *.h *.H *.hpp *.hxx)"; return f; } -QStringList LanguageInterfaceImpl::fileExtensionList() const +TQStringList LanguageInterfaceImpl::fileExtensionList() const { - QStringList f; + TQStringList f; f << "cpp" << "ocl" << "C" << "cxx" << "c++" << "c" <<"h" << "H" << "hpp" << "hxx"; return f; } -QString LanguageInterfaceImpl::projectKeyForExtension( const QString &extension ) const +TQString LanguageInterfaceImpl::projectKeyForExtension( const TQString &extension ) const { if ( extension[ 0 ] == 'c' || extension[ 0 ] == 'C' ) return "SOURCES"; return "HEADERS"; } -void LanguageInterfaceImpl::sourceProjectKeys( QStringList &keys ) const +void LanguageInterfaceImpl::sourceProjectKeys( TQStringList &keys ) const { keys << "HEADERS" << "SOURCES"; } @@ -199,38 +199,38 @@ void LanguageInterfaceImpl::sourceProjectKeys( QStringList &keys ) const { public: CheckObject() {} - bool checkConnectArgs( const char *signal, const char *member ) { return QObject::checkConnectArgs( signal, 0, member ); } + bool checkConnectArgs( const char *signal, const char *member ) { return TQObject::checkConnectArgs( signal, 0, member ); } }; -bool LanguageInterfaceImpl::canConnect( const QString &signal, const QString &slot ) +bool LanguageInterfaceImpl::canConnect( const TQString &signal, const TQString &slot ) { CheckObject o; return o.checkConnectArgs( signal.latin1(), slot.latin1() ); } -void LanguageInterfaceImpl::loadFormCode( const QString &, const QString &filename, - QValueList &functions, - QStringList &, - QValueList & ) +void LanguageInterfaceImpl::loadFormCode( const TQString &, const TQString &filename, + TQValueList &functions, + TQStringList &, + TQValueList & ) { - QFile f( filename ); + TQFile f( filename ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); - QString code( ts.read() ); + TQTextStream ts( &f ); + TQString code( ts.read() ); this->functions( code, &functions ); } -void LanguageInterfaceImpl::preferedExtensions( QMap &extensionMap ) const +void LanguageInterfaceImpl::preferedExtensions( TQMap &extensionMap ) const { extensionMap.insert( "cpp", "C++ Source File" ); extensionMap.insert( "h", "C++ Header File" ); } -QStrList LanguageInterfaceImpl::signalNames( QObject *obj ) const +TQStrList LanguageInterfaceImpl::signalNames( TQObject *obj ) const { - QStrList sigs; + TQStrList sigs; sigs = obj->metaObject()->signalNames( TRUE ); sigs.remove( "destroyed()" ); return sigs; diff --git a/kdevdesigner/plugins/languageinterfaceimpl.h b/kdevdesigner/plugins/languageinterfaceimpl.h index d8cb9cf2..2dd73465 100644 --- a/kdevdesigner/plugins/languageinterfaceimpl.h +++ b/kdevdesigner/plugins/languageinterfaceimpl.h @@ -40,39 +40,39 @@ public: QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - void functions( const QString &code, QValueList *funcs ) const; - void connections( const QString &, QValueList * ) const {}; - QString createFunctionStart( const QString &className, const QString &func, - const QString &returnType, const QString &access ); - QStringList definitions() const; - QStringList definitionEntries( const QString &definition, QUnknownInterface *designerIface ) const; - void setDefinitionEntries( const QString &definition, const QStringList &entries, QUnknownInterface *designerIface ); - QString createArguments( const QString & ) { return QString::null; } - QString createEmptyFunction(); + void functions( const TQString &code, TQValueList *funcs ) const; + void connections( const TQString &, TQValueList * ) const {}; + TQString createFunctionStart( const TQString &className, const TQString &func, + const TQString &returnType, const TQString &access ); + TQStringList definitions() const; + TQStringList definitionEntries( const TQString &definition, QUnknownInterface *designerIface ) const; + void setDefinitionEntries( const TQString &definition, const TQStringList &entries, QUnknownInterface *designerIface ); + TQString createArguments( const TQString & ) { return TQString::null; } + TQString createEmptyFunction(); bool supports( Support s ) const; - QStringList fileFilterList() const; - QStringList fileExtensionList() const; - void preferedExtensions( QMap &extensionMap ) const; - void sourceProjectKeys( QStringList &keys ) const; - QString projectKeyForExtension( const QString &extension ) const; - QString cleanSignature( const QString &sig ) { return sig; } // #### implement me - void loadFormCode( const QString &, const QString &, - QValueList &, - QStringList &, - QValueList & ); - QString formCodeExtension() const { return ".h"; } - bool canConnect( const QString &signal, const QString &slot ); - void compressProject( const QString &, const QString &, bool ) {} - QString uncompressProject( const QString &, const QString & ) { return QString::null; } - QString aboutText() const { return ""; } + TQStringList fileFilterList() const; + TQStringList fileExtensionList() const; + void preferedExtensions( TQMap &extensionMap ) const; + void sourceProjectKeys( TQStringList &keys ) const; + TQString projectKeyForExtension( const TQString &extension ) const; + TQString cleanSignature( const TQString &sig ) { return sig; } // #### implement me + void loadFormCode( const TQString &, const TQString &, + TQValueList &, + TQStringList &, + TQValueList & ); + TQString formCodeExtension() const { return ".h"; } + bool canConnect( const TQString &signal, const TQString &slot ); + void compressProject( const TQString &, const TQString &, bool ) {} + TQString uncompressProject( const TQString &, const TQString & ) { return TQString::null; } + TQString aboutText() const { return ""; } - void addConnection( const QString &, const QString &, - const QString &, const QString &, - QString * ) {} - void removeConnection( const QString &, const QString &, - const QString &, const QString &, - QString * ) {} - QStrList signalNames( QObject *obj ) const; + void addConnection( const TQString &, const TQString &, + const TQString &, const TQString &, + TQString * ) {} + void removeConnection( const TQString &, const TQString &, + const TQString &, const TQString &, + TQString * ) {} + TQStrList signalNames( TQObject *obj ) const; private: QUnknownInterface *parent; diff --git a/kdevdesigner/shared/domtool.cpp b/kdevdesigner/shared/domtool.cpp index 492ce88e..1696aa52 100644 --- a/kdevdesigner/shared/domtool.cpp +++ b/kdevdesigner/shared/domtool.cpp @@ -26,14 +26,14 @@ #include "domtool.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include /*! \class DomTool domtool.h @@ -51,9 +51,9 @@ \sa hasProperty() */ -QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ) +TQVariant DomTool::readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { if ( n.attribute( "name" ) != name ) @@ -68,9 +68,9 @@ QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const /*! \overload */ -QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ) +TQVariant DomTool::readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ) { - QString comment; + TQString comment; return readProperty( e, name, defValue, comment ); } @@ -79,9 +79,9 @@ QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const \sa readProperty() */ -bool DomTool::hasProperty( const QDomElement& e, const QString& name ) +bool DomTool::hasProperty( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { if ( n.attribute( "name" ) != name ) @@ -92,13 +92,13 @@ bool DomTool::hasProperty( const QDomElement& e, const QString& name ) return FALSE; } -QStringList DomTool::propertiesOfType( const QDomElement& e, const QString& type ) +TQStringList DomTool::propertiesOfType( const TQDomElement& e, const TQString& type ) { - QStringList result; - QDomElement n; + TQStringList result; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == type ) result += n.attribute( "name" ); } @@ -107,20 +107,20 @@ QStringList DomTool::propertiesOfType( const QDomElement& e, const QString& type } -QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defValue ) +TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& defValue ) { - QString dummy; + TQString dummy; return elementToVariant( e, defValue, dummy ); } /*! Interprets element \a e as variant and returns the result of the interpretation. */ -QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defValue, QString &comment ) +TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& defValue, TQString &comment ) { - QVariant v; + TQVariant v; if ( e.tagName() == "rect" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0, w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -133,9 +133,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QRect( x, y, w, h ) ); + v = TQVariant( TQRect( x, y, w, h ) ); } else if ( e.tagName() == "point" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -144,9 +144,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal y = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QPoint( x, y ) ); + v = TQVariant( TQPoint( x, y ) ); } else if ( e.tagName() == "size" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) @@ -155,12 +155,12 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QSize( w, h ) ); + v = TQVariant( TQSize( w, h ) ); } else if ( e.tagName() == "color" ) { - v = QVariant( readColor( e ) ); + v = TQVariant( readColor( e ) ); } else if ( e.tagName() == "font" ) { - QDomElement n3 = e.firstChild().toElement(); - QFont f( defValue.toFont() ); + TQDomElement n3 = e.firstChild().toElement(); + TQFont f( defValue.toFont() ); while ( !n3.isNull() ) { if ( n3.tagName() == "family" ) f.setFamily( n3.firstChild().toText().data() ); @@ -176,58 +176,58 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal f.setStrikeOut( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - v = QVariant( f ); + v = TQVariant( f ); } else if ( e.tagName() == "string" ) { - v = QVariant( e.firstChild().toText().data() ); - QDomElement n = e; + v = TQVariant( e.firstChild().toText().data() ); + TQDomElement n = e; n = n.nextSibling().toElement(); if ( n.tagName() == "comment" ) comment = n.firstChild().toText().data(); } else if ( e.tagName() == "cstring" ) { - v = QVariant( QCString( e.firstChild().toText().data() ) ); + v = TQVariant( TQCString( e.firstChild().toText().data() ) ); } else if ( e.tagName() == "number" ) { bool ok = TRUE; - v = QVariant( e.firstChild().toText().data().toInt( &ok ) ); + v = TQVariant( e.firstChild().toText().data().toInt( &ok ) ); if ( !ok ) - v = QVariant( e.firstChild().toText().data().toDouble() ); + v = TQVariant( e.firstChild().toText().data().toDouble() ); } else if ( e.tagName() == "bool" ) { - QString t = e.firstChild().toText().data(); - v = QVariant( t == "true" || t == "1", 0 ); + TQString t = e.firstChild().toText().data(); + v = TQVariant( t == "true" || t == "1", 0 ); } else if ( e.tagName() == "pixmap" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "iconset" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "image" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "enum" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "set" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "sizepolicy" ) { - QDomElement n3 = e.firstChild().toElement(); - QSizePolicy sp; + TQDomElement n3 = e.firstChild().toElement(); + TQSizePolicy sp; while ( !n3.isNull() ) { if ( n3.tagName() == "hsizetype" ) - sp.setHorData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setHorData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "vsizetype" ) - sp.setVerData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setVerData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "horstretch" ) sp.setHorStretch( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "verstretch" ) sp.setVerStretch( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - v = QVariant( sp ); + v = TQVariant( sp ); } else if ( e.tagName() == "cursor" ) { - v = QVariant( QCursor( e.firstChild().toText().data().toInt() ) ); + v = TQVariant( TQCursor( e.firstChild().toText().data().toInt() ) ); } else if ( e.tagName() == "stringlist" ) { - QStringList lst; - QDomElement n; + TQStringList lst; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) lst << n.firstChild().toText().data(); - v = QVariant( lst ); + v = TQVariant( lst ); } else if ( e.tagName() == "date" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int y, m, d; y = m = d = 0; while ( !n3.isNull() ) { @@ -239,9 +239,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QDate( y, m, d ) ); + v = TQVariant( TQDate( y, m, d ) ); } else if ( e.tagName() == "time" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, m, s; h = m = s = 0; while ( !n3.isNull() ) { @@ -253,9 +253,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal s = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QTime( h, m, s ) ); + v = TQVariant( TQTime( h, m, s ) ); } else if ( e.tagName() == "datetime" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, mi, s, y, mo, d ; h = mi = s = y = mo = d = 0; while ( !n3.isNull() ) { @@ -273,7 +273,7 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QDateTime( QDate( y, mo, d ), QTime( h, mi, s ) ) ); + v = TQVariant( TQDateTime( TQDate( y, mo, d ), TQTime( h, mi, s ) ) ); } return v; } @@ -282,9 +282,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal /*! Returns the color which is returned in the dom element \a e. */ -QColor DomTool::readColor( const QDomElement &e ) +TQColor DomTool::readColor( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); int r= 0, g = 0, b = 0; while ( !n.isNull() ) { if ( n.tagName() == "red" ) @@ -296,7 +296,7 @@ QColor DomTool::readColor( const QDomElement &e ) n = n.nextSibling().toElement(); } - return QColor( r, g, b ); + return TQColor( r, g, b ); } /*! @@ -306,9 +306,9 @@ QColor DomTool::readColor( const QDomElement &e ) \sa hasAttribute() */ -QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ) +TQVariant DomTool::readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "attribute" ) { if ( n.attribute( "name" ) != name ) @@ -322,9 +322,9 @@ QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, cons /*! \overload */ -QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue ) +TQVariant DomTool::readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue ) { - QString comment; + TQString comment; return readAttribute( e, name, defValue, comment ); } @@ -333,9 +333,9 @@ QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, cons \sa readAttribute() */ -bool DomTool::hasAttribute( const QDomElement& e, const QString& name ) +bool DomTool::hasAttribute( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "attribute" ) { if ( n.attribute( "name" ) != name ) @@ -346,7 +346,7 @@ bool DomTool::hasAttribute( const QDomElement& e, const QString& name ) return FALSE; } -static bool toBool( const QString& s ) +static bool toBool( const TQString& s ) { return s == "true" || s.toInt() != 0; } @@ -354,11 +354,11 @@ static bool toBool( const QString& s ) /*! Convert Qt 2.x format to Qt 3.0 format if necessary */ -void DomTool::fixDocument( QDomDocument& doc ) +void DomTool::fixDocument( TQDomDocument& doc ) { - QDomElement e; - QDomNode n; - QDomNodeList nl; + TQDomElement e; + TQDomNode n; + TQDomNodeList nl; int i = 0; e = doc.firstChild().toElement(); @@ -374,8 +374,8 @@ void DomTool::fixDocument( QDomDocument& doc ) // in 3.0, we need to fix a spelling error if ( e.hasAttribute("version") && e.attribute("version").toDouble() == 3.0 ) { for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement el = nl.item(i).toElement(); - QString s = el.attribute( "name" ); + TQDomElement el = nl.item(i).toElement(); + TQString s = el.attribute( "name" ); if ( s == "resizeable" ) { el.removeAttribute( "name" ); el.setAttribute( "name", "resizable" ); @@ -391,8 +391,8 @@ void DomTool::fixDocument( QDomDocument& doc ) e.setAttribute("stdsetdef", 1 ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "name" ) { name = n2.firstChild().toText().data(); if ( name == "resizeable" ) @@ -416,8 +416,8 @@ void DomTool::fixDocument( QDomDocument& doc ) nl = doc.elementsByTagName( "attribute" ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "name" ) { name = n2.firstChild().toText().data(); e.setAttribute( "name", name ); @@ -428,8 +428,8 @@ void DomTool::fixDocument( QDomDocument& doc ) nl = doc.elementsByTagName( "image" ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "name" ) { name = n2.firstChild().toText().data(); e.setAttribute( "name", name ); @@ -440,8 +440,8 @@ void DomTool::fixDocument( QDomDocument& doc ) nl = doc.elementsByTagName( "widget" ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "class" ) { name = n2.firstChild().toText().data(); e.setAttribute( "class", name ); diff --git a/kdevdesigner/shared/domtool.h b/kdevdesigner/shared/domtool.h index 61b4269a..e83e106b 100644 --- a/kdevdesigner/shared/domtool.h +++ b/kdevdesigner/shared/domtool.h @@ -27,8 +27,8 @@ #ifndef DOMTOOL_H #define DOMTOOL_H -#include -#include +#include +#include class QDomElement; class QDomDocument; @@ -36,17 +36,17 @@ class QDomDocument; class DomTool : public Qt { public: - static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ); - static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ); - static bool hasProperty( const QDomElement& e, const QString& name ); - static QStringList propertiesOfType( const QDomElement& e, const QString& type ); - static QVariant elementToVariant( const QDomElement& e, const QVariant& defValue ); - static QVariant elementToVariant( const QDomElement& e, const QVariant& defValue, QString &comment ); - static QVariant readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue ); - static QVariant readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ); - static bool hasAttribute( const QDomElement& e, const QString& name ); - static QColor readColor( const QDomElement &e ); - static void fixDocument( QDomDocument& ); + static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); + static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ); + static bool hasProperty( const TQDomElement& e, const TQString& name ); + static TQStringList propertiesOfType( const TQDomElement& e, const TQString& type ); + static TQVariant elementToVariant( const TQDomElement& e, const TQVariant& defValue ); + static TQVariant elementToVariant( const TQDomElement& e, const TQVariant& defValue, TQString &comment ); + static TQVariant readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); + static TQVariant readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ); + static bool hasAttribute( const TQDomElement& e, const TQString& name ); + static TQColor readColor( const TQDomElement &e ); + static void fixDocument( TQDomDocument& ); }; diff --git a/kdevdesigner/shared/globaldefs.h b/kdevdesigner/shared/globaldefs.h index 653c4fa5..ce70cae2 100644 --- a/kdevdesigner/shared/globaldefs.h +++ b/kdevdesigner/shared/globaldefs.h @@ -27,16 +27,16 @@ #ifndef GLOBALDEFS_H #define GLOBALDEFS_H -#include -#include +#include +#include #define BOXLAYOUT_DEFAULT_MARGIN 11 #define BOXLAYOUT_DEFAULT_SPACING 6 #ifndef NO_STATIC_COLORS -static QColor *backColor1 = 0; -static QColor *backColor2 = 0; -static QColor *selectedBack = 0; +static TQColor *backColor1 = 0; +static TQColor *backColor2 = 0; +static TQColor *selectedBack = 0; static void init_colors() { @@ -44,17 +44,17 @@ static void init_colors() return; #if 0 // a calculated alternative for backColor1 - QColorGroup myCg = qApp->palette().active(); + TQColorGroup myCg = qApp->palette().active(); int h1, s1, v1; int h2, s2, v2; - myCg.color( QColorGroup::Base ).hsv( &h1, &s1, &v1 ); - myCg.color( QColorGroup::Background ).hsv( &h2, &s2, &v2 ); - QColor c( h1, s1, ( v1 + v2 ) / 2, QColor::Hsv ); + myCg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); + myCg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 ); + TQColor c( h1, s1, ( v1 + v2 ) / 2, TQColor::Hsv ); #endif - backColor1 = new QColor( 250, 248, 235 ); - backColor2 = new QColor( 255, 255, 255 ); - selectedBack = new QColor( 230, 230, 230 ); + backColor1 = new TQColor( 250, 248, 235 ); + backColor2 = new TQColor( 255, 255, 255 ); + selectedBack = new TQColor( 230, 230, 230 ); } #endif diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp index e1b54ca1..0affb9d0 100644 --- a/kdevdesigner/shared/parser.cpp +++ b/kdevdesigner/shared/parser.cpp @@ -25,28 +25,28 @@ **********************************************************************/ #include "parser.h" -#include -#include +#include +#include class NormalizeObject : public QObject { public: - NormalizeObject() : QObject() {} - static QCString normalizeSignalSlot( const char *signalSlot ) { return QObject::normalizeSignalSlot( signalSlot ); } + NormalizeObject() : TQObject() {} + static TQCString normalizeSignalSlot( const char *signalSlot ) { return TQObject::normalizeSignalSlot( signalSlot ); } }; -QString Parser::cleanArgs( const QString &func ) +TQString Parser::cleanArgs( const TQString &func ) { - QString slot( func ); + TQString slot( func ); int begin = slot.find( "(" ) + 1; - QString args = slot.mid( begin ); + TQString args = slot.mid( begin ); args = args.left( args.find( ")" ) ); - QStringList lst = QStringList::split( ',', args ); - QString res = slot.left( begin ); - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + TQStringList lst = TQStringList::split( ',', args ); + TQString res = slot.left( begin ); + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( it != lst.begin() ) res += ","; - QString arg = *it; + TQString arg = *it; int pos = 0; if ( ( pos = arg.find( "&" ) ) != -1 ) { arg = arg.left( pos + 1 ); @@ -56,7 +56,7 @@ QString Parser::cleanArgs( const QString &func ) arg = arg.simplifyWhiteSpace(); if ( ( pos = arg.find( ':' ) ) != -1 ) arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace(); - QStringList l = QStringList::split( ' ', arg ); + TQStringList l = TQStringList::split( ' ', arg ); if ( l.count() == 2 ) { if ( l[ 0 ] != "const" && l[ 0 ] != "unsigned" && l[ 0 ] != "var" ) arg = l[ 0 ]; @@ -68,5 +68,5 @@ QString Parser::cleanArgs( const QString &func ) } res += ")"; - return QString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); + return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); } diff --git a/kdevdesigner/shared/parser.h b/kdevdesigner/shared/parser.h index 10d83027..c50fed89 100644 --- a/kdevdesigner/shared/parser.h +++ b/kdevdesigner/shared/parser.h @@ -27,12 +27,12 @@ #ifndef PARSER_H #define PARSER_H -#include +#include class Parser { public: - static QString cleanArgs( const QString &func ); + static TQString cleanArgs( const TQString &func ); }; diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp index 72c09320..b1e1c6ac 100644 --- a/kdevdesigner/shared/ui2uib.cpp +++ b/kdevdesigner/shared/ui2uib.cpp @@ -29,15 +29,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* The .uib file format is the binary counterpart of the .ui file @@ -49,22 +49,22 @@ The .uib format, unlike the .ui format, is internal to Trolltech and is not officially documented; it is assumed that anybody who needs to understand the file format can read the ui2uib and - QWidgetFactory source code, with some guidance. And here's some + TQWidgetFactory source code, with some guidance. And here's some guidance. A .uib file starts with a 32-bit magic number that allows - QWidgetFactory to determine the file type. The magic number is + TQWidgetFactory to determine the file type. The magic number is followed by '\n' (0x0a) and '\r' (0x0d), which ensure that the file wasn't corrupted during transfer between different platforms. For example, transferring a .ui file from Windows to Unix using FTP with type ASCII will produce a file with '\r\n\r' - in place of '\n\r'. This is followed by the QDataStream format + in place of '\n\r'. This is followed by the TQDataStream format version number used. The rest of the file is made up of blocks, each of which starts with a block type (Block_XXX) and a block length. Block_Intro and Block_Widget are mandatory; the others are optional. - QWidgetFactory makes certain assumptions about the order of the + TQWidgetFactory makes certain assumptions about the order of the blocks; for example, it expects Block_String before any other block that refers to a string and Block_Images before Block_Widget. The order generated by ui2uib is one of the orders @@ -91,10 +91,10 @@ 2. QObjects are referred to by index in a table rather than by name. The table itself is not stored in the .uib file; it is - rather build dynamically by ui2uib and QWidgetFactory as new + rather build dynamically by ui2uib and TQWidgetFactory as new objects are specified. In ui2uib, the table is represented by - a UibIndexMap object; in QWidgetFactory, a plain array of - QObject pointers suffices. + a UibIndexMap object; in TQWidgetFactory, a plain array of + TQObject pointers suffices. 3. The data is packed to take as little place as possible, without slowing down QLayoutFactory too much. For example, an @@ -105,11 +105,11 @@ 48 bits. 4. The name of a signal or slot and its signature are saved - separately. That way, if a signal 'foo(const QString&)' is - connected to a slot 'bar(const QString&)', the string-table - will only contain 'foo', 'bar', and '(const QString&)', - instead of the longer 'foo(const QString&)' and 'bar(const - QString&)'. The signatures are normalized beforehand to + separately. That way, if a signal 'foo(const TQString&)' is + connected to a slot 'bar(const TQString&)', the string-table + will only contain 'foo', 'bar', and '(const TQString&)', + instead of the longer 'foo(const TQString&)' and 'bar(const + TQString&)'. The signatures are normalized beforehand to ensure that trivial spacing problems don't result in multiple string-table entries. @@ -134,24 +134,24 @@ use UibMagic + 1 for version 2, UibMagic + 2 for version 3, etc. */ -static QCString layoutForTag( const QString& tag ) +static TQCString layoutForTag( const TQString& tag ) { if ( tag == "grid" ) { - return "QGridLayout"; + return "TQGridLayout"; } else if ( tag == "hbox" ) { - return "QHBoxLayout"; + return "TQHBoxLayout"; } else if ( tag == "vbox" ) { - return "QVBoxLayout"; + return "TQVBoxLayout"; } else { - return "QLayout"; + return "TQLayout"; } } class UibHack : public QObject { public: - static QString normalize( const QString& member ) { - return QString::fromUtf8( QObject::normalizeSignalSlot(member.utf8()) ); + static TQString normalize( const TQString& member ) { + return TQString::fromUtf8( TQObject::normalizeSignalSlot(member.utf8()) ); } }; @@ -160,20 +160,20 @@ class UibIndexMap public: UibIndexMap() : next( 0 ) { } - void insert( const QString& name ) { setName( insert(), name ); } + void insert( const TQString& name ) { setName( insert(), name ); } int insert() { return next++; } - void setName( int no, const QString& name ); + void setName( int no, const TQString& name ); - int find( const QString& name, int deflt = -1 ) const; + int find( const TQString& name, int deflt = -1 ) const; int count() const { return next; } private: - QMap nameMap; - QMap conflicts; + TQMap nameMap; + TQMap conflicts; int next; }; -void UibIndexMap::setName( int no, const QString& name ) +void UibIndexMap::setName( int no, const TQString& name ) { if ( !name.isEmpty() ) { if ( *nameMap.insert(name, no, FALSE) != no ) @@ -181,9 +181,9 @@ void UibIndexMap::setName( int no, const QString& name ) } } -int UibIndexMap::find( const QString& name, int deflt ) const +int UibIndexMap::find( const TQString& name, int deflt ) const { - QMap::ConstIterator no = nameMap.find( name ); + TQMap::ConstIterator no = nameMap.find( name ); if ( no == nameMap.end() || conflicts.contains(name) ) { return deflt; } else { @@ -191,7 +191,7 @@ int UibIndexMap::find( const QString& name, int deflt ) const } } -static void packUInt16( QDataStream& out, Q_UINT16 n ) +static void packUInt16( TQDataStream& out, Q_UINT16 n ) { if ( n < 255 ) { out << (Q_UINT8) n; @@ -201,7 +201,7 @@ static void packUInt16( QDataStream& out, Q_UINT16 n ) } } -static void packUInt32( QDataStream& out, Q_UINT32 n ) +static void packUInt32( TQDataStream& out, Q_UINT32 n ) { if ( n < 65535 ) { out << (Q_UINT16) n; @@ -211,26 +211,26 @@ static void packUInt32( QDataStream& out, Q_UINT32 n ) } } -static void packByteArray( QDataStream& out, const QByteArray& array ) +static void packByteArray( TQDataStream& out, const TQByteArray& array ) { packUInt32( out, array.size() ); out.writeRawBytes( array.data(), array.size() ); } -static void packCString( UibStrTable& strings, QDataStream& out, +static void packCString( UibStrTable& strings, TQDataStream& out, const char *cstr ) { packUInt32( out, strings.insertCString(cstr) ); } -static void packString( UibStrTable& strings, QDataStream& out, - const QString& str ) +static void packString( UibStrTable& strings, TQDataStream& out, + const TQString& str ) { packUInt32( out, strings.insertString(str) ); } -static void packStringSplit( UibStrTable& strings, QDataStream& out, - const QString& str, QChar sep ) +static void packStringSplit( UibStrTable& strings, TQDataStream& out, + const TQString& str, TQChar sep ) { int pos = str.find( sep ); if ( pos == -1 ) @@ -239,29 +239,29 @@ static void packStringSplit( UibStrTable& strings, QDataStream& out, packString( strings, out, str.mid(pos) ); } -static void packVariant( UibStrTable& strings, QDataStream& out, - QVariant value, QString tag = "" ) +static void packVariant( UibStrTable& strings, TQDataStream& out, + TQVariant value, TQString tag = "" ) { - QStringList::ConstIterator s; + TQStringList::ConstIterator s; Q_UINT8 type = value.type(); if ( tag == "pixmap" ) { - type = QVariant::Pixmap; + type = TQVariant::Pixmap; } else if ( tag == "image" ) { - type = QVariant::Image; + type = TQVariant::Image; } else if ( tag == "iconset" ) { - type = QVariant::IconSet; + type = TQVariant::IconSet; } out << type; switch ( type ) { - case QVariant::String: - case QVariant::Pixmap: - case QVariant::Image: - case QVariant::IconSet: + case TQVariant::String: + case TQVariant::Pixmap: + case TQVariant::Image: + case TQVariant::IconSet: packString( strings, out, value.asString() ); break; - case QVariant::StringList: + case TQVariant::StringList: packUInt16( out, value.asStringList().count() ); s = value.asStringList().begin(); while ( s != value.asStringList().end() ) { @@ -269,48 +269,48 @@ static void packVariant( UibStrTable& strings, QDataStream& out, ++s; } break; - case QVariant::Font: + case TQVariant::Font: out << value.asFont(); break; - case QVariant::Rect: + case TQVariant::Rect: packUInt16( out, value.asRect().x() ); packUInt16( out, value.asRect().y() ); packUInt16( out, value.asRect().width() ); packUInt16( out, value.asRect().height() ); break; - case QVariant::Size: + case TQVariant::Size: packUInt16( out, value.asSize().width() ); packUInt16( out, value.asSize().height() ); break; - case QVariant::Color: + case TQVariant::Color: out << value.asColor(); break; - case QVariant::Point: + case TQVariant::Point: packUInt16( out, value.asPoint().x() ); packUInt16( out, value.asPoint().y() ); break; - case QVariant::Int: + case TQVariant::Int: packUInt32( out, value.asInt() ); break; - case QVariant::Bool: + case TQVariant::Bool: out << (Q_UINT8) value.asBool(); break; - case QVariant::Double: + case TQVariant::Double: out << value.asDouble(); break; - case QVariant::CString: + case TQVariant::CString: packCString( strings, out, value.asCString() ); break; - case QVariant::Cursor: + case TQVariant::Cursor: out << value.asCursor(); break; - case QVariant::Date: + case TQVariant::Date: out << value.asDate(); break; - case QVariant::Time: + case TQVariant::Time: out << value.asTime(); break; - case QVariant::DateTime: + case TQVariant::DateTime: out << value.asDateTime(); break; default: @@ -318,27 +318,27 @@ static void packVariant( UibStrTable& strings, QDataStream& out, } } -static void outputProperty( QMap& buddies, int objectNo, - UibStrTable& strings, QDataStream& out, - QDomElement elem ) +static void outputProperty( TQMap& buddies, int objectNo, + UibStrTable& strings, TQDataStream& out, + TQDomElement elem ) { - QCString name = elem.attribute( "name" ).latin1(); - QDomElement f = elem.firstChild().toElement(); - QString tag = f.tagName(); - QString comment; - QVariant value; + TQCString name = elem.attribute( "name" ).latin1(); + TQDomElement f = elem.firstChild().toElement(); + TQString tag = f.tagName(); + TQString comment; + TQVariant value; if ( name == "resizeable" ) name = "resizable"; if ( tag == "font" ) { - QString family; + TQString family; Q_UINT16 pointSize = 65535; Q_UINT8 fontFlags = 0; - QDomElement g = f.firstChild().toElement(); + TQDomElement g = f.firstChild().toElement(); while ( !g.isNull() ) { - QString text = g.firstChild().toText().data(); + TQString text = g.firstChild().toText().data(); if ( g.tagName() == "family" ) { fontFlags |= Font_Family; family = text; @@ -372,9 +372,9 @@ static void outputProperty( QMap& buddies, int objectNo, out << (Q_UINT8) Object_PaletteProperty; packCString( strings, out, name ); - QDomElement g = f.firstChild().toElement(); + TQDomElement g = f.firstChild().toElement(); while ( !g.isNull() ) { - QDomElement h = g.firstChild().toElement(); + TQDomElement h = g.firstChild().toElement(); while ( !h.isNull() ) { value = DomTool::elementToVariant( h, Qt::gray ); if ( h.tagName() == "color" ) { @@ -418,7 +418,7 @@ static void outputProperty( QMap& buddies, int objectNo, } } -static void outputGridCell( QDataStream& out, QDomElement elem ) +static void outputGridCell( TQDataStream& out, TQDomElement elem ) { int column = elem.attribute( "column", "0" ).toInt(); int row = elem.attribute( "row", "0" ).toInt(); @@ -438,23 +438,23 @@ static void outputGridCell( QDataStream& out, QDomElement elem ) } } -static int outputObject( QMap& buddies, +static int outputObject( TQMap& buddies, UibIndexMap& objects, UibStrTable& strings, - QDataStream& out, QDomElement elem, - QCString className = "" ); + TQDataStream& out, TQDomElement elem, + TQCString className = "" ); -static void outputLayoutWidgetsSubLayout( QMap& buddies, +static void outputLayoutWidgetsSubLayout( TQMap& buddies, UibIndexMap& objects, UibStrTable& strings, - QDataStream& out, QDomElement elem ) + TQDataStream& out, TQDomElement elem ) { int subLayoutNo = -1; - QCString name; - QDomElement nameElem; + TQCString name; + TQDomElement nameElem; - QDomElement f = elem.firstChild().toElement(); + TQDomElement f = elem.firstChild().toElement(); while ( !f.isNull() ) { - QString tag = f.tagName(); + TQString tag = f.tagName(); if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) { out << (Q_UINT8) Object_SubLayout; subLayoutNo = outputObject( buddies, objects, strings, out, f, @@ -483,16 +483,16 @@ static void outputLayoutWidgetsSubLayout( QMap& buddies, } } -static int outputObject( QMap& buddies, +static int outputObject( TQMap& buddies, UibIndexMap& objects, UibStrTable& strings, - QDataStream& out, QDomElement elem, - QCString className ) + TQDataStream& out, TQDomElement elem, + TQCString className ) { bool isQObject = !className.isEmpty(); - if ( className == "QToolBar" ) + if ( className == "TQToolBar" ) out << (Q_UINT8) elem.attribute( "dock", "0" ).toInt(); - if ( className == "QWidget" ) + if ( className == "TQWidget" ) className = elem.attribute( "class", className ).latin1(); int objectNo = -1; @@ -504,18 +504,18 @@ static int outputObject( QMap& buddies, outputGridCell( out, elem ); // optimization: insert '&Foo' into string-table before 'Foo' - if ( className == "QAction" || className == "QActionGroup" ) { - QVariant value = DomTool::readProperty( elem, "menuText", QVariant() ); + if ( className == "TQAction" || className == "TQActionGroup" ) { + TQVariant value = DomTool::readProperty( elem, "menuText", TQVariant() ); if ( value.asString().startsWith("&") ) strings.insertString( value.asString() ); } - QDomElement f = elem.firstChild().toElement(); + TQDomElement f = elem.firstChild().toElement(); while ( !f.isNull() ) { - QString tag = f.tagName(); + TQString tag = f.tagName(); if ( tag == "action" ) { if ( elem.tagName() == "item" || elem.tagName() == "toolbar" ) { - QString actionName = f.attribute( "name" ); + TQString actionName = f.attribute( "name" ); int no = objects.find( actionName ); if ( no != -1 ) { out << (Q_UINT8) Object_ActionRef; @@ -523,11 +523,11 @@ static int outputObject( QMap& buddies, } } else { out << (Q_UINT8) Object_SubAction; - outputObject( buddies, objects, strings, out, f, "QAction" ); + outputObject( buddies, objects, strings, out, f, "TQAction" ); } } else if ( tag == "actiongroup" ) { out << (Q_UINT8) Object_SubAction; - outputObject( buddies, objects, strings, out, f, "QActionGroup" ); + outputObject( buddies, objects, strings, out, f, "TQActionGroup" ); } else if ( tag == "attribute" ) { out << (Q_UINT8) Object_Attribute; outputProperty( buddies, objectNo, strings, out, f ); @@ -538,7 +538,7 @@ static int outputObject( QMap& buddies, out << (Q_UINT8) Object_Event; packCString( strings, out, f.attribute("name").latin1() ); packVariant( strings, out, - QStringList::split(',', f.attribute("functions")) ); + TQStringList::split(',', f.attribute("functions")) ); } else if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) { out << (Q_UINT8) Object_SubLayout; outputObject( buddies, objects, strings, out, f, @@ -570,7 +570,7 @@ static int outputObject( QMap& buddies, f ); } else { out << (Q_UINT8) Object_SubWidget; - outputObject( buddies, objects, strings, out, f, "QWidget" ); + outputObject( buddies, objects, strings, out, f, "TQWidget" ); } } f = f.nextSibling().toElement(); @@ -582,8 +582,8 @@ static int outputObject( QMap& buddies, return objectNo; } -static void outputBlock( QDataStream& out, BlockTag tag, - const QByteArray& data ) +static void outputBlock( TQDataStream& out, BlockTag tag, + const TQByteArray& data ) { if ( !data.isEmpty() ) { out << (Q_UINT8) tag; @@ -591,41 +591,41 @@ static void outputBlock( QDataStream& out, BlockTag tag, } } -void convertUiToUib( QDomDocument& doc, QDataStream& out ) +void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) { - QByteArray introBlock; - QByteArray actionsBlock; - QByteArray buddiesBlock; - QByteArray connectionsBlock; - QByteArray functionsBlock; - QByteArray imagesBlock; - QByteArray menubarBlock; - QByteArray slotsBlock; - QByteArray tabstopsBlock; - QByteArray toolbarsBlock; - QByteArray variablesBlock; - QByteArray widgetBlock; - - QDomElement actionsElem; - QDomElement connectionsElem; - QDomElement imagesElem; - QDomElement menubarElem; - QDomElement tabstopsElem; - QDomElement toolbarsElem; - QDomElement widgetElem; - - QMap buddies; + TQByteArray introBlock; + TQByteArray actionsBlock; + TQByteArray buddiesBlock; + TQByteArray connectionsBlock; + TQByteArray functionsBlock; + TQByteArray imagesBlock; + TQByteArray menubarBlock; + TQByteArray slotsBlock; + TQByteArray tabstopsBlock; + TQByteArray toolbarsBlock; + TQByteArray variablesBlock; + TQByteArray widgetBlock; + + TQDomElement actionsElem; + TQDomElement connectionsElem; + TQDomElement imagesElem; + TQDomElement menubarElem; + TQDomElement tabstopsElem; + TQDomElement toolbarsElem; + TQDomElement widgetElem; + + TQMap buddies; UibStrTable strings; UibIndexMap objects; int widgetNo = -1; - QCString className; + TQCString className; Q_INT16 defaultMargin = -32768; Q_INT16 defaultSpacing = -32768; Q_UINT8 introFlags = 0; - QDomElement elem = doc.firstChild().toElement().firstChild().toElement(); + TQDomElement elem = doc.firstChild().toElement().firstChild().toElement(); while ( !elem.isNull() ) { - QString tag = elem.tagName(); + TQString tag = elem.tagName(); switch ( tag[0].latin1() ) { case 'a': @@ -641,8 +641,8 @@ void convertUiToUib( QDomDocument& doc, QDataStream& out ) break; case 'f': if ( tag == "functions" ) { - QDataStream out2( functionsBlock, IO_WriteOnly ); - QDomElement f = elem.firstChild().toElement(); + TQDataStream out2( functionsBlock, IO_WriteOnly ); + TQDomElement f = elem.firstChild().toElement(); while ( !f.isNull() ) { if ( f.tagName() == "function" ) { packStringSplit( strings, out2, @@ -656,17 +656,17 @@ void convertUiToUib( QDomDocument& doc, QDataStream& out ) break; case 'i': if ( tag == "images" ) { - QDataStream out2( imagesBlock, IO_WriteOnly ); - QDomElement f = elem.firstChild().toElement(); + TQDataStream out2( imagesBlock, IO_WriteOnly ); + TQDomElement f = elem.firstChild().toElement(); while ( !f.isNull() ) { if ( f.tagName() == "image" ) { - QString name = f.attribute( "name" ); - QDomElement g = f.firstChild().toElement(); + TQString name = f.attribute( "name" ); + TQDomElement g = f.firstChild().toElement(); if ( g.tagName() == "data" ) { - QString format = g.attribute( "format", "PNG" ); - QString hex = g.firstChild().toText().data(); + TQString format = g.attribute( "format", "PNG" ); + TQString hex = g.firstChild().toText().data(); int n = hex.length() / 2; - QByteArray data( n ); + TQByteArray data( n ); for ( int i = 0; i < n; i++ ) data[i] = (char) hex.mid( 2 * i, 2 ) .toUInt( 0, 16 ); @@ -683,10 +683,10 @@ void convertUiToUib( QDomDocument& doc, QDataStream& out ) break; case 'l': if ( tag == "layoutdefaults" ) { - QString margin = elem.attribute( "margin" ); + TQString margin = elem.attribute( "margin" ); if ( !margin.isEmpty() ) defaultMargin = margin.toInt(); - QString spacing = elem.attribute( "spacing" ); + TQString spacing = elem.attribute( "spacing" ); if ( !spacing.isEmpty() ) defaultSpacing = spacing.toInt(); } @@ -701,12 +701,12 @@ void convertUiToUib( QDomDocument& doc, QDataStream& out ) break; case 's': if ( tag == "slots" ) { - QDataStream out2( slotsBlock, IO_WriteOnly ); - QDomElement f = elem.firstChild().toElement(); + TQDataStream out2( slotsBlock, IO_WriteOnly ); + TQDomElement f = elem.firstChild().toElement(); while ( !f.isNull() ) { if ( f.tagName() == "slot" ) { - QString language = f.attribute( "language", "C++" ); - QString slot = UibHack::normalize( + TQString language = f.attribute( "language", "C++" ); + TQString slot = UibHack::normalize( f.firstChild().toText().data() ); packString( strings, out2, language ); packStringSplit( strings, out2, slot, '(' ); @@ -724,11 +724,11 @@ void convertUiToUib( QDomDocument& doc, QDataStream& out ) break; case 'v': if ( tag == "variable" ) { - QDataStream out2( variablesBlock, IO_WriteOnly | IO_Append ); + TQDataStream out2( variablesBlock, IO_WriteOnly | IO_Append ); packString( strings, out2, elem.firstChild().toText().data() ); } else if ( tag == "variables" ) { - QDataStream out2( variablesBlock, IO_WriteOnly ); - QDomElement f = elem.firstChild().toElement(); + TQDataStream out2( variablesBlock, IO_WriteOnly ); + TQDomElement f = elem.firstChild().toElement(); while ( !f.isNull() ) { if ( f.tagName() == "variable" ) packString( strings, out2, @@ -745,17 +745,17 @@ void convertUiToUib( QDomDocument& doc, QDataStream& out ) } { - QDataStream out2( widgetBlock, IO_WriteOnly ); + TQDataStream out2( widgetBlock, IO_WriteOnly ); widgetNo = outputObject( buddies, objects, strings, out2, widgetElem, - "QWidget" ); + "TQWidget" ); } if ( !tabstopsElem.isNull() ) { - QDataStream out2( tabstopsBlock, IO_WriteOnly ); - QDomElement f = tabstopsElem.firstChild().toElement(); + TQDataStream out2( tabstopsBlock, IO_WriteOnly ); + TQDomElement f = tabstopsElem.firstChild().toElement(); while ( !f.isNull() ) { if ( f.tagName() == "tabstop" ) { - QString widgetName = f.firstChild().toText().data(); + TQString widgetName = f.firstChild().toText().data(); int no = objects.find( widgetName ); if ( no != -1 ) packUInt16( out2, no ); @@ -765,31 +765,31 @@ void convertUiToUib( QDomDocument& doc, QDataStream& out ) } if ( !actionsElem.isNull() ) { - QDataStream out2( actionsBlock, IO_WriteOnly ); + TQDataStream out2( actionsBlock, IO_WriteOnly ); outputObject( buddies, objects, strings, out2, actionsElem ); } if ( !menubarElem.isNull() ) { - QDataStream out2( menubarBlock, IO_WriteOnly ); + TQDataStream out2( menubarBlock, IO_WriteOnly ); outputObject( buddies, objects, strings, out2, menubarElem, - "QMenuBar" ); + "TQMenuBar" ); } if ( !toolbarsElem.isNull() ) { - QDataStream out2( toolbarsBlock, IO_WriteOnly ); - QDomElement f = toolbarsElem.firstChild().toElement(); + TQDataStream out2( toolbarsBlock, IO_WriteOnly ); + TQDomElement f = toolbarsElem.firstChild().toElement(); while ( !f.isNull() ) { if ( f.tagName() == "toolbar" ) - outputObject( buddies, objects, strings, out2, f, "QToolBar" ); + outputObject( buddies, objects, strings, out2, f, "TQToolBar" ); f = f.nextSibling().toElement(); } } if ( !buddies.isEmpty() ) { - QDataStream out2( buddiesBlock, IO_WriteOnly ); - QMap::ConstIterator a = buddies.begin(); + TQDataStream out2( buddiesBlock, IO_WriteOnly ); + TQMap::ConstIterator a = buddies.begin(); while ( a != buddies.end() ) { - QStringList::ConstIterator b = (*a).begin(); + TQStringList::ConstIterator b = (*a).begin(); while ( b != (*a).end() ) { int no = objects.find( *b ); if ( no != -1 ) { @@ -803,29 +803,29 @@ void convertUiToUib( QDomDocument& doc, QDataStream& out ) } if ( !connectionsElem.isNull() ) { - QString prevLanguage = "C++"; + TQString prevLanguage = "C++"; int prevSenderNo = 0; - QString prevSignal = "clicked()"; + TQString prevSignal = "clicked()"; int prevReceiverNo = 0; - QString prevSlot = "accept()"; + TQString prevSlot = "accept()"; - QDataStream out2( connectionsBlock, IO_WriteOnly ); - QDomElement f = connectionsElem.firstChild().toElement(); + TQDataStream out2( connectionsBlock, IO_WriteOnly ); + TQDomElement f = connectionsElem.firstChild().toElement(); while ( !f.isNull() ) { if ( f.tagName() == "connection" ) { - QMap argMap; + TQMap argMap; - QDomElement g = f.firstChild().toElement(); + TQDomElement g = f.firstChild().toElement(); while ( !g.isNull() ) { argMap[g.tagName()] = g.firstChild().toText().data(); g = g.nextSibling().toElement(); } - QString language = f.attribute( "language", "C++" ); + TQString language = f.attribute( "language", "C++" ); int senderNo = objects.find( argMap["sender"], widgetNo ); int receiverNo = objects.find( argMap["receiver"], widgetNo ); - QString signal = UibHack::normalize( argMap["signal"] ); - QString slot = UibHack::normalize( argMap["slot"] ); + TQString signal = UibHack::normalize( argMap["signal"] ); + TQString slot = UibHack::normalize( argMap["slot"] ); Q_UINT8 connectionFlags = 0; if ( language != prevLanguage ) @@ -864,7 +864,7 @@ void convertUiToUib( QDomDocument& doc, QDataStream& out ) } { - QDataStream out2( introBlock, IO_WriteOnly ); + TQDataStream out2( introBlock, IO_WriteOnly ); out2 << introFlags; out2 << defaultMargin; out2 << defaultSpacing; diff --git a/kdevdesigner/shared/ui2uib.h b/kdevdesigner/shared/ui2uib.h index 674fd589..6bbc02bc 100644 --- a/kdevdesigner/shared/ui2uib.h +++ b/kdevdesigner/shared/ui2uib.h @@ -30,6 +30,6 @@ class QDataStream; class QDomDocument; -void convertUiToUib( QDomDocument& doc, QDataStream& out ); +void convertUiToUib( TQDomDocument& doc, TQDataStream& out ); #endif diff --git a/kdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp index 72d73b45..ca48b4e4 100644 --- a/kdevdesigner/shared/uib.cpp +++ b/kdevdesigner/shared/uib.cpp @@ -27,7 +27,7 @@ #include "uib.h" static const char commonStrings[] = - "\0()\0(bool)\0(const QString&)\0(int)\0C++\0Layout1\0PNG\0QCheckBox\0" + "\0()\0(bool)\0(const TQString&)\0(int)\0C++\0Layout1\0PNG\0QCheckBox\0" "QComboBox\0QDialog\0QFrame\0QGridLayout\0QGroupBox\0QHBoxLayout\0QLabel\0" "QLineEdit\0QListView\0QPushButton\0QRadioButton\0QVBoxLayout\0QWidget\0" "TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0" diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h index 00adac13..0a7063a4 100644 --- a/kdevdesigner/shared/uib.h +++ b/kdevdesigner/shared/uib.h @@ -27,7 +27,7 @@ #ifndef UIB_H #define UIB_H -#include +#include const Q_UINT32 UibMagic = 0xb77c61d8; @@ -68,22 +68,22 @@ public: UibStrTable(); inline int insertCString( const char *cstr ); - inline int insertString( const QString& str ); - inline void readBlock( QDataStream& in, int size ); + inline int insertString( const TQString& str ); + inline void readBlock( TQDataStream& in, int size ); inline const char *asCString( int offset ) const; - inline QString asString( int offset ) const; - inline QByteArray block() const; + inline TQString asString( int offset ) const; + inline TQByteArray block() const; private: - QCString table; - QDataStream out; + TQCString table; + TQDataStream out; int start; }; /* uic uses insertCString(), insertString(), and block(); - QWidgetFactory uses readBlock(), asCString(), and asString(). By + TQWidgetFactory uses readBlock(), asCString(), and asString(). By implementing these functions inline, we ensure that the binaries don't contain needless code. */ @@ -106,9 +106,9 @@ inline int UibStrTable::insertCString( const char *cstr ) } } -inline int UibStrTable::insertString( const QString& str ) +inline int UibStrTable::insertString( const TQString& str ) { - if ( str.contains('\0') || str[0] == QChar(0x7f) ) { + if ( str.contains('\0') || str[0] == TQChar(0x7f) ) { int nextPos = table.size(); out << (Q_UINT8) 0x7f; out << str; @@ -118,22 +118,22 @@ inline int UibStrTable::insertString( const QString& str ) } } -inline void UibStrTable::readBlock( QDataStream& in, int size ) +inline void UibStrTable::readBlock( TQDataStream& in, int size ) { table.resize( start + size ); in.readRawBytes( table.data() + start, size ); } -inline QString UibStrTable::asString( int offset ) const +inline TQString UibStrTable::asString( int offset ) const { if ( table[offset] == 0x7f ) { - QDataStream in( table, IO_ReadOnly ); + TQDataStream in( table, IO_ReadOnly ); in.device()->at( offset + 1 ); - QString str; + TQString str; in >> str; return str; } else { - return QString::fromUtf8( asCString(offset) ); + return TQString::fromUtf8( asCString(offset) ); } } @@ -142,9 +142,9 @@ inline const char *UibStrTable::asCString( int offset ) const return table.data() + offset; } -inline QByteArray UibStrTable::block() const +inline TQByteArray UibStrTable::block() const { - QByteArray block; + TQByteArray block; block.duplicate( table.data() + start, table.size() - start ); return block; } diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp index 8b80b03f..902cd697 100644 --- a/kdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -32,15 +32,15 @@ #include #include -#include +#include #define NO_STATIC_COLORS #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -50,17 +50,17 @@ const int dbsize = 300; const int dbcustom = 200; const int dbdictsize = 211; static WidgetDatabaseRecord* db[ dbsize ]; -static QDict *className2Id = 0; +static TQDict *className2Id = 0; static int dbcount = 0; static int dbcustomcount = 200; -static QStrList *wGroups; -static QStrList *invisibleGroups; +static TQStrList *wGroups; +static TQStrList *invisibleGroups; static bool whatsThisLoaded = FALSE; static QPluginManager *widgetPluginManager = 0; static bool plugins_set_up = FALSE; static bool was_in_setup = FALSE; -QCleanupHandler > cleanup_manager; +TQCleanupHandler > cleanup_manager; WidgetDatabaseRecord::WidgetDatabaseRecord() { @@ -128,14 +128,14 @@ void WidgetDatabase::setupDataBase( int id ) invisibleGroups = new QStrList; invisibleGroups->append( "Forms" ); invisibleGroups->append( "Temp" ); - className2Id = new QDict( dbdictsize ); + className2Id = new TQDict( dbdictsize ); className2Id->setAutoDelete( TRUE ); WidgetDatabaseRecord *r = 0; r = new WidgetDatabaseRecord; r->iconSet = "designer_pushbutton.png"; - r->name = "QPushButton"; + r->name = "TQPushButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Push Button"; r->isCommon = TRUE; @@ -144,7 +144,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbutton.png"; - r->name = "QToolButton"; + r->name = "TQToolButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Tool Button"; @@ -152,7 +152,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_radiobutton.png"; - r->name = "QRadioButton"; + r->name = "TQRadioButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Radio Button"; r->isCommon = TRUE; @@ -161,7 +161,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_checkbox.png"; - r->name = "QCheckBox"; + r->name = "TQCheckBox"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Check Box"; r->isCommon = TRUE; @@ -170,7 +170,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_groupbox.png"; - r->name = "QGroupBox"; + r->name = "TQGroupBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Group Box"; r->isContainer = TRUE; @@ -179,7 +179,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_buttongroup.png"; - r->name = "QButtonGroup"; + r->name = "TQButtonGroup"; r->group = widgetGroup( "Containers" ); r->toolTip = "Button Group"; r->isContainer = TRUE; @@ -189,7 +189,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_frame.png"; - r->name = "QFrame"; + r->name = "TQFrame"; r->group = widgetGroup( "Containers" ); r->toolTip = "Frame"; r->isContainer = TRUE; @@ -198,7 +198,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "QTabWidget"; + r->name = "TQTabWidget"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tabwidget"; r->isContainer = TRUE; @@ -207,7 +207,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_widgetstack.png"; - r->name = "QWidgetStack"; + r->name = "TQWidgetStack"; r->group = widgetGroup( "Containers" ); r->toolTip = "Widget Stack"; r->isContainer = TRUE; @@ -216,7 +216,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbox.png"; - r->name = "QToolBox"; + r->name = "TQToolBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tool Box"; r->isContainer = TRUE; @@ -225,7 +225,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listbox.png"; - r->name = "QListBox"; + r->name = "TQListBox"; r->group = widgetGroup( "Views" ); r->toolTip = "List Box"; r->isCommon = TRUE; @@ -234,7 +234,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listview.png"; - r->name = "QListView"; + r->name = "TQListView"; r->group = widgetGroup( "Views" ); r->toolTip = "List View"; @@ -243,7 +243,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(QT_NO_ICONVIEW) || defined(UIC) r = new WidgetDatabaseRecord; r->iconSet = "designer_iconview.png"; - r->name = "QIconView"; + r->name = "TQIconView"; r->group = widgetGroup( "Views" ); r->toolTip = "Icon View"; @@ -253,7 +253,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(QT_NO_TABLE) r = new WidgetDatabaseRecord; r->iconSet = "designer_table.png"; - r->name = "QTable"; + r->name = "TQTable"; r->group = widgetGroup( "Views" ); r->toolTip = "Table"; @@ -263,8 +263,8 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(QT_NO_SQL) r = new WidgetDatabaseRecord; r->iconSet = "designer_datatable.png"; - r->includeFile = "qdatatable.h"; - r->name = "QDataTable"; + r->includeFile = "tqdatatable.h"; + r->name = "TQDataTable"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Table"; @@ -273,7 +273,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lineedit.png"; - r->name = "QLineEdit"; + r->name = "TQLineEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Line Edit"; r->isCommon = TRUE; @@ -282,7 +282,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_spinbox.png"; - r->name = "QSpinBox"; + r->name = "TQSpinBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Spin Box"; r->isCommon = TRUE; @@ -294,7 +294,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "QDateEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Date Edit"; - r->includeFile = "qdatetimeedit.h"; + r->includeFile = "tqdatetimeedit.h"; append( r ); @@ -303,7 +303,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "QTimeEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Time Edit"; - r->includeFile = "qdatetimeedit.h"; + r->includeFile = "tqdatetimeedit.h"; append( r ); @@ -312,13 +312,13 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "QDateTimeEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Date-Time Edit"; - r->includeFile = "qdatetimeedit.h"; + r->includeFile = "tqdatetimeedit.h"; append( r ); r = new WidgetDatabaseRecord; r->iconSet = "designer_multilineedit.png"; - r->name = "QMultiLineEdit"; + r->name = "TQMultiLineEdit"; r->group = widgetGroup( "Temp" ); r->toolTip = "Multi Line Edit"; @@ -326,7 +326,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_richtextedit.png"; - r->name = "QTextEdit"; + r->name = "TQTextEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Rich Text Edit"; r->isCommon = TRUE; @@ -335,7 +335,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_combobox.png"; - r->name = "QComboBox"; + r->name = "TQComboBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Combo Box"; r->isCommon = TRUE; @@ -344,7 +344,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_slider.png"; - r->name = "QSlider"; + r->name = "TQSlider"; r->group = widgetGroup( "Input" ); r->toolTip = "Slider"; @@ -352,7 +352,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_scrollbar.png"; - r->name = "QScrollBar"; + r->name = "TQScrollBar"; r->group = widgetGroup( "Input" ); r->toolTip = "Scrollbar"; @@ -360,7 +360,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_dial.png"; - r->name = "QDial"; + r->name = "TQDial"; r->group = widgetGroup( "Input" ); r->toolTip = "Dial"; @@ -368,7 +368,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_label.png"; - r->name = "QLabel"; + r->name = "TQLabel"; r->group = widgetGroup( "Temp" ); r->toolTip = "Label"; @@ -395,7 +395,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lcdnumber.png"; - r->name = "QLCDNumber"; + r->name = "TQLCDNumber"; r->group = widgetGroup( "Display" ); r->toolTip = "LCD Number"; @@ -406,14 +406,14 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "Line"; r->group = widgetGroup( "Display" ); r->toolTip = "Line"; - r->includeFile = "qframe.h"; + r->includeFile = "tqframe.h"; r->whatsThis = "The Line widget provides horizontal and vertical lines."; append( r ); r = new WidgetDatabaseRecord; r->iconSet = "designer_progress.png"; - r->name = "QProgressBar"; + r->name = "TQProgressBar"; r->group = widgetGroup( "Display" ); r->toolTip = "Progress Bar"; @@ -421,7 +421,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textview.png"; - r->name = "QTextView"; + r->name = "TQTextView"; r->group = widgetGroup( "Temp" ); r->toolTip = "Text View"; @@ -429,7 +429,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textbrowser.png"; - r->name = "QTextBrowser"; + r->name = "TQTextBrowser"; r->group = widgetGroup( "Display" ); r->toolTip = "Text Browser"; @@ -445,21 +445,21 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = "QWidget"; + r->name = "TQWidget"; r->isForm = TRUE; r->group = widgetGroup( "Forms" ); append( r ); r = new WidgetDatabaseRecord; - r->name = "QDialog"; + r->name = "TQDialog"; r->group = widgetGroup( "Forms" ); r->isForm = TRUE; append( r ); r = new WidgetDatabaseRecord; - r->name = "QWizard"; + r->name = "TQWizard"; r->group = widgetGroup( "Forms" ); r->isContainer = TRUE; @@ -481,9 +481,9 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = "QSplitter"; + r->name = "TQSplitter"; r->group = widgetGroup( "Temp" ); - r->includeFile = "qsplitter.h"; + r->includeFile = "tqsplitter.h"; r->isContainer = TRUE; append( r ); @@ -514,8 +514,8 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QMainWindow"; - r->includeFile = "qmainwindow.h"; + r->name = "TQMainWindow"; + r->includeFile = "tqmainwindow.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -524,7 +524,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; r->name = "QDesignerAction"; - r->includeFile = "qaction.h"; + r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; @@ -533,7 +533,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; r->name = "QDesignerActionGroup"; - r->includeFile = "qaction.h"; + r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; @@ -541,8 +541,8 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QScrollView"; - r->includeFile = "qscrollview.h"; + r->name = "TQScrollView"; + r->includeFile = "tqscrollview.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -551,8 +551,8 @@ void WidgetDatabase::setupDataBase( int id ) #ifndef QT_NO_SQL r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDataBrowser"; - r->includeFile = "qdatabrowser.h"; + r->name = "TQDataBrowser"; + r->includeFile = "tqdatabrowser.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Browser"; r->iconSet = "designer_databrowser.png"; @@ -562,8 +562,8 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDataView"; - r->includeFile = "qdataview.h"; + r->name = "TQDataView"; + r->includeFile = "tqdataview.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data View"; r->iconSet = "designer_dataview.png"; @@ -582,8 +582,8 @@ void WidgetDatabase::setupPlugins() if ( plugins_set_up ) return; plugins_set_up = TRUE; - QStringList widgets = widgetManager()->featureList(); - for ( QStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) { + TQStringList widgets = widgetManager()->featureList(); + for ( TQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) { if ( hasWidget( *it ) ) continue; WidgetDatabaseRecord *r = new WidgetDatabaseRecord; @@ -593,11 +593,11 @@ void WidgetDatabase::setupPlugins() continue; #ifndef UIC - QIconSet icon = iface->iconSet( *it ); + TQIconSet icon = iface->iconSet( *it ); if ( !icon.pixmap().isNull() ) - r->icon = new QIconSet( icon ); + r->icon = new TQIconSet( icon ); #endif - QString grp = iface->group( *it ); + TQString grp = iface->group( *it ); if ( grp.isEmpty() ) grp = "3rd party widgets"; r->group = widgetGroup( grp ); @@ -636,24 +636,24 @@ int WidgetDatabase::startCustom() Returns the iconset which represents the class registered as \a id. */ -QIconSet WidgetDatabase::iconSet( int id ) +TQIconSet WidgetDatabase::iconSet( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QIconSet(); + return TQIconSet(); #if !defined(UIC) && !defined(RESOURCE) if ( !r->icon ) { if ( r->iconSet.isEmpty() ) - return QIconSet(); - QPixmap pix = BarIcon( r->iconSet, KDevDesignerPartFactory::instance() ); + return TQIconSet(); + TQPixmap pix = BarIcon( r->iconSet, KDevDesignerPartFactory::instance() ); if ( pix.isNull() ) - pix = QPixmap( r->iconSet ); - r->icon = new QIconSet( pix ); + pix = TQPixmap( r->iconSet ); + r->icon = new TQIconSet( pix ); } return *r->icon; #else - return QIconSet(); + return TQIconSet(); #endif } @@ -661,12 +661,12 @@ QIconSet WidgetDatabase::iconSet( int id ) Returns the classname of the widget which is registered as \a id. */ -QString WidgetDatabase::className( int id ) +TQString WidgetDatabase::className( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->name; } @@ -674,12 +674,12 @@ QString WidgetDatabase::className( int id ) Returns the group the widget registered as \a id belongs to. */ -QString WidgetDatabase::group( int id ) +TQString WidgetDatabase::group( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->group; } @@ -687,12 +687,12 @@ QString WidgetDatabase::group( int id ) Returns the tooltip text of the widget which is registered as \a id. */ -QString WidgetDatabase::toolTip( int id ) +TQString WidgetDatabase::toolTip( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->toolTip; } @@ -700,12 +700,12 @@ QString WidgetDatabase::toolTip( int id ) Returns the what's this? text of the widget which is registered as \a id. */ -QString WidgetDatabase::whatsThis( int id ) +TQString WidgetDatabase::whatsThis( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->whatsThis; } @@ -713,12 +713,12 @@ QString WidgetDatabase::whatsThis( int id ) Returns the include file if the widget which is registered as \a id. */ -QString WidgetDatabase::includeFile( int id ) +TQString WidgetDatabase::includeFile( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; if ( r->includeFile.isNull() ) return r->name.lower() + ".h"; return r->includeFile; @@ -756,10 +756,10 @@ bool WidgetDatabase::isCommon( int id ) return r->isCommon; } -QString WidgetDatabase::createWidgetName( int id ) +TQString WidgetDatabase::createWidgetName( int id ) { setupDataBase( id ); - QString n = className( id ); + TQString n = className( id ); if ( n == "QLayoutWidget" ) n = "Layout"; if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] ) @@ -771,14 +771,14 @@ QString WidgetDatabase::createWidgetName( int id ) WidgetDatabaseRecord *r = at( id ); if ( !r ) return n; - n += QString::number( ++r->nameCounter ); + n += TQString::number( ++r->nameCounter ); n[0] = n[0].lower(); return n; } /*! Returns the id for \a name or -1 if \a name is unknown. */ -int WidgetDatabase::idFromClassName( const QString &name ) +int WidgetDatabase::idFromClassName( const TQString &name ) { setupDataBase( -1 ); if ( name.isEmpty() ) @@ -797,7 +797,7 @@ int WidgetDatabase::idFromClassName( const QString &name ) return -1; } -bool WidgetDatabase::hasWidget( const QString &name ) +bool WidgetDatabase::hasWidget( const TQString &name ) { return className2Id->find( name ) != 0; } @@ -830,14 +830,14 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) insert( dbcount++, r ); } -QString WidgetDatabase::widgetGroup( const QString &g ) +TQString WidgetDatabase::widgetGroup( const TQString &g ) { if ( wGroups->find( g ) == -1 ) wGroups->append( g ); return g; } -bool WidgetDatabase::isGroupEmpty( const QString &grp ) +bool WidgetDatabase::isGroupEmpty( const TQString &grp ) { WidgetDatabaseRecord *r = 0; for ( int i = 0; i < dbcount; ++i ) { @@ -849,12 +849,12 @@ bool WidgetDatabase::isGroupEmpty( const QString &grp ) return TRUE; } -QString WidgetDatabase::widgetGroup( int i ) +TQString WidgetDatabase::widgetGroup( int i ) { setupDataBase( -1 ); if ( i >= 0 && i < (int)wGroups->count() ) return wGroups->at( i ); - return QString::null; + return TQString::null; } int WidgetDatabase::numWidgetGroups() @@ -863,7 +863,7 @@ int WidgetDatabase::numWidgetGroups() return wGroups->count(); } -bool WidgetDatabase::isGroupVisible( const QString &g ) +bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); return invisibleGroups->find( g ) == -1; @@ -875,8 +875,8 @@ int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) return dbcustomcount - 1; } -void WidgetDatabase::customWidgetClassNameChanged( const QString &oldName, - const QString &newName ) +void WidgetDatabase::customWidgetClassNameChanged( const TQString &oldName, + const TQString &newName ) { int id = idFromClassName( oldName ); if ( id == -1 ) @@ -908,16 +908,16 @@ bool WidgetDatabase::isWhatsThisLoaded() return whatsThisLoaded; } -void WidgetDatabase::loadWhatsThis( const QString &docPath ) +void WidgetDatabase::loadWhatsThis( const TQString &docPath ) { - QString whatsthisFile = docPath + "/whatsthis"; - QFile f( whatsthisFile ); + TQString whatsthisFile = docPath + "/whatsthis"; + TQFile f( whatsthisFile ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); + TQTextStream ts( &f ); while ( !ts.atEnd() ) { - QString s = ts.readLine(); - QStringList l = QStringList::split( " | ", s ); + TQString s = ts.readLine(); + TQStringList l = TQStringList::split( " | ", s ); int id = idFromClassName( l[ 1 ] ); WidgetDatabaseRecord *r = at( id ); if ( r ) @@ -930,27 +930,27 @@ void WidgetDatabase::loadWhatsThis( const QString &docPath ) // ### Qt 3.1: make these publically accessible via QWidgetDatabase API #if defined(UIC) bool dbnounload = FALSE; -QStringList *dbpaths = 0; +TQStringList *dbpaths = 0; #else -extern QString *qwf_plugin_dir; +extern TQString *qwf_plugin_dir; #endif QPluginManager *widgetManager() { if ( !widgetPluginManager ) { - QString pluginDir = "/designer"; + TQString pluginDir = "/designer"; #if !defined(UIC) if ( qwf_plugin_dir ) pluginDir = *qwf_plugin_dir; #endif - widgetPluginManager = new QPluginManager( IID_Widget, QApplication::libraryPaths(), pluginDir ); + widgetPluginManager = new QPluginManager( IID_Widget, TQApplication::libraryPaths(), pluginDir ); cleanup_manager.add( &widgetPluginManager ); #if defined(UIC) if ( dbnounload ) widgetPluginManager->setAutoUnload( FALSE ); if ( dbpaths ) { - QStringList::ConstIterator it = dbpaths->begin(); + TQStringList::ConstIterator it = dbpaths->begin(); for ( ; it != dbpaths->end(); ++it ) widgetPluginManager->addLibraryPath( *it ); } diff --git a/kdevdesigner/shared/widgetdatabase.h b/kdevdesigner/shared/widgetdatabase.h index 03060fa3..a41728fb 100644 --- a/kdevdesigner/shared/widgetdatabase.h +++ b/kdevdesigner/shared/widgetdatabase.h @@ -27,8 +27,8 @@ #ifndef WIDGETDATABASE_H #define WIDGETDATABASE_H -#include -#include +#include +#include #include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility #include @@ -39,12 +39,12 @@ struct WidgetDatabaseRecord { WidgetDatabaseRecord(); ~WidgetDatabaseRecord(); - QString iconSet, name, group, toolTip, whatsThis, includeFile; + TQString iconSet, name, group, toolTip, whatsThis, includeFile; uint isContainer : 1; uint isForm : 1; uint isCommon : 1; uint isPlugin : 1; - QIconSet *icon; + TQIconSet *icon; int nameCounter; }; @@ -58,38 +58,38 @@ public: static int count(); static int startCustom(); - static QIconSet iconSet( int id ); - static QString className( int id ); - static QString group( int id ); - static QString toolTip( int id ); - static QString whatsThis( int id ); - static QString includeFile( int id ); + static TQIconSet iconSet( int id ); + static TQString className( int id ); + static TQString group( int id ); + static TQString toolTip( int id ); + static TQString whatsThis( int id ); + static TQString includeFile( int id ); static bool isForm( int id ); static bool isContainer( int id ); static bool isCommon( int id ); - static int idFromClassName( const QString &name ); - static QString createWidgetName( int id ); + static int idFromClassName( const TQString &name ); + static TQString createWidgetName( int id ); static WidgetDatabaseRecord *at( int index ); static void insert( int index, WidgetDatabaseRecord *r ); static void append( WidgetDatabaseRecord *r ); - static QString widgetGroup( const QString &g ); - static QString widgetGroup( int i ); + static TQString widgetGroup( const TQString &g ); + static TQString widgetGroup( int i ); static int numWidgetGroups(); - static bool isGroupVisible( const QString &g ); - static bool isGroupEmpty( const QString &grp ); + static bool isGroupVisible( const TQString &g ); + static bool isGroupEmpty( const TQString &grp ); static int addCustomWidget( WidgetDatabaseRecord *r ); static bool isCustomWidget( int id ); static bool isCustomPluginWidget( int id ); static bool isWhatsThisLoaded(); - static void loadWhatsThis( const QString &docPath ); + static void loadWhatsThis( const TQString &docPath ); - static bool hasWidget( const QString &name ); - static void customWidgetClassNameChanged( const QString &oldName, const QString &newName ); + static bool hasWidget( const TQString &name ); + static void customWidgetClassNameChanged( const TQString &oldName, const TQString &newName ); }; diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp index 6ef40bd0..5e54297e 100644 --- a/kdevdesigner/src/kdevdesigner.cpp +++ b/kdevdesigner/src/kdevdesigner.cpp @@ -57,7 +57,7 @@ KDevDesigner::KDevDesigner() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - QStringList args; + TQStringList args; args.append("in shell"); m_part = static_cast(factory->create(this, "kdevdesigner_part", "KParts::ReadWritePart", args)); @@ -99,16 +99,16 @@ void KDevDesigner::load(const KURL& url) void KDevDesigner::setupActions() { -/* KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::open(this, SLOT(fileOpen()), actionCollection());*/ +/* KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());*/ - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } void KDevDesigner::saveProperties(KConfig* /*config*/) @@ -174,8 +174,8 @@ void KDevDesigner::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, SIGNAL(newToolbarConfig()), - this, SLOT(applyNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), + this, TQT_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -190,7 +190,7 @@ void KDevDesigner::fileOpen() // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked KURL url = - KFileDialog::getOpenURL( QString::null, QString::null, this ); + KFileDialog::getOpenURL( TQString::null, TQString::null, this ); if (url.isEmpty() == false) { diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp index fc0f23f7..a535f575 100644 --- a/kdevdesigner/src/main.cpp +++ b/kdevdesigner/src/main.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include #include "kdevdesigner.h" @@ -56,13 +56,13 @@ int main(int argc, char **argv) else { // no session.. just start up normally - QSplashScreen * splash = 0; - QString splashFile = locate("data", "kdevelop/pics/kdevdesigner-splash.png"); + TQSplashScreen * splash = 0; + TQString splashFile = locate("data", "kdevelop/pics/kdevdesigner-splash.png"); if (!splashFile.isNull()) { - QPixmap pm; + TQPixmap pm; pm.load(splashFile); - splash = new QSplashScreen( pm ); + splash = new TQSplashScreen( pm ); splash->show(); } diff --git a/kdevdesigner/uilib/database.cpp b/kdevdesigner/uilib/database.cpp index a92a04c8..c9621604 100644 --- a/kdevdesigner/uilib/database.cpp +++ b/kdevdesigner/uilib/database.cpp @@ -37,10 +37,10 @@ #include "mainwindow.h" #endif -#include -#include -#include -#include +#include +#include +#include +#include DatabaseSupport::DatabaseSupport() { @@ -49,40 +49,40 @@ DatabaseSupport::DatabaseSupport() parent = 0; } -void DatabaseSupport::initPreview( const QString &connection, const QString &table, QObject *o, - const QMap &databaseControls ) +void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o, + const TQMap &databaseControls ) { tbl = table; dbControls = databaseControls; parent = o; if ( connection != "(default)" ) - con = QSqlDatabase::database( connection ); + con = TQSqlDatabase::database( connection ); else - con = QSqlDatabase::database(); - frm = new QSqlForm( o, table ); - for ( QMap::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { - QObject *chld = parent->child( it.key(), "QWidget" ); + con = TQSqlDatabase::database(); + frm = new TQSqlForm( o, table ); + for ( TQMap::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { + TQObject *chld = parent->child( it.key(), "TQWidget" ); if ( !chld ) continue; - frm->insert( (QWidget*)chld, *it ); + frm->insert( (TQWidget*)chld, *it ); } } -QDesignerDataBrowser::QDesignerDataBrowser( QWidget *parent, const char *name ) - : QDataBrowser( parent, name ) +QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *parent, const char *name ) + : TQDataBrowser( parent, name ) { } -bool QDesignerDataBrowser::event( QEvent* e ) +bool QDesignerDataBrowser::event( TQEvent* e ) { - bool b = QDataBrowser::event( e ); + bool b = TQDataBrowser::event( e ); #if defined(DESIGNER) if ( MainWindow::self->isPreviewing() ) { #endif - if ( e->type() == QEvent::Show ) { + if ( e->type() == TQEvent::Show ) { if ( con ) { - QSqlCursor* cursor = new QSqlCursor( tbl, TRUE, con ); + TQSqlCursor* cursor = new TQSqlCursor( tbl, TRUE, con ); setSqlCursor( cursor, TRUE ); setForm( frm ); refresh(); @@ -96,18 +96,18 @@ bool QDesignerDataBrowser::event( QEvent* e ) return b; } -QDesignerDataView::QDesignerDataView( QWidget *parent, const char *name ) - : QDataView( parent, name ) +QDesignerDataView::QDesignerDataView( TQWidget *parent, const char *name ) + : TQDataView( parent, name ) { } -bool QDesignerDataView::event( QEvent* e ) +bool QDesignerDataView::event( TQEvent* e ) { - bool b = QDataView::event( e ); + bool b = TQDataView::event( e ); #if defined(DESIGNER) if ( MainWindow::self->isPreviewing() ) { #endif - if ( e->type() == QEvent::Show ) { + if ( e->type() == TQEvent::Show ) { setForm( frm ); readFields(); return TRUE; diff --git a/kdevdesigner/uilib/database2.h b/kdevdesigner/uilib/database2.h index 05a04712..2efc5c04 100644 --- a/kdevdesigner/uilib/database2.h +++ b/kdevdesigner/uilib/database2.h @@ -27,13 +27,13 @@ #ifndef DATABASE2_H #define DATABASE2_H -#include "qfeatures.h" +#include "tqfeatures.h" #ifndef QT_NO_SQL -#include -#include -#include -#include +#include +#include +#include +#include class QSqlDatabase; class QSqlForm; @@ -44,38 +44,38 @@ public: DatabaseSupport2(); virtual ~DatabaseSupport2() {} - void initPreview( const QString &connection, const QString &table, QObject *o, - const QMap &databaseControls ); + void initPreview( const TQString &connection, const TQString &table, TQObject *o, + const TQMap &databaseControls ); protected: - QSqlDatabase* con; - QSqlForm* frm; - QString tbl; - QMap dbControls; - QObject *parent; + TQSqlDatabase* con; + TQSqlForm* frm; + TQString tbl; + TQMap dbControls; + TQObject *parent; }; -class QDesignerDataBrowser2 : public QDataBrowser, public DatabaseSupport2 +class QDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2 { Q_OBJECT public: - QDesignerDataBrowser2( QWidget *parent, const char *name ); + QDesignerDataBrowser2( TQWidget *parent, const char *name ); protected: - bool event( QEvent* e ); + bool event( TQEvent* e ); }; -class QDesignerDataView2 : public QDataView, public DatabaseSupport2 +class QDesignerDataView2 : public TQDataView, public DatabaseSupport2 { Q_OBJECT public: - QDesignerDataView2( QWidget *parent, const char *name ); + QDesignerDataView2( TQWidget *parent, const char *name ); protected: - bool event( QEvent* e ); + bool event( TQEvent* e ); }; diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index 43c7c11e..b9a5211a 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -24,107 +24,107 @@ ** **********************************************************************/ -#include "qwidgetfactory.h" +#include "tqwidgetfactory.h" #include "../interfaces/languageinterface.h" #include "../interfaces/widgetinterface.h" -#include +#include #include "database2.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #ifndef QT_NO_SQL -#include -#include -#include +#include +#include +#include #endif // include all Qt widgets we support -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef QT_NO_TABLE -#include +#include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include class QWidgetFactoryPrivate { public: - QCString translationContext; - QListViewItem *lastItem; - QDict customWidgets; + TQCString translationContext; + TQListViewItem *lastItem; + TQDict customWidgets; }; -static QPtrList widgetFactories; +static TQPtrList widgetFactories; static QPluginManager *languageInterfaceManager = 0; static QPluginManager *widgetInterfaceManager = 0; -static QMap *availableWidgetMap = 0; -static QStringList *availableWidgetList = 0; +static TQMap *availableWidgetMap = 0; +static TQStringList *availableWidgetList = 0; -QMap *qwf_forms = 0; -QString *qwf_language = 0; +TQMap *qwf_forms = 0; +TQString *qwf_language = 0; bool qwf_execute_code = TRUE; bool qwf_stays_on_top = FALSE; -QString qwf_currFileName = ""; -QObject *qwf_form_object = 0; -QString *qwf_plugin_dir = 0; +TQString qwf_currFileName = ""; +TQObject *qwf_form_object = 0; +TQString *qwf_plugin_dir = 0; static void setupPluginDir() { if ( !qwf_plugin_dir ) - qwf_plugin_dir = new QString( "/designer" ); + qwf_plugin_dir = new TQString( "/designer" ); } static void setupWidgetListAndMap() @@ -133,49 +133,49 @@ static void setupWidgetListAndMap() return; setupPluginDir(); availableWidgetList = new QStringList; - (*availableWidgetList) << "QPushButton" << "QToolButton" << "QCheckBox" << "QRadioButton" - << "QGroupBox" << "QButtonGroup" << "QIconView" << "QTable" - << "QListBox" << "QListView" << "QLineEdit" << "QSpinBox" - << "QMultiLineEdit" << "QLabel" << "TextLabel" << "PixmapLabel" - << "QLayoutWidget" << "QTabWidget" << "QComboBox" - << "QWidget" << "QDialog" << "QWizard" << "QLCDNumber"; + (*availableWidgetList) << "TQPushButton" << "TQToolButton" << "TQCheckBox" << "TQRadioButton" + << "TQGroupBox" << "TQButtonGroup" << "TQIconView" << "TQTable" + << "TQListBox" << "TQListView" << "TQLineEdit" << "TQSpinBox" + << "TQMultiLineEdit" << "TQLabel" << "TextLabel" << "PixmapLabel" + << "QLayoutWidget" << "TQTabWidget" << "TQComboBox" + << "TQWidget" << "TQDialog" << "TQWizard" << "TQLCDNumber"; // put less stress on the compiler by limiting the template nesting depth - (*availableWidgetList) << "QProgressBar" << "QTextView" << "QTextBrowser" - << "QDial" << "QSlider" << "QFrame" << "Line" << "QTextEdit" - << "QDateEdit" << "QTimeEdit" << "QDateTimeEdit" << "QScrollBar" - << "QPopupMenu" << "QWidgetStack" << "QMainWindow" - << "QDataTable" << "QDataBrowser" << "QDataView" - << "QVBox" << "QHBox" << "QGrid" << "QToolBox"; + (*availableWidgetList) << "TQProgressBar" << "TQTextView" << "TQTextBrowser" + << "TQDial" << "TQSlider" << "TQFrame" << "Line" << "TQTextEdit" + << "QDateEdit" << "QTimeEdit" << "QDateTimeEdit" << "TQScrollBar" + << "TQPopupMenu" << "TQWidgetStack" << "TQMainWindow" + << "TQDataTable" << "TQDataBrowser" << "TQDataView" + << "TQVBox" << "TQHBox" << "TQGrid" << "TQToolBox"; if ( !widgetInterfaceManager ) widgetInterfaceManager = - new QPluginManager( IID_Widget, QApplication::libraryPaths(), *qwf_plugin_dir ); + new QPluginManager( IID_Widget, TQApplication::libraryPaths(), *qwf_plugin_dir ); - QStringList l = widgetInterfaceManager->featureList(); - QStringList::Iterator it; + TQStringList l = widgetInterfaceManager->featureList(); + TQStringList::Iterator it; for ( it = l.begin(); it != l.end(); ++it ) (*availableWidgetList) << *it; - availableWidgetMap = new QMap; + availableWidgetMap = new TQMap; for ( it = availableWidgetList->begin(); it != availableWidgetList->end(); ++it ) availableWidgetMap->insert( *it, TRUE ); } -static QImage loadImageData( const QString& format, ulong len, QByteArray data ) +static TQImage loadImageData( const TQString& format, ulong len, TQByteArray data ) { - QImage img; + TQImage img; if ( format == "XPM.GZ" || format == "XBM.GZ" ) { if ( len < data.size() * 10 ) len = data.size() * 10; // qUncompress() expects the first 4 bytes to be the expected length of // the uncompressed data - QByteArray dataTmp( data.size() + 4 ); + TQByteArray dataTmp( data.size() + 4 ); memcpy( dataTmp.data()+4, data.data(), data.size() ); dataTmp[0] = ( len & 0xff000000 ) >> 24; dataTmp[1] = ( len & 0x00ff0000 ) >> 16; dataTmp[2] = ( len & 0x0000ff00 ) >> 8; dataTmp[3] = ( len & 0x000000ff ); - QByteArray baunzip = qUncompress( dataTmp ); + TQByteArray baunzip = qUncompress( dataTmp ); len = baunzip.size(); img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')) ); } else { @@ -184,22 +184,22 @@ static QImage loadImageData( const QString& format, ulong len, QByteArray data ) return img; } -static QSizePolicy::SizeType stringToSizeType( const QString& str ) +static TQSizePolicy::SizeType stringToSizeType( const TQString& str ) { if ( str == "Fixed" ) { - return QSizePolicy::Fixed; + return TQSizePolicy::Fixed; } else if ( str == "Minimum" ) { - return QSizePolicy::Minimum; + return TQSizePolicy::Minimum; } else if ( str == "Maximum" ) { - return QSizePolicy::Maximum; + return TQSizePolicy::Maximum; } else if ( str == "Preferred" ) { - return QSizePolicy::Preferred; + return TQSizePolicy::Preferred; } else if ( str == "MinimumExpanding" ) { - return QSizePolicy::MinimumExpanding; + return TQSizePolicy::MinimumExpanding; } else if ( str == "Expanding" ) { - return QSizePolicy::Expanding; + return TQSizePolicy::Expanding; } else { - return QSizePolicy::Ignored; + return TQSizePolicy::Ignored; } } @@ -207,7 +207,7 @@ static QSizePolicy::SizeType stringToSizeType( const QString& str ) /*! \class QWidgetFactory - \brief The QWidgetFactory class provides for the dynamic creation of widgets + \brief The TQWidgetFactory class provides for the dynamic creation of widgets from Qt Designer .ui files. This class basically offers two things: @@ -216,11 +216,11 @@ static QSizePolicy::SizeType stringToSizeType( const QString& str ) \i Dynamically creating widgets from \link designer-manual.book Qt Designer\endlink user interface description files. - You can do this using the static function QWidgetFactory::create(). + You can do this using the static function TQWidgetFactory::create(). This function also performs signal and slot connections, tab ordering, etc., as defined in the .ui file, and returns the top-level widget in the .ui file. After creating the widget you can - use QObject::child() and QObject::queryList() to access child + use TQObject::child() and TQObject::queryList() to access child widgets of this returned widget. \i Adding additional widget factories to be able to create custom @@ -239,9 +239,9 @@ static QSizePolicy::SizeType stringToSizeType( const QString& str ) Plugins documentation\endlink. */ -/*! Constructs a QWidgetFactory. */ +/*! Constructs a TQWidgetFactory. */ -QWidgetFactory::QWidgetFactory() +TQWidgetFactory::TQWidgetFactory() : d( new QWidgetFactoryPrivate() ), dbControls( 0 ), usePixmapCollection( FALSE ), defMargin( 11 ), defSpacing( 6 ) { @@ -249,10 +249,10 @@ QWidgetFactory::QWidgetFactory() d->customWidgets.setAutoDelete( TRUE ); } -/*! \fn QWidgetFactory::~QWidgetFactory() +/*! \fn TQWidgetFactory::~TQWidgetFactory() Destructor. */ -QWidgetFactory::~QWidgetFactory() +TQWidgetFactory::~TQWidgetFactory() { delete d; } @@ -267,7 +267,7 @@ QWidgetFactory::~QWidgetFactory() ordering, etc., as described in the .ui file. In \e{Qt Designer} it is possible to add custom slots to a form and connect to them. If you want these connections to be made, you must create a class - derived from QObject, which implements all these slots. Then pass an + derived from TQObject, which implements all these slots. Then pass an instance of the object as \a connector to this function. If you do this, the connections to the custom slots will be done using the \a connector as slot. @@ -277,15 +277,15 @@ QWidgetFactory::~QWidgetFactory() The ownership of the returned widget is passed to the caller. */ -QWidget *QWidgetFactory::create( const QString &uiFile, QObject *connector, - QWidget *parent, const char *name ) +TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, + TQWidget *parent, const char *name ) { setupPluginDir(); - QFile f( uiFile ); + TQFile f( uiFile ); bool failed = FALSE; if ( !f.open( IO_ReadOnly ) ) failed = TRUE; - if ( failed && qApp->type() == QApplication::Tty ) { + if ( failed && qApp->type() == TQApplication::Tty ) { // for QSA: If we have no GUI, we have no form definition // files, but just the code. So try if only the code exists. f.setName( uiFile + ".qs" ); @@ -295,9 +295,9 @@ QWidget *QWidgetFactory::create( const QString &uiFile, QObject *connector, return 0; qwf_currFileName = uiFile; - QWidget *w = QWidgetFactory::create( &f, connector, parent, name ); + TQWidget *w = TQWidgetFactory::create( &f, connector, parent, name ); if ( !qwf_forms ) - qwf_forms = new QMap; + qwf_forms = new TQMap; qwf_forms->insert( w, uiFile ); return w; } @@ -308,22 +308,22 @@ QWidget *QWidgetFactory::create( const QString &uiFile, QObject *connector, Loads the user interface description from device \a dev. */ -QWidget *QWidgetFactory::create( QIODevice *dev, QObject *connector, QWidget *parent, const char *name ) +TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *parent, const char *name ) { setupPluginDir(); - QWidget *w = 0; - QDomDocument doc; - QString errMsg; + TQWidget *w = 0; + TQDomDocument doc; + TQString errMsg; int errLine; - QWidgetFactory *widgetFactory = new QWidgetFactory; + TQWidgetFactory *widgetFactory = new QWidgetFactory; widgetFactory->toplevel = 0; // If we have no GUI, we only want to load the code - if ( qApp->type() != QApplication::Tty ) { - QIODevice::Offset start = dev->at(); + if ( qApp->type() != TQApplication::Tty ) { + TQIODevice::Offset start = dev->at(); Q_UINT32 magic; - QDataStream in( dev ); + TQDataStream in( dev ); in >> magic; if ( magic == UibMagic ) { w = widgetFactory->createFromUibFile( in, connector, parent, name ); @@ -333,7 +333,7 @@ QWidget *QWidgetFactory::create( QIODevice *dev, QObject *connector, QWidget *pa if ( doc.setContent( dev, &errMsg, &errLine ) ) { w = widgetFactory->createFromUiFile( doc, connector, parent, name ); } else { - // qDebug( QString("Parse error: ") + errMsg + QString(" in line %d"), errLine ); + // qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); } } if ( !w ) { @@ -344,12 +344,12 @@ QWidget *QWidgetFactory::create( QIODevice *dev, QObject *connector, QWidget *pa if ( !languageInterfaceManager ) languageInterfaceManager = - new QPluginManager( IID_Language, QApplication::libraryPaths(), *qwf_plugin_dir ); + new QPluginManager( IID_Language, TQApplication::libraryPaths(), *qwf_plugin_dir ); widgetFactory->loadExtraSource(); if ( widgetFactory->toplevel ) { #ifndef QT_NO_SQL - QMap::Iterator cit = widgetFactory->sqlWidgetConnections.begin(); + TQMap::Iterator cit = widgetFactory->sqlWidgetConnections.begin(); for( ; cit != widgetFactory->sqlWidgetConnections.end(); ++cit ) { if ( widgetFactory->noDatabaseWidgets.find( cit.key()->name() ) != widgetFactory->noDatabaseWidgets.end() ) @@ -362,93 +362,93 @@ QWidget *QWidgetFactory::create( QIODevice *dev, QObject *connector, QWidget *pa cit.key(), *(*cit).dbControls ); } - for ( QMap::Iterator it = widgetFactory->dbTables.begin(); + for ( TQMap::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) { - QDataTable *table = (QDataTable*)widgetFactory->toplevel->child( it.key(), "QDataTable" ); + TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" ); if ( !table ) continue; if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; - QValueList fieldMap = *widgetFactory->fieldMaps.find( table ); - QString conn = (*it)[ 0 ]; - QSqlCursor* c = 0; - QSqlDatabase *db = 0; + TQValueList fieldMap = *widgetFactory->fieldMaps.find( table ); + TQString conn = (*it)[ 0 ]; + TQSqlCursor* c = 0; + TQSqlDatabase *db = 0; if ( conn.isEmpty() || conn == "(default)" ) { - db = QSqlDatabase::database(); - c = new QSqlCursor( (*it)[ 1 ] ); + db = TQSqlDatabase::database(); + c = new TQSqlCursor( (*it)[ 1 ] ); } else { - db = QSqlDatabase::database( conn ); - c = new QSqlCursor( (*it)[ 1 ], TRUE, db ); + db = TQSqlDatabase::database( conn ); + c = new TQSqlCursor( (*it)[ 1 ], TRUE, db ); } if ( db ) { table->setSqlCursor( c, fieldMap.isEmpty(), TRUE ); - table->refresh( QDataTable::RefreshAll ); + table->refresh( TQDataTable::RefreshAll ); } } #endif } - for ( QMap::Iterator it = widgetFactory->buddies.begin(); + for ( TQMap::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) { - QLabel *label = (QLabel*)widgetFactory->toplevel->child( it.key(), "QLabel" ); - QWidget *buddy = (QWidget*)widgetFactory->toplevel->child( *it, "QWidget" ); + TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), "TQLabel" ); + TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, "TQWidget" ); if ( label && buddy ) label->setBuddy( buddy ); } delete widgetFactory; - QApplication::sendPostedEvents(); + TQApplication::sendPostedEvents(); return w; } -QWidget *QWidgetFactory::createFromUiFile( QDomDocument doc, QObject *connector, - QWidget *parent, const char *name ) +TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connector, + TQWidget *parent, const char *name ) { DomTool::fixDocument( doc ); uiFileVersion = doc.firstChild().toElement().attribute("version"); - QDomElement e = doc.firstChild().toElement().firstChild().toElement(); + TQDomElement e = doc.firstChild().toElement().firstChild().toElement(); - QDomElement variables = e; + TQDomElement variables = e; while ( variables.tagName() != "variables" && !variables.isNull() ) variables = variables.nextSibling().toElement(); - QDomElement slots = e; + TQDomElement slots = e; while ( slots.tagName() != "slots" && !slots.isNull() ) slots = slots.nextSibling().toElement(); - QDomElement connections = e; + TQDomElement connections = e; while ( connections.tagName() != "connections" && !connections.isNull() ) connections = connections.nextSibling().toElement(); - QDomElement imageCollection = e; + TQDomElement imageCollection = e; while ( imageCollection.tagName() != "images" && !imageCollection.isNull() ) imageCollection = imageCollection.nextSibling().toElement(); - QDomElement tabOrder = e; + TQDomElement tabOrder = e; while ( tabOrder.tagName() != "tabstops" && !tabOrder.isNull() ) tabOrder = tabOrder.nextSibling().toElement(); - QDomElement actions = e; + TQDomElement actions = e; while ( actions.tagName() != "actions" && !actions.isNull() ) actions = actions.nextSibling().toElement(); - QDomElement toolbars = e; + TQDomElement toolbars = e; while ( toolbars.tagName() != "toolbars" && !toolbars.isNull() ) toolbars = toolbars.nextSibling().toElement(); - QDomElement menubar = e; + TQDomElement menubar = e; while ( menubar.tagName() != "menubar" && !menubar.isNull() ) menubar = menubar.nextSibling().toElement(); - QDomElement functions = e; + TQDomElement functions = e; while ( functions.tagName() != "functions" && !functions.isNull() ) functions = functions.nextSibling().toElement(); - QDomElement widget; + TQDomElement widget; while ( !e.isNull() ) { if ( e.tagName() == "class" ) { d->translationContext = e.firstChild().toText().data(); @@ -457,8 +457,8 @@ QWidget *QWidgetFactory::createFromUiFile( QDomDocument doc, QObject *connector, } else if ( e.tagName() == "pixmapinproject" ) { usePixmapCollection = TRUE; } else if ( e.tagName() == "layoutdefaults" ) { - defSpacing = e.attribute( "spacing", QString::number( defSpacing ) ).toInt(); - defMargin = e.attribute( "margin", QString::number( defMargin ) ).toInt(); + defSpacing = e.attribute( "spacing", TQString::number( defSpacing ) ).toInt(); + defMargin = e.attribute( "margin", TQString::number( defMargin ) ).toInt(); } e = e.nextSibling().toElement(); } @@ -466,8 +466,8 @@ QWidget *QWidgetFactory::createFromUiFile( QDomDocument doc, QObject *connector, if ( !imageCollection.isNull() ) loadImageCollection( imageCollection ); - createWidgetInternal( widget, parent, 0, widget.attribute("class", "QWidget") ); - QWidget *w = toplevel; + createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") ); + TQWidget *w = toplevel; if ( !w ) return 0; @@ -494,7 +494,7 @@ QWidget *QWidgetFactory::createFromUiFile( QDomDocument doc, QObject *connector, return w; } -void QWidgetFactory::unpackUInt16( QDataStream& in, Q_UINT16& n ) +void TQWidgetFactory::unpackUInt16( TQDataStream& in, Q_UINT16& n ) { Q_UINT8 half; in >> half; @@ -505,7 +505,7 @@ void QWidgetFactory::unpackUInt16( QDataStream& in, Q_UINT16& n ) } } -void QWidgetFactory::unpackUInt32( QDataStream& in, Q_UINT32& n ) +void TQWidgetFactory::unpackUInt32( TQDataStream& in, Q_UINT32& n ) { Q_UINT16 half; in >> half; @@ -516,7 +516,7 @@ void QWidgetFactory::unpackUInt32( QDataStream& in, Q_UINT32& n ) } } -void QWidgetFactory::unpackByteArray( QDataStream& in, QByteArray& array ) +void TQWidgetFactory::unpackByteArray( TQDataStream& in, TQByteArray& array ) { Q_UINT32 size; unpackUInt32( in, size ); @@ -524,35 +524,35 @@ void QWidgetFactory::unpackByteArray( QDataStream& in, QByteArray& array ) in.readRawBytes( array.data(), size ); } -void QWidgetFactory::unpackCString( const UibStrTable& strings, QDataStream& in, - QCString& cstr ) +void TQWidgetFactory::unpackCString( const UibStrTable& strings, TQDataStream& in, + TQCString& cstr ) { Q_UINT32 n; unpackUInt32( in, n ); cstr = strings.asCString( n ); } -void QWidgetFactory::unpackString( const UibStrTable& strings, QDataStream& in, - QString& str ) +void TQWidgetFactory::unpackString( const UibStrTable& strings, TQDataStream& in, + TQString& str ) { Q_UINT32 n; unpackUInt32( in, n ); str = strings.asString( n ); } -void QWidgetFactory::unpackStringSplit( const UibStrTable& strings, - QDataStream& in, QString& str ) +void TQWidgetFactory::unpackStringSplit( const UibStrTable& strings, + TQDataStream& in, TQString& str ) { - QString remainder; + TQString remainder; unpackString( strings, in, str ); unpackString( strings, in, remainder ); str += remainder; } -void QWidgetFactory::unpackVariant( const UibStrTable& strings, QDataStream& in, - QVariant& value ) +void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& in, + TQVariant& value ) { - QString imageName; + TQString imageName; Q_UINT32 number; Q_UINT16 count; Q_UINT16 x; @@ -565,85 +565,85 @@ void QWidgetFactory::unpackVariant( const UibStrTable& strings, QDataStream& in, in >> type; switch ( type ) { - case QVariant::String: + case TQVariant::String: unpackString( strings, in, value.asString() ); break; - case QVariant::Pixmap: + case TQVariant::Pixmap: unpackString( strings, in, imageName ); if ( imageName.isEmpty() ) { - value.asPixmap() = QPixmap(); + value.asPixmap() = TQPixmap(); } else { value.asPixmap() = loadPixmap( imageName ); } break; - case QVariant::Image: + case TQVariant::Image: unpackString( strings, in, imageName ); if ( imageName.isEmpty() ) { - value.asImage() = QImage(); + value.asImage() = TQImage(); } else { value.asImage() = loadFromCollection( imageName ); } break; - case QVariant::IconSet: + case TQVariant::IconSet: unpackString( strings, in, imageName ); if ( imageName.isEmpty() ) { - value.asIconSet() = QIconSet(); + value.asIconSet() = TQIconSet(); } else { - value.asIconSet() = QIconSet( loadPixmap(imageName) ); + value.asIconSet() = TQIconSet( loadPixmap(imageName) ); } break; - case QVariant::StringList: + case TQVariant::StringList: unpackUInt16( in, count ); while ( count-- ) { - QString str; + TQString str; unpackString( strings, in, str ); value.asStringList().append( str ); } break; - case QVariant::Rect: + case TQVariant::Rect: unpackUInt16( in, x ); unpackUInt16( in, y ); unpackUInt16( in, width ); unpackUInt16( in, height ); - value = QRect( x, y, width, height ); + value = TQRect( x, y, width, height ); break; - case QVariant::Size: + case TQVariant::Size: unpackUInt16( in, width ); unpackUInt16( in, height ); - value = QSize( width, height ); + value = TQSize( width, height ); break; - case QVariant::Color: + case TQVariant::Color: in >> value.asColor(); break; - case QVariant::Point: + case TQVariant::Point: unpackUInt16( in, x ); unpackUInt16( in, y ); - value = QPoint( x, y ); + value = TQPoint( x, y ); break; - case QVariant::Int: + case TQVariant::Int: unpackUInt32( in, number ); value = (int) number; break; - case QVariant::Bool: + case TQVariant::Bool: in >> bit; - value = QVariant( bit != 0, 0 ); + value = TQVariant( bit != 0, 0 ); break; - case QVariant::Double: + case TQVariant::Double: in >> value.asDouble(); break; - case QVariant::CString: + case TQVariant::CString: unpackCString( strings, in, value.asCString() ); break; - case QVariant::Cursor: + case TQVariant::Cursor: in >> value.asCursor(); break; - case QVariant::Date: + case TQVariant::Date: in >> value.asDate(); break; - case QVariant::Time: + case TQVariant::Time: in >> value.asTime(); break; - case QVariant::DateTime: + case TQVariant::DateTime: in >> value.asDateTime(); break; default: @@ -651,13 +651,13 @@ void QWidgetFactory::unpackVariant( const UibStrTable& strings, QDataStream& in, } } -void QWidgetFactory::inputSpacer( const UibStrTable& strings, QDataStream& in, - QLayout *parent ) +void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, + TQLayout *parent ) { - QCString name; - QVariant value; - QCString comment; - QSizePolicy::SizeType sizeType = QSizePolicy::Preferred; + TQCString name; + TQVariant value; + TQCString comment; + TQSizePolicy::SizeType sizeType = TQSizePolicy::Preferred; bool vertical = FALSE; int w = 0; int h = 0; @@ -696,15 +696,15 @@ void QWidgetFactory::inputSpacer( const UibStrTable& strings, QDataStream& in, } if ( parent != 0 ) { - QSpacerItem *spacer; + TQSpacerItem *spacer; if ( vertical ) { - spacer = new QSpacerItem( w, h, QSizePolicy::Minimum, sizeType ); + spacer = new TQSpacerItem( w, h, TQSizePolicy::Minimum, sizeType ); } else { - spacer = new QSpacerItem( w, h, sizeType, QSizePolicy::Minimum ); + spacer = new TQSpacerItem( w, h, sizeType, TQSizePolicy::Minimum ); } - if ( parent->inherits("QGridLayout") ) { - ((QGridLayout *) parent)->addMultiCell( spacer, row, + if ( parent->inherits("TQGridLayout") ) { + ((TQGridLayout *) parent)->addMultiCell( spacer, row, row + rowspan - 1, column, column + colspan - 1, vertical ? Qt::AlignHCenter : Qt::AlignVCenter ); } else { @@ -713,20 +713,20 @@ void QWidgetFactory::inputSpacer( const UibStrTable& strings, QDataStream& in, } } -void QWidgetFactory::inputColumnOrRow( const UibStrTable& strings, - QDataStream& in, QObject *parent, +void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, + TQDataStream& in, TQObject *parent, bool isRow ) { - QString text; - QPixmap pixmap; - QString field; + TQString text; + TQPixmap pixmap; + TQString field; bool clickable = TRUE; bool resizable = TRUE; - QCString name; - QVariant value; - QCString comment; - QString str; + TQCString name; + TQVariant value; + TQCString comment; + TQString str; Q_UINT8 objectTag; in >> objectTag; @@ -763,37 +763,37 @@ void QWidgetFactory::inputColumnOrRow( const UibStrTable& strings, } if ( parent != 0 ) { - if ( parent->inherits("QListView") ) { - createListViewColumn( (QListView *) parent, text, pixmap, clickable, + if ( parent->inherits("TQListView") ) { + createListViewColumn( (TQListView *) parent, text, pixmap, clickable, resizable ); #ifndef QT_NO_TABLE - } else if ( parent->inherits("QTable") ) { - createTableColumnOrRow( (QTable *) parent, text, pixmap, field, + } else if ( parent->inherits("TQTable") ) { + createTableColumnOrRow( (TQTable *) parent, text, pixmap, field, isRow ); #endif } } } -void QWidgetFactory::inputItem( const UibStrTable& strings, QDataStream& in, - QObject *parent, QListViewItem *parentItem ) +void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, + TQObject *parent, TQListViewItem *parentItem ) { - QStringList texts; - QValueList pixmaps; - QCString name; - QVariant value; - QCString comment; + TQStringList texts; + TQValueList pixmaps; + TQCString name; + TQVariant value; + TQCString comment; Q_UINT8 objectTag; - QListView *listView = 0; - if ( parent != 0 && parent->inherits("QListView") ) - parent = (QListView *) parent; - QListViewItem *item = 0; + TQListView *listView = 0; + if ( parent != 0 && parent->inherits("TQListView") ) + parent = (TQListView *) parent; + TQListViewItem *item = 0; if ( listView != 0 ) { if ( parentItem == 0 ) { - item = new QListViewItem( listView, d->lastItem ); + item = new TQListViewItem( listView, d->lastItem ); } else { - item = new QListViewItem( parentItem, d->lastItem ); + item = new TQListViewItem( parentItem, d->lastItem ); } d->lastItem = item; } @@ -829,7 +829,7 @@ void QWidgetFactory::inputItem( const UibStrTable& strings, QDataStream& in, if ( listView != 0 ) { int i = 0; - QStringList::ConstIterator t = texts.begin(); + TQStringList::ConstIterator t = texts.begin(); while ( t != texts.end() ) { item->setText( i, *t ); ++i; @@ -837,57 +837,57 @@ void QWidgetFactory::inputItem( const UibStrTable& strings, QDataStream& in, } int j = 0; - QValueList::ConstIterator p = pixmaps.begin(); + TQValueList::ConstIterator p = pixmaps.begin(); while ( p != pixmaps.end() ) { item->setPixmap( j, *p ); ++j; ++p; } } else { - QString text = texts.last(); - QPixmap pixmap = pixmaps.last(); + TQString text = texts.last(); + TQPixmap pixmap = pixmaps.last(); if ( parent != 0 ) { - if ( parent->inherits("QComboBox") || - parent->inherits("QListBox") ) { - QListBox *listBox = (QListBox *) parent->qt_cast( "QListBox" ); + if ( parent->inherits("TQComboBox") || + parent->inherits("TQListBox") ) { + TQListBox *listBox = (TQListBox *) parent->qt_cast( "TQListBox" ); if ( listBox == 0 ) - listBox = ((QComboBox *) parent)->listBox(); + listBox = ((TQComboBox *) parent)->listBox(); if ( pixmap.isNull() ) { - (void) new QListBoxText( listBox, text ); + (void) new TQListBoxText( listBox, text ); } else { - (void) new QListBoxPixmap( listBox, pixmap, text ); + (void) new TQListBoxPixmap( listBox, pixmap, text ); } #ifndef QT_NO_ICONVIEW - } else if ( parent->inherits("QIconView") ) { - (void) new QIconViewItem( (QIconView *) parent, text, pixmap ); + } else if ( parent->inherits("TQIconView") ) { + (void) new TQIconViewItem( (TQIconView *) parent, text, pixmap ); #endif } } } } -void QWidgetFactory::inputMenuItem( QObject **objects, - const UibStrTable& strings, QDataStream& in, - QMenuBar *menuBar ) +void TQWidgetFactory::inputMenuItem( TQObject **objects, + const UibStrTable& strings, TQDataStream& in, + TQMenuBar *menuBar ) { - QCString name; - QCString text; + TQCString name; + TQCString text; Q_UINT16 actionNo; Q_UINT8 objectTag; unpackCString( strings, in, name ); unpackCString( strings, in, text ); - QPopupMenu *popupMenu = new QPopupMenu( menuBar->parentWidget(), name ); + TQPopupMenu *popupMenu = new TQPopupMenu( menuBar->parentWidget(), name ); in >> objectTag; while ( !in.atEnd() && objectTag != Object_End ) { switch ( objectTag ) { case Object_ActionRef: unpackUInt16( in, actionNo ); - ((QAction *) objects[actionNo])->addTo( popupMenu ); + ((TQAction *) objects[actionNo])->addTo( popupMenu ); break; case Object_Separator: popupMenu->insertSeparator(); @@ -900,65 +900,65 @@ void QWidgetFactory::inputMenuItem( QObject **objects, menuBar->insertItem( translate(text.data()), popupMenu ); } -QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, +TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, const UibStrTable& strings, - QDataStream& in, QWidget *ancestorWidget, - QObject *parent, QCString className ) + TQDataStream& in, TQWidget *ancestorWidget, + TQObject *parent, TQCString className ) { - QObject *obj = 0; - QWidget *widget = 0; - QLayout *layout = 0; - QWidget *parentWidget = 0; - QLayout *parentLayout = 0; + TQObject *obj = 0; + TQWidget *widget = 0; + TQLayout *layout = 0; + TQWidget *parentWidget = 0; + TQLayout *parentLayout = 0; bool isQObject = !className.isEmpty(); if ( isQObject ) { if ( parent != 0 ) { if ( parent->isWidgetType() ) { - if ( parent->inherits("QMainWindow") ) { - parentWidget = ((QMainWindow *) parent)->centralWidget(); + if ( parent->inherits("TQMainWindow") ) { + parentWidget = ((TQMainWindow *) parent)->centralWidget(); } else { - parentWidget = (QWidget *) parent; + parentWidget = (TQWidget *) parent; } - } else if ( parent->inherits("QLayout") ) { - parentLayout = (QLayout *) parent; + } else if ( parent->inherits("TQLayout") ) { + parentLayout = (TQLayout *) parent; parentWidget = ancestorWidget; } } - if ( className == "QAction" ) { + if ( className == "TQAction" ) { unpackCString( strings, in, className ); - if ( className == "QActionGroup" ) { - obj = new QActionGroup( parent ); + if ( className == "TQActionGroup" ) { + obj = new TQActionGroup( parent ); } else { - obj = new QAction( parent ); + obj = new TQAction( parent ); } - } else if ( className == "QLayout" ) { + } else if ( className == "TQLayout" ) { unpackCString( strings, in, className ); LayoutType type = Grid; - if ( className == "QHBoxLayout" ) { + if ( className == "TQHBoxLayout" ) { type = HBox; - } else if ( className == "QVBoxLayout" ) { + } else if ( className == "TQVBoxLayout" ) { type = VBox; } - if ( parentLayout != 0 && parentLayout->inherits("QGridLayout") ) { + if ( parentLayout != 0 && parentLayout->inherits("TQGridLayout") ) { layout = createLayout( 0, 0, type ); } else { layout = createLayout( parentWidget, parentLayout, type ); } obj = layout; - } else if ( className == "QMenuBar" ) { + } else if ( className == "TQMenuBar" ) { unpackCString( strings, in, className ); - widget = ((QMainWindow *) parent)->menuBar(); + widget = ((TQMainWindow *) parent)->menuBar(); obj = widget; - } else if ( className == "QToolBar" ) { + } else if ( className == "TQToolBar" ) { Q_UINT8 dock; in >> dock; unpackCString( strings, in, className ); - widget = new QToolBar( QString::null, (QMainWindow *) parent, + widget = new TQToolBar( TQString::null, (TQMainWindow *) parent, (Qt::Dock) dock ); obj = widget; - } else if ( className == "QWidget" ) { + } else if ( className == "TQWidget" ) { unpackCString( strings, in, className ); widget = createWidget( className, parentWidget, 0 ); obj = widget; @@ -970,10 +970,10 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, objects[numObjects++] = obj; } - QCString name; - QVariant value; - QCString comment; - QString str; + TQCString name; + TQVariant value; + TQCString comment; + TQString str; Q_UINT16 actionNo; int metAttribute = 0; Q_UINT16 column = 0; @@ -988,7 +988,7 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, switch ( objectTag ) { case Object_ActionRef: unpackUInt16( in, actionNo ); - ((QAction *) objects[actionNo])->addTo( (QToolBar *) widget ); + ((TQAction *) objects[actionNo])->addTo( (TQToolBar *) widget ); break; case Object_Attribute: metAttribute = 2; @@ -1003,8 +1003,8 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, break; case Object_FontProperty: { - QFont font; - QString family; + TQFont font; + TQString family; Q_UINT16 pointSize; Q_UINT8 fontFlags; @@ -1042,13 +1042,13 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, inputItem( strings, in, obj ); break; case Object_MenuItem: - inputMenuItem( objects, strings, in, (QMenuBar *) widget ); + inputMenuItem( objects, strings, in, (TQMenuBar *) widget ); break; case Object_PaletteProperty: { - QPalette palette; - QColorGroup colorGroup; - QColor color; + TQPalette palette; + TQColorGroup colorGroup; + TQColor color; int role = -1; unpackCString( strings, in, name ); @@ -1071,13 +1071,13 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, case Palette_Color: role++; in >> color; - colorGroup.setColor( (QColorGroup::ColorRole) role, + colorGroup.setColor( (TQColorGroup::ColorRole) role, color ); break; case Palette_Pixmap: unpackVariant( strings, in, value ); - colorGroup.setBrush( (QColorGroup::ColorRole) role, - QBrush(color, value.asPixmap()) ); + colorGroup.setBrush( (TQColorGroup::ColorRole) role, + TQBrush(color, value.asPixmap()) ); break; default: qFatal( "Corrupt" ); @@ -1095,19 +1095,19 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, inputSpacer( strings, in, layout ); break; case Object_Separator: - ((QToolBar *) widget)->addSeparator(); + ((TQToolBar *) widget)->addSeparator(); break; case Object_SubAction: inputObject( objects, numObjects, strings, in, parentWidget, - obj != 0 ? obj : parent, "QAction" ); + obj != 0 ? obj : parent, "TQAction" ); break; case Object_SubLayout: inputObject( objects, numObjects, strings, in, parentWidget, obj, - "QLayout" ); + "TQLayout" ); break; case Object_SubWidget: inputObject( objects, numObjects, strings, in, parentWidget, obj, - "QWidget" ); + "TQWidget" ); break; case Object_TextProperty: unpackCString( strings, in, name ); @@ -1118,10 +1118,10 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "title" ) { if ( parent != 0 ) { - if ( parent->inherits("QTabWidget") ) { - ((QTabWidget *) parent)->insertTab( widget, str ); - } else if ( parent->inherits("QWizard") ) { - ((QWizard *) parent)->addPage( widget, str ); + if ( parent->inherits("TQTabWidget") ) { + ((TQTabWidget *) parent)->insertTab( widget, str ); + } else if ( parent->inherits("TQWizard") ) { + ((TQWizard *) parent)->addPage( widget, str ); } } } @@ -1136,8 +1136,8 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "id" ) { - if ( parent != 0 && parent->inherits("QWidgetStack") ) - ((QWidgetStack *) parent)->addWidget( widget, value.toInt() ); + if ( parent != 0 && parent->inherits("TQWidgetStack") ) + ((TQWidgetStack *) parent)->addWidget( widget, value.toInt() ); } } else { if ( obj != 0 ) @@ -1153,16 +1153,16 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, if ( parentLayout != 0 ) { if ( widget != 0 ) { - if ( parentLayout->inherits("QGridLayout") ) { - ((QGridLayout *) parentLayout)->addMultiCellWidget( + if ( parentLayout->inherits("TQGridLayout") ) { + ((TQGridLayout *) parentLayout)->addMultiCellWidget( widget, row, row + rowspan - 1, column, column + colspan - 1 ); } else { - ((QBoxLayout *) parentLayout)->addWidget( widget ); + ((TQBoxLayout *) parentLayout)->addWidget( widget ); } } else if ( layout != 0 ) { - if ( parentLayout->inherits("QGridLayout") ) { - ((QGridLayout *) parentLayout)->addMultiCellLayout( + if ( parentLayout->inherits("TQGridLayout") ) { + ((TQGridLayout *) parentLayout)->addMultiCellLayout( layout, row, row + rowspan - 1, column, column + colspan - 1 ); } @@ -1171,8 +1171,8 @@ QObject *QWidgetFactory::inputObject( QObject **objects, int& numObjects, return obj; } -QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, - QObject * /* connector */ , QWidget *parent, const char *name ) +TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, + TQObject * /* connector */ , TQWidget *parent, const char *name ) { #define END_OF_BLOCK() \ ( in.atEnd() || in.device()->at() >= nextBlock ) @@ -1195,7 +1195,7 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, in.setVersion( qdatastreamVersion ); UibStrTable strings; - QObject **objects = 0; + TQObject **objects = 0; int numObjects = 0; Q_UINT8 blockType; @@ -1204,7 +1204,7 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, in >> blockType; while ( !in.atEnd() && blockType != Block_End ) { unpackUInt32( in, blockSize ); - QIODevice::Offset nextBlock = in.device()->at() + blockSize; + TQIODevice::Offset nextBlock = in.device()->at() + blockSize; switch ( blockType ) { case Block_Actions: @@ -1218,20 +1218,20 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, do { unpackUInt16( in, labelNo ); unpackUInt16( in, buddyNo ); - QLabel *label = - (QLabel *) objects[labelNo]->qt_cast( "QLabel" ); + TQLabel *label = + (TQLabel *) objects[labelNo]->qt_cast( "TQLabel" ); if ( label != 0 ) - label->setBuddy( (QWidget *) objects[buddyNo] ); + label->setBuddy( (TQWidget *) objects[buddyNo] ); } while ( !END_OF_BLOCK() ); } break; case Block_Connections: { - QString language = "C++"; + TQString language = "C++"; Q_UINT16 senderNo = 0; - QString signal = "clicked()"; + TQString signal = "clicked()"; Q_UINT16 receiverNo = 0; - QString slot = "accept()"; + TQString slot = "accept()"; Q_UINT8 connectionFlags; do { @@ -1262,9 +1262,9 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, break; case Block_Images: { - QString format; + TQString format; Q_UINT32 length; - QByteArray data; + TQByteArray data; Image image; do { @@ -1296,17 +1296,17 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, defMargin = defaultMargin; if ( defaultSpacing != -32768 ) defSpacing = defaultSpacing; - objects = new QObject *[maxObjects]; + objects = new TQObject *[maxObjects]; } break; case Block_Menubar: inputObject( objects, numObjects, strings, in, toplevel, toplevel, - "QMenuBar" ); + "TQMenuBar" ); break; case Block_Slots: { - QString language; - QString slot; + TQString language; + TQString slot; do { unpackString( strings, in, language ); @@ -1325,8 +1325,8 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, unpackUInt16( in, beforeNo ); while ( !END_OF_BLOCK() ) { unpackUInt16( in, afterNo ); - toplevel->setTabOrder( (QWidget *) objects[beforeNo], - (QWidget *) objects[afterNo] ); + toplevel->setTabOrder( (TQWidget *) objects[beforeNo], + (TQWidget *) objects[afterNo] ); beforeNo = afterNo; } } @@ -1334,7 +1334,7 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, case Block_Toolbars: do { inputObject( objects, numObjects, strings, in, toplevel, - toplevel, "QToolBar" ); + toplevel, "TQToolBar" ); } while ( !END_OF_BLOCK() ); break; case Block_Variables: @@ -1343,9 +1343,9 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, in.device()->at( nextBlock ); break; case Block_Widget: - toplevel = (QWidget *) + toplevel = (TQWidget *) inputObject( objects, numObjects, strings, in, toplevel, parent, - "QWidget" ); + "TQWidget" ); if ( toplevel != 0 ) toplevel->setName( name ); break; @@ -1360,11 +1360,11 @@ QWidget *QWidgetFactory::createFromUibFile( QDataStream& in, } /*! Installs a widget factory \a factory, which normally contains - additional widgets that can then be created using a QWidgetFactory. + additional widgets that can then be created using a TQWidgetFactory. See createWidget() for further details. */ -void QWidgetFactory::addWidgetFactory( QWidgetFactory *factory ) +void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory ) { widgetFactories.append( factory ); } @@ -1388,136 +1388,136 @@ void QWidgetFactory::addWidgetFactory( QWidgetFactory *factory ) \list 1 \i Write a widget plugin. This allows you to use the widget in - \e{Qt Designer} and in this QWidgetFactory. See the widget plugin + \e{Qt Designer} and in this TQWidgetFactory. See the widget plugin documentation for further details. (See the "Creating Custom Widgets with Plugins" section of the \link designer-manual.book Qt Designer manual\endlink for an example. - \i Subclass QWidgetFactory. Then reimplement this function to + \i Subclass TQWidgetFactory. Then reimplement this function to create and return an instance of your custom widget if \a className equals the name of your widget, otherwise return 0. Then at the beginning of your program where you want to use the widget factory to create widgets do a: \code - QWidgetFactory::addWidgetFactory( new MyWidgetFactory ); + TQWidgetFactory::addWidgetFactory( new MyWidgetFactory ); \endcode - where MyWidgetFactory is your QWidgetFactory subclass. + where MyWidgetFactory is your TQWidgetFactory subclass. \endlist */ -QWidget *QWidgetFactory::createWidget( const QString &className, QWidget *parent, +TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const { // create widgets we know - if ( className == "QPushButton" ) { - return new QPushButton( parent, name ); - } else if ( className == "QToolButton" ) { - return new QToolButton( parent, name ); - } else if ( className == "QCheckBox" ) { - return new QCheckBox( parent, name ); - } else if ( className == "QRadioButton" ) { - return new QRadioButton( parent, name ); - } else if ( className == "QGroupBox" ) { - return new QGroupBox( parent, name ); - } else if ( className == "QButtonGroup" ) { - return new QButtonGroup( parent, name ); - } else if ( className == "QIconView" ) { + if ( className == "TQPushButton" ) { + return new TQPushButton( parent, name ); + } else if ( className == "TQToolButton" ) { + return new TQToolButton( parent, name ); + } else if ( className == "TQCheckBox" ) { + return new TQCheckBox( parent, name ); + } else if ( className == "TQRadioButton" ) { + return new TQRadioButton( parent, name ); + } else if ( className == "TQGroupBox" ) { + return new TQGroupBox( parent, name ); + } else if ( className == "TQButtonGroup" ) { + return new TQButtonGroup( parent, name ); + } else if ( className == "TQIconView" ) { #if !defined(QT_NO_ICONVIEW) - return new QIconView( parent, name ); + return new TQIconView( parent, name ); #endif - } else if ( className == "QTable" ) { + } else if ( className == "TQTable" ) { #if !defined(QT_NO_TABLE) - return new QTable( parent, name ); + return new TQTable( parent, name ); #endif - } else if ( className == "QListBox" ) { - return new QListBox( parent, name ); - } else if ( className == "QListView" ) { - return new QListView( parent, name ); - } else if ( className == "QLineEdit" ) { - return new QLineEdit( parent, name ); - } else if ( className == "QSpinBox" ) { - return new QSpinBox( parent, name ); - } else if ( className == "QMultiLineEdit" ) { - return new QMultiLineEdit( parent, name ); - } else if ( className == "QLabel" || className == "TextLabel" || className == "PixmapLabel" ) { - return new QLabel( parent, name ); + } else if ( className == "TQListBox" ) { + return new TQListBox( parent, name ); + } else if ( className == "TQListView" ) { + return new TQListView( parent, name ); + } else if ( className == "TQLineEdit" ) { + return new TQLineEdit( parent, name ); + } else if ( className == "TQSpinBox" ) { + return new TQSpinBox( parent, name ); + } else if ( className == "TQMultiLineEdit" ) { + return new TQMultiLineEdit( parent, name ); + } else if ( className == "TQLabel" || className == "TextLabel" || className == "PixmapLabel" ) { + return new TQLabel( parent, name ); } else if ( className == "QLayoutWidget" ) { - return new QWidget( parent, name ); - } else if ( className == "QTabWidget" ) { - return new QTabWidget( parent, name ); - } else if ( className == "QComboBox" ) { - return new QComboBox( FALSE, parent, name ); - } else if ( className == "QWidget" ) { + return new TQWidget( parent, name ); + } else if ( className == "TQTabWidget" ) { + return new TQTabWidget( parent, name ); + } else if ( className == "TQComboBox" ) { + return new TQComboBox( FALSE, parent, name ); + } else if ( className == "TQWidget" ) { if ( !qwf_stays_on_top ) - return new QWidget( parent, name ); - return new QWidget( parent, name, Qt::WStyle_StaysOnTop ); - } else if ( className == "QDialog" ) { + return new TQWidget( parent, name ); + return new TQWidget( parent, name, Qt::WStyle_StaysOnTop ); + } else if ( className == "TQDialog" ) { if ( !qwf_stays_on_top ) - return new QDialog( parent, name ); - return new QDialog( parent, name, FALSE, Qt::WStyle_StaysOnTop ); - } else if ( className == "QWizard" ) { - return new QWizard( parent, name ); - } else if ( className == "QLCDNumber" ) { - return new QLCDNumber( parent, name ); - } else if ( className == "QProgressBar" ) { - return new QProgressBar( parent, name ); - } else if ( className == "QTextView" ) { - return new QTextView( parent, name ); - } else if ( className == "QTextBrowser" ) { - return new QTextBrowser( parent, name ); - } else if ( className == "QDial" ) { - return new QDial( parent, name ); - } else if ( className == "QSlider" ) { - return new QSlider( parent, name ); - } else if ( className == "QFrame" ) { - return new QFrame( parent, name ); - } else if ( className == "QSplitter" ) { - return new QSplitter( parent, name ); + return new TQDialog( parent, name ); + return new TQDialog( parent, name, FALSE, Qt::WStyle_StaysOnTop ); + } else if ( className == "TQWizard" ) { + return new TQWizard( parent, name ); + } else if ( className == "TQLCDNumber" ) { + return new TQLCDNumber( parent, name ); + } else if ( className == "TQProgressBar" ) { + return new TQProgressBar( parent, name ); + } else if ( className == "TQTextView" ) { + return new TQTextView( parent, name ); + } else if ( className == "TQTextBrowser" ) { + return new TQTextBrowser( parent, name ); + } else if ( className == "TQDial" ) { + return new TQDial( parent, name ); + } else if ( className == "TQSlider" ) { + return new TQSlider( parent, name ); + } else if ( className == "TQFrame" ) { + return new TQFrame( parent, name ); + } else if ( className == "TQSplitter" ) { + return new TQSplitter( parent, name ); } else if ( className == "Line" ) { - QFrame *f = new QFrame( parent, name ); - f->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame *f = new TQFrame( parent, name ); + f->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); return f; - } else if ( className == "QTextEdit" ) { - return new QTextEdit( parent, name ); + } else if ( className == "TQTextEdit" ) { + return new TQTextEdit( parent, name ); } else if ( className == "QDateEdit" ) { return new QDateEdit( parent, name ); } else if ( className == "QTimeEdit" ) { return new QTimeEdit( parent, name ); } else if ( className == "QDateTimeEdit" ) { return new QDateTimeEdit( parent, name ); - } else if ( className == "QScrollBar" ) { - return new QScrollBar( parent, name ); - } else if ( className == "QPopupMenu" ) { - return new QPopupMenu( parent, name ); - } else if ( className == "QWidgetStack" ) { - return new QWidgetStack( parent, name ); - } else if ( className == "QToolBox" ) { - return new QToolBox( parent, name ); - } else if ( className == "QVBox" ) { - return new QVBox( parent, name ); - } else if ( className == "QHBox" ) { - return new QHBox( parent, name ); - } else if ( className == "QGrid" ) { - return new QGrid( 4, parent, name ); - } else if ( className == "QMainWindow" ) { - QMainWindow *mw = 0; + } else if ( className == "TQScrollBar" ) { + return new TQScrollBar( parent, name ); + } else if ( className == "TQPopupMenu" ) { + return new TQPopupMenu( parent, name ); + } else if ( className == "TQWidgetStack" ) { + return new TQWidgetStack( parent, name ); + } else if ( className == "TQToolBox" ) { + return new TQToolBox( parent, name ); + } else if ( className == "TQVBox" ) { + return new TQVBox( parent, name ); + } else if ( className == "TQHBox" ) { + return new TQHBox( parent, name ); + } else if ( className == "TQGrid" ) { + return new TQGrid( 4, parent, name ); + } else if ( className == "TQMainWindow" ) { + TQMainWindow *mw = 0; if ( !qwf_stays_on_top ) - mw = new QMainWindow( parent, name ); + mw = new TQMainWindow( parent, name ); else - mw = new QMainWindow( parent, name, Qt::WType_TopLevel | Qt::WStyle_StaysOnTop ); - mw->setCentralWidget( new QWidget( mw, "qt_central_widget" ) ); + mw = new TQMainWindow( parent, name, Qt::WType_TopLevel | Qt::WStyle_StaysOnTop ); + mw->setCentralWidget( new TQWidget( mw, "qt_central_widget" ) ); mw->centralWidget()->show(); (void)mw->statusBar(); return mw; } #if !defined(QT_NO_SQL) - else if ( className == "QDataTable" ) { - return new QDataTable( parent, name ); - } else if ( className == "QDataBrowser" ) { + else if ( className == "TQDataTable" ) { + return new TQDataTable( parent, name ); + } else if ( className == "TQDataBrowser" ) { return new QDesignerDataBrowser2( parent, name ); - } else if ( className == "QDataView" ) { + } else if ( className == "TQDataView" ) { return new QDesignerDataView2( parent, name ); } #endif @@ -1526,13 +1526,13 @@ QWidget *QWidgetFactory::createWidget( const QString &className, QWidget *parent // try to create it using the loaded widget plugins if ( !widgetInterfaceManager ) widgetInterfaceManager = - new QPluginManager( IID_Widget, QApplication::libraryPaths(), + new QPluginManager( IID_Widget, TQApplication::libraryPaths(), *qwf_plugin_dir ); QInterfacePtr iface = 0; widgetInterfaceManager->queryInterface( className, &iface ); if ( iface ) { - QWidget *w = iface->create( className, parent, name ); + TQWidget *w = iface->create( className, parent, name ); if ( w ) { d->customWidgets.replace( className.latin1(), new bool(TRUE) ); return w; @@ -1540,8 +1540,8 @@ QWidget *QWidgetFactory::createWidget( const QString &className, QWidget *parent } // hope we have a factory which can do it - for ( QWidgetFactory* f = widgetFactories.first(); f; f = widgetFactories.next() ) { - QWidget *w = f->createWidget( className, parent, name ); + for ( TQWidgetFactory* f = widgetFactories.first(); f; f = widgetFactories.next() ) { + TQWidget *w = f->createWidget( className, parent, name ); if ( w ) return w; } @@ -1552,7 +1552,7 @@ QWidget *QWidgetFactory::createWidget( const QString &className, QWidget *parent /*! Returns the names of the widgets, which this facory can create. */ -QStringList QWidgetFactory::widgets() +TQStringList TQWidgetFactory::widgets() { setupWidgetListAndMap(); return *availableWidgetList; @@ -1561,21 +1561,21 @@ QStringList QWidgetFactory::widgets() /*! Returns whether this widget factory can create the widget \a widget */ -bool QWidgetFactory::supportsWidget( const QString &widget ) +bool TQWidgetFactory::supportsWidget( const TQString &widget ) { setupWidgetListAndMap(); return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() ); } -QWidget *QWidgetFactory::createWidgetInternal( const QDomElement &e, QWidget *parent, - QLayout* layout, const QString &classNameArg ) +TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, + TQLayout* layout, const TQString &classNameArg ) { d->lastItem = 0; - QDomElement n = e.firstChild().toElement(); - QWidget *w = 0; // the widget that got created - QObject *obj = 0; // gets the properties + TQDomElement n = e.firstChild().toElement(); + TQWidget *w = 0; // the widget that got created + TQObject *obj = 0; // gets the properties - QString className = classNameArg; + TQString className = classNameArg; int row = e.attribute( "row" ).toInt(); int col = e.attribute( "column" ).toInt(); @@ -1590,31 +1590,31 @@ QWidget *QWidgetFactory::createWidgetInternal( const QDomElement &e, QWidget *pa if ( !className.isEmpty() ) { if ( !layout && className == "QLayoutWidget" ) { - className = "QWidget"; + className = "TQWidget"; isQLayoutWidget = TRUE; } if ( layout && className == "QLayoutWidget" ) { // hide layout widgets w = parent; } else { - obj = QWidgetFactory::createWidget( className, parent, 0 ); + obj = TQWidgetFactory::createWidget( className, parent, 0 ); if ( !obj ) return 0; - w = (QWidget*)obj; + w = (TQWidget*)obj; if ( !toplevel ) toplevel = w; - if ( w->inherits( "QMainWindow" ) ) - w = ( (QMainWindow*)w )->centralWidget(); + if ( w->inherits( "TQMainWindow" ) ) + w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch( layoutType( layout ) ) { case HBox: - ( (QHBoxLayout*)layout )->addWidget( w ); + ( (TQHBoxLayout*)layout )->addWidget( w ); break; case VBox: - ( (QVBoxLayout*)layout )->addWidget( w ); + ( (TQVBoxLayout*)layout )->addWidget( w ); break; case Grid: - ( (QGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1, + ( (TQGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1, col, col + colspan - 1 ); break; default: @@ -1626,7 +1626,7 @@ QWidget *QWidgetFactory::createWidgetInternal( const QDomElement &e, QWidget *pa } } #ifdef QT_CONTAINER_CUSTOM_WIDGETS - QString parentClassName = parent ? parent->className() : 0; + TQString parentClassName = parent ? parent->className() : 0; bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE; if ( isPlugin ) qWarning( "####### loading custom container widgets without page support not implemented!" ); @@ -1638,63 +1638,63 @@ QWidget *QWidgetFactory::createWidgetInternal( const QDomElement &e, QWidget *pa if ( n.tagName() == "spacer" ) { createSpacer( n, layout ); } else if ( n.tagName() == "widget" ) { - QMap< QString, QString> *oldDbControls = dbControls; - createWidgetInternal( n, w, layout, n.attribute( "class", "QWidget" ) ); + TQMap< TQString, TQString> *oldDbControls = dbControls; + createWidgetInternal( n, w, layout, n.attribute( "class", "TQWidget" ) ); dbControls = oldDbControls; } else if ( n.tagName() == "hbox" ) { - QLayout *parentLayout = layout; - if ( layout && layout->inherits( "QGridLayout" ) ) - layout = createLayout( 0, 0, QWidgetFactory::HBox, isQLayoutWidget ); + TQLayout *parentLayout = layout; + if ( layout && layout->inherits( "TQGridLayout" ) ) + layout = createLayout( 0, 0, TQWidgetFactory::HBox, isQLayoutWidget ); else - layout = createLayout( w, layout, QWidgetFactory::HBox, isQLayoutWidget ); + layout = createLayout( w, layout, TQWidgetFactory::HBox, isQLayoutWidget ); obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( "QGridLayout" ) ) - ( (QGridLayout*)parentLayout )->addMultiCellLayout( layout, row, + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "grid" ) { - QLayout *parentLayout = layout; - if ( layout && layout->inherits( "QGridLayout" ) ) - layout = createLayout( 0, 0, QWidgetFactory::Grid, isQLayoutWidget ); + TQLayout *parentLayout = layout; + if ( layout && layout->inherits( "TQGridLayout" ) ) + layout = createLayout( 0, 0, TQWidgetFactory::Grid, isQLayoutWidget ); else - layout = createLayout( w, layout, QWidgetFactory::Grid, isQLayoutWidget ); + layout = createLayout( w, layout, TQWidgetFactory::Grid, isQLayoutWidget ); obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( "QGridLayout" ) ) - ( (QGridLayout*)parentLayout )->addMultiCellLayout( layout, row, + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "vbox" ) { - QLayout *parentLayout = layout; - if ( layout && layout->inherits( "QGridLayout" ) ) - layout = createLayout( 0, 0, QWidgetFactory::VBox, isQLayoutWidget ); + TQLayout *parentLayout = layout; + if ( layout && layout->inherits( "TQGridLayout" ) ) + layout = createLayout( 0, 0, TQWidgetFactory::VBox, isQLayoutWidget ); else - layout = createLayout( w, layout, QWidgetFactory::VBox, isQLayoutWidget ); + layout = createLayout( w, layout, TQWidgetFactory::VBox, isQLayoutWidget ); obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( "QGridLayout" ) ) - ( (QGridLayout*)parentLayout )->addMultiCellLayout( layout, row, + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "property" && obj ) { setProperty( obj, n.attribute( "name" ), n.firstChild().toElement() ); } else if ( n.tagName() == "attribute" && w ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( parent ) { - if ( parent->inherits( "QTabWidget" ) ) { + if ( parent->inherits( "TQTabWidget" ) ) { if ( attrib == "title" ) - ( (QTabWidget*)parent )->insertTab( w, translate( v.toString() ) ); - } else if ( parent->inherits( "QWidgetStack" ) ) { + ( (TQTabWidget*)parent )->insertTab( w, translate( v.toString() ) ); + } else if ( parent->inherits( "TQWidgetStack" ) ) { if ( attrib == "id" ) - ( (QWidgetStack*)parent )->addWidget( w, v.toInt() ); - } else if ( parent->inherits( "QToolBox" ) ) { + ( (TQWidgetStack*)parent )->addWidget( w, v.toInt() ); + } else if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) - ( (QToolBox*)parent )->addItem( w, v.toString() ); - } else if ( parent->inherits( "QWizard" ) ) { + ( (TQToolBox*)parent )->addItem( w, v.toString() ); + } else if ( parent->inherits( "TQWizard" ) ) { if ( attrib == "title" ) - ( (QWizard*)parent )->addPage( w, translate( v.toString() ) ); + ( (TQWizard*)parent )->addPage( w, translate( v.toString() ) ); #ifdef QT_CONTAINER_CUSTOM_WIDGETS } else if ( isPlugin ) { if ( attrib == "label" ) { @@ -1706,7 +1706,7 @@ QWidget *QWidgetFactory::createWidgetInternal( const QDomElement &e, QWidget *pa (QUnknownInterface**)&iface2 ); if ( iface2 ) { iface2->insertPage( parentClassName, - (QWidget*)parent, translate( v.toString() ), -1, w ); + (TQWidget*)parent, translate( v.toString() ), -1, w ); iface2->release(); } iface->release(); @@ -1728,7 +1728,7 @@ QWidget *QWidgetFactory::createWidgetInternal( const QDomElement &e, QWidget *pa return w; } -QLayout *QWidgetFactory::createLayout( QWidget *widget, QLayout* layout, +TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout, LayoutType type, bool isQLayoutWidget ) { int spacing = defSpacing; @@ -1737,22 +1737,22 @@ QLayout *QWidgetFactory::createLayout( QWidget *widget, QLayout* layout, if ( layout || !widget || isQLayoutWidget ) margin = 0; - if ( !layout && widget && widget->inherits( "QTabWidget" ) ) - widget = ((QTabWidget*)widget)->currentPage(); + if ( !layout && widget && widget->inherits( "TQTabWidget" ) ) + widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( "QWizard" ) ) - widget = ((QWizard*)widget)->currentPage(); + if ( !layout && widget && widget->inherits( "TQWizard" ) ) + widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( "QWidgetStack" ) ) - widget = ((QWidgetStack*)widget)->visibleWidget(); + if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) + widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( !layout && widget && widget->inherits( "QToolBox" ) ) - widget = ((QToolBox*)widget)->currentItem(); + if ( !layout && widget && widget->inherits( "TQToolBox" ) ) + widget = ((TQToolBox*)widget)->currentItem(); - QLayout *l = 0; + TQLayout *l = 0; int align = 0; - if ( !layout && widget && widget->inherits( "QGroupBox" ) ) { - QGroupBox *gb = (QGroupBox*)widget; + if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { + TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); layout = gb->layout(); layout->setMargin( 0 ); @@ -1762,13 +1762,13 @@ QLayout *QWidgetFactory::createLayout( QWidget *widget, QLayout* layout, if ( layout ) { switch ( type ) { case HBox: - l = new QHBoxLayout( layout ); + l = new TQHBoxLayout( layout ); break; case VBox: - l = new QVBoxLayout( layout ); + l = new TQVBoxLayout( layout ); break; case Grid: - l = new QGridLayout( layout ); + l = new TQGridLayout( layout ); break; default: return 0; @@ -1776,13 +1776,13 @@ QLayout *QWidgetFactory::createLayout( QWidget *widget, QLayout* layout, } else { switch ( type ) { case HBox: - l = new QHBoxLayout( widget ); + l = new TQHBoxLayout( widget ); break; case VBox: - l = new QVBoxLayout( widget ); + l = new TQVBoxLayout( widget ); break; case Grid: - l = new QGridLayout( widget ); + l = new TQGridLayout( widget ); break; default: return 0; @@ -1794,19 +1794,19 @@ QLayout *QWidgetFactory::createLayout( QWidget *widget, QLayout* layout, return l; } -QWidgetFactory::LayoutType QWidgetFactory::layoutType( QLayout *layout ) const +TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) const { - if ( layout->inherits( "QHBoxLayout" ) ) + if ( layout->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( layout->inherits( "QVBoxLayout" ) ) + else if ( layout->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( layout->inherits( "QGridLayout" ) ) + else if ( layout->inherits( "TQGridLayout" ) ) return Grid; return NoLayout; } -void QWidgetFactory::setProperty( QObject* obj, const QString &prop, - QVariant value ) +void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, + TQVariant value ) { int offset = obj->metaObject()->findProperty( prop, TRUE ); @@ -1816,24 +1816,24 @@ void QWidgetFactory::setProperty( QObject* obj, const QString &prop, } else if ( prop == "accel" ) { obj->setProperty( prop, value.toKeySequence() ); } else { - if ( value.type() == QVariant::String || - value.type() == QVariant::CString ) { - const QMetaProperty *metaProp = + if ( value.type() == TQVariant::String || + value.type() == TQVariant::CString ) { + const TQMetaProperty *metaProp = obj->metaObject()->property( offset, TRUE ); if ( metaProp != 0 && metaProp->isEnumType() ) { if ( metaProp->isSetType() ) { - QStrList flagsCStr; - QStringList flagsStr = - QStringList::split( '|', value.asString() ); - QStringList::ConstIterator f = flagsStr.begin(); + TQStrList flagsCStr; + TQStringList flagsStr = + TQStringList::split( '|', value.asString() ); + TQStringList::ConstIterator f = flagsStr.begin(); while ( f != flagsStr.end() ) { flagsCStr.append( *f ); ++f; } - value = QVariant( metaProp->keysToValue(flagsCStr) ); + value = TQVariant( metaProp->keysToValue(flagsCStr) ); } else { - QCString key = value.toCString(); - value = QVariant( metaProp->keyToValue(key) ); + TQCString key = value.toCString(); + value = TQVariant( metaProp->keyToValue(key) ); } } } @@ -1843,19 +1843,19 @@ void QWidgetFactory::setProperty( QObject* obj, const QString &prop, if ( obj->isWidgetType() ) { if ( prop == "toolTip" ) { if ( !value.toString().isEmpty() ) - QToolTip::add( (QWidget*)obj, translate( value.toString() ) ); + TQToolTip::add( (TQWidget*)obj, translate( value.toString() ) ); } else if ( prop == "whatsThis" ) { if ( !value.toString().isEmpty() ) - QWhatsThis::add( (QWidget*)obj, translate( value.toString() ) ); + TQWhatsThis::add( (TQWidget*)obj, translate( value.toString() ) ); } else if ( prop == "buddy" ) { buddies.insert( obj->name(), value.toCString() ); } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( "QButton" ) && obj->parent()->inherits( "QButtonGroup" ) ) - ( (QButtonGroup*)obj->parent() )->insert( (QButton*)obj, value.toInt() ); + if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) ) + ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, value.toInt() ); #ifndef QT_NO_SQL - } else if ( prop == "database" && !obj->inherits( "QDataView" ) - && !obj->inherits( "QDataBrowser" ) ) { - const QStringList& lst = value.asStringList(); + } else if ( prop == "database" && !obj->inherits( "TQDataView" ) + && !obj->inherits( "TQDataBrowser" ) ) { + const TQStringList& lst = value.asStringList(); if ( lst.count() > 2 ) { if ( dbControls ) dbControls->insert( obj->name(), lst[ 2 ] ); @@ -1863,10 +1863,10 @@ void QWidgetFactory::setProperty( QObject* obj, const QString &prop, dbTables.insert( obj->name(), lst ); } } else if ( prop == "database" ) { - const QStringList& lst = value.asStringList(); - if ( lst.count() == 2 && obj->inherits( "QWidget" ) ) { + const TQStringList& lst = value.asStringList(); + if ( lst.count() == 2 && obj->inherits( "TQWidget" ) ) { SqlWidgetConnection conn( lst[ 0 ], lst[ 1 ] ); - sqlWidgetConnections.insert( (QWidget*)obj, conn ); + sqlWidgetConnections.insert( (TQWidget*)obj, conn ); dbControls = conn.dbControls; } #endif @@ -1878,28 +1878,28 @@ void QWidgetFactory::setProperty( QObject* obj, const QString &prop, } } -void QWidgetFactory::setProperty( QObject* widget, const QString &prop, const QDomElement &e ) +void TQWidgetFactory::setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e ) { - QString comment; - QVariant value( DomTool::elementToVariant( e, QVariant(), comment ) ); + TQString comment; + TQVariant value( DomTool::elementToVariant( e, TQVariant(), comment ) ); if ( e.tagName() == "string" ) { value = translate( value.asString(), comment ); } else if ( e.tagName() == "pixmap" ) { - QPixmap pix = loadPixmap( value.toString() ); + TQPixmap pix = loadPixmap( value.toString() ); if ( !pix.isNull() ) value = pix; } else if ( e.tagName() == "iconset" ) { - QPixmap pix = loadPixmap( value.toString() ); + TQPixmap pix = loadPixmap( value.toString() ); if ( !pix.isNull() ) - value = QIconSet( pix ); + value = TQIconSet( pix ); } else if ( e.tagName() == "image" ) { value = loadFromCollection( value.toString() ); } else if ( e.tagName() == "palette" ) { - QDomElement n = e.firstChild().toElement(); - QPalette p; + TQDomElement n = e.firstChild().toElement(); + TQPalette p; while ( !n.isNull() ) { - QColorGroup cg; + TQColorGroup cg; if ( n.tagName() == "active" ) { cg = loadColorGroup( n ); p.setActive( cg ); @@ -1917,9 +1917,9 @@ void QWidgetFactory::setProperty( QObject* widget, const QString &prop, const QD setProperty( widget, prop, value ); } -void QWidgetFactory::createSpacer( const QDomElement &e, QLayout *layout ) +void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); int col = e.attribute( "column" ).toInt(); int rowspan = e.attribute( "rowspan" ).toInt(); @@ -1927,10 +1927,10 @@ void QWidgetFactory::createSpacer( const QDomElement &e, QLayout *layout ) Qt::Orientation orient = Qt::Horizontal; int w = 0, h = 0; - QSizePolicy::SizeType sizeType = QSizePolicy::Preferred; + TQSizePolicy::SizeType sizeType = TQSizePolicy::Preferred; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString prop = n.attribute( "name" ); + TQString prop = n.attribute( "name" ); if ( prop == "orientation" ) { if ( n.firstChild().firstChild().toText().data() == "Horizontal" ) orient = Qt::Horizontal; @@ -1950,36 +1950,36 @@ void QWidgetFactory::createSpacer( const QDomElement &e, QLayout *layout ) rowspan = 1; if ( colspan < 1 ) colspan = 1; - QSpacerItem *item = new QSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : QSizePolicy::Minimum, - orient == Qt::Vertical ? sizeType : QSizePolicy::Minimum ); + TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, + orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); if ( layout ) { - if ( layout->inherits( "QBoxLayout" ) ) - ( (QBoxLayout*)layout )->addItem( item ); + if ( layout->inherits( "TQBoxLayout" ) ) + ( (TQBoxLayout*)layout )->addItem( item ); else - ( (QGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, + ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, orient == Qt::Horizontal ? Qt::AlignVCenter : Qt::AlignHCenter ); } } -static QImage loadImageData( QDomElement &n2 ) +static TQImage loadImageData( TQDomElement &n2 ) { - QString format = n2.attribute( "format", "PNG" ); - QString hex = n2.firstChild().toText().data(); + TQString format = n2.attribute( "format", "PNG" ); + TQString hex = n2.firstChild().toText().data(); int n = hex.length() / 2; - QByteArray data( n ); + TQByteArray data( n ); for ( int i = 0; i < n; i++ ) data[i] = (char) hex.mid( 2 * i, 2 ).toUInt( 0, 16 ); return loadImageData( format, n2.attribute("length").toULong(), data ); } -void QWidgetFactory::loadImageCollection( const QDomElement &e ) +void TQWidgetFactory::loadImageCollection( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "image" ) { Image img; img.name = n.attribute( "name" ); - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "data" ) img.img = loadImageData( n2 ); @@ -1991,47 +1991,47 @@ void QWidgetFactory::loadImageCollection( const QDomElement &e ) } } -QImage QWidgetFactory::loadFromCollection( const QString &name ) +TQImage TQWidgetFactory::loadFromCollection( const TQString &name ) { - QValueList::Iterator it = images.begin(); + TQValueList::Iterator it = images.begin(); for ( ; it != images.end(); ++it ) { if ( ( *it ).name == name ) return ( *it ).img; } - return QImage(); + return TQImage(); } -QPixmap QWidgetFactory::loadPixmap( const QString& name ) +TQPixmap TQWidgetFactory::loadPixmap( const TQString& name ) { - QPixmap pix; + TQPixmap pix; if ( usePixmapCollection ) { - const QMimeSource *m = QMimeSourceFactory::defaultFactory()->data( name ); + const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( name ); if ( m ) - QImageDrag::decode( m, pix ); + TQImageDrag::decode( m, pix ); } else { pix.convertFromImage( loadFromCollection(name) ); } return pix; } -QPixmap QWidgetFactory::loadPixmap( const QDomElement &e ) +TQPixmap TQWidgetFactory::loadPixmap( const TQDomElement &e ) { return loadPixmap( e.firstChild().toText().data() ); } -QColorGroup QWidgetFactory::loadColorGroup( const QDomElement &e ) +TQColorGroup TQWidgetFactory::loadColorGroup( const TQDomElement &e ) { - QColorGroup cg; + TQColorGroup cg; int r = -1; - QDomElement n = e.firstChild().toElement(); - QColor col; + TQDomElement n = e.firstChild().toElement(); + TQColor col; while ( !n.isNull() ) { if ( n.tagName() == "color" ) { r++; - cg.setColor( (QColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); + cg.setColor( (TQColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); } else if ( n.tagName() == "pixmap" ) { - QPixmap pix = loadPixmap( n ); - cg.setBrush( (QColorGroup::ColorRole)r, QBrush( col, pix ) ); + TQPixmap pix = loadPixmap( n ); + cg.setBrush( (TQColorGroup::ColorRole)r, TQBrush( col, pix ) ); } n = n.nextSibling().toElement(); } @@ -2040,8 +2040,8 @@ QColorGroup QWidgetFactory::loadColorGroup( const QDomElement &e ) struct Connection { - QObject *sender, *receiver; - QCString signal, slot; + TQObject *sender, *receiver; + TQCString signal, slot; bool operator==( const Connection &c ) const { return sender == c.sender && receiver == c.receiver && signal == c.signal && slot == c.slot ; @@ -2053,27 +2053,27 @@ struct Connection class NormalizeObject : public QObject { public: - NormalizeObject() : QObject() {} - static QCString normalizeSignalSlot( const char *signalSlot ) { return QObject::normalizeSignalSlot( signalSlot ); } + NormalizeObject() : TQObject() {} + static TQCString normalizeSignalSlot( const char *signalSlot ) { return TQObject::normalizeSignalSlot( signalSlot ); } }; -void QWidgetFactory::loadConnections( const QDomElement &e, QObject *connector ) +void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connector ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "connection" ) { - QString lang = n.attribute( "language", "C++" ); - QDomElement n2 = n.firstChild().toElement(); + TQString lang = n.attribute( "language", "C++" ); + TQDomElement n2 = n.firstChild().toElement(); Connection conn; while ( !n2.isNull() ) { if ( n2.tagName() == "sender" ) { - QString name = n2.firstChild().toText().data(); + TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); - QObjectList *l = toplevel->queryList( 0, name, FALSE ); + TQObjectList *l = toplevel->queryList( 0, name, FALSE ); if ( l ) { if ( l->first() ) conn.sender = l->first(); @@ -2085,11 +2085,11 @@ void QWidgetFactory::loadConnections( const QDomElement &e, QObject *connector ) } else if ( n2.tagName() == "signal" ) { conn.signal = n2.firstChild().toText().data(); } else if ( n2.tagName() == "receiver" ) { - QString name = n2.firstChild().toText().data(); + TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { conn.receiver = toplevel; } else { - QObjectList *l = toplevel->queryList( 0, name, FALSE ); + TQObjectList *l = toplevel->queryList( 0, name, FALSE ); if ( l ) { if ( l->first() ) conn.receiver = l->first(); @@ -2110,8 +2110,8 @@ void QWidgetFactory::loadConnections( const QDomElement &e, QObject *connector ) continue; } - QObject *sender = 0, *receiver = 0; - QObjectList *l = toplevel->queryList( 0, conn.sender->name(), FALSE ); + TQObject *sender = 0, *receiver = 0; + TQObjectList *l = toplevel->queryList( 0, conn.sender->name(), FALSE ); if ( qstrcmp( conn.sender->name(), toplevel->name() ) == 0 ) { sender = toplevel; } else { @@ -2139,13 +2139,13 @@ void QWidgetFactory::loadConnections( const QDomElement &e, QObject *connector ) delete l; } - QString s = "2""%1"; + TQString s = "2""%1"; s = s.arg( conn.signal ); - QString s2 = "1""%1"; + TQString s2 = "1""%1"; s2 = s2.arg( conn.slot ); - QStrList signalList = sender->metaObject()->signalNames( TRUE ); - QStrList slotList = receiver->metaObject()->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 && receiver == toplevel && connector ) { @@ -2159,23 +2159,23 @@ void QWidgetFactory::loadConnections( const QDomElement &e, QObject *connector ) n = n.nextSibling().toElement(); continue; } - QObject::connect( sender, s, receiver, s2 ); + TQObject::connect( sender, s, receiver, s2 ); } n = n.nextSibling().toElement(); } } -void QWidgetFactory::loadTabOrder( const QDomElement &e ) +void TQWidgetFactory::loadTabOrder( const TQDomElement &e ) { - QWidget *last = 0; - QDomElement n = e.firstChild().toElement(); + TQWidget *last = 0; + TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "tabstop" ) { - QString name = n.firstChild().toText().data(); - QObjectList *l = toplevel->queryList( 0, name, FALSE ); + TQString name = n.firstChild().toText().data(); + TQObjectList *l = toplevel->queryList( 0, name, FALSE ); if ( l ) { if ( l->first() ) { - QWidget *w = (QWidget*)l->first(); + TQWidget *w = (TQWidget*)l->first(); if ( last ) toplevel->setTabOrder( last, w ); last = w; @@ -2187,8 +2187,8 @@ void QWidgetFactory::loadTabOrder( const QDomElement &e ) } } -void QWidgetFactory::createListViewColumn( QListView *lv, const QString& txt, - const QPixmap& pix, bool clickable, +void TQWidgetFactory::createListViewColumn( TQListView *lv, const TQString& txt, + const TQPixmap& pix, bool clickable, bool resizable ) { if ( pix.isNull() ) { @@ -2207,12 +2207,12 @@ void QWidgetFactory::createListViewColumn( QListView *lv, const QString& txt, } #ifndef QT_NO_TABLE -void QWidgetFactory::createTableColumnOrRow( QTable *table, const QString& txt, - const QPixmap& pix, - const QString& field, bool isRow ) +void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& txt, + const TQPixmap& pix, + const TQString& field, bool isRow ) { #ifndef QT_NO_SQL - bool isSql = table->inherits( "QDataTable" ); + bool isSql = table->inherits( "TQDataTable" ); #endif if ( isRow ) table->setNumRows( table->numRows() + 1 ); @@ -2223,25 +2223,25 @@ void QWidgetFactory::createTableColumnOrRow( QTable *table, const QString& txt, table->setNumCols( table->numCols() + 1 ); } - QValueList fieldMap; + TQValueList fieldMap; if ( fieldMaps.find( table ) != fieldMaps.end() ) { fieldMap = *fieldMaps.find( table ); fieldMaps.remove( table ); } int i = isRow ? table->numRows() - 1 : table->numCols() - 1; - QHeader *h = !isRow ? table->horizontalHeader() : table->verticalHeader(); + TQHeader *h = !isRow ? table->horizontalHeader() : table->verticalHeader(); if ( !pix.isNull() ) { #ifndef QT_NO_SQL if ( isSql ) - ((QDataTable*)table)->addColumn( field, txt, -1, pix ); + ((TQDataTable*)table)->addColumn( field, txt, -1, pix ); else #endif h->setLabel( i, pix, txt ); } else { #ifndef QT_NO_SQL if ( isSql ) - ((QDataTable*)table)->addColumn( field, txt ); + ((TQDataTable*)table)->addColumn( field, txt ); else #endif h->setLabel( i, txt ); @@ -2254,18 +2254,18 @@ void QWidgetFactory::createTableColumnOrRow( QTable *table, const QString& txt, } #endif -void QWidgetFactory::createColumn( const QDomElement &e, QWidget *widget ) +void TQWidgetFactory::createColumn( const TQDomElement &e, TQWidget *widget ) { - if ( widget->inherits( "QListView" ) && e.tagName() == "column" ) { - QListView *lv = (QListView*)widget; - QDomElement n = e.firstChild().toElement(); - QPixmap pix; - QString txt; + if ( widget->inherits( "TQListView" ) && e.tagName() == "column" ) { + TQListView *lv = (TQListView*)widget; + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; + TQString txt; bool clickable = TRUE, resizable = TRUE; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) txt = translate( v.toString() ); else if ( attrib == "pixmap" ) @@ -2280,18 +2280,18 @@ void QWidgetFactory::createColumn( const QDomElement &e, QWidget *widget ) createListViewColumn( lv, txt, pix, clickable, resizable ); } #ifndef QT_NO_TABLE - else if ( widget->inherits( "QTable" ) ) { - QTable *table = (QTable*)widget; + else if ( widget->inherits( "TQTable" ) ) { + TQTable *table = (TQTable*)widget; - QDomElement n = e.firstChild().toElement(); - QPixmap pix; - QString txt; - QString field; + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; + TQString txt; + TQString field; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) txt = translate( v.toString() ); else if ( attrib == "pixmap" ) { @@ -2307,14 +2307,14 @@ void QWidgetFactory::createColumn( const QDomElement &e, QWidget *widget ) #endif } -void QWidgetFactory::loadItem( const QDomElement &e, QPixmap &pix, QString &txt, bool &hasPixmap ) +void TQWidgetFactory::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap ) { - QDomElement n = e; + TQDomElement n = e; hasPixmap = FALSE; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) txt = translate( v.toString() ); else if ( attrib == "pixmap" ) { @@ -2326,56 +2326,56 @@ void QWidgetFactory::loadItem( const QDomElement &e, QPixmap &pix, QString &txt, } } -void QWidgetFactory::createItem( const QDomElement &e, QWidget *widget, QListViewItem *i ) +void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( widget->inherits( "QListBox" ) || widget->inherits( "QComboBox" ) ) { - QDomElement n = e.firstChild().toElement(); - QPixmap pix; + if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; bool hasPixmap = FALSE; - QString txt; + TQString txt; loadItem( n, pix, txt, hasPixmap ); - QListBox *lb = 0; - if ( widget->inherits( "QListBox" ) ) - lb = (QListBox*)widget; + TQListBox *lb = 0; + if ( widget->inherits( "TQListBox" ) ) + lb = (TQListBox*)widget; else - lb = ( (QComboBox*)widget)->listBox(); + lb = ( (TQComboBox*)widget)->listBox(); if ( hasPixmap ) { - new QListBoxPixmap( lb, pix, txt ); + new TQListBoxPixmap( lb, pix, txt ); } else { - new QListBoxText( lb, txt ); + new TQListBoxText( lb, txt ); } #ifndef QT_NO_ICONVIEW - } else if ( widget->inherits( "QIconView" ) ) { - QDomElement n = e.firstChild().toElement(); - QPixmap pix; + } else if ( widget->inherits( "TQIconView" ) ) { + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; bool hasPixmap = FALSE; - QString txt; + TQString txt; loadItem( n, pix, txt, hasPixmap ); - QIconView *iv = (QIconView*)widget; - new QIconViewItem( iv, txt, pix ); + TQIconView *iv = (TQIconView*)widget; + new TQIconViewItem( iv, txt, pix ); #endif - } else if ( widget->inherits( "QListView" ) ) { - QDomElement n = e.firstChild().toElement(); - QPixmap pix; - QValueList pixmaps; - QStringList textes; - QListViewItem *item = 0; - QListView *lv = (QListView*)widget; + } else if ( widget->inherits( "TQListView" ) ) { + TQDomElement n = e.firstChild().toElement(); + TQPixmap pix; + TQValueList pixmaps; + TQStringList textes; + TQListViewItem *item = 0; + TQListView *lv = (TQListView*)widget; if ( i ) - item = new QListViewItem( i, d->lastItem ); + item = new TQListViewItem( i, d->lastItem ); else - item = new QListViewItem( lv, d->lastItem ); + item = new TQListViewItem( lv, d->lastItem ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) textes << translate( v.toString() ); else if ( attrib == "pixmap" ) { - QString s = v.toString(); + TQString s = v.toString(); if ( s.isEmpty() ) { - pixmaps << QPixmap(); + pixmaps << TQPixmap(); } else { pix = loadPixmap( n.firstChild().toElement() ); pixmaps << pix; @@ -2399,32 +2399,32 @@ void QWidgetFactory::createItem( const QDomElement &e, QWidget *widget, QListVie -void QWidgetFactory::loadChildAction( QObject *parent, const QDomElement &e ) +void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) { - QDomElement n = e; - QAction *a = 0; + TQDomElement n = e; + TQAction *a = 0; bool hasMenuText = FALSE; if ( n.tagName() == "action" ) { - a = new QAction( parent ); - QDomElement n2 = n.firstChild().toElement(); + a = new TQAction( parent ); + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { - QString prop(n2.attribute("name")); + TQString prop(n2.attribute("name")); if (prop == "menuText") hasMenuText = TRUE; setProperty( a, prop, n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( "QAction" ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new QActionGroup( parent ); - QDomElement n2 = n.firstChild().toElement(); + a = new TQActionGroup( parent ); + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { - QString prop(n2.attribute("name")); + TQString prop(n2.attribute("name")); if (prop == "menuText") hasMenuText = TRUE; setProperty( a, prop, n2.firstChild().toElement() ); @@ -2435,7 +2435,7 @@ void QWidgetFactory::loadChildAction( QObject *parent, const QDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( "QAction" ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } @@ -2443,9 +2443,9 @@ void QWidgetFactory::loadChildAction( QObject *parent, const QDomElement &e ) a->setMenuText(a->text()); } -void QWidgetFactory::loadActions( const QDomElement &e ) +void TQWidgetFactory::loadActions( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { loadChildAction( toplevel, n ); @@ -2456,27 +2456,27 @@ void QWidgetFactory::loadActions( const QDomElement &e ) } } -void QWidgetFactory::loadToolBars( const QDomElement &e ) +void TQWidgetFactory::loadToolBars( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); - QMainWindow *mw = ( (QMainWindow*)toplevel ); - QToolBar *tb = 0; + TQDomElement n = e.firstChild().toElement(); + TQMainWindow *mw = ( (TQMainWindow*)toplevel ); + TQToolBar *tb = 0; while ( !n.isNull() ) { if ( n.tagName() == "toolbar" ) { Qt::Dock dock = (Qt::Dock)n.attribute( "dock" ).toInt(); - tb = new QToolBar( QString::null, mw, dock ); + tb = new TQToolBar( TQString::null, mw, dock ); tb->setLabel( n.attribute( "label" ) ); tb->setName( n.attribute( "name" ) ); - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { - QAction *a = findAction( n2.attribute( "name" ) ); + TQAction *a = findAction( n2.attribute( "name" ) ); if ( a ) a->addTo( tb ); } else if ( n2.tagName() == "separator" ) { tb->addSeparator(); } else if ( n2.tagName() == "widget" ) { - (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "QWidget" ) ); + (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) ); } else if ( n2.tagName() == "property" ) { setProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } @@ -2487,14 +2487,14 @@ void QWidgetFactory::loadToolBars( const QDomElement &e ) } } -void QWidgetFactory::loadMenuBar( const QDomElement &e ) +void TQWidgetFactory::loadMenuBar( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); - QMainWindow *mw = ( (QMainWindow*)toplevel ); - QMenuBar *mb = mw->menuBar(); + TQDomElement n = e.firstChild().toElement(); + TQMainWindow *mw = ( (TQMainWindow*)toplevel ); + TQMenuBar *mb = mw->menuBar(); while ( !n.isNull() ) { if ( n.tagName() == "item" ) { - QPopupMenu *popup = new QPopupMenu( mw ); + TQPopupMenu *popup = new TQPopupMenu( mw ); loadPopupMenu( popup, n ); popup->setName( n.attribute( "name" ) ); mb->insertItem( translate( n.attribute( "text" ) ), popup ); @@ -2507,16 +2507,16 @@ void QWidgetFactory::loadMenuBar( const QDomElement &e ) } } -void QWidgetFactory::loadPopupMenu( QPopupMenu *p, const QDomElement &e ) +void TQWidgetFactory::loadPopupMenu( TQPopupMenu *p, const TQDomElement &e ) { - QMainWindow *mw = ( (QMainWindow*)toplevel ); - QDomElement n = e.firstChild().toElement(); + TQMainWindow *mw = ( (TQMainWindow*)toplevel ); + TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - QAction *a = findAction( n.attribute( "name" ) ); - QDomElement n2 = n.nextSibling().toElement(); + TQAction *a = findAction( n.attribute( "name" ) ); + TQDomElement n2 = n.nextSibling().toElement(); if ( n2.tagName() == "item") { // load submenu - QPopupMenu *popup = new QPopupMenu( mw ); + TQPopupMenu *popup = new TQPopupMenu( mw ); popup->setName( n2.attribute( "name" ) ); if ( a ) { p->setAccel( a->accel(), p->insertItem( a->iconSet(), @@ -2542,16 +2542,16 @@ void QWidgetFactory::loadPopupMenu( QPopupMenu *p, const QDomElement &e ) // compatibility with early 3.0 betas // ### remove for 4.0 -void QWidgetFactory::loadFunctions( const QDomElement & ) +void TQWidgetFactory::loadFunctions( const TQDomElement & ) { } -QAction *QWidgetFactory::findAction( const QString &name ) +TQAction *TQWidgetFactory::findAction( const TQString &name ) { - for ( QAction *a = actionList.first(); a; a = actionList.next() ) { - if ( QString( a->name() ) == name ) + for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { + if ( TQString( a->name() ) == name ) return a; - QAction *ac = (QAction*)a->child( name.latin1(), "QAction" ); + TQAction *ac = (TQAction*)a->child( name.latin1(), "TQAction" ); if ( ac ) return ac; } @@ -2561,46 +2561,46 @@ QAction *QWidgetFactory::findAction( const QString &name ) /*! If you use a pixmap collection (which is the default for new projects) rather than saving the pixmaps within the .ui XML file, - you must load the pixmap collection. QWidgetFactory looks in the - default QMimeSourceFactory for the pixmaps. Either add it there + you must load the pixmap collection. TQWidgetFactory looks in the + default TQMimeSourceFactory for the pixmaps. Either add it there manually, or call this function and specify the directory where the images can be found, as \a dir. This is normally the directory called \c images in the project's directory. */ -void QWidgetFactory::loadImages( const QString &dir ) +void TQWidgetFactory::loadImages( const TQString &dir ) { - QDir d( dir ); - QStringList l = d.entryList( QDir::Files ); - for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it ) - QMimeSourceFactory::defaultFactory()->setPixmap( *it, QPixmap( d.path() + "/" + *it, "PNG" ) ); + TQDir d( dir ); + TQStringList l = d.entryList( TQDir::Files ); + for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) + TQMimeSourceFactory::defaultFactory()->setPixmap( *it, TQPixmap( d.path() + "/" + *it, "PNG" ) ); } -void QWidgetFactory::loadExtraSource() +void TQWidgetFactory::loadExtraSource() { if ( !qwf_language || !languageInterfaceManager ) return; - QString lang = *qwf_language; + TQString lang = *qwf_language; LanguageInterface *iface = 0; languageInterfaceManager->queryInterface( lang, &iface ); if ( !iface ) return; - QFile f( qwf_currFileName + iface->formCodeExtension() ); + TQFile f( qwf_currFileName + iface->formCodeExtension() ); if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); + TQTextStream ts( &f ); code = ts.read(); } } -QString QWidgetFactory::translate( const QString& sourceText, const QString& comment ) +TQString TQWidgetFactory::translate( const TQString& sourceText, const TQString& comment ) { return qApp->translate( d->translationContext, sourceText.utf8(), comment.utf8(), - QApplication::UnicodeUTF8 ); + TQApplication::UnicodeUTF8 ); } -QString QWidgetFactory::translate( const char *sourceText, const char *comment ) +TQString TQWidgetFactory::translate( const char *sourceText, const char *comment ) { return qApp->translate( d->translationContext, sourceText, comment, - QApplication::UnicodeUTF8 ); + TQApplication::UnicodeUTF8 ); } diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h index 9146e9a7..f2d07275 100644 --- a/kdevdesigner/uilib/qwidgetfactory.h +++ b/kdevdesigner/uilib/qwidgetfactory.h @@ -28,13 +28,13 @@ #define QWIDGETFACTORY_H #ifndef QT_H -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #endif // QT_H class QDomDocument; @@ -51,87 +51,87 @@ class UibStrTable; class QWidgetFactory { public: - QWidgetFactory(); - virtual ~QWidgetFactory(); + TQWidgetFactory(); + virtual ~TQWidgetFactory(); - static QWidget *create( const QString &uiFile, QObject *connector = 0, QWidget *parent = 0, const char *name = 0 ); - static QWidget *create( QIODevice *dev, QObject *connector = 0, QWidget *parent = 0, const char *name = 0 ); - static void addWidgetFactory( QWidgetFactory *factory ); - static void loadImages( const QString &dir ); + static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ); + static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ); + static void addWidgetFactory( TQWidgetFactory *factory ); + static void loadImages( const TQString &dir ); - virtual QWidget *createWidget( const QString &className, QWidget *parent, const char *name ) const; - static QStringList widgets(); - static bool supportsWidget( const QString &widget ); + virtual TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const; + static TQStringList widgets(); + static bool supportsWidget( const TQString &widget ); private: enum LayoutType { HBox, VBox, Grid, NoLayout }; - void loadImageCollection( const QDomElement &e ); - void loadConnections( const QDomElement &e, QObject *connector ); - void loadTabOrder( const QDomElement &e ); - QWidget *createWidgetInternal( const QDomElement &e, QWidget *parent, QLayout* layout, const QString &classNameArg ); - QLayout *createLayout( QWidget *widget, QLayout* layout, LayoutType type, bool isQLayoutWidget = FALSE ); - LayoutType layoutType( QLayout *l ) const; - void setProperty( QObject* widget, const QString &prop, QVariant value ); - void setProperty( QObject* widget, const QString &prop, const QDomElement &e ); - void createSpacer( const QDomElement &e, QLayout *layout ); - QImage loadFromCollection( const QString &name ); - QPixmap loadPixmap( const QString &name ); - QPixmap loadPixmap( const QDomElement &e ); - QColorGroup loadColorGroup( const QDomElement &e ); - void createListViewColumn( QListView *lv, const QString& txt, - const QPixmap& pix, bool clickable, + void loadImageCollection( const TQDomElement &e ); + void loadConnections( const TQDomElement &e, TQObject *connector ); + void loadTabOrder( const TQDomElement &e ); + TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg ); + TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type, bool isQLayoutWidget = FALSE ); + LayoutType layoutType( TQLayout *l ) const; + void setProperty( TQObject* widget, const TQString &prop, TQVariant value ); + void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e ); + void createSpacer( const TQDomElement &e, TQLayout *layout ); + TQImage loadFromCollection( const TQString &name ); + TQPixmap loadPixmap( const TQString &name ); + TQPixmap loadPixmap( const TQDomElement &e ); + TQColorGroup loadColorGroup( const TQDomElement &e ); + void createListViewColumn( TQListView *lv, const TQString& txt, + const TQPixmap& pix, bool clickable, bool resizable ); #ifndef QT_NO_TABLE - void createTableColumnOrRow( QTable *table, const QString& txt, - const QPixmap& pix, const QString& field, + void createTableColumnOrRow( TQTable *table, const TQString& txt, + const TQPixmap& pix, const TQString& field, bool isRow ); #endif - void createColumn( const QDomElement &e, QWidget *widget ); - void loadItem( const QDomElement &e, QPixmap &pix, QString &txt, bool &hasPixmap ); - void createItem( const QDomElement &e, QWidget *widget, QListViewItem *i = 0 ); - void loadChildAction( QObject *parent, const QDomElement &e ); - void loadActions( const QDomElement &e ); - void loadToolBars( const QDomElement &e ); - void loadMenuBar( const QDomElement &e ); - void loadPopupMenu( QPopupMenu *p, const QDomElement &e ); - void loadFunctions( const QDomElement &e ); - QAction *findAction( const QString &name ); + void createColumn( const TQDomElement &e, TQWidget *widget ); + void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap ); + void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); + void loadChildAction( TQObject *parent, const TQDomElement &e ); + void loadActions( const TQDomElement &e ); + void loadToolBars( const TQDomElement &e ); + void loadMenuBar( const TQDomElement &e ); + void loadPopupMenu( TQPopupMenu *p, const TQDomElement &e ); + void loadFunctions( const TQDomElement &e ); + TQAction *findAction( const TQString &name ); void loadExtraSource(); - QString translate( const char *sourceText, const char *comment = "" ); - QString translate( const QString& sourceText, const QString& comment = QString::null ); + TQString translate( const char *sourceText, const char *comment = "" ); + TQString translate( const TQString& sourceText, const TQString& comment = TQString::null ); - void unpackUInt16( QDataStream& in, Q_UINT16& n ); - void unpackUInt32( QDataStream& in, Q_UINT32& n ); - void unpackByteArray( QDataStream& in, QByteArray& array ); - void unpackCString( const UibStrTable& strings, QDataStream& in, - QCString& cstr ); - void unpackString( const UibStrTable& strings, QDataStream& in, - QString& str ); - void unpackStringSplit( const UibStrTable& strings, QDataStream& in, - QString& str ); - void unpackVariant( const UibStrTable& strings, QDataStream& in, - QVariant& value ); - void inputSpacer( const UibStrTable& strings, QDataStream& in, - QLayout *parent ); - void inputColumnOrRow( const UibStrTable& strings, QDataStream& in, - QObject *parent, bool isRow ); - void inputItem( const UibStrTable& strings, QDataStream& in, - QObject *parent, QListViewItem *parentItem = 0 ); - void inputMenuItem( QObject **objects, const UibStrTable& strings, - QDataStream& in, QMenuBar *menuBar ); - QObject *inputObject( QObject **objects, int& numObjects, - const UibStrTable& strings, QDataStream& in, - QWidget *ancestorWidget, QObject *parent, - QCString className = "" ); - QWidget *createFromUiFile( QDomDocument doc, QObject *connector, - QWidget *parent, const char *name ); - QWidget *createFromUibFile( QDataStream& in, QObject *connector, - QWidget *parent, const char *name ); + void unpackUInt16( TQDataStream& in, Q_UINT16& n ); + void unpackUInt32( TQDataStream& in, Q_UINT32& n ); + void unpackByteArray( TQDataStream& in, TQByteArray& array ); + void unpackCString( const UibStrTable& strings, TQDataStream& in, + TQCString& cstr ); + void unpackString( const UibStrTable& strings, TQDataStream& in, + TQString& str ); + void unpackStringSplit( const UibStrTable& strings, TQDataStream& in, + TQString& str ); + void unpackVariant( const UibStrTable& strings, TQDataStream& in, + TQVariant& value ); + void inputSpacer( const UibStrTable& strings, TQDataStream& in, + TQLayout *parent ); + void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in, + TQObject *parent, bool isRow ); + void inputItem( const UibStrTable& strings, TQDataStream& in, + TQObject *parent, TQListViewItem *parentItem = 0 ); + void inputMenuItem( TQObject **objects, const UibStrTable& strings, + TQDataStream& in, TQMenuBar *menuBar ); + TQObject *inputObject( TQObject **objects, int& numObjects, + const UibStrTable& strings, TQDataStream& in, + TQWidget *ancestorWidget, TQObject *parent, + TQCString className = "" ); + TQWidget *createFromUiFile( TQDomDocument doc, TQObject *connector, + TQWidget *parent, const char *name ); + TQWidget *createFromUibFile( TQDataStream& in, TQObject *connector, + TQWidget *parent, const char *name ); private: struct Image { - QImage img; - QString name; + TQImage img; + TQString name; bool operator==( const Image &i ) const { return ( i.name == name && i.img == img ); @@ -141,40 +141,40 @@ private: struct Field { Field() {} - Field( const QString &s1, const QPixmap &p, const QString &s2 ) : name( s1 ), pix( p ), field( s2 ) {} - QString name; - QPixmap pix; - QString field; + Field( const TQString &s1, const TQPixmap &p, const TQString &s2 ) : name( s1 ), pix( p ), field( s2 ) {} + TQString name; + TQPixmap pix; + TQString field; Q_DUMMY_COMPARISON_OPERATOR( Field ) }; struct SqlWidgetConnection { SqlWidgetConnection() {} - SqlWidgetConnection( const QString &c, const QString &t ) - : conn( c ), table( t ), dbControls( new QMap() ) {} - QString conn; - QString table; - QMap *dbControls; + SqlWidgetConnection( const TQString &c, const TQString &t ) + : conn( c ), table( t ), dbControls( new TQMap() ) {} + TQString conn; + TQString table; + TQMap *dbControls; Q_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection ) }; - QValueList images; - QWidget *toplevel; + TQValueList images; + TQWidget *toplevel; QWidgetFactoryPrivate *d; - QMap *dbControls; - QMap dbTables; - QMap sqlWidgetConnections; - QMap buddies; - QMap > fieldMaps; - QPtrList actionList; - QMap languageSlots; - QStringList noDatabaseWidgets; + TQMap *dbControls; + TQMap dbTables; + TQMap sqlWidgetConnections; + TQMap buddies; + TQMap > fieldMaps; + TQPtrList actionList; + TQMap languageSlots; + TQStringList noDatabaseWidgets; bool usePixmapCollection; int defMargin; int defSpacing; - QString code; - QString uiFileVersion; + TQString code; + TQString uiFileVersion; }; #endif diff --git a/languages/ada/AdaStoreWalker.hpp b/languages/ada/AdaStoreWalker.hpp index 6f108ff6..c18f5dcd 100644 --- a/languages/ada/AdaStoreWalker.hpp +++ b/languages/ada/AdaStoreWalker.hpp @@ -3,9 +3,9 @@ #line 1 "expandedada.store.g" -#include -#include -#include +#include +#include +#include #include #include "AdaAST.hpp" @@ -28,10 +28,10 @@ class CUSTOM_API AdaStoreWalker : public ANTLR_USE_NAMESPACE(antlr)TreeParser, p #line 25 "expandedada.store.g" private: - QString m_fileName; - QValueList m_scopeStack; + TQString m_fileName; + TQValueList m_scopeStack; CodeModel* m_model; - QValueList m_imports; + TQValueList m_imports; NamespaceDom m_currentContainer; int m_currentAccess; bool m_addToStore; /* auxiliary variable: for the moment, this is `true' @@ -44,8 +44,8 @@ public: CodeModel* codeModel () { return m_model; } const CodeModel* codeModel () const { return m_model; } - QString fileName () const { return m_fileName; } - void setFileName (const QString& fileName) { m_fileName = fileName; } + TQString fileName () const { return m_fileName; } + void setFileName (const TQString& fileName) { m_fileName = fileName; } void init () { m_scopeStack.clear (); @@ -64,13 +64,13 @@ public: void wipeout () { m_model->wipeout (); } // void out () { m_store->out (); } - void removeWithReferences (const QString& fileName) { + void removeWithReferences (const TQString& fileName) { m_model->removeFile (m_model->fileByName(fileName)); } NamespaceDom insertScopeContainer - (NamespaceDom scope, const QStringList & scopes ) { - QStringList::ConstIterator it = scopes.begin(); - QString prefix( *it ); + (NamespaceDom scope, const TQStringList & scopes ) { + TQStringList::ConstIterator it = scopes.begin(); + TQString prefix( *it ); NamespaceDom ns = scope->namespaceByName( prefix ); // kdDebug() << "insertScopeContainer begin with prefix " << prefix << endl; if (!ns.data()) { @@ -87,7 +87,7 @@ public: } // kdDebug() << "insertScopeContainer: while" << endl; while ( ++it != scopes.end() ) { - QString nameSegment( *it ); + TQString nameSegment( *it ); prefix += "." + nameSegment; // kdDebug() << "insertScopeContainer: while prefix = " << prefix << endl; NamespaceDom inner = scope->namespaceByName( prefix ); @@ -104,7 +104,7 @@ public: return ns; } NamespaceDom defineScope( RefAdaAST namenode ) { - QStringList scopes( qnamelist( namenode ) ); + TQStringList scopes( qnamelist( namenode ) ); // kdDebug() << "defineScope: " << scopes.join(" ") << endl; NamespaceDom psc = insertScopeContainer( m_currentContainer, scopes ); // kdDebug() << "defineScope psc created" << endl; diff --git a/languages/ada/ada_utils.cpp b/languages/ada/ada_utils.cpp index 9630f058..6e4bea13 100644 --- a/languages/ada/ada_utils.cpp +++ b/languages/ada/ada_utils.cpp @@ -4,56 +4,56 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "ada_utils.hpp" #include "adasupport.hpp" -QString qtext (const RefAdaAST& n) +TQString qtext (const RefAdaAST& n) { - return QString::fromLatin1 (text (n).c_str ()); + return TQString::fromLatin1 (text (n).c_str ()); } -QStringList qnamelist (const RefAdaAST& n) +TQStringList qnamelist (const RefAdaAST& n) { - QString txt = qtext (n); + TQString txt = qtext (n); // kdDebug() << "qnamelist: input is " << txt << endl; - return QStringList::split ('.', txt); + return TQStringList::split ('.', txt); } -QString ada_spec_filename (const QString& comp_unit_name) +TQString ada_spec_filename (const TQString& comp_unit_name) { - QString fn (comp_unit_name.lower ()); + TQString fn (comp_unit_name.lower ()); - fn.replace (QRegExp("."), "-"); + fn.replace (TQRegExp("."), "-"); fn += ".ads"; return fn; } -QString fq_specfilename (const QString& comp_unit_name) +TQString fq_specfilename (const TQString& comp_unit_name) { - QString fname = ada_spec_filename (comp_unit_name); + TQString fname = ada_spec_filename (comp_unit_name); - if (QFile::exists (fname)) + if (TQFile::exists (fname)) return fname; - QString adaincpath = getenv ("ADA_INCLUDE_PATH"); + TQString adaincpath = getenv ("ADA_INCLUDE_PATH"); if (adaincpath.isNull ()) - return QString::null; + return TQString::null; - QStringList dirs = QStringList::split (':', adaincpath); - QString fq_filename; - for (QStringList::Iterator it = dirs.begin (); it != dirs.end (); it++) { + TQStringList dirs = TQStringList::split (':', adaincpath); + TQString fq_filename; + for (TQStringList::Iterator it = dirs.begin (); it != dirs.end (); it++) { fq_filename = *it; if (! fq_filename.endsWith ("/")) fq_filename += "/"; fq_filename += fname; - if (QFile::exists (fq_filename)) + if (TQFile::exists (fq_filename)) return fq_filename; } if (fname.startsWith ("ada-") || @@ -64,6 +64,6 @@ QString fq_specfilename (const QString& comp_unit_name) } else { kdDebug () << "Cannot find file " << fname << endl; } - return QString::null; + return TQString::null; } diff --git a/languages/ada/ada_utils.hpp b/languages/ada/ada_utils.hpp index b1df43dd..25c9fabd 100644 --- a/languages/ada/ada_utils.hpp +++ b/languages/ada/ada_utils.hpp @@ -3,13 +3,13 @@ #ifndef ADA_UTILS_H #define ADA_UTILS_H -#include +#include #include "AdaAST.hpp" -QString qtext (const RefAdaAST& n); -QStringList qnamelist (const RefAdaAST& n); -QString ada_spec_filename (const QString& comp_unit_name); -QString fq_specfilename (const QString& comp_unit_name); +TQString qtext (const RefAdaAST& n); +TQStringList qnamelist (const RefAdaAST& n); +TQString ada_spec_filename (const TQString& comp_unit_name); +TQString fq_specfilename (const TQString& comp_unit_name); #endif diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 39ead02a..7c7f4198 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -1,11 +1,11 @@ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -50,35 +50,35 @@ struct AdaSupportPartData { AdaSupportPartData () : problemReporter (0) {} }; -AdaSupportPart::AdaSupportPart (QObject *parent, const char *name, const QStringList &) +AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &) : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) { setInstance (AdaSupportPartFactory::instance ()); d->problemReporter = new ProblemReporter (this); -// connect (core (), SIGNAL (configWidget (KDialogBase*)), -// d->problemReporter, SLOT (configWidget (KDialogBase*))); +// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), +// d->problemReporter, TQT_SLOT (configWidget (KDialogBase*))); d->problemReporter->setIcon( SmallIcon("info") ); mainWindow( )->embedOutputView( d->problemReporter, i18n("Problems"), i18n("Problem reporter")); - QWhatsThis::add(d->problemReporter, i18n("Problem reporter

    This window shows various \"problems\" in your project. " + TQWhatsThis::add(d->problemReporter, i18n("Problem reporter

    This window shows various \"problems\" in your project. " "It displays errors reported by a language parser.")); setXMLFile ("adasupportpart.rc"); - connect (core (), SIGNAL (projectOpened ()), this, SLOT (projectOpened ())); - connect (core (), SIGNAL (projectClosed ()), this, SLOT (projectClosed ())); + connect (core (), TQT_SIGNAL (projectOpened ()), this, TQT_SLOT (projectOpened ())); + connect (core (), TQT_SIGNAL (projectClosed ()), this, TQT_SLOT (projectClosed ())); - connect (partController (), SIGNAL (savedFile (const KURL&)), - this, SLOT (savedFile (const KURL&))); + connect (partController (), TQT_SIGNAL (savedFile (const KURL&)), + this, TQT_SLOT (savedFile (const KURL&))); -// connect (core (), SIGNAL (configWidget (KDialogBase*)), this, SLOT (configWidget (KDialogBase*))); - connect( core(), SIGNAL(configWidget(KDialogBase*)), - d->problemReporter, SLOT(configWidget(KDialogBase*)) ); +// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), this, TQT_SLOT (configWidget (KDialogBase*))); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), + d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); // a small hack (robe) //classStore ()->globalScope ()->setName ("(default packages)"); //classStore ()->addScope (classStore ()->globalScope ()); - //classStore ()->globalScope ()->setName (QString::null); + //classStore ()->globalScope ()->setName (TQString::null); } @@ -102,14 +102,14 @@ KDevLanguageSupport::Features AdaSupportPart::features () void AdaSupportPart::projectOpened () { - connect (project (), SIGNAL (addedFilesToProject (const QStringList &)), - this, SLOT (addedFilesToProject (const QStringList &))); - connect (project (), SIGNAL (removedFilesFromProject (const QStringList &)), - this, SLOT (removedFilesFromProject (const QStringList &))); - connect( project( ), SIGNAL( changedFilesInProject( const QStringList & ) ), - this, SLOT( changedFilesInProject( const QStringList & ) ) ); - - QTimer::singleShot (0, this, SLOT (initialParse ())); + connect (project (), TQT_SIGNAL (addedFilesToProject (const TQStringList &)), + this, TQT_SLOT (addedFilesToProject (const TQStringList &))); + connect (project (), TQT_SIGNAL (removedFilesFromProject (const TQStringList &)), + this, TQT_SLOT (removedFilesFromProject (const TQStringList &))); + connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); + + TQTimer::singleShot (0, this, TQT_SLOT (initialParse ())); } @@ -130,18 +130,18 @@ void AdaSupportPart::initialParse () kapp->setOverrideCursor (waitCursor); int n = 0; - QStringList files = project ()->allFiles (); + TQStringList files = project ()->allFiles (); - QProgressBar* bar = new QProgressBar( files.count( ), mainWindow( )->statusBar( ) ); + TQProgressBar* bar = new TQProgressBar( files.count( ), mainWindow( )->statusBar( ) ); bar->setMinimumWidth( 120 ); bar->setCenterIndicator( true ); mainWindow( )->statusBar( )->addWidget( bar ); bar->show( ); - for (QStringList::Iterator it = files.begin (); it != files.end (); ++it) { + for (TQStringList::Iterator it = files.begin (); it != files.end (); ++it) { bar->setProgress( n++ ); - QString fn = project ()->projectDirectory () + "/" + *it; + TQString fn = project ()->projectDirectory () + "/" + *it; maybeParse (fn); kapp->processEvents (500); } @@ -158,16 +158,16 @@ void AdaSupportPart::initialParse () } } -QStringList AdaSupportPart::fileExtensions () +TQStringList AdaSupportPart::fileExtensions () { - return QStringList () << "ads" << "adb"; + return TQStringList () << "ads" << "adb"; } -void AdaSupportPart::maybeParse (const QString &fileName) +void AdaSupportPart::maybeParse (const TQString &fileName) { kdDebug () << "AdaSupportPart::maybeParse: " << fileName << endl; - if (!fileExtensions ().contains (QFileInfo (fileName).extension ())) + if (!fileExtensions ().contains (TQFileInfo (fileName).extension ())) return; // mainWindow ()->statusBar ()->message (i18n ("Parsing file: %1").arg (fileName)); @@ -175,27 +175,27 @@ void AdaSupportPart::maybeParse (const QString &fileName) } -void AdaSupportPart::addedFilesToProject (const QStringList &fileList) +void AdaSupportPart::addedFilesToProject (const TQStringList &fileList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = fileList.begin (); it != fileList.end (); ++it) { - QString path = project ()->projectDirectory () + "/" + (*it); + TQString path = project ()->projectDirectory () + "/" + (*it); maybeParse (path); emit addedSourceInfo( path ); } } -void AdaSupportPart::removedFilesFromProject (const QStringList &fileList) +void AdaSupportPart::removedFilesFromProject (const TQStringList &fileList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = fileList.begin (); it != fileList.end (); ++it) { kdDebug () << "AdaSupportPart::removedFileFromProject () -- " << (*it) << endl; - QString path = project ()->projectDirectory () + "/" + (*it); + TQString path = project ()->projectDirectory () + "/" + (*it); if( codeModel()->hasFile(path) ) { @@ -208,12 +208,12 @@ void AdaSupportPart::removedFilesFromProject (const QStringList &fileList) } -void AdaSupportPart::parse (const QString &fileName) +void AdaSupportPart::parse (const TQString &fileName) { kdDebug () << "AdaSupportPart::parse () -- " << fileName << endl; - std::ifstream stream (QFile::encodeName( fileName ).data()); - QCString _fn = fileName.utf8 (); + std::ifstream stream (TQFile::encodeName( fileName ).data()); + TQCString _fn = fileName.utf8 (); std::string fn (_fn.data ()); AdaLexer lexer (stream); @@ -250,21 +250,21 @@ void AdaSupportPart::parse (const QString &fileName) } } catch (antlr::ANTLRException& ex) { kdDebug () << "*exception*: " << ex.toString ().c_str () << endl; - d->problemReporter->reportError (QString::fromLatin1( ex.getMessage ().c_str() ), + d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage ().c_str() ), fileName, lexer.getLine (), lexer.getColumn ()); } } -void AdaSupportPart::parseContents (const QString& contents, const QString& fileName) +void AdaSupportPart::parseContents (const TQString& contents, const TQString& fileName) { kdDebug () << "AdaSupportPart::parseContents () -- " << fileName << endl; - QCString _fn = QFile::encodeName (fileName); + TQCString _fn = TQFile::encodeName (fileName); std::string fn (_fn.data ()); - QCString text = contents.utf8 (); + TQCString text = contents.utf8 (); std::istringstream stream ((const char *)text); AdaLexer lexer (stream); @@ -285,7 +285,7 @@ void AdaSupportPart::parseContents (const QString& contents, const QString& file } catch (antlr::ANTLRException& ex) { kdDebug () << "*exception*: " << ex.toString ().c_str () << endl; - d->problemReporter->reportError (QString::fromLatin1( ex.getMessage().c_str() ), + d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage().c_str() ), fileName, lexer.getLine (), lexer.getColumn ()); @@ -323,14 +323,14 @@ void AdaSupportPart::saveProjectSourceInfo( ) if( !project() || fileList.isEmpty() ) return; - QFile f( project()->projectDirectory() + "/" + project()->projectName() + ".pcs" ); + TQFile f( project()->projectDirectory() + "/" + project()->projectName() + ".pcs" ); if( !f.open( IO_WriteOnly ) ) return; - QDataStream stream( &f ); - QMap offsets; + TQDataStream stream( &f ); + TQMap offsets; - QString pcs( "PCS" ); + TQString pcs( "PCS" ); stream << pcs << KDEV_PCS_VERSION; stream << int( fileList.size() ); @@ -359,13 +359,13 @@ void AdaSupportPart::saveProjectSourceInfo( ) }*/ } -void AdaSupportPart::changedFilesInProject( const QStringList & fileList ) +void AdaSupportPart::changedFilesInProject( const TQStringList & fileList ) { - QStringList files = fileList; + TQStringList files = fileList; - for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - QString path = project ()->projectDirectory () + "/" + *it ; + TQString path = project ()->projectDirectory () + "/" + *it ; maybeParse( path ); emit addedSourceInfo( path ); diff --git a/languages/ada/adasupportpart.h b/languages/ada/adasupportpart.h index d9f2c45d..968b1d34 100644 --- a/languages/ada/adasupportpart.h +++ b/languages/ada/adasupportpart.h @@ -4,7 +4,7 @@ #include "kdevlanguagesupport.h" -#include +#include class AdaSupportPartData; class KDialogBase; @@ -14,30 +14,30 @@ class AdaSupportPart : public KDevLanguageSupport { Q_OBJECT public: - AdaSupportPart (QObject *parent, const char *name, const QStringList &); + AdaSupportPart (TQObject *parent, const char *name, const TQStringList &); ~AdaSupportPart (); - void parseContents (const QString& contents, const QString& fileName); + void parseContents (const TQString& contents, const TQString& fileName); protected: Features features (); KMimeType::List mimeTypes (); - QStringList fileExtensions (); + TQStringList fileExtensions (); private slots: void projectOpened (); void projectClosed (); - void addedFilesToProject (const QStringList &fileList); - void removedFilesFromProject (const QStringList &fileList); - void changedFilesInProject( const QStringList &fileList ); + void addedFilesToProject (const TQStringList &fileList); + void removedFilesFromProject (const TQStringList &fileList); + void changedFilesInProject( const TQStringList &fileList ); void initialParse (); void savedFile (const KURL&); private: - void maybeParse (const QString &fileName); - void parse (const QString &fileName); + void maybeParse (const TQString &fileName); + void parse (const TQString &fileName); void saveProjectSourceInfo( ); private: diff --git a/languages/ada/addclass.cpp b/languages/ada/addclass.cpp index 5a5ccb13..ee28ff93 100644 --- a/languages/ada/addclass.cpp +++ b/languages/ada/addclass.cpp @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include @@ -30,10 +30,10 @@ AddClassInfo::AddClassInfo() } -QString AddClassInfo::adaFileName() const +TQString AddClassInfo::adaFileName() const { - QString dest = className; - dest.replace(QRegExp("\\."), "/"); + TQString dest = className; + dest.replace(TQRegExp("\\."), "/"); return sourceDir + "/" + dest + ".ada"; } @@ -55,7 +55,7 @@ AddClassInfo &AddClass::info() } -void AddClass::setBaseClasses(const QStringList &classes) +void AddClass::setBaseClasses(const TQStringList &classes) { m_baseClasses = classes; } @@ -65,7 +65,7 @@ bool AddClass::showDialog() { AddClassDlg dlg; - QString dir = m_info.projectDir; + TQString dir = m_info.projectDir; if (m_info.sourceDir.isEmpty()) m_info.sourceDir = "src"; if (dir.isEmpty()) @@ -100,7 +100,7 @@ bool AddClass::showDialog() dlg.Documentation->setText(m_info.documentation); dlg.License->setEditText(m_info.license); - if (dlg.exec() == QDialog::Accepted) + if (dlg.exec() == TQDialog::Accepted) { m_info.projectDir = ""; m_info.sourceDir = dlg.SourcePath->text(); @@ -130,17 +130,17 @@ bool AddClass::showDialog() } -static bool makeDirs(const QString &dest) +static bool makeDirs(const TQString &dest) { - QStringList dirs = QStringList::split("/", dest); + TQStringList dirs = TQStringList::split("/", dest); - QString d = ""; + TQString d = ""; - for (QStringList::Iterator it=dirs.begin(); it != dirs.end(); ++it) + for (TQStringList::Iterator it=dirs.begin(); it != dirs.end(); ++it) { d = d + "/" + *it; - QFileInfo fi(d); + TQFileInfo fi(d); if (fi.exists() && !fi.isDir()) { @@ -149,7 +149,7 @@ static bool makeDirs(const QString &dest) } if (!fi.exists()) - if (::mkdir(QFile::encodeName(d), 0755) != 0) + if (::mkdir(TQFile::encodeName(d), 0755) != 0) return false; } @@ -159,7 +159,7 @@ static bool makeDirs(const QString &dest) bool AddClass::generate() { - QString code; + TQString code; // license @@ -204,7 +204,7 @@ bool AddClass::generate() } // find class and package name - QString className, packageName; + TQString className, packageName; int i = m_info.className.findRev('.'); if (i == -1) @@ -228,7 +228,7 @@ bool AddClass::generate() { code += "/**\n"; - QTextStream ts(&m_info.documentation, IO_ReadOnly); + TQTextStream ts(&m_info.documentation, IO_ReadOnly); while (!ts.eof()) code += " * " + ts.readLine() + "\n"; @@ -283,7 +283,7 @@ bool AddClass::generate() { code += " implements "; unsigned int c=0; - for (QStringList::Iterator it = m_info.implements.begin(); it != m_info.implements.end(); ++it, c++) + for (TQStringList::Iterator it = m_info.implements.begin(); it != m_info.implements.end(); ++it, c++) { code += *it; if (c+1 < m_info.implements.count()) @@ -321,8 +321,8 @@ bool AddClass::generate() // create directories - QString dest = packageName; - dest.replace(QRegExp("\\."), "/"); + TQString dest = packageName; + dest.replace(TQRegExp("\\."), "/"); dest = m_info.sourceDir + "/" + dest; if (!makeDirs(dest)) @@ -330,19 +330,19 @@ bool AddClass::generate() // write out the file - if (QFile::exists(m_info.adaFileName())) + if (TQFile::exists(m_info.adaFileName())) { /// @todo ask before overwriting! } - QFile of(m_info.adaFileName()); + TQFile of(m_info.adaFileName()); if (!of.open(IO_WriteOnly)) { /// @todo message to user return false; } - QTextStream os(&of); + TQTextStream os(&of); os << code; of.close(); diff --git a/languages/ada/addclass.h b/languages/ada/addclass.h index 7bcfd370..e3ce8858 100644 --- a/languages/ada/addclass.h +++ b/languages/ada/addclass.h @@ -2,8 +2,8 @@ #define __ADDCLASS_H__ -#include -#include +#include +#include class AddClassInfo @@ -14,17 +14,17 @@ public: enum Visibility { PublicClass, ProtectedClass, PrivateClass}; - QString className; - QString extends; + TQString className; + TQString extends; bool interfaceOpt, abstractOpt, finalOpt; - QString projectDir, sourceDir; + TQString projectDir, sourceDir; Visibility visibility; - QStringList implements; + TQStringList implements; bool createConstructor, createMain; - QString documentation; - QString license; + TQString documentation; + TQString license; - QString adaFileName() const; + TQString adaFileName() const; }; @@ -38,7 +38,7 @@ public: void setInfo(const AddClassInfo &info); AddClassInfo &info(); - void setBaseClasses(const QStringList &classes); + void setBaseClasses(const TQStringList &classes); bool showDialog(); bool generate(); @@ -47,7 +47,7 @@ public: private: AddClassInfo m_info; - QStringList m_baseClasses; + TQStringList m_baseClasses; }; diff --git a/languages/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp index f94f3216..68607851 100644 --- a/languages/ada/backgroundparser.cpp +++ b/languages/ada/backgroundparser.cpp @@ -15,15 +15,15 @@ #include "AdaParser.hpp" #include "AdaAST.hpp" #include -#include +#include #include #include BackgroundParser::BackgroundParser( ProblemReporter* reporter, - const QString& source, - const QString& filename ) + const TQString& source, + const TQString& filename ) : m_reporter( reporter ), m_source( source.unicode(), source.length() ), m_fileName( filename ) @@ -36,7 +36,7 @@ BackgroundParser::~BackgroundParser() void BackgroundParser::run() { - QCString _fn = QFile::encodeName(m_fileName); + TQCString _fn = TQFile::encodeName(m_fileName); std::string fn( _fn.data() ); std::istringstream stream( m_source.utf8().data() ); @@ -64,7 +64,7 @@ void BackgroundParser::run() } catch( antlr::ANTLRException& ex ){ kdDebug() << "*exception*: " << ex.toString().c_str() << endl; - m_reporter->reportError( QString::fromLatin1( ex.getMessage().c_str() ), + m_reporter->reportError( TQString::fromLatin1( ex.getMessage().c_str() ), m_fileName, lexer.getLine(), lexer.getColumn() ); diff --git a/languages/ada/backgroundparser.h b/languages/ada/backgroundparser.h index 0b4eef16..3c41d450 100644 --- a/languages/ada/backgroundparser.h +++ b/languages/ada/backgroundparser.h @@ -13,8 +13,8 @@ #ifndef BACKGROUNDPARSER_H #define BACKGROUNDPARSER_H -#include -#include +#include +#include #include class ProblemReporter; @@ -22,16 +22,16 @@ class ProblemReporter; class BackgroundParser: public QThread{ public: BackgroundParser( ProblemReporter* reporter, - const QString& source, - const QString& filename ); + const TQString& source, + const TQString& filename ); virtual ~BackgroundParser(); virtual void run(); private: ProblemReporter* m_reporter; - QString m_source; - QString m_fileName; + TQString m_source; + TQString m_fileName; }; #endif diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 61109775..652d5a6b 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -24,7 +24,7 @@ #include "configproblemreporter.h" #include "backgroundparser.h" -#include +#include #include #include @@ -43,24 +43,24 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include class ProblemItem: public QListViewItem{ public: - ProblemItem( QListView* parent, const QString& level, const QString& problem, - const QString& file, const QString& line, const QString& column ) - : QListViewItem( parent, level, problem, file, line, column ) {} + ProblemItem( TQListView* parent, const TQString& level, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) + : TQListViewItem( parent, level, problem, file, line, column ) {} - ProblemItem( QListViewItem* parent, const QString& level, const QString& problem, - const QString& file, const QString& line, const QString& column ) - : QListViewItem( parent, level, problem, file, line, column ) {} + ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) + : TQListViewItem( parent, level, problem, file, line, column ) {} - int compare( QListViewItem* item, int column, bool ascending ) const { + int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 3 || column == 4 ){ int a = text( column ).toInt(); int b = item->text( column ).toInt(); @@ -68,20 +68,20 @@ public: return 0; return( a > b ? -1 : 1 ); } - return QListViewItem::compare( item, column, ascending ); + return TQListViewItem::compare( item, column, ascending ); } }; -ProblemReporter::ProblemReporter( AdaSupportPart* part, QWidget* parent, const char* name ) - : QListView( parent, name ), +ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const char* name ) + : TQListView( parent, name ), m_adaSupport( part ), m_editor( 0 ), m_document( 0 ), m_markIface( 0 ), m_bgParser( 0 ) { - QWhatsThis::add(this, i18n("Problem reporter

    This window shows errors reported by a language parser.")); + TQWhatsThis::add(this, i18n("Problem reporter

    This window shows errors reported by a language parser.")); addColumn( i18n("Level") ); addColumn( i18n("Problem") ); @@ -90,21 +90,21 @@ ProblemReporter::ProblemReporter( AdaSupportPart* part, QWidget* parent, const c //addColumn( i18n("Column") ); setAllColumnsShowFocus( TRUE ); - m_timer = new QTimer( this ); + m_timer = new TQTimer( this ); - connect( part->partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partAdded(KParts::Part*)), - this, SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partRemoved(KParts::Part*)), - this, SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), + this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), + this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, SIGNAL(timeout()), this, SLOT(reparse()) ); + connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); - connect( this, SIGNAL(doubleClicked(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem*)) ); - connect( this, SIGNAL(returnPressed(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem*)) ); + connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -134,7 +134,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) m_editor = dynamic_cast( part ); if( m_editor ) - connect( m_document, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) ); + connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast( part ); @@ -166,9 +166,9 @@ void ProblemReporter::reparse() m_bgParser = 0; } - QListViewItem* current = firstChild(); + TQListViewItem* current = firstChild(); while( current ){ - QListViewItem* i = current; + TQListViewItem* i = current; current = current->nextSibling(); if( i->text(2) == m_filename ) @@ -176,8 +176,8 @@ void ProblemReporter::reparse() } if( m_markIface ){ - QPtrList marks = m_markIface->marks(); - QPtrListIterator it( marks ); + TQPtrList marks = m_markIface->marks(); + TQPtrListIterator it( marks ); while( it.current() ){ m_markIface->removeMark( it.current()->line, KTextEditor::MarkInterface::markType07 ); ++it; @@ -185,7 +185,7 @@ void ProblemReporter::reparse() } /* Temporarily deactivated (crashes)*/ - if (!m_adaSupport->fileExtensions ().contains (QFileInfo (m_filename).extension ())) + if (!m_adaSupport->fileExtensions ().contains (TQFileInfo (m_filename).extension ())) { m_bgParser = new BackgroundParser( this, m_editor->text(), m_filename ); m_bgParser->start(); @@ -193,7 +193,7 @@ void ProblemReporter::reparse() /**/ } -void ProblemReporter::slotSelected( QListViewItem* item ) +void ProblemReporter::slotSelected( TQListViewItem* item ) { KURL url( item->text(2) ); int line = item->text( 3 ).toInt(); @@ -201,8 +201,8 @@ void ProblemReporter::slotSelected( QListViewItem* item ) m_adaSupport->partController()->editDocument( url, line-1 ); } -void ProblemReporter::reportError( QString message, - QString filename, +void ProblemReporter::reportError( TQString message, + TQString filename, int line, int column ) { if( m_markIface ){ @@ -211,34 +211,34 @@ void ProblemReporter::reportError( QString message, new ProblemItem( this, "error", - message.replace( QRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, - QString::number( line ), - QString::number( column ) ); + TQString::number( line ), + TQString::number( column ) ); } -void ProblemReporter::reportWarning( QString message, - QString filename, +void ProblemReporter::reportWarning( TQString message, + TQString filename, int line, int column ) { new ProblemItem( this, "warning", - message.replace( QRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, - QString::number( line ), - QString::number( column ) ); + TQString::number( line ), + TQString::number( column ) ); } -void ProblemReporter::reportMessage( QString message, - QString filename, +void ProblemReporter::reportMessage( TQString message, + TQString filename, int line, int column ) { - new QListViewItem( this, + new TQListViewItem( this, "message", - message.replace( QRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, - QString::number( line ), - QString::number( column ) ); + TQString::number( line ), + TQString::number( column ) ); } void ProblemReporter::configure() @@ -253,10 +253,10 @@ void ProblemReporter::configure() void ProblemReporter::configWidget( KDialogBase* dlg ) { kdDebug() << "ProblemReporter::configWidget()" << endl; - QVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"), BarIcon( "source", KIcon::SizeMedium )); + TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"), BarIcon( "source", KIcon::SizeMedium )); ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); - connect(dlg, SIGNAL(okClicked()), this, SLOT(configure())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure())); } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/ada/problemreporter.h b/languages/ada/problemreporter.h index a3d70135..c2a112aa 100644 --- a/languages/ada/problemreporter.h +++ b/languages/ada/problemreporter.h @@ -20,7 +20,7 @@ #ifndef PROBLEMSREPORTER_H #define PROBLEMSREPORTER_H -#include +#include class AdaSupportPart; class QTimer; @@ -40,16 +40,16 @@ namespace KTextEditor{ class ProblemReporter: public QListView{ Q_OBJECT public: - ProblemReporter( AdaSupportPart* part, QWidget* parent=0, const char* name=0 ); + ProblemReporter( AdaSupportPart* part, TQWidget* parent=0, const char* name=0 ); virtual ~ProblemReporter(); - virtual void reportError( QString message, QString filename, + virtual void reportError( TQString message, TQString filename, int line, int column ); - virtual void reportWarning( QString message, QString filename, + virtual void reportWarning( TQString message, TQString filename, int line, int column ); - virtual void reportMessage( QString message, QString filename, + virtual void reportMessage( TQString message, TQString filename, int line, int column ); public slots: @@ -62,15 +62,15 @@ private slots: void slotPartRemoved( KParts::Part* ); void slotActivePartChanged( KParts::Part* ); void slotTextChanged(); - void slotSelected( QListViewItem* ); + void slotSelected( TQListViewItem* ); private: AdaSupportPart* m_adaSupport; KTextEditor::EditInterface* m_editor; KTextEditor::Document* m_document; KTextEditor::MarkInterface* m_markIface; - QTimer* m_timer; - QString m_filename; + TQTimer* m_timer; + TQString m_filename; int m_active; int m_delay; BackgroundParser* m_bgParser; diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index 389c0a70..1420356d 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -3,14 +3,14 @@ */ #include "bashsupport_part.h" -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include @@ -36,26 +36,26 @@ typedef KDevGenericFactory BashSupportFactory; static const KDevPluginInfo data("kdevbashsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) ) -BashSupportPart::BashSupportPart(QObject *parent, const char *name, const QStringList& ) +BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& ) : KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" ) { setInstance(BashSupportFactory::instance()); setXMLFile("kdevbashsupport.rc"); KAction *action; - action = new KAction( i18n("&Run"), "exec",Key_F9,this, SLOT(slotRun()),actionCollection(), "build_execute" ); + action = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("Run

    Starts an application.")); kdDebug() << "Creating BashSupportPart" << endl; - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), this, SLOT(savedFile(const KURL&)) ); - connect(partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part *))); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); + connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); m_cc = new BashCodeCompletion(); } @@ -71,23 +71,23 @@ BashSupportPart::~BashSupportPart() void BashSupportPart::projectConfigWidget(KDialogBase *dlg) { Q_UNUSED( dlg ); -// QVBox *vbox = dlg->addVBoxPage(i18n("Bash")); -// RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (QWidget *)vbox, "Bash config widget"); -// connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); +// TQVBox *vbox = dlg->addVBoxPage(i18n("Bash")); +// RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "Bash config widget"); +// connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } void BashSupportPart::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - QTimer::singleShot(0, this, SLOT(parse())); + TQTimer::singleShot(0, this, TQT_SLOT(parse())); } @@ -98,18 +98,18 @@ void BashSupportPart::projectClosed() void BashSupportPart::slotRun () { - QString file; + TQString file; KParts::ReadOnlyPart *ro_part = dynamic_cast(partController()->activePart()); if(ro_part) file = ro_part->url().path(); - QString cmd = interpreter() + " " + file; + TQString cmd = interpreter() + " " + file; startApplication(cmd); } -QString BashSupportPart::interpreter() +TQString BashSupportPart::interpreter() { - QString prog = DomUtil::readEntry(*projectDom(), "/kdevrbashsupport/run/interpreter"); + TQString prog = DomUtil::readEntry(*projectDom(), "/kdevrbashsupport/run/interpreter"); if (prog.isEmpty()) prog = "bash"; return prog; @@ -122,8 +122,8 @@ void BashSupportPart::parse() if (project()) { kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) + TQStringList files = project()->allFiles(); + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; parse(project()->projectDirectory() + "/" + *it); @@ -135,11 +135,11 @@ void BashSupportPart::parse() } } -void BashSupportPart::addedFilesToProject(const QStringList &fileList) +void BashSupportPart::addedFilesToProject(const TQStringList &fileList) { kdDebug(9014) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -150,15 +150,15 @@ kdDebug(9014) << "addedFilesToProject()" << endl; } -void BashSupportPart::removedFilesFromProject(const QStringList &fileList) +void BashSupportPart::removedFilesFromProject(const TQStringList &fileList) { kdDebug(9014) << "removedFilesFromProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); if( codeModel()->hasFile(fileName) ){ emit aboutToRemoveSourceInfo( fileName ); codeModel()->removeFile( codeModel()->fileByName(fileName) ); @@ -179,11 +179,11 @@ void BashSupportPart::savedFile(const KURL &fileName) } } -void BashSupportPart::startApplication(const QString &program) +void BashSupportPart::startApplication(const TQString &program) { kdDebug() << "starting application" << program << endl; if (KDevAppFrontend *appFrontend = extension("KDevelop/AppFrontend")) - appFrontend->startAppCommand(QString::QString(), program, TRUE); + appFrontend->startAppCommand(TQString::TQString(), program, TRUE); } @@ -192,9 +192,9 @@ KDevLanguageSupport::Features BashSupportPart::features() return Features(Variables | Functions); } -void BashSupportPart::parse(const QString &fileName) +void BashSupportPart::parse(const TQString &fileName) { - QFileInfo fi(fileName); + TQFileInfo fi(fileName); m_vars.clear(); if (fi.extension() == "sh") { @@ -207,19 +207,19 @@ void BashSupportPart::parse(const QString &fileName) m_file->setName( fileName ); m_vars.clear(); - QFile f(QFile::encodeName(fileName)); + TQFile f(TQFile::encodeName(fileName)); if (!f.open(IO_ReadOnly)) return; - QString rawline; - QString line; + TQString rawline; + TQString line; uint lineNo = 0; //KRegExp methodre("\\b([\\d\\w]+[\\s]*)\\([\\s]*\\)"); - QRegExp methodre("^\\s*(\\w+)\\s*\\(\\s*\\)"); - QRegExp varre( "^\\s*(\\w+)[=]" ); - QRegExp expvarre( "^export\\s*(\\w+)[=]" ); - QRegExp forvarre("\\bfor[\\s]+([\\d\\w]+)[\\s]+in[\\s]+"); + TQRegExp methodre("^\\s*(\\w+)\\s*\\(\\s*\\)"); + TQRegExp varre( "^\\s*(\\w+)[=]" ); + TQRegExp expvarre( "^export\\s*(\\w+)[=]" ); + TQRegExp forvarre("\\bfor[\\s]+([\\d\\w]+)[\\s]+in[\\s]+"); - QTextStream stream(&f); + TQTextStream stream(&f); while (!stream.atEnd()) { rawline = stream.readLine(); @@ -274,7 +274,7 @@ void BashSupportPart::slotActivePartChanged(KParts::Part *part) m_cc->setActiveEditorPart(part); } -void BashSupportPart::addAttribute(const QString &name, FileDom file, uint lineNo) +void BashSupportPart::addAttribute(const TQString &name, FileDom file, uint lineNo) { VariableDom var = codeModel()->create(); var->setName(name); @@ -332,26 +332,26 @@ void BashCodeCompletion::setActiveEditorPart(KParts::Part *part) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice - connect(part->widget(), SIGNAL(cursorPositionChanged()), - this, SLOT(cursorPositionChanged())); - connect(part->widget(), SIGNAL(argHintHidden()), this, SLOT(argHintHidden())); - connect(part->widget(), SIGNAL(completionAborted()), this, SLOT(completionBoxAbort())); - connect(part->widget(), SIGNAL(completionDone()), this, SLOT(completionBoxHidden())); + connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), + this, TQT_SLOT(cursorPositionChanged())); + connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHidden())); + connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxAbort())); + connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHidden())); } -void BashCodeCompletion::setVars(QStringList lst) +void BashCodeCompletion::setVars(TQStringList lst) { m_vars = lst; } -QValueList BashCodeCompletion::getVars(const QString &startText) +TQValueList BashCodeCompletion::getVars(const TQString &startText) { kdDebug() << "getVars for " << startText << endl; - QValueList varList; - QValueList::ConstIterator it; + TQValueList varList; + TQValueList::ConstIterator it; for (it = m_vars.begin(); it != m_vars.end(); ++it) { - QString var = "$" + (*it); + TQString var = "$" + (*it); kdDebug() << "Compair " << var << endl; if( var.startsWith( startText )) { @@ -373,15 +373,15 @@ void BashCodeCompletion::cursorPositionChanged() m_cursorInterface->cursorPositionReal(&line, &col); kdDebug() << "BashCodeCompletion::cursorPositionChanged:" << line << ":" << col << endl; - QString lineStr = m_editInterface->textLine(line); + TQString lineStr = m_editInterface->textLine(line); if(lineStr.isNull() || lineStr.isEmpty()){ kdDebug() << "No Text..." << endl; return; // nothing to do } // if(m_config->getCodeCompletion()) // { - QString restLine = lineStr.mid(col); - QString prevText = lineStr.mid(0,col); + TQString restLine = lineStr.mid(col); + TQString prevText = lineStr.mid(0,col); if(restLine.left(1) != " " && restLine.left(1) != "\t" && !restLine.isNull()) { @@ -389,13 +389,13 @@ void BashCodeCompletion::cursorPositionChanged() return; } - QRegExp prevReg("[$][\\d\\w]*\\b$"); + TQRegExp prevReg("[$][\\d\\w]*\\b$"); int pos = prevReg.search( prevText ); if (pos > -1 ) { // We are in completion mode - QString startMatch = prevReg.cap(0); + TQString startMatch = prevReg.cap(0); kdDebug() << "Matching: " << startMatch << endl; m_completionBoxShow=true; m_codeInterface->showCompletionBox(getVars(startMatch),2); @@ -416,9 +416,9 @@ void BashCodeCompletion::completionBoxHidden() m_completionBoxShow=false; /* uint line, col, start; m_cursorInterface->cursorPositionReal(&line, &col); - QString lineStr = m_editInterface->textLine(line); + TQString lineStr = m_editInterface->textLine(line); - start = lineStr.findRev(QRegExp("[$][\\d\\w]*\\b$")); + start = lineStr.findRev(TQRegExp("[$][\\d\\w]*\\b$")); m_editInterface->removeText ( start, col, line, col ); */ } diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h index 20c11c4e..4b3219fa 100644 --- a/languages/bash/bashsupport_part.h +++ b/languages/bash/bashsupport_part.h @@ -7,7 +7,7 @@ #define __KDEVPART_BASHSUPPORT_H__ -#include +#include #include #include @@ -29,8 +29,8 @@ class BashCodeCompletion : QObject BashCodeCompletion(); ~BashCodeCompletion(); void setActiveEditorPart(KParts::Part*); - void setVars(QStringList); - QValueList getVars(const QString& textHint); + void setVars(TQStringList); + TQValueList getVars(const TQString& textHint); public slots: void cursorPositionChanged(); @@ -38,7 +38,7 @@ class BashCodeCompletion : QObject void completionBoxAbort(); private: - QStringList m_vars; + TQStringList m_vars; bool m_argWidgetShow; bool m_completionBoxShow; KTextEditor::EditInterface *m_editInterface; @@ -50,7 +50,7 @@ class BashSupportPart : public KDevLanguageSupport { Q_OBJECT public: - BashSupportPart(QObject *parent, const char *name, const QStringList &); + BashSupportPart(TQObject *parent, const char *name, const TQStringList &); virtual ~BashSupportPart(); protected: @@ -63,18 +63,18 @@ class BashSupportPart : public KDevLanguageSupport void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void parse(); void slotActivePartChanged(KParts::Part *part); private: - void startApplication(const QString &program); - QString interpreter(); - void parse(const QString &fileName); - void addAttribute(const QString &name, FileDom file, uint line); + void startApplication(const TQString &program); + TQString interpreter(); + void parse(const TQString &fileName); + void addAttribute(const TQString &name, FileDom file, uint line); BashCodeCompletion *m_cc; - QStringList m_vars; + TQStringList m_vars; }; diff --git a/languages/cpp/KDevCppSupportIface.cpp b/languages/cpp/KDevCppSupportIface.cpp index f5af83c9..793516ca 100644 --- a/languages/cpp/KDevCppSupportIface.cpp +++ b/languages/cpp/KDevCppSupportIface.cpp @@ -3,7 +3,7 @@ #include "cppsupportpart.h" KDevCppSupportIface::KDevCppSupportIface( CppSupportPart* cppSupport ) - : QObject( cppSupport ), DCOPObject( "KDevCppSupport" ), m_cppSupport( cppSupport ) + : TQObject( cppSupport ), DCOPObject( "KDevCppSupport" ), m_cppSupport( cppSupport ) { } diff --git a/languages/cpp/KDevCppSupportIface.h b/languages/cpp/KDevCppSupportIface.h index 34780d8c..8aed7e94 100644 --- a/languages/cpp/KDevCppSupportIface.h +++ b/languages/cpp/KDevCppSupportIface.h @@ -2,12 +2,12 @@ #ifndef KDEVCPPSUPPORTIFACE_H #define KDEVCPPSUPPORTIFACE_H -#include +#include #include class CppSupportPart; -class KDevCppSupportIface : public QObject, public DCOPObject +class KDevCppSupportIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 7f5712a2..42031f59 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -32,24 +32,24 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include AddAttributeDialog::AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - QWidget* parent, const char* name, bool modal, WFlags fl ) + TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddAttributeDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { - access->insertStringList( QStringList() << "Public" << "Protected" << "Private" ); + access->insertStringList( TQStringList() << "Public" << "Protected" << "Private" ); - storage->insertStringList( QStringList() << "Normal" << "Static" ); + storage->insertStringList( TQStringList() << "Normal" << "Static" ); returnType->setAutoCompletion( true ); - returnType->insertStringList( QStringList() + returnType->insertStringList( TQStringList() << "void" << "char" << "wchar_t" @@ -73,7 +73,7 @@ AddAttributeDialog::~AddAttributeDialog() void AddAttributeDialog::reject() { - QDialog::reject(); + TQDialog::reject(); } void AddAttributeDialog::accept() @@ -83,7 +83,7 @@ void AddAttributeDialog::accept() if ( !editIface ) { /// @todo show messagebox - QDialog::accept(); + TQDialog::accept(); return ; } @@ -91,15 +91,15 @@ void AddAttributeDialog::accept() m_klass->getEndPosition( &line, &column ); // compute the insertion point map - QMap > points; - QStringList accessList; + TQMap > points; + TQStringList accessList; const VariableList variableList = m_klass->variableList(); for ( VariableList::ConstIterator it = variableList.begin(); it != variableList.end(); ++it ) { int varEndLine, varEndColumn; ( *it ) ->getEndPosition( &varEndLine, &varEndColumn ); - QString access = accessID( *it ); + TQString access = accessID( *it ); QPair varEndPoint = qMakePair( varEndLine, varEndColumn ); if ( !points.contains( access ) || points[ access ] < varEndPoint ) @@ -115,21 +115,21 @@ void AddAttributeDialog::accept() accessList += newAccessList( accessList ); - for ( QStringList::iterator it = accessList.begin(); it != accessList.end(); ++it ) + for ( TQStringList::iterator it = accessList.begin(); it != accessList.end(); ++it ) { - QListViewItem* item = attributes->firstChild(); + TQListViewItem* item = attributes->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); if ( currentItem->text( 0 ) != *it ) continue; - QString access = ( *it ).lower(); + TQString access = ( *it ).lower(); - QString str = variableDeclaration( currentItem ); + TQString str = variableDeclaration( currentItem ); QPair pt; if ( points.contains( *it ) ) @@ -144,21 +144,21 @@ void AddAttributeDialog::accept() } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.contains( QChar( '\n' ) ); + insertedLine += str.contains( TQChar( '\n' ) ); } } m_cppSupport->backgroundParser() ->addFile( m_klass->fileName() ); - QDialog::accept(); + TQDialog::accept(); } -QString AddAttributeDialog::variableDeclaration( QListViewItem* item ) const +TQString AddAttributeDialog::variableDeclaration( TQListViewItem* item ) const { - QString str; - QTextStream stream( &str, IO_WriteOnly ); - QString ind; - ind.fill( QChar( ' ' ), 4 ); + TQString str; + TQTextStream stream( &str, IO_WriteOnly ); + TQString ind; + ind.fill( TQChar( ' ' ), 4 ); stream << ind; if ( item->text( 1 ) == "Static" ) @@ -183,7 +183,7 @@ void AddAttributeDialog::updateGUI() if ( enable ) { - QListViewItem * item = attributes->selectedItem(); + TQListViewItem * item = attributes->selectedItem(); item->setText( 0, access->currentText() ); item->setText( 1, storage->currentText() ); item->setText( 2, returnType->currentText() ); @@ -193,8 +193,8 @@ void AddAttributeDialog::updateGUI() void AddAttributeDialog::addAttribute() { - QListViewItem * item = new QListViewItem( attributes, "Protected", "Normal", - "int", QString( "attribute_%1" ).arg( ++m_count ) ); + TQListViewItem * item = new TQListViewItem( attributes, "Protected", "Normal", + "int", TQString( "attribute_%1" ).arg( ++m_count ) ); attributes->setCurrentItem( item ); attributes->setSelected( item, true ); @@ -206,14 +206,14 @@ void AddAttributeDialog::deleteCurrentAttribute() delete( attributes->currentItem() ); } -void AddAttributeDialog::currentChanged( QListViewItem* item ) +void AddAttributeDialog::currentChanged( TQListViewItem* item ) { if ( item ) { - QString _access = item->text( 0 ); - QString _storage = item->text( 1 ); - QString _returnType = item->text( 2 ); - QString _declarator = item->text( 3 ); + TQString _access = item->text( 0 ); + TQString _storage = item->text( 1 ); + TQString _returnType = item->text( 2 ); + TQString _declarator = item->text( 3 ); access->setCurrentText( _access ); storage->setCurrentText( _storage ); @@ -224,18 +224,18 @@ void AddAttributeDialog::currentChanged( QListViewItem* item ) updateGUI(); } -QStringList AddAttributeDialog::newAccessList( const QStringList& accessList ) const +TQStringList AddAttributeDialog::newAccessList( const TQStringList& accessList ) const { - QStringList newAccessList; + TQStringList newAccessList; - QListViewItem* item = attributes->firstChild(); + TQListViewItem* item = attributes->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); - QString access = currentItem->text( 0 ); + TQString access = currentItem->text( 0 ); if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) ) newAccessList.push_back( access ); } @@ -243,21 +243,21 @@ QStringList AddAttributeDialog::newAccessList( const QStringList& accessList ) c return newAccessList; } -QString AddAttributeDialog::accessID( VariableDom var ) const +TQString AddAttributeDialog::accessID( VariableDom var ) const { switch ( var->access() ) { case CodeModelItem::Public: - return QString::fromLatin1( "Public" ); + return TQString::fromLatin1( "Public" ); case CodeModelItem::Protected: - return QString::fromLatin1( "Protected" ); + return TQString::fromLatin1( "Protected" ); case CodeModelItem::Private: - return QString::fromLatin1( "Private" ); + return TQString::fromLatin1( "Private" ); } - return QString::null; + return TQString::null; } #include "addattributedialog.moc" diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index 8e160f2a..54d917b1 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -31,12 +31,12 @@ class AddAttributeDialog : public AddAttributeDialogBase Q_OBJECT public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddAttributeDialog(); virtual void addAttribute(); virtual void deleteCurrentAttribute(); - virtual void currentChanged( QListViewItem* item ); + virtual void currentChanged( TQListViewItem* item ); virtual void updateGUI(); protected: @@ -44,9 +44,9 @@ protected: virtual void accept(); private: - QString accessID( VariableDom var ) const; - QStringList newAccessList( const QStringList& accessList ) const; - QString variableDeclaration( QListViewItem* item ) const; + TQString accessID( VariableDom var ) const; + TQStringList newAccessList( const TQStringList& accessList ) const; + TQString variableDeclaration( TQListViewItem* item ) const; private: CppSupportPart* m_cppSupport; diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index 2b53868c..ae4e1738 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -34,28 +34,28 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - QWidget* parent, const char* name, bool modal, WFlags fl ) + TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddMethodDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { - QString fileName = m_klass->fileName(); + TQString fileName = m_klass->fileName(); - access->insertStringList( QStringList() << "Public" << "Protected" << "Private" << "Signals" << + access->insertStringList( TQStringList() << "Public" << "Protected" << "Private" << "Signals" << "Public Slots" << "Protected Slots" << "Private Slots" ); - storage->insertStringList( QStringList() << "Normal" << "Static" << "Virtual" << "Pure Virtual" << "Friend" ); + storage->insertStringList( TQStringList() << "Normal" << "Static" << "Virtual" << "Pure Virtual" << "Friend" ); // setup sourceFile combo - QMap m; + TQMap m; #if 0 /// \FIXME ROBE FunctionList l = m_klass->functionList(); @@ -69,12 +69,12 @@ AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, #endif { - QStringList headers = QStringList::split( ",", "h,H,hh,hxx,hpp,inl,tlh,diff,ui.h" ); - QStringList fileList; - QMap::Iterator it = m.begin(); + TQStringList headers = TQStringList::split( ",", "h,H,hh,hxx,hpp,inl,tlh,diff,ui.h" ); + TQStringList fileList; + TQMap::Iterator it = m.begin(); while ( it != m.end() ) { - QString ext = QFileInfo( it.key() ).extension(); + TQString ext = TQFileInfo( it.key() ).extension(); if ( !headers.contains( ext ) ) sourceFile->insertItem( it.key() ); ++it; @@ -82,14 +82,14 @@ AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, if ( sourceFile->count() == 0 ) { - QFileInfo info( fileName ); - QString impl = DomUtil::readEntry( *cppSupport->projectDom(), "/cppsupportpart/filetemplates/implementationsuffix", "cpp" ); + TQFileInfo info( fileName ); + TQString impl = DomUtil::readEntry( *cppSupport->projectDom(), "/cppsupportpart/filetemplates/implementationsuffix", "cpp" ); sourceFile->insertItem( info.dirPath( true ) + "/" + info.baseName() + impl ); } } returnType->setAutoCompletion( true ); - returnType->insertStringList( QStringList() + returnType->insertStringList( TQStringList() << "void" << "char" << "wchar_t" @@ -113,33 +113,33 @@ AddMethodDialog::~AddMethodDialog() void AddMethodDialog::reject() { - QDialog::reject(); + TQDialog::reject(); } -QString AddMethodDialog::accessID( FunctionDom fun ) const +TQString AddMethodDialog::accessID( FunctionDom fun ) const { if ( fun->isSignal() ) - return QString::fromLatin1( "Signals" ); + return TQString::fromLatin1( "Signals" ); switch ( fun->access() ) { case CodeModelItem::Public: if ( fun->isSlot() ) - return QString::fromLatin1( "Public Slots" ); - return QString::fromLatin1( "Public" ); + return TQString::fromLatin1( "Public Slots" ); + return TQString::fromLatin1( "Public" ); case CodeModelItem::Protected: if ( fun->isSlot() ) - return QString::fromLatin1( "Protected Slots" ); - return QString::fromLatin1( "Protected" ); + return TQString::fromLatin1( "Protected Slots" ); + return TQString::fromLatin1( "Protected" ); case CodeModelItem::Private: if ( fun->isSlot() ) - return QString::fromLatin1( "Private Slots" ); - return QString::fromLatin1( "Private" ); + return TQString::fromLatin1( "Private Slots" ); + return TQString::fromLatin1( "Private" ); } - return QString::null; + return TQString::null; } void AddMethodDialog::accept() @@ -149,7 +149,7 @@ void AddMethodDialog::accept() if ( !editIface ) { /// @todo show messagebox - QDialog::accept(); + TQDialog::accept(); return ; } @@ -157,15 +157,15 @@ void AddMethodDialog::accept() m_klass->getEndPosition( &line, &column ); // compute the insertion point map - QMap > points; - QStringList accessList; + TQMap > points; + TQStringList accessList; const FunctionList functionList = m_klass->functionList(); for ( FunctionList::ConstIterator it = functionList.begin(); it != functionList.end(); ++it ) { int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); - QString access = accessID( *it ); + TQString access = accessID( *it ); QPair funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) @@ -181,22 +181,22 @@ void AddMethodDialog::accept() accessList += newAccessList( accessList ); - for ( QStringList::iterator it = accessList.begin(); it != accessList.end(); ++it ) + for ( TQStringList::iterator it = accessList.begin(); it != accessList.end(); ++it ) { - QListViewItem* item = methods->firstChild(); + TQListViewItem* item = methods->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); if ( currentItem->text( 1 ) != *it ) continue; - QString access = ( *it ).lower(); + TQString access = ( *it ).lower(); bool isInline = currentItem->text( 0 ) == "True"; - QString str = isInline ? functionDefinition( currentItem ) : functionDeclaration( currentItem ); + TQString str = isInline ? functionDefinition( currentItem ) : functionDeclaration( currentItem ); QPair pt; if ( points.contains( *it ) ) @@ -211,30 +211,30 @@ void AddMethodDialog::accept() } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.contains( QChar( '\n' ) ); + insertedLine += str.contains( TQChar( '\n' ) ); } } m_cppSupport->backgroundParser() ->addFile( m_klass->fileName() ); - QString str; - QListViewItem* item = methods->firstChild(); + TQString str; + TQListViewItem* item = methods->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); - QString str = functionDefinition( currentItem ); + TQString str = functionDefinition( currentItem ); if ( str.isEmpty() ) continue; - QString implementationFile = currentItem->text( 5 ); + TQString implementationFile = currentItem->text( 5 ); if ( currentItem->text( 0 ) == "True" ) implementationFile = m_klass->fileName(); - QFileInfo fileInfo( implementationFile ); - if ( !QFile::exists( fileInfo.absFilePath() ) ) + TQFileInfo fileInfo( implementationFile ); + if ( !TQFile::exists( fileInfo.absFilePath() ) ) { if ( KDevCreateFile * createFileSupp = m_cppSupport->extension( "KDevelop/CreateFile" ) ) createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() ); @@ -248,13 +248,13 @@ void AddMethodDialog::accept() bool isInline = currentItem->text( 0 ) == "True"; if ( !isInline ) { - editIface->insertLine( editIface->numLines(), QString::fromLatin1( "" ) ); + editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) ); editIface->insertText( editIface->numLines() - 1, 0, str ); m_cppSupport->backgroundParser() ->addFile( implementationFile ); } } - QDialog::accept(); + TQDialog::accept(); } void AddMethodDialog::updateGUI() @@ -274,7 +274,7 @@ void AddMethodDialog::updateGUI() if ( enable ) { - QListViewItem * item = methods->selectedItem(); + TQListViewItem * item = methods->selectedItem(); item->setText( 0, isInline->isChecked() ? "True" : "False" ); item->setText( 1, access->currentText() ); item->setText( 2, storage->currentText() ); @@ -292,8 +292,8 @@ void AddMethodDialog::updateGUI() void AddMethodDialog::addMethod() { - QListViewItem * item = new QListViewItem( methods, "False", "Public", "Normal", - "void", QString( "method_%1()" ).arg( ++m_count ), + TQListViewItem * item = new TQListViewItem( methods, "False", "Public", "Normal", + "void", TQString( "method_%1()" ).arg( ++m_count ), sourceFile->currentText() ); methods->setCurrentItem( item ); methods->setSelected( item, true ); @@ -307,16 +307,16 @@ void AddMethodDialog::deleteCurrentMethod() updateGUI(); } -void AddMethodDialog::currentChanged( QListViewItem* item ) +void AddMethodDialog::currentChanged( TQListViewItem* item ) { if ( item ) { - QString _isInline = item->text( 0 ); - QString _access = item->text( 1 ); - QString _storage = item->text( 2 ); - QString _returnType = item->text( 3 ); - QString _declarator = item->text( 4 ); - QString _sourceFile = item->text( 5 ); + TQString _isInline = item->text( 0 ); + TQString _access = item->text( 1 ); + TQString _storage = item->text( 2 ); + TQString _returnType = item->text( 3 ); + TQString _declarator = item->text( 4 ); + TQString _sourceFile = item->text( 5 ); isInline->setChecked( _isInline == "True" ? true : false ); access->setCurrentText( _access ); @@ -331,17 +331,17 @@ void AddMethodDialog::currentChanged( QListViewItem* item ) void AddMethodDialog::browseImplementationFile() { - QString fileName = KFileDialog::getOpenFileName(); + TQString fileName = KFileDialog::getOpenFileName(); sourceFile->setCurrentText( fileName ); updateGUI(); } -QString AddMethodDialog::functionDeclaration( QListViewItem * item ) const +TQString AddMethodDialog::functionDeclaration( TQListViewItem * item ) const { - QString str; - QTextStream stream( &str, IO_WriteOnly ); + TQString str; + TQTextStream stream( &str, IO_WriteOnly ); - QString access = item->text( 1 ).lower(); + TQString access = item->text( 1 ).lower(); stream << " "; /// @todo use AStyle if ( item->text( 2 ) == "Virtual" || item->text( 2 ) == "Pure Virtual" ) @@ -358,28 +358,28 @@ QString AddMethodDialog::functionDeclaration( QListViewItem * item ) const return str; } -QString AddMethodDialog::functionDefinition( QListViewItem* item ) const +TQString AddMethodDialog::functionDefinition( TQListViewItem* item ) const { if ( item->text( 1 ) == "Signals" || item->text( 2 ) == "Pure Virtual" || item->text( 2 ) == "Friend" ) { - return QString::null; + return TQString::null; } - QString className = m_klass->name(); - QString fullName = m_klass->scope().join( "::" ); + TQString className = m_klass->name(); + TQString fullName = m_klass->scope().join( "::" ); if ( !fullName.isEmpty() ) fullName += "::"; fullName += className; - QString str; - QTextStream stream( &str, IO_WriteOnly ); + TQString str; + TQTextStream stream( &str, IO_WriteOnly ); bool isInline = item->text( 0 ) == "True"; - QString ind; + TQString ind; if ( isInline ) - ind.fill( QChar( ' ' ), 4 ); + ind.fill( TQChar( ' ' ), 4 ); stream << "\n" << ind << "/*!\n" @@ -387,7 +387,7 @@ QString AddMethodDialog::functionDefinition( QListViewItem* item ) const << ind << " */\n"; stream - << ind << item->text( 3 ) << " " << ( isInline ? QString::fromLatin1( "" ) : fullName + "::" ) + << ind << item->text( 3 ) << " " << ( isInline ? TQString::fromLatin1( "" ) : fullName + "::" ) << item->text( 4 ) << "\n" << ind << "{\n" << ind << " /// @todo implement me\n" @@ -396,18 +396,18 @@ QString AddMethodDialog::functionDefinition( QListViewItem* item ) const return str; } -QStringList AddMethodDialog::newAccessList( const QStringList& accessList ) const +TQStringList AddMethodDialog::newAccessList( const TQStringList& accessList ) const { - QStringList newAccessList; + TQStringList newAccessList; - QListViewItem* item = methods->firstChild(); + TQListViewItem* item = methods->firstChild(); while ( item ) { - QListViewItem * currentItem = item; + TQListViewItem * currentItem = item; item = item->nextSibling(); - QString access = currentItem->text( 1 ); + TQString access = currentItem->text( 1 ); if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) ) newAccessList.push_back( access ); } diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index 0b196c19..badfe537 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -31,12 +31,12 @@ class AddMethodDialog : public AddMethodDialogBase Q_OBJECT public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddMethodDialog(); virtual void addMethod(); virtual void deleteCurrentMethod(); - virtual void currentChanged( QListViewItem* item ); + virtual void currentChanged( TQListViewItem* item ); virtual void updateGUI(); virtual void browseImplementationFile(); @@ -45,10 +45,10 @@ protected: virtual void accept(); private: - QString accessID( FunctionDom fun ) const; - QString functionDeclaration( QListViewItem* item ) const; - QString functionDefinition( QListViewItem* item ) const; - QStringList newAccessList( const QStringList& accessList ) const; + TQString accessID( FunctionDom fun ) const; + TQString functionDeclaration( TQListViewItem* item ) const; + TQString functionDefinition( TQListViewItem* item ) const; + TQStringList newAccessList( const TQStringList& accessList ) const; private: CppSupportPart* m_cppSupport; diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index 841f88d4..973aee2c 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -2,120 +2,120 @@ #include "%{APPNAMELC}.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "filesave.xpm" #include "fileopen.xpm" #include "fileprint.xpm" %{APPNAME}::%{APPNAME}() - : QMainWindow( 0, "%{APPNAME}", WDestructiveClose ) + : TQMainWindow( 0, "%{APPNAME}", WDestructiveClose ) { printer = new QPrinter; - QPixmap openIcon, saveIcon, printIcon; + TQPixmap openIcon, saveIcon, printIcon; - QToolBar * fileTools = new QToolBar( this, "file operations" ); + TQToolBar * fileTools = new TQToolBar( this, "file operations" ); fileTools->setLabel( tr("File Operations") ); - openIcon = QPixmap( fileopen ); - QToolButton * fileOpen - = new QToolButton( openIcon, tr("Open File"), QString::null, - this, SLOT(choose()), fileTools, "open file" ); + openIcon = TQPixmap( fileopen ); + TQToolButton * fileOpen + = new TQToolButton( openIcon, tr("Open File"), TQString::null, + this, TQT_SLOT(choose()), fileTools, "open file" ); - saveIcon = QPixmap( filesave ); - QToolButton * fileSave - = new QToolButton( saveIcon, tr("Save File"), QString::null, - this, SLOT(save()), fileTools, "save file" ); + saveIcon = TQPixmap( filesave ); + TQToolButton * fileSave + = new TQToolButton( saveIcon, tr("Save File"), TQString::null, + this, TQT_SLOT(save()), fileTools, "save file" ); - printIcon = QPixmap( fileprint ); - QToolButton * filePrint - = new QToolButton( printIcon, tr("Print File"), QString::null, - this, SLOT(print()), fileTools, "print file" ); + printIcon = TQPixmap( fileprint ); + TQToolButton * filePrint + = new TQToolButton( printIcon, tr("Print File"), TQString::null, + this, TQT_SLOT(print()), fileTools, "print file" ); - (void)QWhatsThis::whatsThisButton( fileTools ); + (void)TQWhatsThis::whatsThisButton( fileTools ); - QString fileOpenText = tr("

    " + TQString fileOpenText = tr("

    " "Click this button to open a new file.
    " "You can also select the Open command " "from the File menu.

    "); - QWhatsThis::add( fileOpen, fileOpenText ); + TQWhatsThis::add( fileOpen, fileOpenText ); - QMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); + TQMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); - QString fileSaveText = tr("

    Click this button to save the file you " + TQString fileSaveText = tr("

    Click this button to save the file you " "are editing. You will be prompted for a file name.\n" "You can also select the Save command " "from the File menu.

    "); - QWhatsThis::add( fileSave, fileSaveText ); + TQWhatsThis::add( fileSave, fileSaveText ); - QString filePrintText = tr("Click this button to print the file you " + TQString filePrintText = tr("Click this button to print the file you " "are editing.\n You can also select the Print " "command from the File menu."); - QWhatsThis::add( filePrint, filePrintText ); + TQWhatsThis::add( filePrint, filePrintText ); - QPopupMenu * file = new QPopupMenu( this ); + TQPopupMenu * file = new TQPopupMenu( this ); menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, SLOT(choose()), CTRL+Key_O ); + this, TQT_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, SLOT(save()), CTRL+Key_S ); + this, TQT_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, SLOT(print()), CTRL+Key_P ); + this, TQT_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), qApp, SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); - QPopupMenu * help = new QPopupMenu( this ); + TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, SLOT(about()), Key_F1 ); - help->insertItem( tr("About &Qt"), this, SLOT(aboutQt()) ); + help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); - e = new QTextEdit( this, "editor" ); + e = new TQTextEdit( this, "editor" ); e->setFocus(); setCentralWidget( e ); statusBar()->message( tr("Ready"), 2000 ); @@ -140,7 +140,7 @@ void %{APPNAME}::newDoc() void %{APPNAME}::choose() { - QString fn = QFileDialog::getOpenFileName( QString::null, QString::null, + TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this); if ( !fn.isEmpty() ) load( fn ); @@ -149,13 +149,13 @@ void %{APPNAME}::choose() } -void %{APPNAME}::load( const QString &fileName ) +void %{APPNAME}::load( const TQString &fileName ) { - QFile f( fileName ); + TQFile f( fileName ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); + TQTextStream ts( &f ); e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); @@ -170,15 +170,15 @@ void %{APPNAME}::save() return; } - QString text = e->text(); - QFile f( filename ); + TQString text = e->text(); + TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { statusBar()->message( tr("Could not write to %1").arg(filename), 2000 ); return; } - QTextStream t( &f ); + TQTextStream t( &f ); t << text; f.close(); @@ -192,7 +192,7 @@ void %{APPNAME}::save() void %{APPNAME}::saveAs() { - QString fn = QFileDialog::getSaveFileName( QString::null, QString::null, + TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) { filename = fn; @@ -205,25 +205,25 @@ void %{APPNAME}::saveAs() void %{APPNAME}::print() { - // ###### Rewrite to use QSimpleRichText to print here as well + // ###### Rewrite to use TQSimpleRichText to print here as well const int Margin = 10; int pageNo = 1; if ( printer->setup(this) ) { // printer dialog statusBar()->message( tr("Printing...") ); - QPainter p; + TQPainter p; if( !p.begin( printer ) ) // paint on printer return; p.setFont( e->font() ); int yPos = 0; // y-position for each line - QFontMetrics fm = p.fontMetrics(); - QPaintDeviceMetrics metrics( printer ); // need width/height + TQFontMetrics fm = p.fontMetrics(); + TQPaintDeviceMetrics metrics( printer ); // need width/height // of printer surface for( int i = 0 ; i < e->lines() ; i++ ) { if ( Margin + yPos > metrics.height() - Margin ) { - QString msg( "Printing (page " ); - msg += QString::number( ++pageNo ); + TQString msg( "Printing (page " ); + msg += TQString::number( ++pageNo ); msg += ")..."; statusBar()->message( msg ); printer->newPage(); // no more room on this page @@ -242,14 +242,14 @@ void %{APPNAME}::print() } } -void %{APPNAME}::closeEvent( QCloseEvent* ce ) +void %{APPNAME}::closeEvent( TQCloseEvent* ce ) { if ( !e->isModified() ) { ce->accept(); return; } - switch( QMessageBox::information( this, tr("Qt Application Example"), + switch( TQMessageBox::information( this, tr("Qt Application Example"), tr("Do you want to save the changes" " to the document?"), tr("Yes"), tr("No"), tr("Cancel"), @@ -271,13 +271,13 @@ void %{APPNAME}::closeEvent( QCloseEvent* ce ) void %{APPNAME}::about() { - QMessageBox::about( this, tr("Qt Application Example"), + TQMessageBox::about( this, tr("Qt Application Example"), tr("This example demonstrates simple use of " - "QMainWindow,\nQMenuBar and QToolBar.")); + "TQMainWindow,\nQMenuBar and TQToolBar.")); } void %{APPNAME}::aboutQt() { - QMessageBox::aboutQt( this, tr("Qt Application Example") ); + TQMessageBox::aboutQt( this, tr("Qt Application Example") ); } diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h index 2d372da9..48bf459a 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h @@ -3,7 +3,7 @@ #ifndef %{APPNAMEUC}_H #define %{APPNAMEUC}_H -#include +#include class QTextEdit; @@ -16,12 +16,12 @@ public: ~%{APPNAME}(); protected: - void closeEvent( QCloseEvent* ); + void closeEvent( TQCloseEvent* ); private slots: void newDoc(); void choose(); - void load( const QString &fileName ); + void load( const TQString &fileName ); void save(); void saveAs(); void print(); @@ -30,9 +30,9 @@ private slots: void aboutQt(); private: - QPrinter *printer; - QTextEdit *e; - QString filename; + TQPrinter *printer; + TQTextEdit *e; + TQString filename; }; diff --git a/languages/cpp/app_templates/cmakeqt3app/main.cpp b/languages/cpp/app_templates/cmakeqt3app/main.cpp index bd26f19a..8938adc5 100644 --- a/languages/cpp/app_templates/cmakeqt3app/main.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/main.cpp @@ -1,13 +1,13 @@ %{CPP_TEMPLATE} -#include +#include #include "%{APPNAMELC}.h" int main( int argc, char ** argv ) { - QApplication a( argc, argv ); + TQApplication a( argc, argv ); %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); + a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp index a23da01b..32f32c65 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp +++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp @@ -7,7 +7,7 @@ %{APPNAME}::%{APPNAME}() : DCOPObject("serviceInterface") { kdDebug() << "Starting new service... " << endl; - m_List = QStringList(); + m_List = TQStringList(); } %{APPNAME}::~%{APPNAME}() @@ -15,25 +15,25 @@ kdDebug() << "Going away... " << endl; } -QString %{APPNAME}::string(int idx) +TQString %{APPNAME}::string(int idx) { return *m_List.at(idx); } -QStringList %{APPNAME}::list() +TQStringList %{APPNAME}::list() { return m_List; } -void %{APPNAME}::add(QString arg) +void %{APPNAME}::add(TQString arg) { kdDebug() << "Adding " << arg << " to the list" << endl; m_List << arg; } -bool %{APPNAME}::remove(QString arg) +bool %{APPNAME}::remove(TQString arg) { - QStringList::Iterator it = m_List.find(arg); + TQStringList::Iterator it = m_List.find(arg); if (it != m_List.end()) { m_List.remove(it); diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.h b/languages/cpp/app_templates/dcopservice/dcopservice.h index 4e9eda87..59aa3c28 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.h +++ b/languages/cpp/app_templates/dcopservice/dcopservice.h @@ -3,8 +3,8 @@ #ifndef _%{APPNAME}_H #define _%{APPNAME}_H -#include -#include +#include +#include #include class %{APPNAME} : public DCOPObject @@ -12,7 +12,7 @@ class %{APPNAME} : public DCOPObject K_DCOP private: - QStringList m_List; + TQStringList m_List; public: %{APPNAME}(); @@ -20,13 +20,13 @@ class %{APPNAME} : public DCOPObject ~%{APPNAME}(); k_dcop: - QString string(int); + TQString string(int); - QStringList list(); + TQStringList list(); - void add(QString); + void add(TQString); - bool remove(QString); + bool remove(TQString); bool exit(); diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 5460bba9..6388f452 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -3,10 +3,10 @@ #include "%{APPNAMELC}.h" #include "pref.h" -#include +#include #include -#include -#include +#include +#include #include #include @@ -49,10 +49,10 @@ setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); } @@ -62,7 +62,7 @@ void %{APPNAME}::load(const KURL& url) { - QString target; + TQString target; // the below code is what you should normally do. in this // example case, we want the url to our own. you probably // want to use this code instead for your app @@ -88,19 +88,19 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); - KStdAction::print(this, SLOT(filePrint()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0, - this, SLOT(optionsPreferences()), + this, TQT_SLOT(optionsPreferences()), actionCollection(), "custom_action"); } @@ -126,19 +126,19 @@ void %{APPNAME}::readProperties(KConfig *config) // the app is being restored. read in here whatever you wrote // in 'saveProperties' - QString url = config->readPathEntry("lastURL"); + TQString url = config->readPathEntry("lastURL"); if (!url.isEmpty()) m_view->openURL(KURL(url)); } -void %{APPNAME}::dragEnterEvent(QDragEnterEvent *event) +void %{APPNAME}::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void %{APPNAME}::dropEvent(QDropEvent *event) +void %{APPNAME}::dropEvent(TQDropEvent *event) { // this is a very simplistic implementation of a drop event. we // will only accept a dropped URL. the Qt dnd code can do *much* @@ -173,10 +173,10 @@ void %{APPNAME}::fileOpen() // button is clicked /* // this brings up the generic open dialog - KURL url = KURLRequesterDlg::getURL(QString::null, this, i18n("Open Location") ); + KURL url = KURLRequesterDlg::getURL(TQString::null, this, i18n("Open Location") ); */ // standard filedialog - KURL url = KFileDialog::getOpenURL(QString::null, QString::null, this, i18n("Open Location")); + KURL url = KFileDialog::getOpenURL(TQString::null, TQString::null, this, i18n("Open Location")); if (!url.isEmpty()) m_view->openURL(url); } @@ -209,13 +209,13 @@ void %{APPNAME}::filePrint() if (m_printer->setup(this)) { // setup the printer. with Qt, you always "print" to a - // QPainter.. whether the output medium is a pixmap, a screen, + // TQPainter.. whether the output medium is a pixmap, a screen, // or paper - QPainter p; + TQPainter p; p.begin(m_printer); // we let our view do the actual printing - QPaintDeviceMetrics metrics(m_printer); + TQPaintDeviceMetrics metrics(m_printer); m_view->print(&p, metrics.height(), metrics.width()); // and send the result to the printer @@ -233,13 +233,13 @@ void %{APPNAME}::optionsPreferences() } } -void %{APPNAME}::changeStatusbar(const QString& text) +void %{APPNAME}::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text); } -void %{APPNAME}::changeCaption(const QString& text) +void %{APPNAME}::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h index 45c65f4b..1c92feb8 100644 --- a/languages/cpp/app_templates/kapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h @@ -46,8 +46,8 @@ protected: /** * Overridden virtuals for Qt drag 'n drop (XDND) */ - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); protected: /** @@ -72,8 +72,8 @@ private slots: void filePrint(); void optionsPreferences(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); private: void setupAccel(); diff --git a/languages/cpp/app_templates/kapp/app_client.cpp b/languages/cpp/app_templates/kapp/app_client.cpp index 5c062077..ecde60fb 100644 --- a/languages/cpp/app_templates/kapp/app_client.cpp +++ b/languages/cpp/app_templates/kapp/app_client.cpp @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char **argv) { @@ -14,13 +14,13 @@ int main(int argc, char **argv) client->attach(); // do a 'send' for now - QByteArray data; - QDataStream ds(data, IO_WriteOnly); + TQByteArray data; + TQDataStream ds(data, IO_WriteOnly); if (argc > 1) - ds << QString(argv[1]); + ds << TQString(argv[1]); else - ds << QString("http://www.kde.org"); - client->send("%{APPNAMELC}", "%{APPNAME}Iface", "openURL(QString)", data); + ds << TQString("http://www.kde.org"); + client->send("%{APPNAMELC}", "%{APPNAME}Iface", "openURL(TQString)", data); return app.exec(); } diff --git a/languages/cpp/app_templates/kapp/appiface.h b/languages/cpp/app_templates/kapp/appiface.h index 4a24ae7f..9fa7cd1b 100644 --- a/languages/cpp/app_templates/kapp/appiface.h +++ b/languages/cpp/app_templates/kapp/appiface.h @@ -11,7 +11,7 @@ class %{APPNAME}Iface : virtual public DCOPObject public: k_dcop: - virtual void openURL(QString url) = 0; + virtual void openURL(TQString url) = 0; }; #endif // _%{APPNAMEUC}IFACE_H_ diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index a57adbf3..32afca2e 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -2,8 +2,8 @@ #include "%{APPNAMELC}view.h" -#include -#include +#include +#include #include @@ -13,12 +13,12 @@ #include #include -%{APPNAME}View::%{APPNAME}View(QWidget *parent) - : QWidget(parent), +%{APPNAME}View::%{APPNAME}View(TQWidget *parent) + : TQWidget(parent), DCOPObject("%{APPNAME}Iface") { // setup our layout manager to automatically add our widgets - QHBoxLayout *top_layout = new QHBoxLayout(this); + TQHBoxLayout *top_layout = new TQHBoxLayout(this); top_layout->setAutoAdd(true); // we want to look for all components that satisfy our needs. the @@ -63,10 +63,10 @@ return; } - connect(m_html, SIGNAL(setWindowCaption(const QString&)), - this, SLOT(slotSetTitle(const QString&))); - connect(m_html, SIGNAL(setStatusBarText(const QString&)), - this, SLOT(slotOnURL(const QString&))); + connect(m_html, TQT_SIGNAL(setWindowCaption(const TQString&)), + this, TQT_SLOT(slotSetTitle(const TQString&))); + connect(m_html, TQT_SIGNAL(setStatusBarText(const TQString&)), + this, TQT_SLOT(slotOnURL(const TQString&))); } @@ -74,18 +74,18 @@ { } -void %{APPNAME}View::print(QPainter *p, int height, int width) +void %{APPNAME}View::print(TQPainter *p, int height, int width) { // do the actual printing, here // p->drawText(etc..) } -QString %{APPNAME}View::currentURL() +TQString %{APPNAME}View::currentURL() { return m_html->url().url(); } -void %{APPNAME}View::openURL(QString url) +void %{APPNAME}View::openURL(TQString url) { openURL(KURL(url)); } @@ -95,12 +95,12 @@ void %{APPNAME}View::openURL(const KURL& url) m_html->openURL(url); } -void %{APPNAME}View::slotOnURL(const QString& url) +void %{APPNAME}View::slotOnURL(const TQString& url) { emit signalChangeStatusbar(url); } -void %{APPNAME}View::slotSetTitle(const QString& title) +void %{APPNAME}View::slotSetTitle(const TQString& title) { emit signalChangeCaption(title); } diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index ae0c6b6d..236749bc 100644 --- a/languages/cpp/app_templates/kapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}VIEW_H_ #define _%{APPNAMEUC}VIEW_H_ -#include +#include #include #include <%{APPNAMELC}iface.h> @@ -21,14 +21,14 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME}View : public QWidget, public %{APPNAME}Iface +class %{APPNAME}View : public TQWidget, public %{APPNAME}Iface { Q_OBJECT public: /** * Default constructor */ - %{APPNAME}View(QWidget *parent); + %{APPNAME}View(TQWidget *parent); /** * Destructor @@ -38,12 +38,12 @@ public: /** * Random 'get' function */ - QString currentURL(); + TQString currentURL(); /** * Random 'set' function accessed by DCOP */ - virtual void openURL(QString url); + virtual void openURL(TQString url); /** * Random 'set' function @@ -53,22 +53,22 @@ public: /** * Print this view to any medium -- paper or not */ - void print(QPainter *, int height, int width); + void print(TQPainter *, int height, int width); signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); private slots: - void slotOnURL(const QString& url); - void slotSetTitle(const QString& title); + void slotOnURL(const TQString& url); + void slotSetTitle(const TQString& title); private: KParts::ReadOnlyPart *m_html; diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index ee647b1c..ff83190f 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -4,8 +4,8 @@ #include -#include -#include +#include +#include %{APPNAME}Preferences::%{APPNAME}Preferences() : KDialogBase(TreeList, i18n("%{APPNAME} Preferences"), @@ -14,7 +14,7 @@ // this is the base class for your preferences dialog. it is now // a Treelist dialog.. but there are a number of other // possibilities (including Tab, Swallow, and just Plain) - QFrame *frame; + TQFrame *frame; frame = addPage(i18n("First Page"), i18n("Page One Options")); m_pageOne = new %{APPNAME}PrefPageOne(frame); @@ -22,21 +22,21 @@ m_pageTwo = new %{APPNAME}PrefPageTwo(frame); } -%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(QWidget *parent) - : QFrame(parent) +%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent) + : TQFrame(parent) { - QHBoxLayout *layout = new QHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); layout->setAutoAdd(true); - new QLabel(i18n("Add something here"), this); + new TQLabel(i18n("Add something here"), this); } -%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(QWidget *parent) - : QFrame(parent) +%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent) + : TQFrame(parent) { - QHBoxLayout *layout = new QHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); layout->setAutoAdd(true); - new QLabel(i18n("Add something here"), this); + new TQLabel(i18n("Add something here"), this); } #include "pref.moc" diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h index 11aec821..93859cfd 100644 --- a/languages/cpp/app_templates/kapp/pref.h +++ b/languages/cpp/app_templates/kapp/pref.h @@ -4,7 +4,7 @@ #define _%{APPNAMEUC}PREF_H_ #include -#include +#include class %{APPNAME}PrefPageOne; class %{APPNAME}PrefPageTwo; @@ -24,14 +24,14 @@ class %{APPNAME}PrefPageOne : public QFrame { Q_OBJECT public: - %{APPNAME}PrefPageOne(QWidget *parent = 0); + %{APPNAME}PrefPageOne(TQWidget *parent = 0); }; class %{APPNAME}PrefPageTwo : public QFrame { Q_OBJECT public: - %{APPNAME}PrefPageTwo(QWidget *parent = 0); + %{APPNAME}PrefPageTwo(TQWidget *parent = 0); }; #endif // _%{APPNAMEUC}PREF_H_ diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 9fd4a694..1a40df32 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -33,14 +33,14 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -QObject* KatePluginFactory::createObject( QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { return new KatePlugin%{APPNAME}( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( QObject* parent, const char* name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ) { } @@ -55,7 +55,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction ( i18n("Insert Hello World"), 0, this, - SLOT( slotInsertHello() ), view->actionCollection(), + TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new KInstance("kate")); diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 8cc5b237..879ff967 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -22,7 +22,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, const char* name = "QObject", const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -33,7 +33,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - KatePlugin%{APPNAME}( QObject* parent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); @@ -43,7 +43,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface void slotInsertHello(); private: - QPtrList m_views; + TQPtrList m_views; }; #endif // _PLUGIN_%{APPNAMEUC}_H_ diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 99d78eff..18595d10 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include class PluginView : public KXMLGUIClient { @@ -37,14 +37,14 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -QObject* KatePluginFactory::createObject( QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { return new KatePlugin%{APPNAME}( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( QObject* parent, const char* name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ) { } @@ -59,7 +59,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction ( i18n("Insert Hello World"), 0, this, - SLOT( slotInsertHello() ), view->actionCollection(), + TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new KInstance("kate")); @@ -90,11 +90,11 @@ void KatePlugin%{APPNAME}::slotInsertHello() kv->insertText ("Hello World"); } -Kate::PluginConfigPage* KatePlugin%{APPNAME}::configPage (uint, QWidget *w, const char* name) +Kate::PluginConfigPage* KatePlugin%{APPNAME}::configPage (uint, TQWidget *w, const char* name) { %{APPNAME}ConfigPage* p = new %{APPNAME}ConfigPage(this, w); initConfigPage( p ); - connect( p, SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); + connect( p, TQT_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQT_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -114,17 +114,17 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) /** * %{APPNAME}ConfigPage */ -%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (QObject* parent /*= 0L*/, QWidget *parentWidget /*= 0L*/) +%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* parent /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { - QVBoxLayout* lo = new QVBoxLayout( this, 0, 0, "config_page_layout" ); + TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" ); lo->setSpacing(KDialogBase::spacingHint()); - QLabel* lab = new QLabel("KatePlugin%{APPNAME}'s config page", this); + TQLabel* lab = new TQLabel("KatePlugin%{APPNAME}'s config page", this); lo->addWidget(lab); - // TODO: add connection to emit SLOT( changed() ) + // TODO: add connection to emit TQT_SLOT( changed() ) } %{APPNAME}ConfigPage::~%{APPNAME}ConfigPage() diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index e4f97d00..6ad068d4 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -26,7 +26,7 @@ public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, const char* name = "QObject", const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -37,7 +37,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kat Q_OBJECT public: - KatePlugin%{APPNAME}( QObject* parent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); @@ -45,10 +45,10 @@ public: /** overwrite some functions */ uint configPages () const { return 1; } - Kate::PluginConfigPage *configPage (uint , QWidget *w, const char *name=0); - QString configPageName(uint) const { return i18n("%{APPNAME}"); }; - QString configPageFullName(uint) const { return i18n("Configure KatePlugin%{APPNAME}"); }; - QPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const { return 0L; }; + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + TQString configPageName(uint) const { return i18n("%{APPNAME}"); }; + TQString configPageFullName(uint) const { return i18n("Configure KatePlugin%{APPNAME}"); }; + TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const { return 0L; }; public slots: void slotInsertHello(); @@ -58,7 +58,7 @@ private: void initConfigPage( %{APPNAME}ConfigPage* ); private: - QPtrList m_views; + TQPtrList m_views; }; @@ -68,7 +68,7 @@ class %{APPNAME}ConfigPage : public Kate::PluginConfigPage friend class KatePlugin%{APPNAME}; public: - %{APPNAME}ConfigPage (QObject* parent = 0L, QWidget *parentWidget = 0L); + %{APPNAME}ConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~%{APPNAME}ConfigPage (); /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ). */ diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp index 69e87692..bb15b923 100644 --- a/languages/cpp/app_templates/kcmodule/module.cpp +++ b/languages/cpp/app_templates/kcmodule/module.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include +#include #include #include @@ -8,10 +8,10 @@ #include "%{APPNAMELC}.h" -typedef KGenericFactory<%{APPNAME}, QWidget> %{APPNAME}Factory; +typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}")) -%{APPNAME}::%{APPNAME}(QWidget *parent, const char *name, const QStringList&) +%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&) : KCModule(parent, name), myAboutData(0) { // place widgets here @@ -57,7 +57,7 @@ void %{APPNAME}::configChanged() } -QString %{APPNAME}::quickHelp() const +TQString %{APPNAME}::quickHelp() const { return i18n("Helpful information about the %{APPNAMELC} module."); } diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h index cebf0f48..7f539c60 100644 --- a/languages/cpp/app_templates/kcmodule/module.h +++ b/languages/cpp/app_templates/kcmodule/module.h @@ -11,14 +11,14 @@ class %{APPNAME}: public KCModule Q_OBJECT public: - %{APPNAME}( QWidget *parent=0, const char *name=0, const QStringList& = QStringList() ); + %{APPNAME}( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); ~%{APPNAME}(); virtual void load(); virtual void save(); virtual void defaults(); virtual int buttons(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; virtual const KAboutData *aboutData()const { return myAboutData; }; diff --git a/languages/cpp/app_templates/kconfig35/app.cpp b/languages/cpp/app_templates/kconfig35/app.cpp index e32e28b5..e18b4148 100644 --- a/languages/cpp/app_templates/kconfig35/app.cpp +++ b/languages/cpp/app_templates/kconfig35/app.cpp @@ -4,7 +4,7 @@ #include "settings.h" #include "prefs.h" -#include +#include #include #include @@ -34,10 +34,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); } @@ -47,14 +47,14 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, - m_view, SLOT(switchColors()), + m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); setupGUI(); @@ -75,17 +75,17 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, SIGNAL(settingsChanged()), m_view, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); dialog->show(); } -void %{APPNAMELC}::changeCaption(const QString& text) +void %{APPNAMELC}::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); } -void %{APPNAMELC}::changeStatusbar(const QString& text) +void %{APPNAMELC}::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text); diff --git a/languages/cpp/app_templates/kconfig35/app.h b/languages/cpp/app_templates/kconfig35/app.h index abfd6c09..0174aa1b 100644 --- a/languages/cpp/app_templates/kconfig35/app.h +++ b/languages/cpp/app_templates/kconfig35/app.h @@ -43,8 +43,8 @@ private slots: void optionsPreferences(); void newToolbarConfig(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); private: diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp index 35e23682..30d627fe 100644 --- a/languages/cpp/app_templates/kconfig35/appview.cpp +++ b/languages/cpp/app_templates/kconfig35/appview.cpp @@ -4,9 +4,9 @@ #include "settings.h" #include -#include +#include -%{APPNAMELC}View::%{APPNAMELC}View(QWidget *parent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) : %{APPNAMELC}view_base(parent) { settingsChanged(); @@ -20,7 +20,7 @@ void %{APPNAMELC}View::switchColors() { // switch the foreground/background colors of the label - QColor color = Settings::col_background(); + TQColor color = Settings::col_background(); Settings::setCol_background( Settings::col_foreground() ); Settings::setCol_foreground( color ); diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/kconfig35/appview.h index 45a10de7..5b69ae24 100644 --- a/languages/cpp/app_templates/kconfig35/appview.h +++ b/languages/cpp/app_templates/kconfig35/appview.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}VIEW_H_ #define _%{APPNAMEUC}VIEW_H_ -#include +#include #include "%{APPNAMELC}view_base.h" @@ -26,7 +26,7 @@ public: /** * Default constructor */ - %{APPNAMELC}View(QWidget *parent); + %{APPNAMELC}View(TQWidget *parent); /** * Destructor @@ -37,12 +37,12 @@ signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); private slots: void switchColors(); diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index c11a58d1..b8849a58 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4.cpp @@ -4,8 +4,8 @@ #include "%{APPNAMELC}view.h" #include "settings.h" -#include -#include +#include +#include #include #include @@ -47,15 +47,15 @@ void %{APPNAME}::setupActions() { - KStandardAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStandardAction::quit(qApp, SLOT(quit()), actionCollection()); + KStandardAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStandardAction::quit(qApp, TQT_SLOT(quit()), actionCollection()); - KStandardAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View KAction *custom = new KAction(KIcon("colorize"), i18n("Swi&tch Colors"), this); actionCollection()->addAction( QLatin1String("switch_action"), custom ); - connect(custom, SIGNAL(triggered(bool)), m_view, SLOT(switchColors())); + connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors())); } void %{APPNAME}::fileNew() @@ -79,10 +79,10 @@ void %{APPNAME}::optionsPreferences() return; } KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self()); - QWidget *generalSettingsDlg = new QWidget; + TQWidget *generalSettingsDlg = new QWidget; ui_prefs_base.setupUi(generalSettingsDlg); dialog->addPage(generalSettingsDlg, i18n("General"), "package_setting"); - connect(dialog, SIGNAL(settingsChanged(QString)), m_view, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged(TQString)), m_view, TQT_SLOT(settingsChanged())); dialog->setAttribute( Qt::WA_DeleteOnClose ); dialog->show(); } diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp index 256f6bcb..785a6858 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4view.cpp @@ -3,9 +3,9 @@ #include "settings.h" #include -#include +#include -%{APPNAME}View::%{APPNAME}View(QWidget *) +%{APPNAME}View::%{APPNAME}View(TQWidget *) { ui_%{APPNAMELC}view_base.setupUi(this); settingsChanged(); @@ -20,7 +20,7 @@ void %{APPNAME}View::switchColors() { // switch the foreground/background colors of the label - QColor color = Settings::col_background(); + TQColor color = Settings::col_background(); Settings::setCol_background( Settings::col_foreground() ); Settings::setCol_foreground( color ); @@ -29,9 +29,9 @@ void %{APPNAME}View::switchColors() void %{APPNAME}View::settingsChanged() { - QPalette pal; - pal.setColor( QPalette::Window, Settings::col_background()); - pal.setColor( QPalette::WindowText, Settings::col_foreground()); + TQPalette pal; + pal.setColor( TQPalette::Window, Settings::col_background()); + pal.setColor( TQPalette::WindowText, Settings::col_foreground()); ui_%{APPNAMELC}view_base.kcfg_sillyLabel->setPalette( pal ); // i18n : internationalization diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h index ab08445f..9572b914 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view.h +++ b/languages/cpp/app_templates/kde4app/kapp4view.h @@ -2,7 +2,7 @@ #ifndef %{APPNAMELC}VIEW_H #define %{APPNAMELC}VIEW_H -#include +#include #include "ui_%{APPNAMELC}view_base.h" @@ -19,14 +19,14 @@ class KUrl; * @version %{VERSION} */ -class %{APPNAME}View : public QWidget, public Ui::%{APPNAMELC}view_base +class %{APPNAME}View : public TQWidget, public Ui::%{APPNAMELC}view_base { Q_OBJECT public: /** * Default constructor */ - %{APPNAME}View(QWidget *parent); + %{APPNAME}View(TQWidget *parent); /** * Destructor @@ -40,12 +40,12 @@ signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); private slots: void switchColors(); diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp index e295253a..e4fa554f 100644 --- a/languages/cpp/app_templates/kdedcop/app.cpp +++ b/languages/cpp/app_templates/kdedcop/app.cpp @@ -2,7 +2,7 @@ #include "%{APPNAMELC}.h" -#include +#include #include #include diff --git a/languages/cpp/app_templates/kdedcop/app_iface.h b/languages/cpp/app_templates/kdedcop/app_iface.h index 57bfb059..7049c712 100644 --- a/languages/cpp/app_templates/kdedcop/app_iface.h +++ b/languages/cpp/app_templates/kdedcop/app_iface.h @@ -10,10 +10,10 @@ class DCOPDemoIface : virtual public DCOPObject // Here you should place your DCOP interface. // Below are four example methods. - virtual QString strVal() const = 0; + virtual TQString strVal() const = 0; virtual int intVal() const = 0; virtual void setIntVal( int num ) = 0; - virtual void setStrVal( const QString &str ) = 0; + virtual void setStrVal( const TQString &str ) = 0; }; diff --git a/languages/cpp/app_templates/kdedcop/mainclass.cpp b/languages/cpp/app_templates/kdedcop/mainclass.cpp index 8f334114..a5e0d6a5 100644 --- a/languages/cpp/app_templates/kdedcop/mainclass.cpp +++ b/languages/cpp/app_templates/kdedcop/mainclass.cpp @@ -14,7 +14,7 @@ MainClass::~MainClass() { } -void MainClass::setStrVal(const QString & str) { +void MainClass::setStrVal(const TQString & str) { m_strValue = str; } @@ -22,7 +22,7 @@ void MainClass::setIntVal(int val) { m_intValue = val; } -QString MainClass::strVal() const { +TQString MainClass::strVal() const { return m_strValue; } diff --git a/languages/cpp/app_templates/kdedcop/mainclass.h b/languages/cpp/app_templates/kdedcop/mainclass.h index ca37f2ad..13504f82 100644 --- a/languages/cpp/app_templates/kdedcop/mainclass.h +++ b/languages/cpp/app_templates/kdedcop/mainclass.h @@ -18,13 +18,13 @@ public: // Here is the implementation of the example DCOP interface methods. - virtual void setStrVal(const QString &); + virtual void setStrVal(const TQString &); virtual void setIntVal(int); - virtual QString strVal() const; + virtual TQString strVal() const; virtual int intVal() const; private: - QString m_strValue; + TQString m_strValue; int m_intValue; }; diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 9d5cadcf..364ec0d7 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -1,7 +1,7 @@ %{CPP_TEMPLATE} -#include -#include +#include +#include #include #include @@ -21,24 +21,24 @@ typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) ); static const KDevPluginInfo data("kdev%{APPNAMELC}"); -%{APPNAME}Part::%{APPNAME}Part(QObject *parent, const char *name, const QStringList& ) +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& ) : KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdevlang_%{APPNAMELC}.rc"); - m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); kdDebug() << "Creating %{APPNAMELC} Part" << endl; - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), this, SLOT(savedFile(const KURL&)) ); - connect(partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part *))); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); + connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); } @@ -74,14 +74,14 @@ void %{APPNAME}Part::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - QTimer::singleShot(0, this, SLOT(parse())); + TQTimer::singleShot(0, this, TQT_SLOT(parse())); } void %{APPNAME}Part::projectClosed() { @@ -97,11 +97,11 @@ void %{APPNAME}Part::savedFile(const KURL &fileName) emit addedSourceInfo( fileName.path() ); } } -void %{APPNAME}Part::addedFilesToProject(const QStringList &fileList) +void %{APPNAME}Part::addedFilesToProject(const TQStringList &fileList) { kdDebug(9014) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -110,15 +110,15 @@ void %{APPNAME}Part::addedFilesToProject(const QStringList &fileList) emit updatedSourceInfo(); } -void %{APPNAME}Part::removedFilesFromProject(const QStringList &fileList) +void %{APPNAME}Part::removedFilesFromProject(const TQStringList &fileList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); if( codeModel()->hasFile(fileName) ) { kdDebug(9014) << "removed " << fileName << endl; @@ -135,8 +135,8 @@ void %{APPNAME}Part::parse() if (project()) { kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) + TQStringList files = project()->allFiles(); + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; } diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index 25721d64..d6d92ff6 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include class KAction; @@ -19,7 +19,7 @@ class %{APPNAME}Part : public KDevLanguageSupport { Q_OBJECT public: - %{APPNAME}Part(QObject *parent, const char *name, const QStringList &); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &); ~%{APPNAME}Part(); protected: virtual Features features(); @@ -31,8 +31,8 @@ class %{APPNAME}Part : public KDevLanguageSupport void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void parse(); void slotActivePartChanged(KParts::Part *part); private: diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp index 12396fec..cddf3e7e 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/globalconfig.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, QWidget *parent, const char *name) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h index 1b321cd2..aea1cbea 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart/globalconfig.h @@ -10,7 +10,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { Q_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, QWidget *parent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index dd86843d..082549c4 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -1,9 +1,9 @@ %{CPP_TEMPLATE} #include "%{APPNAMELC}part.h" -#include -#include -#include +#include +#include +#include #include #include @@ -28,7 +28,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(QObject *parent, const char *name, const QStringList &/*args*/) +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); @@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); m_widget->setCaption("widget caption"); m_widget->setIcon(SmallIcon(info()->icon())); - QWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); + TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int))); + connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *))); - connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened())); - connect(core(), SIGNAL(projectClosed()), this, SLOT(projectClosed())); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); - QTimer::singleShot(0, this, SLOT(init())); + TQTimer::singleShot(0, this, TQT_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,12 +92,12 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new KAction(i18n("&Do Something..."), 0, - this, SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("Do something

    Describe here what does this action do.")); } -void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo) +void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) { // create configuraton dialogs here switch (pageNo) @@ -105,19 +105,19 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, QWidget *page, u case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } } } -void %{APPNAME}Part::contextMenu(QPopupMenu *popup, const Context *context) +void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) { // put actions into the context menu here if (context->hasType(Context::EditorContext)) @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(QPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, SLOT(doSomething()) ); + // this, TQT_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("Do something here

    Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index 168b8a40..246e539d 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -4,7 +4,7 @@ #include -#include +#include class QPopupMenu; class KAction; @@ -20,14 +20,14 @@ class %{APPNAME}Part: public KDevPlugin { Q_OBJECT public: - %{APPNAME}Part(QObject *parent, const char *name, const QStringList &args); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: void init(); - void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo); - void contextMenu(QPopupMenu *popup, const Context *context); + void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo); + void contextMenu(TQPopupMenu *popup, const Context *context); void projectOpened(); void projectClosed(); @@ -38,7 +38,7 @@ private: KAction *action; - QGuardedPtr<%{APPNAME}Widget> m_widget; + TQGuardedPtr<%{APPNAME}Widget> m_widget; ConfigWidgetProxy *m_configProxy; }; diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp index 0c05b976..1fe3558c 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp @@ -10,7 +10,7 @@ #include "%{APPNAMELC}part.h" %{APPNAME}Widget::%{APPNAME}Widget(%{APPNAME}Part *part) - : QWidget(0, "%{APPNAMELC} widget"), m_part(part) + : TQWidget(0, "%{APPNAMELC} widget"), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h index e29e29d2..308c3e7e 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h @@ -2,8 +2,8 @@ #ifndef %{APPNAMEUC}_WIDGET_H #define %{APPNAMEUC}_WIDGET_H -#include -#include +#include +#include class KDevProject; class %{APPNAME}Part; diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp index 5f07993b..42a9f3e7 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/projectconfig.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, QWidget *parent, const char *name) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h index ec3ff4df..0ab0cb35 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart/projectconfig.h @@ -10,7 +10,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { Q_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, QWidget *parent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp index 12396fec..cddf3e7e 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, QWidget *parent, const char *name) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index 1b321cd2..aea1cbea 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h @@ -10,7 +10,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { Q_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, QWidget *parent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index dd86843d..082549c4 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -1,9 +1,9 @@ %{CPP_TEMPLATE} #include "%{APPNAMELC}part.h" -#include -#include -#include +#include +#include +#include #include #include @@ -28,7 +28,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(QObject *parent, const char *name, const QStringList &/*args*/) +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); @@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); m_widget->setCaption("widget caption"); m_widget->setIcon(SmallIcon(info()->icon())); - QWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); + TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int))); + connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *))); - connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened())); - connect(core(), SIGNAL(projectClosed()), this, SLOT(projectClosed())); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); - QTimer::singleShot(0, this, SLOT(init())); + TQTimer::singleShot(0, this, TQT_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,12 +92,12 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new KAction(i18n("&Do Something..."), 0, - this, SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("Do something

    Describe here what does this action do.")); } -void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo) +void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) { // create configuraton dialogs here switch (pageNo) @@ -105,19 +105,19 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, QWidget *page, u case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); break; } } } -void %{APPNAME}Part::contextMenu(QPopupMenu *popup, const Context *context) +void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) { // put actions into the context menu here if (context->hasType(Context::EditorContext)) @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(QPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, SLOT(doSomething()) ); + // this, TQT_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("Do something here

    Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index 168b8a40..246e539d 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -4,7 +4,7 @@ #include -#include +#include class QPopupMenu; class KAction; @@ -20,14 +20,14 @@ class %{APPNAME}Part: public KDevPlugin { Q_OBJECT public: - %{APPNAME}Part(QObject *parent, const char *name, const QStringList &args); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: void init(); - void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo); - void contextMenu(QPopupMenu *popup, const Context *context); + void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo); + void contextMenu(TQPopupMenu *popup, const Context *context); void projectOpened(); void projectClosed(); @@ -38,7 +38,7 @@ private: KAction *action; - QGuardedPtr<%{APPNAME}Widget> m_widget; + TQGuardedPtr<%{APPNAME}Widget> m_widget; ConfigWidgetProxy *m_configProxy; }; diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp index 0c05b976..1fe3558c 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp @@ -10,7 +10,7 @@ #include "%{APPNAMELC}part.h" %{APPNAME}Widget::%{APPNAME}Widget(%{APPNAME}Part *part) - : QWidget(0, "%{APPNAMELC} widget"), m_part(part) + : TQWidget(0, "%{APPNAMELC} widget"), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h index e29e29d2..308c3e7e 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h @@ -2,8 +2,8 @@ #ifndef %{APPNAMEUC}_WIDGET_H #define %{APPNAMEUC}_WIDGET_H -#include -#include +#include +#include class KDevProject; class %{APPNAME}Part; diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp index 5f07993b..42a9f3e7 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, QWidget *parent, const char *name) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index ec3ff4df..0ab0cb35 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h @@ -10,7 +10,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { Q_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, QWidget *parent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp index 3e6b849a..db259cb3 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp @@ -6,15 +6,15 @@ #include //#include -//#include -//#include +//#include +//#include typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" )) -%{APPNAME}Plugin::%{APPNAME}Plugin(QObject *parent, const char *name, - const QStringList &args) +%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { //add the mimetype here - example: @@ -28,12 +28,12 @@ K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAME KFileMimeTypeInfo::ItemInfo* item; // our new items in the group - item = addItemInfo(group, "Items", i18n("Items"), QVariant::Int); - item = addItemInfo(group, "Size", i18n("Size"), QVariant::Int); + item = addItemInfo(group, "Items", i18n("Items"), TQVariant::Int); + item = addItemInfo(group, "Size", i18n("Size"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::KiloBytes); // strings are possible, too: - //addItemInfo(group, "Text", i18n("Document Type"), QVariant::String); + //addItemInfo(group, "Text", i18n("Document Type"), TQVariant::String); } bool %{APPNAME}Plugin::readInfo( KFileMetaInfo& info, uint /*what*/) diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h index 358b4dcb..8a0355f1 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h @@ -15,7 +15,7 @@ class %{APPNAME}Plugin: public KFilePlugin Q_OBJECT public: - %{APPNAME}Plugin( QObject *parent, const char *name, const QStringList& args ); + %{APPNAME}Plugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/languages/cpp/app_templates/khello/app.cpp b/languages/cpp/app_templates/khello/app.cpp index 44332685..811f9337 100644 --- a/languages/cpp/app_templates/khello/app.cpp +++ b/languages/cpp/app_templates/khello/app.cpp @@ -2,7 +2,7 @@ #include "%{APPNAMELC}.h" -#include +#include #include #include @@ -13,7 +13,7 @@ // set the shell's ui resource file setXMLFile("%{APPNAMELC}ui.rc"); - new QLabel( "Hello World", this, "hello label" ); + new TQLabel( "Hello World", this, "hello label" ); } %{APPNAME}::~%{APPNAME}() diff --git a/languages/cpp/app_templates/khello2/widget.cpp b/languages/cpp/app_templates/khello2/widget.cpp index 6775ac39..266e894f 100644 --- a/languages/cpp/app_templates/khello2/widget.cpp +++ b/languages/cpp/app_templates/khello2/widget.cpp @@ -1,10 +1,10 @@ %{CPP_TEMPLATE} -#include +#include #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget(QWidget* parent, const char* name, WFlags fl) +%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* parent, const char* name, WFlags fl) : %{APPNAME}WidgetBase(parent,name,fl) {} diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h index 275e13c7..50d7a721 100644 --- a/languages/cpp/app_templates/khello2/widget.h +++ b/languages/cpp/app_templates/khello2/widget.h @@ -10,7 +10,7 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase Q_OBJECT public: - %{APPNAME}Widget(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}Widget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}Widget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp index 5345ac0c..29ec3d1d 100644 --- a/languages/cpp/app_templates/kicker/applet.cpp +++ b/languages/cpp/app_templates/kicker/applet.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include +#include #include #include #include @@ -10,12 +10,12 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(const QString& configFile, Type type, int actions, QWidget *parent, const char *name) +%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name) { // Get the current application configuration handle ksConfig = config(); - QLCDNumber *w = new QLCDNumber(this); + TQLCDNumber *w = new TQLCDNumber(this); w->display(42); mainView = w; @@ -55,14 +55,14 @@ int %{APPNAME}::heightForWidth(int width) const return height(); } -void %{APPNAME}::resizeEvent(QResizeEvent *e) +void %{APPNAME}::resizeEvent(TQResizeEvent *e) { } extern "C" { - KPanelApplet* init( QWidget *parent, const QString& configFile) + KPanelApplet* init( TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}(configFile, KPanelApplet::Normal, diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h index b078b2a4..ba4d6cd4 100644 --- a/languages/cpp/app_templates/kicker/applet.h +++ b/languages/cpp/app_templates/kicker/applet.h @@ -8,7 +8,7 @@ #endif #include -#include +#include #include @@ -26,8 +26,8 @@ public: * @param parent The pointer to the parent widget handed over in the factory function. * @param name A Qt object name for your applet. **/ - %{APPNAME}(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + %{APPNAME}(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); /** destructor */ ~%{APPNAME}(); @@ -97,11 +97,11 @@ public: virtual void preferences(); protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(TQResizeEvent *); private: KConfig *ksConfig; - QWidget *mainView; + TQWidget *mainView; }; #endif diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp index df32aebf..c8dc5d81 100644 --- a/languages/cpp/app_templates/kioslave/slave.cpp +++ b/languages/cpp/app_templates/kioslave/slave.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -26,7 +26,7 @@ using namespace KIO; -kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol(const QCString &pool_socket, const QCString &app_socket) +kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket) : SlaveBase("kio_%{APPNAMELC}", pool_socket, app_socket) { kdDebug() << "kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol()" << endl; @@ -44,7 +44,7 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url ) kdDebug() << "kio_%{APPNAMELC}::get(const KURL& url)" << endl ; kdDebug() << "Seconds: " << url.query() << endl; - QString remoteServer = url.host(); + TQString remoteServer = url.host(); int remotePort = url.port(); kdDebug() << "myURL: " << url.prettyURL() << endl; @@ -52,9 +52,9 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url ) // Send the mimeType as soon as it is known mimeType("text/plain"); // Send the data - QString theData = "This is a test of kio_%{APPNAMELC}"; - data(QCString(theData.local8Bit())); - data(QByteArray()); // empty array means we're done sending the data + TQString theData = "This is a test of kio_%{APPNAMELC}"; + data(TQCString(theData.local8Bit())); + data(TQByteArray()); // empty array means we're done sending the data finished(); } diff --git a/languages/cpp/app_templates/kioslave/slave.h b/languages/cpp/app_templates/kioslave/slave.h index 649ead8c..d094a23a 100644 --- a/languages/cpp/app_templates/kioslave/slave.h +++ b/languages/cpp/app_templates/kioslave/slave.h @@ -2,8 +2,8 @@ #ifndef _%{APPNAMELC}_H_ #define _%{APPNAMELC}_H_ -#include -#include +#include +#include #include #include @@ -14,7 +14,7 @@ class QCString; class kio_%{APPNAMELC}Protocol : public KIO::SlaveBase { public: - kio_%{APPNAMELC}Protocol(const QCString &pool_socket, const QCString &app_socket); + kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket); virtual ~kio_%{APPNAMELC}Protocol(); virtual void mimetype(const KURL& url); virtual void get(const KURL& url); diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp index 68cb262a..8a0de706 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.cpp +++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp @@ -1,9 +1,9 @@ #include "mainviewimp.h" -#include +#include #include -MainViewImp::MainViewImp(QWidget* parent, const char* name, WFlags fl) +MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl) : MainView(parent,name,fl) { } diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h index 51af1957..190a26e3 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.h +++ b/languages/cpp/app_templates/kmake/mainviewimp.h @@ -8,7 +8,7 @@ class MainViewImp : public MainView Q_OBJECT public: - MainViewImp(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + MainViewImp(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~MainViewImp(); public slots: diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index bd79c317..86287a3f 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -23,7 +23,7 @@ extern "C" KInstance* %{APPNAME}Factory::s_global = 0L; KAboutData* %{APPNAME}Factory::s_aboutData = 0L; -%{APPNAME}Factory::%{APPNAME}Factory( QObject* parent, const char* name ) +%{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name ) : KoFactory( parent, name ) { global(); @@ -37,7 +37,7 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L; s_global = 0L; } -KParts::Part* %{APPNAME}Factory::createPartObject( QWidget *parentWidget, const char *widgetName, QObject* parent, const char* name, const char* classname, const QStringList & ) +KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { // If classname is "KoDocument", our host is a koffice application // otherwise, the host wants us as a simple part, so switch to readonly and single view. diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index 45f1f649..58061af3 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -15,10 +15,10 @@ class %{APPNAME}Factory : public KoFactory { Q_OBJECT public: - %{APPNAME}Factory( QObject* parent = 0, const char* name = 0 ); + %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 ); ~%{APPNAME}Factory(); - virtual KParts::Part *createPartObject( QWidget *parentWidget = 0, const char *widgetName = 0, QObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const QStringList &args = QStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp index 500179f3..c12b5fd7 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -6,40 +6,40 @@ #include "%{APPNAMELC}_part.h" #include "%{APPNAMELC}_view.h" -#include +#include -%{APPNAME}Part::%{APPNAME}Part( QWidget *parentWidget, const char *widgetName, QObject* parent, const char* name, bool singleViewMode ) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode ) : KoDocument( parentWidget, widgetName, parent, name, singleViewMode ) { } -bool %{APPNAME}Part::initDoc( InitDocFlags flags, QWidget* parentWidget ) +bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) { // If nothing is loaded, do initialize here return TRUE; } -KoView* %{APPNAME}Part::createViewInstance( QWidget* parent, const char* name ) +KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name ) { return new %{APPNAME}View( this, parent, name ); } -bool %{APPNAME}Part::loadOasis( const QDomDocument & doc, KoOasisStyles& oasisStyles, const QDomDocument & settings, KoStore* store ) +bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ) { /// @todo load the document using the OASIS format return true; } -bool %{APPNAME}Part::loadXML( QIODevice *, const QDomDocument & ) +bool %{APPNAME}Part::loadXML( TQIODevice *, const TQDomDocument & ) { /// @todo load the document from the QDomDocument return true; } -QDomDocument %{APPNAME}Part::saveXML() +TQDomDocument %{APPNAME}Part::saveXML() { /// @todo save the document into a QDomDocument - return QDomDocument(); + return TQDomDocument(); } bool %{APPNAME}Part::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) @@ -49,7 +49,7 @@ bool %{APPNAME}Part::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) } -void %{APPNAME}Part::paintContent( QPainter& painter, const QRect& rect, bool /*transparent*/, +void %{APPNAME}Part::paintContent( TQPainter& painter, const TQRect& rect, bool /*transparent*/, double /*zoomX*/, double /*zoomY*/ ) { // ####### handle transparency diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 03361ca7..95ebb3f6 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -12,19 +12,19 @@ class %{APPNAME}Part : public KoDocument { Q_OBJECT public: - %{APPNAME}Part( QWidget *parentWidget = 0, const char *widgetName = 0, QObject* parent = 0, const char* name = 0, bool singleViewMode = false ); + %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); - virtual void paintContent( QPainter& painter, const QRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); - virtual bool initDoc( InitDocFlags flags, QWidget* parentWidget = 0 ); + virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 ); - virtual bool loadOasis( const QDomDocument & doc, KoOasisStyles& oasisStyles, const QDomDocument & settings, KoStore* store ); - virtual bool loadXML( QIODevice *, const QDomDocument & ); - virtual QDomDocument saveXML(); + virtual bool loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ); + virtual bool loadXML( TQIODevice *, const TQDomDocument & ); + virtual TQDomDocument saveXML(); virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter ); protected: - virtual KoView* createViewInstance( QWidget* parent, const char* name ); + virtual KoView* createViewInstance( TQWidget* parent, const char* name ); }; #endif diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 28c0b42f..f32707a8 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -6,27 +6,27 @@ #include "%{APPNAMELC}_factory.h" #include "%{APPNAMELC}_part.h" -#include -#include +#include +#include #include #include #include #include -%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, QWidget* parent, const char* name ) +%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name ) : KoView( part, parent, name ) { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); - KStdAction::cut(this, SLOT( cut() ), actionCollection(), "cut" ); + KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new KAction( i18n("&Cut"), "editcut", 0, this, SLOT( cut() ), + //m_cut = new KAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), // actionCollection(), "cut"); } -void %{APPNAME}View::paintEvent( QPaintEvent* ev ) +void %{APPNAME}View::paintEvent( TQPaintEvent* ev ) { - QPainter painter; + TQPainter painter; painter.begin( this ); /// @todo Scaling diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index eb14763f..bab3d89e 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -17,13 +17,13 @@ class %{APPNAME}View : public KoView { Q_OBJECT public: - %{APPNAME}View( %{APPNAME}Part* part, QWidget* parent = 0, const char* name = 0 ); + %{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent = 0, const char* name = 0 ); protected slots: void cut(); protected: - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); virtual void updateReadWrite( bool readwrite ); diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index 34515ce2..ae9a85a6 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -1,16 +1,16 @@ -#include +#include #include -#include -#include +#include +#include #include "%{APPNAMELC}.h" #include "%{APPNAMELC}.moc" -%{APPNAME}::%{APPNAME}(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name): +%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { - widget=new QLabel("Init Value",widgetParent); + widget=new TQLabel("Init Value",widgetParent); } @@ -20,14 +20,14 @@ void %{APPNAME}::handleURL(const KURL &url) { - widget->setText(QString("%{APPNAME}")+"::"+url.url()); + widget->setText(TQString("%{APPNAME}")+"::"+url.url()); } extern "C" { - void* create_konqsidebar_%{APPNAME}(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + void* create_konqsidebar_%{APPNAME}(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new %{APPNAME}(instance,par,widp,desktopname,name); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index 949c68d3..9599b530 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -7,7 +7,7 @@ #endif #include -#include +#include #include @@ -25,17 +25,17 @@ public: * @param desktopName The filename of the configuration file. * @param name A Qt object name for your plugin. **/ - %{APPNAME}(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name=0); + %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~%{APPNAME}(); - virtual QWidget *getWidget(){return widget;} - virtual void *provides(const QString &) {return 0;} + virtual TQWidget *getWidget(){return widget;} + virtual void *provides(const TQString &) {return 0;} protected: /*Example widget only. You use whichever widget you want. You onl have to care that getWidget returns some kind of widget */ - QLabel *widget; + TQLabel *widget; virtual void handleURL(const KURL &url); }; diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 68c34ab3..3a8a2274 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -76,16 +76,16 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } void %{APPNAME}::saveProperties(KConfig* /*config*/) @@ -159,8 +159,8 @@ void %{APPNAME}::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, SIGNAL(newToolbarConfig()), - this, SLOT(applyNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), + this, TQT_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -183,7 +183,7 @@ void %{APPNAME}::fileOpen() // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked KURL url = - KFileDialog::getOpenURL( QString::null, QString::null, this ); + KFileDialog::getOpenURL( TQString::null, TQString::null, this ); if (url.isEmpty() == false) { diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index bf63557f..809d642a 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -8,27 +8,27 @@ #include #include -#include -#include -#include +#include +#include +#include -%{APPNAME}Part::%{APPNAME}Part( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name ) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name ) : KParts::ReadWritePart(parent, name) { // we need an instance setInstance( %{APPNAME}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new QMultiLineEdit( parentWidget, widgetName ); + m_widget = new TQMultiLineEdit( parentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); // create our actions - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, SLOT(save()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQT_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -49,12 +49,12 @@ void %{APPNAME}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, SIGNAL(textChanged()), - this, SLOT(setModified())); + connect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); else { - disconnect(m_widget, SIGNAL(textChanged()), - this, SLOT(setModified())); + disconnect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); @@ -80,15 +80,15 @@ void %{APPNAME}Part::setModified(bool modified) bool %{APPNAME}Part::openFile() { - // m_file is always local so we can use QFile on it - QFile file(m_file); + // m_file is always local so we can use TQFile on it + TQFile file(m_file); if (file.open(IO_ReadOnly) == false) return false; - // our example widget is text-based, so we use QTextStream instead + // our example widget is text-based, so we use TQTextStream instead // of a raw QDataStream - QTextStream stream(&file); - QString str; + TQTextStream stream(&file); + TQString str; while (!stream.eof()) str += stream.readLine() + "\n"; @@ -110,12 +110,12 @@ bool %{APPNAME}Part::saveFile() return false; // m_file is always local, so we use QFile - QFile file(m_file); + TQFile file(m_file); if (file.open(IO_WriteOnly) == false) return false; - // use QTextStream to dump the text to the file - QTextStream stream(&file); + // use TQTextStream to dump the text to the file + TQTextStream stream(&file); stream << m_widget->text(); file.close(); @@ -128,7 +128,7 @@ void %{APPNAME}Part::fileOpen() // this slot is called whenever the File->Open menu is selected, // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked - QString file_name = KFileDialog::getOpenFileName(); + TQString file_name = KFileDialog::getOpenFileName(); if (file_name.isEmpty() == false) openURL(file_name); @@ -137,7 +137,7 @@ void %{APPNAME}Part::fileOpen() void %{APPNAME}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, - QString file_name = KFileDialog::getSaveFileName(); + TQString file_name = KFileDialog::getSaveFileName(); if (file_name.isEmpty() == false) saveAs(file_name); } @@ -164,15 +164,15 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L; s_instance = 0L; } -KParts::Part* %{APPNAME}PartFactory::createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ) +KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ) { // Create an instance of our Part %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, parent, name ); // See if we are to be read-write or not - if (QCString(classname) == "KParts::ReadOnlyPart") + if (TQCString(classname) == "KParts::ReadOnlyPart") obj->setReadWrite(false); return obj; diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 37c30189..6b56c36a 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -25,8 +25,8 @@ public: /** * Default constructor */ - %{APPNAME}Part(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name); + %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name); /** * Destructor @@ -61,7 +61,7 @@ protected slots: void fileSaveAs(); private: - QMultiLineEdit *m_widget; + TQMultiLineEdit *m_widget; }; class KInstance; @@ -73,9 +73,9 @@ class %{APPNAME}PartFactory : public KParts::Factory public: %{APPNAME}PartFactory(); virtual ~%{APPNAME}PartFactory(); - virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ); + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ); static KInstance* instance(); private: diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index a9ee55a3..61e3ca0e 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -8,13 +8,13 @@ #include #include -Plugin%{APPNAME}::Plugin%{APPNAME}( QObject* parent, const char* name ) +Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) : Plugin( parent, name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. (void) new KAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, - this, SLOT(slotAction()), + this, TQT_SLOT(slotAction()), actionCollection(), "plugin_action" ); } @@ -29,8 +29,8 @@ void Plugin%{APPNAME}::slotAction() // change the following block. if ( !parent()->inherits("KHTMLPart") ) { - QString title( i18n( "Cannot Translate Source" ) ); - QString text( i18n( "You cannot translate anything except web pages " + TQString title( i18n( "Cannot Translate Source" ) ); + TQString text( i18n( "You cannot translate anything except web pages " "with this plugin." ) ); KMessageBox::sorry( 0, text, title ); @@ -49,8 +49,8 @@ void Plugin%{APPNAME}::slotAction() // valid URL if ( !url.isValid() ) { - QString title( i18n( "Malformed URL" ) ); - QString text( i18n( "The URL you entered is not valid, please " + TQString title( i18n( "Malformed URL" ) ); + TQString text( i18n( "The URL you entered is not valid, please " "correct it and try again" ) ); KMessageBox::sorry( 0, text, title ); @@ -63,7 +63,7 @@ void Plugin%{APPNAME}::slotAction() // BEGIN KURL work( "http://babel.altavista.com/translate.dyn" ); - QString query( "urltext=" ); + TQString query( "urltext=" ); query += KURL::encode_string( url.url() ); work.setQuery( query ); // END @@ -83,7 +83,7 @@ void Plugin%{APPNAME}::slotAction() s_instance = 0; } -QObject* %{APPNAME}Factory::createObject( QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { return new Plugin%{APPNAME}( parent, name ); } diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index e70ad1c1..7c7bfc0c 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -9,7 +9,7 @@ class Plugin%{APPNAME} : public KParts::Plugin { Q_OBJECT public: - Plugin%{APPNAME}( QObject* parent = 0, const char* name = 0 ); + Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~Plugin%{APPNAME}(); public slots: @@ -23,7 +23,7 @@ public: %{APPNAME}Factory(); virtual ~%{APPNAME}Factory(); - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, const char* name = "QObject", const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index 71155138..a851f02a 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -10,30 +10,30 @@ #include #include -#include -#include -#include +#include +#include +#include typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); -%{APPNAMELC}Part::%{APPNAMELC}Part( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, const QStringList & /*args*/) +%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList & /*args*/) : KParts::ReadWritePart(parent) { // we need an instance setInstance( %{APPNAMELC}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new QMultiLineEdit( parentWidget, widgetName ); + m_widget = new TQMultiLineEdit( parentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); // create our actions - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, SLOT(save()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQT_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -63,12 +63,12 @@ void %{APPNAMELC}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, SIGNAL(textChanged()), - this, SLOT(setModified())); + connect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); else { - disconnect(m_widget, SIGNAL(textChanged()), - this, SLOT(setModified())); + disconnect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); @@ -94,15 +94,15 @@ void %{APPNAMELC}Part::setModified(bool modified) bool %{APPNAMELC}Part::openFile() { - // m_file is always local so we can use QFile on it - QFile file(m_file); + // m_file is always local so we can use TQFile on it + TQFile file(m_file); if (file.open(IO_ReadOnly) == false) return false; - // our example widget is text-based, so we use QTextStream instead + // our example widget is text-based, so we use TQTextStream instead // of a raw QDataStream - QTextStream stream(&file); - QString str; + TQTextStream stream(&file); + TQString str; while (!stream.eof()) str += stream.readLine() + "\n"; @@ -124,12 +124,12 @@ bool %{APPNAMELC}Part::saveFile() return false; // m_file is always local, so we use QFile - QFile file(m_file); + TQFile file(m_file); if (file.open(IO_WriteOnly) == false) return false; - // use QTextStream to dump the text to the file - QTextStream stream(&file); + // use TQTextStream to dump the text to the file + TQTextStream stream(&file); stream << m_widget->text(); file.close(); @@ -142,7 +142,7 @@ void %{APPNAMELC}Part::fileOpen() // this slot is called whenever the File->Open menu is selected, // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked - QString file_name = KFileDialog::getOpenFileName(); + TQString file_name = KFileDialog::getOpenFileName(); if (file_name.isEmpty() == false) openURL(file_name); @@ -151,7 +151,7 @@ void %{APPNAMELC}Part::fileOpen() void %{APPNAMELC}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, - QString file_name = KFileDialog::getSaveFileName(); + TQString file_name = KFileDialog::getSaveFileName(); if (file_name.isEmpty() == false) saveAs(file_name); } diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h index e1dd002b..2d4ea947 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.h +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h @@ -27,8 +27,8 @@ public: /** * Default constructor */ - %{APPNAMELC}Part(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, const QStringList & /*args*/); + %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList & /*args*/); /** * Destructor @@ -68,7 +68,7 @@ protected slots: void fileSaveAs(); private: - QMultiLineEdit *m_widget; + TQMultiLineEdit *m_widget; }; #endif // _%{APPNAMEUC}PART_H_ diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp index be5d8862..4286053a 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp @@ -1,11 +1,11 @@ %{CPP_TEMPLATE} -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -53,8 +53,8 @@ setStandardMDIMenuEnabled(false); m_manager = new KParts::PartManager(this); - connect(m_manager, SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(createGUI(KParts::Part*)) ); + connect(m_manager, TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(createGUI(KParts::Part*)) ); #if KDE_IS_VERSION(3, 3, 0) setToolviewStyle( KMdi::TextAndIcon ); @@ -77,7 +77,7 @@ // and a status bar statusBar()->show(); - connect( this, SIGNAL( viewActivated( KMdiChildView * ) ), this, SLOT( currentChanged( KMdiChildView * ) ) ); + connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) ); m_console = new kmdikonsole(this, "konsole"); m_console->setIcon( SmallIcon("konsole") ); @@ -88,11 +88,11 @@ #if KDE_IS_VERSION(3, 3, 0) if (Settings::showCloseTabsButton()) { - QToolButton *but = new QToolButton(tabWidget()); + TQToolButton *but = new TQToolButton(tabWidget()); but->setIconSet(SmallIcon("tab_remove")); but->adjustSize(); but->hide(); - connect(but, SIGNAL(clicked()), actionCollection()->action( "file_close" ), SIGNAL(activated())); + connect(but, TQT_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQT_SIGNAL(activated())); tabWidget()->setCornerWidget(but, TopRight); } #endif @@ -124,29 +124,29 @@ void %{APPNAMELC}kmdi::setupActions() { setXMLFile("%{APPNAMELC}_shell.rc"); - KStdAction::openNew(this, SLOT(slotFileNew()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); - KStdAction::tipOfDay( this, SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::close(this, SLOT(slotFileClose()), actionCollection()); - KStdAction::quit(this, SLOT(slotFileQuit()), actionCollection()); + KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); KAction* action = KStdAction::configureToolbars(this, - SLOT(optionsConfigureToolbars()), actionCollection()); + TQT_SLOT(optionsConfigureToolbars()), actionCollection()); createGUI( NULL ); } void %{APPNAMELC}kmdi::showTip() { - KTipDialog::showTip(this,QString::null,true); + KTipDialog::showTip(this,TQString::null,true); } void %{APPNAMELC}kmdi::showTipOnStart() @@ -170,8 +170,8 @@ void %{APPNAMELC}kmdi::slotFileNew() void %{APPNAMELC}kmdi::openURL(const KURL & url) { // check if the url is not already opened first - QValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); - QValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); + TQValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); + TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); for (; it != end; ++it) { %{APPNAMELC}kmdiView *view = *it; @@ -283,9 +283,9 @@ void %{APPNAMELC}kmdi::optionsConfigureKeys() { //KKeyDialog::configure(actionCollection()); KKeyDialog dlg( false, this ); - QPtrList clients = guiFactory()->clients(); + TQPtrList clients = guiFactory()->clients(); - for( QPtrListIterator it( clients ); it.current(); ++it ) + for( TQPtrListIterator it( clients ); it.current(); ++it ) dlg.insert ( (*it)->actionCollection(), (*it)->instance()->aboutData()->programName() ); dlg.configure(); @@ -320,15 +320,15 @@ void %{APPNAMELC}kmdi::optionsPreferences() KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new prefs(), i18n("General"), "package_settings"); - connect(dialog, SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); dialog->show(); } void %{APPNAMELC}kmdi::settingsChanged() { // propagate the changes to our views - /*QValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); - QValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); + /*TQValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); + TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); for (; it != end; ++it) { %{APPNAMELC}kmdiView *view = *it; @@ -336,19 +336,19 @@ void %{APPNAMELC}kmdi::settingsChanged() }*/ } -void %{APPNAMELC}kmdi::changeStatusbar(const QString& text) +void %{APPNAMELC}kmdi::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text, 2000); } -void %{APPNAMELC}kmdi::dragEnterEvent(QDragEnterEvent *event) +void %{APPNAMELC}kmdi::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void %{APPNAMELC}kmdi::dropEvent(QDropEvent *event) +void %{APPNAMELC}kmdi::dropEvent(TQDropEvent *event) { KURL::List urls; @@ -365,7 +365,7 @@ void %{APPNAMELC}kmdi::dropEvent(QDropEvent *event) bool %{APPNAMELC}kmdi::queryClose() { - QValueList<%{APPNAMELC}kmdiView*>::iterator it; + TQValueList<%{APPNAMELC}kmdiView*>::iterator it; // check if we can close all documents for (it = m_views.begin(); it != m_views.end(); ++it) diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h index 370a3034..8ff90205 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}KMDI_H #define _%{APPNAMEUC}KMDI_H -#include +#include #include #include @@ -37,8 +37,8 @@ class %{APPNAMELC}kmdi : public KMdiMainFrm void openURL( const KURL& ); protected: - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); virtual bool queryClose(); private slots: @@ -57,7 +57,7 @@ class %{APPNAMELC}kmdi : public KMdiMainFrm void newToolbarConfig(); - void changeStatusbar(const QString& text); + void changeStatusbar(const TQString& text); void currentChanged( KMdiChildView *current ); bool requestClose(KMdiChildView* view); @@ -68,7 +68,7 @@ class %{APPNAMELC}kmdi : public KMdiMainFrm void setupAccel(); void setupActions(); - QValueList<%{APPNAMELC}kmdiView*> m_views; + TQValueList<%{APPNAMELC}kmdiView*> m_views; KToggleAction *m_toolbarAction; KToggleAction *m_statusbarAction; diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp index c4cfbf65..d7c00001 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp @@ -1,7 +1,7 @@ %{CPP_TEMPLATE} -#include -#include +#include +#include #include #include @@ -13,7 +13,7 @@ #include "%{APPNAMELC}kmdiView.h" - %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( QWidget *parentWidget, const char *name ) + %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name ) : KMdiChildView( parentWidget, name ) { m_part = NULL; @@ -35,11 +35,11 @@ part()->widget()->setFocus(); setFocusProxy(part()->widget()); - QBoxLayout* layout = new QHBoxLayout(this, 0, -1, "kdissertviewlayout" ); - part()->widget()->reparent( this, QPoint(0, 0) ); + TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" ); + part()->widget()->reparent( this, TQPoint(0, 0) ); layout->addWidget( part()->widget() ); - // connect( m_part, SIGNAL(stateChanged()), this, SLOT(updateCaption()) ); + // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); } else { diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h index 66e5203b..af05df48 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h @@ -16,7 +16,7 @@ class %{APPNAMELC}kmdiView : public KMdiChildView { Q_OBJECT public: - %{APPNAMELC}kmdiView( QWidget *parentWidget=0L, const char *name=0L ); + %{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L ); virtual ~%{APPNAMELC}kmdiView(); KParts::ReadWritePart *part() { return m_part; } diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp index da41685f..8171c6b8 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp @@ -1,7 +1,7 @@ %{CPP_TEMPLATE} -#include -#include +#include +#include #include #include @@ -12,7 +12,7 @@ #include "kmdikonsole.h" -kmdikonsole::kmdikonsole(QWidget *parent, const char *name) : QVBox(parent, name) +kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name) { m_haskonsole = false; respawn(); @@ -31,17 +31,17 @@ void kmdikonsole::respawn() if (!m_part) return; - if (m_part->widget()->inherits("QFrame")) - ((QFrame*)m_part->widget())->setFrameStyle(QFrame::Panel|QFrame::Sunken); + if (m_part->widget()->inherits("TQFrame")) + ((TQFrame*)m_part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); m_haskonsole=true; - connect( m_part, SIGNAL(destroyed()), this, SLOT(slotDestroyed()) ); + connect( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); m_part->widget()->show(); show(); } -void kmdikonsole::setDirectory(const QString &dirname) +void kmdikonsole::setDirectory(const TQString &dirname) { if (m_haskonsole) { @@ -51,9 +51,9 @@ void kmdikonsole::setDirectory(const QString &dirname) } } -void kmdikonsole::showEvent(QShowEvent *ev) +void kmdikonsole::showEvent(TQShowEvent *ev) { - QWidget::showEvent(ev); + TQWidget::showEvent(ev); activate(); } diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h index 83adb417..ef5a2c1e 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h @@ -3,18 +3,18 @@ #ifndef KMDIKONSOLE_H #define KMDIKONSOLE_H -#include +#include class kmdikonsole : public QVBox { Q_OBJECT public: - kmdikonsole( QWidget* parent, const char* name=0); + kmdikonsole( TQWidget* parent, const char* name=0); ~kmdikonsole(); public slots: - void setDirectory(const QString & dir); + void setDirectory(const TQString & dir); void activate(); private slots: @@ -22,7 +22,7 @@ class kmdikonsole : public QVBox void respawn(); protected: - void showEvent(QShowEvent *ev); + void showEvent(TQShowEvent *ev); private: KParts::ReadOnlyPart *m_part; diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index bc343554..2a696ea0 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -4,10 +4,10 @@ #include "settings.h" #include "prefs.h" -#include +#include #include -#include -#include +#include +#include #include #include @@ -48,10 +48,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); showTipOnStart(); } @@ -62,22 +62,22 @@ void %{APPNAME}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::tipOfDay( this, SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, - m_view, SLOT(switchColors()), + m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -140,17 +140,17 @@ void %{APPNAME}::optionsPreferences() // to the names of the variables in the .kcfg file KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, SIGNAL(settingsChanged()), m_view, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); dialog->show(); } -void %{APPNAME}::changeStatusbar(const QString& text) +void %{APPNAME}::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text, 2000); } -void %{APPNAME}::changeCaption(const QString& text) +void %{APPNAME}::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); @@ -158,7 +158,7 @@ void %{APPNAME}::changeCaption(const QString& text) void %{APPNAME}::showTip() { - KTipDialog::showTip(this,QString::null,true); + KTipDialog::showTip(this,TQString::null,true); } void %{APPNAME}::showTipOnStart() diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h index 4f855793..e812716d 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.h +++ b/languages/cpp/app_templates/kscons_kxt/app.h @@ -53,8 +53,8 @@ private slots: void newToolbarConfig(); void showTip(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); private: void setupAccel(); diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp index 7dc99f61..2bcc9c6a 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.cpp +++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp @@ -4,9 +4,9 @@ #include "settings.h" #include -#include +#include -%{APPNAME}View::%{APPNAME}View(QWidget *parent) +%{APPNAME}View::%{APPNAME}View(TQWidget *parent) : %{APPNAME}view_base(parent) { settingsChanged(); @@ -20,7 +20,7 @@ void %{APPNAME}View::switchColors() { // switch the foreground/background colors of the label - QColor color = Settings::col_background(); + TQColor color = Settings::col_background(); Settings::setCol_background( Settings::col_foreground() ); Settings::setCol_foreground( color ); diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h index 86d097a4..96f0845f 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.h +++ b/languages/cpp/app_templates/kscons_kxt/appview.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}VIEW_H_ #define _%{APPNAMEUC}VIEW_H_ -#include +#include #include "%{APPNAMELC}view_base.h" @@ -26,7 +26,7 @@ public: /** * Default constructor */ - %{APPNAME}View(QWidget *parent); + %{APPNAME}View(TQWidget *parent); /** * Destructor @@ -37,12 +37,12 @@ signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); public slots: void switchColors(); diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp index f4418571..efdbf40b 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp @@ -1,8 +1,8 @@ %{CPP_TEMPLATE} #include -#include -#include +#include +#include #include #include #include @@ -24,7 +24,7 @@ extern "C" return new %{APPNAME}( id ); } - QDialog *kss_setup() + TQDialog *kss_setup() { KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Setup(); @@ -33,15 +33,15 @@ extern "C" //----------------------------------------------------------------------------- //! dialog to setup screen saver parameters -%{APPNAME}Setup::%{APPNAME}Setup( QWidget *parent, const char *name ) +%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) : %{APPNAME}UI( parent, name, TRUE ) { /// @todo //Connect your signals and slots here to configure the screen saver. - connect( OkayPushButton, SIGNAL( released() ), - SLOT( slotOkPressed() ) ); - connect( CancelPushButton, SIGNAL( released() ), - SLOT( slotCancelPressed() ) ); + connect( OkayPushButton, TQT_SIGNAL( released() ), + TQT_SLOT( slotOkPressed() ) ); + connect( CancelPushButton, TQT_SIGNAL( released() ), + TQT_SLOT( slotCancelPressed() ) ); } @@ -101,7 +101,7 @@ void %{APPNAME}::blank() { /// @todo //Add your code to render the screen. - setBackgroundColor( QColor(black) ); + setBackgroundColor( TQColor(black) ); // erase(); } diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/kscreensaver/kscreensaver.h index 1301083d..a5d252a5 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.h @@ -21,7 +21,7 @@ class %{APPNAME}Setup : public %{APPNAME}UI { Q_OBJECT public: - %{APPNAME}Setup( QWidget *parent = NULL, const char *name = NULL ); + %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); private slots: void slotOkPressed(); diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index 6e2ce524..ce5577cb 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -4,10 +4,10 @@ #include "settings.h" #include "prefs.h" -#include +#include #include -#include -#include +#include +#include #include #include @@ -47,10 +47,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); } @@ -60,19 +60,19 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAMELC}View KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, - m_view, SLOT(switchColors()), + m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -135,17 +135,17 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, SIGNAL(settingsChanged()), m_view, SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); dialog->show(); } -void %{APPNAMELC}::changeStatusbar(const QString& text) +void %{APPNAMELC}::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text, 2000); } -void %{APPNAMELC}::changeCaption(const QString& text) +void %{APPNAMELC}::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h index 22037de2..09f031c4 100644 --- a/languages/cpp/app_templates/kxt/app.h +++ b/languages/cpp/app_templates/kxt/app.h @@ -47,8 +47,8 @@ private slots: void optionsPreferences(); void newToolbarConfig(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); private: void setupAccel(); diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp index 35e23682..30d627fe 100644 --- a/languages/cpp/app_templates/kxt/appview.cpp +++ b/languages/cpp/app_templates/kxt/appview.cpp @@ -4,9 +4,9 @@ #include "settings.h" #include -#include +#include -%{APPNAMELC}View::%{APPNAMELC}View(QWidget *parent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) : %{APPNAMELC}view_base(parent) { settingsChanged(); @@ -20,7 +20,7 @@ void %{APPNAMELC}View::switchColors() { // switch the foreground/background colors of the label - QColor color = Settings::col_background(); + TQColor color = Settings::col_background(); Settings::setCol_background( Settings::col_foreground() ); Settings::setCol_foreground( color ); diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h index 45a10de7..5b69ae24 100644 --- a/languages/cpp/app_templates/kxt/appview.h +++ b/languages/cpp/app_templates/kxt/appview.h @@ -3,7 +3,7 @@ #ifndef _%{APPNAMEUC}VIEW_H_ #define _%{APPNAMEUC}VIEW_H_ -#include +#include #include "%{APPNAMELC}view_base.h" @@ -26,7 +26,7 @@ public: /** * Default constructor */ - %{APPNAMELC}View(QWidget *parent); + %{APPNAMELC}View(TQWidget *parent); /** * Destructor @@ -37,12 +37,12 @@ signals: /** * Use this signal to change the content of the statusbar */ - void signalChangeStatusbar(const QString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); + void signalChangeCaption(const TQString& text); private slots: void switchColors(); diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 1b5eea45..7f4cda15 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -9,12 +9,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -25,53 +25,53 @@ //#include //#include -%{APPNAME}UI::%{APPNAME}UI() : QWidget(0,"%{APPNAME}UI"), UserInterface() +%{APPNAME}UI::%{APPNAME}UI() : TQWidget(0,"%{APPNAME}UI"), UserInterface() { setAcceptDrops(true); static const int buttonSize=32; - mBack=new QPushButton(this); + mBack=new TQPushButton(this); mBack->setFixedSize(buttonSize,buttonSize); mBack->setPixmap(BarIcon("noatunback")); - connect(mBack, SIGNAL(clicked()), napp->player(), SLOT(back())); - QToolTip::add(mBack,i18n("Back")); + connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + TQToolTip::add(mBack,i18n("Back")); - mStop=new QPushButton(this); + mStop=new TQPushButton(this); mStop->setFixedSize(buttonSize,buttonSize); mStop->setPixmap(BarIcon("noatunstop")); - connect(mStop, SIGNAL(clicked()), napp->player(), SLOT(stop())); - QToolTip::add(mStop, i18n("Stop")); + connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + TQToolTip::add(mStop, i18n("Stop")); - mPlay=new QPushButton(this); + mPlay=new TQPushButton(this); mPlay->setToggleButton(true); mPlay->setFixedSize(buttonSize,buttonSize); mPlay->setPixmap(BarIcon("noatunplay")); - connect(mPlay, SIGNAL(clicked()), napp->player(), SLOT(playpause())); - QToolTip::add(mPlay, i18n("Play")); + connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause())); + TQToolTip::add(mPlay, i18n("Play")); - mForward=new QPushButton(this); + mForward=new TQPushButton(this); mForward->setFixedSize(buttonSize,buttonSize); mForward->setPixmap(BarIcon("noatunforward")); - connect(mForward, SIGNAL(clicked()), napp->player(), SLOT(forward())); - QToolTip::add(mForward, i18n("Forward")); + connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + TQToolTip::add(mForward, i18n("Forward")); - mPlaylist=new QPushButton(this); + mPlaylist=new TQPushButton(this); mPlaylist->setToggleButton(true); mPlaylist->setFixedSize(buttonSize,buttonSize); mPlaylist->setPixmap(BarIcon("noatunplaylist")); - connect(mPlaylist, SIGNAL(clicked()), napp->player(), SLOT(toggleListView())); - QToolTip::add(mPlaylist, i18n("Playlist")); + connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView())); + TQToolTip::add(mPlaylist, i18n("Playlist")); - mLoop=new QPushButton(this); + mLoop=new TQPushButton(this); mLoop->setFixedSize(buttonSize,buttonSize); mLoop->setPixmap(BarIcon("noatunloopnone")); - connect(mLoop, SIGNAL(clicked()), napp->player(), SLOT(loop())); - QToolTip::add(mLoop, i18n("Change loop style")); + connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop())); + TQToolTip::add(mLoop, i18n("Change loop style")); - mPopup=new QPushButton(this); + mPopup=new TQPushButton(this); mPopup->setFixedSize(buttonSize,buttonSize); mPopup->setPixmap(BarIcon("noatun")); - connect(mPopup, SIGNAL(clicked()), SLOT(popup())); + connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); mVolume=new L33tSlider(0,100,10,0, Horizontal, this); @@ -81,7 +81,7 @@ mStatusBar=new KStatusBar(this); - QGridLayout *l=new QGridLayout(this); + TQGridLayout *l=new TQGridLayout(this); l->addWidget(mBack,0,0); l->addWidget(mStop,0,1); l->addWidget(mPlay,0,2); @@ -98,33 +98,33 @@ statusBar()->message(i18n("No File Loaded")); statusBar()->insertItem("--:--/--:--", 1, 0, true); - connect(napp, SIGNAL(hideYourself()), this, SLOT(hide()) ); - connect(napp, SIGNAL(showYourself()), this, SLOT(show()) ); + connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); + connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); - connect(napp->player(), SIGNAL(playing()), this, SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(stopped()), this, SLOT(slotStopped())); - connect(napp->player(), SIGNAL(paused()), this, SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), SIGNAL(timeout()), this, SLOT(slotTimeout())); - connect(napp->player(), SIGNAL(loopTypeChange(int)), this, SLOT(changeLoopType(int))); + connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int))); /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(seeker(), SIGNAL(userChanged(int)), this, SLOT(skipToWrapper(int))); - connect(this, SIGNAL(skipTo(int)), napp->player(), SLOT(skipTo(int))); - connect(seeker(), SIGNAL(sliderMoved(int)), SLOT(sliderMoved(int))); + connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); + connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); + connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); - connect(mVolume, SIGNAL(sliderMoved(int)), napp->player(), SLOT(setVolume(int))); - connect(mVolume, SIGNAL(userChanged(int)), napp->player(), SLOT(setVolume(int))); + connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int))); + connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int))); - connect(napp->player(), SIGNAL(playlistShown()), SLOT(playlistShown())); - connect(napp->player(), SIGNAL(playlistHidden()), SLOT(playlistHidden())); + connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); // Event Filter for the RMB - for (QPtrListIterator i(*children()); i.current(); ++i) + for (TQPtrListIterator i(*children()); i.current(); ++i) (*i)->installEventFilter(this); setCaption("Noatun"); @@ -140,23 +140,23 @@ /** save settings here */ } -void %{APPNAME}UI::closeEvent(QCloseEvent*) +void %{APPNAME}UI::closeEvent(TQCloseEvent*) { unload(); } -void %{APPNAME}UI::showEvent(QShowEvent*e) +void %{APPNAME}UI::showEvent(TQShowEvent*e) { - QWidget::showEvent(e); + TQWidget::showEvent(e); } -void %{APPNAME}UI::dragEnterEvent(QDragEnterEvent *event) +void %{APPNAME}UI::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void %{APPNAME}UI::dropEvent(QDropEvent *event) +void %{APPNAME}UI::dropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -166,14 +166,14 @@ void %{APPNAME}UI::dropEvent(QDropEvent *event) } } -void %{APPNAME}UI::mouseReleaseEvent(QMouseEvent *e) +void %{APPNAME}UI::mouseReleaseEvent(TQMouseEvent *e) { - QWidget::mouseReleaseEvent(e); + TQWidget::mouseReleaseEvent(e); if (e->button()!=RightButton) return; NoatunStdAction::ContextMenu::showContextMenu(); } -void %{APPNAME}UI::changeStatusbar(const QString& text, const QString &text2) +void %{APPNAME}UI::changeStatusbar(const TQString& text, const TQString &text2) { if (!text2.isNull()) statusBar()->changeItem(text2, 1); @@ -181,7 +181,7 @@ void %{APPNAME}UI::changeStatusbar(const QString& text, const QString &text2) statusBar()->message(!text.isNull() ? text : napp->player()->current().title()); } -void %{APPNAME}UI::changeCaption(const QString& text) +void %{APPNAME}UI::changeCaption(const TQString& text) { setCaption(text); } @@ -265,21 +265,21 @@ void %{APPNAME}UI::changeLoopType(int t) } } -bool %{APPNAME}UI::eventFilter(QObject *o, QEvent *e) +bool %{APPNAME}UI::eventFilter(TQObject *o, TQEvent *e) { - if ((e->type() == QEvent::MouseButtonRelease) - && ((static_cast(e))->button()==RightButton)) + if ((e->type() == TQEvent::MouseButtonRelease) + && ((static_cast(e))->button()==RightButton)) { - mouseReleaseEvent(static_cast(e)); + mouseReleaseEvent(static_cast(e)); return true; } - if (e->type() == QEvent::Wheel) + if (e->type() == TQEvent::Wheel) { - wheelEvent(static_cast(e)); + wheelEvent(static_cast(e)); return true; } - return QWidget::eventFilter(o, e); + return TQWidget::eventFilter(o, e); } void %{APPNAME}UI::playlistShown() @@ -292,7 +292,7 @@ void %{APPNAME}UI::playlistHidden() mPlaylist->setOn(false); } -void %{APPNAME}UI::wheelEvent(QWheelEvent *e) +void %{APPNAME}UI::wheelEvent(TQWheelEvent *e) { int delta=e->delta(); mVolume->setValue(mVolume->value()+(delta/120)); diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.h b/languages/cpp/app_templates/noatunui/plugin_impl.h index 970246d4..e918f925 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.h +++ b/languages/cpp/app_templates/noatunui/plugin_impl.h @@ -23,27 +23,27 @@ class KStatusBar; * @version 0.1 * Note: You can user _every_ widget for implementing your userinterface. */ -class %{APPNAME}UI : public QWidget, public UserInterface +class %{APPNAME}UI : public TQWidget, public UserInterface { Q_OBJECT public: %{APPNAME}UI(); virtual ~%{APPNAME}UI(); - void load(const QString& url); + void load(const TQString& url); protected: - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); - virtual void closeEvent(QCloseEvent*); - virtual void showEvent(QShowEvent*e); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); + virtual void closeEvent(TQCloseEvent*); + virtual void showEvent(TQShowEvent*e); /** RMB -> context menu */ - virtual void mouseReleaseEvent(QMouseEvent *); - virtual bool eventFilter(QObject*, QEvent*); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual bool eventFilter(TQObject*, TQEvent*); /** volume control */ - virtual void wheelEvent(QWheelEvent *e); + virtual void wheelEvent(TQWheelEvent *e); protected: - QSlider *seeker() const { return mSeeker; } + TQSlider *seeker() const { return mSeeker; } KStatusBar *statusBar() const { return mStatusBar; } public slots: @@ -64,13 +64,13 @@ signals: void skipTo( int ); // emitted by skipToWrapper() private slots: - void changeStatusbar(const QString& text, const QString &text2=0); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text, const TQString &text2=0); + void changeCaption(const TQString& text); void popup(); private: - QPushButton *mBack, *mStop, *mPlay, *mForward, *mPlaylist, *mPopup, *mLoop; - QSlider *mSeeker, *mVolume; + TQPushButton *mBack, *mStop, *mPlay, *mForward, *mPlaylist, *mPopup, *mLoop; + TQSlider *mSeeker, *mVolume; KStatusBar *mStatusBar; }; diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp index 84f3f9d5..ebb4233c 100644 --- a/languages/cpp/app_templates/opieapp/example.cpp +++ b/languages/cpp/app_templates/opieapp/example.cpp @@ -1,5 +1,5 @@ #include "%{APPNAMELC}.h" -#include +#include #include typedef OApplicationFactory<%{APPNAME}> %{APPNAME}Factory; @@ -9,10 +9,10 @@ OPIE_EXPORT_APP( %{APPNAME}Factory ) * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( QWidget* parent, const char* name, WFlags fl ) +%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, SIGNAL(clicked()), this, SLOT(goodBye())); + connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 1ba8ead7..2a9c9efa 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -7,10 +7,10 @@ class %{APPNAME} : public %{APPNAME}Base Q_OBJECT public: - static QString appName() { - return QString::fromLatin1("%{APPNAMELC}" ); + static TQString appName() { + return TQString::fromLatin1("%{APPNAMELC}" ); } - %{APPNAME}( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp index 1474a0e4..3264314c 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include // for AppLnk #include // for Resource loading @@ -8,8 +8,8 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(QWidget *parent) - : QWidget( parent, "%{APPNAME} Applet" ) { +%{APPNAME}::%{APPNAME}(TQWidget *parent) + : TQWidget( parent, "%{APPNAME} Applet" ) { /* * we will load an Image, scale it for the right usage * remember your applet might be used by different @@ -19,7 +19,7 @@ * the only class that allows scaling. */ - QImage image = Resource::loadImage("%{APPNAMELC}/%{APPNAMELC}"); + TQImage image = Resource::loadImage("%{APPNAMELC}/%{APPNAMELC}"); /* * smooth scale to AppLnk smallIconSize for applest * smallIconSize gets adjusted to the resolution @@ -32,7 +32,7 @@ * now we need to convert the Image to a Pixmap cause these * can be drawn more easily */ - m_pix = new QPixmap(); + m_pix = new TQPixmap(); m_pix->convertFromImage( image ); /* @@ -56,15 +56,15 @@ * global with mapToGlobal(). Then you might also need to * move the widgets so it is visible */ -void %{APPNAME}::mousePressEvent(QMouseEvent* ) { - QMessageBox::information(this, tr("No action taken"), +void %{APPNAME}::mousePressEvent(TQMouseEvent* ) { + TQMessageBox::information(this, tr("No action taken"), tr("This Plugin does not yet support anything usefule aye."), - QMessageBox::Ok ); + TQMessageBox::Ok ); } -void %{APPNAME}::paintEvent( QPaintEvent* ) { - QPainter p(this); +void %{APPNAME}::paintEvent( TQPaintEvent* ) { + TQPainter p(this); /* simpy draw the pixmap from the start of this widget */ p.drawPixmap(0, 0, *m_pix ); @@ -89,7 +89,7 @@ void %{APPNAME}::paintEvent( QPaintEvent* ) { /* * For the taskbar interface return a Widget */ -QWidget* %{APPNAME}Impl::applet( QWidget* parent ) { +TQWidget* %{APPNAME}Impl::applet( TQWidget* parent ) { /* * There are problems with ownership. So we add * our ownlist and clear this; diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h index 19475367..7cca8ee7 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.h +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h @@ -26,8 +26,8 @@ * luckiy there is a macro for the reference counting * We provide an Implementation of the interface. */ -#include -#include +#include +#include #include @@ -35,18 +35,18 @@ /* * Because we only draw an Icon in a fixed width and height * we declare and define %{APPNAME} here and you could use QLabel - * setPixmap or use QWidget and draw yourself. + * setPixmap or use TQWidget and draw yourself. * You might also want to reimplement mouse*Event to use some simple actions */ -class %{APPNAME} : public QWidget { +class %{APPNAME} : public TQWidget { Q_OBJECT public: - %{APPNAME}(QWidget *parent); + %{APPNAME}(TQWidget *parent); ~%{APPNAME}(); private: - void mousePressEvent( QMouseEvent* ); - void paintEvent( QPaintEvent* ); - QPixmap *m_pix; + void mousePressEvent( TQMouseEvent* ); + void paintEvent( TQPaintEvent* ); + TQPixmap *m_pix; }; class %{APPNAME}Impl : public TaskbarAppletInterface { @@ -57,7 +57,7 @@ public: QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - QWidget *applet( QWidget* parent ); + TQWidget *applet( TQWidget* parent ); int position()const; /* diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index 6da986eb..db2e4285 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -1,43 +1,43 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(QWidget* par, WFlags fl ) - : QHBox(par, "name", fl ) +%{APPNAME}::%{APPNAME}(TQWidget* par, WFlags fl ) + : TQHBox(par, "name", fl ) { - QCheckBox *box1 = new QCheckBox(tr("Alt"),this); - connect(box1,SIGNAL(toggled(bool)), - this,SLOT(slotAlt(bool))); + TQCheckBox *box1 = new TQCheckBox(tr("Alt"),this); + connect(box1,TQT_SIGNAL(toggled(bool)), + this,TQT_SLOT(slotAlt(bool))); m_alt = box1; - box1 = new QCheckBox(tr("Shift"),this ); - connect(box1,SIGNAL(toggled(bool)), - this,SLOT(slotShift(bool))); + box1 = new TQCheckBox(tr("Shift"),this ); + connect(box1,TQT_SIGNAL(toggled(bool)), + this,TQT_SLOT(slotShift(bool))); m_shi = box1; - box1 = new QCheckBox(tr("Ctrl","Control Shortcut on keyboard"),this ); - connect(box1,SIGNAL(toggled(bool)), - this,SLOT(slotCtrl(bool))); + box1 = new TQCheckBox(tr("Ctrl","Control Shortcut on keyboard"),this ); + connect(box1,TQT_SIGNAL(toggled(bool)), + this,TQT_SLOT(slotCtrl(bool))); m_ctrl = box1; - QSignalMapper *map = new QSignalMapper(this); - QPushButton *btn = new QPushButton("a",this); + TQSignalMapper *map = new TQSignalMapper(this); + TQPushButton *btn = new TQPushButton("a",this); map->setMapping(btn,0); - connect(btn,SIGNAL(clicked()),map,SLOT(map())); + connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); - btn = new QPushButton("b",this); + btn = new TQPushButton("b",this); map->setMapping(btn,1); - connect(btn,SIGNAL(clicked()),map,SLOT(map())); + connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); - btn = new QPushButton("c",this); + btn = new TQPushButton("c",this); map->setMapping(btn,2); - connect(btn,SIGNAL(clicked()),map,SLOT(map())); + connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); - connect(map,SIGNAL(mapped(int)), - this,SLOT(slotKey(int))); + connect(map,TQT_SIGNAL(mapped(int)), + this,TQT_SLOT(slotKey(int))); resetState(); } @@ -102,7 +102,7 @@ void %{APPNAME}::slotCtrl(bool b){ delete m_icn; } -QWidget *%{APPNAME}Impl::inputMethod( QWidget *parent, Qt::WFlags f ) +TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *parent, Qt::WFlags f ) { if ( !m_pickboard ) m_pickboard = new %{APPNAME}( parent, f ); @@ -115,22 +115,22 @@ void %{APPNAME}Impl::resetState() m_pickboard->resetState(); } -QPixmap *%{APPNAME}Impl::icon() +TQPixmap *%{APPNAME}Impl::icon() { if ( !m_icn ) - m_icn = new QPixmap(Resource::loadPixmap("Tux")); + m_icn = new TQPixmap(Resource::loadPixmap("Tux")); return m_icn; } -QString %{APPNAME}Impl::name() +TQString %{APPNAME}Impl::name() { - return QObject::tr("Example Input"); + return TQObject::tr("Example Input"); } -void %{APPNAME}Impl::onKeyPress( QObject *receiver, const char *slot ) +void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot ) { if ( m_pickboard ) - QObject::connect( m_pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); + TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); } #ifndef QT_NO_COMPONENT diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h index 362e59b3..17972b29 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.h +++ b/languages/cpp/app_templates/opieinput/simpleimpl.h @@ -1,16 +1,16 @@ #ifndef %{APPNAME}IMPL_H #define %{APPNAME}IMPL_H -#include +#include #include class QPixmap; class QCheckBox; -class %{APPNAME} : public QHBox { +class %{APPNAME} : public TQHBox { Q_OBJECT public: - %{APPNAME}( QWidget *par, WFlags f ); + %{APPNAME}( TQWidget *par, WFlags f ); ~%{APPNAME}(); void resetState(); private slots: @@ -22,7 +22,7 @@ signals: void key(ushort,ushort,ushort,bool,bool); private: int m_state; - QCheckBox *m_alt,*m_shi,*m_ctrl; + TQCheckBox *m_alt,*m_shi,*m_ctrl; }; class %{APPNAME}Impl : public InputMethodInterface @@ -36,15 +36,15 @@ public: Q_REFCOUNT #endif - virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); + virtual TQWidget *inputMethod( TQWidget *parent, Qt::WFlags f ); virtual void resetState(); - virtual QPixmap *icon(); - virtual QString name(); - virtual void onKeyPress( QObject *receiver, const char *slot ); + virtual TQPixmap *icon(); + virtual TQString name(); + virtual void onKeyPress( TQObject *receiver, const char *slot ); private: %{APPNAME} *m_pickboard; - QPixmap *m_icn; + TQPixmap *m_icn; }; #endif diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp index 95245661..17b59a3e 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp @@ -4,13 +4,13 @@ #include /* QT */ -#include -#include -#include +#include +#include +#include %{APPNAME}::%{APPNAME}() - :QObject( 0, "%{APPNAME}" ) + :TQObject( 0, "%{APPNAME}" ) { } @@ -22,27 +22,27 @@ int %{APPNAME}::position() const return 3; } -QString %{APPNAME}::name() const +TQString %{APPNAME}::name() const { return tr( "MenuApplet Example Name" ); } -QString %{APPNAME}::text() const +TQString %{APPNAME}::text() const { return tr( "Click the white rabbit" ); } -QIconSet %{APPNAME}::icon() const +TQIconSet %{APPNAME}::icon() const { - QPixmap pix; - QImage img = Resource::loadImage( "Tux" ); + TQPixmap pix; + TQImage img = Resource::loadImage( "Tux" ); if ( !img.isNull() ) pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); return pix; } -QPopupMenu* %{APPNAME}::popup(QWidget*) const +TQPopupMenu* %{APPNAME}::popup(TQWidget*) const { /* no subdir */ return 0; @@ -50,7 +50,7 @@ QPopupMenu* %{APPNAME}::popup(QWidget*) const void %{APPNAME}::activated() { - QMessageBox::information(0,tr("No white rabbit found"), + TQMessageBox::information(0,tr("No white rabbit found"), tr("No white rabbit was seen near Opie." "Only the beautiful OpieZilla is available" "for your pleassure")); diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h index 3961e3c4..b384ee2d 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.h +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h @@ -3,9 +3,9 @@ #include -#include +#include -class %{APPNAME} : public QObject, public MenuAppletInterface +class %{APPNAME} : public TQObject, public MenuAppletInterface { Q_OBJECT @@ -19,13 +19,13 @@ public: virtual int position() const; - virtual QString name ( ) const; - virtual QIconSet icon ( ) const; - virtual QString text ( ) const; - /* virtual QString tr( const char* ) const; - virtual QString tr( const char*, const char* ) const; + virtual TQString name ( ) const; + virtual TQIconSet icon ( ) const; + virtual TQString text ( ) const; + /* virtual TQString tr( const char* ) const; + virtual TQString tr( const char*, const char* ) const; */ - virtual QPopupMenu *popup ( QWidget *parent ) const; + virtual TQPopupMenu *popup ( TQWidget *parent ) const; virtual void activated ( ); }; diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h index 9158a7c8..7a8882b4 100644 --- a/languages/cpp/app_templates/opienet/simmplemodule.h +++ b/languages/cpp/app_templates/opienet/simmplemodule.h @@ -12,17 +12,17 @@ public: VirtualModule(); ~VirtualModule(); - const QString type() {return QString::fromLatin1("vpn" );} - void setProfile( const QString& ) {} + const TQString type() {return TQString::fromLatin1("vpn" );} + void setProfile( const TQString& ) {} bool isOwner( Interface* ); - QWidget *configure( Interface* ); - QWidget *information( Interface* ); + TQWidget *configure( Interface* ); + TQWidget *information( Interface* ); QList getInterfaces(); - void possibleNewInterfaces( QMap& ); - Interface *addNewInterface( const QString& ); + void possibleNewInterfaces( TQMap& ); + Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - QString getPixmapName( Interface* ) {return QString::fromLatin1("Tux"); } - void receive( const QCString&, const QByteArray& ar ) {} // don't listen + TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: QList m_interfaces; }; diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp index 9182a2f9..bbabcbda 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.cpp +++ b/languages/cpp/app_templates/opienet/simpleiface.cpp @@ -1,6 +1,6 @@ #include "%{APPNAMELC}iface.h" -%{APPNAME}Interface::%{APPNAME}Interface( QObject* parent, +%{APPNAME}Interface::%{APPNAME}Interface( TQObject* parent, const char* name, bool status ) : Interface(parent, name, status ) @@ -16,7 +16,7 @@ bool %{APPNAME}Interface::refresh() { * something actual existing * I take wlan0 in my case */ - QString old = getInterfaceName(); + TQString old = getInterfaceName(); qWarning("Interface name was " + old ); setInterfaceName( "wlan0" ); diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h index f235c160..ef514697 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.h +++ b/languages/cpp/app_templates/opienet/simpleiface.h @@ -7,7 +7,7 @@ class %{APPNAME}Interface : public Interface { Q_OBJECT public: - %{APPNAME}Interface(QObject* parent, const char* name = "vpn", bool up = false ); + %{APPNAME}Interface(TQObject* parent, const char* name = "vpn", bool up = false ); ~%{APPNAME}Interface(); public slots: diff --git a/languages/cpp/app_templates/opienet/simplemodule.cpp b/languages/cpp/app_templates/opienet/simplemodule.cpp index a67974a8..0a96c844 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.cpp +++ b/languages/cpp/app_templates/opienet/simplemodule.cpp @@ -1,4 +1,4 @@ -#include +#include #include @@ -32,12 +32,12 @@ bool %{APPNAME}Module::isOwner( Interface* iface ) { return m_interfaces.find( iface ) != -1; } -QWidget* %{APPNAME}Module::configure( Interface* ) { +TQWidget* %{APPNAME}Module::configure( Interface* ) { /* We don't have any Config for now */ return 0l; } -QWidget* %{APPNAME}Module::information( Interface* iface ) { +TQWidget* %{APPNAME}Module::information( Interface* iface ) { return new InterfaceInformationImp(0, "Interface info", iface ); } @@ -45,13 +45,13 @@ QList %{APPNAME}Module::getInterfaces() { return m_interfaces; } -void %{APPNAME}Module::possibleNewInterfaces( QMap& map) { - map.insert( QObject::tr("VPN PPTP"), - QObject::tr("Add new Point to Point Tunnel Protocol connection" ) ); +void %{APPNAME}Module::possibleNewInterfaces( TQMap& map) { + map.insert( TQObject::tr("VPN PPTP"), + TQObject::tr("Add new Point to Point Tunnel Protocol connection" ) ); } -Interface* %{APPNAME}Module::addNewInterface( const QString& ) { +Interface* %{APPNAME}Module::addNewInterface( const TQString& ) { /* check the str if we support more interfaces */ /* Interface* iface = new %{APPNAME}Interface( 0 ); diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h index 1b02b688..4120d811 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.h +++ b/languages/cpp/app_templates/opienet/simplemodule.h @@ -12,17 +12,17 @@ public: %{APPNAME}Module(); ~%{APPNAME}Module(); - const QString type() {return QString::fromLatin1("vpn" );} - void setProfile( const QString& ) {} + const TQString type() {return TQString::fromLatin1("vpn" );} + void setProfile( const TQString& ) {} bool isOwner( Interface* ); - QWidget *configure( Interface* ); - QWidget *information( Interface* ); + TQWidget *configure( Interface* ); + TQWidget *information( Interface* ); QList getInterfaces(); - void possibleNewInterfaces( QMap& ); - Interface *addNewInterface( const QString& ); + void possibleNewInterfaces( TQMap& ); + Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - QString getPixmapName( Interface* ) {return QString::fromLatin1("Tux"); } - void receive( const QCString&, const QByteArray& ar ) {} // don't listen + TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: QList m_interfaces; }; diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp index 3d32b274..c7df8069 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp +++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp @@ -9,8 +9,8 @@ delete (%{APPNAME}Widget*)m_widget; } -QString %{APPNAME}::pluginName() const { - return QObject::tr( "%{APPNAME}" ); +TQString %{APPNAME}::pluginName() const { + return TQObject::tr( "%{APPNAME}" ); } double %{APPNAME}::versionNumber() const { @@ -18,11 +18,11 @@ double %{APPNAME}::versionNumber() const { } // this sets the image that will be shown on the left side of the plugin -QString %{APPNAME}::pixmapNameWidget() const { - return QString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}"); +TQString %{APPNAME}::pixmapNameWidget() const { + return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}"); } -QWidget* %{APPNAME}::widget( QWidget * wid ) { +TQWidget* %{APPNAME}::widget( TQWidget * wid ) { if(!m_widget) { m_widget = new %{APPNAME}Widget( wid, "%{APPNAME}" ); } @@ -31,18 +31,18 @@ QWidget* %{APPNAME}::widget( QWidget * wid ) { // that would be the icon of the config widget in todays config view -QString %{APPNAME}::pixmapNameConfig() const { +TQString %{APPNAME}::pixmapNameConfig() const { return 0l; } // No config widget yet, look at the datebook plugin for an example of that -TodayConfigWidget* %{APPNAME}::configWidget( QWidget* /*parent*/ ) { +TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*parent*/ ) { return 0l; } // add the binary name of the app to launch here -QString %{APPNAME}::appName() const { - return QString::null; +TQString %{APPNAME}::appName() const { + return TQString::null; } // if the plugin should be excluded form the refresh cycles that can be set in the today app diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.h b/languages/cpp/app_templates/opietoday/exampleplugin.h index b321f434..ebd44ba5 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.h +++ b/languages/cpp/app_templates/opietoday/exampleplugin.h @@ -1,8 +1,8 @@ #ifndef %{APPNAME}_PLUGIN_H #define %{APPNAME}_PLUGIN_H -#include -#include +#include +#include #include #include @@ -16,19 +16,19 @@ public: %{APPNAME}(); ~%{APPNAME}(); - QString pluginName() const; + TQString pluginName() const; double versionNumber() const; - QString pixmapNameWidget() const; - QWidget* widget(QWidget *); - QString pixmapNameConfig() const; - TodayConfigWidget* configWidget(QWidget *); - QString appName() const; + TQString pixmapNameWidget() const; + TQWidget* widget(TQWidget *); + TQString pixmapNameConfig() const; + TodayConfigWidget* configWidget(TQWidget *); + TQString appName() const; bool excludeFromRefresh() const; void refresh(); void reinitialize(); private: - QGuardedPtr<%{APPNAME}Widget> m_widget; + TQGuardedPtr<%{APPNAME}Widget> m_widget; }; #endif diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp index b0cb0dcc..a80dad81 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget( QWidget *parent, const char* name) - : QWidget(parent, name ) { +%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *parent, const char* name) + : TQWidget(parent, name ) { m_exampleLabel = 0l; m_layout = 0l; @@ -17,12 +17,12 @@ // that should be triggered when clicked are defined in slotClicked() // of course also normal widgets can be used. m_exampleLabel = new OClickableLabel( this ); - connect( m_exampleLabel, SIGNAL( clicked() ), this, SLOT( slotClicked() ) ); + connect( m_exampleLabel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); if ( m_layout ) { delete m_layout; } - m_layout = new QHBoxLayout( this ); + m_layout = new TQHBoxLayout( this ); m_layout->setAutoAdd( true ); readConfig(); diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index 26a72128..53a67b18 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -1,16 +1,16 @@ #ifndef %{APPNAME}_PLUGIN_WIDGET_H #define %{APPNAME}_PLUGIN_WIDGET_H -#include +#include #include -class %{APPNAME}Widget : public QWidget { +class %{APPNAME}Widget : public TQWidget { Q_OBJECT public: - %{APPNAME}Widget( QWidget *parent, const char *name ); + %{APPNAME}Widget( TQWidget *parent, const char *name ); ~%{APPNAME}Widget(); void refresh(); @@ -20,7 +20,7 @@ private slots: private: OClickableLabel* m_exampleLabel; - QHBoxLayout* m_layout; + TQHBoxLayout* m_layout; void readConfig(); void getInfo(); }; diff --git a/languages/cpp/app_templates/qmakeapp/main.cpp b/languages/cpp/app_templates/qmakeapp/main.cpp index bd26f19a..8938adc5 100644 --- a/languages/cpp/app_templates/qmakeapp/main.cpp +++ b/languages/cpp/app_templates/qmakeapp/main.cpp @@ -1,13 +1,13 @@ %{CPP_TEMPLATE} -#include +#include #include "%{APPNAMELC}.h" int main( int argc, char ** argv ) { - QApplication a( argc, argv ); + TQApplication a( argc, argv ); %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); + a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index 841f88d4..973aee2c 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -2,120 +2,120 @@ #include "%{APPNAMELC}.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "filesave.xpm" #include "fileopen.xpm" #include "fileprint.xpm" %{APPNAME}::%{APPNAME}() - : QMainWindow( 0, "%{APPNAME}", WDestructiveClose ) + : TQMainWindow( 0, "%{APPNAME}", WDestructiveClose ) { printer = new QPrinter; - QPixmap openIcon, saveIcon, printIcon; + TQPixmap openIcon, saveIcon, printIcon; - QToolBar * fileTools = new QToolBar( this, "file operations" ); + TQToolBar * fileTools = new TQToolBar( this, "file operations" ); fileTools->setLabel( tr("File Operations") ); - openIcon = QPixmap( fileopen ); - QToolButton * fileOpen - = new QToolButton( openIcon, tr("Open File"), QString::null, - this, SLOT(choose()), fileTools, "open file" ); + openIcon = TQPixmap( fileopen ); + TQToolButton * fileOpen + = new TQToolButton( openIcon, tr("Open File"), TQString::null, + this, TQT_SLOT(choose()), fileTools, "open file" ); - saveIcon = QPixmap( filesave ); - QToolButton * fileSave - = new QToolButton( saveIcon, tr("Save File"), QString::null, - this, SLOT(save()), fileTools, "save file" ); + saveIcon = TQPixmap( filesave ); + TQToolButton * fileSave + = new TQToolButton( saveIcon, tr("Save File"), TQString::null, + this, TQT_SLOT(save()), fileTools, "save file" ); - printIcon = QPixmap( fileprint ); - QToolButton * filePrint - = new QToolButton( printIcon, tr("Print File"), QString::null, - this, SLOT(print()), fileTools, "print file" ); + printIcon = TQPixmap( fileprint ); + TQToolButton * filePrint + = new TQToolButton( printIcon, tr("Print File"), TQString::null, + this, TQT_SLOT(print()), fileTools, "print file" ); - (void)QWhatsThis::whatsThisButton( fileTools ); + (void)TQWhatsThis::whatsThisButton( fileTools ); - QString fileOpenText = tr("

    " + TQString fileOpenText = tr("

    " "Click this button to open a new file.
    " "You can also select the Open command " "from the File menu.

    "); - QWhatsThis::add( fileOpen, fileOpenText ); + TQWhatsThis::add( fileOpen, fileOpenText ); - QMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); + TQMimeSourceFactory::defaultFactory()->setPixmap( "fileopen", openIcon ); - QString fileSaveText = tr("

    Click this button to save the file you " + TQString fileSaveText = tr("

    Click this button to save the file you " "are editing. You will be prompted for a file name.\n" "You can also select the Save command " "from the File menu.

    "); - QWhatsThis::add( fileSave, fileSaveText ); + TQWhatsThis::add( fileSave, fileSaveText ); - QString filePrintText = tr("Click this button to print the file you " + TQString filePrintText = tr("Click this button to print the file you " "are editing.\n You can also select the Print " "command from the File menu."); - QWhatsThis::add( filePrint, filePrintText ); + TQWhatsThis::add( filePrint, filePrintText ); - QPopupMenu * file = new QPopupMenu( this ); + TQPopupMenu * file = new TQPopupMenu( this ); menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, SLOT(choose()), CTRL+Key_O ); + this, TQT_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, SLOT(save()), CTRL+Key_S ); + this, TQT_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, SLOT(print()), CTRL+Key_P ); + this, TQT_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), qApp, SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); - QPopupMenu * help = new QPopupMenu( this ); + TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, SLOT(about()), Key_F1 ); - help->insertItem( tr("About &Qt"), this, SLOT(aboutQt()) ); + help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); - e = new QTextEdit( this, "editor" ); + e = new TQTextEdit( this, "editor" ); e->setFocus(); setCentralWidget( e ); statusBar()->message( tr("Ready"), 2000 ); @@ -140,7 +140,7 @@ void %{APPNAME}::newDoc() void %{APPNAME}::choose() { - QString fn = QFileDialog::getOpenFileName( QString::null, QString::null, + TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this); if ( !fn.isEmpty() ) load( fn ); @@ -149,13 +149,13 @@ void %{APPNAME}::choose() } -void %{APPNAME}::load( const QString &fileName ) +void %{APPNAME}::load( const TQString &fileName ) { - QFile f( fileName ); + TQFile f( fileName ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); + TQTextStream ts( &f ); e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); @@ -170,15 +170,15 @@ void %{APPNAME}::save() return; } - QString text = e->text(); - QFile f( filename ); + TQString text = e->text(); + TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { statusBar()->message( tr("Could not write to %1").arg(filename), 2000 ); return; } - QTextStream t( &f ); + TQTextStream t( &f ); t << text; f.close(); @@ -192,7 +192,7 @@ void %{APPNAME}::save() void %{APPNAME}::saveAs() { - QString fn = QFileDialog::getSaveFileName( QString::null, QString::null, + TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) { filename = fn; @@ -205,25 +205,25 @@ void %{APPNAME}::saveAs() void %{APPNAME}::print() { - // ###### Rewrite to use QSimpleRichText to print here as well + // ###### Rewrite to use TQSimpleRichText to print here as well const int Margin = 10; int pageNo = 1; if ( printer->setup(this) ) { // printer dialog statusBar()->message( tr("Printing...") ); - QPainter p; + TQPainter p; if( !p.begin( printer ) ) // paint on printer return; p.setFont( e->font() ); int yPos = 0; // y-position for each line - QFontMetrics fm = p.fontMetrics(); - QPaintDeviceMetrics metrics( printer ); // need width/height + TQFontMetrics fm = p.fontMetrics(); + TQPaintDeviceMetrics metrics( printer ); // need width/height // of printer surface for( int i = 0 ; i < e->lines() ; i++ ) { if ( Margin + yPos > metrics.height() - Margin ) { - QString msg( "Printing (page " ); - msg += QString::number( ++pageNo ); + TQString msg( "Printing (page " ); + msg += TQString::number( ++pageNo ); msg += ")..."; statusBar()->message( msg ); printer->newPage(); // no more room on this page @@ -242,14 +242,14 @@ void %{APPNAME}::print() } } -void %{APPNAME}::closeEvent( QCloseEvent* ce ) +void %{APPNAME}::closeEvent( TQCloseEvent* ce ) { if ( !e->isModified() ) { ce->accept(); return; } - switch( QMessageBox::information( this, tr("Qt Application Example"), + switch( TQMessageBox::information( this, tr("Qt Application Example"), tr("Do you want to save the changes" " to the document?"), tr("Yes"), tr("No"), tr("Cancel"), @@ -271,13 +271,13 @@ void %{APPNAME}::closeEvent( QCloseEvent* ce ) void %{APPNAME}::about() { - QMessageBox::about( this, tr("Qt Application Example"), + TQMessageBox::about( this, tr("Qt Application Example"), tr("This example demonstrates simple use of " - "QMainWindow,\nQMenuBar and QToolBar.")); + "TQMainWindow,\nQMenuBar and TQToolBar.")); } void %{APPNAME}::aboutQt() { - QMessageBox::aboutQt( this, tr("Qt Application Example") ); + TQMessageBox::aboutQt( this, tr("Qt Application Example") ); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.h b/languages/cpp/app_templates/qmakeapp/qmakeapp.h index 2d372da9..48bf459a 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.h +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.h @@ -3,7 +3,7 @@ #ifndef %{APPNAMEUC}_H #define %{APPNAMEUC}_H -#include +#include class QTextEdit; @@ -16,12 +16,12 @@ public: ~%{APPNAME}(); protected: - void closeEvent( QCloseEvent* ); + void closeEvent( TQCloseEvent* ); private slots: void newDoc(); void choose(); - void load( const QString &fileName ); + void load( const TQString &fileName ); void save(); void saveAs(); void print(); @@ -30,9 +30,9 @@ private slots: void aboutQt(); private: - QPrinter *printer; - QTextEdit *e; - QString filename; + TQPrinter *printer; + TQTextEdit *e; + TQString filename; }; diff --git a/languages/cpp/app_templates/qt4makeapp/main.cpp b/languages/cpp/app_templates/qt4makeapp/main.cpp index 3416347e..4f6295a2 100644 --- a/languages/cpp/app_templates/qt4makeapp/main.cpp +++ b/languages/cpp/app_templates/qt4makeapp/main.cpp @@ -1,12 +1,12 @@ %{CPP_TEMPLATE} -#include +#include #include "%{APPNAMELC}.h" int main(int argc, char *argv[]) { Q_INIT_RESOURCE(application); - QApplication app(argc, argv); + TQApplication app(argc, argv); %{APPNAME} * mw = new %{APPNAME}(); mw->show(); return app.exec(); diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp index af16391f..11bcf85f 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp @@ -3,10 +3,10 @@ #include #include "%{APPNAMELC}.h" -#include -#include -#include -#include +#include +#include +#include +#include %{APPNAME}::%{APPNAME}() { @@ -20,13 +20,13 @@ readSettings(); - connect(textEdit->document(), SIGNAL(contentsChanged()), - this, SLOT(documentWasModified())); + connect(textEdit->document(), TQT_SIGNAL(contentsChanged()), + this, TQT_SLOT(documentWasModified())); setCurrentFile(""); } -void %{APPNAME}::closeEvent(QCloseEvent *event) +void %{APPNAME}::closeEvent(TQCloseEvent *event) { if (maybeSave()) { writeSettings(); @@ -47,7 +47,7 @@ void %{APPNAME}::newFile() void %{APPNAME}::open() { if (maybeSave()) { - QString fileName = QFileDialog::getOpenFileName(this); + TQString fileName = TQFileDialog::getOpenFileName(this); if (!fileName.isEmpty()) loadFile(fileName); } @@ -64,7 +64,7 @@ bool %{APPNAME}::save() bool %{APPNAME}::saveAs() { - QString fileName = QFileDialog::getSaveFileName(this); + TQString fileName = TQFileDialog::getSaveFileName(this); if (fileName.isEmpty()) return false; @@ -73,7 +73,7 @@ bool %{APPNAME}::saveAs() void %{APPNAME}::about() { - QMessageBox::about(this, tr("About Application"), + TQMessageBox::about(this, tr("About Application"), tr("The Application example demonstrates how to " "write modern GUI applications using Qt, with a menu bar, " "toolbars, and a status bar.")); @@ -86,62 +86,62 @@ void %{APPNAME}::documentWasModified() void %{APPNAME}::createActions() { - newAct = new QAction(QIcon(":/filenew.xpm"), tr("&New"), this); + newAct = new TQAction(QIcon(":/filenew.xpm"), tr("&New"), this); newAct->setShortcut(tr("Ctrl+N")); newAct->setStatusTip(tr("Create a new file")); - connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); + connect(newAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(newFile())); - openAct = new QAction(QIcon(":/fileopen.xpm"), tr("&Open..."), this); + openAct = new TQAction(QIcon(":/fileopen.xpm"), tr("&Open..."), this); openAct->setShortcut(tr("Ctrl+O")); openAct->setStatusTip(tr("Open an existing file")); - connect(openAct, SIGNAL(triggered()), this, SLOT(open())); + connect(openAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(open())); - saveAct = new QAction(QIcon(":/filesave.xpm"), tr("&Save"), this); + saveAct = new TQAction(QIcon(":/filesave.xpm"), tr("&Save"), this); saveAct->setShortcut(tr("Ctrl+S")); saveAct->setStatusTip(tr("Save the document to disk")); - connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); + connect(saveAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(save())); - saveAsAct = new QAction(tr("Save &As..."), this); + saveAsAct = new TQAction(tr("Save &As..."), this); saveAsAct->setStatusTip(tr("Save the document under a new name")); - connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); + connect(saveAsAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(saveAs())); - exitAct = new QAction(tr("E&xit"), this); + exitAct = new TQAction(tr("E&xit"), this); exitAct->setShortcut(tr("Ctrl+Q")); exitAct->setStatusTip(tr("Exit the application")); - connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); + connect(exitAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(close())); - cutAct = new QAction(QIcon(":/editcut.xpm"), tr("Cu&t"), this); + cutAct = new TQAction(QIcon(":/editcut.xpm"), tr("Cu&t"), this); cutAct->setShortcut(tr("Ctrl+X")); cutAct->setStatusTip(tr("Cut the current selection's contents to the " "clipboard")); - connect(cutAct, SIGNAL(triggered()), textEdit, SLOT(cut())); + connect(cutAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(cut())); - copyAct = new QAction(QIcon(":/editcopy.xpm"), tr("&Copy"), this); + copyAct = new TQAction(QIcon(":/editcopy.xpm"), tr("&Copy"), this); copyAct->setShortcut(tr("Ctrl+C")); copyAct->setStatusTip(tr("Copy the current selection's contents to the " "clipboard")); - connect(copyAct, SIGNAL(triggered()), textEdit, SLOT(copy())); + connect(copyAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(copy())); - pasteAct = new QAction(QIcon(":/editpaste.xpm"), tr("&Paste"), this); + pasteAct = new TQAction(QIcon(":/editpaste.xpm"), tr("&Paste"), this); pasteAct->setShortcut(tr("Ctrl+V")); pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " "selection")); - connect(pasteAct, SIGNAL(triggered()), textEdit, SLOT(paste())); + connect(pasteAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(paste())); - aboutAct = new QAction(tr("&About"), this); + aboutAct = new TQAction(tr("&About"), this); aboutAct->setStatusTip(tr("Show the application's About box")); - connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); + connect(aboutAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(about())); - aboutQtAct = new QAction(tr("About &Qt"), this); + aboutQtAct = new TQAction(tr("About &Qt"), this); aboutQtAct->setStatusTip(tr("Show the Qt library's About box")); - connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); + connect(aboutQtAct, TQT_SIGNAL(triggered()), qApp, TQT_SLOT(aboutQt())); cutAct->setEnabled(false); copyAct->setEnabled(false); - connect(textEdit, SIGNAL(copyAvailable(bool)), - cutAct, SLOT(setEnabled(bool))); - connect(textEdit, SIGNAL(copyAvailable(bool)), - copyAct, SLOT(setEnabled(bool))); + connect(textEdit, TQT_SIGNAL(copyAvailable(bool)), + cutAct, TQT_SLOT(setEnabled(bool))); + connect(textEdit, TQT_SIGNAL(copyAvailable(bool)), + copyAct, TQT_SLOT(setEnabled(bool))); } void %{APPNAME}::createMenus() @@ -186,16 +186,16 @@ void %{APPNAME}::createStatusBar() void %{APPNAME}::readSettings() { - QSettings settings("Trolltech", "Application Example"); - QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint(); - QSize size = settings.value("size", QSize(400, 400)).toSize(); + TQSettings settings("Trolltech", "Application Example"); + TQPoint pos = settings.value("pos", TQPoint(200, 200)).toPoint(); + TQSize size = settings.value("size", TQSize(400, 400)).toSize(); resize(size); move(pos); } void %{APPNAME}::writeSettings() { - QSettings settings("Trolltech", "Application Example"); + TQSettings settings("Trolltech", "Application Example"); settings.setValue("pos", pos()); settings.setValue("size", size()); } @@ -203,68 +203,68 @@ void %{APPNAME}::writeSettings() bool %{APPNAME}::maybeSave() { if (textEdit->document()->isModified()) { - int ret = QMessageBox::warning(this, tr("Application"), + int ret = TQMessageBox::warning(this, tr("Application"), tr("The document has been modified.\n" "Do you want to save your changes?"), - QMessageBox::Yes | QMessageBox::Default, - QMessageBox::No, - QMessageBox::Cancel | QMessageBox::Escape); - if (ret == QMessageBox::Yes) + TQMessageBox::Yes | TQMessageBox::Default, + TQMessageBox::No, + TQMessageBox::Cancel | TQMessageBox::Escape); + if (ret == TQMessageBox::Yes) return save(); - else if (ret == QMessageBox::Cancel) + else if (ret == TQMessageBox::Cancel) return false; } return true; } -void %{APPNAME}::loadFile(const QString &fileName) +void %{APPNAME}::loadFile(const TQString &fileName) { - QFile file(fileName); - if (!file.open(QFile::ReadOnly | QFile::Text)) { - QMessageBox::warning(this, tr("Application"), + TQFile file(fileName); + if (!file.open(TQFile::ReadOnly | TQFile::Text)) { + TQMessageBox::warning(this, tr("Application"), tr("Cannot read file %1:\n%2.") .arg(fileName) .arg(file.errorString())); return; } - QTextStream in(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); + TQTextStream in(&file); + TQApplication::setOverrideCursor(Qt::WaitCursor); textEdit->setPlainText(in.readAll()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); setCurrentFile(fileName); statusBar()->showMessage(tr("File loaded"), 2000); } -bool %{APPNAME}::saveFile(const QString &fileName) +bool %{APPNAME}::saveFile(const TQString &fileName) { - QFile file(fileName); - if (!file.open(QFile::WriteOnly | QFile::Text)) { - QMessageBox::warning(this, tr("Application"), + TQFile file(fileName); + if (!file.open(TQFile::WriteOnly | TQFile::Text)) { + TQMessageBox::warning(this, tr("Application"), tr("Cannot write file %1:\n%2.") .arg(fileName) .arg(file.errorString())); return false; } - QTextStream out(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); + TQTextStream out(&file); + TQApplication::setOverrideCursor(Qt::WaitCursor); out << textEdit->toPlainText(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); setCurrentFile(fileName); statusBar()->showMessage(tr("File saved"), 2000); return true; } -void %{APPNAME}::setCurrentFile(const QString &fileName) +void %{APPNAME}::setCurrentFile(const TQString &fileName) { curFile = fileName; textEdit->document()->setModified(false); setWindowModified(false); - QString shownName; + TQString shownName; if (curFile.isEmpty()) shownName = "untitled.txt"; else @@ -273,9 +273,9 @@ void %{APPNAME}::setCurrentFile(const QString &fileName) setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application"))); } -QString %{APPNAME}::strippedName(const QString &fullFileName) +TQString %{APPNAME}::strippedName(const TQString &fullFileName) { - return QFileInfo(fullFileName).fileName(); + return TQFileInfo(fullFileName).fileName(); } %{APPNAME}::~%{APPNAME}() diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h index cd470d00..8140766b 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h @@ -3,8 +3,8 @@ #ifndef %{APPNAMEUC}_H #define %{APPNAMEUC}_H -#include -#include +#include +#include class QAction; class QMenu; @@ -19,7 +19,7 @@ public: ~%{APPNAME}(); protected: - void closeEvent(QCloseEvent *event); + void closeEvent(TQCloseEvent *event); private slots: void newFile(); @@ -37,29 +37,29 @@ private: void readSettings(); void writeSettings(); bool maybeSave(); - void loadFile(const QString &fileName); - bool saveFile(const QString &fileName); - void setCurrentFile(const QString &fileName); - QString strippedName(const QString &fullFileName); + void loadFile(const TQString &fileName); + bool saveFile(const TQString &fileName); + void setCurrentFile(const TQString &fileName); + TQString strippedName(const TQString &fullFileName); - QTextEdit *textEdit; - QString curFile; + TQTextEdit *textEdit; + TQString curFile; QMenu *fileMenu; QMenu *editMenu; QMenu *helpMenu; - QToolBar *fileToolBar; - QToolBar *editToolBar; - QAction *newAct; - QAction *openAct; - QAction *saveAct; - QAction *saveAsAct; - QAction *exitAct; - QAction *cutAct; - QAction *copyAct; - QAction *pasteAct; - QAction *aboutAct; - QAction *aboutQtAct; + TQToolBar *fileToolBar; + TQToolBar *editToolBar; + TQAction *newAct; + TQAction *openAct; + TQAction *saveAct; + TQAction *saveAsAct; + TQAction *exitAct; + TQAction *cutAct; + TQAction *copyAct; + TQAction *pasteAct; + TQAction *aboutAct; + TQAction *aboutQtAct; }; #endif diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp index a35d57cb..45331649 100644 --- a/languages/cpp/app_templates/qtopia4app/example.cpp +++ b/languages/cpp/app_templates/qtopia4app/example.cpp @@ -1,9 +1,9 @@ #include "%{APPNAMELC}.h" -#include +#include -%{APPNAME}Base::%{APPNAME}Base( QWidget *parent, Qt::WFlags f ) - : QWidget( parent, f ) +%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, Qt::WFlags f ) + : TQWidget( parent, f ) { setupUi( this ); } @@ -16,10 +16,10 @@ * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( QWidget *parent, Qt::WFlags f ) +%{APPNAME}::%{APPNAME}( TQWidget *parent, Qt::WFlags f ) : %{APPNAME}Base( parent, f ) { - connect(quit, SIGNAL(clicked()), this, SLOT(goodBye())); + connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h index 7d58c7d8..5bfc69ba 100644 --- a/languages/cpp/app_templates/qtopia4app/example.h +++ b/languages/cpp/app_templates/qtopia4app/example.h @@ -3,10 +3,10 @@ #define %{APPNAMEUC}_H #include "ui_%{APPNAMELC}base.h" -class %{APPNAME}Base : public QWidget, public Ui_%{APPNAME}Base +class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base { public: - %{APPNAME}Base( QWidget *parent = 0, Qt::WFlags f = 0 ); + %{APPNAME}Base( TQWidget *parent = 0, Qt::WFlags f = 0 ); virtual ~%{APPNAME}Base(); }; @@ -14,7 +14,7 @@ class %{APPNAME} : public %{APPNAME}Base { Q_OBJECT public: - %{APPNAME}( QWidget *parent = 0, Qt::WFlags f = 0 ); + %{APPNAME}( TQWidget *parent = 0, Qt::WFlags f = 0 ); virtual ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp index 939f708e..a849977d 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.cpp +++ b/languages/cpp/app_templates/qtopiaapp/example.cpp @@ -1,15 +1,15 @@ #include "%{APPNAMELC}.h" -#include +#include /* * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( QWidget* parent, const char* name, WFlags fl ) +%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, SIGNAL(clicked()), this, SLOT(goodBye())); + connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h index 883cb27d..42dfc2dd 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.h +++ b/languages/cpp/app_templates/qtopiaapp/example.h @@ -8,7 +8,7 @@ class %{APPNAME} : public %{APPNAME}Base Q_OBJECT public: - %{APPNAME}( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp index d21f4782..a6ef1a2b 100644 --- a/languages/cpp/ast_utils.cpp +++ b/languages/cpp/ast_utils.cpp @@ -12,8 +12,8 @@ #include "ast_utils.h" #include "ast.h" -#include -#include +#include +#include #include #include @@ -40,8 +40,8 @@ AST* findNodeAt( AST* node, int line, int column ) ( line < endLine || ( line == endLine && column < endColumn ) ) ) { - QPtrList children = node->children(); - QPtrListIterator it( children ); + TQPtrList children = node->children(); + TQPtrListIterator it( children ); while ( it.current() ) { AST * a = it.current(); @@ -58,7 +58,7 @@ AST* findNodeAt( AST* node, int line, int column ) return 0; } -void scopeOfNode( AST* ast, QStringList& scope ) +void scopeOfNode( AST* ast, TQStringList& scope ) { if ( !ast ) return ; @@ -66,14 +66,14 @@ void scopeOfNode( AST* ast, QStringList& scope ) if ( ast->parent() ) scopeOfNode( ast->parent(), scope ); - QString s; + TQString s; switch ( ast->nodeType() ) { case NodeType_ClassSpecifier: if ( ( ( ClassSpecifierAST* ) ast ) ->name() ) { s = ( ( ClassSpecifierAST* ) ast ) ->name() ->text(); - s = s.isEmpty() ? QString::fromLatin1( "" ) : s; + s = s.isEmpty() ? TQString::fromLatin1( "" ) : s; scope.push_back( s ); } break; @@ -81,7 +81,7 @@ void scopeOfNode( AST* ast, QStringList& scope ) case NodeType_Namespace: { AST* namespaceName = ( ( NamespaceAST* ) ast ) ->namespaceName(); - s = namespaceName ? namespaceName->text() : QString::fromLatin1( "" ); + s = namespaceName ? namespaceName->text() : TQString::fromLatin1( "" ); scope.push_back( s ); } break; @@ -95,8 +95,8 @@ void scopeOfNode( AST* ast, QStringList& scope ) if ( !d->declaratorId() ) break; - QPtrList l = d->declaratorId() ->classOrNamespaceNameList(); - QPtrListIterator nameIt( l ); + TQPtrList l = d->declaratorId() ->classOrNamespaceNameList(); + TQPtrListIterator nameIt( l ); while ( nameIt.current() ) { AST * name = nameIt.current() ->name(); @@ -113,25 +113,25 @@ void scopeOfNode( AST* ast, QStringList& scope ) } -QString typeSpecToString( TypeSpecifierAST* typeSpec ) /// @todo remove +TQString typeSpecToString( TypeSpecifierAST* typeSpec ) /// @todo remove { if ( !typeSpec ) - return QString::null; + return TQString::null; - return typeSpec->text().replace( QRegExp( " :: " ), "::" ); + return typeSpec->text().replace( TQRegExp( " :: " ), "::" ); } -QString declaratorToString( DeclaratorAST* declarator, const QString& scope, bool skipPtrOp ) +TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, bool skipPtrOp ) { if ( !declarator ) - return QString::null; + return TQString::null; - QString text; + TQString text; if ( !skipPtrOp ) { - QPtrList ptrOpList = declarator->ptrOpList(); - for ( QPtrListIterator it( ptrOpList ); it.current(); ++it ) + TQPtrList ptrOpList = declarator->ptrOpList(); + for ( TQPtrListIterator it( ptrOpList ); it.current(); ++it ) { text += it.current() ->text(); } @@ -141,13 +141,13 @@ QString declaratorToString( DeclaratorAST* declarator, const QString& scope, boo text += scope; if ( declarator->subDeclarator() ) - text += QString::fromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + QString::fromLatin1( ")" ); + text += TQString::fromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::fromLatin1( ")" ); if ( declarator->declaratorId() ) text += declarator->declaratorId() ->text(); - QPtrList arrays = declarator->arrayDimensionList(); - QPtrListIterator it( arrays ); + TQPtrList arrays = declarator->arrayDimensionList(); + TQPtrListIterator it( arrays ); while ( it.current() ) { text += "[]"; @@ -161,12 +161,12 @@ QString declaratorToString( DeclaratorAST* declarator, const QString& scope, boo ParameterDeclarationListAST* l = declarator->parameterDeclarationClause() ->parameterDeclarationList(); if ( l != 0 ) { - QPtrList params = l->parameterList(); - QPtrListIterator it( params ); + TQPtrList params = l->parameterList(); + TQPtrListIterator it( params ); while ( it.current() ) { - QString type = typeSpecToString( it.current() ->typeSpec() ); + TQString type = typeSpecToString( it.current() ->typeSpec() ); text += type; if ( !type.isEmpty() ) text += " "; @@ -185,6 +185,6 @@ QString declaratorToString( DeclaratorAST* declarator, const QString& scope, boo text += " const"; } - return text.replace( QRegExp( " :: " ), "::" ).simplifyWhiteSpace(); + return text.replace( TQRegExp( " :: " ), "::" ).simplifyWhiteSpace(); } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/ast_utils.h b/languages/cpp/ast_utils.h index ce9ec99f..1a1c1813 100644 --- a/languages/cpp/ast_utils.h +++ b/languages/cpp/ast_utils.h @@ -12,7 +12,7 @@ #ifndef __ast_utils_h #define __ast_utils_h -#include +#include class AST; class DeclaratorAST; @@ -25,9 +25,9 @@ namespace KTextEditor } AST* findNodeAt( AST* unit, int line, int column ); -void scopeOfNode( AST* ast, QStringList& ); -QString typeSpecToString( TypeSpecifierAST* typeSpec ); -QString declaratorToString( DeclaratorAST* declarator, const QString& scope = QString::null, bool skipPtrOp = false ); +void scopeOfNode( AST* ast, TQStringList& ); +TQString typeSpecToString( TypeSpecifierAST* typeSpec ); +TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString::null, bool skipPtrOp = false ); #endif // __ast_utils_h // kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index ed51d0c6..d3f9c2ee 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -18,7 +18,7 @@ #include "kdevdeepcopy.h" #include "kdevdriver.h" -#include +#include #include #include @@ -32,11 +32,11 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include class BackgroundKDevDriver : public KDevDriver { @@ -44,7 +44,7 @@ public: BackgroundKDevDriver( CppSupportPart* cppSupport, BackgroundParser* bp ) : KDevDriver( cppSupport, false ), m_backgroundParser(bp) { } virtual void fileParsed( ParsedFile& fileName ); - virtual void addDependence( const QString& fileName, const Dependence& dep ); + virtual void addDependence( const TQString& fileName, const Dependence& dep ); private: BackgroundParser* m_backgroundParser; }; @@ -53,8 +53,8 @@ private: class KDevSourceProvider: public SourceProvider { public: - //Deadlock is a mutex that is locked when KDevSourceProvider::contents(..) is used, and that should be unlocked before QApplication is locked(that way a deadlock where the thread that holds the QApplication-mutex and tries to lock the given mutex, while the thread that calls contents(..) and holds the given mutex and tries to lock the QApplication-mutex, cannot happen) - KDevSourceProvider( CppSupportPart* cppSupport, QMutex& deadlock ) + //Deadlock is a mutex that is locked when KDevSourceProvider::contents(..) is used, and that should be unlocked before TQApplication is locked(that way a deadlock where the thread that holds the QApplication-mutex and tries to lock the given mutex, while the thread that calls contents(..) and holds the given mutex and tries to lock the QApplication-mutex, cannot happen) + KDevSourceProvider( CppSupportPart* cppSupport, TQMutex& deadlock ) : m_cppSupport( cppSupport ), m_readFromDisk( false ), m_deadlock(deadlock) @@ -69,9 +69,9 @@ public: return m_readFromDisk; } - virtual QString contents( const QString& fileName ) + virtual TQString contents( const TQString& fileName ) { - QString contents = QString::null; + TQString contents = TQString::null; if ( !m_readFromDisk ) { @@ -81,8 +81,8 @@ public: //kdDebug(9007) << "-------> kapp locked" << endl; - QPtrList parts( *m_cppSupport->partController() ->parts() ); - QPtrListIterator it( parts ); + TQPtrList parts( *m_cppSupport->partController() ->parts() ); + TQPtrListIterator it( parts ); while ( it.current() ) { KTextEditor::Document * doc = dynamic_cast( it.current() ); @@ -92,7 +92,7 @@ public: if ( !doc || !editIface || doc->url().path() != fileName ) continue; - contents = QString( editIface->text().ascii() ); // deep copy + contents = TQString( editIface->text().ascii() ); // deep copy //kdDebug(9007) << "-------> kapp unlocked" << endl; @@ -105,12 +105,12 @@ public: //kdDebug(9007) << "-------> kapp unlocked" << endl; } - if( m_readFromDisk || contents == QString::null ) + if( m_readFromDisk || contents == TQString::null ) { - QFile f( fileName ); + TQFile f( fileName ); if ( f.open( IO_ReadOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); contents = stream.read(); f.close(); } @@ -119,7 +119,7 @@ public: return contents; } - virtual bool isModified( const QString& fileName ) + virtual bool isModified( const TQString& fileName ) { bool ret = false; m_deadlock.unlock(); @@ -139,7 +139,7 @@ public: private: CppSupportPart* m_cppSupport; bool m_readFromDisk; - QMutex& m_deadlock; + TQMutex& m_deadlock; private: KDevSourceProvider( const KDevSourceProvider& source ); void operator = ( const KDevSourceProvider& source ); @@ -156,52 +156,52 @@ public: bool isEmpty() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList.empty(); } uint count() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList.size(); } QPair front() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList.front(); } void clear() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.clear(); } - void push_front( const QString& fileName, bool readFromDisk = false ) + void push_front( const TQString& fileName, bool readFromDisk = false ) { SafeString s( fileName.ascii() ); - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.push_front( qMakePair( s, readFromDisk ) ); } - void push_back( const QString& fileName, bool readFromDisk = false ) + void push_back( const TQString& fileName, bool readFromDisk = false ) { SafeString s( fileName.ascii() ); - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.push_back( qMakePair( s, readFromDisk ) ); } void pop_front() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.pop_front(); } - int count( const QString& fileName ) const { + int count( const TQString& fileName ) const { int c = 0; - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); ListType::const_iterator it = m_fileList.begin(); while ( it != m_fileList.end() ) { @@ -214,15 +214,15 @@ public: QPair takeFront() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); QPair ret = m_fileList.front(); m_fileList.pop_front(); return ret; } - bool contains( const QString& fileName ) const + bool contains( const TQString& fileName ) const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); ListType::const_iterator it = m_fileList.begin(); while ( it != m_fileList.end() ) { @@ -233,9 +233,9 @@ public: return false; } - void remove( const QString& fileName ) + void remove( const TQString& fileName ) { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); ListType::iterator it = m_fileList.begin(); while ( it != m_fileList.end() ) { @@ -247,20 +247,20 @@ public: } private: - mutable QMutex m_mutex; + mutable TQMutex m_mutex; ListType m_fileList; }; -BackgroundParser::BackgroundParser( CppSupportPart* part, QWaitCondition* consumed ) +BackgroundParser::BackgroundParser( CppSupportPart* part, TQWaitCondition* consumed ) : m_consumed( consumed ), m_cppSupport( part ), m_close( false ), m_saveMemory( false ) { m_fileList = new SynchronizedFileList(); m_driver = new BackgroundKDevDriver( m_cppSupport, this ); m_driver->setSourceProvider( new KDevSourceProvider( m_cppSupport, m_mutex ) ); - QString conf_file_name = m_cppSupport->specialHeaderName(); + TQString conf_file_name = m_cppSupport->specialHeaderName(); m_mutex.lock(); - if ( QFile::exists( conf_file_name ) ) + if ( TQFile::exists( conf_file_name ) ) m_driver->parseFile( conf_file_name, true, true, true ); m_mutex.unlock(); @@ -278,9 +278,9 @@ BackgroundParser::~BackgroundParser() m_fileList = 0; } -void BackgroundParser::addFile( const QString& fileName, bool readFromDisk ) +void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk ) { - QString fn = deepCopy( fileName ); + TQString fn = deepCopy( fileName ); //bool added = false; /*if ( !m_fileList->contains( fn ) ) @@ -294,9 +294,9 @@ void BackgroundParser::addFile( const QString& fileName, bool readFromDisk ) m_canParse.wakeAll(); } -void BackgroundParser::addFileFront( const QString& fileName, bool readFromDisk ) +void BackgroundParser::addFileFront( const TQString& fileName, bool readFromDisk ) { - QString fn = deepCopy( fileName ); + TQString fn = deepCopy( fileName ); bool added = false; /*if ( m_fileList->contains( fn ) ) @@ -312,9 +312,9 @@ void BackgroundParser::addFileFront( const QString& fileName, bool readFromDisk void BackgroundParser::removeAllFiles() { kdDebug( 9007 ) << "BackgroundParser::removeAllFiles()" << endl; - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); - QMap::Iterator it = m_unitDict.begin(); + TQMap::Iterator it = m_unitDict.begin(); while ( it != m_unitDict.end() ) { Unit * unit = it.data(); @@ -329,9 +329,9 @@ void BackgroundParser::removeAllFiles() m_isEmpty.wakeAll(); } -void BackgroundParser::removeFile( const QString& fileName ) +void BackgroundParser::removeFile( const TQString& fileName ) { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); Unit* unit = findUnit( fileName ); if ( unit ) @@ -347,7 +347,7 @@ void BackgroundParser::removeFile( const QString& fileName ) m_isEmpty.wakeAll(); } -void BackgroundKDevDriver::addDependence( const QString& fileName, const Dependence& dep ) { +void BackgroundKDevDriver::addDependence( const TQString& fileName, const Dependence& dep ) { //give waiting threads a chance to perform their actions m_backgroundParser->m_mutex.unlock(); m_backgroundParser->m_mutex.lock(); @@ -358,7 +358,7 @@ void BackgroundKDevDriver::fileParsed( ParsedFile& fileName ) { m_backgroundParser->fileParsed( fileName ); } -void BackgroundParser::parseFile( const QString& fileName, bool readFromDisk, bool lock ) +void BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk, bool lock ) { if( lock ) m_mutex.lock(); @@ -374,9 +374,9 @@ void BackgroundParser::parseFile( const QString& fileName, bool readFromDisk, bo m_mutex.unlock(); } -QValueList cloneProblemList( const QValueList& list ) { - QValueList ret; - for( QValueList::const_iterator it = list.begin(); it != list.end(); ++it ) { +TQValueList cloneProblemList( const TQValueList& list ) { + TQValueList ret; + for( TQValueList::const_iterator it = list.begin(); it != list.end(); ++it ) { ret << Problem( *it, true ); } return ret; @@ -389,13 +389,13 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { ParsedFilePointer translationUnit; //Since the lexer-cache keeps many QStrings like macro-names used in the background, everything must be copied here. The safest solution is just //serializing and deserializing the whole thing(the serialization does not respect the AST, but that can be copied later because that's safe) - QMemArray data; + TQMemArray data; { - QDataStream stream( data, IO_WriteOnly ); + TQDataStream stream( data, IO_WriteOnly ); translationUnitUnsafe->write( stream ); } { - QDataStream stream( data, IO_ReadOnly ); + TQDataStream stream( data, IO_ReadOnly ); translationUnit = new ParsedFile( stream ); } @@ -422,24 +422,24 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { KApplication::postEvent( m_cppSupport, new FileParsedEvent( file.fileName(), unit->problems, m_readFromDisk ) ); - m_currentFile = QString::null; + m_currentFile = TQString::null; if ( m_fileList->isEmpty() ) m_isEmpty.wakeAll(); } -Unit* BackgroundParser::findUnit( const QString& fileName ) +Unit* BackgroundParser::findUnit( const TQString& fileName ) { - QMap::Iterator it = m_unitDict.find( fileName ); + TQMap::Iterator it = m_unitDict.find( fileName ); return it != m_unitDict.end() ? *it : 0; } -bool BackgroundParser::hasTranslationUnit( const QString& fileName ) { - QMap::Iterator it = m_unitDict.find( fileName ); +bool BackgroundParser::hasTranslationUnit( const TQString& fileName ) { + TQMap::Iterator it = m_unitDict.find( fileName ); return it != m_unitDict.end(); } -ParsedFilePointer BackgroundParser::translationUnit( const QString& fileName ) +ParsedFilePointer BackgroundParser::translationUnit( const TQString& fileName ) { Unit * u = findUnit( fileName ); if ( u == 0 ) @@ -453,7 +453,7 @@ ParsedFilePointer BackgroundParser::translationUnit( const QString& fileName ) return u->translationUnit; } -QValueList BackgroundParser::problems( const QString& fileName, bool readFromDisk, bool forceParse ) +TQValueList BackgroundParser::problems( const TQString& fileName, bool readFromDisk, bool forceParse ) { Q_UNUSED(readFromDisk); Unit * u = findUnit( fileName ); @@ -465,13 +465,13 @@ QValueList BackgroundParser::problems( const QString& fileName, bool re u = parseFile( fileName, readFromDisk ); */ } - return u ? u->problems : QValueList(); + return u ? u->problems : TQValueList(); } void BackgroundParser::close() { { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_close = true; m_canParse.wakeAll(); } @@ -484,28 +484,28 @@ void BackgroundParser::close() bool BackgroundParser::filesInQueue() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList->count() || !m_currentFile.isEmpty(); } -int BackgroundParser::countInQueue( const QString& file ) const { +int BackgroundParser::countInQueue( const TQString& file ) const { return m_fileList->count( file ); } void BackgroundParser::updateParserConfiguration() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_driver->setup(); - QString conf_file_name = m_cppSupport->specialHeaderName(); + TQString conf_file_name = m_cppSupport->specialHeaderName(); m_driver->removeAllMacrosInFile( conf_file_name ); m_driver->parseFile( conf_file_name, true, true, true ); } void BackgroundParser::run() { - // (void) m_cppSupport->codeCompletion()->repository()->getEntriesInScope( QStringList(), false ); + // (void) m_cppSupport->codeCompletion()->repository()->getEntriesInScope( TQStringList(), false ); while ( !m_close ) { @@ -527,20 +527,20 @@ void BackgroundParser::run() break; QPair entry = m_fileList->takeFront(); - QString fileName = entry.first.c_str(); + TQString fileName = entry.first.c_str(); bool readFromDisk = entry.second; m_currentFile = deepCopy(fileName); ( void ) parseFile( fileName, readFromDisk, true ); - m_currentFile = QString::null; + m_currentFile = TQString::null; } kdDebug( 9007 ) << "!!!!!!!!!!!!!!!!!! BG PARSER DESTROYED !!!!!!!!!!!!" << endl; // adymo: commented to fix #88091 -// QThread::exit(); +// TQThread::exit(); } void BackgroundParser::saveMemory() { diff --git a/languages/cpp/backgroundparser.h b/languages/cpp/backgroundparser.h index 2bbf1173..6bbec3fc 100644 --- a/languages/cpp/backgroundparser.h +++ b/languages/cpp/backgroundparser.h @@ -15,10 +15,10 @@ #include "ast.h" #include "driver.h" -#include -#include -#include -#include +#include +#include +#include +#include #include class CppSupportPart; @@ -35,8 +35,8 @@ public: translationUnit = 0; } - QString fileName; - QValueList problems; + TQString fileName; + TQValueList problems; ParsedFilePointer translationUnit; protected: @@ -47,10 +47,10 @@ protected: class BackgroundParser: public QThread { public: - BackgroundParser( CppSupportPart*, QWaitCondition* consumed ); + BackgroundParser( CppSupportPart*, TQWaitCondition* consumed ); virtual ~BackgroundParser(); - QMutex& mutex() + TQMutex& mutex() { return m_mutex; } @@ -63,27 +63,27 @@ public: m_mutex.unlock(); } - QWaitCondition& canParse() + TQWaitCondition& canParse() { return m_canParse; } - QWaitCondition& isEmpty() + TQWaitCondition& isEmpty() { return m_isEmpty; } bool filesInQueue(); - int countInQueue( const QString& file ) const; + int countInQueue( const TQString& file ) const; - void addFile( const QString& fileName, bool readFromDisk = false ); - void addFileFront( const QString& fileName, bool readFromDisk = false ); - void removeFile( const QString& fileName ); + void addFile( const TQString& fileName, bool readFromDisk = false ); + void addFileFront( const TQString& fileName, bool readFromDisk = false ); + void removeFile( const TQString& fileName ); void removeAllFiles(); - bool hasTranslationUnit( const QString& fileName ); - ParsedFilePointer translationUnit( const QString& fileName ); - QValueList problems( const QString& fileName , bool readFromDisk = false, bool forceParse = false ); + bool hasTranslationUnit( const TQString& fileName ); + ParsedFilePointer translationUnit( const TQString& fileName ); + TQValueList problems( const TQString& fileName , bool readFromDisk = false, bool forceParse = false ); void updateParserConfiguration(); ///Should be run on a regular basis(every X minutes). It reduces some caches etc. BackgroundParser must be locked before. @@ -96,21 +96,21 @@ public: protected: friend class BackgroundKDevDriver; void fileParsed( ParsedFile& fileName ); - Unit* findUnit( const QString& fileName ); - void parseFile( const QString& fileName, bool readFromDisk, bool lock = false ) + Unit* findUnit( const TQString& fileName ); + void parseFile( const TQString& fileName, bool readFromDisk, bool lock = false ) ; private: class KDevDriver* m_driver; - QString m_currentFile; - QWaitCondition m_canParse; - QWaitCondition m_isEmpty; - QWaitCondition* m_consumed; - QMutex m_mutex; + TQString m_currentFile; + TQWaitCondition m_canParse; + TQWaitCondition m_isEmpty; + TQWaitCondition* m_consumed; + TQMutex m_mutex; SynchronizedFileList* m_fileList; CppSupportPart* m_cppSupport; bool m_close; - QMap m_unitDict; + TQMap m_unitDict; bool m_saveMemory; //used to prevent blocking //State of parseFile(..): diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 09b13938..44ce91c2 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -10,19 +10,19 @@ * * ***************************************************************************/ // qt includes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // kde includes #include @@ -60,19 +60,19 @@ using namespace std; -CCConfigWidget::CCConfigWidget( CppSupportPart* part, QWidget* parent, const char* name ) +CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const char* name ) : CCConfigWidgetBase( parent, name ) { m_pPart = part; - connect( m_pPart->codeRepository(), SIGNAL( catalogRegistered( Catalog* ) ), - this, SLOT( catalogRegistered( Catalog* ) ) ); - connect( m_pPart->codeRepository(), SIGNAL( catalogUnregistered( Catalog* ) ), - this, SLOT( catalogUnregistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ), + this, TQT_SLOT( catalogRegistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogUnregistered( Catalog* ) ), + this, TQT_SLOT( catalogUnregistered( Catalog* ) ) ); - connect( m_qtDir, SIGNAL(urlSelected(const QString &)), - this, SLOT(isValidQtDir(const QString &))); - connect( m_qtDir, SIGNAL(textChanged(const QString &)), - this, SLOT(isValidQtDir(const QString &))); + connect( m_qtDir, TQT_SIGNAL(urlSelected(const TQString &)), + this, TQT_SLOT(isValidQtDir(const TQString &))); + connect( m_qtDir, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SLOT(isValidQtDir(const TQString &))); initGeneralTab( ); initQtTab(); @@ -85,7 +85,7 @@ CCConfigWidget::CCConfigWidget( CppSupportPart* part, QWidget* parent, const cha void CCConfigWidget::initGeneralTab( ) { - QDomDocument dom = *m_pPart->projectDom(); + TQDomDocument dom = *m_pPart->projectDom(); interface_suffix->setText( DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfacesuffix", ".h" ) ); implementation_suffix->setText( DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/implementationsuffix", ".cpp" ) ); @@ -112,7 +112,7 @@ void CCConfigWidget::accept( ) void CCConfigWidget::saveFileTemplatesTab( ) { - QDomDocument dom = *m_pPart->projectDom(); + TQDomDocument dom = *m_pPart->projectDom(); DomUtil::writeEntry( dom, "/cppsupportpart/filetemplates/interfacesuffix", interface_suffix->text() ); DomUtil::writeEntry( dom, "/cppsupportpart/filetemplates/implementationsuffix", implementation_suffix->text() ); @@ -157,12 +157,12 @@ void CCConfigWidget::initCodeCompletionTab( ) break; }*/ - QValueList catalogs = m_pPart->codeRepository() ->registeredCatalogs(); - for ( QValueList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) + TQValueList catalogs = m_pPart->codeRepository() ->registeredCatalogs(); + for ( TQValueList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { Catalog* c = *it; - QFileInfo dbInfo( c->dbName() ); - QCheckListItem* item = new QCheckListItem( advancedOptions, KURL::decode_string( dbInfo.baseName(true) ), QCheckListItem::CheckBox ); + TQFileInfo dbInfo( c->dbName() ); + TQCheckListItem* item = new TQCheckListItem( advancedOptions, KURL::decode_string( dbInfo.baseName(true) ), TQCheckListItem::CheckBox ); item->setOn( c->enabled() ); m_catalogs[ item ] = c; @@ -203,7 +203,7 @@ void CCConfigWidget::saveCodeCompletionTab( ) if( radioGroupByAlphabet->isChecked() ) c->setCompletionBoxItemOrder( CppCodeCompletionConfig::ByAlphabet );*/ - for ( QMap::Iterator it = m_catalogs.begin(); it != m_catalogs.end(); ++it ) + for ( TQMap::Iterator it = m_catalogs.begin(); it != m_catalogs.end(); ++it ) { it.data() ->setEnabled( it.key() ->isOn() ); } @@ -229,11 +229,11 @@ void CCConfigWidget::slotRemovePCS() if ( !advancedOptions->selectedItem() ) return ; - QString db = advancedOptions->selectedItem() ->text( 0 ); - QString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db ); + TQString db = advancedOptions->selectedItem() ->text( 0 ); + TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db ); KStandardDirs *dirs = m_pPart->instance() ->dirs(); - QString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db"; + TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db"; if ( KMessageBox::Continue == KMessageBox::warningContinueCancel( 0, question, i18n( "Delete Database" ), KStdGuiItem::del() ) ) { @@ -243,8 +243,8 @@ void CCConfigWidget::slotRemovePCS() void CCConfigWidget::catalogRegistered( Catalog * c ) { - QFileInfo dbInfo( c->dbName() ); - QCheckListItem* item = new QCheckListItem( advancedOptions, KURL::decode_string( dbInfo.baseName(true) ), QCheckListItem::CheckBox ); + TQFileInfo dbInfo( c->dbName() ); + TQCheckListItem* item = new TQCheckListItem( advancedOptions, KURL::decode_string( dbInfo.baseName(true) ), TQCheckListItem::CheckBox ); item->setOn( c->enabled() ); m_catalogs[ item ] = c; @@ -252,11 +252,11 @@ void CCConfigWidget::catalogRegistered( Catalog * c ) void CCConfigWidget::catalogUnregistered( Catalog * c ) { - for ( QMap::Iterator it = m_catalogs.begin(); it != m_catalogs.end(); ++it ) + for ( TQMap::Iterator it = m_catalogs.begin(); it != m_catalogs.end(); ++it ) { if ( it.data() == c ) { - QCheckListItem * item = it.key(); + TQCheckListItem * item = it.key(); delete( item ); m_catalogs.remove( it ); break; @@ -284,16 +284,16 @@ void CCConfigWidget::slotGetterSetterValuesChanged( ) bool hasError = false; if ( m_edtParameterName->text().isEmpty() ) { - m_lblParameterName->setPaletteForegroundColor( QColor( "red" ) ); + m_lblParameterName->setPaletteForegroundColor( TQColor( "red" ) ); m_edtExampleGet->setText( "error, missing parametername" ); m_edtExampleSet->setText( "error, missing parametername" ); hasError = true; } - QString name = m_edtVariableName->text(); + TQString name = m_edtVariableName->text(); if ( name.isEmpty() ) { - m_lblVariableName->setPaletteForegroundColor( QColor( "red" ) ); + m_lblVariableName->setPaletteForegroundColor( TQColor( "red" ) ); m_edtExampleGet->setText( "error, missing variablename" ); m_edtExampleSet->setText( "error, missing variablename" ); hasError = true; @@ -301,23 +301,23 @@ void CCConfigWidget::slotGetterSetterValuesChanged( ) if ( hasError ) { - m_edtExampleGet->setPaletteForegroundColor( QColor( "red" ) ); - m_edtExampleSet->setPaletteForegroundColor( QColor( "red" ) ); + m_edtExampleGet->setPaletteForegroundColor( TQColor( "red" ) ); + m_edtExampleSet->setPaletteForegroundColor( TQColor( "red" ) ); return ; } else { - m_lblVariableName->setPaletteForegroundColor( QColor( "black" ) ); - m_lblParameterName->setPaletteForegroundColor( QColor( "black" ) ); - m_edtExampleGet->setPaletteForegroundColor( QColor( "black" ) ); - m_edtExampleSet->setPaletteForegroundColor( QColor( "black" ) ); + m_lblVariableName->setPaletteForegroundColor( TQColor( "black" ) ); + m_lblParameterName->setPaletteForegroundColor( TQColor( "black" ) ); + m_edtExampleGet->setPaletteForegroundColor( TQColor( "black" ) ); + m_edtExampleSet->setPaletteForegroundColor( TQColor( "black" ) ); } - QStringList prefixes = QStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ); + TQStringList prefixes = TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ); unsigned int len = 0; - QStringList::ConstIterator theend = prefixes.end(); - for ( QStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) + TQStringList::ConstIterator theend = prefixes.end(); + for ( TQStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) { if ( name.startsWith( *ci ) && ( *ci ).length() > len ) len = ( *ci ).length(); @@ -326,14 +326,14 @@ void CCConfigWidget::slotGetterSetterValuesChanged( ) if ( len > 0 ) name.remove( 0, len ); - QString getName = name; + TQString getName = name; if ( !m_edtGet->text().isEmpty() ) { getName[ 0 ] = getName[ 0 ].upper(); getName.prepend( m_edtGet->text() ); } - QString setName = name; + TQString setName = name; if ( !m_edtSet->text().isEmpty() ) { setName[ 0 ] = setName[ 0 ].upper(); @@ -355,7 +355,7 @@ void CCConfigWidget::saveGetterSetterTab( ) config->setPrefixGet( m_edtGet->text() ); config->setPrefixSet( m_edtSet->text() ); - config->setPrefixVariable( QStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ) ); + config->setPrefixVariable( TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ) ); config->setParameterName( m_edtParameterName->text() ); config->store(); } @@ -370,7 +370,7 @@ void CCConfigWidget::initSplitTab( ) m_splitEnable->setChecked( config->splitEnabled() ); m_splitSync->setChecked( config->autoSync() ); - QString o = config->orientation(); + TQString o = config->orientation(); m_splitVertical->setChecked( o == "Vertical" ); m_splitHorizontal->setChecked( o == "Horizontal" ); } @@ -453,29 +453,29 @@ void CCConfigWidget::initQtTab() } } -bool CCConfigWidget::isExecutable( const QString& path ) +bool CCConfigWidget::isExecutable( const TQString& path ) { - QFileInfo fi(path); + TQFileInfo fi(path); return ( fi.exists() && fi.isExecutable() ); } -void CCConfigWidget::isQMakeExecutable( const QString& path ) +void CCConfigWidget::isQMakeExecutable( const TQString& path ) { if( !isExecutable( path ) ) { - m_qmakePath->lineEdit()->setPaletteForegroundColor(QColor("#ff0000")); + m_qmakePath->lineEdit()->setPaletteForegroundColor(TQColor("#ff0000")); }else { m_qmakePath->lineEdit()->unsetPalette(); } } -void CCConfigWidget::isDesignerExecutable( const QString& path ) +void CCConfigWidget::isDesignerExecutable( const TQString& path ) { if( !isExecutable( path ) ) { - m_designerPath->lineEdit()->setPaletteForegroundColor(QColor("#ff0000")); + m_designerPath->lineEdit()->setPaletteForegroundColor(TQColor("#ff0000")); }else { m_designerPath->lineEdit()->unsetPalette(); @@ -519,14 +519,14 @@ void CCConfigWidget::saveQtTab() c->store(); } -void CCConfigWidget::isValidQtDir( const QString &dir ) +void CCConfigWidget::isValidQtDir( const TQString &dir ) { - QFileInfo inc( dir + QString( QChar( QDir::separator() ) )+ - "include"+QString( QChar( QDir::separator() ) )+ - "qt.h" ); + TQFileInfo inc( dir + TQString( TQChar( TQDir::separator() ) )+ + "include"+TQString( TQChar( TQDir::separator() ) )+ + "tqt.h" ); if ( !m_versionQt4->isChecked() && !inc.exists() ) { - m_qtDir->lineEdit()->setPaletteForegroundColor(QColor("#ff0000")); + m_qtDir->lineEdit()->setPaletteForegroundColor(TQColor("#ff0000")); }else { m_qtDir->lineEdit()->unsetPalette(); @@ -561,13 +561,13 @@ void CCConfigWidget::openPluginPaths() kdDebug(9024) << "Plugin paths opened" << endl; QtBuildConfig* c = m_pPart->qtBuildConfig(); KDialog d( this ); - QVBoxLayout* mainlayout = new QVBoxLayout( &d ); + TQVBoxLayout* mainlayout = new TQVBoxLayout( &d ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d ); - connect( ok, SIGNAL(clicked()), &d, SLOT(accept())); + connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept())); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d ); - connect( cancel, SIGNAL(clicked()), &d, SLOT(reject())); - QHBoxLayout* btns = new QHBoxLayout( &d ); - btns->addItem( new QSpacerItem(10,10,QSizePolicy::Expanding) ); + connect( cancel, TQT_SIGNAL(clicked()), &d, TQT_SLOT(reject())); + TQHBoxLayout* btns = new TQHBoxLayout( &d ); + btns->addItem( new TQSpacerItem(10,10,TQSizePolicy::Expanding) ); btns->addWidget(ok); btns->addWidget(cancel); @@ -579,7 +579,7 @@ void CCConfigWidget::openPluginPaths() mainlayout->addWidget( p ); mainlayout->addLayout( btns ); d.resize( 450, 250 ); - if( d.exec() == QDialog::Accepted) + if( d.exec() == TQDialog::Accepted) { c->setDesignerPluginPaths( p->items() ); } diff --git a/languages/cpp/ccconfigwidget.h b/languages/cpp/ccconfigwidget.h index b8874ed2..8dd8c9a3 100644 --- a/languages/cpp/ccconfigwidget.h +++ b/languages/cpp/ccconfigwidget.h @@ -13,7 +13,7 @@ #define _CCCONFIGWIDGET_H_ #include "ccconfigwidgetbase.h" -#include +#include class CppSupportPart; class Catalog; @@ -25,7 +25,7 @@ class CCConfigWidget : public CCConfigWidgetBase Q_OBJECT public: - CCConfigWidget( CppSupportPart* part, QWidget* parent = 0, const char* name = 0 ); + CCConfigWidget( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); virtual ~CCConfigWidget( ); public slots: @@ -39,14 +39,14 @@ protected slots: private slots: void catalogRegistered( Catalog* c ); void catalogUnregistered( Catalog* c ); - void isValidQtDir( const QString & ); - void isDesignerExecutable( const QString& ); - void isQMakeExecutable( const QString& ); + void isValidQtDir( const TQString & ); + void isDesignerExecutable( const TQString& ); + void isQMakeExecutable( const TQString& ); void toggleQtVersion( bool ); void openPluginPaths( ); private: - bool isExecutable( const QString & ); + bool isExecutable( const TQString & ); void initGeneralTab(); void saveFileTemplatesTab(); @@ -65,7 +65,7 @@ private: private: CppSupportPart* m_pPart; - QMap m_catalogs; + TQMap m_catalogs; KEditListBox* m_designerPluginPaths; }; diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp index c6049801..70ad5d10 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -21,7 +21,7 @@ #include "cppsupportfactory.h" #include "classgeneratorconfig.h" -ClassGeneratorConfig::ClassGeneratorConfig( QWidget* parent, const char* name, WFlags fl ) +ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* parent, const char* name, WFlags fl ) : ClassGeneratorConfigBase( parent, name, fl ) { readConfig(); @@ -29,12 +29,12 @@ ClassGeneratorConfig::ClassGeneratorConfig( QWidget* parent, const char* name, W template_edit->setText( *currTemplate ); } -ClassGeneratorConfig::ClassGeneratorConfig( QString v_cppHeaderText, QString v_cppSourceText, - QString v_objcHeaderText, QString v_objcSourceText, - QString v_gtkHeaderText, QString v_gtkSourceText, +ClassGeneratorConfig::ClassGeneratorConfig( TQString v_cppHeaderText, TQString v_cppSourceText, + TQString v_objcHeaderText, TQString v_objcSourceText, + TQString v_gtkHeaderText, TQString v_gtkSourceText, NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase, bool v_showAuthor, bool v_genDoc, bool v_reformat, - QWidget* parent, const char* name, WFlags fl ) + TQWidget* parent, const char* name, WFlags fl ) : ClassGeneratorConfigBase( parent, name, fl ), cppHeaderText( v_cppHeaderText ), cppSourceText( v_cppSourceText ), objcHeaderText( v_objcHeaderText ), objcSourceText( v_objcSourceText ), @@ -62,42 +62,42 @@ void ClassGeneratorConfig::templateTypeChanged( int type ) template_edit->setText( *currTemplate ); } -QString ClassGeneratorConfig::cppHeader() +TQString ClassGeneratorConfig::cppHeader() { if ( currTemplate == &cppHeaderText ) * currTemplate = template_edit->text(); return cppHeaderText; } -QString ClassGeneratorConfig::cppSource() +TQString ClassGeneratorConfig::cppSource() { if ( currTemplate == &cppSourceText ) * currTemplate = template_edit->text(); return cppSourceText; } -QString ClassGeneratorConfig::objcHeader() +TQString ClassGeneratorConfig::objcHeader() { if ( currTemplate == &objcHeaderText ) * currTemplate = template_edit->text(); return objcHeaderText; } -QString ClassGeneratorConfig::objcSource() +TQString ClassGeneratorConfig::objcSource() { if ( currTemplate == &objcSourceText ) * currTemplate = template_edit->text(); return objcSourceText; } -QString ClassGeneratorConfig::gtkHeader() +TQString ClassGeneratorConfig::gtkHeader() { if ( currTemplate == >kHeaderText ) * currTemplate = template_edit->text(); return gtkHeaderText; } -QString ClassGeneratorConfig::gtkSource() +TQString ClassGeneratorConfig::gtkSource() { if ( currTemplate == >kSourceText ) * currTemplate = template_edit->text(); @@ -129,7 +129,7 @@ bool ClassGeneratorConfig::genDoc() return doc_box->isChecked(); } -QString *ClassGeneratorConfig::identifyTemplate( int value ) +TQString *ClassGeneratorConfig::identifyTemplate( int value ) { switch ( value ) { @@ -177,15 +177,15 @@ void ClassGeneratorConfig::readConfig() } -QString ClassGeneratorConfig::templateText( QString path ) +TQString ClassGeneratorConfig::templateText( TQString path ) { - QFileInfo f( path ); + TQFileInfo f( path ); if ( f.exists() ) { - QFile file( path ); + TQFile file( path ); if ( file.open( IO_ReadOnly ) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); return stream.read(); } else @@ -222,12 +222,12 @@ void ClassGeneratorConfig::storeConfig() } } -void ClassGeneratorConfig::saveTemplateText( QString path, QString content ) +void ClassGeneratorConfig::saveTemplateText( TQString path, TQString content ) { - QFile f( path ); + TQFile f( path ); if ( f.open( IO_WriteOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << content; f.close(); } diff --git a/languages/cpp/classgeneratorconfig.h b/languages/cpp/classgeneratorconfig.h index b9cb08a3..783934d4 100644 --- a/languages/cpp/classgeneratorconfig.h +++ b/languages/cpp/classgeneratorconfig.h @@ -21,26 +21,26 @@ class ClassGeneratorConfig : public ClassGeneratorConfigBase public: enum NameCase { LowerCase, UpperCase, SameAsClassCase, SameAsFileCase }; - ClassGeneratorConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ClassGeneratorConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ClassGeneratorConfig( QString v_cppHeaderText, QString v_cppSourceText, - QString v_objcHeaderText, QString v_objcSourceText, - QString v_gtkHeaderText, QString v_gtkSourceText, + ClassGeneratorConfig( TQString v_cppHeaderText, TQString v_cppSourceText, + TQString v_objcHeaderText, TQString v_objcSourceText, + TQString v_gtkHeaderText, TQString v_gtkSourceText, NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase, bool v_showAuthor, bool v_genDoc, bool v_reformat, - QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~ClassGeneratorConfig(); /*$PUBLIC_FUNCTIONS$*/ void readConfig(); - QString cppHeader(); - QString cppSource(); - QString objcHeader(); - QString objcSource(); - QString gtkHeader(); - QString gtkSource(); + TQString cppHeader(); + TQString cppSource(); + TQString objcHeader(); + TQString objcSource(); + TQString gtkHeader(); + TQString gtkSource(); NameCase fileCase(); NameCase defCase(); @@ -61,18 +61,18 @@ protected slots: virtual void templateTypeChanged( int type ); private: - QString *identifyTemplate( int value ); - QString templateText( QString path ); - void saveTemplateText( QString path, QString content ); - - QString cppHeaderText; - QString cppSourceText; - QString objcHeaderText; - QString objcSourceText; - QString gtkHeaderText; - QString gtkSourceText; - - QString *currTemplate; + TQString *identifyTemplate( int value ); + TQString templateText( TQString path ); + void saveTemplateText( TQString path, TQString content ); + + TQString cppHeaderText; + TQString cppSourceText; + TQString objcHeaderText; + TQString objcSourceText; + TQString gtkHeaderText; + TQString gtkSourceText; + + TQString *currTemplate; }; #endif diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index 5bb22a68..e71f3a66 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -16,17 +16,17 @@ #include /// @todo move in utils.cpp -static QValueList -my_unique( const QValueList& entryList ) +static TQValueList +my_unique( const TQValueList& entryList ) { - QValueList< KTextEditor::CompletionEntry > l; - QMap map; - QValueList< KTextEditor::CompletionEntry >::ConstIterator it = entryList.begin(); + TQValueList< KTextEditor::CompletionEntry > l; + TQMap map; + TQValueList< KTextEditor::CompletionEntry >::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { KTextEditor::CompletionEntry e = *it++; - QString key = e.type + " " + + TQString key = e.type + " " + e.text + " " + e.prefix + " " + e.postfix + " "; @@ -46,14 +46,14 @@ CodeInformationRepository::CodeInformationRepository( KDevCodeRepository* rep ) CodeInformationRepository::~CodeInformationRepository() {} -QValueList CodeInformationRepository::query( const QValueList & args ) +TQValueList CodeInformationRepository::query( const TQValueList & args ) { // kdDebug( 9007 ) << "CodeInformationRepository::query()" << endl; - QValueList tags; + TQValueList tags; - QValueList catalogs = m_rep->registeredCatalogs(); - QValueList::Iterator it = catalogs.begin(); + TQValueList catalogs = m_rep->registeredCatalogs(); + TQValueList::Iterator it = catalogs.begin(); while ( it != catalogs.end() ) { Catalog * catalog = *it; @@ -68,36 +68,36 @@ QValueList CodeInformationRepository::query( const QValueList CodeInformationRepository::getTagsInFile( const QString & fileName ) +TQValueList CodeInformationRepository::getTagsInFile( const TQString & fileName ) { kdDebug( 9007 ) << "CodeInformationRepository::getTagsInFile()" << endl; - QValueList args; + TQValueList args; args << Catalog::QueryArgument( "fileName", fileName ); - QValueList catalogs = m_rep->registeredCatalogs(); - QValueList::Iterator it = catalogs.begin(); + TQValueList catalogs = m_rep->registeredCatalogs(); + TQValueList::Iterator it = catalogs.begin(); while ( it != catalogs.end() ) { Catalog * catalog = *it; ++it; - QValueList tags = catalog->query( args ); + TQValueList tags = catalog->query( args ); if ( tags.size() ) return tags; } - return QValueList(); + return TQValueList(); } -QValueList CodeInformationRepository::getTagsInScope( const QStringList & scope, bool // isInstance +TQValueList CodeInformationRepository::getTagsInScope( const TQStringList & scope, bool // isInstance ) { kdDebug( 9007 ) << "CodeInformationRepository::getTagsInScope()" << endl; - QValueList tags; - QValueList args; + TQValueList tags; + TQValueList args; #if 0 @@ -133,7 +133,7 @@ QValueList CodeInformationRepository::getTagsInScope( const QStringList & s return tags; } -QValueList CodeInformationRepository::getEntriesInScope( const QStringList & scope, bool isInstance, bool recompute ) +TQValueList CodeInformationRepository::getEntriesInScope( const TQStringList & scope, bool isInstance, bool recompute ) { kdDebug( 9007 ) << "CodeInformationRepository::getEntriesInScope()" << endl; @@ -149,14 +149,14 @@ QValueList CodeInformationRepository::getEntriesIn } -QValueList CodeInformationRepository::getBaseClassList( const QString& className ) +TQValueList CodeInformationRepository::getBaseClassList( const TQString& className ) { // kdDebug( 9007 ) << "CodeInformationRepository::getBaseClassList()" << endl; if ( className.isEmpty() ) - return QValueList(); + return TQValueList(); - QValueList args; + TQValueList args; args << Catalog::QueryArgument( "kind", Tag::Kind_Base_class ); /* if( className.length() >= 2 ) args << Catalog::QueryArgument( "prefix", className.left(2) );*/ @@ -164,12 +164,12 @@ QValueList CodeInformationRepository::getBaseClassList( const QString& clas return query( args ); } -QValueList CodeInformationRepository::getClassOrNamespaceList( const QStringList & scope ) +TQValueList CodeInformationRepository::getClassOrNamespaceList( const TQStringList & scope ) { kdDebug( 9007 ) << "CodeInformationRepository::getClassOrNamespaceList()" << endl; - QValueList tags; - QValueList args; + TQValueList tags; + TQValueList args; args << Catalog::QueryArgument( "kind", Tag::Kind_Namespace ) << Catalog::QueryArgument( "scope", scope ); @@ -183,10 +183,10 @@ QValueList CodeInformationRepository::getClassOrNamespaceList( const QStrin return tags; } -QValueList CodeInformationRepository::getTagsInScope( const QString & name, const QStringList & scope ) +TQValueList CodeInformationRepository::getTagsInScope( const TQString & name, const TQStringList & scope ) { - QValueList tags; - QValueList args; + TQValueList tags; + TQValueList args; args.clear(); args << Catalog::QueryArgument( "scope", scope ); @@ -233,8 +233,8 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC { CppFunction tagInfo( tag ); - QStringList arguments = tagInfo.arguments(); - QStringList argumentNames = tagInfo.argumentNames(); + TQStringList arguments = tagInfo.arguments(); + TQStringList argumentNames = tagInfo.argumentNames(); if ( completionMode == CppCodeCompletion::VirtualDeclCompletion ) { @@ -252,7 +252,7 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC else entry.text += "( "; - QString signature; + TQString signature; for ( uint i = 0; i < arguments.size(); ++i ) { if( !proc ) @@ -263,9 +263,9 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC if ( completionMode == CppCodeCompletion::NormalCompletion || completionMode == CppCodeCompletion::VirtualDeclCompletion ) { - QString argName = argumentNames[ i ]; + TQString argName = argumentNames[ i ]; if ( !argName.isEmpty() ) - signature += QString::fromLatin1( " " ) + argName; + signature += TQString::fromLatin1( " " ) + argName; } @@ -286,15 +286,15 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC if ( completionMode == CppCodeCompletion::VirtualDeclCompletion ) { entry.text += entry.postfix + ";"; - entry.postfix = QString::null; + entry.postfix = TQString::null; } else if ( completionMode != CppCodeCompletion::NormalCompletion ) { entry.text += entry.postfix; - entry.postfix = QString::null; + entry.postfix = TQString::null; } - QString comment = tag.attribute( "description" ).toString(); + TQString comment = tag.attribute( "description" ).toString(); if ( !comment.isNull() ) entry.comment = comment; //else @@ -317,12 +317,12 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC return entry; } -QValueList CodeInformationRepository::toEntryList( const QValueList & tags, CppCodeCompletion::CompletionMode completionMode ) +TQValueList CodeInformationRepository::toEntryList( const TQValueList & tags, CppCodeCompletion::CompletionMode completionMode ) { - QValueList entryList; - QMap ns; + TQValueList entryList; + TQMap ns; - QValueList::ConstIterator it = tags.begin(); + TQValueList::ConstIterator it = tags.begin(); while ( it != tags.end() ) { Tag tag = *it; diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h index f7fa712a..2c5f4cb2 100644 --- a/languages/cpp/codeinformationrepository.h +++ b/languages/cpp/codeinformationrepository.h @@ -14,13 +14,13 @@ #include "catalog.h" #include "cppcodecompletion.h" -#include +#include #include struct TypeProcessor { - virtual QString processType( const QString& type ) = 0; - virtual QString parentType() = 0; + virtual TQString processType( const TQString& type ) = 0; + virtual TQString parentType() = 0; }; class KDevCodeRepository; @@ -31,21 +31,21 @@ public: CodeInformationRepository( KDevCodeRepository* rep ); virtual ~CodeInformationRepository(); - static QValueList toEntryList( const QValueList& tags, + static TQValueList toEntryList( const TQValueList& tags, CppCodeCompletion::CompletionMode mode = CppCodeCompletion::NormalCompletion ); static KTextEditor::CompletionEntry toEntry( Tag& tag, CppCodeCompletion::CompletionMode mode = CppCodeCompletion::NormalCompletion, TypeProcessor* proc = 0 ); - QValueList getEntriesInScope( const QStringList& scope, bool isInstance, bool recompute = false ); + TQValueList getEntriesInScope( const TQStringList& scope, bool isInstance, bool recompute = false ); - QValueList query( const QValueList& args ); - QValueList getTagsInScope( const QStringList& scope, bool isInstance ); - QValueList getTagsInScope( const QString& name, const QStringList& scope ); + TQValueList query( const TQValueList& args ); + TQValueList getTagsInScope( const TQStringList& scope, bool isInstance ); + TQValueList getTagsInScope( const TQString& name, const TQStringList& scope ); - QValueList getTagsInFile( const QString& fileName ); - QValueList getBaseClassList( const QString& className ); - QValueList getClassOrNamespaceList( const QStringList& scope ); + TQValueList getTagsInFile( const TQString& fileName ); + TQValueList getBaseClassList( const TQString& className ); + TQValueList getClassOrNamespaceList( const TQStringList& scope ); private: - QValueList m_globalEntries; + TQValueList m_globalEntries; KDevCodeRepository* m_rep; private: diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index ac547fc7..8f632d69 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -9,14 +9,14 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -29,11 +29,11 @@ K_EXPORT_COMPONENT_FACTORY( libkdevgccoptions, KGenericFactory class GeneralTab : public QWidget { public: - GeneralTab( GccOptionsPlugin::Type type, QWidget *parent = 0, const char *name = 0 ); + GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~GeneralTab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: FlagCheckBoxController *controller; @@ -43,14 +43,14 @@ private: class OptimizationTab : public QWidget { public: - OptimizationTab( GccOptionsPlugin::Type type, QWidget *parent = 0, const char *name = 0 ); + OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~OptimizationTab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: - QRadioButton *Odefault, *O0, *O1, *O2; + TQRadioButton *Odefault, *O0, *O1, *O2; FlagListBox *optBox; }; @@ -58,11 +58,11 @@ private: class G77Tab : public QWidget { public: - G77Tab( QWidget *parent = 0, const char *name = 0 ); + G77Tab( TQWidget *parent = 0, const char *name = 0 ); ~G77Tab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: FlagCheckBoxController *controller; @@ -72,11 +72,11 @@ private: class Warnings1Tab : public QWidget { public: - Warnings1Tab( GccOptionsPlugin::Type type, QWidget *parent = 0, const char *name = 0 ); + Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~Warnings1Tab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: FlagCheckBoxController *controller; @@ -87,25 +87,25 @@ private: class Warnings2Tab : public QWidget { public: - Warnings2Tab( GccOptionsPlugin::Type type, QWidget *parent = 0, const char *name = 0 ); + Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~Warnings2Tab(); - void readFlags( QStringList *str ); - void writeFlags( QStringList *str ); + void readFlags( TQStringList *str ); + void writeFlags( TQStringList *str ); private: FlagListBox *wrestBox; }; -GeneralTab::GeneralTab( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) - : QWidget( parent, name ), controller( new FlagCheckBoxController ) +GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); layout->addSpacing( 10 ); - QVButtonGroup *output_group = new QVButtonGroup( i18n( "Output" ), this ); + TQVButtonGroup *output_group = new TQVButtonGroup( i18n( "Output" ), this ); new FlagCheckBox( output_group, controller, "-fsyntax-only", i18n( "Only check the code for syntax errors, do not produce object code" ) ); new FlagCheckBox( output_group, controller, @@ -113,10 +113,10 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, QWidget *parent, const char new FlagCheckBox( output_group, controller, "-save-temps", i18n( "Do not delete intermediate output like assembler files" ) ); - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addSpacing( 10 ); - QVButtonGroup *codegen_group = new QVButtonGroup( i18n( "Code Generation" ), this ); + TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); if ( type != GccOptionsPlugin::GPP ) { new FlagCheckBox( codegen_group, controller, @@ -141,7 +141,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, QWidget *parent, const char new FlagCheckBox( codegen_group, controller, "-short-double", i18n( "Make 'double' the same as 'float'" ) ); - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addStretch(); } @@ -152,30 +152,30 @@ GeneralTab::~GeneralTab() } -void GeneralTab::readFlags( QStringList *list ) +void GeneralTab::readFlags( TQStringList *list ) { controller->readFlags( list ); } -void GeneralTab::writeFlags( QStringList *list ) +void GeneralTab::writeFlags( TQStringList *list ) { controller->writeFlags( list ); } -OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) - : QWidget( parent, name ) +OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); - QVButtonGroup *group = new QVButtonGroup( i18n( "Optimization Level" ), this ); - Odefault = new QRadioButton( i18n( "Default" ), group ); + TQVButtonGroup *group = new TQVButtonGroup( i18n( "Optimization Level" ), this ); + Odefault = new TQRadioButton( i18n( "Default" ), group ); Odefault->setChecked( true ); - O0 = new QRadioButton( i18n( "No optimization" ), group ); - O1 = new QRadioButton( i18n( "Level 1" ), group ); - O2 = new QRadioButton( i18n( "Level 2" ), group ); + O0 = new TQRadioButton( i18n( "No optimization" ), group ); + O1 = new TQRadioButton( i18n( "Level 1" ), group ); + O2 = new TQRadioButton( i18n( "Level 2" ), group ); optBox = new FlagListBox( this ); @@ -210,7 +210,7 @@ OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, QWidget *parent, "-fdefault-inline" ); } - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addStretch(); } @@ -219,11 +219,11 @@ OptimizationTab::~OptimizationTab() {} -void OptimizationTab::readFlags( QStringList *list ) +void OptimizationTab::readFlags( TQStringList *list ) { optBox->readFlags( list ); - QStringList::Iterator sli; + TQStringList::Iterator sli; sli = list->find( "-O0" ); if ( sli != list->end() ) { @@ -248,7 +248,7 @@ void OptimizationTab::readFlags( QStringList *list ) } -void OptimizationTab::writeFlags( QStringList *list ) +void OptimizationTab::writeFlags( TQStringList *list ) { optBox->writeFlags( list ); @@ -261,14 +261,14 @@ void OptimizationTab::writeFlags( QStringList *list ) } -G77Tab::G77Tab( QWidget *parent, const char *name ) - : QWidget( parent, name ), controller( new FlagCheckBoxController ) +G77Tab::G77Tab( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); layout->addSpacing( 10 ); - QVButtonGroup *dialect_group = new QVButtonGroup( i18n( "Dialect" ), this ); + TQVButtonGroup *dialect_group = new TQVButtonGroup( i18n( "Dialect" ), this ); new FlagCheckBox( dialect_group, controller, "-ffree-form", i18n( "Interpret source code as Fortran 90 free form" ), "-fno-exception" ); @@ -282,10 +282,10 @@ G77Tab::G77Tab( QWidget *parent, const char *name ) new FlagCheckBox( dialect_group, controller, "-fonetrip", i18n( "DO loops are executed at least once" ) ); - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addSpacing( 10 ); - QVButtonGroup *codegen_group = new QVButtonGroup( i18n( "Code Generation" ), this ); + TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); new FlagCheckBox( codegen_group, controller, "-fno-automatic", i18n( "Treat local variables as if SAVE statement had been specified" ) ); new FlagCheckBox( codegen_group, controller, @@ -293,7 +293,7 @@ G77Tab::G77Tab( QWidget *parent, const char *name ) new FlagCheckBox( codegen_group, controller, "-fbounds-check", i18n( "Generate run-time checks for array subscripts" ) ); - QApplication::sendPostedEvents( this, QEvent::ChildInserted ); + TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); layout->addStretch(); } @@ -304,22 +304,22 @@ G77Tab::~G77Tab() } -void G77Tab::readFlags( QStringList *list ) +void G77Tab::readFlags( TQStringList *list ) { controller->readFlags( list ); } -void G77Tab::writeFlags( QStringList *list ) +void G77Tab::writeFlags( TQStringList *list ) { controller->writeFlags( list ); } -Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) - : QWidget( parent, name ), controller( new FlagCheckBoxController ) +Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); new FlagCheckBox( this, controller, @@ -400,24 +400,24 @@ Warnings1Tab::~Warnings1Tab() } -void Warnings1Tab::readFlags( QStringList *list ) +void Warnings1Tab::readFlags( TQStringList *list ) { controller->readFlags( list ); wallBox->readFlags( list ); } -void Warnings1Tab::writeFlags( QStringList *list ) +void Warnings1Tab::writeFlags( TQStringList *list ) { controller->writeFlags( list ); wallBox->writeFlags( list ); } -Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) - : QWidget( parent, name ) +Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); wrestBox = new FlagListBox( this ); @@ -559,23 +559,23 @@ Warnings2Tab::~Warnings2Tab() {} -void Warnings2Tab::readFlags( QStringList *list ) +void Warnings2Tab::readFlags( TQStringList *list ) { wrestBox->readFlags( list ); } -void Warnings2Tab::writeFlags( QStringList *list ) +void Warnings2Tab::writeFlags( TQStringList *list ) { wrestBox->writeFlags( list ); } // Last but not least... :-) -GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, QWidget *parent, const char *name ) +GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, parent, name, true ) { - QVBox * vbox; + TQVBox * vbox; vbox = addVBoxPage( i18n( "General" ) ); general = new GeneralTab( type, vbox, "general tab" ); @@ -603,9 +603,9 @@ GccOptionsDialog::~GccOptionsDialog() {} -void GccOptionsDialog::setFlags( const QString &flags ) +void GccOptionsDialog::setFlags( const TQString &flags ) { - QStringList flaglist = QStringList::split( " ", flags ); + TQStringList flaglist = TQStringList::split( " ", flags ); // Hand them to 'general' at last, so it can make a line edit // with the unprocessed items @@ -619,9 +619,9 @@ void GccOptionsDialog::setFlags( const QString &flags ) } -QString GccOptionsDialog::flags() const +TQString GccOptionsDialog::flags() const { - QStringList flaglist; + TQStringList flaglist; if ( g77 ) g77->writeFlags( &flaglist ); @@ -630,8 +630,8 @@ QString GccOptionsDialog::flags() const warnings2->writeFlags( &flaglist ); general->writeFlags( &flaglist ); - QString flags; - QStringList::ConstIterator li; + TQString flags; + TQStringList::ConstIterator li; for ( li = flaglist.begin(); li != flaglist.end(); ++li ) { flags += ( *li ); @@ -649,7 +649,7 @@ QString GccOptionsDialog::flags() const } -GccOptionsPlugin::GccOptionsPlugin( QObject *parent, const char *name, const QStringList &args ) +GccOptionsPlugin::GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ) : KDevCompilerOptions( parent, name ) { gcctype = Unknown; @@ -657,7 +657,7 @@ GccOptionsPlugin::GccOptionsPlugin( QObject *parent, const char *name, const QSt if ( args.count() == 0 ) return ; - QString typeStr = args[ 0 ]; + TQString typeStr = args[ 0 ]; if ( typeStr == "gcc" ) gcctype = GccOptionsPlugin::GCC; @@ -672,7 +672,7 @@ GccOptionsPlugin::~GccOptionsPlugin() {} -QString GccOptionsPlugin::captionForType( Type type ) +TQString GccOptionsPlugin::captionForType( Type type ) { switch ( type ) { @@ -683,19 +683,19 @@ QString GccOptionsPlugin::captionForType( Type type ) case G77: return i18n( "GNU Fortran 77 Compiler Options" ); default: - return QString::null; + return TQString::null; } } -QString GccOptionsPlugin::exec( QWidget *parent, const QString &flags ) +TQString GccOptionsPlugin::exec( TQWidget *parent, const TQString &flags ) { if ( gcctype == Unknown ) - return QString::null; + return TQString::null; GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, parent, "gcc options dialog" ); - QString newFlags = flags; + TQString newFlags = flags; dlg->setFlags( flags ); - if ( dlg->exec() == QDialog::Accepted ) + if ( dlg->exec() == TQDialog::Accepted ) newFlags = dlg->flags(); delete dlg; return newFlags; diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h index a3b8cd70..e5144e01 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h @@ -30,12 +30,12 @@ class GccOptionsPlugin : public KDevCompilerOptions public: enum Type { GCC, GPP, G77, Unknown }; - GccOptionsPlugin( QObject *parent, const char *name, const QStringList &args ); + GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~GccOptionsPlugin(); - static QString captionForType(Type type); + static TQString captionForType(Type type); - virtual QString exec(QWidget *parent, const QString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); private: Type gcctype; @@ -45,11 +45,11 @@ private: class GccOptionsDialog : public KDialogBase { public: - GccOptionsDialog( GccOptionsPlugin::Type type, QWidget *parent=0, const char *name=0 ); + GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~GccOptionsDialog(); - void setFlags(const QString &flags); - QString flags() const; + void setFlags(const TQString &flags); + TQString flags() const; private: GeneralTab *general; @@ -57,7 +57,7 @@ private: G77Tab *g77; Warnings1Tab *warnings1; Warnings2Tab *warnings2; - QStringList unrecognizedFlags; + TQStringList unrecognizedFlags; }; #endif diff --git a/languages/cpp/completiondebug.h b/languages/cpp/completiondebug.h index 088b3b99..325ad193 100644 --- a/languages/cpp/completiondebug.h +++ b/languages/cpp/completiondebug.h @@ -20,7 +20,7 @@ email : david.nolden.kdevelop@art-master.de ///When defined, a backtrace is printed the first time the maximum depth is reached for the first time. //#define DEPTHBACKTRACE -#include +#include #include namespace CompletionDebug { @@ -29,7 +29,7 @@ class KDDebugState { private: StreamType m_stream; kndbgstream m_nstream; - QStringList m_prefixStack; + TQStringList m_prefixStack; int m_counter; int m_depth; bool m_enabled; @@ -41,7 +41,7 @@ class KDDebugState { KDDebugState( StreamType stream ) : m_stream( stream ), m_counter( 0 ), m_depth( 0 ), m_enabled( true ), m_hadWarning( false ) {} - void push( const QString & txt ) { + void push( const TQString & txt ) { m_prefixStack.push_back( txt ); pushDepth(); } @@ -74,7 +74,7 @@ class KDDebugState { #endif m_stream << "(" << m_counter << ")"; - for ( QStringList::iterator it = m_prefixStack.begin(); it != m_prefixStack.end() ; ++it ) + for ( TQStringList::iterator it = m_prefixStack.begin(); it != m_prefixStack.end() ; ++it ) m_stream << *it; m_counter++; @@ -92,7 +92,7 @@ class KDDebugState { #ifndef NDEBUG void outputPrefix( kdbgstream& target ) { target << "(" << m_counter << ")"; - for ( QStringList::iterator it = m_prefixStack.begin(); it != m_prefixStack.end() ; ++it ) + for ( TQStringList::iterator it = m_prefixStack.begin(); it != m_prefixStack.end() ; ++it ) target << *it; m_counter++; diff --git a/languages/cpp/computerecoverypoints.h b/languages/cpp/computerecoverypoints.h index eccd44f6..4e2056d5 100644 --- a/languages/cpp/computerecoverypoints.h +++ b/languages/cpp/computerecoverypoints.h @@ -22,20 +22,20 @@ #ifndef __COMPUTERECOVERYPOINTS_H__ #define __COMPUTERECOVERYPOINTS_H__ -#include +#include #include "simpletype.h" #include "simpletypenamespace.h" #include "tree_parser.h" -static QString toSimpleName( NameAST* name ) +static TQString toSimpleName( NameAST* name ) { if ( !name ) - return QString::null; + return TQString::null; - QString s; - QPtrList l = name->classOrNamespaceNameList(); - QPtrListIterator nameIt( l ); + TQString s; + TQPtrList l = name->classOrNamespaceNameList(); + TQPtrListIterator nameIt( l ); while ( nameIt.current() ) { if ( nameIt.current() ->name() ) @@ -55,8 +55,8 @@ static QString toSimpleName( NameAST* name ) struct RecoveryPoint { int kind; - QStringList scope; - QValueList imports; + TQStringList scope; + TQValueList imports; int startLine, startColumn; int endLine, endColumn; @@ -67,15 +67,15 @@ struct RecoveryPoint {} ///Registers the recovery-points imports into the given namespace - void registerImports( SimpleType ns, QString hardCodedAliases ) { + void registerImports( SimpleType ns, TQString hardCodedAliases ) { SimpleTypeNamespace* n = dynamic_cast( &(*ns) ); if( !n ) { kdDebug( 9007 ) << "the global namespace was not resolved correctly " << endl; } else { ///put the imports into the global namespace - for( QValueList::iterator it = imports.begin(); it != imports.end(); ++it ) { + for( TQValueList::iterator it = imports.begin(); it != imports.end(); ++it ) { kdDebug( 9007 ) << "inserting import " << *it << " into the global scope" << endl; - n->addAliasMap( QString(""), (*it).join("::"), IncludeFiles() ); ///@TODO: remove this + n->addAliasMap( TQString(""), (*it).join("::"), IncludeFiles() ); ///@TODO: remove this } n->addAliases( hardCodedAliases ); } @@ -91,13 +91,13 @@ private: class ComputeRecoveryPoints: public TreeParser { public: - ComputeRecoveryPoints( QPtrList& points ) + ComputeRecoveryPoints( TQPtrList& points ) : recoveryPoints( points ) {} virtual void parseTranslationUnit( const ParsedFile& ast ) { - QValueList dummy; + TQValueList dummy; m_imports.push( dummy ); TreeParser::parseTranslationUnit( ast ); @@ -111,7 +111,7 @@ public: if ( !ast->name() ) return ; - //QStringList type = CppCodeCompletion::typeName( ast->name() ->text() ).scope(); + //TQStringList type = CppCodeCompletion::typeName( ast->name() ->text() ).scope(); m_imports.top().push_back( ast->name() ->text() ); } @@ -181,9 +181,9 @@ public: } private: - QPtrList& recoveryPoints; - QValueStack< QValueList > m_imports; - QStringList m_currentScope; + TQPtrList& recoveryPoints; + TQValueStack< TQValueList > m_imports; + TQStringList m_currentScope; }; #endif diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index d5952b95..842e0c69 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include void ConfigureProblemReporter::init() { @@ -39,13 +39,13 @@ void ConfigureProblemReporter::setPart( CppSupportPart* part ) if ( !m_part ) return ; - QString conf_file_name = m_part->specialHeaderName(); - if ( QFile::exists( conf_file_name ) ) + TQString conf_file_name = m_part->specialHeaderName(); + if ( TQFile::exists( conf_file_name ) ) { - QFile f( conf_file_name ); + TQFile f( conf_file_name ); if ( f.open( IO_ReadOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); specialHeader->setText( stream.read() ); f.close(); } @@ -67,11 +67,11 @@ void ConfigureProblemReporter::accept() if ( m_part && specialHeader->isModified() ) { - QString conf_file_name = m_part->specialHeaderName( true ); - QFile f( conf_file_name ); + TQString conf_file_name = m_part->specialHeaderName( true ); + TQFile f( conf_file_name ); if ( f.open( IO_WriteOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << specialHeader->text(); f.close(); diff --git a/languages/cpp/cpp_tags.h b/languages/cpp/cpp_tags.h index 077fbd82..a82ac758 100644 --- a/languages/cpp/cpp_tags.h +++ b/languages/cpp/cpp_tags.h @@ -13,8 +13,8 @@ #ifndef CPP_TAGS_H #define CPP_TAGS_H -#include -#include +#include +#include template class CppBaseClass @@ -44,9 +44,9 @@ public: return m_tag; } - static QString format( const Tag& tag ) + static TQString format( const Tag& tag ) { - return QString::null; + return TQString::null; } int access() const @@ -71,22 +71,22 @@ public: m_tag.setFlags( m_info.flags ); } - QString name() const + TQString name() const { return m_tag.name(); } - void setName( const QString& name ) + void setName( const TQString& name ) { m_tag.setName( name ); } - QString baseClass() const + TQString baseClass() const { return m_tag.attribute( "b" ).toString(); } - void setBaseClass( const QString& baseClass ) + void setBaseClass( const TQString& baseClass ) { m_tag.setAttribute( "b", baseClass ); } @@ -135,9 +135,9 @@ public: return m_tag; } - static QString format( const Tag& tag ) + static TQString format( const Tag& tag ) { - return QString::null; + return TQString::null; } int access() const @@ -173,22 +173,22 @@ public: m_tag.setFlags( m_info.flags ); } - QString type() const + TQString type() const { return m_tag.attribute( "t" ).toString(); } - void setType( const QString& type ) + void setType( const TQString& type ) { m_tag.setAttribute( "t", type ); } - QString name() const + TQString name() const { return m_tag.name(); } - void setName( const QString& name ) + void setName( const TQString& name ) { m_tag.setName( name ); } @@ -239,9 +239,9 @@ public: return m_tag; } - static QString format( const Tag& tag ) + static TQString format( const Tag& tag ) { - return QString::null; + return TQString::null; } int access() const @@ -355,42 +355,42 @@ public: } - QString type() const + TQString type() const { return m_tag.attribute( "t" ).toString(); } - void setType( const QString& type ) + void setType( const TQString& type ) { m_tag.setAttribute( "t", type ); } - QString name() const + TQString name() const { return m_tag.name(); } - void setName( const QString& name ) + void setName( const TQString& name ) { m_tag.setName( name ); } - QStringList arguments() const + TQStringList arguments() const { return m_tag.attribute( "a" ).toStringList(); } - void setArguments( const QStringList args ) + void setArguments( const TQStringList args ) { m_tag.setAttribute( "a", args ); } - QStringList argumentNames() const + TQStringList argumentNames() const { return m_tag.attribute( "an" ).toStringList(); } - void setArgumentNames( const QStringList args ) + void setArgumentNames( const TQStringList args ) { m_tag.setAttribute( "an", args ); } diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 27cc9009..266c3878 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -37,7 +37,7 @@ email : david.nolden.kdevelop@art-master.de #include -#include +#include #include #include @@ -49,15 +49,15 @@ email : david.nolden.kdevelop@art-master.de #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -99,14 +99,14 @@ const char* destructorPrefix = ""; -- TODO: The documentation shown in the calltips looks very bad, a better solution must be found(maybe an additional tooltip) */ - void statusBarText( const QString& str, int time ) { + void statusBarText( const TQString& str, int time ) { CppCodeCompletion* c = CppCodeCompletion::instance(); if( c ) c->addStatusText( str, time ); } TypePointer CppCodeCompletion::createGlobalNamespace() { - KSharedPtr n = new SimpleTypeCachedNamespace( QStringList(), QStringList() ); + KSharedPtr n = new SimpleTypeCachedNamespace( TQStringList(), TQStringList() ); n->addAliases(m_pSupport->codeCompletionConfig()->namespaceAliases() ); return n.data(); } @@ -133,16 +133,16 @@ SafetyCounter safetyCounter; CppCodeCompletion* cppCompletionInstance = 0; //file global functions, must be before any "using namespace" -QString cleanForMenu( QString txt ) { +TQString cleanForMenu( TQString txt ) { return txt.replace( "&", "&&" ).replace( " ", " " ); } -QString buildSignature( TypePointer currType ) { +TQString buildSignature( TypePointer currType ) { SimpleTypeFunctionInterface * f = currType->asFunction(); if ( !f ) return ""; - QString ret; + TQString ret; LocateResult rtt = currType->locateDecType( f->getReturnType() ); if ( rtt->resolved() || rtt.resolutionCount() > 1 ) ret = rtt->fullNameChain(); @@ -153,7 +153,7 @@ QString buildSignature( TypePointer currType ) { TypeDesc desc = currType->desc(); desc.decreaseFunctionDepth(); - QString sig = ret + " " + desc.fullNameChain() + f->signature(); + TQString sig = ret + " " + desc.fullNameChain() + f->signature(); if ( f->isConst() ) sig += " const"; return sig; @@ -164,10 +164,10 @@ PopupTracker* PopupTracker::pt = 0; /** Multiple empty lines are reduced to one, too long lines wrapped over, and the beginnings of the lines are normalized */ -QStringList maximumLength( const QStringList& in, int length ) { - QStringList ret; +TQStringList maximumLength( const TQStringList& in, int length ) { + TQStringList ret; uint firstNonSpace = 50000; - for ( QStringList::const_iterator it = in.begin(); it != in.end(); ++it ) + for ( TQStringList::const_iterator it = in.begin(); it != in.end(); ++it ) for ( uint a = 0; a < ( *it ).length(); a++ ) if ( !( *it ) [ a ].isSpace() ) { if ( firstNonSpace > a ) @@ -175,17 +175,17 @@ QStringList maximumLength( const QStringList& in, int length ) { break; } if ( firstNonSpace == 50000 ) - return QStringList(); + return TQStringList(); bool hadEmptyLine = false; - for ( QStringList::const_iterator it = in.begin(); it != in.end(); ++it ) { + for ( TQStringList::const_iterator it = in.begin(); it != in.end(); ++it ) { if ( ( *it ).length() <= firstNonSpace ) { if ( !hadEmptyLine ) ret << " "; hadEmptyLine = true; } else { hadEmptyLine = false; - QString str = ( *it ).mid( firstNonSpace ); + TQString str = ( *it ).mid( firstNonSpace ); while ( !str.isEmpty() ) { if ( (int)str.length() < length ) { ret << str; @@ -200,10 +200,10 @@ QStringList maximumLength( const QStringList& in, int length ) { return ret; } -QStringList prepareTextForMenu( const QString& comment, int maxLines, int maxLength ) { - QStringList in = QStringList::split( "\n", comment ); - QStringList out; - for ( QStringList::iterator it = in.begin(); it != in.end(); ++it ) { +TQStringList prepareTextForMenu( const TQString& comment, int maxLines, int maxLength ) { + TQStringList in = TQStringList::split( "\n", comment ); + TQStringList out; + for ( TQStringList::iterator it = in.begin(); it != in.end(); ++it ) { out << cleanForMenu( *it ); if ( (int)out.count() >= maxLines ) { out << "[...]"; @@ -214,15 +214,15 @@ QStringList prepareTextForMenu( const QString& comment, int maxLines, int maxLen return maximumLength( out, maxLength ); } -QStringList formatComment( const QString& comment, int maxCols = 120 ) { - QStringList ret; +TQStringList formatComment( const TQString& comment, int maxCols = 120 ) { + TQStringList ret; SafetyCounter s( 14 ); ///maximum of 14 lines - QStringList lines = QStringList::split( "\n", comment ); - for ( QStringList::iterator it = lines.begin(); it != lines.end(); ++it ) { - QStringList words = QStringList::split( " ", *it ); + TQStringList lines = TQStringList::split( "\n", comment ); + for ( TQStringList::iterator it = lines.begin(); it != lines.end(); ++it ) { + TQStringList words = TQStringList::split( " ", *it ); while ( !words.isEmpty() && s ) { - QString line = "? "; + TQString line = "? "; int len = 0; while ( !words.isEmpty() && len < maxCols ) { len += words.front().length(); @@ -243,14 +243,14 @@ bool operator < ( const CodeCompletionEntry& e1, const CodeCompletionEntry& e2 ) } template -static QValueList unique( const QValueList& entryList ) { +static TQValueList unique( const TQValueList& entryList ) { - QValueList< ItemType > l; - QMap map; - typename QValueList< ItemType >::ConstIterator it = entryList.begin(); + TQValueList< ItemType > l; + TQMap map; + typename TQValueList< ItemType >::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { CodeCompletionEntry e = *it++; - QString key = ( e.type + " " + + TQString key = ( e.type + " " + e.prefix + " " + e.text + " " + e.postfix + " " ).simplifyWhiteSpace().stripWhiteSpace(); @@ -262,13 +262,13 @@ static QValueList unique( const QValueList& entryList ) { return l; } -static QStringList unique( const QStringList& entryList ) { +static TQStringList unique( const TQStringList& entryList ) { - QStringList l; - QMap map; - QStringList::ConstIterator it = entryList.begin(); + TQStringList l; + TQMap map; + TQStringList::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { - QString e = *it++; + TQString e = *it++; if ( map.find( e ) == map.end() ) { map[ e ] = TRUE; l << e; @@ -277,14 +277,14 @@ static QStringList unique( const QStringList& entryList ) { return l; } -static QStringList unique( const QValueList& entryList ) { +static TQStringList unique( const TQValueList& entryList ) { - QStringList l; - QMap map; - QValueList::ConstIterator it = entryList.begin(); + TQStringList l; + TQMap map; + TQValueList::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { - QStringList li = ( *it++ ); - QString e = li.join( "\n" ); + TQStringList li = ( *it++ ); + TQString e = li.join( "\n" ); if ( map.find( e ) == map.end() ) { map[ e ] = TRUE; l += li; @@ -295,7 +295,7 @@ static QStringList unique( const QValueList& entryList ) { } -bool tokenAt( const QString& text, const QString& token, int textPos ) { +bool tokenAt( const TQString& text, const TQString& token, int textPos ) { if ( text.isEmpty() ) return false; @@ -311,7 +311,7 @@ bool tokenAt( const QString& text, const QString& token, int textPos ) { if ( tokenPos == 0 || textPos == 0 ) { if ( tokenPos == 0 ) { if ( textPos >= 1 && text[ textPos ] == token[ tokenPos ] ) { - QChar c = text[ textPos - 1 ]; + TQChar c = text[ textPos - 1 ]; return c.isSpace() || c == '{' || c == '}' || c == ';'; } else { return false; @@ -346,26 +346,26 @@ struct PopupFillerHelpStruct { return true; } - QMap m_namespacePopupCache; + TQMap m_namespacePopupCache; - void insertItem( QPopupMenu* parent, SimpleTypeImpl::MemberInfo d , QString prefix ) { + void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); - QString memType = d.memberTypeToString(); + TQString memType = d.memberTypeToString(); if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) memType = "enum"; - QString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, SLOT( popupAction( int ) ) ); + TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); } - void insertItem ( QPopupMenu* parent, TypeDesc d , QString prefix ) { + void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); - QString txt1, txt2; + TQString txt1, txt2; if ( d.resolved() && d.resolved() ->isNamespace() ) { SimpleTypeCachedNamespace * ns = dynamic_cast( d.resolved().data() ); @@ -374,9 +374,9 @@ struct PopupFillerHelpStruct { for ( SimpleTypeNamespace::SlaveList::iterator it = slaves.begin(); it != slaves.end(); ++it ) { SimpleTypeCodeModel* cm = dynamic_cast( ( *it ).first.first.resolved().data() ); if ( cm && cm->item() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); - QString scope = cm->scope().join("::"); - QMap< QString, QPopupMenu* >::iterator it = m_namespacePopupCache.find( scope ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + TQString scope = cm->scope().join("::"); + TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.find( scope ); if( it != m_namespacePopupCache.end() ) { parent->insertItem( "Imported Namespace " + scope, *it ); delete m; @@ -402,13 +402,13 @@ struct PopupFillerHelpStruct { if ( SimpleTypeCachedCodeModel * item = dynamic_cast( d.resolved().data() ) ) { ///(1) if ( item->item() && item->item() ->isNamespace() ) { NamespaceModel* ns = dynamic_cast( item->item().data() ); - QStringList wholeScope = ns->scope(); + TQStringList wholeScope = ns->scope(); wholeScope << ns->name(); for( FileList::iterator it = files.begin(); it != files.end(); ++it ) { // if( !safetyCounter ) break; NamespaceModel* ns = (*it).data(); - for( QStringList::iterator it2 = wholeScope.begin(); it2 != wholeScope.end(); ++it2 ) { + for( TQStringList::iterator it2 = wholeScope.begin(); it2 != wholeScope.end(); ++it2 ) { if( ns->hasNamespace( (*it2) ) ) { ns = ns->namespaceByName( *it2 ); if( !ns ) break; @@ -423,7 +423,7 @@ struct PopupFillerHelpStruct { int sLine, sCol, eLine, eCol; i->getStartPosition( &sLine, &sCol ); i->getEndPosition( &eLine, &eCol ); - insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + QString(" (%1 Lines): ").arg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. + insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").arg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. } } @@ -447,19 +447,19 @@ struct PopupFillerHelpStruct { } } - int id = parent->insertItem( txt1, receiver, SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); if ( d.resolved() ) receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() ); if ( !txt2.isEmpty() ) { - int id2 = parent->insertItem( txt2, receiver, SLOT( popupDefinitionAction( int ) ) ); + int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); if ( d.resolved() ) receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() ); } } }; -ItemDom itemFromScope( const QStringList& scope, NamespaceDom startNamespace ) { +ItemDom itemFromScope( const TQStringList& scope, NamespaceDom startNamespace ) { if ( scope.isEmpty() ) return ItemDom(); @@ -469,7 +469,7 @@ ItemDom itemFromScope( const QStringList& scope, NamespaceDom startNamespace ) { ClassModel* curr = glob ; - QStringList::const_iterator mit = scope.begin(); + TQStringList::const_iterator mit = scope.begin(); while ( curr->isNamespace() && mit != scope.end() && ( ( NamespaceModel* ) curr ) ->hasNamespace( *mit ) ) { curr = &( *( ( ( NamespaceModel* ) curr ) ->namespaceByName( *mit ) ) ); @@ -523,29 +523,29 @@ struct PopupClassViewFillerHelpStruct { return false; } - void insertItem( QPopupMenu* parent, SimpleTypeImpl::MemberInfo d , QString prefix ) { + void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); FileDom f = receiver->m_pSupport->codeModel() ->fileByName( d.decl.file ); if ( !f ) return ; - ItemDom dom = itemFromScope( QStringList::split( "::", d.name ), model_cast( f ) ); + ItemDom dom = itemFromScope( TQStringList::split( "::", d.name ), model_cast( f ) ); - QString memType = d.memberTypeToString(); + TQString memType = d.memberTypeToString(); if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) memType = "enum"; - QString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, SLOT( popupClassViewAction( int ) ) ); + TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); } - void insertItem ( QPopupMenu* parent, TypeDesc d , QString prefix ) { + void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); - QString txt; + TQString txt; if ( !d.resolved() ) return ; @@ -578,8 +578,8 @@ struct PopupClassViewFillerHelpStruct { } } else { if ( dom ) { - QString n = d.resolved() ->scope().join( "::" ); - //QString n = d.fullNameChain(); + TQString n = d.resolved() ->scope().join( "::" ); + //TQString n = d.fullNameChain(); if ( d.resolved() ->asFunction() ) { n = buildSignature( d.resolved() ); } @@ -596,7 +596,7 @@ struct PopupClassViewFillerHelpStruct { } } - int id = parent->insertItem( txt, receiver, SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); if ( dom ) receiver->m_popupClassViewActions.insert( id, dom ); @@ -606,27 +606,27 @@ struct PopupClassViewFillerHelpStruct { template class PopupFiller { HelpStruct struk; - QString depthAdd; + TQString depthAdd; SafetyCounter s; public: - PopupFiller( HelpStruct str , QString dAdd, int maxCount = 100 ) : struk( str ), depthAdd( dAdd ), s( maxCount ) {} + PopupFiller( HelpStruct str , TQString dAdd, int maxCount = 100 ) : struk( str ), depthAdd( dAdd ), s( maxCount ) {} - void fillIncludes( const DeclarationInfo& decl, QPopupMenu* parent, bool& needSeparator ) { + void fillIncludes( const DeclarationInfo& decl, TQPopupMenu* parent, bool& needSeparator ) { if( !struk.receiver->getIncludeFiles()[ HashedString( decl.file ) ] ) { - QString file = decl.file; + TQString file = decl.file; //The include-file seems to be missing if( needSeparator ) { needSeparator = false; parent->insertSeparator(); } - QString includeFile = file; - QFileInfo info( file ); + TQString includeFile = file; + TQFileInfo info( file ); Driver* driver = struk.receiver->cppSupport()->driver(); if( driver ) { - QStringList elements = QStringList::split( "/", file ); + TQStringList elements = TQStringList::split( "/", file ); includeFile = elements.back(); elements.pop_back(); @@ -644,7 +644,7 @@ class PopupFiller { //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; } - int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, SLOT( popupAction( int ) ) ); + int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); DeclarationInfo fakeDec; fakeDec.name = decl.name; fakeDec.file = includeFile; @@ -653,7 +653,7 @@ class PopupFiller { } } - void fill( QPopupMenu * parent, LocateResult d, QString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { + void fill( TQPopupMenu * parent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { Debug dbg( "#fl# ", 10 ) ; @@ -670,7 +670,7 @@ class PopupFiller { f.type = d.desc(); f.memberType = SimpleTypeImpl::MemberInfo::Variable; - /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, SLOT( popupAction( int ) ) ); + /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ struk.insertItem( parent, f, prefix ); @@ -678,11 +678,11 @@ class PopupFiller { parent->insertSeparator(); if ( !sourceVariable.comment.isEmpty() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m ); - QStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); - for ( QStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, SLOT( popupClassViewAction( int ) ) ); + TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); + for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { + m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } parent->insertSeparator(); } @@ -694,7 +694,7 @@ class PopupFiller { SimpleType p = d->resolved()->parent(); LocateResult r = p->locateDecType( d->name() ); if( r ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Specialized from \"%1\"" ).arg( cleanForMenu( r->fullNameChain() ) ), m ); fill( m, r ); } @@ -703,7 +703,7 @@ class PopupFiller { TypeDesc::TemplateParams p = d->templateParams(); for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) { //if( (*it)->resolved() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Template-param \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, **it ); /*} else { @@ -715,25 +715,25 @@ class PopupFiller { if ( d->resolved() ->asFunction() ) { LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() ); if ( rt ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Return-type \"%1\"" ).arg( cleanForMenu( rt->fullNameChain() ) ), m ); fill( m, rt ); } - QValueList args = d->resolved() ->asFunction() ->getArgumentTypes(); - QStringList argNames = d->resolved() ->asFunction() ->getArgumentNames(); + TQValueList args = d->resolved() ->asFunction() ->getArgumentTypes(); + TQStringList argNames = d->resolved() ->asFunction() ->getArgumentNames(); if ( !args.isEmpty() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Argument-types" ), m ); - QStringList::iterator it2 = argNames.begin(); - for ( QValueList::iterator it = args.begin(); it != args.end(); ++it ) { + TQStringList::iterator it2 = argNames.begin(); + for ( TQValueList::iterator it = args.begin(); it != args.end(); ++it ) { LocateResult at = d->resolved() ->locateDecType( *it ); - QString name = ""; + TQString name = ""; if ( it2 != argNames.end() ) { name = *it2; ++it2; } - QPopupMenu * mo = PopupTracker::createPopup( m ); + TQPopupMenu * mo = PopupTracker::createPopup( m ); m->insertItem( i18n( "Argument \"%1\"" ).arg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo ); fill( mo, at ); @@ -743,14 +743,14 @@ class PopupFiller { } #ifndef DISABLE_TRACING if ( d.trace() ) { - QValueList > trace = d.trace() ->trace(); + TQValueList > trace = d.trace() ->trace(); if ( !trace.isEmpty() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Trace" ), m ); - for ( QValueList >::iterator it = trace.begin(); it != trace.end(); ++it ) { - QPopupMenu * mo = PopupTracker::createPopup( m ); - QString tail = ( *it ).second.fullNameChain(); + for ( TQValueList >::iterator it = trace.begin(); it != trace.end(); ++it ) { + TQPopupMenu * mo = PopupTracker::createPopup( m ); + TQString tail = ( *it ).second.fullNameChain(); if ( !tail.isEmpty() ) tail = "::" + tail; m->insertItem( i18n( "%1 -> %2" ).arg( cleanForMenu( ( *it ).first.name + tail ) ).arg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo ); @@ -759,16 +759,16 @@ class PopupFiller { if ( !( *it ).first.decl.comment.isEmpty() ) { mo->insertSeparator(); - QPopupMenu * m = PopupTracker::createPopup( mo ); + TQPopupMenu * m = PopupTracker::createPopup( mo ); mo->insertItem( i18n( "Comment" ), m ); - QStringList ls = prepareTextForMenu( ( *it ).first.decl.comment, 15, 100 ); - for ( QStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, SLOT( popupClassViewAction( int ) ) ); + TQStringList ls = prepareTextForMenu( ( *it ).first.decl.comment, 15, 100 ); + for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { + m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } } /*bool needSeparator = true; - if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator QString().isEmpty() ) + if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator TQString().isEmpty() ) fillIncludes( (*it).first.decl, mo, needSeparator );*/ } } @@ -776,26 +776,26 @@ class PopupFiller { #endif if ( d->resolved() ) { - QValueList bases = d->resolved() ->getBases(); - for ( QValueList::iterator it = bases.begin(); it != bases.end(); ++it ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQValueList bases = d->resolved() ->getBases(); + for ( TQValueList::iterator it = bases.begin(); it != bases.end(); ++it ) { + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Base-class \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, *it ); } if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) { - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Nested in \"%1\"" ).arg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m ); fill( m, d->resolved() ->parent() ->desc() ); } if ( !d->resolved() ->comment().isEmpty() ) { parent->insertSeparator(); - QPopupMenu * m = PopupTracker::createPopup( parent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m ); - QStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); - for ( QStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, SLOT( popupClassViewAction( int ) ) ); + TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); + for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { + m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } } } @@ -805,10 +805,10 @@ class PopupFiller { bool needSeparator = true; //Show the include-files for the whole trace, because usually the first in the trace should be the one to include if ( d.trace() ) { - QValueList > trace = d.trace() ->trace(); + TQValueList > trace = d.trace() ->trace(); if ( !trace.isEmpty() ) { - for ( QValueList >::iterator it = trace.begin(); it != trace.end(); ++it ) { - if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator QString().isEmpty() ) + for ( TQValueList >::iterator it = trace.begin(); it != trace.end(); ++it ) { + if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator TQString().isEmpty() ) fillIncludes( (*it).first.decl, parent, needSeparator ); } } @@ -828,11 +828,11 @@ struct CompTypeProcessor : public TypeProcessor { CompTypeProcessor( SimpleType scope, bool processArguments ) : m_scope( scope ), m_processArguments( processArguments ) {} - virtual QString parentType() { + virtual TQString parentType() { return m_scope->fullType(); } - virtual QString processType( const QString& type ) { + virtual TQString processType( const TQString& type ) { if ( !m_processArguments ) return type; LocateResult t = m_scope->locateDecType( type ); @@ -844,8 +844,8 @@ struct CompTypeProcessor : public TypeProcessor { }; struct CppCodeCompletionData { - QPtrList recoveryPoints; - //QStringList classNameList; + TQPtrList recoveryPoints; + //TQStringList classNameList; CppCodeCompletionData() { recoveryPoints.setAutoDelete( true ); @@ -857,7 +857,7 @@ struct CppCodeCompletionData { QPair pt = qMakePair( line, column ); - QPtrListIterator it( recoveryPoints ); + TQPtrListIterator it( recoveryPoints ); RecoveryPoint* recPt = 0; while ( it.current() ) { @@ -895,29 +895,29 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_pSupport = part; - connect( m_pSupport->codeCompletionConfig(), SIGNAL( stored() ), this, SLOT( emptyCache() ) ); + connect( m_pSupport->codeCompletionConfig(), TQT_SIGNAL( stored() ), this, TQT_SLOT( emptyCache() ) ); m_activeCursor = 0; m_activeEditor = 0; m_activeCompletion = 0; m_activeHintInterface = 0; m_activeView = 0; - m_ccTimer = new QTimer( this ); - m_showStatusTextTimer = new QTimer( this ); + m_ccTimer = new TQTimer( this ); + m_showStatusTextTimer = new TQTimer( this ); m_ccLine = 0; m_ccColumn = 0; - connect( m_ccTimer, SIGNAL( timeout() ), this, SLOT( slotTimeout() ) ); - connect( m_showStatusTextTimer, SIGNAL( timeout() ), this, SLOT( slotStatusTextTimeout() ) ); + connect( m_ccTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); + connect( m_showStatusTextTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotStatusTextTimeout() ) ); computeFileEntryList(); CppSupportPart* cppSupport = m_pSupport; - connect( cppSupport->project(), SIGNAL( addedFilesToProject( const QStringList& ) ), - this, SLOT( computeFileEntryList() ) ); - connect( cppSupport->project(), SIGNAL( removedFilesFromProject( const QStringList& ) ), - this, SLOT( computeFileEntryList() ) ); - connect( cppSupport, SIGNAL( synchronousParseReady( const QString&, ParsedFilePointer ) ), this, SLOT( synchronousParseReady( const QString&, ParsedFilePointer ) ) ); + connect( cppSupport->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList& ) ), + this, TQT_SLOT( computeFileEntryList() ) ); + connect( cppSupport->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList& ) ), + this, TQT_SLOT( computeFileEntryList() ) ); + connect( cppSupport, TQT_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQT_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) ); m_bArgHintShow = false; m_bCompletionBoxShow = false; @@ -927,14 +927,14 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_repository = new CodeInformationRepository( cppSupport->codeRepository() ); - connect( cppSupport->codeRepository(), SIGNAL(catalogRegistered( Catalog* )), this, SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), SIGNAL(catalogUnregistered( Catalog* )), this, SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), SIGNAL(catalogChanged( Catalog* )), this, SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogRegistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogUnregistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogChanged( Catalog* )), this, TQT_SLOT( emptyCache() ) ); setupCodeInformationRepository(); if ( part->partController() ->parts() ) { - QPtrListIterator it( *part->partController() ->parts() ); + TQPtrListIterator it( *part->partController() ->parts() ); while ( KParts::Part * part = it.current() ) { integratePart( part ); ++it; @@ -944,22 +944,22 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { if ( part->partController() ->activePart() ) slotActivePartChanged( part->partController() ->activePart() ); - connect( part->partController( ), SIGNAL( partAdded( KParts::Part* ) ), - this, SLOT( slotPartAdded( KParts::Part* ) ) ); - connect( part->partController( ), SIGNAL( activePartChanged( KParts::Part* ) ), - this, SLOT( slotActivePartChanged( KParts::Part* ) ) ); + connect( part->partController( ), TQT_SIGNAL( partAdded( KParts::Part* ) ), + this, TQT_SLOT( slotPartAdded( KParts::Part* ) ) ); + connect( part->partController( ), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); - connect( part, SIGNAL( fileParsed( const QString& ) ), - this, SLOT( slotFileParsed( const QString& ) ) ); - connect( part, SIGNAL( codeModelUpdated( const QString& ) ), - this, SLOT( slotCodeModelUpdated( const QString& ) ) ); + connect( part, TQT_SIGNAL( fileParsed( const TQString& ) ), + this, TQT_SLOT( slotFileParsed( const TQString& ) ) ); + connect( part, TQT_SIGNAL( codeModelUpdated( const TQString& ) ), + this, TQT_SLOT( slotCodeModelUpdated( const TQString& ) ) ); KAction * action = new KAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma, - this, SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); + this, TQT_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); action->plug( &m_DummyActionWidget ); action = new KAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, - this, SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); + this, TQT_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); action->plug( &m_DummyActionWidget ); } @@ -968,8 +968,8 @@ CppCodeCompletion::~CppCodeCompletion( ) { delete d; } -void CppCodeCompletion::addStatusText( QString text, int timeout ) { - m_statusTextList.append( QPair( timeout, text ) ); +void CppCodeCompletion::addStatusText( TQString text, int timeout ) { + m_statusTextList.append( QPair( timeout, text ) ); if ( !m_showStatusTextTimer->isActive() ) { slotStatusTextTimeout(); } @@ -998,8 +998,8 @@ void CppCodeCompletion::slotTimeout() { if ( nLine != m_ccLine || nCol != m_ccColumn ) return ; - QString textLine = m_activeEditor->textLine( nLine ); - QChar ch = textLine[ nCol ]; + TQString textLine = m_activeEditor->textLine( nLine ); + TQChar ch = textLine[ nCol ]; if ( ch.isLetterOrNumber() || ch == '_' ) return ; @@ -1027,13 +1027,13 @@ void CppCodeCompletion::integratePart( KParts::Part * part ) { if ( m_pSupport ) { //The slot should connected even when automatic completion is disabled, so it can be enabled any time kdDebug( 9007 ) << k_funcinfo << "enabling code completion" << endl; - connect( part, SIGNAL( textChanged() ), this, SLOT( slotTextChanged() ) ); - connect( part->widget(), SIGNAL( completionDone() ), this, - SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), SIGNAL( completionAborted() ), this, - SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), SIGNAL( argHintHidden() ), this, - SLOT( slotArgHintHidden() ) ); + connect( part, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged() ) ); + connect( part->widget(), TQT_SIGNAL( completionDone() ), this, + TQT_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQT_SIGNAL( completionAborted() ), this, + TQT_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQT_SIGNAL( argHintHidden() ), this, + TQT_SLOT( slotArgHintHidden() ) ); } } } @@ -1046,7 +1046,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { emptyCache(); this->d->recoveryPoints.clear(); if ( m_activeHintInterface && m_activeView ) { - disconnect( m_activeView , SIGNAL( needTextHint( int, int, QString & ) ), this, SLOT( slotTextHint( int, int, QString& ) ) ); + disconnect( m_activeView , TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); m_activeHintInterface = 0; } @@ -1055,7 +1055,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { kdDebug( 9007 ) << k_funcinfo << endl; - m_activeFileName = QString::null; + m_activeFileName = TQString::null; KTextEditor::Document* doc = dynamic_cast( part ); if ( !doc ) @@ -1093,7 +1093,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { if ( m_activeHintInterface ) { #ifndef DISABLETOOLTIPS m_activeHintInterface->enableTextHints( 500 ); - connect( m_activeView, SIGNAL( needTextHint( int, int, QString & ) ), this, SLOT( slotTextHint( int, int, QString& ) ) ); + connect( m_activeView, TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); #endif } else { @@ -1112,9 +1112,9 @@ void CppCodeCompletion::slotTextChanged() { unsigned int nLine, nCol; m_activeCursor->cursorPositionReal( &nLine, &nCol ); - QString strCurLine = m_activeEditor->textLine( nLine ); - QString ch = strCurLine.mid( nCol - 1, 1 ); - QString ch2 = strCurLine.mid( nCol - 2, 2 ); + TQString strCurLine = m_activeEditor->textLine( nLine ); + TQString ch = strCurLine.mid( nCol - 1, 1 ); + TQString ch2 = strCurLine.mid( nCol - 2, 2 ); // Tell the completion box to _go_away_ when the completion char // becomes empty or whitespace and the box is already showing. @@ -1123,7 +1123,7 @@ void CppCodeCompletion::slotTextChanged() { if ( ch.simplifyWhiteSpace().isEmpty() && !strCurLine.simplifyWhiteSpace().contains( "virtual" ) && m_bCompletionBoxShow ) { - QValueList entryList; + TQValueList entryList; m_bCompletionBoxShow = true; m_activeCompletion->showCompletionBox( entryList, 0 ); } @@ -1227,14 +1227,14 @@ void CppCodeCompletion::fitContextItem( int nLine, int nCol ) { enum { T_ACCESS, T_PAREN, T_BRACKET, T_IDE, T_UNKNOWN, T_TEMP }; -QString CppCodeCompletion::replaceCppComments( const QString& contents ) { - QString text = contents; +TQString CppCodeCompletion::replaceCppComments( const TQString& contents ) { + TQString text = contents; int pos = 0; while ( ( pos = m_cppCodeCommentsRx.search( text, pos ) ) != -1 ) { if ( m_cppCodeCommentsRx.cap( 1 ).startsWith( "//" ) ) { - QString before = m_cppCodeCommentsRx.cap( 1 ); - QString after; + TQString before = m_cppCodeCommentsRx.cap( 1 ); + TQString after; after.fill( ' ', before.length() - 5 ); after.prepend( "/*" ); after.append( "*/" ); @@ -1247,14 +1247,14 @@ QString CppCodeCompletion::replaceCppComments( const QString& contents ) { return text; } -int CppCodeCompletion::expressionAt( const QString& contents, int index ) { +int CppCodeCompletion::expressionAt( const TQString& contents, int index ) { kdDebug( 9007 ) << k_funcinfo << endl; /* C++ style comments present issues with finding the expr so I'm matching for them and replacing them with empty C style comments of the same length for purposes of finding the expr. */ - QString text = clearComments( contents ); + TQString text = clearComments( contents ); int last = T_UNKNOWN; int start = index; @@ -1265,8 +1265,8 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { --index; } - QChar ch = text[ index ]; - QString ch2 = text.mid( index - 1, 2 ); + TQChar ch = text[ index ]; + TQString ch2 = text.mid( index - 1, 2 ); if ( ( last != T_IDE ) && ( ch.isLetterOrNumber() || ch == '_' ) ) { while ( index > 0 && ( text[ index ].isLetterOrNumber() || text[ index ] == '_' ) ) { --index; @@ -1275,7 +1275,7 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { } else if ( last != T_IDE && ch == ')' ) { int count = 0; while ( index > 0 ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '(' ) { ++count; } else if ( ch == ')' ) { @@ -1290,7 +1290,7 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { } else if ( last != T_IDE && ch == '>' && ch2 != "->" ) { int count = 0; while ( index > 0 ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '<' ) { ++count; } else if ( ch == '>' ) { @@ -1305,7 +1305,7 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { } else if ( ch == ']' ) { int count = 0; while ( index > 0 ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '[' ) { ++count; } else if ( ch == ']' ) { @@ -1344,16 +1344,16 @@ int CppCodeCompletion::expressionAt( const QString& contents, int index ) { return index; } -QStringList CppCodeCompletion::splitExpression( const QString& text ) { +TQStringList CppCodeCompletion::splitExpression( const TQString& text ) { #define ADD_CURRENT()\ if( current.length() ) { l << current; /*kdDebug(9007) << "add word " << current << endl;*/ current = ""; } - QStringList l; + TQStringList l; uint index = 0; - QString current; + TQString current; while ( index < text.length() ) { - QChar ch = text[ index ]; - QString ch2 = text.mid( index, 2 ); + TQChar ch = text[ index ]; + TQString ch2 = text.mid( index, 2 ); if ( ch == '.' ) { current += ch; @@ -1362,7 +1362,7 @@ QStringList CppCodeCompletion::splitExpression( const QString& text ) { } else if ( ch == '(' ) { int count = 0; while ( index < text.length() ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '(' ) { ++count; } else if ( ch == ')' ) { @@ -1376,7 +1376,7 @@ QStringList CppCodeCompletion::splitExpression( const QString& text ) { } else if ( ch == '[' ) { int count = 0; while ( index < text.length() ) { - QChar ch = text[ index ]; + TQChar ch = text[ index ]; if ( ch == '[' ) { ++count; } else if ( ch == ']' ) { @@ -1418,7 +1418,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionAt( int line, int column , return EvaluationResult(); { - QString curLine = m_activeEditor->textLine( line ); + TQString curLine = m_activeEditor->textLine( line ); ///move column to the last letter of the pointed word while ( column + 1 < ( int ) curLine.length() && isValidIdentifierSign( curLine[ column ] ) && isValidIdentifierSign( curLine[ column + 1 ] ) ) @@ -1429,7 +1429,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionAt( int line, int column , if ( column >= ( int ) curLine.length() || curLine[ column ].isSpace() ) return EvaluationResult(); - QString expr = curLine.left( column + 1 ); + TQString expr = curLine.left( column + 1 ); kdDebug( 9007 ) << "evaluating line \"" << expr.stripWhiteSpace() << "\"" << endl; if ( curLine[ column ] == '-' || curLine[ column ] == ';' ) @@ -1446,10 +1446,10 @@ EvaluationResult CppCodeCompletion::evaluateExpressionAt( int line, int column , void CppCodeCompletion::popupAction( int number ) { PopupActions::iterator it = m_popupActions.find( number ); if ( it != m_popupActions.end() ) { - QString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator QString(); + TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString(); if( (*it).startLine == -1 ) { //startLine -1 indicates that the file should be added to the include-files - m_activeEditor->insertLine( 0, QString("#include \"%1\" /* defines %2 */").arg( fileName ).arg( (*it).name ) ); + m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").arg( fileName ).arg( (*it).name ) ); } else { m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine ); } @@ -1461,7 +1461,7 @@ void CppCodeCompletion::popupAction( int number ) { void CppCodeCompletion::popupDefinitionAction( int number ) { PopupActions::iterator it = m_popupDefinitionActions.find( number ); if ( it != m_popupDefinitionActions.end() ) { - QString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator QString(); + TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString(); if ( !m_pSupport->switchHeaderImpl( fileName, ( *it ).startLine, ( *it ).startCol ) ) m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine ); } else { @@ -1490,7 +1490,7 @@ void CppCodeCompletion::popupClassViewAction( int number ) { } } -void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Context *context, int line, int column ) { +void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Context *context, int line, int column ) { clearStatusText(); Q_UNUSED(context); if ( !m_pSupport->codeCompletionConfig() ->showEvaluationContextMenu() ) @@ -1529,15 +1529,15 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex ///Test if it is a macro if( type.isMacro ) { - QPopupMenu * m = PopupTracker::createPopup( popup ); + TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ ); else gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, SLOT( popupAction( int ) ) ); - QPopupMenu * b = PopupTracker::createPopup( m ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); + TQPopupMenu * b = PopupTracker::createPopup( m ); m->insertItem( i18n( "Body" ), b ); DeclarationInfo i; @@ -1548,27 +1548,27 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex i.endLine = type.macro.line(); m_popupActions.insert( id, i ); - QStringList ls = prepareTextForMenu( type.macro.body(), 20, 100 ); - for ( QStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - b->insertItem( *it, 0, SLOT( popupClassViewAction( int ) ) ); + TQStringList ls = prepareTextForMenu( type.macro.body(), 20, 100 ); + for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { + b->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } } ///Test if it is an include-directive - QString includeFileName, includeFilePath; + TQString includeFileName, includeFilePath; bool simpleAlgorithm = false; bool isIncludeDirective = getIncludeInfo( line, includeFileName, includeFilePath, simpleAlgorithm ); if( isIncludeDirective ) { ///Add menu entry if( !includeFilePath.isEmpty() ) { int gid; - QPopupMenu * m = PopupTracker::createPopup( popup ); + TQPopupMenu * m = PopupTracker::createPopup( popup ); if ( contextMenuEntriesAtTop ) gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m, 5, cpos++ ); else gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); DeclarationInfo i; i.file = includeFilePath; @@ -1595,7 +1595,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex if ( isIncludeDirective || (!type->resolved() && !type.sourceVariable && ( !type.resultType.trace() || type.resultType.trace() ->trace().isEmpty() ) && !BuiltinTypes::isBuiltin( type.resultType ) ) ) return ; - QString name = type->fullNameChain(); + TQString name = type->fullNameChain(); if ( type.sourceVariable ) name += " " + type.sourceVariable.name; if ( type.resultType->resolved() && type.resultType->resolved() ->asFunction() ) @@ -1606,7 +1606,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex PopupFillerHelpStruct h( this ); PopupFiller filler( h, "" ); - QPopupMenu * m = PopupTracker::createPopup( popup ); + TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m, 5, cpos++ ); @@ -1616,7 +1616,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex popup->setWhatsThis( gid, i18n( "Navigation

    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\"").arg( type.sourceVariable.name ) , this, SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable ); }*/ @@ -1626,7 +1626,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex if ( type->resolved() ) { ///Now fill the class-view-browsing-stuff { - QPopupMenu * m = PopupTracker::createPopup( popup ); + TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m, 6, cpos++ ); @@ -1646,7 +1646,7 @@ void CppCodeCompletion::contextEvaluationMenus ( QPopupMenu *popup, const Contex popup->insertSeparator( cpos ); } -void CppCodeCompletion::slotTextHint( int line, int column, QString &text ) { +void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) { if ( ! m_pSupport->codeCompletionConfig() ->statusBarTypeEvaluation() ) return ; @@ -1654,12 +1654,12 @@ void CppCodeCompletion::slotTextHint( int line, int column, QString &text ) { clearStatusText(); - if ( m_lastHintTime.msecsTo( QTime::currentTime() ) < 300 ) { + if ( m_lastHintTime.msecsTo( TQTime::currentTime() ) < 300 ) { kdDebug( 9007 ) << "slotNeedTextHint called too often" << endl; return ; } - m_lastHintTime = QTime::currentTime(); + m_lastHintTime = TQTime::currentTime(); clearStatusText(); text = ""; @@ -1682,9 +1682,9 @@ void CppCodeCompletion::slotTextHint( int line, int column, QString &text ) { if( f ) { text += "function: \"" + buildSignature( type->resolved() ) + "\""; } else { - QValueList trace = type.resultType->trace(); + TQValueList trace = type.resultType->trace(); if( !trace.isEmpty() ) { - for( QValueList::iterator it = trace.begin(); it != trace.end(); ++it ) { + for( TQValueList::iterator it = trace.begin(); it != trace.end(); ++it ) { text += (*it).fullNameChain() + " --> "; } text += "\n"; @@ -1731,19 +1731,19 @@ void CppCodeCompletion::slotTextHint( int line, int column, QString &text ) { } ///not good.. -bool CppCodeCompletion::isTypeExpression( const QString& expr ) { +bool CppCodeCompletion::isTypeExpression( const TQString& expr ) { TypeDesc d( expr ); if ( !d.isValidType() ) return false; - QString ex = d.fullNameChain(); - QStringList lex = QStringList::split( " ", ex ); - QStringList lexpr = QStringList::split( " ", expr ); + TQString ex = d.fullNameChain(); + TQStringList lex = TQStringList::split( " ", ex ); + TQStringList lexpr = TQStringList::split( " ", expr ); return lex.join( " " ) == lexpr.join( " " ); } -bool CppCodeCompletion::mayBeTypeTail( int line, int column, QString& append, bool inFunction ) { - QString tail = clearComments( m_activeEditor->text( line, column + 1, line + 10 > ( int ) m_activeEditor->numLines() ? ( int ) m_activeEditor->numLines() : line + 10, 0 ) ); +bool CppCodeCompletion::mayBeTypeTail( int line, int column, TQString& append, bool inFunction ) { + TQString tail = clearComments( m_activeEditor->text( line, column + 1, line + 10 > ( int ) m_activeEditor->numLines() ? ( int ) m_activeEditor->numLines() : line + 10, 0 ) ); tail.replace( "\n", " " ); SafetyCounter s ( 100 ); bool hadSpace = false; @@ -1776,7 +1776,7 @@ bool CppCodeCompletion::mayBeTypeTail( int line, int column, QString& append, bo return false; } -bool CppCodeCompletion::canBeTypePrefix( const QString& prefix, bool inFunction ) { +bool CppCodeCompletion::canBeTypePrefix( const TQString& prefix, bool inFunction ) { for ( int p = prefix.length() - 1 ; p >= 0; --p ) { if ( prefix[ p ].isSpace() ) { @@ -1802,13 +1802,13 @@ bool CppCodeCompletion::canBeTypePrefix( const QString& prefix, bool inFunction ExpressionInfo CppCodeCompletion::findExpressionAt( int line, int column, int startLine, int startCol, bool inFunction ) { ExpressionInfo ret; - QString contents = clearComments( getText( startLine, startCol, line, column ) ); + TQString contents = clearComments( getText( startLine, startCol, line, column ) ); int start_expr = expressionAt( contents, contents.length() ); if ( start_expr != int( contents.length() ) ) { - QString str = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); + TQString str = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); if ( str.startsWith( "new " ) ) { str = str.mid( 4 ).stripWhiteSpace(); } @@ -1820,7 +1820,7 @@ ExpressionInfo CppCodeCompletion::findExpressionAt( int line, int column, int st if ( ret ) { ///Check whether it may be a type-expression bool mayBeType = true; - QString append; + TQString append; if ( !mayBeTypeTail( line, column - 1, append, inFunction ) ) mayBeType = false; if ( mayBeType ) { @@ -1829,7 +1829,7 @@ ExpressionInfo CppCodeCompletion::findExpressionAt( int line, int column, int st } //make this a regexp - QString e = ret.expr(); + TQString e = ret.expr(); if ( e.contains( "." ) || e.contains( "->" ) || e.contains( "(" ) || e.contains( ")" ) || e.contains( "=" ) || e.contains( "-" ) ) mayBeType = false; @@ -1863,10 +1863,10 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin f->getStartPosition( &modelStartLine, &modelStartColumn ); f->getEndPosition( &modelEndLine, &modelEndColumn ); - QString textLine = m_activeEditor->textLine( modelStartLine ); + TQString textLine = m_activeEditor->textLine( modelStartLine ); kdDebug( 9007 ) << "startLine = " << textLine << endl; - QString contents = getText( modelStartLine, modelStartColumn, line, col ); + TQString contents = getText( modelStartLine, modelStartColumn, line, col ); Driver d; Lexer lexer( &d ); @@ -1900,13 +1900,13 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin if ( !ctx ) return 0; - QStringList scope = f->scope(); + TQStringList scope = f->scope(); if ( !scope.isEmpty() ) { SimpleType parentType; /* if( !m_cachedFromContext ) { - TypePointer t = SimpleType(QStringList())->locateDecType( scope.join("") ).desc().resolved();; + TypePointer t = SimpleType(TQStringList())->locateDecType( scope.join("") ).desc().resolved();; if( t ) parentType = SimpleType( t.data() ); else @@ -1922,8 +1922,8 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin if( dynamic_cast( &(*global) ) ) { SimpleTypeNamespace* globalNs = static_cast ( &(*global) ); - QValueList > localImports = ctx->imports(); - for( QValueList >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) + TQValueList > localImports = ctx->imports(); + for( TQValueList >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) globalNs->addAliasMap( (*it).first, (*it).second ); } @@ -1984,7 +1984,7 @@ bool CppCodeCompletion::functionContains( FunctionDom f , int line, int col ) { int sl, sc, el, ec; f->getStartPosition( &sl, &sc ); f->getEndPosition( &el, &ec ); - QString t = clearComments( getText( sl, sc, el, ec ) ); + TQString t = clearComments( getText( sl, sc, el, ec ) ); if ( t.isEmpty() ) return false; @@ -2013,7 +2013,7 @@ void CppCodeCompletion::getFunctionBody( FunctionDom f , int& line, int& col ) { int sl, sc, el, ec; f->getStartPosition( &sl, &sc ); f->getEndPosition( &el, &ec ); - QString t = clearComments( getText( sl, sc, el, ec ) ); + TQString t = clearComments( getText( sl, sc, el, ec ) ); if ( t.isEmpty() ) return; @@ -2095,10 +2095,10 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column // emptyCache(); fitContextItem( line, column ); - QString strCurLine = m_activeEditor->textLine( nLine ); + TQString strCurLine = m_activeEditor->textLine( nLine ); - QString ch = strCurLine.mid( nCol - 1, 1 ); - QString ch2 = strCurLine.mid( nCol - 2, 2 ); + TQString ch = strCurLine.mid( nCol - 1, 1 ); + TQString ch2 = strCurLine.mid( nCol - 2, 2 ); while ( ch[ 0 ].isSpace() && nCol >= 3 ) { nCol -= 1; @@ -2108,7 +2108,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column if ( ch2 == "->" || ch == "." || ch == "(" ) { int pos = ch2 == "->" ? nCol - 3 : nCol - 2; - QChar c = strCurLine[ pos ]; + TQChar c = strCurLine[ pos ]; while ( pos > 0 && c.isSpace() ) c = strCurLine[ --pos ]; @@ -2126,7 +2126,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column showArguments = true; } - QString word; + TQString word; { ExpressionInfo exp_ = findExpressionAt( line, column , line, 0 ); @@ -2196,7 +2196,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column } else { ///Remove the not completely typed last word while normal completion if ( !showArguments && ( opt & CompletionOption ) ) { - QString e = exp.expr(); + TQString e = exp.expr(); int idx = e.length() - 1; while ( e[ idx ].isLetterOrNumber() || e[ idx ] == '_' ) --idx; @@ -2229,7 +2229,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column RecoveryPoint* recoveryPoint = this->d->findRecoveryPoint( line, column ); - QStringList scope; + TQStringList scope; if ( !currentClass ) { kdDebug( 9007 ) << "no container-class found" << endl; @@ -2251,7 +2251,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column if ( m_cachedFromContext ) { TypeDesc d( scope.join( "::" ) ); d.setIncludeFiles( getIncludeFiles() ); - SimpleTypeImpl * i = SimpleType( QStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); + SimpleTypeImpl * i = SimpleType( TQStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); if ( i ) container = i; else @@ -2287,13 +2287,13 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column return ret; } -bool isAfterKeyword( const QString& str, int column ) { - QStringList keywords; +bool isAfterKeyword( const TQString& str, int column ) { + TQStringList keywords; keywords << "new"; keywords << "throw"; keywords << "return"; keywords << "emit"; ///This could be done even better by only showing signals for completion.. - for ( QStringList::iterator it = keywords.begin(); it != keywords.end(); ++it ) { + for ( TQStringList::iterator it = keywords.begin(); it != keywords.end(); ++it ) { int len = ( *it ).length(); if ( column >= len && str.mid( column - len, len ) == *it ) return true; @@ -2345,10 +2345,10 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { surroundingEndLine = m_activeEditor->numLines() - 1; int surroundingEndCol = m_activeEditor->lineLength( surroundingEndLine ); - QString pre = getText( surroundingStartLine, 0, line, column ); + TQString pre = getText( surroundingStartLine, 0, line, column ); int pos = pre.length(); pre += getText( line, column, surroundingEndLine, surroundingEndCol ); - QString cleared = clearComments( pre ); + TQString cleared = clearComments( pre ); if ( cleared[ pos ] != pre[ pos ] ) { kdDebug( 9007 ) << "stopping completion because we're in a coment" << endl; return ; @@ -2356,10 +2356,10 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { int nLine = line, nCol = column; - QString strCurLine = clearComments( m_activeEditor->textLine( nLine ) ); + TQString strCurLine = clearComments( m_activeEditor->textLine( nLine ) ); - QString ch = strCurLine.mid( nCol - 1, 1 ); - QString ch2 = strCurLine.mid( nCol - 2, 2 ); + TQString ch = strCurLine.mid( nCol - 1, 1 ); + TQString ch2 = strCurLine.mid( nCol - 2, 2 ); while ( ch[ 0 ].isSpace() && nCol >= 3 ) { nCol -= 1; @@ -2381,7 +2381,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( ch2 == "->" || ch == "." || ch == "(" ) { int pos = ch2 == "->" ? nCol - 3 : nCol - 2; - QChar c = strCurLine[ pos ]; + TQChar c = strCurLine[ pos ]; while ( pos > 0 && c.isSpace() ) c = strCurLine[ --pos ]; @@ -2412,7 +2412,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( isAfterKeyword( strCurLine, column ) ) { ///Maybe a constructor using "new", or "throw", "return", ... } else { - ///it is a local constructor like "QString name("David");" + ///it is a local constructor like "TQString name("David");" nCol = column; } } @@ -2424,7 +2424,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { EvaluationResult type; SimpleType this_type; - QString expr, word; + TQString expr, word; DeclarationAST::Node recoveredDecl; TypeSpecifierAST::Node recoveredTypeSpec; @@ -2442,7 +2442,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { RecoveryPoint * recoveryPoint = d->findRecoveryPoint( line, column ); if ( recoveryPoint || currentFunction ) { contextItem = currentFunction.data(); - QStringList scope; + TQStringList scope; int startLine, startColumn; if ( currentFunction ) { ///maybe change the priority of these @@ -2456,12 +2456,12 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { scope = recoveryPoint->scope; } - QString textLine = m_activeEditor->textLine( startLine ); + TQString textLine = m_activeEditor->textLine( startLine ); kdDebug( 9007 ) << "startLine = " << textLine << endl; if ( currentFunction || recoveryPoint->kind == NodeType_FunctionDefinition ) { - QString textToReparse = clearComments( getText( startLine, startColumn, line, showArguments ? nCol : column ) ); + TQString textToReparse = clearComments( getText( startLine, startColumn, line, showArguments ? nCol : column ) ); kdDebug( 9007 ) << "-------------> reparse text" << endl << textToReparse << endl << "--------------------------------------------" << endl; @@ -2492,7 +2492,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { /// @todo remove code duplication - QString contents = textToReparse; + TQString contents = textToReparse; int start_expr = expressionAt( contents, contents.length() ); // kdDebug(9007) << "start_expr = " << start_expr << endl; @@ -2508,7 +2508,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { --end_expr; if ( contents[ end_expr ] != ',' ) { - expr = QString::null; + expr = TQString::null; } else { start_expr = expressionAt( contents, end_expr ); expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); @@ -2531,14 +2531,14 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { DeclaratorAST* d = def->initDeclarator() ->declarator(); NameAST* name = d->declaratorId(); - QStringList nested; + TQStringList nested; - QPtrList l; + TQPtrList l; if ( name ) { l = name->classOrNamespaceNameList(); } - // QPtrList l = name->classOrNamespaceNameList(); - QPtrListIterator nameIt( l ); + // TQPtrList l = name->classOrNamespaceNameList(); + TQPtrListIterator nameIt( l ); while ( nameIt.current() ) { if ( nameIt.current() ->name() ) { nested << nameIt.current() ->name() ->text(); @@ -2555,8 +2555,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if( dynamic_cast( SimpleType::globalNamespace().data() ) ) { SimpleTypeNamespace* globalNs = static_cast ( SimpleType::globalNamespace().data() ); - QValueList > localImports = ctx->imports(); - for( QValueList >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) + TQValueList > localImports = ctx->imports(); + for( TQValueList >::const_iterator it = localImports.begin(); it != localImports.end(); ++it ) globalNs->addAliasMap( (*it).first, (*it).second ); } } else { @@ -2571,7 +2571,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { conf.setGlobalNamespace( t ); SimpleTypeNamespace * n = dynamic_cast( t.data() ); if ( !n ) { - QString str = QString( "the global namespace was not resolved correctly , real type: " ) + typeid( n ).name() + QString( " name: " ) + n->scope().join( "::" ) + " scope-size: " + n->scope().count(); + TQString str = TQString( "the global namespace was not resolved correctly , real type: " ) + typeid( n ).name() + TQString( " name: " ) + n->scope().join( "::" ) + " scope-size: " + n->scope().count(); kdDebug( 9007 ) << str << endl; m_pSupport->mainWindow() ->statusBar() ->message( str , 1000 ); } else { @@ -2582,7 +2582,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( m_cachedFromContext ) { TypeDesc d( scope.join( "::" ) ); d.setIncludeFiles( getIncludeFiles() ); - SimpleTypeImpl * i = SimpleType( QStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); + SimpleTypeImpl * i = SimpleType( TQStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); if ( i ) { parentType = i; } else { @@ -2633,7 +2633,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { kdDebug( 9007 ) << "no valid declaration to recover!!!" << endl; } } else if ( recoveryPoint->kind == NodeType_ClassSpecifier ) { - QString textToReparse = getText( recoveryPoint->startLine, recoveryPoint->startColumn, + TQString textToReparse = getText( recoveryPoint->startLine, recoveryPoint->startColumn, recoveryPoint->endLine, recoveryPoint->endColumn, line ); // kdDebug(9007) << "-------------> please reparse only text" << endl << textToReparse << endl // << "--------------------------------------------" << endl; @@ -2651,7 +2651,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { //ClassSpecifierAST * clazz = static_cast( recoveredTypeSpec.get() ); - QString keyword = getText( line, 0, line, column ).simplifyWhiteSpace(); + TQString keyword = getText( line, 0, line, column ).simplifyWhiteSpace(); kdDebug( 9007 ) << "===========================> keyword is: " << keyword << endl; @@ -2659,8 +2659,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { BaseClauseAST *baseClause = clazz->baseClause(); if ( baseClause ) { - QPtrList baseList = baseClause->baseSpecifierList(); - QPtrList::iterator it = baseList.begin(); + TQPtrList baseList = baseClause->baseSpecifierList(); + TQPtrList::iterator it = baseList.begin(); for ( ; it != baseList.end(); ++it ) type.append( ( *it )->name()->text() ); @@ -2673,7 +2673,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { kdDebug(9007) << "------> found virtual keyword for class specifier '" << clazz->text() << "'" << endl; }*/ - } else if ( QString( "virtual" ).find( keyword ) != -1 ) + } else if ( TQString( "virtual" ).find( keyword ) != -1 ) m_blockForKeyword = true; else m_blockForKeyword = false; @@ -2694,7 +2694,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { int startLine, startColumn; def->getStartPosition( &startLine, &startColumn ); - QString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); + TQString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); /// @todo remove code duplication @@ -2713,7 +2713,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { --end_expr; if ( contents[ end_expr ] != ',' ) { - expr = QString::null; + expr = TQString::null; } else { start_expr = expressionAt( contents, end_expr ); expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); @@ -2732,7 +2732,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { ctx = computeContext( def, line, column, startLine, startColumn ); - QStringList scope; + TQStringList scope; scopeOfNode( def, scope ); this_type = SimpleType( scope, getIncludeFiles() ); @@ -2755,12 +2755,12 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { return ; if ( ch2 == "::" ) { - QString str = clearComments( expr ); + TQString str = clearComments( expr ); if ( !str.contains( '.' ) && !str.contains( "->" ) ) ///Necessary, because the expression may also be like user->BaseUser:: isInstance = false; } - QString resolutionType = "(resolved)"; + TQString resolutionType = "(resolved)"; if( !type->resolved() ) { if( BuiltinTypes::isBuiltin( type.resultType ) ) { resolutionType = "(builtin " + BuiltinTypes::comment( type.resultType ) + ")"; @@ -2773,7 +2773,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { kdDebug( 9007 ) << "===========================> word is: " << word << endl; if ( !showArguments ) { - QValueList entryList; + TQValueList entryList; if ( !type && this_type && ( expr.isEmpty() || expr.endsWith( ";" ) ) ) { @@ -2817,9 +2817,9 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if( ctx ) computeCompletionEntryList( entryList, ctx, isInstance ); // if ( m_pSupport->codeCompletionConfig() ->includeGlobalFunctions() ) - // computeCompletionEntryList( type, entryList, QStringList(), false ); + // computeCompletionEntryList( type, entryList, TQStringList(), false ); - computeCompletionEntryList( type, entryList, QStringList(), false ); + computeCompletionEntryList( type, entryList, TQStringList(), false ); if ( this_type.scope().size() ) computeCompletionEntryList( this_type, entryList, this_type.scope(), isInstance ); @@ -2829,11 +2829,11 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { computeCompletionEntryList( type, entryList, type->resolved() ->scope() , isInstance ); } - QStringList trueMatches; + TQStringList trueMatches; if ( invokedOnDemand ) { // find matching words - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = entryList.begin(); it != entryList.end(); ++it ) { if ( ( *it ).text.startsWith( word ) ) { trueMatches << ( *it ).text; @@ -2860,14 +2860,14 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { m_bCompletionBoxShow = true; ///Warning: the conversion is only possible because CodeCompletionEntry is binary compatible with KTextEditor::CompletionEntry, ///never change that! - m_activeCompletion->showCompletionBox( *( ( QValueList* ) ( &entryList ) ), word.length() ); + m_activeCompletion->showCompletionBox( *( ( TQValueList* ) ( &entryList ) ), word.length() ); } } else { - QValueList signatureList; + TQValueList signatureList; signatureList = computeSignatureList( type ); - QString methodName = type->name(); + TQString methodName = type->name(); ///Search for variables with ()-operator in the context if ( ctx ) { @@ -2911,7 +2911,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } -QValueList CppCodeCompletion::computeSignatureList( EvaluationResult result ) { +TQValueList CppCodeCompletion::computeSignatureList( EvaluationResult result ) { SimpleType type = result; if ( result.expr.t == ExpressionInfo::TypeExpression ) { @@ -2920,7 +2920,7 @@ QValueList CppCodeCompletion::computeSignatureList( EvaluationResul type = type->typeOf( d, SimpleTypeImpl::MemberInfo::Function ); ///Compute the signature of the constructor } - QValueList retList; + TQValueList retList; SimpleTypeFunctionInterface* f = type->asFunction(); SimpleType currType = type; @@ -2934,10 +2934,10 @@ QValueList CppCodeCompletion::computeSignatureList( EvaluationResul } while ( f ) { - QStringList lst; - QString sig = buildSignature( currType.get() ); - QString comment = currType->comment(); - QStringList commentList; + TQStringList lst; + TQString sig = buildSignature( currType.get() ); + TQString comment = currType->comment(); + TQStringList commentList; if ( m_pSupport->codeCompletionConfig() ->showCommentWithArgumentHint() ) { if ( !comment.isEmpty() ) { @@ -2962,13 +2962,13 @@ QValueList CppCodeCompletion::computeSignatureList( EvaluationResul return retList; } -void CppCodeCompletion::synchronousParseReady( const QString& file, ParsedFilePointer unit ) { +void CppCodeCompletion::synchronousParseReady( const TQString& file, ParsedFilePointer unit ) { if ( file == m_activeFileName ) { computeRecoveryPoints( unit ); } } -void CppCodeCompletion::slotCodeModelUpdated( const QString& fileName ) { +void CppCodeCompletion::slotCodeModelUpdated( const TQString& fileName ) { if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) return ; @@ -2977,7 +2977,7 @@ void CppCodeCompletion::slotCodeModelUpdated( const QString& fileName ) { computeRecoveryPointsLocked(); } -void CppCodeCompletion::slotFileParsed( const QString& fileName ) { +void CppCodeCompletion::slotFileParsed( const TQString& fileName ) { if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) return ; @@ -2999,24 +2999,24 @@ SimpleContext* CppCodeCompletion::computeContext( FunctionDefinitionAST * ast, i DeclaratorAST * d = ast->initDeclarator() ->declarator(); if ( ParameterDeclarationClauseAST * clause = d->parameterDeclarationClause() ) { if ( ParameterDeclarationListAST * params = clause->parameterDeclarationList() ) { - QPtrList l( params->parameterList() ); - QPtrListIterator it( l ); + TQPtrList l( params->parameterList() ); + TQPtrListIterator it( l ); while ( it.current() ) { ParameterDeclarationAST * param = it.current(); ++it; SimpleVariable var; - QStringList ptrList; - QPtrList ptrOpList = param->declarator() ->ptrOpList(); - QPtrList::iterator it = ptrOpList.begin(); + TQStringList ptrList; + TQPtrList ptrOpList = param->declarator() ->ptrOpList(); + TQPtrList::iterator it = ptrOpList.begin(); for ( ; it != ptrOpList.end(); ++it ) { ptrList.append( ( *it ) ->text() ); } var.ptrList = ptrList; var.type = param->typeSpec() ->text() + ptrList.join( "" ); - var.name = declaratorToString( param->declarator(), QString::null, true ); + var.name = declaratorToString( param->declarator(), TQString::null, true ); var.comment = param->comment(); param->getStartPosition( &var.startLine, &var.startCol ); param->getEndPosition( &var.endLine, &var.endCol ); @@ -3080,8 +3080,8 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, StatementListAST* a if ( !inContextScope( ast, line, col, false, true ) ) return ; - QPtrList l( ast->statementList() ); - QPtrListIterator it( l ); + TQPtrList l( ast->statementList() ); + TQPtrListIterator it( l ); while ( it.current() ) { StatementAST * stmt = it.current(); ++it; @@ -3144,8 +3144,8 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, CatchStatementListA /*if ( !inContextScope( ast, line, col, false, true ) ) return;*/ - QPtrList l( ast->statementList() ); - QPtrListIterator it( l ); + TQPtrList l( ast->statementList() ); + TQPtrListIterator it( l ); while ( it.current() ) { CatchStatementAST * stmt = it.current(); ++it; @@ -3168,21 +3168,21 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen ///@todo respect NodeType_Typedef if( ast->declaration() && ast->declaration() ->nodeType() == NodeType_UsingDirective ) { UsingDirectiveAST* usingDecl = static_cast( ast->declaration() ); - QString name; + TQString name; if( usingDecl->name() ) { name = usingDecl->name()->text(); if( !name.isNull() ) - ctx->addImport( QPair( "", name ) ); + ctx->addImport( QPair( "", name ) ); } } if( ast->declaration() && ast->declaration() ->nodeType() == NodeType_NamespaceAlias ) { NamespaceAliasAST* namespaceAlias = static_cast( ast->declaration() ); - QString name; + TQString name; if( namespaceAlias ->namespaceName() && namespaceAlias->aliasName() ) { - ctx->addImport( QPair( namespaceAlias->namespaceName()->text(), namespaceAlias->aliasName()->text() ) ); + ctx->addImport( QPair( namespaceAlias->namespaceName()->text(), namespaceAlias->aliasName()->text() ) ); } } @@ -3199,8 +3199,8 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen if ( !initDeclListAST ) return ; - QPtrList l = initDeclListAST->initDeclaratorList(); - QPtrListIterator it( l ); + TQPtrList l = initDeclListAST->initDeclaratorList(); + TQPtrListIterator it( l ); while ( it.current() ) { DeclaratorAST * d = it.current() ->declarator(); ++it; @@ -3208,9 +3208,9 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen if ( d->declaratorId() ) { SimpleVariable var; - QStringList ptrList; - QPtrList ptrOpList = d->ptrOpList(); - QPtrList::iterator it = ptrOpList.begin(); + TQStringList ptrList; + TQPtrList ptrOpList = d->ptrOpList(); + TQPtrList::iterator it = ptrOpList.begin(); for ( ; it != ptrOpList.end(); ++it ) { ptrList.append( ( *it ) ->text() ); } @@ -3241,9 +3241,9 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, ConditionAST* ast, SimpleVariable var; - QStringList ptrList; - QPtrList ptrOpList = ast->declarator() ->ptrOpList(); - QPtrList::iterator it = ptrOpList.begin(); + TQStringList ptrList; + TQPtrList ptrOpList = ast->declarator() ->ptrOpList(); + TQPtrList::iterator it = ptrOpList.begin(); for ( ; it != ptrOpList.end(); ++it ) { ptrList.append( ( *it ) ->text() ); } @@ -3298,19 +3298,19 @@ FunctionDefinitionAST * CppCodeCompletion::functionDefinition( AST* node ) { return 0; } -QString CppCodeCompletion::getText( int startLine, int startColumn, int endLine, int endColumn, int omitLine ) { +TQString CppCodeCompletion::getText( int startLine, int startColumn, int endLine, int endColumn, int omitLine ) { if ( startLine == endLine ) { - QString textLine = m_activeEditor->textLine( startLine ); + TQString textLine = m_activeEditor->textLine( startLine ); return textLine.mid( startColumn, endColumn - startColumn ); } - QStringList contents; + TQStringList contents; for ( int line = startLine; line <= endLine; ++line ) { if ( line == omitLine ) continue; - QString textLine = m_activeEditor->textLine( line ); + TQString textLine = m_activeEditor->textLine( line ); if ( line == startLine ) textLine = textLine.mid( startColumn ); @@ -3344,7 +3344,7 @@ void CppCodeCompletion::computeRecoveryPoints( ParsedFilePointer unit ) { walker.parseTranslationUnit( *unit ); } -QString codeModelAccessToString( CodeModelItem::Access access ) { +TQString codeModelAccessToString( CodeModelItem::Access access ) { switch ( access ) { case CodeModelItem::Public: return "public"; @@ -3360,13 +3360,13 @@ QString codeModelAccessToString( CodeModelItem::Access access ) { #define MAXCOMMENTCOLUMNS 45 -QString CppCodeCompletion::commentFromItem( const SimpleType& parent, const ItemDom& item ) { +TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const ItemDom& item ) { --m_maxComments; - static QString maxReached = " "; + static TQString maxReached = " "; if( m_maxComments < 0 ) { return maxReached; } - QString ret; + TQString ret; int line, col; item->getStartPosition( &line, &col ); @@ -3397,7 +3397,7 @@ QString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Item const FunctionModel * f = dynamic_cast( item.data() ); ret += "\nKind: Function"; if ( f ) { - QString state; + TQString state; if ( f->isStatic() ) state += "static "; if ( f->isVirtual() ) @@ -3463,22 +3463,22 @@ QString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Item ret += "\nKind: Class"; } - ret += QString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); + ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); if ( !item->comment().isEmpty() ) ret += "\n\n" + prepareTextForMenu( item->comment(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ); return ret; } -QString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) { +TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) { --m_maxComments; - static QString maxReached = " "; + static TQString maxReached = " "; if( m_maxComments < 0 ) { return maxReached; } int line, col; tag.getStartPosition( &line, &col ); - QString ret; // = tag.comment(); + TQString ret; // = tag.comment(); if ( !parent->scope().isEmpty() ) { ret += "Container: " + parent->fullTypeResolvedWithScope(); @@ -3508,7 +3508,7 @@ QString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) ret += "\nKind: Function"; - QString state; + TQString state; if ( function.isStatic() ) state += "static "; if ( function.isVirtual() ) @@ -3585,14 +3585,14 @@ QString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) ret += "\nKind: Struct"; } - ret += QString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); + ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); if ( !tag.comment().isEmpty() ) { ret += "\n\n" + prepareTextForMenu( tag.comment(), 20, MAXCOMMENTCOLUMNS ).join( "\n" ); } return ret; } -void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList& entryList, const QStringList& type, SimpleTypeNamespace* ns, std::set& ignore, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, TQValueList& entryList, const TQStringList& type, SimpleTypeNamespace* ns, std::set& ignore, bool isInstance, int depth ) { HashedString myName = HashedString( ns->scope().join("::") +"%"+typeid(*ns).name() ); if ( ignore.find( myName ) != ignore.end() ) return ; @@ -3608,7 +3608,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList< CodeCompletionEntry > & entryList, const QStringList & type, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, TQValueList< CodeCompletionEntry > & entryList, const TQStringList & type, bool isInstance, int depth ) { dbgState.setState( disableVerboseForCompletionList ); Debug d( "#cel#" ); @@ -3625,12 +3625,12 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList if ( ClassModel * mod = dynamic_cast ( &( *item ) ) ) computeCompletionEntryList( typeR, entryList, ClassDom( mod ) , isInstance, depth ); } else { - QValueList args; - QValueList tags; + TQValueList args; + TQValueList tags; - QStringList ts = type; + TQStringList ts = type; if( !ts.isEmpty() ) { - QString s = ts.back() + typeR->specialization(); + TQString s = ts.back() + typeR->specialization(); ts.pop_back(); ts.push_back( s ); } @@ -3681,14 +3681,14 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList args.clear(); args << Catalog::QueryArgument( "kind", Tag::Kind_Base_class ); - QString fullname = type.join( "::" )+typeR->specialization(); + TQString fullname = type.join( "::" )+typeR->specialization(); /* if( fullname.length() >=2 ) args << Catalog::QueryArgument( "prefix", fullname.left(2) );*/ args << Catalog::QueryArgument( "name", fullname ); - QValueList parents = typeR->getBases( ); - for ( QValueList::Iterator it = parents.begin(); it != parents.end(); ++it ) { + TQValueList parents = typeR->getBases( ); + for ( TQValueList::Iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; SimpleType tp = SimpleType( ( *it ) ->resolved() ); @@ -3700,18 +3700,18 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, QValueList } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, QValueList< Tag > & tags, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, TQValueList< Tag > & tags, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; - QString className = type->desc().name(); + TQString className = type->desc().name(); bool isNs = type->isNamespace(); CompTypeProcessor proc( type, m_pSupport->codeCompletionConfig() ->processFunctionArguments() && type->usingTemplates() ); bool resolve = m_pSupport->codeCompletionConfig() ->processPrimaryTypes() && type->usingTemplates(); - QValueList::Iterator it = tags.begin(); + TQValueList::Iterator it = tags.begin(); while ( it != tags.end() ) { Tag & tag = *it; ++it; @@ -3753,7 +3753,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< fl.flags = tag.flags(); int num = fl.data.access; - QString str = "public"; + TQString str = "public"; if ( num != 0 ) { str = TagUtils::accessToString( num ); } else { @@ -3807,7 +3807,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< break; } - e.userdata = QString( "%1%2%3%4%5" ).arg( num ).arg( depth ).arg( className ).arg( sortPosition ).arg( subSorting ); + e.userdata = TQString( "%1%2%3%4%5" ).arg( num ).arg( depth ).arg( className ).arg( sortPosition ).arg( subSorting ); if ( m_completionMode != SignalCompletion ) { if ( !type->isNamespace() ) { @@ -3819,7 +3819,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } - QString prefix = tagType( tag ).stripWhiteSpace(); + TQString prefix = tagType( tag ).stripWhiteSpace(); if ( tag.kind() == Tag::Kind_Enumerator && tag.hasAttribute( "enum" ) ) { prefix = tag.attribute( "enum" ).asString(); @@ -3867,7 +3867,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, ClassDom klass, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, ClassDom klass, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -3878,7 +3878,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< FunctionDefinitionList definitions = klass->functionDefinitionList(); FunctionList l; - QStringList classScope = klass->scope(); + TQStringList classScope = klass->scope(); classScope << klass->name(); for ( FunctionDefinitionList::iterator it = definitions.begin(); it != definitions.end(); ++it ) { @@ -3930,9 +3930,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< computeCompletionEntryList( klass->name(), type, entryList, klass->typeAliasList(), isInstance, depth ); } - QValueList parents = type->getBases( ); + TQValueList parents = type->getBases( ); - for ( QValueList::Iterator it = parents.begin(); it != parents.end(); ++it ) { + for ( TQValueList::Iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; @@ -3950,7 +3950,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, NamespaceDom scope, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, NamespaceDom scope, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -3962,7 +3962,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< computeCompletionEntryList( type, entryList, scope->namespaceList(), isInstance, depth ); } -void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType type, QValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -3981,7 +3981,7 @@ void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType t if ( isInstance ) continue; - entry.userdata = QString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 6 ); + entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 6 ); entryList << entry; @@ -3993,7 +3993,7 @@ void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType t } } -void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType type, QValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -4015,11 +4015,11 @@ void CppCodeCompletion::computeCompletionEntryList( QString parent, SimpleType t entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace(); entry.text = klass->name(); entry.comment = commentFromItem( type, klass.data() ); - entry.userdata = QString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 5 ); + entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 5 ); entryList << entry; } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, const NamespaceList & lst, bool /*isInstance*/, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const NamespaceList & lst, bool /*isInstance*/, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -4038,11 +4038,11 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, const FunctionList & methods, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const FunctionList & methods, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; - QString className = type->desc().name(); + TQString className = type->desc().name(); bool isNs = type->isNamespace(); bool resolve = type->usingTemplates() && m_pSupport->codeCompletionConfig() ->processPrimaryTypes(); @@ -4073,7 +4073,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< if ( ! resolve ) { entry.prefix = meth->resultType(); } else { - QString tt = meth->resultType(); + TQString tt = meth->resultType(); LocateResult t = type->locateDecType( tt ); if ( t ) { entry.prefix = t->fullNameChain(); @@ -4087,7 +4087,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< entry.prefix = destructorPrefix; entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace(); - QString text; + TQString text; ArgumentList args = meth->argumentList(); ArgumentList::Iterator argIt = args.begin(); @@ -4112,7 +4112,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< text += proc.processType( arg->type() ); if ( m_completionMode == NormalCompletion || m_completionMode == VirtualDeclCompletion ) - text += QString( " " ) + arg->name(); + text += TQString( " " ) + arg->name(); if ( argIt != args.end() ) text += ", "; @@ -4136,7 +4136,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< if ( meth->isStatic() ) subSorting = 5; - entry.userdata += QString( "%1%2%3%4%5" ).arg( meth->access() ).arg( depth ).arg( className ).arg( 1 ).arg( subSorting ); + entry.userdata += TQString( "%1%2%3%4%5" ).arg( meth->access() ).arg( depth ).arg( className ).arg( 1 ).arg( subSorting ); if ( m_completionMode == VirtualDeclCompletion ) entry.text += text + ";"; @@ -4162,9 +4162,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry > & entryList, const VariableList & attributes, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const VariableList & attributes, bool isInstance, int depth ) { Debug d( "#cel#" ); - QString className = type->desc().name(); + TQString className = type->desc().name(); bool isNs = type->isNamespace(); if ( !safetyCounter || !d ) @@ -4187,14 +4187,14 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< CodeCompletionEntry entry; entry.text = attr->name(); entry.comment = commentFromItem( type, model_cast( attr ) ); - entry.userdata += QString( "%1%2%3%4" ).arg( attr->access() ).arg( depth ).arg( className ).arg( 2 ); + entry.userdata += TQString( "%1%2%3%4" ).arg( attr->access() ).arg( depth ).arg( className ).arg( 2 ); if ( !attr->isEnumeratorVariable() ) { if ( ! resolve ) { entry.prefix = attr->type(); } else { - QString tt = attr->type(); + TQString tt = attr->type(); LocateResult t = type->locateDecType( tt ); //SimpleType t = type->typeOf( attr->name() ); if ( t ) @@ -4217,14 +4217,14 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, QValueList< } } -void CppCodeCompletion::computeCompletionEntryList( QValueList< CodeCompletionEntry > & entryList, SimpleContext * ctx, bool /*isInstance*/, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQValueList< CodeCompletionEntry > & entryList, SimpleContext * ctx, bool /*isInstance*/, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; while ( ctx ) { - QValueList vars = ctx->vars(); - QValueList::ConstIterator it = vars.begin(); + TQValueList vars = ctx->vars(); + TQValueList::ConstIterator it = vars.begin(); while ( it != vars.end() ) { const SimpleVariable & var = *it; ++it; @@ -4252,7 +4252,7 @@ EvaluationResult CppCodeCompletion::evaluateExpression( ExpressionInfo expr, Sim EvaluationResult res; res = obj.evaluate(); - QString resolutionType = "(resolved)"; + TQString resolutionType = "(resolved)"; if( !res->resolved() ) { if( BuiltinTypes::isBuiltin( res.resultType ) ) { resolutionType = "(builtin " + BuiltinTypes::comment( res.resultType ) + ")"; @@ -4269,13 +4269,13 @@ EvaluationResult CppCodeCompletion::evaluateExpression( ExpressionInfo expr, Sim void CppCodeCompletion::computeFileEntryList( ) { m_fileEntryList.clear(); - QStringList fileList = m_pSupport->project() ->allFiles(); - for ( QStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) { + TQStringList fileList = m_pSupport->project() ->allFiles(); + for ( TQStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) { if ( !m_pSupport->isHeader( *it ) ) continue; CodeCompletionEntry entry; - entry.text = QFileInfo( *it ).fileName(); + entry.text = TQFileInfo( *it ).fileName(); m_fileEntryList.push_back( entry ); } @@ -4283,8 +4283,8 @@ void CppCodeCompletion::computeFileEntryList( ) { m_fileEntryList = unique( m_fileEntryList ); } -HashedStringSet CppCodeCompletion::getIncludeFiles( const QString& fi ) { - QString file = fi; +HashedStringSet CppCodeCompletion::getIncludeFiles( const TQString& fi ) { + TQString file = fi; if( file.isEmpty() ) file = m_activeFileName; @@ -4328,7 +4328,7 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f ) // Determine the declaration info based on the type of item we are dealing with. DeclarationInfo d; - QString includeFileName, includeFilePath; + TQString includeFileName, includeFilePath; bool unused; if ( result.isMacro ) { @@ -4354,12 +4354,12 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f ) SimpleTypeCachedCodeModel * item = dynamic_cast( ( *slaves.begin() ).first.first.resolved().data() ); if ( item && item->item() && item->item()->isNamespace() ) { NamespaceModel* ns = dynamic_cast( item->item().data() ); - QStringList wholeScope = ns->scope(); + TQStringList wholeScope = ns->scope(); wholeScope << ns->name(); FileList files = cppSupport()->codeModel()->fileList(); for ( FileList::iterator it = files.begin(); it != files.end(); ++it ) { NamespaceModel* ns = (*it).data(); - for ( QStringList::iterator it2 = wholeScope.begin(); it2 != wholeScope.end(); ++it2 ) { + for ( TQStringList::iterator it2 = wholeScope.begin(); it2 != wholeScope.end(); ++it2 ) { if ( ns->hasNamespace( (*it2) ) ) { ns = ns->namespaceByName( *it2 ); if ( !ns ) break; @@ -4386,7 +4386,7 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f ) } // Unresolved, maybe its a named enumeration? else if ( type && type.trace() ) { - QValueList< QPair > trace = type.trace()->trace(); + TQValueList< QPair > trace = type.trace()->trace(); if ( !trace.isEmpty() ) { if ( trace.begin() != trace.end() ) { d = ( *trace.begin() ).first.decl; @@ -4395,16 +4395,16 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f ) } } if ( d ) { - QString fileName = d.file == "current_file" ? m_activeFileName : d.file.operator QString(); + TQString fileName = d.file == "current_file" ? m_activeFileName : d.file.operator TQString(); if ( f == Definition && cppSupport()->switchHeaderImpl( fileName, d.startLine, d.startCol ) ) return; cppSupport()->partController()->editDocument( fileName, d.startLine ); } } -QString CppCodeCompletion::createTypeInfoString( int line, int column ) +TQString CppCodeCompletion::createTypeInfoString( int line, int column ) { - QString typeInfoString; + TQString typeInfoString; SimpleTypeConfiguration conf( m_activeFileName ); EvaluationResult type = evaluateExpressionAt( line, column, conf ); @@ -4412,11 +4412,11 @@ QString CppCodeCompletion::createTypeInfoString( int line, int column ) if ( type.expr.expr().stripWhiteSpace().isEmpty() ) return typeInfoString; - typeInfoString += type.expr.expr() + QString(" : " ); + typeInfoString += type.expr.expr() + TQString(" : " ); if ( type->resolved() ) { - QString scope = type->resolved()->scope().join("::"); + TQString scope = type->resolved()->scope().join("::"); int pos = scope.findRev("::"); if ( scope.isEmpty() || pos == -1 ) { @@ -4427,7 +4427,7 @@ QString CppCodeCompletion::createTypeInfoString( int line, int column ) scope.truncate( pos + 2 ); } - typeInfoString += scope + type->fullNameChain() + QString( i18n(" (resolved) ") ); + typeInfoString += scope + type->fullNameChain() + TQString( i18n(" (resolved) ") ); } else { @@ -4435,16 +4435,16 @@ QString CppCodeCompletion::createTypeInfoString( int line, int column ) { if( !BuiltinTypes::isBuiltin( type.resultType ) ) { - typeInfoString += type->fullNameChain() + QString( i18n(" (unresolved) ") ); + typeInfoString += type->fullNameChain() + TQString( i18n(" (unresolved) ") ); } else { - typeInfoString += type->fullNameChain() + ", " + BuiltinTypes::comment( type.resultType ) + QString( i18n(" (builtin type) ") ); + typeInfoString += type->fullNameChain() + ", " + BuiltinTypes::comment( type.resultType ) + TQString( i18n(" (builtin type) ") ); } } else { - typeInfoString += QString( i18n(" (unresolved) ") ); + typeInfoString += TQString( i18n(" (unresolved) ") ); } } @@ -4458,16 +4458,16 @@ QString CppCodeCompletion::createTypeInfoString( int line, int column ) return typeInfoString; } -bool CppCodeCompletion::getIncludeInfo( int line, QString& includeFileName, QString& includeFilePath, bool& usedProjectFiles ) +bool CppCodeCompletion::getIncludeInfo( int line, TQString& includeFileName, TQString& includeFilePath, bool& usedProjectFiles ) { bool isIncludeDirective = false; - QString lineText = getText( line, 0, line+1, 0 ); - QRegExp includeRx( "(?:#include[\\s]*(?:\\\"|\\<))([^\\n]*)(\\\"|\\>)" ); + TQString lineText = getText( line, 0, line+1, 0 ); + TQRegExp includeRx( "(?:#include[\\s]*(?:\\\"|\\<))([^\\n]*)(\\\"|\\>)" ); if( includeRx.search( lineText ) != -1 ) { //It is an include-directive. The regular expression captures the string, and the closing sign('"' or '>'). isIncludeDirective = true; usedProjectFiles = false; - QStringList captured = includeRx.capturedTexts(); + TQStringList captured = includeRx.capturedTexts(); if( captured.size() == 3 ) { Dependence d; d.first = captured[1]; diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 0eb49908..67f7b10b 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -34,28 +34,28 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "driver.h" ///A little debugging class -#include -class PopupTracker : public QObject { +#include +class PopupTracker : public TQObject { Q_OBJECT public: static PopupTracker* pt; static uint pendingPopups; - static QPopupMenu* createPopup( QWidget* parent ) { + static TQPopupMenu* createPopup( TQWidget* parent ) { if( !pt ) pt = new PopupTracker(); - QPopupMenu* m = new QPopupMenu( parent ); + TQPopupMenu* m = new TQPopupMenu( parent ); ++pendingPopups; - connect( m, SIGNAL(destroyed()), pt, SLOT(destroyedPopup()) ); + connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) ); return m; } @@ -123,31 +123,31 @@ public: return m_completionMode; } - QString createTypeInfoString( int line, int column ); + TQString createTypeInfoString( int line, int column ); - QString replaceCppComments( const QString& contents ); - int expressionAt( const QString& text, int index ); - QStringList splitExpression( const QString& text ); + TQString replaceCppComments( const TQString& contents ); + int expressionAt( const TQString& text, int index ); + TQStringList splitExpression( const TQString& text ); CppEvaluation::EvaluationResult evaluateExpression( ExpressionInfo expr, SimpleContext* ctx ); CppEvaluation::EvaluationResult evaluateExpressionAt( int line, int column, SimpleTypeConfiguration& conf, bool ifUnknownSetType = false ); - void contextEvaluationMenus ( QPopupMenu *popup, const Context *context, int line, int col ); + void contextEvaluationMenus ( TQPopupMenu *popup, const Context *context, int line, int col ); CppSupportPart* cppSupport() const; - HashedStringSet getIncludeFiles( const QString& file = QString() ); + HashedStringSet getIncludeFiles( const TQString& file = TQString() ); static CppCodeCompletion* instance() { return m_instance; } ///Adds a string that will be ticked through the status-bar - void addStatusText( QString text, int timeout ); + void addStatusText( TQString text, int timeout ); void clearStatusText(); - QString activeFileName() const { + TQString activeFileName() const { return m_activeFileName; } @@ -166,17 +166,17 @@ private slots: void slotArgHintHidden(); void slotCompletionBoxHidden(); void slotTextChanged(); - void slotFileParsed( const QString& fileName ); - void slotCodeModelUpdated( const QString& fileName ); + void slotFileParsed( const TQString& fileName ); + void slotCodeModelUpdated( const TQString& fileName ); void slotTimeout(); void slotStatusTextTimeout(); void computeFileEntryList(); - bool isTypeExpression( const QString& expr ); - void slotTextHint( int line, int col, QString &text ); + bool isTypeExpression( const TQString& expr ); + void slotTextHint( int line, int col, TQString &text ); void popupAction( int number ); void popupDefinitionAction( int number ); void popupClassViewAction( int number ); - void synchronousParseReady( const QString& file, ParsedFilePointer unit ); + void synchronousParseReady( const TQString& file, ParsedFilePointer unit ); void slotJumpToDefCursorContext(); void slotJumpToDeclCursorContext(); @@ -187,16 +187,16 @@ private: bool functionContains( FunctionDom f , int line, int col ); void getFunctionBody( FunctionDom f , int& line, int& col ); void selectItem( ItemDom item ); - void addTypePopups( QPopupMenu* parent, TypeDesc d, QString depthAdd, QString prefix = "" ); - void addTypeClassPopups( QPopupMenu* parent, TypeDesc d, QString depthAdd, QString prefix = "" ); - QValueList computeSignatureList( CppEvaluation::EvaluationResult function ); + void addTypePopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypeClassPopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + TQValueList computeSignatureList( CppEvaluation::EvaluationResult function ); void integratePart( KParts::Part* part ); void setupCodeInformationRepository(); FunctionDefinitionAST* functionDefinition( AST* node ); void computeRecoveryPoints( ParsedFilePointer unit ); void computeRecoveryPointsLocked(); void jumpCursorContext( FunctionType ); - bool getIncludeInfo( int line, QString& includeFileName, QString& includeFilePath, bool& usedProjectFiles ); + bool getIncludeInfo( int line, TQString& includeFileName, TQString& includeFilePath, bool& usedProjectFiles ); enum EvaluateExpressionOptions { IncludeStandardExpressions = 1, @@ -209,33 +209,33 @@ private: DefaultCompletionOptions = 1 | 4 | 8 | 16 }; - bool mayBeTypeTail( int line, int column, QString& append, bool inFunction = false ); - bool canBeTypePrefix( const QString& prefix, bool inFunction = false ); + bool mayBeTypeTail( int line, int column, TQString& append, bool inFunction = false ); + bool canBeTypePrefix( const TQString& prefix, bool inFunction = false ); ExpressionInfo findExpressionAt( int line, int col, int startLine, int startCol, bool inFunction = false ); SimpleContext* computeFunctionContext( FunctionDom f, int line, int col, SimpleTypeConfiguration& conf ); CppEvaluation::EvaluationResult evaluateExpressionType( int line, int column, SimpleTypeConfiguration& conf, EvaluateExpressionOptions opt = DefaultCompletionOptions ); - SimpleType unTypeDef( SimpleType scope , QMap& typedefs ); + SimpleType unTypeDef( SimpleType scope , TQMap& typedefs ); - // QString buildSignature( TypePointer currType ); - SimpleType typeOf( QValueList& tags, MemberAccessOp accessOp ); + // TQString buildSignature( TypePointer currType ); + SimpleType typeOf( TQValueList& tags, MemberAccessOp accessOp ); /// @todo remove isInstance - void computeCompletionEntryList( QValueList& entryList, SimpleContext* ctx, bool isInstance, int depth = 0 ); - void computeCompletionEntryList( SimpleType type, QValueList& - entryList, const QStringList& typeList, SimpleTypeNamespace* ns, std::set& ignore, bool isInstance, int depth = 0 ); - void computeCompletionEntryList( SimpleType type, QValueList& - entryList, const QStringList& typeList, bool isInstance, int depth = 0 ); - void computeCompletionEntryList( SimpleType type, QValueList& entryList, QValueList& tags, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList& entryList, ClassDom klass, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList& entryList, NamespaceDom scope, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList& entryList, const FunctionList& methods, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList& entryList, const VariableList& attributes, bool isInstance, int depth ); - void computeCompletionEntryList( QString parent, SimpleType type, QValueList& entryList, const ClassList& lst, bool isInstance, int depth ); - void computeCompletionEntryList( QString parent, SimpleType type, QValueList& entryList, const TypeAliasList& lst, bool isInstance, int depth ); - void computeCompletionEntryList( SimpleType type, QValueList& entryList, const NamespaceList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQValueList& entryList, SimpleContext* ctx, bool isInstance, int depth = 0 ); + void computeCompletionEntryList( SimpleType type, TQValueList& + entryList, const TQStringList& typeList, SimpleTypeNamespace* ns, std::set& ignore, bool isInstance, int depth = 0 ); + void computeCompletionEntryList( SimpleType type, TQValueList& + entryList, const TQStringList& typeList, bool isInstance, int depth = 0 ); + void computeCompletionEntryList( SimpleType type, TQValueList& entryList, TQValueList& tags, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList& entryList, ClassDom klass, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList& entryList, NamespaceDom scope, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList& entryList, const FunctionList& methods, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList& entryList, const VariableList& attributes, bool isInstance, int depth ); + void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList& entryList, const ClassList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList& entryList, const TypeAliasList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( SimpleType type, TQValueList& entryList, const NamespaceList& lst, bool isInstance, int depth ); SimpleContext* computeContext( FunctionDefinitionAST* ast, int line, int col, int lineOffset, int colOffset ); void computeContext( SimpleContext*& ctx, StatementAST* ast, int line, int col ); @@ -252,7 +252,7 @@ private: void computeContext( SimpleContext*& ctx, ConditionAST* ast, int line, int col ); bool inContextScope( AST* ast, int line, int col, bool checkStart = true, bool checkEnd = true ); - QString getText( int startLine, int startColumn, int endLine, int endColumn, int omitLine = -1 ); + TQString getText( int startLine, int startColumn, int endLine, int endColumn, int omitLine = -1 ); private: @@ -263,15 +263,15 @@ private: friend class ExpressionEvaluation; friend class PopupFillerHelpStruct; friend class PopupClassViewFillerHelpStruct; - QGuardedPtr m_pSupport; - QTimer* m_ccTimer; - QTimer* m_showStatusTextTimer; - QValueList > m_statusTextList; + TQGuardedPtr m_pSupport; + TQTimer* m_ccTimer; + TQTimer* m_showStatusTextTimer; + TQValueList > m_statusTextList; void fitContextItem( int nLine, int nColumn ); void needRecoveryPoints(); - QString m_activeFileName; + TQString m_activeFileName; KTextEditor::ViewCursorInterface* m_activeCursor; KTextEditor::EditInterface* m_activeEditor; KTextEditor::TextHintInterface* m_activeHintInterface; @@ -291,33 +291,33 @@ private: CppCodeCompletionData* d; CompletionMode m_completionMode; - QTime m_lastHintTime; + TQTime m_lastHintTime; //If more then the given count of comments were requested, all following ones will be blank.(Performance-reasons) void setMaxComments( int count ); - QString commentFromItem( const SimpleType& parent, const ItemDom& item ); - QString commentFromTag( const SimpleType& parent, Tag& tag ); + TQString commentFromItem( const SimpleType& parent, const ItemDom& item ); + TQString commentFromTag( const SimpleType& parent, Tag& tag ); ItemDom m_cachedFromContext; ///Can be a function or a class, representing the position from where the last completion was started. Necessary as long as all imports are put into the global namespace. - QRegExp m_includeRx; - QRegExp m_cppCodeCommentsRx; - QRegExp m_codeCompleteChRx; - QRegExp m_codeCompleteCh2Rx; - QValueList m_fileEntryList; + TQRegExp m_includeRx; + TQRegExp m_cppCodeCommentsRx; + TQRegExp m_codeCompleteChRx; + TQRegExp m_codeCompleteCh2Rx; + TQValueList m_fileEntryList; int m_maxComments; - typedef QMap PopupActions; - typedef QMap PopupClassViewActions; + typedef TQMap PopupActions; + typedef TQMap PopupClassViewActions; PopupActions m_popupActions; PopupActions m_popupDefinitionActions; PopupClassViewActions m_popupClassViewActions; // we need something to plug actions that are not in any menu // into in order for their shortcuts to work - QWidget m_DummyActionWidget; + TQWidget m_DummyActionWidget; }; #endif diff --git a/languages/cpp/cppcodecompletionconfig.cpp b/languages/cpp/cppcodecompletionconfig.cpp index 2c394858..9ecca5f4 100644 --- a/languages/cpp/cppcodecompletionconfig.cpp +++ b/languages/cpp/cppcodecompletionconfig.cpp @@ -16,12 +16,12 @@ #include #include -#include +#include -QString CppCodeCompletionConfig::defaultPath = QString::fromLatin1( "/kdevcppsupport/codecompletion" ); +TQString CppCodeCompletionConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/codecompletion" ); -CppCodeCompletionConfig::CppCodeCompletionConfig( CppSupportPart * part, QDomDocument* dom ) - : QObject( part ), m_part( part ), m_dom( dom ) +CppCodeCompletionConfig::CppCodeCompletionConfig( CppSupportPart * part, TQDomDocument* dom ) + : TQObject( part ), m_part( part ), m_dom( dom ) { init(); } diff --git a/languages/cpp/cppcodecompletionconfig.h b/languages/cpp/cppcodecompletionconfig.h index 13b23ccf..4fbf2d1b 100644 --- a/languages/cpp/cppcodecompletionconfig.h +++ b/languages/cpp/cppcodecompletionconfig.h @@ -13,7 +13,7 @@ #ifndef CPPCODECOMPLETIONCONFIG_H #define CPPCODECOMPLETIONCONFIG_H -#include +#include class CppSupportPart; class QDomDocument; @@ -26,7 +26,7 @@ class CppCodeCompletionConfig : public QObject { Q_OBJECT public: - CppCodeCompletionConfig( CppSupportPart* part, QDomDocument* dom ); + CppCodeCompletionConfig( CppSupportPart* part, TQDomDocument* dom ); virtual ~CppCodeCompletionConfig(); // bool includeGlobalFunctions() const @@ -93,7 +93,7 @@ public: } ///Additional include-paths defined by the user - void setCustomIncludePaths(QString str) { + void setCustomIncludePaths(TQString str) { m_includePaths = str; } @@ -116,7 +116,7 @@ public: } ///Additional include-paths defined by the user - QString customIncludePaths() const { + TQString customIncludePaths() const { return m_includePaths; } @@ -160,7 +160,7 @@ public: return m_statusBarTypeEvaluation; } - QString namespaceAliases() const { + TQString namespaceAliases() const { ///used return m_namespaceAliases; } @@ -201,7 +201,7 @@ public: m_statusBarTypeEvaluation = b; } - void setNamespaceAliases( QString n ) { + void setNamespaceAliases( TQString n ) { ///used m_namespaceAliases = n; } @@ -274,7 +274,7 @@ private: private: CppSupportPart* m_part; - QDomDocument* m_dom; + TQDomDocument* m_dom; /* bool m_includeGlobalFunctions; bool m_includeTypes; bool m_includeEnums; @@ -292,18 +292,18 @@ private: bool m_alwaysIncludeNamespaces; bool m_alwaysParseInBackground; bool m_usePermanentCaching; - QString m_includePaths; + TQString m_includePaths; bool m_showOnlyAccessibleItems; CompletionBoxItemOrder m_completionBoxItemOrder; bool m_showEvaluationContextMenu; bool m_showCommentWithArgumentHint; bool m_statusBarTypeEvaluation; - QString m_namespaceAliases; + TQString m_namespaceAliases; bool m_processPrimaryTypes; bool m_processFunctionArguments; - static QString defaultPath; + static TQString defaultPath; }; #endif diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp index ff1f4ab9..b84185f5 100644 --- a/languages/cpp/cppevaluation.cpp +++ b/languages/cpp/cppevaluation.cpp @@ -27,7 +27,7 @@ extern SafetyCounter safetyCounter; namespace CppEvaluation { -void statusLog( const QString& str ) { +void statusLog( const TQString& str ) { ifVerboseMajor( dbgMajor() << str << endl ); statusBarText( str, 2000 ); } @@ -43,41 +43,41 @@ RegisterOperator< IndexOperator > IndexReg( AllOperators ); RegisterOperator< ParenOperator > ParenReg( AllOperators ); template -QValueList convertList( const QValueList& from ) { - QValueList ret; - for( typename QValueList::const_iterator it = from.begin(); it != from.end(); ++it ) { +TQValueList convertList( const TQValueList& from ) { + TQValueList ret; + for( typename TQValueList::const_iterator it = from.begin(); it != from.end(); ++it ) { ret << (To)*it; } return ret; } -QString nameFromType( SimpleType t ) { +TQString nameFromType( SimpleType t ) { return t->fullTypeResolved(); } -QString Operator::printTypeList( QValueList& lst ) +TQString Operator::printTypeList( TQValueList& lst ) { - QString ret; - for( QValueList::iterator it = lst.begin(); it != lst.end(); ++it ) { + TQString ret; + for( TQValueList::iterator it = lst.begin(); it != lst.end(); ++it ) { ret += "\"" + (*it)->fullNameChain() + "\", "; } ret.truncate( ret.length() - 3 ); return ret; } -void Operator::log( const QString& msg ) { +void Operator::log( const TQString& msg ) { statusLog( "\"" + name() + "\": " + msg ); //ifVerboseMajor( dbgMajor() << "\"" << name() << "\": " << msg << endl ); } OperatorSet::~OperatorSet() { - for( QValueList< Operator* >::iterator it = m_operators.begin(); it != m_operators.end(); ++it ) { + for( TQValueList< Operator* >::iterator it = m_operators.begin(); it != m_operators.end(); ++it ) { delete *it; } } -OperatorIdentification OperatorSet::identifyOperator( const QString& str_ , Operator::BindingSide allowedBindings) { - QString str = str_.stripWhiteSpace(); +OperatorIdentification OperatorSet::identifyOperator( const TQString& str_ , Operator::BindingSide allowedBindings) { + TQString str = str_.stripWhiteSpace(); for( OperatorList::iterator it = m_operators.begin(); it != m_operators.end(); ++it ) { if( ((*it)->binding() & allowedBindings) == (*it)->binding() ) { if( OperatorIdentification ident = (*it)->identify( str ) ) { @@ -89,7 +89,7 @@ OperatorIdentification OperatorSet::identifyOperator( const QString& str_ , Oper return OperatorIdentification(); } -OperatorIdentification UnaryOperator::identify( QString& str ) { +OperatorIdentification UnaryOperator::identify( TQString& str ) { OperatorIdentification ret; if( str.startsWith( m_identString ) ) { ret.start = 0; @@ -100,9 +100,9 @@ OperatorIdentification UnaryOperator::identify( QString& str ) { return ret; } -EvaluationResult UnaryOperator::apply( QValueList params, QValueList innerParams ) { +EvaluationResult UnaryOperator::apply( TQValueList params, TQValueList innerParams ) { if( !checkParams( params ) ) { - log( QString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) ); + log( TQString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) ); return EvaluationResult(); } else { EvaluationResult t = unaryApply( params.front(), innerParams ); @@ -116,11 +116,11 @@ EvaluationResult UnaryOperator::apply( QValueList params, QVal } } -EvaluationResult NestedTypeOperator::unaryApply( EvaluationResult param, const QValueList& /*innerParams*/ ) { +EvaluationResult NestedTypeOperator::unaryApply( EvaluationResult param, const TQValueList& /*innerParams*/ ) { return param; } -EvaluationResult DotOperator::unaryApply( EvaluationResult param, const QValueList& /*innerParams*/ ) { +EvaluationResult DotOperator::unaryApply( EvaluationResult param, const TQValueList& /*innerParams*/ ) { if( param->totalPointerDepth() == 0 ) { return param; } else { @@ -130,7 +130,7 @@ EvaluationResult DotOperator::unaryApply( EvaluationResult param, const QValueLi } -EvaluationResult ArrowOperator::unaryApply( EvaluationResult param, const QValueList& innerParams ) { +EvaluationResult ArrowOperator::unaryApply( EvaluationResult param, const TQValueList& innerParams ) { if( param->totalPointerDepth() == 1 ) { param->setTotalPointerDepth( param->totalPointerDepth() - 1 ); return param; @@ -149,7 +149,7 @@ EvaluationResult ArrowOperator::unaryApply( EvaluationResult param, const QValue }; } -EvaluationResult StarOperator::unaryApply( EvaluationResult param, const QValueList& /*innerParams*/ ) { +EvaluationResult StarOperator::unaryApply( EvaluationResult param, const TQValueList& /*innerParams*/ ) { if( param->totalPointerDepth() > 0 ) { param->setTotalPointerDepth( param->totalPointerDepth() - 1 ); return param; @@ -163,14 +163,14 @@ EvaluationResult StarOperator::unaryApply( EvaluationResult param, const QValueL }; } -EvaluationResult AddressOperator::unaryApply( EvaluationResult param, const QValueList& /*innerParams*/ ) { +EvaluationResult AddressOperator::unaryApply( EvaluationResult param, const TQValueList& /*innerParams*/ ) { param->setTotalPointerDepth( param->totalPointerDepth() + 1 ); return param; } -OperatorIdentification UnaryParenOperator::identify( QString& str ) { +OperatorIdentification UnaryParenOperator::identify( TQString& str ) { OperatorIdentification ret; - if( str.startsWith( QString( identString()[0] ) ) ) { + if( str.startsWith( TQString( identString()[0] ) ) ) { ret.start = 0; ret.end = findClose( str, 0 ); if( ret.end == -1 ) { @@ -200,7 +200,7 @@ OperatorIdentification UnaryParenOperator::identify( QString& str ) { } -EvaluationResult IndexOperator::unaryApply( EvaluationResult param, const QValueList& innerParams ) { +EvaluationResult IndexOperator::unaryApply( EvaluationResult param, const TQValueList& innerParams ) { if( param->totalPointerDepth() > 0 ) { param->setTotalPointerDepth( param->totalPointerDepth() - 1 ); return param; @@ -214,7 +214,7 @@ EvaluationResult IndexOperator::unaryApply( EvaluationResult param, const QValue }; } -EvaluationResult ParenOperator::unaryApply( EvaluationResult param, const QValueList& innerParams ) { +EvaluationResult ParenOperator::unaryApply( EvaluationResult param, const TQValueList& innerParams ) { if( param ) { if( param->resolved() ) { return param->resolved()->applyOperator( SimpleTypeImpl::ParenOp, convertList(innerParams) ); @@ -253,7 +253,7 @@ EvaluationResult ExpressionEvaluation::evaluate() { return res; } -EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, EvaluationResult scope, SimpleContext * ctx, SimpleContext* innerCtx , bool canBeTypeExpression) { +EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( TQString expr, EvaluationResult scope, SimpleContext * ctx, SimpleContext* innerCtx , bool canBeTypeExpression) { LogDebug d( "#evl#" ); if( expr.isEmpty() || !safetyCounter ) { scope.expr.t = ExpressionInfo::NormalExpression; @@ -270,9 +270,9 @@ EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, expr = expr.stripWhiteSpace(); ///Find the rightmost operator with the lowest priority, for the first split. - QValueList idents; + TQValueList idents; for( uint a = 0; a < expr.length(); ++a ) { - QString part = expr.mid( a ); + TQString part = expr.mid( a ); OperatorIdentification ident = m_operators.identifyOperator( part ); if( ident ) { ifVerboseMajor( dbgMajor() << "identified \"" << ident.op->name() << "\" in string " << part << endl ); @@ -292,7 +292,7 @@ EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, if( !idents.isEmpty() ) { OperatorIdentification lowest; - for( QValueList::iterator it = idents.begin(); it != idents.end(); ++it ) { + for( TQValueList::iterator it = idents.begin(); it != idents.end(); ++it ) { if( lowest ) { if( lowest.op->priority() >= (*it).op->priority() ) lowest = *it; @@ -302,8 +302,8 @@ EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, } if( lowest ) { - QString leftSide = expr.left( lowest.start ).stripWhiteSpace(); - QString rightSide = expr.right( expr.length() - lowest.end ).stripWhiteSpace(); + TQString leftSide = expr.left( lowest.start ).stripWhiteSpace(); + TQString rightSide = expr.right( expr.length() - lowest.end ).stripWhiteSpace(); EvaluationResult left, right; if( !leftSide.isEmpty() ) { @@ -323,12 +323,12 @@ EvaluationResult ExpressionEvaluation::evaluateExpressionInternal( QString expr, ifVerboseMajor( dbgMajor() << "problem while evaluating expression \"" << expr << "\", the operator \"" << lowest.op->name() << "\" has a binding to the right side, but no right side could be evaluated: \"" << rightSide << "\"" << endl ); } - QValueList innerParams; - QValueList params; + TQValueList innerParams; + TQValueList params; if( lowest.op->binding() & Operator::Left ) params << left; if( lowest.op->binding() & Operator::Right ) params << right; - for( QValueList::iterator it = lowest.innerParams.begin(); it != lowest.innerParams.end(); ++it ) { + for( TQValueList::iterator it = lowest.innerParams.begin(); it != lowest.innerParams.end(); ++it ) { ifVerboseMajor(dbgMajor() << "evaluating inner parameter \"" + *it + "\"" ); innerParams << evaluateExpressionInternal( (*it), SimpleType(), innerCtx, innerCtx, lowest.op->canBeType( Operator::Neutral ) ); } @@ -465,7 +465,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, } /*} else { bestRet = EvaluationResult( type ); - QStringList s = split+exprList; + TQStringList s = split+exprList; s.pop_front(); if( !s.isEmpty() ) bestRet->append( new TypeDescShared( s.join("::") ) ); diff --git a/languages/cpp/cppevaluation.h b/languages/cpp/cppevaluation.h index e4adeb28..97924b0a 100644 --- a/languages/cpp/cppevaluation.h +++ b/languages/cpp/cppevaluation.h @@ -22,7 +22,7 @@ #ifndef CPPEVALUATION_H #define CPPEVALUATION_H -#include +#include #include "expressioninfo.h" #include "simpletype.h" @@ -31,19 +31,19 @@ class SimpleContext; -void statusBarText( const QString& str, int time = 1000 ); +void statusBarText( const TQString& str, int time = 1000 ); namespace CppEvaluation { template -extern QValueList convertList( const QValueList& from ); +extern TQValueList convertList( const TQValueList& from ); -extern QString nameFromType( SimpleType t ); +extern TQString nameFromType( SimpleType t ); class Operator; struct OperatorIdentification { - QValueList innerParams; /** Inner parameters of the operator( for the vec["hello"] the "hello" ) */ + TQValueList innerParams; /** Inner parameters of the operator( for the vec["hello"] the "hello" ) */ int start, end; /** Range the operator occupies */ bool found; Operator* op; ///Can be 0 ! @@ -139,12 +139,12 @@ class Operator { virtual BindingSide binding() = 0; ///The side to which the operator binds ///When this returns true, the ident-structure must be filled correctly - virtual OperatorIdentification identify( QString& str ) = 0; + virtual OperatorIdentification identify( TQString& str ) = 0; ///params - virtual EvaluationResult apply( QValueList params, QValueList innerParams ) = 0; + virtual EvaluationResult apply( TQValueList params, TQValueList innerParams ) = 0; - virtual QString name() = 0; + virtual TQString name() = 0; ///Should return whether the item it the given side can be a type(Neutral stands for the inner paremeters) virtual bool canBeType( BindingSide side ) { @@ -152,14 +152,14 @@ class Operator { } protected: - void log( const QString& msg ); - QString printTypeList( QValueList& lst ); + void log( const TQString& msg ); + TQString printTypeList( TQValueList& lst ); }; class OperatorSet { private: - typedef QValueList< Operator* > OperatorList; + typedef TQValueList< Operator* > OperatorList; OperatorList m_operators; public: OperatorSet() {} @@ -170,7 +170,7 @@ class OperatorSet { m_operators << op; } - OperatorIdentification identifyOperator( const QString& str_ , Operator::BindingSide allowedBindings = ( Operator::BindingSide ) ( Operator::Left | Operator::Right | Operator::Neutral ) ); + OperatorIdentification identifyOperator( const TQString& str_ , Operator::BindingSide allowedBindings = ( Operator::BindingSide ) ( Operator::Left | Operator::Right | Operator::Neutral ) ); }; extern OperatorSet AllOperators; @@ -190,7 +190,7 @@ class RegisterOperator { class UnaryOperator : public Operator { public: - UnaryOperator( int priority , QString identString, QString description, Operator::BindingSide binding ) : Operator(), m_priority( priority ), m_identString( identString ), m_name( description ), m_binding( binding ) {} + UnaryOperator( int priority , TQString identString, TQString description, Operator::BindingSide binding ) : Operator(), m_priority( priority ), m_identString( identString ), m_name( description ), m_binding( binding ) {} virtual int priority() { return m_priority; @@ -208,28 +208,28 @@ class UnaryOperator : public Operator { return 1; } - virtual OperatorIdentification identify( QString& str ); + virtual OperatorIdentification identify( TQString& str ); - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList& innerParams ) = 0; + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList& innerParams ) = 0; - virtual bool checkParams( const QValueList& params ) { + virtual bool checkParams( const TQValueList& params ) { return !params.isEmpty() && params[ 0 ]; } - virtual EvaluationResult apply( QValueList params, QValueList innerParams ); + virtual EvaluationResult apply( TQValueList params, TQValueList innerParams ); - virtual QString name() { + virtual TQString name() { return m_name; } private: int m_priority; - QString m_identString; - QString m_name; + TQString m_identString; + TQString m_name; Operator::BindingSide m_binding; protected: - QString identString() const { + TQString identString() const { return m_identString; } @@ -240,7 +240,7 @@ class NestedTypeOperator : public UnaryOperator { public: NestedTypeOperator() : UnaryOperator( 18, "::", "nested-type-operator", Operator::Left ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList& /*innerParams*/ ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList& /*innerParams*/ ); }; //RegisterOperator< NestedTypeOperator > NestedTypeReg( AllOperators ); ///This registers the operator to the list of all operators @@ -249,7 +249,7 @@ class DotOperator : public UnaryOperator { public: DotOperator() : UnaryOperator( 17, ".", "dot-operator", Operator::Left ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList& /*innerParams*/ ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList& /*innerParams*/ ); virtual bool canBeType( BindingSide side ) { return false; @@ -260,7 +260,7 @@ class ArrowOperator : public UnaryOperator { public: ArrowOperator() : UnaryOperator( 17, "->", "arrow-operator", Operator::Left ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList& innerParams ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList& innerParams ); virtual bool canBeType( BindingSide side ) { return false; @@ -273,7 +273,7 @@ class StarOperator : public UnaryOperator { StarOperator() : UnaryOperator( 15, "*", "star-operator", Operator::Right ) { ///Normally this should have a priority of 16, but that would need changes to the expression-parsin g-loop } - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList& /*innerParams*/ ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList& /*innerParams*/ ); virtual bool canBeType( BindingSide side ) { return false; @@ -285,7 +285,7 @@ class AddressOperator : public UnaryOperator { public: AddressOperator() : UnaryOperator( 16, "&", "address-operator", Operator::Right ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList& /*innerParams*/ ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList& /*innerParams*/ ); virtual bool canBeType( BindingSide side ) { return false; @@ -296,9 +296,9 @@ class AddressOperator : public UnaryOperator { class UnaryParenOperator : public UnaryOperator { public: ///Identstring should be both parens, for Example "[]" or "()" - UnaryParenOperator( int priority , QString identString, QString description, Operator::BindingSide binding ) : UnaryOperator( priority, identString, description, binding ) {} + UnaryParenOperator( int priority , TQString identString, TQString description, Operator::BindingSide binding ) : UnaryOperator( priority, identString, description, binding ) {} - virtual OperatorIdentification identify( QString& str ); + virtual OperatorIdentification identify( TQString& str ); virtual bool canBeType( BindingSide side ) { return false; @@ -309,7 +309,7 @@ class IndexOperator : public UnaryParenOperator { public: IndexOperator() : UnaryParenOperator( 17, "[]", "index-operator", Operator::Left ) {} - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList& innerParams ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList& innerParams ); virtual bool canBeType( BindingSide side ) { return false; @@ -321,11 +321,11 @@ class ParenOperator : public UnaryParenOperator { public: ParenOperator() : UnaryParenOperator( 16, "()", "paren-operator", Operator::Left ) {} - virtual bool checkParams( const QValueList& params ) { + virtual bool checkParams( const TQValueList& params ) { return !params.isEmpty(); } - virtual EvaluationResult unaryApply( EvaluationResult param, const QValueList& innerParams ); + virtual EvaluationResult unaryApply( EvaluationResult param, const TQValueList& innerParams ); virtual bool canBeType( BindingSide side ) { return false; @@ -354,7 +354,7 @@ class ExpressionEvaluation { vector[ (*it)->position ](). */ - virtual EvaluationResult evaluateExpressionInternal( QString expr, EvaluationResult scope, SimpleContext * ctx, SimpleContext* innerCtx , bool canBeTypeExpression = true ); + virtual EvaluationResult evaluateExpressionInternal( TQString expr, EvaluationResult scope, SimpleContext * ctx, SimpleContext* innerCtx , bool canBeTypeExpression = true ); ///Locates types or members EvaluationResult evaluateAtomicExpression( TypeDesc expr, EvaluationResult scope, SimpleContext * ctx = 0, bool canBeTypeExpression = true ); diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index f5961a7a..7b2d98cd 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -19,12 +19,12 @@ ***************************************************************************/ #include "cppimplementationwidget.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -37,60 +37,60 @@ #include CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, - QWidget *parent, const char *name, bool modal ) + TQWidget *parent, const char *name, bool modal ) : ImplementationWidget( part, parent, name, modal ) {} -QStringList CppImplementationWidget::createClassFiles() +TQStringList CppImplementationWidget::createClassFiles() { - QString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\npublic:\n $CLASSNAME$(QWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; - QString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(QWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; + TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; + TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) template_cpp += "\n#include \"$MOCINCLUDE$\"\n"; - QFileInfo formInfo( m_formName ); - template_h.replace( QRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" ); - template_h.replace( QRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); - template_h.replace( QRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); - template_h.replace( QRegExp( "\\$DEFTEXT\\$" ), fileNameEdit->text().upper() ); + TQFileInfo formInfo( m_formName ); + template_h.replace( TQRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" ); + template_h.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); + template_h.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); + template_h.replace( TQRegExp( "\\$DEFTEXT\\$" ), fileNameEdit->text().upper() ); - template_cpp.replace( QRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" ); - template_cpp.replace( QRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); - template_cpp.replace( QRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); - template_cpp.replace( QRegExp( "\\$MOCINCLUDE\\$" ), fileNameEdit->text() + ".moc" ); + template_cpp.replace( TQRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" ); + template_cpp.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); + template_cpp.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); + template_cpp.replace( TQRegExp( "\\$MOCINCLUDE\\$" ), fileNameEdit->text() + ".moc" ); template_h = FileTemplate::read( m_part, "h" ) + template_h; template_cpp = FileTemplate::read( m_part, "cpp" ) + template_cpp; - QString file_h = fileNameEdit->text() + ".h"; - QString file_cpp = fileNameEdit->text() + ".cpp"; + TQString file_h = fileNameEdit->text() + ".h"; + TQString file_cpp = fileNameEdit->text() + ".cpp"; if ( !m_part->project() ->activeDirectory().isEmpty() ) { file_h = m_part->project() ->activeDirectory() + "/" + file_h; file_cpp = m_part->project() ->activeDirectory() + "/" + file_cpp; } - QFile ifile( QDir::cleanDirPath( m_part->project() ->projectDirectory() + "/" + file_cpp ) ); + TQFile ifile( TQDir::cleanDirPath( m_part->project() ->projectDirectory() + "/" + file_cpp ) ); if ( !ifile.open( IO_WriteOnly ) ) { KMessageBox::error( this, i18n( "Cannot write to implementation file" ) ); - return QStringList(); + return TQStringList(); } - QTextStream istream( &ifile ); + TQTextStream istream( &ifile ); istream << template_cpp; ifile.close(); - QFile hfile( QDir::cleanDirPath( m_part->project() ->projectDirectory() + "/" + file_h ) ); + TQFile hfile( TQDir::cleanDirPath( m_part->project() ->projectDirectory() + "/" + file_h ) ); if ( !hfile.open( IO_WriteOnly ) ) { KMessageBox::error( this, i18n( "Cannot write to header file" ) ); - return QStringList(); + return TQStringList(); } - QTextStream hstream( &hfile ); + TQTextStream hstream( &hfile ); hstream << template_h; hfile.close(); - QStringList fileList; + TQStringList fileList; fileList.append( file_h ); fileList.append( file_cpp ); diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index 0fc9d306..b79b0aff 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -31,10 +31,10 @@ class CppImplementationWidget : public ImplementationWidget { Q_OBJECT public: - CppImplementationWidget( KDevLanguageSupport *part, QWidget* parent = 0, const char* name = 0, bool modal = false ); + CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); protected: - virtual QStringList createClassFiles(); + virtual TQStringList createClassFiles(); }; #endif diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index b941b46e..fc338900 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -19,23 +19,23 @@ #include "cppnewclassdlg.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -52,14 +52,14 @@ #include "classgeneratorconfig.h" -QString QRegExp_escape( const QString& str ) +TQString QRegExp_escape( const TQString& str ) { #if QT_VERSION >= 0x030100 - return QRegExp::escape( str ); + return TQRegExp::escape( str ); #else // this block is copyrighted by Trolltech AS (GPL) static const char meta[] = "$()*+.?[\\]^{|}"; - QString quoted = str; + TQString quoted = str; int i = 0; while ( i < ( int ) quoted.length() ) @@ -72,7 +72,7 @@ QString QRegExp_escape( const QString& str ) #endif } -CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, QWidget *parent, const char *name ) +CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, const char *name ) : CppNewClassDialogBase( parent, name ), myModel( 0 ) { headerModified = false; @@ -81,7 +81,7 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, QWidget *parent, con m_part = part; // read file template configuration // KDevProject *project = part->project(); - QDomDocument &dom = *part->projectDom(); + TQDomDocument &dom = *part->projectDom(); interface_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfaceURL" ); implementation_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/implementationURL" ); interface_suffix = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfacesuffix", ".h" ); @@ -92,22 +92,22 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, QWidget *parent, con baseclasses_view->setSorting( -1 ); constructors_view->setSorting( -1 ); - accessMenu = new QPopupMenu( this ); + accessMenu = new TQPopupMenu( this ); accessMenu->insertItem( i18n( "Use as Private" ), - this, SLOT( changeToPrivate() ), 0, 1 ); + this, TQT_SLOT( changeToPrivate() ), 0, 1 ); accessMenu->insertItem( i18n( "Use as Protected" ), - this, SLOT( changeToProtected() ), 0, 2 ); + this, TQT_SLOT( changeToProtected() ), 0, 2 ); accessMenu->insertItem( i18n( "Use as Public" ), - this, SLOT( changeToPublic() ), 0, 3 ); + this, TQT_SLOT( changeToPublic() ), 0, 3 ); accessMenu->insertSeparator(); accessMenu->insertItem( i18n( "Unset" ), - this, SLOT( changeToInherited() ), 0, 5 ); + this, TQT_SLOT( changeToInherited() ), 0, 5 ); - overMenu = new QPopupMenu( this ); + overMenu = new TQPopupMenu( this ); overMenu->insertItem( i18n( "Extend Base Class Functionality" ), - this, SLOT( extendFunctionality() ), 0, 11 ); + this, TQT_SLOT( extendFunctionality() ), 0, 11 ); overMenu->insertItem( i18n( "Replace Base Class Method" ), - this, SLOT( replaceFunctionality() ), 0, 12 ); + this, TQT_SLOT( replaceFunctionality() ), 0, 12 ); compBasename = basename_edit->completionObject(); setCompletionBasename( m_part->codeModel() ); @@ -135,7 +135,7 @@ void CppNewClassDialog::setCompletionBasename( CodeModel *model ) // Import selected namespace without qualifier NamespaceDom namespaceDom = model->globalNamespace(); - QStringList::const_iterator it = currNamespace.begin(); + TQStringList::const_iterator it = currNamespace.begin(); for ( ; it != currNamespace.end() ; ++it ) { if ( ! namespaceDom->hasNamespace( *it ) ) @@ -149,16 +149,16 @@ void CppNewClassDialog::setCompletionBasename( CodeModel *model ) addCompletionBasenameNamespacesRecursive( model->globalNamespace() ); - QStringList compItems = compBasename->items(); + TQStringList compItems = compBasename->items(); it = compItems.begin(); for ( int i = 0; it != compItems.end(); ++it, ++i ) kdDebug( 9007 ) << "compBasename->items()[" << i << "] = \"" << *it << "\"" << endl; } -QStringList& gres( QStringList &list, const QRegExp & rx, const QString & after ) +TQStringList& gres( TQStringList &list, const TQRegExp & rx, const TQString & after ) { - QStringList::Iterator it = list.begin(); + TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { ( *it ).replace( rx, after ); @@ -168,18 +168,18 @@ QStringList& gres( QStringList &list, const QRegExp & rx, const QString & after } void CppNewClassDialog::addCompletionBasenameNamespacesRecursive( const NamespaceDom & namespaceDom, - const QString & namespaceParent ) + const TQString & namespaceParent ) { // Add classes of this namespace - QStringList classList = sortedNameList( namespaceDom -> classList() ); + TQStringList classList = sortedNameList( namespaceDom -> classList() ); if ( ! namespaceParent.isEmpty() ) { #if QT_VERSION >= 0x030200 - classList.gres( QRegExp( "^" ), namespaceParent + "::" ); + classList.gres( TQRegExp( "^" ), namespaceParent + "::" ); #else - gres( classList, QRegExp( "^" ), namespaceParent + "::" ); + gres( classList, TQRegExp( "^" ), namespaceParent + "::" ); #endif } @@ -193,7 +193,7 @@ void CppNewClassDialog::addCompletionBasenameNamespacesRecursive( const Namespac for ( ; it != namespaceList.end() ; ++it ) { - QString fullNamespace; + TQString fullNamespace; if ( ! namespaceParent.isEmpty() ) fullNamespace = namespaceParent + "::"; @@ -204,13 +204,13 @@ void CppNewClassDialog::addCompletionBasenameNamespacesRecursive( const Namespac } -void CppNewClassDialog::setCompletionNamespaceRecursive( const NamespaceDom & namespaceDom, const QString & namespaceParent ) +void CppNewClassDialog::setCompletionNamespaceRecursive( const NamespaceDom & namespaceDom, const TQString & namespaceParent ) { NamespaceList namespaceList = namespaceDom->namespaceList(); NamespaceList::const_iterator it = namespaceList.begin(); for ( ; it != namespaceList.end() ; ++it ) { - QString fullNamespace; + TQString fullNamespace; if ( ! namespaceParent.isEmpty() ) fullNamespace = namespaceParent + "::"; @@ -222,20 +222,20 @@ void CppNewClassDialog::setCompletionNamespaceRecursive( const NamespaceDom & na } } -void CppNewClassDialog::nameHandlerChanged( const QString &text ) +void CppNewClassDialog::nameHandlerChanged( const TQString &text ) { DomUtil::writeEntry( *m_part->projectDom(), "/cppsupportpart/newclass/filenamesetting", text ); m_parse = text; classNameChanged( classname_edit->text() ); } -void CppNewClassDialog::classNameChanged( const QString &text ) +void CppNewClassDialog::classNameChanged( const TQString &text ) { - QString str = text; + TQString str = text; if ( !headerModified ) { - QString header = str + interface_suffix; + TQString header = str + interface_suffix; switch ( gen_config->fileCase() ) { case ClassGeneratorConfig::LowerCase: @@ -247,12 +247,12 @@ void CppNewClassDialog::classNameChanged( const QString &text ) default: ; } - header = header.replace( QRegExp( "(template *<.*> *)?(class +)?" ), "" ); + header = header.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); header_edit->setText( header ); } if ( !implementationModified ) { - QString implementation; + TQString implementation; if ( str.contains( "template" ) ) implementation = str + "_impl" + interface_suffix; else @@ -268,23 +268,23 @@ void CppNewClassDialog::classNameChanged( const QString &text ) default: ; } - implementation = implementation.replace( QRegExp( "(template *<.*> *)?(class +)?" ), "" ); + implementation = implementation.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); implementation_edit->setText( implementation ); } } -void CppNewClassDialog::classNamespaceChanged( const QString &text ) +void CppNewClassDialog::classNamespaceChanged( const TQString &text ) { - currNamespace = QStringList::split( QString( "::" ), text ); + currNamespace = TQStringList::split( TQString( "::" ), text ); setCompletionBasename( m_part -> codeModel() ); reloadAdvancedInheritance( true ); } -void CppNewClassDialog::baseclassname_changed( const QString &text ) +void CppNewClassDialog::baseclassname_changed( const TQString &text ) { if ( ( basename_edit->hasFocus() ) && ( !baseincludeModified ) ) { - QString header = text; + TQString header = text; // handle Qt classes in a special way. if( m_part->qtBuildConfig()->isUsed() && header.startsWith( "Q" ) ) @@ -295,14 +295,14 @@ void CppNewClassDialog::baseclassname_changed( const QString &text ) } else if( m_part->qtBuildConfig()->version() == 4 ) { - // 1:1, e.g QObject is #include + // 1:1, e.g TQObject is #include } } else { - if ( header.contains( QRegExp( "::" ) ) ) - header = header.mid( header.findRev( QRegExp( "::" ) ) + 2 ); - header = header.replace( QRegExp( " *<.*>" ), "" ); + if ( header.contains( TQRegExp( "::" ) ) ) + header = header.mid( header.findRev( TQRegExp( "::" ) ) + 2 ); + header = header.replace( TQRegExp( " *<.*>" ), "" ); header += interface_suffix; switch ( gen_config->superCase() ) @@ -322,7 +322,7 @@ void CppNewClassDialog::baseclassname_changed( const QString &text ) } } -void CppNewClassDialog::baseIncludeChanged( const QString &text ) +void CppNewClassDialog::baseIncludeChanged( const TQString &text ) { if ( baseinclude_edit->hasFocus() ) { @@ -395,17 +395,17 @@ void CppNewClassDialog::checkQWidgetInheritance( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( "QWidget" ); + basename_edit->setText( "TQWidget" ); } /* constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() + - "(QWidget *parent, const char *name):\n QWidget(parent, name)\n{\n}\n"); - constructors_h_edit->append(classname_edit->text() + "(QWidget *parent, const char *name);\n");*/ + "(TQWidget *parent, const char *name):\n TQWidget(parent, name)\n{\n}\n"); + constructors_h_edit->append(classname_edit->text() + "(TQWidget *parent, const char *name);\n");*/ } if ( val && ( baseclasses_view->childCount() > 1 ) ) if ( KMessageBox::warningContinueCancel( this, - i18n( "Multiple inheritance requires QObject derivative to be first and unique in base class list." ), - i18n( "Warning" ), KStdGuiItem::cont(), "Check QWidget inheritance rules" ) == KMessageBox::Cancel ) + i18n( "Multiple inheritance requires TQObject derivative to be first and unique in base class list." ), + i18n( "Warning" ), KStdGuiItem::cont(), "Check TQWidget inheritance rules" ) == KMessageBox::Cancel ) childclass_box->setChecked( false ); } @@ -417,7 +417,7 @@ void CppNewClassDialog::qobject_box_stateChanged( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( "QObject" ); + basename_edit->setText( "TQObject" ); } @@ -451,7 +451,7 @@ void CppNewClassDialog::accept() { ClassGenerator generator( *this ); if ( generator.generate() ) - QDialog::accept(); + TQDialog::accept(); } @@ -481,12 +481,12 @@ void CppNewClassDialog::addBaseClass() baseincludeModified = false; if ( baseclasses_view->selectedItem() ) baseclasses_view->selectedItem() ->setSelected( false ); - QListViewItem* it = new QListViewItem( baseclasses_view, baseclasses_view->lastItem(), - QString::null, "public", QString( "%1" ).arg( scope_box->currentItem() ), QString::null, "false" ); + TQListViewItem* it = new TQListViewItem( baseclasses_view, baseclasses_view->lastItem(), + TQString::null, "public", TQString( "%1" ).arg( scope_box->currentItem() ), TQString::null, "false" ); setStateOfInheritanceEditors( true ); public_button->setChecked( true ); virtual_box->setChecked( false ); - basename_edit->setText( QString::null ); + basename_edit->setText( TQString::null ); basename_edit->setFocus(); baseclasses_view->setSelected( it, true ); } @@ -501,7 +501,7 @@ void CppNewClassDialog::remBaseClass() } if ( baseclasses_view->selectedItem() ) { - QListViewItem * it = baseclasses_view->selectedItem(); + TQListViewItem * it = baseclasses_view->selectedItem(); remClassFromAdv( it->text( 0 ) ); baseclasses_view->selectedItem() ->setSelected( false ); if ( it->itemBelow() ) @@ -521,7 +521,7 @@ void CppNewClassDialog::remBaseClassOnly() { if ( baseclasses_view->selectedItem() ) { - QListViewItem * it = baseclasses_view->selectedItem(); + TQListViewItem * it = baseclasses_view->selectedItem(); baseclasses_view->selectedItem() ->setSelected( false ); if ( it->itemBelow() ) baseclasses_view->setSelected( it->itemBelow(), true ); @@ -534,14 +534,14 @@ void CppNewClassDialog::remBaseClassOnly() } } -void CppNewClassDialog::remClassFromAdv( QString text ) +void CppNewClassDialog::remClassFromAdv( TQString text ) { // Strip off namespace qualification if ( text.contains( "::" ) ) text = text.mid( text.findRev( "::" ) + 2 ); removeTemplateParams( text ); - QListViewItem *it = 0; + TQListViewItem *it = 0; if ( ( it = access_view->findItem( text, 0 ) ) ) delete it; if ( ( it = methods_view->findItem( text, 0 ) ) ) @@ -562,7 +562,7 @@ void CppNewClassDialog::remClassFromAdv( QString text ) } } -void CppNewClassDialog::currBaseNameChanged( const QString &text ) +void CppNewClassDialog::currBaseNameChanged( const TQString &text ) { if ( baseclasses_view->selectedItem() && ( basename_edit->hasFocus() ) ) { @@ -584,7 +584,7 @@ void CppNewClassDialog::currBasePrivateSet() if ( baseclasses_view->selectedItem() ) { setAccessForBase( baseclasses_view->selectedItem() ->text( 0 ), "private" ); - baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + QString( "private" ) ); + baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + TQString( "private" ) ); } } @@ -593,7 +593,7 @@ void CppNewClassDialog::currBaseProtectedSet() if ( baseclasses_view->selectedItem() ) { setAccessForBase( baseclasses_view->selectedItem() ->text( 0 ), "protected" ); - baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + QString( "protected" ) ); + baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + TQString( "protected" ) ); } } @@ -602,7 +602,7 @@ void CppNewClassDialog::currBasePublicSet() if ( baseclasses_view->selectedItem() ) { setAccessForBase( baseclasses_view->selectedItem() ->text( 0 ), "public" ); - baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + QString( "public" ) ); + baseclasses_view->selectedItem() ->setText( 1, ( virtual_box->isChecked() ? "virtual " : "" ) + TQString( "public" ) ); } } @@ -610,7 +610,7 @@ void CppNewClassDialog::scopeboxActivated( int value ) { if ( baseclasses_view->selectedItem() ) { - baseclasses_view->selectedItem() ->setText( 2, QString( "%1" ).arg( value ) ); + baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).arg( value ) ); } } @@ -618,14 +618,14 @@ void CppNewClassDialog::currBaseVirtualChanged( int val ) { if ( baseclasses_view->selectedItem() ) { - baseclasses_view->selectedItem() ->setText( 1, QString( val ? "virtual " : "" ) + - QString( private_button->isChecked() ? "private" : "" ) + - QString( protected_button->isChecked() ? "protected" : "" ) + - QString( public_button->isChecked() ? "public" : "" ) ); + baseclasses_view->selectedItem() ->setText( 1, TQString( val ? "virtual " : "" ) + + TQString( private_button->isChecked() ? "private" : "" ) + + TQString( protected_button->isChecked() ? "protected" : "" ) + + TQString( public_button->isChecked() ? "public" : "" ) ); } } -void CppNewClassDialog::currBaseSelected( QListViewItem *it ) +void CppNewClassDialog::currBaseSelected( TQListViewItem *it ) { if ( it == 0 ) { @@ -671,15 +671,15 @@ void CppNewClassDialog::upbaseclass_button_clicked() } if ( baseclasses_view->selectedItem() ) { - QListViewItem * it = baseclasses_view->selectedItem(); + TQListViewItem * it = baseclasses_view->selectedItem(); if ( it->itemAbove() ) { - QListViewItem * newit; + TQListViewItem * newit; if ( it->itemAbove() ->itemAbove() ) - newit = new QListViewItem( baseclasses_view, it->itemAbove() ->itemAbove(), + newit = new TQListViewItem( baseclasses_view, it->itemAbove() ->itemAbove(), it->text( 0 ), it->text( 1 ), it->text( 2 ), it->text( 3 ), it->text( 4 ) ); else - newit = new QListViewItem( baseclasses_view, it->text( 0 ), it->text( 1 ), + newit = new TQListViewItem( baseclasses_view, it->text( 0 ), it->text( 1 ), it->text( 2 ), it->text( 3 ), it->text( 4 ) ); remBaseClassOnly(); baseclasses_view->setSelected( newit, true ); @@ -701,10 +701,10 @@ void CppNewClassDialog::downbaseclass_button_clicked() } if ( baseclasses_view->selectedItem() ) { - QListViewItem * it = baseclasses_view->selectedItem(); + TQListViewItem * it = baseclasses_view->selectedItem(); if ( it->itemBelow() ) { - QListViewItem * newit = new QListViewItem( baseclasses_view, it->itemBelow(), + TQListViewItem * newit = new TQListViewItem( baseclasses_view, it->itemBelow(), it->text( 0 ), it->text( 1 ), it->text( 2 ), it->text( 3 ), it->text( 3 ) ); remBaseClassOnly(); baseclasses_view->setSelected( newit, true ); @@ -719,9 +719,9 @@ void CppNewClassDialog::downbaseclass_button_clicked() void CppNewClassDialog::updateConstructorsOrder() { - QListViewItemIterator it( baseclasses_view ); - QListViewItem *c_it; - QListViewItem *fc_it = 0; + TQListViewItemIterator it( baseclasses_view ); + TQListViewItem *c_it; + TQListViewItem *fc_it = 0; while ( it.current() ) { @@ -776,18 +776,18 @@ void CppNewClassDialog::changeToPublic() void CppNewClassDialog::changeToInherited() { if ( access_view->selectedItem() ) - access_view->selectedItem() ->setText( 2, QString::null ); + access_view->selectedItem() ->setText( 2, TQString::null ); } -void CppNewClassDialog::newTabSelected( const QString& /*text*/ ) +void CppNewClassDialog::newTabSelected( const TQString& /*text*/ ) { /* if (text == i18n("&Advanced Inheritance")) reloadAdvancedInheritance(true);*/ } -void CppNewClassDialog::newTabSelected( QWidget* /*w*/ ) +void CppNewClassDialog::newTabSelected( TQWidget* /*w*/ ) { - /* if ( QString(w->name()) == QString("tab2")) + /* if ( TQString(w->name()) == TQString("tab2")) { reloadAdvancedInheritance(false); }*/ @@ -800,7 +800,7 @@ void CppNewClassDialog::reloadAdvancedInheritance( bool clean ) clearMethodsList( clean ); clearUpgradeList( clean ); - QListViewItemIterator it( baseclasses_view ); + TQListViewItemIterator it( baseclasses_view ); while ( it.current() ) { if ( ! ( it.current() ->text( 0 ).isEmpty() ) ) @@ -811,10 +811,10 @@ void CppNewClassDialog::reloadAdvancedInheritance( bool clean ) } } -void CppNewClassDialog::parseClass( QString clName, QString inheritance ) +void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) { // Determine namespace - QStringList clNamespace = currNamespace; + TQStringList clNamespace = currNamespace; bool clFullQualified = false; if ( clName.contains( "::" ) ) @@ -822,26 +822,26 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) // Full qualified, override imported namespace clFullQualified = true; int splitpoint = clName.findRev( "::" ); - clNamespace = QStringList::split( "::", clName.left( splitpoint ) ); + clNamespace = TQStringList::split( "::", clName.left( splitpoint ) ); clName = clName.mid( splitpoint + 2 ); } kdDebug( 9007 ) << "clFullQualified = " << clFullQualified << endl; kdDebug( 9007 ) << "clName = " << clName << endl; - QString debMsg = "clNamespace = "; - for ( QStringList::const_iterator it = clNamespace.begin(); + TQString debMsg = "clNamespace = "; + for ( TQStringList::const_iterator it = clNamespace.begin(); it != clNamespace.end(); ++it ) debMsg += ( *it ) + "::"; kdDebug( 9007 ) << debMsg << endl; - QString templateAdd = templateActualParamsFormatted( clName ); + TQString templateAdd = templateActualParamsFormatted( clName ); removeTemplateParams( clName ); ClassList myClasses; // = m_part->codeModel()->globalNamespace()->classByName(clName); NamespaceDom namespaceDom = m_part->codeModel() ->globalNamespace(); - QStringList::const_iterator namespaceIt = clNamespace.begin(); + TQStringList::const_iterator namespaceIt = clNamespace.begin(); for ( ; namespaceIt != clNamespace.end(); ++namespaceIt ) { if ( ! namespaceDom -> hasNamespace( *namespaceIt ) ) @@ -869,12 +869,12 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) it->templateAddition = templateAdd; PListViewItem *over = new PListViewItem( *classIt, methods_view, ( *classIt ) ->name() ); over->templateAddition = templateAdd; - QListViewItem *over_methods = new QListViewItem( over, i18n( "Methods" ) ); - QListViewItem *over_slots = new QListViewItem( over, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *over_methods = new TQListViewItem( over, i18n( "Methods" ) ); + TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (Qt-specific)" ) ); PListViewItem *access = new PListViewItem( *classIt, access_view, ( *classIt ) ->name() ); - QListViewItem *access_methods = new QListViewItem( access, i18n( "Methods" ) ); - QListViewItem *access_slots = new QListViewItem( access, i18n( "Slots (Qt-specific)" ) ); - QListViewItem *access_attrs = new QListViewItem( access, i18n( "Attributes" ) ); + TQListViewItem *access_methods = new TQListViewItem( access, i18n( "Methods" ) ); + TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *access_attrs = new TQListViewItem( access, i18n( "Attributes" ) ); FunctionList functionList = ( *classIt ) ->functionList(); for ( FunctionList::const_iterator methodIt = functionList.begin(); @@ -894,7 +894,7 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) { addToMethodsList( over_slots, *methodIt ); - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected attributes if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -915,7 +915,7 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) addToMethodsList( over_methods, *methodIt ); // see what modifier is given for the base class - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected methods if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -936,7 +936,7 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) { if ( ( *varIt ) ->access() != CodeModelItem::Private ) { - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected attributes if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -952,14 +952,14 @@ void CppNewClassDialog::parseClass( QString clName, QString inheritance ) } } -bool CppNewClassDialog::isConstructor( QString className, const FunctionDom &method ) +bool CppNewClassDialog::isConstructor( TQString className, const FunctionDom &method ) { // regexp: myclass\\s*\\(\\s*(const)?\\s*myclass\\s*&[A-Za-z_0-9\\s]*\\) is for copy constructors if ( ( className == method->name() ) ) { qWarning( "1x" ); - if ( ( method->argumentList().count() == 1 ) && ( m_part->formatModelItem( method->argumentList() [ 0 ].data() ).contains( QRegExp( " *(const)? *" + className + " *& *" ) ) ) ) - // if ( method->asString().contains(QRegExp(className + "\\s*\\(\\s*(const)?\\s*" + className + "\\s*&[A-Za-z_0-9\\s]*\\)", true, false)) ) + if ( ( method->argumentList().count() == 1 ) && ( m_part->formatModelItem( method->argumentList() [ 0 ].data() ).contains( TQRegExp( " *(const)? *" + className + " *& *" ) ) ) ) + // if ( method->asString().contains(TQRegExp(className + "\\s*\\(\\s*(const)?\\s*" + className + "\\s*&[A-Za-z_0-9\\s]*\\)", true, false)) ) return false; else return true; @@ -968,34 +968,34 @@ bool CppNewClassDialog::isConstructor( QString className, const FunctionDom &met return false; } -void CppNewClassDialog::addToConstructorsList( QCheckListItem *myClass, FunctionDom method ) +void CppNewClassDialog::addToConstructorsList( TQCheckListItem *myClass, FunctionDom method ) { - new PCheckListItem( method, myClass, m_part->formatModelItem( method.data() ), QCheckListItem::RadioButton ); + new PCheckListItem( method, myClass, m_part->formatModelItem( method.data() ), TQCheckListItem::RadioButton ); } -void CppNewClassDialog::addToMethodsList( QListViewItem *parent, FunctionDom method ) +void CppNewClassDialog::addToMethodsList( TQListViewItem *parent, FunctionDom method ) { - PCheckListItem *it = new PCheckListItem( method, parent, m_part->formatModelItem( method.data() ), QCheckListItem::CheckBox ); + PCheckListItem *it = new PCheckListItem( method, parent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); method->isAbstract() ? it->setText( 1, i18n( "replace" ) ) : it->setText( 1, i18n( "extend" ) ); } -void CppNewClassDialog::addToUpgradeList( QListViewItem *parent, FunctionDom method, QString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ) { PListViewItem *it = new PListViewItem( method, parent, m_part->formatModelItem( method.data() ) ); it->setText( 1, modifier ); } -void CppNewClassDialog::addToUpgradeList( QListViewItem *parent, VariableDom attr, QString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ) { PListViewItem *it = new PListViewItem( attr, parent, m_part->formatModelItem( attr.data() ) ); it->setText( 1, modifier ); } -void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) +void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) { // Determine namespace - QStringList clNamespace = currNamespace; + TQStringList clNamespace = currNamespace; bool clFullQualified = false; if ( clName.contains( "::" ) ) @@ -1003,7 +1003,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) // Full qualified, override imported namespace clFullQualified = true; int splitpoint = clName.findRev( "::" ); - clNamespace = QStringList::split( "::", clName.left( splitpoint ) ); + clNamespace = TQStringList::split( "::", clName.left( splitpoint ) ); clName = clName.mid( splitpoint + 2 ); } @@ -1011,7 +1011,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) kdDebug( 9007 ) << "clName = " << clName << endl; kdDebug( 9007 ) << "clNamespace = " << clNamespace.join( "." ) << endl; - QString templateAdd = templateActualParamsFormatted( clName ); + TQString templateAdd = templateActualParamsFormatted( clName ); removeTemplateParams( clName ); myModel = new CodeModel(); @@ -1028,12 +1028,12 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) it->templateAddition = templateAdd; PListViewItem *over = new PListViewItem( *classIt, methods_view, ( *classIt ) ->name() ); over->templateAddition = templateAdd; - QListViewItem *over_methods = new QListViewItem( over, i18n( "Methods" ) ); - QListViewItem *over_slots = new QListViewItem( over, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *over_methods = new TQListViewItem( over, i18n( "Methods" ) ); + TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (Qt-specific)" ) ); PListViewItem *access = new PListViewItem( *classIt, access_view, ( *classIt ) ->name() ); - QListViewItem *access_methods = new QListViewItem( access, i18n( "Methods" ) ); - QListViewItem *access_slots = new QListViewItem( access, i18n( "Slots (Qt-specific)" ) ); - QListViewItem *access_attrs = new QListViewItem( access, i18n( "Attributes" ) ); + TQListViewItem *access_methods = new TQListViewItem( access, i18n( "Methods" ) ); + TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (Qt-specific)" ) ); + TQListViewItem *access_attrs = new TQListViewItem( access, i18n( "Attributes" ) ); FunctionList functionList = ( *classIt ) ->functionList(); for ( FunctionList::const_iterator methodIt = functionList.begin(); @@ -1053,7 +1053,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) { addToMethodsList( over_slots, *methodIt ); - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected attributes if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -1074,7 +1074,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) addToMethodsList( over_methods, *methodIt ); //see what modifier is given for the base class - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected methods if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -1095,7 +1095,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) { if ( ( *varIt ) ->access() != CodeModelItem::Private ) { - QString inhModifier; + TQString inhModifier; //protected inheritance gives protected attributes if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; @@ -1113,7 +1113,7 @@ void CppNewClassDialog::parsePCSClass( QString clName, QString inheritance ) void CppNewClassDialog::clear_selection_button_clicked() { - QListViewItemIterator it( constructors_view ); + TQListViewItemIterator it( constructors_view ); while ( it.current() ) { PCheckListItem *curr; @@ -1129,7 +1129,7 @@ void CppNewClassDialog::clearConstructorsList( bool clean ) constructors_view->clear(); /* else { - QListViewItemIterator it( constructors_view ); + TQListViewItemIterator it( constructors_view ); while ( it.current() ) { if ( ! currBaseClasses.contains(it.current().text(0)) ) @@ -1151,7 +1151,7 @@ void CppNewClassDialog::clearUpgradeList( bool clean ) access_view->clear(); } -void CppNewClassDialog::setAccessForItem( QListViewItem *curr, QString newAccess, bool isPublic ) +void CppNewClassDialog::setAccessForItem( TQListViewItem *curr, TQString newAccess, bool isPublic ) { if ( newAccess == "public" ) curr->setText( 1, isPublic ? "public" : "protected" ); @@ -1160,19 +1160,19 @@ void CppNewClassDialog::setAccessForItem( QListViewItem *curr, QString newAccess if ( !curr->text( 2 ).isEmpty() ) { if ( ( curr->text( 2 ) == "private" ) && ( ( newAccess == "public" ) || ( newAccess == "protected" ) ) ) - curr->setText( 2, QString::null ); + curr->setText( 2, TQString::null ); if ( ( curr->text( 2 ) == "protected" ) && ( ( newAccess == "public" ) && ( isPublic ) ) ) - curr->setText( 2, QString::null ); + curr->setText( 2, TQString::null ); } } -void CppNewClassDialog::setAccessForBase( QString baseclass, QString newAccess ) +void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess ) { - QListViewItem * base; + TQListViewItem * base; if ( ( base = access_view->findItem( baseclass, 0 ) ) ) { - QListViewItemIterator it( base ); + TQListViewItemIterator it( base ); while ( it.current() ) { if ( !it.current() ->text( 1 ).isEmpty() ) @@ -1190,7 +1190,7 @@ void CppNewClassDialog::setAccessForBase( QString baseclass, QString newAccess ) } -void CppNewClassDialog::access_view_mouseButtonPressed( int button, QListViewItem * item, const QPoint &p, int /*c*/ ) +void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int /*c*/ ) { if ( item && ( ( button == LeftButton ) || ( button == RightButton ) ) && ( item->depth() > 1 ) ) { @@ -1215,7 +1215,7 @@ void CppNewClassDialog::access_view_mouseButtonPressed( int button, QListViewIte } -void CppNewClassDialog::methods_view_mouseButtonPressed( int button , QListViewItem * item, const QPoint&p , int /*c*/ ) +void CppNewClassDialog::methods_view_mouseButtonPressed( int button , TQListViewItem * item, const TQPoint&p , int /*c*/ ) { if ( item && ( button == RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) { @@ -1237,7 +1237,7 @@ void CppNewClassDialog::replaceFunctionality() void CppNewClassDialog::selectall_button_clicked() { - QListViewItemIterator it( constructors_view ); + TQListViewItemIterator it( constructors_view ); while ( it.current() ) { PCheckListItem *curr; @@ -1249,17 +1249,17 @@ void CppNewClassDialog::selectall_button_clicked() void CppNewClassDialog::to_constructors_list_clicked() { - QString templateAdd = templateStrFormatted().isEmpty() ? QString::null : templateStrFormatted() + "\n"; - QString constructor_h = classNameFormatted(); - QString constructor_cpp = templateAdd + classNameFormatted() + templateParamsFormatted() + "::" + classNameFormatted(); + TQString templateAdd = templateStrFormatted().isEmpty() ? TQString::null : templateStrFormatted() + "\n"; + TQString constructor_h = classNameFormatted(); + TQString constructor_cpp = templateAdd + classNameFormatted() + templateParamsFormatted() + "::" + classNameFormatted(); constructor_h += "("; constructor_cpp += "("; - QString params_h; - QString params_cpp; - QString base; + TQString params_h; + TQString params_cpp; + TQString base; int unnamed = 1; - QListViewItemIterator it( constructors_view ); + TQListViewItemIterator it( constructors_view ); while ( it.current() ) { PCheckListItem *curr; @@ -1278,8 +1278,8 @@ void CppNewClassDialog::to_constructors_list_clicked() params_h += params_h.isEmpty() ? "" : ", "; //fill arguments for both constructor and base class initializer - QString cparams; - QString bparams; + TQString cparams; + TQString bparams; ArgumentList argumentList = curr->item() ->argumentList(); for ( ArgumentList::const_iterator argIt = argumentList.begin(); argIt != argumentList.end(); ++argIt ) @@ -1289,8 +1289,8 @@ void CppNewClassDialog::to_constructors_list_clicked() cparams += ( *argIt ) ->type() + " "; if ( ( *argIt ) ->name().isEmpty() ) { - cparams += QString( "arg%1" ).arg( unnamed ); - bparams += QString( "arg%1" ).arg( unnamed++ ); + cparams += TQString( "arg%1" ).arg( unnamed ); + bparams += TQString( "arg%1" ).arg( unnamed++ ); } else { @@ -1308,7 +1308,7 @@ void CppNewClassDialog::to_constructors_list_clicked() ++it; } - constructor_cpp += params_cpp + ")" + base + QString( "\n{\n}\n\n\n" ); + constructor_cpp += params_cpp + ")" + base + TQString( "\n{\n}\n\n\n" ); constructor_h += params_h + ");\n\n"; constructors_h_edit->append( constructor_h ); @@ -1333,14 +1333,14 @@ void CppNewClassDialog::to_constructors_list_clicked() bool CppNewClassDialog::ClassGenerator::validateInput() { className = dlg.classname_edit->text().simplifyWhiteSpace(); - QString temp = className; - className.replace( QRegExp( "template *<.*> *(class *)?" ), "" ); - templateStr = temp.replace( QRegExp( QRegExp_escape( className ) ), "" ); - templateStr.replace( QRegExp( " *class *$" ), "" ); + TQString temp = className; + className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); + templateStr.replace( TQRegExp( " *class *$" ), "" ); templateParams = templateStr; - templateParams.replace( QRegExp( "^ *template *" ), "" ); - templateParams.replace( QRegExp( " *class *" ), "" ); + templateParams.replace( TQRegExp( "^ *template *" ), "" ); + templateParams.replace( TQRegExp( " *class *" ), "" ); templateParams.simplifyWhiteSpace(); if ( className.isEmpty() ) @@ -1384,13 +1384,13 @@ bool CppNewClassDialog::ClassGenerator::generate() subDir = project->projectDirectory() + "/"; if ( !project->activeDirectory().isEmpty() ){ subDir += project->activeDirectory(); - subDir = QDir::cleanDirPath(subDir); + subDir = TQDir::cleanDirPath(subDir); subDir += "/"; } headerPath = subDir + header; implementationPath = subDir + implementation; - if ( QFileInfo( headerPath ).exists() || QFileInfo( implementationPath ).exists() ) + if ( TQFileInfo( headerPath ).exists() || TQFileInfo( implementationPath ).exists() ) { KMessageBox::error( &dlg, i18n( "KDevelop is not able to add classes " "to existing header or implementation files." ) ); @@ -1399,12 +1399,12 @@ bool CppNewClassDialog::ClassGenerator::generate() if( ( dlg.m_part->project() ->options() & KDevProject::UsesQMakeBuildSystem) ) { - QDir dir( QFileInfo( project->projectDirectory()+QString( QChar( QDir::separator() ) )+project->activeDirectory() + QString( QChar( QDir::separator() ) ) + header ).dirPath() ); + TQDir dir( TQFileInfo( project->projectDirectory()+TQString( TQChar( TQDir::separator() ) )+project->activeDirectory() + TQString( TQChar( TQDir::separator() ) ) + header ).dirPath() ); kdDebug(9024) << "Dir for new file:" << dir.absPath() << endl; if( dir.isRelative() ) dir.convertToAbs(); - QValueStack dirsToCreate; + TQValueStack dirsToCreate; while( !dir.exists() ) { dirsToCreate.push( dir.dirName() ); @@ -1423,8 +1423,8 @@ bool CppNewClassDialog::ClassGenerator::generate() gen_interface(); - QStringList fileList; - QString file; + TQStringList fileList; + TQString file; if( project->activeDirectory().isEmpty() ) file = header; else @@ -1449,7 +1449,7 @@ void CppNewClassDialog::ClassGenerator::common_text() // common namespaceStr = dlg.namespace_edit->text(); - namespaces = QStringList::split( QString( "::" ), namespaceStr ); + namespaces = TQStringList::split( TQString( "::" ), namespaceStr ); childClass = dlg.childclass_box->isChecked(); objc = dlg.objc_box->isChecked(); @@ -1458,25 +1458,25 @@ void CppNewClassDialog::ClassGenerator::common_text() headeronly = dlg.headeronly_box->isChecked(); if ( ( dlg.baseclasses_view->childCount() == 0 ) && childClass ) - new QListViewItem( dlg.baseclasses_view, "QWidget", "public" ); + new TQListViewItem( dlg.baseclasses_view, "TQWidget", "public" ); if ( objc && ( dlg.baseclasses_view->childCount() == 0 ) ) - new QListViewItem( dlg.baseclasses_view, "NSObject", "public" ); + new TQListViewItem( dlg.baseclasses_view, "NSObject", "public" ); if ( dlg.documentation_edit->text().isEmpty() && ( !dlg.gen_config->doc_box->isChecked() ) ) doc = ""; else { - doc = QString( "/**\n" ); + doc = TQString( "/**\n" ); if ( !dlg.documentation_edit->text().isEmpty() ) { doc.append( dlg.documentation_edit->text() ); if ( dlg.gen_config->author_box->isChecked() ) doc.append( "\n\n" ); } - QString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); - QString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); + TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); + TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); if( !email.isEmpty() ) - author += QString( " <%1>" ).arg( email ); + author += TQString( " <%1>" ).arg( email ); if ( dlg.gen_config->author_box->isChecked() ) doc.append( "\t@author " + author + "\n" ); @@ -1485,7 +1485,7 @@ void CppNewClassDialog::ClassGenerator::common_text() if ( !namespaceStr.isEmpty() ) { - for ( QStringList::Iterator it = namespaces.begin(); it != namespaces.end(); ++it ) + for ( TQStringList::Iterator it = namespaces.begin(); it != namespaces.end(); ++it ) { if ( !namespaceBeg.isEmpty() ) namespaceBeg += "\n\n"; @@ -1498,31 +1498,31 @@ void CppNewClassDialog::ClassGenerator::common_text() //advanced constructor creation - advConstructorsHeader = QString::null; - advConstructorsSource = QString::null; + advConstructorsHeader = TQString::null; + advConstructorsSource = TQString::null; if ( !dlg.constructors_h_edit->text().isEmpty() ) { advConstructorsHeader = " " + dlg.constructors_h_edit->text(); - advConstructorsHeader.replace( QRegExp( "\n" ), "\n " ); + advConstructorsHeader.replace( TQRegExp( "\n" ), "\n " ); } if ( !dlg.constructors_cpp_edit->text().isEmpty() ) { advConstructorsSource = dlg.constructors_cpp_edit->text(); } - advConstructorsHeader.replace( QRegExp( "[\\n ]*$" ), QString::null ); - advConstructorsSource.replace( QRegExp( "[\\n ]*$" ), QString::null ); + advConstructorsHeader.replace( TQRegExp( "[\\n ]*$" ), TQString::null ); + advConstructorsSource.replace( TQRegExp( "[\\n ]*$" ), TQString::null ); //advanced method overriding - advH_public = QString::null; - advH_public_slots = QString::null; - advH_protected = QString::null; - advH_protected_slots = QString::null; - advH_private = QString::null; - advH_private_slots = QString::null; - advCpp = QString::null; + advH_public = TQString::null; + advH_public_slots = TQString::null; + advH_protected = TQString::null; + advH_protected_slots = TQString::null; + advH_private = TQString::null; + advH_private_slots = TQString::null; + advCpp = TQString::null; - QListViewItemIterator it( dlg.methods_view ); + TQListViewItemIterator it( dlg.methods_view ); while ( it.current() ) { PCheckListItem *curr; @@ -1530,7 +1530,7 @@ void CppNewClassDialog::ClassGenerator::common_text() { if ( curr->isOn() && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { - QString * adv_h = 0; + TQString * adv_h = 0; if ( curr->item() ->access() == CodeModelItem::Private ) adv_h = curr->item() ->isSlot() ? &advH_private_slots : &advH_private; if ( curr->item() ->access() == CodeModelItem::Protected ) @@ -1540,7 +1540,7 @@ void CppNewClassDialog::ClassGenerator::common_text() // if (advCpp.isEmpty()) advCpp += "\n\n"; - QString bcName = curr->parent() ->parent() ->text( 0 ); + TQString bcName = curr->parent() ->parent() ->text( 0 ); PListViewItem *bc; if ( ( bc = dynamic_cast* >( curr->parent() ->parent() ) ) ) { @@ -1554,7 +1554,7 @@ void CppNewClassDialog::ClassGenerator::common_text() } //advanced access control and upgrading - QListViewItemIterator ita( dlg.access_view ); + TQListViewItemIterator ita( dlg.access_view ); while ( ita.current() ) { PListViewItem *curr; @@ -1563,7 +1563,7 @@ void CppNewClassDialog::ClassGenerator::common_text() { if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { - QString * adv_h = 0; + TQString * adv_h = 0; if ( curr->text( 2 ) == "private" ) adv_h = &advH_private; if ( curr->text( 2 ) == "public" ) @@ -1574,14 +1574,14 @@ void CppNewClassDialog::ClassGenerator::common_text() /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ if ( adv_h ) - *adv_h += QString( " using " ) + curr->parent() ->parent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; + *adv_h += TQString( " using " ) + curr->parent() ->parent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; } } else if ( ( curr_m = dynamic_cast* >( ita.current() ) ) ) { if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->parent() ) && ( curr_m->parent() ->parent() ) ) { - QString * adv_h = 0; + TQString * adv_h = 0; if ( curr_m->text( 2 ) == "private" ) adv_h = &advH_private; if ( curr_m->text( 2 ) == "public" ) @@ -1592,8 +1592,8 @@ void CppNewClassDialog::ClassGenerator::common_text() /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ - QString methodName = curr_m->item() ->name(); - if ( !methodName.contains( QRegExp( "^[a-zA-z_]" ) ) ) + TQString methodName = curr_m->item() ->name(); + if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; *adv_h += " using " + curr_m->parent() ->parent() ->text( 0 ) + "::" + methodName + ";\n"; } @@ -1601,33 +1601,33 @@ void CppNewClassDialog::ClassGenerator::common_text() ++ita; } - QRegExp e( "[\\n ]*$" ); - advH_public.replace( e, QString::null ); - advH_public_slots.replace( e, QString::null ); - advH_protected.replace( e, QString::null ); - advH_protected_slots.replace( e, QString::null ); - advH_private.replace( e, QString::null ); - advH_private_slots.replace( e, QString::null ); - advCpp.replace( e, QString::null ); + TQRegExp e( "[\\n ]*$" ); + advH_public.replace( e, TQString::null ); + advH_public_slots.replace( e, TQString::null ); + advH_protected.replace( e, TQString::null ); + advH_protected_slots.replace( e, TQString::null ); + advH_private.replace( e, TQString::null ); + advH_private_slots.replace( e, TQString::null ); + advCpp.replace( e, TQString::null ); } void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method, - QString className, QString templateStr, QString *adv_h, QString *adv_cpp, bool extend, QString baseClassName ) + TQString className, TQString templateStr, TQString *adv_h, TQString *adv_cpp, bool extend, TQString baseClassName ) { /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ - QString methodName = method->name(); - if ( !methodName.contains( QRegExp( "^[a-zA-z_]" ) ) ) + TQString methodName = method->name(); + if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; - *adv_h += " " + ( method->isVirtual() ? QString( "virtual " ) : QString( "" ) ) - + ( method->isStatic() ? QString( "static " ) : QString( "" ) ) + *adv_h += " " + ( method->isVirtual() ? TQString( "virtual " ) : TQString( "" ) ) + + ( method->isStatic() ? TQString( "static " ) : TQString( "" ) ) + method->resultType() + " " + methodName + "("; if ( !templateStr.isEmpty() ) * adv_cpp += templateStr + "\n"; *adv_cpp += method->resultType() + " " + className + templateParams + "::" + methodName + "("; - QString bparams; - QString cparams; + TQString bparams; + TQString cparams; int unnamed = 1; ArgumentList argumentList = method->argumentList(); @@ -1639,8 +1639,8 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method cparams += ( *argIt ) ->type() + " "; if ( ( *argIt ) ->name().isEmpty() ) { - cparams += QString( "arg%1" ).arg( unnamed ); - bparams += QString( "arg%1" ).arg( unnamed++ ); + cparams += TQString( "arg%1" ).arg( unnamed ); + bparams += TQString( "arg%1" ).arg( unnamed++ ); } else { @@ -1664,22 +1664,22 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() // implementation - QString classImpl; - QFileInfo fi( implementationPath ); - QString module = fi.baseName(); - QString basefilename = fi.baseName( true ); + TQString classImpl; + TQFileInfo fi( implementationPath ); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName( true ); if ( dlg.filetemplate_box->isChecked() ) { - /* QDomDocument dom = *dlg.m_part->projectDom(); + /* TQDomDocument dom = *dlg.m_part->projectDom(); if(DomUtil::readBoolEntry(dom,"/cppsupportpart/filetemplates/choosefiles",false)) classImpl = FileTemplate::read(dlg.m_part, DomUtil::readEntry(dom,"/cppsupportpart/filetemplates/implementationURL",""), FileTemplate::Custom); else*/ classImpl = FileTemplate::read( dlg.m_part, fi.extension( true ) ); } - classImpl.replace( QRegExp( "\\$MODULE\\$" ), module ); - classImpl.replace( QRegExp( "\\$FILENAME\\$" ), basefilename ); + classImpl.replace( TQRegExp( "\\$MODULE\\$" ), module ); + classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); if ( objc ) { @@ -1692,16 +1692,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() else { classImpl += dlg.gen_config->cppSource(); - /* classImpl += QString( + /* classImpl += TQString( "#include \"$HEADER$\"\n" "\n" "\n") + namespaceBeg - + ( advConstructorsSource.isEmpty() ? QString("$CLASSNAME$::$CLASSNAME$($ARGS$)\n" + + ( advConstructorsSource.isEmpty() ? TQString("$CLASSNAME$::$CLASSNAME$($ARGS$)\n" "$BASEINITIALIZER$" "{\n" "}\n") : advConstructorsSource ) - + QString("\n" + + TQString("\n" "$CLASSNAME$::~$CLASSNAME$()\n" "{\n" "}\n") @@ -1709,15 +1709,15 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() + namespaceEnd;*/ } - QString relPath; + TQString relPath; for ( int i = implementation.findRev( '/' ); i != -1; i = implementation.findRev( '/', --i ) ) relPath += "../"; - QString constructors = ( advConstructorsSource.isEmpty() ? QString( "$TEMPLATESTR$\n$CLASSNAME$$TEMPLATEPARAMS$::$CLASSNAME$($ARGS$)\n" + TQString constructors = ( advConstructorsSource.isEmpty() ? TQString( "$TEMPLATESTR$\n$CLASSNAME$$TEMPLATEPARAMS$::$CLASSNAME$($ARGS$)\n" "$BASEINITIALIZER$" "{\n" "}" ) : advConstructorsSource ) - + QString( "\n\n\n" + + TQString( "\n\n\n" "$TEMPLATESTR$\n$CLASSNAME$$TEMPLATEPARAMS$::~$CLASSNAME$()\n" "{\n" "}\n" ); @@ -1728,26 +1728,26 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "QWidget *parent = 0, const char *name = 0"; - argsCpp = "QWidget *parent, const char *name"; + argsH = "TQWidget *parent = 0, const char *name = 0"; + argsCpp = "TQWidget *parent, const char *name"; } else { - argsH = "QWidget *parent = 0"; - argsCpp = "QWidget *parent"; + argsH = "TQWidget *parent = 0"; + argsCpp = "TQWidget *parent"; } } else if ( qobject ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "QObject *parent = 0, const char *name = 0"; - argsCpp = "QObject *parent, const char *name"; + argsH = "TQObject *parent = 0, const char *name = 0"; + argsCpp = "TQObject *parent, const char *name"; } else { - argsH = "QObject *parent = 0"; - argsCpp = "QObject *parent"; + argsH = "TQObject *parent = 0"; + argsCpp = "TQObject *parent"; } } else @@ -1755,25 +1755,25 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() argsH = ""; argsCpp = ""; } - QString baseInitializer; + TQString baseInitializer; if ( childClass && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : QWidget(parent, name)"; + baseInitializer = " : TQWidget(parent, name)"; else - baseInitializer = " : QWidget(parent)"; + baseInitializer = " : TQWidget(parent)"; } else if ( qobject && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : QObject(parent, name)"; + baseInitializer = " : TQObject(parent, name)"; else - baseInitializer = " : QObject(parent)"; + baseInitializer = " : TQObject(parent)"; } else if ( dlg.baseclasses_view->childCount() != 0 ) { - QListViewItemIterator it( dlg.baseclasses_view ); + TQListViewItemIterator it( dlg.baseclasses_view ); baseInitializer += " : "; while ( it.current() ) { @@ -1808,41 +1808,41 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() baseInitializer += "\n"; } - constructors.replace( QRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer ); - constructors.replace( QRegExp( "\\$CLASSNAME\\$" ), className ); + constructors.replace( TQRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer ); + constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); if ( templateStr.isEmpty() ) { - constructors.replace( QRegExp( "\\$TEMPLATESTR\\$\\n" ), "" ); - constructors.replace( QRegExp( "\\$TEMPLATEPARAMS\\$" ), "" ); + constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$\\n" ), "" ); + constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), "" ); } else { - constructors.replace( QRegExp( "\\$TEMPLATESTR\\$" ), templateStr ); - constructors.replace( QRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams ); - classImpl.replace( QRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" ); + constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$" ), templateStr ); + constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams ); + classImpl.replace( TQRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" ); } // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); - constructors.replace( QRegExp( "\\$ARGS\\$" ), argsCpp ); + constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsCpp ); // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); //remove unnesessary carriadge returns - QString hp = relPath + header; + TQString hp = relPath + header; beautifySource( classImpl, hp, className, namespaceBeg, constructors, advCpp, namespaceEnd, implementation ); - classImpl.replace( QRegExp( "\\$HEADER\\$" ), relPath + header ); - classImpl.replace( QRegExp( "\\$CLASSNAME\\$" ), className ); - classImpl.replace( QRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); - classImpl.replace( QRegExp( "\\$CONSTRUCTORDEFINITIONS\\$" ), constructors ); - classImpl.replace( QRegExp( "\\$DEFINITIONS\\$" ), advCpp ); - classImpl.replace( QRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); - classImpl.replace( QRegExp( "\\$FILENAME\\$" ), implementation ); + classImpl.replace( TQRegExp( "\\$HEADER\\$" ), relPath + header ); + classImpl.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + classImpl.replace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); + classImpl.replace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$" ), constructors ); + classImpl.replace( TQRegExp( "\\$DEFINITIONS\\$" ), advCpp ); + classImpl.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); + classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), implementation ); if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) ) { - QString moc = header; - moc.replace( QRegExp( "\\..*" ), ".moc" ); + TQString moc = header; + moc.replace( TQRegExp( "\\..*" ), ".moc" ); classImpl += "#include \"" + moc + "\"\n"; } @@ -1855,13 +1855,13 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() kdDebug( 9007 ) << "implementationPath = " << implementationPath << endl; - QFile ifile( implementationPath ); + TQFile ifile( implementationPath ); if ( !ifile.open( IO_WriteOnly ) ) { KMessageBox::error( &dlg, i18n( "Cannot write to implementation file" ) ); return ; } - QTextStream istream( &ifile ); + TQTextStream istream( &ifile ); istream << classImpl; ifile.close(); @@ -1875,22 +1875,22 @@ void CppNewClassDialog::ClassGenerator::gen_interface() { // interface - QString classIntf; - QFileInfo fi( headerPath ); - QString module = fi.baseName(); - QString basefilename = fi.baseName( true ); + TQString classIntf; + TQFileInfo fi( headerPath ); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName( true ); if ( dlg.filetemplate_box->isChecked() ) { - /* QDomDocument dom = *dlg.m_part->projectDom(); + /* TQDomDocument dom = *dlg.m_part->projectDom(); if(DomUtil::readBoolEntry(dom,"/cppsupportpart/filetemplates/choosefiles",false)) classIntf = FileTemplate::read(dlg.m_part, DomUtil::readEntry(dom,"/cppsupportpart/filetemplates/interfaceURL",""), FileTemplate::Custom); else*/ classIntf = FileTemplate::read( dlg.m_part, fi.extension( true ) ); } - classIntf.replace( QRegExp( "\\$MODULE\\$" ), module ); - classIntf.replace( QRegExp( "\\$FILENAME\\$" ), basefilename ); + classIntf.replace( TQRegExp( "\\$MODULE\\$" ), module ); + classIntf.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); if ( objc ) { @@ -1903,32 +1903,32 @@ void CppNewClassDialog::ClassGenerator::gen_interface() else { classIntf += dlg.gen_config->cppHeader(); - /* classIntf = QString("\n" + /* classIntf = TQString("\n" "#ifndef $HEADERGUARD$\n" "#define $HEADERGUARD$\n" "\n" "$INCLUDEBASEHEADER$\n" "\n") + namespaceBeg - + QString("class $CLASSNAME$$INHERITANCE$\n" + + TQString("class $CLASSNAME$$INHERITANCE$\n" "{\n" "$QOBJECT$" "public:\n") - + ( advConstructorsHeader.isEmpty() ? QString(" $CLASSNAME$($ARGS$);\n") : advConstructorsHeader ) - + QString("\n ~$CLASSNAME$();\n") + + ( advConstructorsHeader.isEmpty() ? TQString(" $CLASSNAME$($ARGS$);\n") : advConstructorsHeader ) + + TQString("\n ~$CLASSNAME$();\n") + advH_public - + (advH_public_slots.isEmpty() ? QString::fromLatin1("") : ("\n\npublic slots:" + advH_public_slots)) - + (advH_protected.isEmpty() ? QString::fromLatin1("") : ("\n\nprotected:" + advH_protected)) - + (advH_protected_slots.isEmpty() ? QString::fromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots)) - + (advH_private.isEmpty() ? QString::fromLatin1("") : ("\n\nprivate:" + advH_private)) - + (advH_private_slots.isEmpty() ? QString::fromLatin1("") : ("\n\nprivate slots:" + advH_private_slots)) - + QString("};\n" + + (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 + "#endif\n";*/ } - QString headerGuard; + TQString headerGuard; switch ( dlg.gen_config->defCase() ) { case ClassGeneratorConfig::UpperCase: @@ -1945,24 +1945,24 @@ void CppNewClassDialog::ClassGenerator::gen_interface() break; } - headerGuard.replace( QRegExp( "\\." ), "_" ); - headerGuard.replace( QRegExp( "::" ), "_" ); - QString includeBaseHeader; + headerGuard.replace( TQRegExp( "\\." ), "_" ); + headerGuard.replace( TQRegExp( "::" ), "_" ); + TQString includeBaseHeader; if( dlg.m_part->qtBuildConfig()->isUsed() ) { if( childClass && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - includeBaseHeader = "#include "; + includeBaseHeader = "#include "; else - includeBaseHeader = "#include "; + includeBaseHeader = "#include "; } else if( qobject && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - includeBaseHeader = "#include "; + includeBaseHeader = "#include "; else - includeBaseHeader = "#include "; + includeBaseHeader = "#include "; } } @@ -1972,37 +1972,37 @@ void CppNewClassDialog::ClassGenerator::gen_interface() if ( dlg.baseclasses_view->firstChild() ->text( 0 ) != "NSObject" ) if ( !dlg.baseclasses_view->firstChild() ->text( 3 ).isEmpty() ) includeBaseHeader = "#include " - + ( dlg.baseclasses_view->firstChild() ->text( 2 ).toInt() == 0 ? QString( "<" ) : QString( "\"" ) ) + + ( dlg.baseclasses_view->firstChild() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) ) + dlg.baseclasses_view->firstChild() ->text( 3 ) - + ( dlg.baseclasses_view->firstChild() ->text( 2 ).toInt() == 0 ? QString( ">" ) : QString( "\"" ) ); + + ( dlg.baseclasses_view->firstChild() ->text( 2 ).toInt() == 0 ? TQString( ">" ) : TQString( "\"" ) ); } else { - QListViewItemIterator it( dlg.baseclasses_view ); + TQListViewItemIterator it( dlg.baseclasses_view ); while ( it.current() ) { if ( !it.current() ->text( 0 ).isEmpty() ) if ( !it.current() ->text( 3 ).isEmpty() ) - // if ((!childClass) || (it.current()->text(0) != "QWidget")) - includeBaseHeader += ( includeBaseHeader.isEmpty() ? QString( "" ) : QString( "\n" ) ) + QString::fromLatin1( "#include " ) + - ( it.current() ->text( 2 ).toInt() == 0 ? QString( "<" ) : QString( "\"" ) ) + // if ((!childClass) || (it.current()->text(0) != "TQWidget")) + 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 ? QString( ">" ) : QString( "\"" ) ); + + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( ">" ) : TQString( "\"" ) ); ++it; } } - QString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); - QString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); + TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); + TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); if( !email.isEmpty() ) - author += QString( " <%1>" ).arg( email ); + author += TQString( " <%1>" ).arg( email ); - QString inheritance; + TQString inheritance; if ( dlg.baseclasses_view->childCount() > 0 ) { inheritance += " : "; - QListViewItemIterator it( dlg.baseclasses_view ); + TQListViewItemIterator it( dlg.baseclasses_view ); while ( it.current() ) { if ( !it.current() ->text( 0 ).isEmpty() ) @@ -2023,21 +2023,21 @@ void CppNewClassDialog::ClassGenerator::gen_interface() } } else if ( qobject ) - inheritance += ": public QObject"; + inheritance += ": public TQObject"; - QString constructors = QString( advConstructorsHeader.isEmpty() ? - QString( " $CLASSNAME$($ARGS$);" ) : advConstructorsHeader ) - + QString( "\n\n ~$CLASSNAME$();" ); + TQString constructors = TQString( advConstructorsHeader.isEmpty() ? + TQString( " $CLASSNAME$($ARGS$);" ) : advConstructorsHeader ) + + TQString( "\n\n ~$CLASSNAME$();" ); - constructors.replace( QRegExp( "\\$CLASSNAME\\$" ), className ); - constructors.replace( QRegExp( "\\$ARGS\\$" ), argsH ); + constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsH ); - QString qobjectStr; + TQString qobjectStr; if ( childClass || qobject ) qobjectStr = "Q_OBJECT"; - QString baseclass; + TQString baseclass; if ( dlg.baseclasses_view->childCount() > 0 ) baseclass = dlg.baseclasses_view->firstChild() ->text( 0 ); //remove unnesessary carriadge returns @@ -2047,30 +2047,30 @@ void CppNewClassDialog::ClassGenerator::gen_interface() advH_protected, advH_protected_slots, advH_private, advH_private_slots, namespaceEnd ); - classIntf.replace( QRegExp( "\\$HEADERGUARD\\$" ), headerGuard ); - classIntf.replace( QRegExp( "\\$INCLUDEBASEHEADER\\$" ), includeBaseHeader ); - classIntf.replace( QRegExp( "\\$AUTHOR\\$" ), author ); - classIntf.replace( QRegExp( "\\$DOC\\$" ), doc ); - classIntf.replace( QRegExp( "\\$TEMPLATE\\$" ), templateStr ); - classIntf.replace( QRegExp( "\\$CLASSNAME\\$" ), className ); + classIntf.replace( TQRegExp( "\\$HEADERGUARD\\$" ), headerGuard ); + classIntf.replace( TQRegExp( "\\$INCLUDEBASEHEADER\\$" ), includeBaseHeader ); + classIntf.replace( TQRegExp( "\\$AUTHOR\\$" ), author ); + classIntf.replace( TQRegExp( "\\$DOC\\$" ), doc ); + classIntf.replace( TQRegExp( "\\$TEMPLATE\\$" ), templateStr ); + classIntf.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); if ( dlg.baseclasses_view->childCount() > 0 ) - classIntf.replace( QRegExp( "\\$BASECLASS\\$" ), dlg.baseclasses_view->firstChild() ->text( 0 ) ); - classIntf.replace( QRegExp( "\\$INHERITANCE\\$" ), inheritance ); - classIntf.replace( QRegExp( "\\$QOBJECT\\$" ), qobjectStr ); - classIntf.replace( QRegExp( "\\$ARGS\\$" ), argsH ); - classIntf.replace( QRegExp( "\\$FILENAME\\$" ), header ); - classIntf.replace( QRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); - classIntf.replace( QRegExp( "\\$CONSTRUCTORDECLARATIONS\\$" ), constructors ); - classIntf.replace( QRegExp( "\\$PUBLICDECLARATIONS\\$" ), advH_public ); - classIntf.replace( QRegExp( "\\$PUBLICSLOTS\\$" ), advH_public_slots ); - classIntf.replace( QRegExp( "\\$PROTECTEDDECLARATIONS\\$" ), QString( "protected:\n" ) + advH_protected ); - classIntf.replace( QRegExp( "\\$PROTECTEDSLOTS\\$" ), QString( "protected slots:\n" ) + advH_protected_slots ); - classIntf.replace( QRegExp( "\\$PRIVATEDECLARATIONS\\$" ), QString( "private:\n" ) + advH_private ); - classIntf.replace( QRegExp( "\\$PRIVATESLOTS\\$" ), QString( "private slots:\n" ) + advH_private_slots ); - classIntf.replace( QRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); + classIntf.replace( TQRegExp( "\\$BASECLASS\\$" ), dlg.baseclasses_view->firstChild() ->text( 0 ) ); + classIntf.replace( TQRegExp( "\\$INHERITANCE\\$" ), inheritance ); + classIntf.replace( TQRegExp( "\\$QOBJECT\\$" ), qobjectStr ); + classIntf.replace( TQRegExp( "\\$ARGS\\$" ), argsH ); + classIntf.replace( TQRegExp( "\\$FILENAME\\$" ), header ); + classIntf.replace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); + classIntf.replace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$" ), constructors ); + classIntf.replace( TQRegExp( "\\$PUBLICDECLARATIONS\\$" ), advH_public ); + classIntf.replace( TQRegExp( "\\$PUBLICSLOTS\\$" ), advH_public_slots ); + classIntf.replace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$" ), TQString( "protected:\n" ) + advH_protected ); + classIntf.replace( TQRegExp( "\\$PROTECTEDSLOTS\\$" ), TQString( "protected slots:\n" ) + advH_protected_slots ); + classIntf.replace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$" ), TQString( "private:\n" ) + advH_private ); + classIntf.replace( TQRegExp( "\\$PRIVATESLOTS\\$" ), TQString( "private slots:\n" ) + advH_private_slots ); + classIntf.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); if ( !templateStr.isEmpty() && (!headeronly) ) - classIntf.replace( QRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" ); + classIntf.replace( TQRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" ); if ( dlg.gen_config->reformat_box->isChecked() ) { @@ -2079,13 +2079,13 @@ void CppNewClassDialog::ClassGenerator::gen_interface() classIntf = fmt->formatSource( classIntf ); } - QFile hfile( headerPath ); + TQFile hfile( headerPath ); if ( !hfile.open( IO_WriteOnly ) ) { KMessageBox::error( &dlg, i18n( "Cannot write to header file" ) ); return ; } - QTextStream hstream( &hfile ); + TQTextStream hstream( &hfile ); hstream << classIntf; hfile.close(); @@ -2094,140 +2094,140 @@ void CppNewClassDialog::ClassGenerator::gen_interface() dlg.m_part->partController()->editDocument( u ); } -void CppNewClassDialog::ClassGenerator::beautifyHeader( QString &templ, QString &headerGuard, - QString &includeBaseHeader, QString &author, QString &doc, QString &className, QString &templateStr, - QString &baseclass, QString &inheritance, QString &qobjectStr, QString &args, - QString &header, QString &namespaceBeg, QString &constructors, QString &advH_public, QString &advH_public_slots, - QString &advH_protected, QString &advH_protected_slots, QString &advH_private, QString &advH_private_slots, - QString &namespaceEnd ) +void CppNewClassDialog::ClassGenerator::beautifyHeader( TQString &templ, TQString &headerGuard, + TQString &includeBaseHeader, TQString &author, TQString &doc, TQString &className, TQString &templateStr, + TQString &baseclass, TQString &inheritance, TQString &qobjectStr, TQString &args, + TQString &header, TQString &namespaceBeg, TQString &constructors, TQString &advH_public, TQString &advH_public_slots, + TQString &advH_protected, TQString &advH_protected_slots, TQString &advH_private, TQString &advH_private_slots, + TQString &namespaceEnd ) { if ( headerGuard.isEmpty() ) - templ.replace( QRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), TQString::null ); if ( includeBaseHeader.isEmpty() ) - templ.replace( QRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), TQString::null ); if ( author.isEmpty() ) - templ.replace( QRegExp( "\\$AUTHOR\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$AUTHOR\\$[\\n ]*" ), TQString::null ); if ( doc.isEmpty() ) - templ.replace( QRegExp( "\\$DOC\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$DOC\\$[\\n ]*" ), TQString::null ); if ( className.isEmpty() ) - templ.replace( QRegExp( "\\$CLASSNAME\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString::null ); if ( templateStr.isEmpty() ) - templ.replace( QRegExp( "\\$TEMPLATE\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$TEMPLATE\\$[\\n ]*" ), TQString::null ); if ( baseclass.isEmpty() ) - templ.replace( QRegExp( "\\$BASECLASS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$BASECLASS\\$[\\n ]*" ), TQString::null ); if ( inheritance.isEmpty() ) - templ.replace( QRegExp( "\\$INHERITANCE\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$INHERITANCE\\$[\\n ]*" ), TQString::null ); if ( qobjectStr.isEmpty() ) - templ.replace( QRegExp( "\\$QOBJECT\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$QOBJECT\\$[\\n ]*" ), TQString::null ); if ( args.isEmpty() ) - templ.replace( QRegExp( "\\$ARGS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$ARGS\\$[\\n ]*" ), TQString::null ); if ( header.isEmpty() ) - templ.replace( QRegExp( "\\$FILENAME\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString::null ); if ( namespaceBeg.isEmpty() ) - templ.replace( QRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString::null ); if ( constructors.isEmpty() ) - templ.replace( QRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), TQString::null ); if ( advH_public.isEmpty() ) - templ.replace( QRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), TQString::null ); if ( advH_public_slots.isEmpty() ) - templ.replace( QRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), TQString::null ); if ( advH_protected.isEmpty() ) - templ.replace( QRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), TQString::null ); if ( advH_protected_slots.isEmpty() ) - templ.replace( QRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), TQString::null ); if ( advH_private.isEmpty() ) - templ.replace( QRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), TQString::null ); if ( advH_private_slots.isEmpty() ) - templ.replace( QRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), TQString::null ); if ( namespaceEnd.isEmpty() ) - templ.replace( QRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString::null ); } -void CppNewClassDialog::ClassGenerator::beautifySource( QString &templ, QString &header, QString &className, QString &namespaceBeg, - QString &constructors, QString &advCpp, QString &namespaceEnd, QString &implementation ) +void CppNewClassDialog::ClassGenerator::beautifySource( TQString &templ, TQString &header, TQString &className, TQString &namespaceBeg, + TQString &constructors, TQString &advCpp, TQString &namespaceEnd, TQString &implementation ) { if ( header.isEmpty() ) - templ.replace( QRegExp( "\\$HEADER\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$HEADER\\$[\\n ]*" ), TQString::null ); if ( className.isEmpty() ) - templ.replace( QRegExp( "\\$CLASSNAME\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString::null ); if ( namespaceBeg.isEmpty() ) - templ.replace( QRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString::null ); if ( constructors.isEmpty() ) - templ.replace( QRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), TQString::null ); if ( advCpp.isEmpty() ) - templ.replace( QRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), TQString::null ); if ( namespaceEnd.isEmpty() ) - templ.replace( QRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString::null ); if ( implementation.isEmpty() ) - templ.replace( QRegExp( "\\$FILENAME\\$[\\n ]*" ), QString::null ); + templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString::null ); } -QString CppNewClassDialog::classNameFormatted( ) +TQString CppNewClassDialog::classNameFormatted( ) { return classNameFormatted( classname_edit->text() ); } -QString CppNewClassDialog::classNameFormatted( const QString &name ) +TQString CppNewClassDialog::classNameFormatted( const TQString &name ) { - QString temp = name.simplifyWhiteSpace(); - return temp.replace( QRegExp( "template *<.*> *(class *)?" ), "" ); + TQString temp = name.simplifyWhiteSpace(); + return temp.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); } -QString CppNewClassDialog::templateStrFormatted( ) +TQString CppNewClassDialog::templateStrFormatted( ) { return templateStrFormatted( classname_edit->text() ); } -QString CppNewClassDialog::templateStrFormatted( const QString &name ) +TQString CppNewClassDialog::templateStrFormatted( const TQString &name ) { - QString className = name.simplifyWhiteSpace(); - QString temp = className; - className.replace( QRegExp( "template *<.*> *(class *)?" ), "" ); - QString templateStr = temp.replace( QRegExp( QRegExp_escape( className ) ), "" ); - templateStr.replace( QRegExp( " *class *$" ), "" ); + TQString className = name.simplifyWhiteSpace(); + TQString temp = className; + className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); + templateStr.replace( TQRegExp( " *class *$" ), "" ); return templateStr; } -QString CppNewClassDialog::templateParamsFormatted( ) +TQString CppNewClassDialog::templateParamsFormatted( ) { return templateParamsFormatted( classname_edit->text() ); } -QString CppNewClassDialog::templateParamsFormatted( const QString &name ) +TQString CppNewClassDialog::templateParamsFormatted( const TQString &name ) { - QString className = name.simplifyWhiteSpace(); - QString temp = className; - className.replace( QRegExp( "template *<.*> *(class *)?" ), "" ); - QString templateStr = temp.replace( QRegExp( QRegExp_escape( className ) ), "" ); - templateStr.replace( QRegExp( " *class *$" ), "" ); + TQString className = name.simplifyWhiteSpace(); + TQString temp = className; + className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); + templateStr.replace( TQRegExp( " *class *$" ), "" ); - QString templateParams = templateStr; - templateParams.replace( QRegExp( "^ *template *" ), "" ); - templateParams.replace( QRegExp( " *class *" ), "" ); + TQString templateParams = templateStr; + templateParams.replace( TQRegExp( "^ *template *" ), "" ); + templateParams.replace( TQRegExp( " *class *" ), "" ); templateParams.simplifyWhiteSpace(); return templateParams; } -QString CppNewClassDialog::templateActualParamsFormatted( const QString & name ) +TQString CppNewClassDialog::templateActualParamsFormatted( const TQString & name ) { - QString className = name.simplifyWhiteSpace(); - QString temp = className; - className.replace( QRegExp( "<.*> *" ), "" ); - QString templateStr = temp.replace( QRegExp( QRegExp_escape( className ) ), "" ); + TQString className = name.simplifyWhiteSpace(); + TQString temp = className; + className.replace( TQRegExp( "<.*> *" ), "" ); + TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" ); return templateStr; } -void CppNewClassDialog::removeTemplateParams( QString & name ) +void CppNewClassDialog::removeTemplateParams( TQString & name ) { - name.replace( QRegExp( "<.*> *" ), "" ); + name.replace( TQRegExp( "<.*> *" ), "" ); } -bool CppNewClassDialog::isDestructor( QString className, const FunctionDom &method ) +bool CppNewClassDialog::isDestructor( TQString className, const FunctionDom &method ) { - if ( m_part->formatModelItem( method.data() ).contains( QRegExp( " *~ *" + className ) ) ) + if ( m_part->formatModelItem( method.data() ).contains( TQRegExp( " *~ *" + className ) ) ) return true; return false; } diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index fb680921..18399d1c 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -16,9 +16,9 @@ #ifndef _CPPNEWCLASSDLG_H_ #define _CPPNEWCLASSDLG_H_ -#include -#include -#include +#include +#include +#include #include "codemodel.h" #include "cppnewclassdlgbase.h" @@ -35,36 +35,36 @@ class PCheckListItem: public QCheckListItem { public: - PCheckListItem ( T item, QCheckListItem * parent, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQCheckListItem * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QCheckListItem * parent, QListViewItem * after, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQCheckListItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListViewItem * parent, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListViewItem * parent, QListViewItem * after, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListView * parent, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListView * parent, QListViewItem * after, const QString & text, Type tt = Controller ) : - QCheckListItem ( parent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, QListViewItem * parent, const QString & text, const QPixmap & p ) : - QCheckListItem ( parent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( parent, text, p ), m_item( item ) {} - PCheckListItem ( T item, QListView * parent, const QString & text, const QPixmap & p ) : - QCheckListItem ( parent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( parent, text, p ), m_item( item ) {} T item() @@ -72,7 +72,7 @@ public: return m_item; } - QString templateAddition; + TQString templateAddition; private: T m_item; @@ -83,20 +83,20 @@ class PListViewItem: public QListViewItem { public: - PListViewItem ( T item, QListViewItem * parent, QListViewItem * after, const QString & text ) : - QListViewItem ( parent, after, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( parent, after, text ), m_item( item ) {} - PListViewItem ( T item, QListViewItem * parent, const QString & text ) : - QListViewItem ( parent, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * parent, const TQString & text ) : + TQListViewItem ( parent, text ), m_item( item ) {} - PListViewItem ( T item, QListView * parent, const QString & text ) : - QListViewItem ( parent, text ), m_item( item ) + PListViewItem ( T item, TQListView * parent, const TQString & text ) : + TQListViewItem ( parent, text ), m_item( item ) {} - PListViewItem ( T item, QListView * parent, QListViewItem * after, const QString & text ) : - QListViewItem ( parent, after, text ), m_item( item ) + PListViewItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( parent, after, text ), m_item( item ) {} T item() @@ -104,7 +104,7 @@ public: return m_item; } - QString templateAddition; + TQString templateAddition; private: T m_item; }; @@ -115,28 +115,28 @@ class CppNewClassDialog : public CppNewClassDialogBase Q_OBJECT public: - CppNewClassDialog( CppSupportPart *part, QWidget *parent = 0, const char *name = 0 ); + CppNewClassDialog( CppSupportPart *part, TQWidget *parent = 0, const char *name = 0 ); ~CppNewClassDialog(); protected: virtual void accept(); - virtual void classNameChanged( const QString &text ); - virtual void classNamespaceChanged( const QString &text ); + virtual void classNameChanged( const TQString &text ); + virtual void classNamespaceChanged( const TQString &text ); virtual void headerChanged(); virtual void implementationChanged(); - virtual void nameHandlerChanged( const QString &text ); - virtual void baseclassname_changed( const QString &text ); - virtual void baseIncludeChanged( const QString &text ); + virtual void nameHandlerChanged( const TQString &text ); + virtual void baseclassname_changed( const TQString &text ); + virtual void baseIncludeChanged( const TQString &text ); virtual void addBaseClass(); virtual void remBaseClass(); virtual void remBaseClassOnly(); - virtual void currBaseNameChanged( const QString &text ); + virtual void currBaseNameChanged( const TQString &text ); virtual void currBasePrivateSet(); virtual void currBaseProtectedSet(); virtual void currBasePublicSet(); virtual void currBaseVirtualChanged( int val ); - virtual void currBaseSelected( QListViewItem *it ); + virtual void currBaseSelected( TQListViewItem *it ); virtual void scopeboxActivated( int value ); virtual void checkObjCInheritance( int val ); @@ -146,14 +146,14 @@ protected: virtual void downbaseclass_button_clicked(); virtual void baseclasses_view_selectionChanged(); - virtual void newTabSelected( const QString &text ); - virtual void newTabSelected( QWidget *w ); - virtual void access_view_mouseButtonPressed( int button, QListViewItem * item, const QPoint &p, int c ); + virtual void newTabSelected( const TQString &text ); + virtual void newTabSelected( TQWidget *w ); + virtual void access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int c ); virtual void changeToPrivate(); virtual void changeToProtected(); virtual void changeToPublic(); virtual void changeToInherited(); - virtual void methods_view_mouseButtonPressed( int button , QListViewItem * item, const QPoint&p , int c ); + virtual void methods_view_mouseButtonPressed( int button , TQListViewItem * item, const TQPoint&p , int c ); virtual void extendFunctionality(); virtual void replaceFunctionality(); virtual void to_constructors_list_clicked(); @@ -164,59 +164,59 @@ protected: virtual void headeronly_box_stateChanged(int val); void reloadAdvancedInheritance( bool clean = false ); - void parseClass( QString clName, QString inheritance ); - void parsePCSClass( QString clName, QString inheritance ); - void addToConstructorsList( QCheckListItem *myClass, FunctionDom method ); - void addToMethodsList( QListViewItem *parent, FunctionDom method ); - void addToUpgradeList( QListViewItem *parent, FunctionDom method, QString modifier ); - void addToUpgradeList( QListViewItem *parent, VariableDom attr, QString modifier ); + void parseClass( TQString clName, TQString inheritance ); + void parsePCSClass( TQString clName, TQString inheritance ); + void addToConstructorsList( TQCheckListItem *myClass, FunctionDom method ); + void addToMethodsList( TQListViewItem *parent, FunctionDom method ); + void addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ); + void addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ); void clearConstructorsList( bool clean = false ); void clearMethodsList( bool clean = false ); void clearUpgradeList( bool clean = false ); - bool isConstructor( QString className, const FunctionDom &method ); - bool isDestructor( QString className, const FunctionDom &method ); + bool isConstructor( TQString className, const FunctionDom &method ); + bool isDestructor( TQString className, const FunctionDom &method ); private: bool headerModified; bool baseincludeModified; bool implementationModified; - QString m_parse; - QPopupMenu *accessMenu; - QPopupMenu *overMenu; + TQString m_parse; + TQPopupMenu *accessMenu; + TQPopupMenu *overMenu; CppSupportPart *m_part; CodeModel *myModel; // configuration variables - QString interface_url; - QString implementation_url; - QString interface_suffix; - QString implementation_suffix; - QStringList currNamespace; + TQString interface_url; + TQString implementation_url; + TQString interface_suffix; + TQString implementation_suffix; + TQStringList currNamespace; bool lowercase_filenames; - QStringList currBaseClasses; + TQStringList currBaseClasses; KCompletion * compBasename; KCompletion * compNamespace; void setCompletionBasename( CodeModel *model ); - void addCompletionBasenameNamespacesRecursive( const NamespaceDom & namespaceDom, const QString & namespaceParent = "" ); - void setCompletionNamespaceRecursive( const NamespaceDom & namespaceDom, const QString & namespaceParent = "" ); + void addCompletionBasenameNamespacesRecursive( const NamespaceDom & namespaceDom, const TQString & namespaceParent = "" ); + void setCompletionNamespaceRecursive( const NamespaceDom & namespaceDom, const TQString & namespaceParent = "" ); void setStateOfInheritanceEditors( bool state, bool hideList = true ); - void setAccessForBase( QString baseclass, QString newAccess ); - void setAccessForItem( QListViewItem *curr, QString newAccess, bool isPublic ); - void remClassFromAdv( QString text ); + void setAccessForBase( TQString baseclass, TQString newAccess ); + void setAccessForItem( TQListViewItem *curr, TQString newAccess, bool isPublic ); + void remClassFromAdv( TQString text ); void checkUpButtonState(); void checkDownButtonState(); void updateConstructorsOrder(); - QString classNameFormatted(); - QString templateStrFormatted(); - QString templateParamsFormatted(); - QString classNameFormatted( const QString & ); - QString templateStrFormatted( const QString & ); - QString templateParamsFormatted( const QString & ); - QString templateActualParamsFormatted( const QString & ); - void removeTemplateParams( QString & ); + TQString classNameFormatted(); + TQString templateStrFormatted(); + TQString templateParamsFormatted(); + TQString classNameFormatted( const TQString & ); + TQString templateStrFormatted( const TQString & ); + TQString templateParamsFormatted( const TQString & ); + TQString templateActualParamsFormatted( const TQString & ); + void removeTemplateParams( TQString & ); friend class ClassGenerator; @@ -234,49 +234,49 @@ private: void common_text(); void gen_implementation(); void gen_interface(); - void genMethodDeclaration( FunctionDom method, QString className, QString templateStr, - QString *adv_h, QString *adv_cpp, bool extend, QString baseClassName ); - - void beautifyHeader( QString &templ, QString &headerGuard, - QString &includeBaseHeader, QString &author, QString &doc, QString &className, QString &templateStr, - QString &baseclass, QString &inheritance, QString &qobjectStr, QString &args, - QString &header, QString &namespaceBeg, QString &constructors, QString &advH_public, - QString &advH_public_slots, - QString &advH_protected, QString &advH_protected_slots, QString &advH_private, QString &advH_private_slots, - QString &namespaceEnd ); - void beautifySource( QString &templ, QString &header, QString &className, QString &namespaceBeg, - QString &constructors, QString &advCpp, QString &namespaceEnd, QString &implementation ); - - QString className; - QString templateStr; - QString templateParams; - QString header; - QString implementation; - - QString advConstructorsHeader; - QString advConstructorsSource; + void genMethodDeclaration( FunctionDom method, TQString className, TQString templateStr, + TQString *adv_h, TQString *adv_cpp, bool extend, TQString baseClassName ); + + void beautifyHeader( TQString &templ, TQString &headerGuard, + TQString &includeBaseHeader, TQString &author, TQString &doc, TQString &className, TQString &templateStr, + TQString &baseclass, TQString &inheritance, TQString &qobjectStr, TQString &args, + TQString &header, TQString &namespaceBeg, TQString &constructors, TQString &advH_public, + TQString &advH_public_slots, + TQString &advH_protected, TQString &advH_protected_slots, TQString &advH_private, TQString &advH_private_slots, + TQString &namespaceEnd ); + void beautifySource( TQString &templ, TQString &header, TQString &className, TQString &namespaceBeg, + TQString &constructors, TQString &advCpp, TQString &namespaceEnd, TQString &implementation ); + + TQString className; + TQString templateStr; + TQString templateParams; + TQString header; + TQString implementation; + + TQString advConstructorsHeader; + TQString advConstructorsSource; KDevProject *project; - QString subDir, headerPath, implementationPath; - QString doc; - QString namespaceStr; + TQString subDir, headerPath, implementationPath; + TQString doc; + TQString namespaceStr; bool childClass; bool objc; bool qobject; bool gtk; bool headeronly; - QStringList namespaces; - QString namespaceBeg, namespaceEnd; - QString argsH; - QString argsCpp; - - QString advH_public; - QString advH_public_slots; - QString advH_protected; - QString advH_protected_slots; - QString advH_private; - QString advH_private_slots; - QString advCpp; + TQStringList namespaces; + TQString namespaceBeg, namespaceEnd; + TQString argsH; + TQString argsCpp; + + TQString advH_public; + TQString advH_public_slots; + TQString advH_protected; + TQString advH_protected_slots; + TQString advH_private; + TQString advH_private_slots; + TQString advCpp; CppNewClassDialog& dlg; diff --git a/languages/cpp/cppsplitheadersourceconfig.cpp b/languages/cpp/cppsplitheadersourceconfig.cpp index 68253368..7298354b 100644 --- a/languages/cpp/cppsplitheadersourceconfig.cpp +++ b/languages/cpp/cppsplitheadersourceconfig.cpp @@ -25,12 +25,12 @@ #include #include -#include +#include -QString CppSplitHeaderSourceConfig::defaultPath = QString::fromLatin1( "/kdevcppsupport/splitheadersource" ); +TQString CppSplitHeaderSourceConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/splitheadersource" ); -CppSplitHeaderSourceConfig::CppSplitHeaderSourceConfig( CppSupportPart * part, QDomDocument* dom ) - : QObject( part ), m_part( part ), m_dom( dom ) +CppSplitHeaderSourceConfig::CppSplitHeaderSourceConfig( CppSupportPart * part, TQDomDocument* dom ) + : TQObject( part ), m_part( part ), m_dom( dom ) { init(); } @@ -73,7 +73,7 @@ void CppSplitHeaderSourceConfig::setAutoSync( bool b ) m_splitSync = b; } -void CppSplitHeaderSourceConfig::setOrientation( const QString &o ) +void CppSplitHeaderSourceConfig::setOrientation( const TQString &o ) { m_splitOrientation = o; } diff --git a/languages/cpp/cppsplitheadersourceconfig.h b/languages/cpp/cppsplitheadersourceconfig.h index d975bc2c..52be4297 100644 --- a/languages/cpp/cppsplitheadersourceconfig.h +++ b/languages/cpp/cppsplitheadersourceconfig.h @@ -21,7 +21,7 @@ #ifndef CPPSPLITHEADERSOURCECONFIG_H #define CPPSPLITHEADERSOURCECONFIG_H -#include +#include class CppSupportPart; class QDomDocument; @@ -30,7 +30,7 @@ class CppSplitHeaderSourceConfig : public QObject { Q_OBJECT public: - CppSplitHeaderSourceConfig( CppSupportPart* part, QDomDocument* dom ); + CppSplitHeaderSourceConfig( CppSupportPart* part, TQDomDocument* dom ); virtual ~CppSplitHeaderSourceConfig(); bool splitEnabled() const @@ -45,11 +45,11 @@ public: } void setAutoSync( bool b ); - QString orientation() const + TQString orientation() const { return m_splitOrientation; } - void setOrientation( const QString &o ); + void setOrientation( const TQString &o ); public slots: void store(); @@ -62,12 +62,12 @@ signals: private: CppSupportPart* m_part; - QDomDocument* m_dom; + TQDomDocument* m_dom; bool m_splitEnable; bool m_splitSync; - QString m_splitOrientation; + TQString m_splitOrientation; - static QString defaultPath; + static TQString defaultPath; }; #endif diff --git a/languages/cpp/cppsupport_events.h b/languages/cpp/cppsupport_events.h index 0c266726..2dbac39a 100644 --- a/languages/cpp/cppsupport_events.h +++ b/languages/cpp/cppsupport_events.h @@ -14,29 +14,29 @@ #include "kdevdeepcopy.h" -#include -#include +#include +#include #if QT_VERSION < 0x030100 #include #else -#include +#include #endif enum { - Event_FileParsed = QEvent::User + 1000 + Event_FileParsed = TQEvent::User + 1000 }; class FileParsedEvent: public QCustomEvent { public: - FileParsedEvent( const QString& fileName, const QValueList& problems, bool fromDisk = false ) - : QCustomEvent( Event_FileParsed ), m_fileName( deepCopy( fileName ) ), m_fromDisk( fromDisk ) + FileParsedEvent( const TQString& fileName, const TQValueList& problems, bool fromDisk = false ) + : TQCustomEvent( Event_FileParsed ), m_fileName( deepCopy( fileName ) ), m_fromDisk( fromDisk ) { // the members are deep copies - QValueListConstIterator it = problems.begin(); + TQValueListConstIterator it = problems.begin(); while ( it != problems.end() ) { Problem p = *it; @@ -46,11 +46,11 @@ public: } } - QString fileName() const + TQString fileName() const { return m_fileName; } - QValueList problems() const + TQValueList problems() const { return m_problems; } @@ -60,8 +60,8 @@ public: } private: - QString m_fileName; - QValueList m_problems; + TQString m_fileName; + TQValueList m_problems; bool m_fromDisk; private: diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp index e6f80abc..338fa724 100644 --- a/languages/cpp/cppsupport_utils.cpp +++ b/languages/cpp/cppsupport_utils.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -8,26 +8,26 @@ #include "cppsupport_utils.h" -static void typeNameList( QStringList& path, QStringList & lst, const CodeModel * model ); -static void typeNameList( QStringList& path, QStringList & lst, NamespaceDom ns ); -static void typeNameList( QStringList & path, QStringList & lst, ClassDom klass ); +static void typeNameList( TQStringList& path, TQStringList & lst, const CodeModel * model ); +static void typeNameList( TQStringList& path, TQStringList & lst, NamespaceDom ns ); +static void typeNameList( TQStringList & path, TQStringList & lst, ClassDom klass ); -QStringList typeNameList( const CodeModel* model ) +TQStringList typeNameList( const CodeModel* model ) { - QStringList lst; - QStringList path; + TQStringList lst; + TQStringList path; typeNameList( path, lst, model ); return lst; } -static void typeNameList( QStringList& path, QStringList & lst, const CodeModel * model ) +static void typeNameList( TQStringList& path, TQStringList & lst, const CodeModel * model ) { const FileList fileList = model->fileList(); for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ) typeNameList( path, lst, model_cast(*it) ); } -static void typeNameList( QStringList& path, QStringList & lst, NamespaceDom ns ) +static void typeNameList( TQStringList& path, TQStringList & lst, NamespaceDom ns ) { if( !ns->isFile() ) path.push_back( ns->name() ); @@ -44,7 +44,7 @@ static void typeNameList( QStringList& path, QStringList & lst, NamespaceDom ns path.pop_back(); } -static void typeNameList( QStringList & path, QStringList & lst, ClassDom klass ) +static void typeNameList( TQStringList & path, TQStringList & lst, ClassDom klass ) { path.push_back( klass->name() ); @@ -57,13 +57,13 @@ static void typeNameList( QStringList & path, QStringList & lst, ClassDom klass path.pop_back(); } -static void typedefMap( QMap & map, const CodeModel * model ); -static void typedefMap( QMap & map, NamespaceDom ns ); -static void typedefMap( QMap & map, ClassDom klass ); +static void typedefMap( TQMap & map, const CodeModel * model ); +static void typedefMap( TQMap & map, NamespaceDom ns ); +static void typedefMap( TQMap & map, ClassDom klass ); -QMap typedefMap( const CodeModel* model ) +TQMap typedefMap( const CodeModel* model ) { - QMap map; + TQMap map; typedefMap( map, model ); /*We need to flatten the typedefs to avoid circular aliases. @@ -72,7 +72,7 @@ QMap typedefMap( const CodeModel* model ) map["Bar"] = "Foo"; map["Baz"] = "Bar";*/ - QMap::iterator it = map.begin(); + TQMap::iterator it = map.begin(); for ( ; it != map.end(); ++it ) { while ( map.contains( map[ it.key() ] ) && @@ -85,14 +85,14 @@ QMap typedefMap( const CodeModel* model ) return map; } -static void typedefMap( QMap & map, const CodeModel * model ) +static void typedefMap( TQMap & map, const CodeModel * model ) { const FileList fileList = model->fileList(); for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ) typedefMap( map, model_cast(*it) ); } -static void typedefMap( QMap & map, NamespaceDom ns ) +static void typedefMap( TQMap & map, NamespaceDom ns ) { const TypeAliasList aliasList = ns->typeAliasList(); for( TypeAliasList::ConstIterator it=aliasList.begin(); it!=aliasList.end(); ++it ) @@ -107,7 +107,7 @@ static void typedefMap( QMap & map, NamespaceDom ns ) typedefMap( map, *it ); } -static void typedefMap( QMap & map, ClassDom klass ) +static void typedefMap( TQMap & map, ClassDom klass ) { const TypeAliasList aliasList = klass->typeAliasList(); for( TypeAliasList::ConstIterator it=aliasList.begin(); it!=aliasList.end(); ++it ) @@ -118,7 +118,7 @@ static void typedefMap( QMap & map, ClassDom klass ) typedefMap( map, *it ); } -QString formattedOpeningParenthesis(bool suppressSpace) +TQString formattedOpeningParenthesis(bool suppressSpace) { KConfig * config = kapp->config(); config->setGroup("AStyle"); @@ -127,7 +127,7 @@ QString formattedOpeningParenthesis(bool suppressSpace) return "( "; } -QString formattedClosingParenthesis(bool suppressSpace) +TQString formattedClosingParenthesis(bool suppressSpace) { KConfig * config = kapp->config(); config->setGroup("AStyle"); diff --git a/languages/cpp/cppsupport_utils.h b/languages/cpp/cppsupport_utils.h index 9182dd08..37331eaa 100644 --- a/languages/cpp/cppsupport_utils.h +++ b/languages/cpp/cppsupport_utils.h @@ -12,16 +12,16 @@ #ifndef __cppsupport_utils_h #define __cppsupport_utils_h -#include -#include +#include +#include #include "codemodel.h" -QStringList typeNameList( const CodeModel* model ); -QMap typedefMap( const CodeModel* model ); +TQStringList typeNameList( const CodeModel* model ); +TQMap typedefMap( const CodeModel* model ); -QString formattedOpeningParenthesis(bool suppressSpace = false); -QString formattedClosingParenthesis(bool suppressSpace = false); +TQString formattedOpeningParenthesis(bool suppressSpace = false); +TQString formattedClosingParenthesis(bool suppressSpace = false); #endif // __cppsupport_utils_h // kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index f72b168c..334c7d6c 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -55,21 +55,21 @@ #include "configproblemreporter.h" #include "codeinformationrepository.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -110,11 +110,11 @@ const bool alwaysParseInBackground = true; enum { KDEV_DB_VERSION = 21 }; enum { KDEV_PCS_VERSION = 18 }; -QStringList CppSupportPart::m_sourceMimeTypes = QStringList() << "text/x-csrc" << "text/x-c++src"; -QStringList CppSupportPart::m_headerMimeTypes = QStringList() << "text/x-chdr" << "text/x-c++hdr"; +TQStringList CppSupportPart::m_sourceMimeTypes = TQStringList() << "text/x-csrc" << "text/x-c++src"; +TQStringList CppSupportPart::m_headerMimeTypes = TQStringList() << "text/x-chdr" << "text/x-c++hdr"; -QStringList CppSupportPart::m_sourceExtensions = QStringList::split( ",", "c,C,cc,cpp,c++,cxx,m,mm,M" ); -QStringList CppSupportPart::m_headerExtensions = QStringList::split( ",", "h,H,hh,h++,hxx,hpp,inl,tlh,diff,ui.h" ); +TQStringList CppSupportPart::m_sourceExtensions = TQStringList::split( ",", "c,C,cc,cpp,c++,cxx,m,mm,M" ); +TQStringList CppSupportPart::m_headerExtensions = TQStringList::split( ",", "h,H,hh,h++,hxx,hpp,inl,tlh,diff,ui.h" ); class CppDriver: public KDevDriver { @@ -132,8 +132,8 @@ public: { cppSupport() ->problemReporter() ->removeAllProblems( fileName.fileName() ); - QValueList pl = problems( fileName.fileName() ); - QValueList::ConstIterator it = pl.begin(); + TQValueList pl = problems( fileName.fileName() ); + TQValueList::ConstIterator it = pl.begin(); while ( it != pl.end() ) { const Problem & p = *it++; @@ -156,11 +156,11 @@ public: if( cppSupport()->_jd ) { cppSupport()->_jd->backgroundState ++; - cppSupport()->_jd->lastParse = QTime::currentTime(); + cppSupport()->_jd->lastParse = TQTime::currentTime(); } - QFileInfo fileInfo( fileName.fileName() ); - QString path = URLUtil::canonicalPath( fileName.fileName() ); + TQFileInfo fileInfo( fileName.fileName() ); + TQString path = URLUtil::canonicalPath( fileName.fileName() ); cppSupport()->m_timestamp[ path ] = fileInfo.lastModified(); @@ -191,7 +191,7 @@ public: }; -CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QStringList &args ) +CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ) : KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_projectClosing( false ), m_valid( false ), m_isTyping( false ), m_hadErrors( false ), @@ -201,10 +201,10 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString m_pCompletionConfig = new CppCodeCompletionConfig( this, projectDom() ); m_pSplitHeaderSourceConfig = new CppSplitHeaderSourceConfig( this, projectDom() ); - m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, SIGNAL( stored() ), - this, SLOT( splitHeaderSourceConfigStored() ) ); - connect( m_pCompletionConfig, SIGNAL( stored() ), - this, SLOT( codeCompletionConfigStored() ) ); + m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQT_SIGNAL( stored() ), + this, TQT_SLOT( splitHeaderSourceConfigStored() ) ); + connect( m_pCompletionConfig, TQT_SIGNAL( stored() ), + this, TQT_SLOT( codeCompletionConfigStored() ) ); m_qtBuildConfig = new QtBuildConfig( this, projectDom() ); m_qtBuildConfig->store(); @@ -214,45 +214,45 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString m_driver = new CppDriver( this ); m_problemReporter = 0; - m_textChangedTimer = new QTimer( this ); - connect( m_textChangedTimer, SIGNAL(timeout()), this, SLOT(slotParseCurrentFile()) ); + m_textChangedTimer = new TQTimer( this ); + connect( m_textChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseCurrentFile()) ); - m_cursorMovedTimer = new QTimer( this ); - connect( m_cursorMovedTimer, SIGNAL(timeout()), this, SLOT(slotCursorPositionChanged()) ); + m_cursorMovedTimer = new TQTimer( this ); + connect( m_cursorMovedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCursorPositionChanged()) ); -// m_deleteParserStoreTimer = new QTimer( this ); - m_saveMemoryTimer = new QTimer( this ); - m_buildSafeFileSetTimer = new QTimer( this ); -// m_functionHintTimer = new QTimer( this ); - connect( m_buildSafeFileSetTimer, SIGNAL(timeout()), this, SLOT(buildSafeFileSet()) ); - connect( m_saveMemoryTimer, SIGNAL(timeout()), this, SLOT(slotSaveMemory()) ); -// connect( m_deleteParserStoreTimer, SIGNAL(timeout()), this, SLOT(slotDeleteParserStore()) ); +// m_deleteParserStoreTimer = new TQTimer( this ); + m_saveMemoryTimer = new TQTimer( this ); + m_buildSafeFileSetTimer = new TQTimer( this ); +// m_functionHintTimer = new TQTimer( this ); + connect( m_buildSafeFileSetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(buildSafeFileSet()) ); + connect( m_saveMemoryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveMemory()) ); +// connect( m_deleteParserStoreTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDeleteParserStore()) ); resetParserStoreTimer(); m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes - // connect( m_functionHintTimer, SIGNAL(timeout()), this, SLOT(slotFunctionHint()) ); + // connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) ); setXMLFile( "kdevcppsupport.rc" ); m_catalogList.setAutoDelete( true ); - connect( core(), SIGNAL( projectOpened() ), this, SLOT( projectOpened() ) ); - connect( core(), SIGNAL( projectClosed() ), this, SLOT( projectClosed() ) ); - connect( core(), SIGNAL( languageChanged() ), this, SLOT( projectOpened() ) ); - connect( partController(), SIGNAL( savedFile( const KURL& ) ), - this, SLOT( savedFile( const KURL& ) ) ); - connect( core(), SIGNAL( contextMenu( QPopupMenu *, const Context * ) ), - this, SLOT( contextMenu( QPopupMenu *, const Context * ) ) ); - connect( partController(), SIGNAL( activePartChanged( KParts::Part* ) ), - this, SLOT( activePartChanged( KParts::Part* ) ) ); - connect( partController(), SIGNAL( partRemoved( KParts::Part* ) ), - this, SLOT( partRemoved( KParts::Part* ) ) ); - - connect( core(), SIGNAL( configWidget( KDialogBase* ) ), - this, SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( projectOpened() ) ); + connect( core(), TQT_SIGNAL( projectClosed() ), this, TQT_SLOT( projectClosed() ) ); + connect( core(), TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( projectOpened() ) ); + connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), + this, TQT_SLOT( savedFile( const KURL& ) ) ); + connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), + this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); + connect( partController(), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQT_SLOT( activePartChanged( KParts::Part* ) ) ); + connect( partController(), TQT_SIGNAL( partRemoved( KParts::Part* ) ), + this, TQT_SLOT( partRemoved( KParts::Part* ) ) ); + + connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), + this, TQT_SLOT( configWidget( KDialogBase* ) ) ); m_switchHeaderSourceAction = new KAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12, - this, SLOT( slotSwitchHeader() ), + this, TQT_SLOT( slotSwitchHeader() ), actionCollection(), "edit_switchheader" ); m_switchHeaderSourceAction->setToolTip( i18n( "Switch between header and implementation files" ) ); m_switchHeaderSourceAction->setWhatsThis( i18n( "Switch Header/Implementation

    " @@ -265,7 +265,7 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString KAction *action; action = new KAction( i18n( "Complete Text" ), CTRL + Key_Space, - this, SLOT( slotCompleteText() ), + this, TQT_SLOT( slotCompleteText() ), actionCollection(), "edit_complete_text" ); action->setToolTip( i18n( "Complete current expression" ) ); action->setWhatsThis( i18n( "Complete Text

    Completes current expression using " @@ -274,11 +274,11 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString action->setEnabled( false ); m_createGetterSetterAction = new KAction( i18n( "Create Accessor Methods" ), 0, - this, SLOT( slotCreateAccessMethods() ), actionCollection(), + this, TQT_SLOT( slotCreateAccessMethods() ), actionCollection(), "edit_create_getter_setter" ); action = new KAction( i18n( "Make Member" ), 0, Key_F2, - this, SLOT( slotMakeMember() ), + this, TQT_SLOT( slotMakeMember() ), actionCollection(), "edit_make_member" ); action->setToolTip( i18n( "Make member" ) ); action->setWhatsThis( i18n( "Make member

    Creates a class member function in implementation file " @@ -286,7 +286,7 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString action->plug( &m_DummyActionWidget ); action = new KAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space, - this, SLOT( slotNavigate() ), + this, TQT_SLOT( slotNavigate() ), actionCollection(), "edit_navigate" ); action->setToolTip( i18n( "Show the navigation-menu" ) ); action->setWhatsThis( i18n( "Navigate

    Shows a navigation-menu based on the type-evaluation of the item under the cursor." ) ); @@ -294,7 +294,7 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString action = new KAction( i18n( "New Class..." ), "classnew", 0, - this, SLOT( slotNewClass() ), + this, TQT_SLOT( slotNewClass() ), actionCollection(), "project_newclass" ); action->setToolTip( i18n( "Generate a new class" ) ); action->setWhatsThis( i18n( "New Class

    Calls the New Class wizard." ) ); @@ -306,8 +306,8 @@ CppSupportPart::CppSupportPart( QObject *parent, const char *name, const QString withcpp = true; // daniel - connect( core( ), SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevCppSupportIface( this ); //(void) dcopClient(); @@ -336,7 +336,7 @@ CppSupportPart::~CppSupportPart() codeRepository() ->setMainCatalog( 0 ); - QPtrListIterator it( m_catalogList ); + TQPtrListIterator it( m_catalogList ); while ( Catalog * catalog = it.current() ) { ++it; @@ -361,11 +361,11 @@ CppSupportPart::~CppSupportPart() } -void CppSupportPart::customEvent( QCustomEvent* ev ) +void CppSupportPart::customEvent( TQCustomEvent* ev ) { kdDebug( 9007 ) << "CppSupportPart::customEvent(" << ev->type() << ")" << endl; - QTime t; + TQTime t; t.start(); bool fromDisk = false; @@ -375,14 +375,14 @@ void CppSupportPart::customEvent( QCustomEvent* ev ) FileParsedEvent * event = ( FileParsedEvent* ) ev; fromDisk = event->fromDisk(); - QString fileName = event->fileName(); + TQString fileName = event->fileName(); bool hasErrors = false; if ( m_problemReporter ) { m_problemReporter->removeAllProblems( fileName ); - QValueList problems = event->problems(); - QValueList::ConstIterator it = problems.begin(); + TQValueList problems = event->problems(); + TQValueList::ConstIterator it = problems.begin(); while ( it != problems.end() ) { const Problem & p = *it++; @@ -413,7 +413,7 @@ void CppSupportPart::customEvent( QCustomEvent* ev ) //Increase status-bar if( p.hasFlag( ParseEmitWaiting::Silent ) && _jd ) { _jd->backgroundState ++; - _jd->lastParse = QTime::currentTime(); + _jd->lastParse = TQTime::currentTime(); } } else { @@ -424,7 +424,7 @@ void CppSupportPart::customEvent( QCustomEvent* ev ) //Increase status-bar if( p.hasFlag( ParseEmitWaiting::Silent ) && _jd ) { _jd->backgroundState ++; - _jd->lastParse = QTime::currentTime(); + _jd->lastParse = TQTime::currentTime(); } } } @@ -433,26 +433,26 @@ void CppSupportPart::customEvent( QCustomEvent* ev ) void CppSupportPart::projectConfigWidget( KDialogBase* dlg ) { - QVBox * vbox = 0; + TQVBox * vbox = 0; vbox = dlg->addVBoxPage( i18n( "C++ Support" ), i18n( "C++ Support" ), BarIcon( info() ->icon(), KIcon::SizeMedium ) ); CCConfigWidget* w = new CCConfigWidget( this, vbox ); - connect( dlg, SIGNAL( okClicked( ) ), w, SLOT( accept( ) ) ); + connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); } void CppSupportPart::configWidget( KDialogBase *dlg ) { - QVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ), + TQVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ), BarIcon( info() ->icon(), KIcon::SizeMedium ) ); ClassGeneratorConfig *w = new ClassGeneratorConfig( vbox, "classgenerator config widget" ); - connect( dlg, SIGNAL( okClicked() ), w, SLOT( storeConfig() ) ); + connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) ); vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"), BarIcon( "source_cpp", KIcon::SizeMedium) ); ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox ); ww->setPart( this ); - connect(dlg, SIGNAL(okClicked()), ww, SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept())); } void CppSupportPart::activePartChanged( KParts::Part *part ) @@ -465,11 +465,11 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeView ) { - disconnect( m_activeView, SIGNAL( cursorPositionChanged() ), this, 0 ); + disconnect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, 0 ); } if ( m_activeDocument ) { - disconnect( m_activeDocument, SIGNAL(textChanged()), this, 0 ); + disconnect( m_activeDocument, TQT_SIGNAL(textChanged()), this, 0 ); } m_isTyping = false; @@ -480,13 +480,13 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) m_activeSelection = dynamic_cast( part ); m_activeViewCursor = dynamic_cast( m_activeView ); - m_activeFileName = QString::null; + m_activeFileName = TQString::null; if ( m_activeDocument ) { m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() ); - QFileInfo fi( m_activeFileName ); - QString ext = fi.extension(); + TQFileInfo fi( m_activeFileName ); + TQString ext = fi.extension(); if ( isSource( m_activeFileName ) || isHeader( m_activeFileName ) ) enabled = true; } @@ -500,14 +500,14 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeDocument ) { - connect( m_activeDocument, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) ); + connect( m_activeDocument, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); m_textChangedTimer->start( 250, true ); // kick the parse timer, we might want to parse the current file } if ( m_activeViewCursor ) { - connect( m_activeView, SIGNAL( cursorPositionChanged() ), this, SLOT(slotCursorMoved()) ); -// this, SLOT( slotCursorPositionChanged() ) ); + connect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, TQT_SLOT(slotCursorMoved()) ); +// this, TQT_SLOT( slotCursorPositionChanged() ) ); } @@ -516,8 +516,8 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( !textHintIface ) return ; - connect( view, SIGNAL( needTextHint( int, int, QString& ) ), - this, SLOT( slotNeedTextHint( int, int, QString& ) ) ); + connect( view, TQT_SIGNAL( needTextHint( int, int, TQString& ) ), + this, TQT_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); textHintIface->enableTextHints( 1000 ); #endif @@ -537,11 +537,11 @@ void CppSupportPart::projectOpened( ) kdDebug( 9007 ) << "projectOpened( )" << endl; m_backgroundParser = new BackgroundParser( this, &m_eventConsumed ); - m_backgroundParser->start( QThread::IdlePriority ); + m_backgroundParser->start( TQThread::IdlePriority ); // setup the driver - QString conf_file_name = specialHeaderName(); - if ( QFile::exists( conf_file_name ) ) + TQString conf_file_name = specialHeaderName(); + if ( TQFile::exists( conf_file_name ) ) m_driver->parseFile( conf_file_name, true, true, true ); m_projectDirectory = URLUtil::canonicalPath( project() ->projectDirectory() ); @@ -551,17 +551,17 @@ void CppSupportPart::projectOpened( ) embedProblemReporter(); - connect( core(), SIGNAL( configWidget( KDialogBase* ) ), - m_problemReporter, SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), + m_problemReporter, TQT_SLOT( configWidget( KDialogBase* ) ) ); - connect( project( ), SIGNAL( addedFilesToProject( const QStringList & ) ), - this, SLOT( addedFilesToProject( const QStringList & ) ) ); - connect( project( ), SIGNAL( removedFilesFromProject( const QStringList & ) ), - this, SLOT( removedFilesFromProject( const QStringList & ) ) ); - connect( project( ), SIGNAL( changedFilesInProject( const QStringList & ) ), - this, SLOT( changedFilesInProject( const QStringList & ) ) ); - connect( project(), SIGNAL( projectCompiled() ), - this, SLOT( slotProjectCompiled() ) ); + connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQT_SIGNAL( projectCompiled() ), + this, TQT_SLOT( slotProjectCompiled() ) ); m_timestamp.clear(); m_parseEmitWaiting.clear(); @@ -573,7 +573,7 @@ void CppSupportPart::projectOpened( ) m_buildSafeFileSetTimer->start( 500, true ); updateParserConfiguration(); //Necessary to respect custom include-paths and such - QTimer::singleShot( 500, this, SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); } void CppSupportPart::embedProblemReporter( bool force ) @@ -601,17 +601,17 @@ void CppSupportPart::projectClosed( ) m_projectClosing = true; - QStringList enabledPCSs; - QValueList catalogs = codeRepository() ->registeredCatalogs(); - for ( QValueList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) + TQStringList enabledPCSs; + TQValueList catalogs = codeRepository() ->registeredCatalogs(); + for ( TQValueList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { Catalog* c = *it; if ( c->enabled() ) - enabledPCSs.push_back( QFileInfo( c->dbName() ).baseName(true) ); + enabledPCSs.push_back( TQFileInfo( c->dbName() ).baseName(true) ); } DomUtil::writeListEntry( *project() ->projectDom(), "kdevcppsupport/references", "pcs", enabledPCSs ); - for ( QMap::const_iterator it = m_designers.begin(); + for ( TQMap::const_iterator it = m_designers.begin(); it != m_designers.end(); ++it ) { kdDebug( 9007 ) << "calling save settings fro designer integration" << endl; @@ -656,7 +656,7 @@ void CppSupportPart::slotNavigate() { } -void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) +void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { m_activeClass = 0; m_activeFunction = 0; @@ -682,12 +682,12 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) } } - QString text; + TQString text; int atline, atcol; MakeMemberHelper( text, atline, atcol ); if ( !text.isEmpty() ) { - id = popup->insertItem( i18n( "Make Member" ), this, SLOT( slotMakeMember() ) ); + id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) ); popup->setWhatsThis( id, i18n( "Make member

    Creates a class member function in implementation file " "based on the member declaration at the current line." ) ); } @@ -721,7 +721,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( showContextMenuExplosion ) { //kdDebug( 9007 ) << "CppSupportPart::contextMenu 1" << endl; - QString candidate; + TQString candidate; if ( isSource( m_activeFileName ) ) candidate = sourceOrHeaderCandidate(); else @@ -735,7 +735,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( !candidate.isEmpty() && codeModel() ->hasFile( candidate ) ) { - QPopupMenu * m2 = new QPopupMenu( popup ); + TQPopupMenu * m2 = new TQPopupMenu( popup ); id = popup->insertItem( i18n( "Go to Declaration" ), m2 ); popup->setWhatsThis( id, i18n( "Go to declaration

    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." ) ); @@ -746,15 +746,15 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) FunctionList functionList2 = CodeModelUtils::allFunctions( file2 ); for ( FunctionList::ConstIterator it = functionList2.begin(); it != functionList2.end(); ++it ) { - QString text = ( *it ) ->scope().join( "::" ); + TQString text = ( *it ) ->scope().join( "::" ); //kdDebug( 9007 ) << "CppSupportPart::contextMenu 3 text: " << text << endl; if ( !text.isEmpty() ) { text += "::"; } text += formatModelItem( *it, true ); - text = text.replace( QString::fromLatin1( "&" ), QString::fromLatin1( "&&" ) ); - int id = m2->insertItem( text, this, SLOT( gotoDeclarationLine( int ) ) ); + text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); + int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m2->setItemParameter( id, line ); @@ -767,7 +767,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) //kdDebug( 9007 ) << "CppSupportPart::contextMenu 4" << endl; } - QString candidate1; + TQString candidate1; if ( isHeader( m_activeFileName ) ) { candidate1 = sourceOrHeaderCandidate(); @@ -779,7 +779,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) //kdDebug( 9007 ) << "CppSupportPart::go to definition in " << candidate1 << endl; if ( codeModel() ->hasFile( candidate1 ) ) { - QPopupMenu * m = new QPopupMenu( popup ); + TQPopupMenu * m = new TQPopupMenu( popup ); id = popup->insertItem( i18n( "Go to Definition" ), m ); popup->setWhatsThis( id, i18n( "Go to definition

    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." ) ); @@ -788,14 +788,14 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) const FunctionDefinitionList functionDefinitionList = CodeModelUtils::allFunctionDefinitionsDetailed( file ).functionList; for ( FunctionDefinitionList::ConstIterator it = functionDefinitionList.begin(); it != functionDefinitionList.end(); ++it ) { - QString text = ( *it ) ->scope().join( "::" ); + TQString text = ( *it ) ->scope().join( "::" ); if ( !text.isEmpty() ) { text += "::"; } text += formatModelItem( *it, true ); - text = text.replace( QString::fromLatin1( "&" ), QString::fromLatin1( "&&" ) ); - int id = m->insertItem( text, this, SLOT( gotoLine( int ) ) ); + text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); + int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m->setItemParameter( id, line ); @@ -810,7 +810,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) } const EditorContext *econtext = static_cast( context ); - QString str = econtext->currentLine(); + TQString str = econtext->currentLine(); if ( str.isEmpty() ) return ; } @@ -821,7 +821,7 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( mcontext->item() ->isClass() ) { m_activeClass = ( ClassModel* ) mcontext->item(); - int id = popup->insertItem( i18n( "Extract Interface..." ), this, SLOT( slotExtractInterface() ) ); + int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) ); popup->setWhatsThis( id, i18n( "Extract interface

    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." ) ); } @@ -839,17 +839,17 @@ void CppSupportPart::contextMenu( QPopupMenu *popup, const Context *context ) if ( url.fileName().endsWith( ".ui" ) ) { m_contextFileName = url.path(); - int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, SLOT( slotCreateSubclass() ) ); + int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) ); popup->setWhatsThis( id, i18n( "Create or select implementation

    Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } } -QStringList makeListUnique( const QStringList& rhs ) { - QMap map; - QStringList ret; - for( QStringList::const_iterator it = rhs.begin(); it != rhs.end(); ++it ) { +TQStringList makeListUnique( const TQStringList& rhs ) { + TQMap map; + TQStringList ret; + for( TQStringList::const_iterator it = rhs.begin(); it != rhs.end(); ++it ) { if( map.find( *it ) == map.end() ) { ret << *it; map.insert( *it, true ); @@ -859,18 +859,18 @@ QStringList makeListUnique( const QStringList& rhs ) { } // Makes sure that header files come first -QStringList CppSupportPart::reorder( const QStringList &list ) +TQStringList CppSupportPart::reorder( const TQStringList &list ) { - QStringList headers, others; + TQStringList headers, others; - QStringList headerExtensions = QStringList::split( ",", "h,H,hh,hxx,hpp,tlh" ); + TQStringList headerExtensions = TQStringList::split( ",", "h,H,hh,hxx,hpp,tlh" ); - QString projectPath = project()->projectDirectory(); + TQString projectPath = project()->projectDirectory(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) { - QString filePath = *it; + TQString filePath = *it; // brilliant stuff.. this method is apparently called both with // relative and absolute paths.. if ( !filePath.startsWith("/") ) @@ -878,7 +878,7 @@ QStringList CppSupportPart::reorder( const QStringList &list ) filePath = projectPath + "/" + filePath; } if( !isValidSource( filePath ) ) continue; - if ( headerExtensions.contains( QFileInfo( filePath ).extension() ) ) + if ( headerExtensions.contains( TQFileInfo( filePath ).extension() ) ) headers << ( filePath ); else others << ( filePath ); @@ -887,14 +887,14 @@ QStringList CppSupportPart::reorder( const QStringList &list ) return makeListUnique( headers + others ); } -void CppSupportPart::addedFilesToProject( const QStringList &fileList ) +void CppSupportPart::addedFilesToProject( const TQStringList &fileList ) { m_projectFileList = project() ->allFiles(); - QStringList files = reorder( fileList ); + TQStringList files = reorder( fileList ); - for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - QString path = *it; + TQString path = *it; if (!path.startsWith("/")) path = URLUtil::canonicalPath( m_projectDirectory + "/" + ( *it ) ); @@ -904,12 +904,12 @@ void CppSupportPart::addedFilesToProject( const QStringList &fileList ) m_buildSafeFileSetTimer->start( 500, true ); } -void CppSupportPart::removedFilesFromProject( const QStringList &fileList ) +void CppSupportPart::removedFilesFromProject( const TQStringList &fileList ) { m_projectFileList = project() ->allFiles(); - for ( QStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) + for ( TQStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) { - QString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); + TQString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); kdDebug( 9007 ) << "=====================> remove file: " << path << endl; removeWithReferences( path ); @@ -918,13 +918,13 @@ void CppSupportPart::removedFilesFromProject( const QStringList &fileList ) m_buildSafeFileSetTimer->start( 500, true ); } -void CppSupportPart::changedFilesInProject( const QStringList & fileList ) +void CppSupportPart::changedFilesInProject( const TQStringList & fileList ) { - QStringList files = reorder( fileList ); + TQStringList files = reorder( fileList ); - for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - QString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); + TQString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); maybeParse( path ); //emit addedSourceInfo( path ); @@ -953,16 +953,16 @@ void CppSupportPart::savedFile( const KURL &file ) #endif } -QString CppSupportPart::findSourceFile() +TQString CppSupportPart::findSourceFile() { // get the path of the currently active document - QFileInfo fi( m_activeFileName ); - QString path = fi.filePath(); - QString ext = fi.extension(); + TQFileInfo fi( m_activeFileName ); + TQString path = fi.filePath(); + TQString ext = fi.extension(); // extract the base path (full path without '.' and extension) - QString base = path.left( path.length() - ext.length() - 1 ); - QStringList candidates; - if ( QStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) + TQString base = path.left( path.length() - ext.length() - 1 ); + TQStringList candidates; + if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) { candidates << ( base + ".c" ); candidates << ( base + ".cc" ); @@ -977,11 +977,11 @@ QString CppSupportPart::findSourceFile() candidates << ( base + "_impl.h" ); } - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = candidates.begin(); it != candidates.end(); ++it ) { kdDebug( 9007 ) << "Trying " << ( *it ) << endl; - if ( QFileInfo( *it ).exists() ) + if ( TQFileInfo( *it ).exists() ) { return * it; } @@ -989,15 +989,15 @@ QString CppSupportPart::findSourceFile() return m_activeFileName; } -QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) +TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) { - QString urlPath; + TQString urlPath; if ( url.isEmpty() ) { KTextEditor::Document * doc = dynamic_cast( partController() ->activePart() ); if ( !doc ) - return QString::null; + return TQString::null; urlPath = doc->url().path(); } else @@ -1005,34 +1005,34 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) urlPath = url.path(); } // get the path of the currently active document - QFileInfo fi( urlPath ); - QString path = fi.filePath(); + TQFileInfo fi( urlPath ); + TQString path = fi.filePath(); // extract the exension - QString ext = fi.extension(); + TQString ext = fi.extension(); if ( ext.isEmpty() ) - return QString::null; + return TQString::null; // extract the base path (full path without '.' and extension) - QString base = path.left( path.length() - ext.length() - 1 ); + TQString base = path.left( path.length() - ext.length() - 1 ); //kdDebug( 9007 ) << "base: " << base << ", ext: " << ext << endl; // just the filename without the extension - QString fileNameWoExt = fi.fileName(); + TQString fileNameWoExt = fi.fileName(); if ( !ext.isEmpty() ) fileNameWoExt.replace( "." + ext, "" ); - QString possibleExts; + TQString possibleExts; // depending on the current extension assemble a list of // candidate files to look for - QStringList candidates; + TQStringList candidates; // special case for template classes created by the new class dialog if ( path.endsWith( "_impl.h" ) ) { - QString headerpath = path; + TQString headerpath = path; headerpath.replace( "_impl.h", ".h" ); candidates << headerpath; fileNameWoExt.replace( "_impl", "" ); possibleExts = "h"; } // if file is a header file search for implementation file - else if ( QStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) + else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) { candidates << ( base + ".c" ); candidates << ( base + ".cc" ); @@ -1048,7 +1048,7 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) possibleExts = "c,cc,cpp,c++,cxx,C,m,mm,M,inl,_impl.h"; } // if file is an implementation file, search for header file - else if ( QStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).contains( ext ) ) + else if ( TQStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).contains( ext ) ) { candidates << ( base + ".h" ); candidates << ( base + ".H" ); @@ -1059,12 +1059,12 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) possibleExts = "h,H,hh,hxx,hpp,tlh"; } // search for files from the assembled candidate lists, return the first - // candidate file that actually exists or QString::null if nothing is found. - QStringList::ConstIterator it; + // candidate file that actually exists or TQString::null if nothing is found. + TQStringList::ConstIterator it; for ( it = candidates.begin(); it != candidates.end(); ++it ) { //kdDebug( 9007 ) << "Trying " << ( *it ) << endl; - if ( QFileInfo( *it ).exists() ) + if ( TQFileInfo( *it ).exists() ) { kdDebug( 9007 ) << "using: " << *it << endl; return * it; @@ -1072,10 +1072,10 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) } //kdDebug( 9007 ) << "Now searching in project files." << endl; // Our last resort: search the project file list for matching files - QStringList::iterator fileIt; - QFileInfo candidateFileWoExt; - QString candidateFileWoExtString; - QStringList possibleExtsList = QStringList::split( ',', possibleExts ); + TQStringList::iterator fileIt; + TQFileInfo candidateFileWoExt; + TQString candidateFileWoExtString; + TQStringList possibleExtsList = TQStringList::split( ',', possibleExts ); for ( fileIt = m_projectFileList.begin(); fileIt != m_projectFileList.end(); ++fileIt ) { candidateFileWoExt.setFile(*fileIt); @@ -1087,13 +1087,13 @@ QString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) if ( possibleExtsList.contains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() ) { //kdDebug( 9007 ) << "checking if " << *fileIt << " exists" << endl; - if ( QFileInfo( *fileIt ).exists() ) + if ( TQFileInfo( *fileIt ).exists() ) kdDebug( 9007 ) << "using: " << *fileIt << endl; return *fileIt; } } } - return QString::null; + return TQString::null; } void CppSupportPart::slotSaveMemory() { @@ -1137,7 +1137,7 @@ void CppSupportPart::slotSwitchHeader( bool scrollOnly ) partController() ->splitCurrentDocument( url ); } -bool CppSupportPart::switchHeaderImpl( const QString& file, int line, int col, bool scrollOnly ) +bool CppSupportPart::switchHeaderImpl( const TQString& file, int line, int col, bool scrollOnly ) { bool handled = false; @@ -1181,10 +1181,10 @@ FunctionDom CppSupportPart::findFunction( const FunctionDom& def ) } FunctionDom CppSupportPart::findFunctionInNamespace( const NamespaceDom& ns, const FunctionDom& def, const std::set& nsImports, - const QString& candidateFile, int scopeIndex, FunctionDom& bestMatch ) + const TQString& candidateFile, int scopeIndex, FunctionDom& bestMatch ) { FunctionDom d; - QStringList scope = def->scope(); + TQStringList scope = def->scope(); if ( !(scopeIndex >= (signed) scope.size()) ) { NamespaceDom ns_next = ns->namespaceByName( scope[ scopeIndex ] ); if ( ns_next ) { @@ -1231,10 +1231,10 @@ FunctionDom CppSupportPart::findFunctionInNamespace( const NamespaceDom& ns, con } FunctionDom CppSupportPart::findFunctionInClass( const ClassDom& cs, const FunctionDom& def, const std::set& nsImports, - const QString& candidateFile, int scopeIndex, FunctionDom& bestMatch ) + const TQString& candidateFile, int scopeIndex, FunctionDom& bestMatch ) { FunctionDom d; - QStringList scope = def->scope(); + TQStringList scope = def->scope(); if ( !(scopeIndex >= (signed) scope.size()) ) { ClassList classList = cs->classByName( scope[ scopeIndex ] ); for ( ClassList::ConstIterator it_cs = classList.begin(); it_cs != classList.end(); ) { @@ -1270,7 +1270,7 @@ FunctionDom CppSupportPart::findFunctionDefinition( const FunctionDom& decl ) // Since the definition can be the child of any namespace in its scope depending on syntax, we have to check every one. FunctionDom def, bestMatch; NamespaceDom ns = codeModel()->globalNamespace(); - QString candidateFile = sourceOrHeaderCandidate( decl->fileName() ); + TQString candidateFile = sourceOrHeaderCandidate( decl->fileName() ); FunctionDefinitionList functionList = ns->functionDefinitionByName( decl->name() ); for ( FunctionDefinitionList::ConstIterator it_def = functionList.begin(); it_def != functionList.end() && !def; ++it_def ) { if ( CodeModelUtils::compareDeclarationToDefinition( decl, *it_def, ns->namespaceImports() ) ) { @@ -1288,8 +1288,8 @@ FunctionDom CppSupportPart::findFunctionDefinition( const FunctionDom& decl ) } } } - QStringList scope = decl->scope(); - for ( QStringList::ConstIterator it_scope = scope.begin(); it_scope != scope.end() && !def; ++it_scope ) { + TQStringList scope = decl->scope(); + for ( TQStringList::ConstIterator it_scope = scope.begin(); it_scope != scope.end() && !def; ++it_scope ) { NamespaceDom ns_next = ns->namespaceByName( *it_scope ); if ( ns_next ) { ns = ns_next; @@ -1351,15 +1351,15 @@ KDevLanguageSupport::Features CppSupportPart::features() return Features ( Structs | Functions | Variables | Declarations ); } -QString CppSupportPart::formatClassName( const QString &name ) +TQString CppSupportPart::formatClassName( const TQString &name ) { - QString n = name; + TQString n = name; return n.replace( ".", "::" ); } -QString CppSupportPart::unformatClassName( const QString &name ) +TQString CppSupportPart::unformatClassName( const TQString &name ) { - QString n = name; + TQString n = name; return n.replace( "::", "." ); } @@ -1372,7 +1372,7 @@ bool CppSupportPart::shouldSplitDocument(const KURL &url) KURL::List::ConstIterator it = list.begin(); while ( it != list.end() ) { - QString candidate = sourceOrHeaderCandidate( ( *it ) ); + TQString candidate = sourceOrHeaderCandidate( ( *it ) ); if ( candidate.isEmpty() ) { ++it; @@ -1395,7 +1395,7 @@ bool CppSupportPart::shouldSplitDocument(const KURL &url) Qt::Orientation CppSupportPart::splitOrientation() const { - QString o = splitHeaderSourceConfig()->orientation(); + TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) return Qt::Vertical; else @@ -1467,29 +1467,29 @@ bool CppSupportPart::parseProject( bool force ) kapp->setOverrideCursor( waitCursor ); _jd = new JobData; - if( QFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower() + if( TQFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower() + ".kdevelop.pcs" ).exists()) { - QDir d( project() ->projectDirectory()); + TQDir d( project() ->projectDirectory()); d.rename(project() ->projectName().lower() + ".kdevelop.pcs", project() ->projectName() +".kdevelop.pcs"); } _jd->file.setName( project() ->projectDirectory() + "/" + project()->projectName() + ".kdevelop.pcs" ); - QString skip_file_name = project() ->projectDirectory() + "/" + + TQString skip_file_name = project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.ignore_pcs"; - QString skip_lower_file_name = project() ->projectDirectory() + "/" + + TQString skip_lower_file_name = project() ->projectDirectory() + "/" + project() ->projectName().lower() + ".kdevelop.ignore_pcs"; - if ( !force && !QFile::exists( skip_file_name ) && - !QFile::exists( skip_lower_file_name ) && _jd->file.open( IO_ReadOnly ) ) + if ( !force && !TQFile::exists( skip_file_name ) && + !TQFile::exists( skip_lower_file_name ) && _jd->file.open( IO_ReadOnly ) ) { _jd->stream.setDevice( &( _jd->file ) ); createIgnorePCSFile(); - QString sig; + TQString sig; int pcs_version = 0; _jd->stream >> sig >> pcs_version; if ( sig == "PCS" && pcs_version == KDEV_PCS_VERSION ) @@ -1501,7 +1501,7 @@ bool CppSupportPart::parseProject( bool force ) for ( int i = 0; i < numFiles; ++i ) { - QString fn; + TQString fn; uint ts; uint offset; @@ -1513,7 +1513,7 @@ bool CppSupportPart::parseProject( bool force ) _jd->files = reorder( modifiedFileList() ); - QProgressBar* bar = new QProgressBar( _jd->files.count( ), mainWindow( ) ->statusBar( ) ); + TQProgressBar* bar = new TQProgressBar( _jd->files.count( ), mainWindow( ) ->statusBar( ) ); bar->setMinimumWidth( 120 ); bar->setCenterIndicator( true ); mainWindow( ) ->statusBar( ) ->addWidget( bar ); @@ -1522,11 +1522,11 @@ bool CppSupportPart::parseProject( bool force ) _jd->progressBar = bar; _jd->dir.setPath( m_projectDirectory ); _jd->it = _jd->files.begin(); - _jd->reparseList = QStringList(); + _jd->reparseList = TQStringList(); _jd->backgroundCount = 0; _jd->cycle = 0; - QTimer::singleShot( 0, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); m_saveMemoryTimer->stop(); //Do not regularly remove cached files that may still be needed while parsing(the cache anyway be full for the whole parsing-process) return true; @@ -1544,15 +1544,15 @@ void CppSupportPart::slotParseFiles() { _jd->progressBar->setProgress( _jd->progressBar->progress() + 1 ); - QFileInfo fileInfo( _jd->dir, *( _jd->it ) ); + TQFileInfo fileInfo( _jd->dir, *( _jd->it ) ); if ( fileInfo.exists() && fileInfo.isFile() && fileInfo.isReadable() ) { - QString absFilePath = URLUtil::canonicalPath( fileInfo.absFilePath() ); + TQString absFilePath = URLUtil::canonicalPath( fileInfo.absFilePath() ); if ( isValidSource( absFilePath ) ) { - QDateTime t = fileInfo.lastModified(); + TQDateTime t = fileInfo.lastModified(); if ( ! ( m_timestamp.contains( absFilePath ) && m_timestamp[ absFilePath ] == t ) ) { @@ -1583,7 +1583,7 @@ void CppSupportPart::slotParseFiles() } ++( _jd->it ); - QTimer::singleShot( 0, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); if( _jd->it == _jd->files.end()) { if( _jd->reparseList.isEmpty() ) { @@ -1603,7 +1603,7 @@ void CppSupportPart::slotParseFiles() _jd->lastBackgroundState = -1; _jd->backgroundState = 0; _jd->cycle = 1; - _jd->lastParse = QTime::currentTime(); + _jd->lastParse = TQTime::currentTime(); kapp->restoreOverrideCursor( ); } } @@ -1618,10 +1618,10 @@ void CppSupportPart::slotParseFiles() kapp->restoreOverrideCursor( ); emit updatedSourceInfo(); mainWindow( ) ->statusBar( ) ->message( i18n( "Done" ), 2000 ); - QFile::remove( project() ->projectDirectory() + TQFile::remove( project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.ignore_pcs" ); - QFile::remove( project() ->projectDirectory() + TQFile::remove( project() ->projectDirectory() + "/" + project() ->projectName().lower() + ".kdevelop.ignore_pcs" ); @@ -1637,13 +1637,13 @@ void CppSupportPart::slotParseFiles() } else { _jd->progressBar->setProgress( _jd->backgroundState ); ///restart _jd->progressBar->setTotalSteps( _jd->backgroundCount ); - if( _jd->lastParse.msecsTo( QTime::currentTime()) > 60000 && !m_backgroundParser->filesInQueue()) { + if( _jd->lastParse.msecsTo( TQTime::currentTime()) > 60000 && !m_backgroundParser->filesInQueue()) { _jd->backgroundCount = _jd->backgroundState; ///Stop waiting if there is no progress and no file in the background-parser - QTimer::singleShot( 0, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); } else { int timeStep = 0; if( alwaysParseInBackground ) { - QTimer::singleShot( 10, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 10, this, TQT_SLOT( slotParseFiles() ) ); } else { if( _jd->it == _jd->reparseList.end() ) { /*_jd->it = _jd->files.end(); @@ -1651,7 +1651,7 @@ void CppSupportPart::slotParseFiles() timeStep = 1; } else { /*///Parse the files one by one - if( _jd->lastParse.msecsTo( QTime::currentTime()) > 100 || _jd->backgroundState != _jd->lastBackgroundState ) {*/ + if( _jd->lastParse.msecsTo( TQTime::currentTime()) > 100 || _jd->backgroundState != _jd->lastBackgroundState ) {*/ maybeParse( *_jd->it, false ); ++(_jd->it); _jd->lastBackgroundState = _jd->backgroundState; @@ -1659,41 +1659,41 @@ void CppSupportPart::slotParseFiles() timeStep = 1; }*/ } - QTimer::singleShot( timeStep, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( timeStep, this, TQT_SLOT( slotParseFiles() ) ); } } } } } -void CppSupportPart::maybeParse( const QString& fn, bool background ) +void CppSupportPart::maybeParse( const TQString& fn, bool background ) { if ( !isValidSource( fn ) ) return ; - QFileInfo fileInfo( fn ); - QString path = URLUtil::canonicalPath( fn ); - QDateTime t = fileInfo.lastModified(); + TQFileInfo fileInfo( fn ); + TQString path = URLUtil::canonicalPath( fn ); + TQDateTime t = fileInfo.lastModified(); if ( !fileInfo.exists() ) return; - QMap::Iterator it = m_timestamp.find( path ); + TQMap::Iterator it = m_timestamp.find( path ); if ( codeModel()->hasFile( fn ) && it != m_timestamp.end() && *it == t ) return; - QStringList l; + TQStringList l; l << fn; parseFilesAndDependencies( l, background ); } -bool CppSupportPart::isQueued( const QString& file ) const { +bool CppSupportPart::isQueued( const TQString& file ) const { //int c = m_backgroundParser->countInQueue( file ); //if( c == 0 ) return false; return m_parseEmitWaiting.waiting( file, ParseEmitWaiting::Silent, 2 ); //Since it may be possible that the background-parser is currently parsing the file(in an obselete state), it is allowed to have the file in the queue twice. } -void CppSupportPart::slotNeedTextHint( int line, int column, QString& textHint ) +void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint ) { if ( 1 || !m_activeEditor ) return ; @@ -1723,7 +1723,7 @@ void CppSupportPart::slotNeedTextHint( int line, int column, QString& textHint ) m_backgroundParser->unlock(); } -void CppSupportPart::MakeMemberHelper( QString& text, int& atLine, int& atColumn ) +void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColumn ) { if ( !m_activeViewCursor || !m_valid ) return ; @@ -1731,7 +1731,7 @@ void CppSupportPart::MakeMemberHelper( QString& text, int& atLine, int& atColumn atLine = -2; atColumn = 0; - QString implFile = findSourceFile(); + TQString implFile = findSourceFile(); m_backgroundParser->lock(); TranslationUnitAST* translationUnit = *m_backgroundParser->translationUnit( m_activeFileName ); @@ -1767,33 +1767,33 @@ void CppSupportPart::MakeMemberHelper( QString& text, int& atLine, int& atColumn if ( !fail && decl && declarator && declarator->parameterDeclarationClause() ) { - QStringList scope; + TQStringList scope; scopeOfNode( decl, scope ); - QString scopeStr = scope.join( "::" ); + TQString scopeStr = scope.join( "::" ); if ( !scopeStr.isEmpty() ) scopeStr += "::"; - QString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace(); + TQString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace(); if ( declarator->exceptionSpecification() ) { - declStr += QString::fromLatin1( " throw( " ); - QPtrList l = declarator->exceptionSpecification() ->nodeList(); - QPtrListIterator type_it( l ); + declStr += TQString::fromLatin1( " throw( " ); + TQPtrList l = declarator->exceptionSpecification() ->nodeList(); + TQPtrListIterator type_it( l ); while ( type_it.current() ) { declStr += type_it.current() ->text(); ++type_it; if ( type_it.current() ) - declStr += QString::fromLatin1( ", " ); + declStr += TQString::fromLatin1( ", " ); } - declStr += QString::fromLatin1( " )" ); + declStr += TQString::fromLatin1( " )" ); } text += "\n\n"; - QString type = typeSpecToString( decl->typeSpec() ); + TQString type = typeSpecToString( decl->typeSpec() ); text += type; if ( !type.isNull() ) text += + " "; @@ -1815,18 +1815,18 @@ void CppSupportPart::MakeMemberHelper( QString& text, int& atLine, int& atColumn void CppSupportPart::slotMakeMember() { - QString text; + TQString text; int atColumn, atLine; MakeMemberHelper( text, atLine, atColumn ); if ( !text.isEmpty() ) { - QString implFile = findSourceFile(); + TQString implFile = findSourceFile(); if ( !implFile.isEmpty() ) { partController() ->editDocument( KURL( implFile ) ); - kapp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput | QEventLoop::ExcludeSocketNotifiers, 500 ); + kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 ); } if ( atLine == -2 ) atLine = m_activeEditor->numLines() - 1; @@ -1845,17 +1845,17 @@ void CppSupportPart::slotMakeMember() } } -QStringList CppSupportPart::subclassWidget( const QString& formName ) +TQStringList CppSupportPart::subclassWidget( const TQString& formName ) { - QStringList newFileNames; + TQStringList newFileNames; SubclassingDlg *dlg = new SubclassingDlg( this, formName, newFileNames ); dlg->exec(); return newFileNames; } -QStringList CppSupportPart::updateWidget( const QString& formName, const QString& fileName ) +TQStringList CppSupportPart::updateWidget( const TQString& formName, const TQString& fileName ) { - QStringList dummy; + TQStringList dummy; SubclassingDlg *dlg = new SubclassingDlg( this, formName, fileName, dummy ); dlg->exec(); return dummy; @@ -1868,11 +1868,11 @@ void CppSupportPart::partRemoved( KParts::Part* part ) if ( KTextEditor::Document * doc = dynamic_cast( part ) ) { - QString fileName = doc->url().path(); + TQString fileName = doc->url().path(); if ( !isValidSource( fileName ) ) return ; - QString canonicalFileName = URLUtil::canonicalPath( fileName ); + TQString canonicalFileName = URLUtil::canonicalPath( fileName ); m_backgroundParser->removeFile( canonicalFileName ); m_backgroundParser->addFile( canonicalFileName, true ); } @@ -1884,26 +1884,26 @@ void CppSupportPart::slotProjectCompiled() parseProject(); } -QStringList CppSupportPart::modifiedFileList() +TQStringList CppSupportPart::modifiedFileList() { - QStringList lst; + TQStringList lst; - QStringList fileList = m_projectFileList; - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = m_projectFileList; + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { - QString fileName = *it; + TQString fileName = *it; ++it; - QFileInfo fileInfo( m_projectDirectory, fileName ); - QString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); + TQFileInfo fileInfo( m_projectDirectory, fileName ); + TQString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); if ( !( isSource( path ) || isHeader( path ) ) ) continue; - QDateTime t = fileInfo.lastModified(); + TQDateTime t = fileInfo.lastModified(); - QMap::Iterator dictIt = m_timestamp.find( path ); + TQMap::Iterator dictIt = m_timestamp.find( path ); if ( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t ) continue; @@ -1918,8 +1918,8 @@ KTextEditor::Document * CppSupportPart::findDocument( const KURL & url ) if ( !partController() ->parts() ) return 0; - QPtrList parts( *partController() ->parts() ); - QPtrListIterator it( parts ); + TQPtrList parts( *partController() ->parts() ); + TQPtrListIterator it( parts ); while ( KParts::Part * part = it.current() ) { KTextEditor::Document * doc = dynamic_cast( part ); @@ -1936,16 +1936,16 @@ void CppSupportPart::setupCatalog( ) kdDebug( 9007 ) << "CppSupportPart::setupCatalog()" << endl; KStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); - QStringList pcsList = dirs->findAllResources( "pcs", "*.db", false, true ); - QStringList pcsIdxList = dirs->findAllResources( "pcs", "*.idx", false, true ); + TQStringList pcsList = dirs->findAllResources( "pcs", "*.db", false, true ); + TQStringList pcsIdxList = dirs->findAllResources( "pcs", "*.idx", false, true ); - QStringList enabledPCSs; + TQStringList enabledPCSs; if ( DomUtil::elementByPath( *project() ->projectDom(), "kdevcppsupport/references" ).isNull() ) { - for ( QStringList::Iterator it = pcsList.begin(); it != pcsList.end(); ++it ) + for ( TQStringList::Iterator it = pcsList.begin(); it != pcsList.end(); ++it ) { kdDebug( 9007 ) << "CppSupportPart::setupCatalog()1 " << *it << endl; - enabledPCSs.push_back( QFileInfo( *it ).baseName(true) ); + enabledPCSs.push_back( TQFileInfo( *it ).baseName(true) ); } } else @@ -1953,18 +1953,18 @@ void CppSupportPart::setupCatalog( ) enabledPCSs = DomUtil::readListEntry( *project() ->projectDom(), "kdevcppsupport/references", "pcs" ); } - QStringList indexList = QStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; + TQStringList indexList = TQStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; if ( pcsList.size() && pcsVersion() < KDEV_DB_VERSION ) { - QStringList l = pcsList + pcsIdxList; + TQStringList l = pcsList + pcsIdxList; int rtn = KMessageBox::questionYesNoList( 0, i18n( "Persistent class store will be disabled: you have a wrong version of pcs installed.\nRemove old pcs files?" ), l, i18n( "C++ Support" ), KStdGuiItem::del(), KStdGuiItem::cancel() ); if ( rtn == KMessageBox::Yes ) { - QStringList::Iterator it = l.begin(); + TQStringList::Iterator it = l.begin(); while ( it != l.end() ) { - QFile::remove + TQFile::remove ( *it ); ++it; } @@ -1977,16 +1977,16 @@ void CppSupportPart::setupCatalog( ) } } - QStringList::Iterator it = pcsList.begin(); + TQStringList::Iterator it = pcsList.begin(); while ( it != pcsList.end() ) { kdDebug( 9007 ) << "CppSupportPart::setupCatalog()2 " << *it << endl; Catalog * catalog = new Catalog(); catalog->open( *it ); - catalog->setEnabled( enabledPCSs.contains( QFileInfo( *it ).baseName(true) ) ); + catalog->setEnabled( enabledPCSs.contains( TQFileInfo( *it ).baseName(true) ) ); ++it; - for ( QStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) + for ( TQStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) catalog->addIndex( ( *idxIt ).utf8() ); m_catalogList.append( catalog ); @@ -1998,12 +1998,12 @@ void CppSupportPart::setupCatalog( ) KMimeType::List CppSupportPart::mimeTypes( ) { - QStringList mimeList; + TQStringList mimeList; mimeList += m_headerMimeTypes; mimeList += m_sourceMimeTypes; KMimeType::List list; - for ( QStringList::Iterator it = mimeList.begin(); it != mimeList.end(); ++it ) + for ( TQStringList::Iterator it = mimeList.begin(); it != mimeList.end(); ++it ) { if ( KMimeType::Ptr mime = KMimeType::mimeType( *it ) ) list << mime; @@ -2027,17 +2027,17 @@ void CppSupportPart::setPcsVersion( int version ) config->sync(); } -QString CppSupportPart::formatTag( const Tag & inputTag ) +TQString CppSupportPart::formatTag( const Tag & inputTag ) { Tag tag = inputTag; switch ( tag.kind() ) { case Tag::Kind_Namespace: - return QString::fromLatin1( "namespace " ) + tag.name(); + return TQString::fromLatin1( "namespace " ) + tag.name(); case Tag::Kind_Class: - return QString::fromLatin1( "class " ) + tag.name(); + return TQString::fromLatin1( "class " ) + tag.name(); case Tag::Kind_Function: case Tag::Kind_FunctionDeclaration: @@ -2075,14 +2075,14 @@ void CppSupportPart::codeCompletionConfigStored( ) void CppSupportPart::splitHeaderSourceConfigStored( ) { - QString o = splitHeaderSourceConfig()->orientation(); + TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) emit splitOrientationChanged( Qt::Vertical ); else if ( o == "Horizontal" ) emit splitOrientationChanged( Qt::Horizontal ); } -void CppSupportPart::removeWithReferences( const QString & fileName ) +void CppSupportPart::removeWithReferences( const TQString & fileName ) { kdDebug( 9007 ) << "remove with references: " << fileName << endl; m_timestamp.remove( fileName ); @@ -2094,23 +2094,23 @@ kdDebug( 9007 ) << "remove with references: " << fileName << endl; codeModel() ->removeFile( codeModel() ->fileByName( fileName ) ); } -bool CppSupportPart::isValidSource( const QString& fileName ) const +bool CppSupportPart::isValidSource( const TQString& fileName ) const { - QFileInfo fileInfo( fileName ); - QString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); + TQFileInfo fileInfo( fileName ); + TQString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); return /*project() && project() ->isProjectFile( path ) &&*/ ( isSource( path ) || isHeader( path ) ) - && !QFile::exists( fileInfo.dirPath( true ) + "/.kdev_ignore" ); + && !TQFile::exists( fileInfo.dirPath( true ) + "/.kdev_ignore" ); } -QString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription ) +TQString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription ) { if ( item->isFunction() || item->isFunctionDefinition() ) { const FunctionModel * model = static_cast( item ); - QString function; - QString args; + TQString function; + TQString args; ArgumentList argumentList = model->argumentList(); for ( ArgumentList::const_iterator it = argumentList.begin(); it != argumentList.end(); ++it ) { @@ -2118,10 +2118,10 @@ QString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortDe args += formatModelItem( ( *it ).data() ); } if ( !shortDescription ) - function += ( model->isVirtual() ? QString( "virtual " ) : QString( "" ) ) + model->resultType() + " "; + function += ( model->isVirtual() ? TQString( "virtual " ) : TQString( "" ) ) + model->resultType() + " "; - function += model->name() + "(" + args + ")" + ( model->isConstant() ? QString( " const" ) : QString( "" ) ) + - ( model->isAbstract() ? QString( " = 0" ) : QString( "" ) ); + function += model->name() + "(" + args + ")" + ( model->isConstant() ? TQString( " const" ) : TQString( "" ) ) + + ( model->isAbstract() ? TQString( " = 0" ) : TQString( "" ) ); return function; } @@ -2135,12 +2135,12 @@ QString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortDe else if ( item->isArgument() ) { const ArgumentModel * model = static_cast( item ); - QString arg; + TQString arg; if ( !shortDescription ) arg += model->type() + " "; arg += model->name(); if ( !shortDescription ) - arg += model->defaultValue().isEmpty() ? QString( "" ) : QString( " = " ) + model->defaultValue(); + arg += model->defaultValue().isEmpty() ? TQString( "" ) : TQString( " = " ) + model->defaultValue(); return arg.stripWhiteSpace(); } else @@ -2159,7 +2159,7 @@ void CppSupportPart::saveProjectSourceInfo() if ( !project() || fileList.isEmpty() ) return ; - QFile f( project() ->projectDirectory() + "/" + TQFile f( project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.pcs" ); if ( !f.open( IO_WriteOnly ) ) return ; @@ -2168,10 +2168,10 @@ void CppSupportPart::saveProjectSourceInfo() createIgnorePCSFile(); - QDataStream stream( &f ); - QMap offsets; + TQDataStream stream( &f ); + TQMap offsets; - QString pcs( "PCS" ); + TQString pcs( "PCS" ); stream << pcs << KDEV_PCS_VERSION; stream << int( fileList.size() ); @@ -2200,22 +2200,22 @@ void CppSupportPart::saveProjectSourceInfo() stream.device() ->at( end ); } - QFile::remove( project() ->projectDirectory() + "/" + TQFile::remove( project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.ignore_pcs" ); - QFile::remove( project() ->projectDirectory() + "/" + TQFile::remove( project() ->projectDirectory() + "/" + project() ->projectName().lower() + ".kdevelop.ignore_pcs" ); m_backgroundParser->unlock(); } -QString CppSupportPart::extractInterface( const ClassDom& klass ) +TQString CppSupportPart::extractInterface( const ClassDom& klass ) { - QString txt; - QTextStream stream( &txt, IO_WriteOnly ); + TQString txt; + TQTextStream stream( &txt, IO_WriteOnly ); - QString name = klass->name() + "Interface"; - QString ind; - ind.fill( QChar( ' ' ), 4 ); + TQString name = klass->name() + "Interface"; + TQString ind; + ind.fill( TQChar( ' ' ), 4 ); stream << "class " << name << "\n" @@ -2255,21 +2255,21 @@ void CppSupportPart::slotExtractInterface( ) if ( !m_activeClass ) return ; - QFileInfo fileInfo( m_activeClass->fileName() ); - QString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h"; - if ( QFile::exists( ifaceFileName ) ) + TQFileInfo fileInfo( m_activeClass->fileName() ); + TQString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h"; + if ( TQFile::exists( ifaceFileName ) ) { KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).arg( ifaceFileName ), i18n( "C++ Support" ) ); } else { - QString text = extractInterface( m_activeClass ); + TQString text = extractInterface( m_activeClass ); - QFile f( ifaceFileName ); + TQFile f( ifaceFileName ); if ( f.open( IO_WriteOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); stream << "#ifndef __" << m_activeClass->name().upper() << "_INTERFACE_H" << "\n" << "#define __" << m_activeClass->name().upper() << "_INTERFACE_H" << "\n" @@ -2298,19 +2298,19 @@ void CppSupportPart::gotoLine( int line ) m_activeViewCursor->setCursorPositionReal( line, 0 ); } -FileDom CppSupportPart::fileByName( const QString& name) { +FileDom CppSupportPart::fileByName( const TQString& name) { return codeModel()->fileByName( name ); } -int CppSupportPart::parseFilesAndDependencies( QStringList files, bool background, bool parseFirst, bool silent ) { - QMap fileGroups; +int CppSupportPart::parseFilesAndDependencies( TQStringList files, bool background, bool parseFirst, bool silent ) { + TQMap fileGroups; int nextGroup = 0; - for( QStringList::iterator it = files.begin(); it != files.end(); ++it ) { + for( TQStringList::iterator it = files.begin(); it != files.end(); ++it ) { FileDom d = fileByName( *it ); - QStringList lst; + TQStringList lst; if( !d ) { lst << *it; }else{ @@ -2326,20 +2326,20 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun if( fileGroups.find( *it ) != fileGroups.end() ) cgroup = fileGroups[*it]; - for( QStringList::iterator lit = lst.begin(); lit != lst.end(); ++lit ) + for( TQStringList::iterator lit = lst.begin(); lit != lst.end(); ++lit ) fileGroups[*lit] = cgroup; } - QValueVector groups; + TQValueVector groups; groups.resize( nextGroup ); ///put the groups together - for( QMap::iterator it = fileGroups.begin(); it != fileGroups.end(); ++it ) { + for( TQMap::iterator it = fileGroups.begin(); it != fileGroups.end(); ++it ) { groups[*it] << it.key(); } for( int a = 0; a < nextGroup; a++ ) { - QStringList group = reorder( groups[a] ); + TQStringList group = reorder( groups[a] ); /* kdDebug( 9007 ) << "reparsing the following group: " << ":\n" << group.join("\n") << "\n\n";*/ @@ -2361,7 +2361,7 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun } if( parseFirst && !group.empty() ) { - for(QStringList::iterator it = --group.end(); it != group.end(); ) { + for(TQStringList::iterator it = --group.end(); it != group.end(); ) { backgroundParser()->addFileFront(*it); if( it == group.begin() ) { it = group.end(); @@ -2370,7 +2370,7 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun } } } else { - for(QStringList::iterator it = group.begin(); it != group.end(); ++it) { + for(TQStringList::iterator it = group.begin(); it != group.end(); ++it) { backgroundParser()->addFile(*it); } } @@ -2378,7 +2378,7 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun m_backgroundParser->unlock(); } else { - for(QStringList::iterator it = group.begin(); it != group.end(); ++it) { + for(TQStringList::iterator it = group.begin(); it != group.end(); ++it) { m_driver->parseFile( *it ); } } @@ -2387,7 +2387,7 @@ int CppSupportPart::parseFilesAndDependencies( QStringList files, bool backgroun return fileGroups.count(); } -int CppSupportPart::parseFileAndDependencies( const QString & fileName, bool background, bool parseFirst, bool silent ) { +int CppSupportPart::parseFileAndDependencies( const TQString & fileName, bool background, bool parseFirst, bool silent ) { if(! isValidSource( fileName ) ) return 0; // kdDebug( 9007 ) << "reparsing dependencies of " << fileName << "\n"; @@ -2400,7 +2400,7 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { bool modelHasFiles = true; - for( QStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) { + for( TQStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) { if( !codeModel()->hasFile( *it ) ) modelHasFiles = false; } @@ -2409,16 +2409,16 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { if( (files.flag & ParseEmitWaiting::HadErrors) && modelHasFiles && !files.hasFlag( ParseEmitWaiting::Silent ) ) { mainWindow() ->statusBar() ->message( "File parsed, but not updating code-model because of errors", 2000 ); kdDebug( 9007 ) << "not updating code-model because at least one file has errors" << endl; - // for( QStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) + // for( TQStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) // m_backgroundParser->removeFile( *it ); } else { ///update timestamps - for( QStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) { + for( TQStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) { if( !codeModel()->hasFile( *it ) ) modelHasFiles = false; - QString& fileName = *it; + TQString& fileName = *it; - QFileInfo fileInfo( fileName ); - QString path = URLUtil::canonicalPath( fileName ); + TQFileInfo fileInfo( fileName ); + TQString path = URLUtil::canonicalPath( fileName ); if ( !fileInfo.exists() ) { removeWithReferences( path ); @@ -2433,15 +2433,15 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { m_backgroundParser->lock(); - QStringList l = files.res; + TQStringList l = files.res; - QMap wholeResult; - QStringList missing; + TQMap wholeResult; + TQStringList missing; - QMap newFiles; + TQMap newFiles; while(!l.isEmpty() ) { - QString fileName = l.front(); + TQString fileName = l.front(); if( !m_backgroundParser->hasTranslationUnit( fileName ) ) { kdDebug( 9007 ) << "error: translation-unit is missing: " << fileName << endl; @@ -2462,8 +2462,8 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { newFiles[fileName] = walker.file(); ///update timestamps - QFileInfo fileInfo( fileName ); - QString path = URLUtil::canonicalPath( fileName ); + TQFileInfo fileInfo( fileName ); + TQString path = URLUtil::canonicalPath( fileName ); m_timestamp[ path ] = fileInfo.lastModified(); } else { @@ -2471,8 +2471,8 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { } if( walker.file() ) { - QStringList grp = walker.file()->wholeGroupStrings(); - for( QStringList::const_iterator it = grp.begin(); it != grp.end(); ++it ) + TQStringList grp = walker.file()->wholeGroupStrings(); + for( TQStringList::const_iterator it = grp.begin(); it != grp.end(); ++it ) wholeResult[*it] = true; } } @@ -2486,7 +2486,7 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { } bool canUpdate = true; - for( QMap::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { + for( TQMap::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { FileDom oldFile = codeModel()->fileByName( it.key() ); if( !oldFile || !oldFile->canUpdate( *it ) ) { @@ -2497,14 +2497,14 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { if( canUpdate ) { ///Update the code-model - for( QMap::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { + for( TQMap::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { FileDom oldFile = codeModel()->fileByName( it.key() ); oldFile->update( *it ); codeModel()->mergeGroups( oldFile->groupId(), (*it)->groupId() ); ///Merge parsing-groups together } } else { ///Remove the current files and replace them with the new ones - for( QMap::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { + for( TQMap::const_iterator it = newFiles.begin(); it != newFiles.end(); ++it ) { removeWithReferences( it.key() ); codeModel()->addFile( *it ); } @@ -2513,7 +2513,7 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { ///make the list unique l.clear(); - for( QMap::const_iterator it = wholeResult.begin(); it != wholeResult.end(); ++it ) + for( TQMap::const_iterator it = wholeResult.begin(); it != wholeResult.end(); ++it ) l << it.key();*/ m_backgroundParser->unlock(); @@ -2526,11 +2526,11 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { if( files.hasFlag( ParseEmitWaiting::Silent ) ) { if( alwaysParseInBackground ) - for( QStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) + for( TQStringList::iterator it = files.res.begin(); it != files.res.end(); ++it ) m_backgroundParser->removeFile( *it ); } else { if( !canUpdate ) { ///If the current model could be updated, do not emit addedSourceInfo(..) and remove the units from the parser, because nobody will be using them - QStringList l = files.res; + TQStringList l = files.res; while(!l.isEmpty() ) { emit aboutToRemoveSourceInfo( l.front() ); emit removedSourceInfo( l.front() ); @@ -2541,7 +2541,7 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { if( !files.hasFlag( ParseEmitWaiting::Silent ) ) emitFileParsed( files ); } else { - QStringList l = files.res; + TQStringList l = files.res; while( !l.isEmpty() ) { emit codeModelUpdated( l.front() ); emit aboutToRemoveSourceInfo( l.front() ); @@ -2555,16 +2555,16 @@ void CppSupportPart::parseEmit( ParseEmitWaiting::Processed files ) { } } -/*void CppSupportPart::recomputeCodeModel( const QString& fileName ) +/*void CppSupportPart::recomputeCodeModel( const TQString& fileName ) {*/ //} -void CppSupportPart::emitSynchronousParseReady( const QString& file, ParsedFilePointer unit ) { +void CppSupportPart::emitSynchronousParseReady( const TQString& file, ParsedFilePointer unit ) { emit synchronousParseReady( file, unit ); } -void CppSupportPart::emitFileParsed( QStringList l ) +void CppSupportPart::emitFileParsed( TQStringList l ) { while( !l.isEmpty() ) { emit fileParsed( l.front() ); @@ -2572,22 +2572,22 @@ void CppSupportPart::emitFileParsed( QStringList l ) } } -bool CppSupportPart::isHeader( const QString& fileName ) const +bool CppSupportPart::isHeader( const TQString& fileName ) const { /*KMimeType::Ptr ptr = KMimeType::findByPath( fileName ); if ( ptr && m_headerMimeTypes.contains( ptr->name() ) ) return true;*/ - return ( m_headerExtensions.findIndex( QFileInfo( fileName ).extension() ) != -1 ); + return ( m_headerExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 ); } -bool CppSupportPart::isSource( const QString& fileName ) const +bool CppSupportPart::isSource( const TQString& fileName ) const { /*KMimeType::Ptr ptr = KMimeType::findByPath( fileName ); if ( ptr && m_sourceMimeTypes.contains( ptr->name() ) ) return true;*/ - return ( m_sourceExtensions.findIndex( QFileInfo( fileName ).extension() ) != -1 ); + return ( m_sourceExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 ); } void CppSupportPart::gotoDeclarationLine( int line ) @@ -2602,14 +2602,14 @@ void CppSupportPart::gotoDeclarationLine( int line ) } } -void CppSupportPart::removeCatalog( const QString & dbName ) +void CppSupportPart::removeCatalog( const TQString & dbName ) { - if ( !QFile::exists( dbName ) ) + if ( !TQFile::exists( dbName ) ) return ; - QValueList catalogs = codeRepository() ->registeredCatalogs(); + TQValueList catalogs = codeRepository() ->registeredCatalogs(); Catalog* c = 0; - for ( QValueList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) + for ( TQValueList::Iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { if ( ( *it ) ->dbName() == dbName ) { @@ -2624,15 +2624,15 @@ void CppSupportPart::removeCatalog( const QString & dbName ) m_catalogList.remove( c ); } - QFileInfo fileInfo( dbName ); - QDir dir( fileInfo.dir( true ) ); - QStringList indexList = QStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; - for(QStringList::Iterator iter = indexList.begin(); iter != indexList.end(); iter++) + TQFileInfo fileInfo( dbName ); + TQDir dir( fileInfo.dir( true ) ); + TQStringList indexList = TQStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; + for(TQStringList::Iterator iter = indexList.begin(); iter != indexList.end(); iter++) { - QStringList fileList = dir.entryList( fileInfo.baseName(true) +"." +(*iter) + ".idx" ); - for ( QStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) + TQStringList fileList = dir.entryList( fileInfo.baseName(true) +"." +(*iter) + ".idx" ); + for ( TQStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it ) { - QString idxName = fileInfo.dirPath( true ) + "/" + *it; + TQString idxName = fileInfo.dirPath( true ) + "/" + *it; kdDebug( 9007 ) << "=========> remove db index: " << idxName << endl; dir.remove( *it ); } @@ -2679,7 +2679,7 @@ void CppSupportPart::slotCursorPositionChanged() unsigned int column = 0; if ( KDevEditorUtil::currentPositionReal( &line, &column, dynamic_cast( partController()->activePart() ) ) ) { - QString typeInfoString = codeCompletion()->createTypeInfoString( line, column ); + TQString typeInfoString = codeCompletion()->createTypeInfoString( line, column ); mainWindow()->statusBar()->message( typeInfoString ); } } @@ -2697,8 +2697,8 @@ void CppSupportPart::slotFunctionHint( ) // m_functionHintTimer->stop(); if ( FunctionDefinitionDom fun = currentFunctionDefinition() ) { - QStringList scope = fun->scope(); - QString funName = scope.join( "::" ); + TQStringList scope = fun->scope(); + TQString funName = scope.join( "::" ); if ( !funName.isEmpty() ) funName += "::"; @@ -2711,11 +2711,11 @@ void CppSupportPart::slotFunctionHint( ) void CppSupportPart::createIgnorePCSFile( ) { - static QCString skip_me( "ignore me\n" ); + static TQCString skip_me( "ignore me\n" ); - QString skip_file_name = project() ->projectDirectory() + "/" + TQString skip_file_name = project() ->projectDirectory() + "/" + project() ->projectName() + ".kdevelop.ignore_pcs"; - QFile skip_pcs_file( skip_file_name ); + TQFile skip_pcs_file( skip_file_name ); if ( skip_pcs_file.open( IO_WriteOnly ) ) { skip_pcs_file.writeBlock( skip_me ); @@ -2723,7 +2723,7 @@ void CppSupportPart::createIgnorePCSFile( ) } } -QString CppSupportPart::specialHeaderName( bool local ) const +TQString CppSupportPart::specialHeaderName( bool local ) const { if ( local ) return ::locateLocal( "data", "kdevcppsupport/configuration", CppSupportFactory::instance() ); @@ -2735,7 +2735,7 @@ void CppSupportPart::updateParserConfiguration() { m_backgroundParser->updateParserConfiguration(); - QString conf_file_name = specialHeaderName(); + TQString conf_file_name = specialHeaderName(); m_driver->removeAllMacrosInFile( conf_file_name ); dynamic_cast(m_driver)->setup(); @@ -2788,7 +2788,7 @@ void CppSupportPart::slotDeleteParserStore() { void CppSupportPart::slotCreateSubclass() { - QFileInfo fi( m_contextFileName ); + TQFileInfo fi( m_contextFileName ); if ( fi.extension( false ) != "ui" ) return ; QtDesignerCppIntegration *des = dynamic_cast( designer( KInterfaceDesigner::QtDesigner ) ); @@ -2796,10 +2796,10 @@ void CppSupportPart::slotCreateSubclass() des->selectImplementation( m_contextFileName ); } -void CppSupportPart::addMethod( ClassDom aClass, const QString& name, const QString type, - const QString& parameters, CodeModelItem::Access accessType, +void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQString type, + const TQString& parameters, CodeModelItem::Access accessType, bool isConst, bool isInline, bool isVirtual, bool isPureVirtual, - const QString& implementation ) + const TQString& implementation ) { partController() ->editDocument( KURL( aClass->fileName() ) ); KTextEditor::EditInterface* editIface = dynamic_cast( partController() ->activePart() ); @@ -2808,18 +2808,18 @@ void CppSupportPart::addMethod( ClassDom aClass, const QString& name, const QStr /// @fixme show messagebox return ; } - QString declarationString = type + " " + name + "(" + parameters + ")" + ( isConst ? " const" : "" ); + TQString declarationString = type + " " + name + "(" + parameters + ")" + ( isConst ? " const" : "" ); KDevSourceFormatter* sourceFormatter = extension( "KDevelop/SourceFormatter" ); - QString finalDeclaration = ( ( isVirtual || isPureVirtual ) ? "\nvirtual " : "\n" + declarationString + + TQString finalDeclaration = ( ( isVirtual || isPureVirtual ) ? "\nvirtual " : "\n" + declarationString + ( isPureVirtual ? " = 0 " : "" ) + ( isInline ? "\n{\n" + implementation + "\n}\n" : ";" ) ); if ( sourceFormatter != 0 ) finalDeclaration = sourceFormatter->formatSource( finalDeclaration ); - QString indentString = "\t"; + TQString indentString = "\t"; if ( sourceFormatter != 0 ) indentString = sourceFormatter->indentString(); @@ -2832,23 +2832,23 @@ void CppSupportPart::addMethod( ClassDom aClass, const QString& name, const QStr return ; // construct fully qualified name for method definition - QString fullyQualifiedName = aClass->scope().join("::"); + TQString fullyQualifiedName = aClass->scope().join("::"); if (! fullyQualifiedName.isEmpty()) { fullyQualifiedName += "::"; } fullyQualifiedName += aClass->name() + "::" + name; - QString definitionString = "\n" + type + " " + fullyQualifiedName + "(" + parameters + ")" + ( isConst ? " const" : "" ) + "\n{\n" + implementation + "\n}\n"; + TQString definitionString = "\n" + type + " " + fullyQualifiedName + "(" + parameters + ")" + ( isConst ? " const" : "" ) + "\n{\n" + implementation + "\n}\n"; if ( sourceFormatter != 0 ) definitionString = sourceFormatter->formatSource( definitionString ); - QFileInfo info( aClass->fileName() ); - QString implementationFile = info.dirPath( true ) + "/" + info.baseName() + ".cpp" ; - QFileInfo fileInfo( implementationFile ); + TQFileInfo info( aClass->fileName() ); + TQString implementationFile = info.dirPath( true ) + "/" + info.baseName() + ".cpp" ; + TQFileInfo fileInfo( implementationFile ); KDevCreateFile* createFileSupport = extension( "KDevelop/CreateFile" ); - if ( !QFile::exists( fileInfo.absFilePath() ) && createFileSupport != 0 ) + if ( !TQFile::exists( fileInfo.absFilePath() ) && createFileSupport != 0 ) createFileSupport->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() ); partController() ->editDocument( KURL( implementationFile ) ); @@ -2856,7 +2856,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const QString& name, const QStr if ( !editIface ) return ; //@fixme errorverdoedelung - editIface->insertLine( editIface->numLines(), QString::fromLatin1( "" ) ); + editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) ); editIface->insertText( editIface->numLines() - 1, 0, definitionString ); backgroundParser() ->addFile( implementationFile ); } @@ -3011,42 +3011,42 @@ void CppSupportPart::buildSafeFileSet() { SynchronizedFileSet::SetType files; //everything that goes into this set must be deep-copied kdDebug( 9007 ) << "CppSupportPart:: rebuilding safe-file-set" << endl; - for( QStringList::const_iterator it = m_projectFileList.begin(); it != m_projectFileList.end(); ++it ) { - QFileInfo fi( *it ); - QString file = *it; + for( TQStringList::const_iterator it = m_projectFileList.begin(); it != m_projectFileList.end(); ++it ) { + TQFileInfo fi( *it ); + TQString file = *it; if( fi.isRelative() ) { - fi.setFile( QDir(m_projectDirectory), *it ); + fi.setFile( TQDir(m_projectDirectory), *it ); file = fi.absFilePath(); } //deep-copy - files.insert( QString::fromUtf8(file.utf8()) ); + files.insert( TQString::fromUtf8(file.utf8()) ); } ///Now get all translation-units from the code-repository - QValueList args; + TQValueList args; args << Catalog::QueryArgument( "kind", Tag::Kind_TranslationUnit ); - QValueList tags( codeCompletion()->repository()->query( args ) ); + TQValueList tags( codeCompletion()->repository()->query( args ) ); - for( QValueList::const_iterator it = tags.begin(); it != tags.end(); ++it ) { + for( TQValueList::const_iterator it = tags.begin(); it != tags.end(); ++it ) { files.insert( (*it).fileName() + "||" + (*it).attribute("macroValueHash").toString() + "||" + (*it).attribute("macroIdHash").toString() ); } m_safeProjectFiles.setFiles( files ); } void CppSupportPart::addToRepository( ParsedFilePointer file ) { - QString catalogString( "automatic_" + KURL::encode_string_no_slash(m_projectDirectory) ); + TQString catalogString( "automatic_" + KURL::encode_string_no_slash(m_projectDirectory) ); KStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); - QString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + catalogString + ".db"; + TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + catalogString + ".db"; Catalog* catalog = 0; ///First check if the catalog is already there - QValueList catalogs = codeRepository()->registeredCatalogs(); - for( QValueList::const_iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { + TQValueList catalogs = codeRepository()->registeredCatalogs(); + for( TQValueList::const_iterator it = catalogs.begin(); it != catalogs.end(); ++it ) { if( (*it)->dbName() == dbName ) { catalog = *it; break; @@ -3055,7 +3055,7 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { if( !catalog ) { kdDebug( 9007 ) << "creating new catalog named " << catalogString << " for automatic filling" << endl; - //QStringList indexList = QStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; + //TQStringList indexList = TQStringList() << "kind" << "name" << "scope" << "fileName" << "prefix"; catalog = new Catalog; catalog->open( dbName ); catalog->addIndex( "kind" ); @@ -3064,27 +3064,27 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { catalog->addIndex( "prefix" ); catalog->addIndex( "fileName" ); /* - for ( QStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) + for ( TQStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) catalog->addIndex( ( *idxIt ).utf8() );*/ addCatalog( catalog ); } catalog->setEnabled( true ); ///Now check if the file was already parsed with the same parameters, if yes don't parse again(auto-update is currently not supported, when major changes have been done in the libraries, the repository should be deleted) - QValueList args; + TQValueList args; bool compatibleParsed = false; Tag compatibleParsedTag; args << Catalog::QueryArgument( "kind", Tag::Kind_TranslationUnit ); args << Catalog::QueryArgument( "fileName", file->fileName() ); - QValueList tags( catalog->query( args ) ); + TQValueList tags( catalog->query( args ) ); if( !tags.isEmpty() ) { - for( QValueList::const_iterator it = tags.begin(); it != tags.end(); ++it ) { + for( TQValueList::const_iterator it = tags.begin(); it != tags.end(); ++it ) { if( (*it).hasAttribute( "cppparsedfile" ) ) { - QVariant v = (*it).attribute( "cppparsedfile" ); + TQVariant v = (*it).attribute( "cppparsedfile" ); ///@todo reenable this - /*QByteArray b = v.toByteArray(); + /*TQByteArray b = v.toByteArray(); if( !b.isEmpty() ) { //Would be much more efficient not to do this deserialization ParsedFile f(b); @@ -3105,8 +3105,8 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { if( compatibleParsed ) { ///Add a Tag that makes sure that the file will not be parsed again compatibleParsedTag.setAttribute( "includedFrom", file->includedFrom() ); - QByteArray data; - QDataStream s( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream s( data, IO_WriteOnly ); file->write( s ); compatibleParsedTag.setAttribute( "cppparsedfile", data ); catalog->addItem( compatibleParsedTag ); @@ -3118,32 +3118,32 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { w.parseTranslationUnit( *file ); codeRepository()->touchCatalog( catalog ); - m_safeProjectFiles.insert( file->fileName() + "||" + QString("%1").arg(file->usedMacros().valueHash()) + "||" + QString("%1").arg(file->usedMacros().idHash()) ); + m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()) ); } -QString CppSupportPart::findHeaderSimple( const QString &header ) +TQString CppSupportPart::findHeaderSimple( const TQString &header ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = m_projectFileList.begin(); it != m_projectFileList.end(); ++it ) { - QString s = *it; + TQString s = *it; if (s == header) return s; if ( ( s.right( header.length() ) == header ) && ( s[s.length() - header.length() - 1] == '/' ) ) return s; } - return QString::null; + return TQString::null; } -UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ), m_stop(false) { +UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : TQThread(), m_parent( parent ), m_stop(false) { } void UIBlockTester::UIBlockTesterThread::run() { while(!m_stop) { msleep( m_parent.m_msecs / 10 ); m_parent.m_timeMutex.lock(); - QDateTime t = QDateTime::currentDateTime(); + TQDateTime t = TQDateTime::currentDateTime(); uint msecs = m_parent.m_lastTime.time().msecsTo( t.time() ); if( msecs > m_parent.m_msecs ) { m_parent.lockup(); @@ -3158,9 +3158,9 @@ void UIBlockTester::UIBlockTesterThread::stop() { } UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) { - m_timer = new QTimer( this ); + m_timer = new TQTimer( this ); m_timer->start( milliseconds/10 ); - connect( m_timer, SIGNAL(timeout()), this, SLOT(timer()) ); + connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) ); timer(); m_thread.start(); } @@ -3171,7 +3171,7 @@ UIBlockTester::~UIBlockTester() { void UIBlockTester::timer() { m_timeMutex.lock(); - m_lastTime = QDateTime::currentDateTime(); + m_lastTime = TQDateTime::currentDateTime(); m_timeMutex.unlock(); } diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index e01d5115..fecfe2d1 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -21,25 +21,25 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include "driver.h" ///A class that helps detecting what exactly makes the UI block. To use it, just place a breakpoint on UIBlockTester::lockup() and inspect the execution-position of the main thread -class UIBlockTester : public QObject { +class UIBlockTester : public TQObject { Q_OBJECT - class UIBlockTesterThread : public QThread { + class UIBlockTesterThread : public TQThread { public: UIBlockTesterThread( UIBlockTester& parent ); void run(); @@ -63,9 +63,9 @@ protected: private: UIBlockTesterThread m_thread; - QDateTime m_lastTime; - QMutex m_timeMutex; - QTimer * m_timer; + TQDateTime m_lastTime; + TQMutex m_timeMutex; + TQTimer * m_timer; uint m_msecs; }; @@ -113,42 +113,42 @@ public: bool isEmpty() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileSet.empty(); } uint count() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileSet.size(); } void clear() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileSet.clear(); } void setFiles( const SetType& files ) { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileSet = files; } void insert( const HashedString& str ) { - HashedString s( QString::fromUtf8(str.str().utf8()) ); - QMutexLocker locker( &m_mutex ); + HashedString s( TQString::fromUtf8(str.str().utf8()) ); + TQMutexLocker locker( &m_mutex ); m_fileSet.insert( s ); } bool contains( const HashedString& str ) const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileSet.find( str ) != m_fileSet.end(); } private: - mutable QMutex m_mutex; + mutable TQMutex m_mutex; SetType m_fileSet; }; @@ -157,7 +157,7 @@ class CppSupportPart : public KDevLanguageSupport Q_OBJECT public: - CppSupportPart( QObject *parent, const char *name, const QStringList &args ); + CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ); virtual ~CppSupportPart(); bool isValid() const @@ -165,7 +165,7 @@ public: return m_valid; } - QString specialHeaderName( bool local = false ) const; + TQString specialHeaderName( bool local = false ) const; void updateParserConfiguration(); void updateBackgroundParserConfig(); @@ -178,8 +178,8 @@ public: } /** parses the file and all files that belong to it using the background-parser */ - int parseFileAndDependencies( const QString& fileName, bool background = true, bool parseFirst = false, bool silent = false ); - int parseFilesAndDependencies( QStringList files, bool background = true, bool parseFirst = false, bool silent = false ); + int parseFileAndDependencies( const TQString& fileName, bool background = true, bool parseFirst = false, bool silent = false ); + int parseFilesAndDependencies( TQStringList files, bool background = true, bool parseFirst = false, bool silent = false ); BackgroundParser* backgroundParser() const { @@ -208,19 +208,19 @@ public: */ inline QtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; } - const QPtrList& catalogList() const + const TQPtrList& catalogList() const { return m_catalogList; } void addCatalog( Catalog* catalog ); - void removeCatalog( const QString& dbName ); + void removeCatalog( const TQString& dbName ); - bool isValidSource( const QString& fileName ) const; + bool isValidSource( const TQString& fileName ) const; - virtual void customEvent( QCustomEvent* ev ); + virtual void customEvent( TQCustomEvent* ev ); - virtual QStringList subclassWidget( const QString& formName ); - virtual QStringList updateWidget( const QString& formName, const QString& fileName ); + virtual TQStringList subclassWidget( const TQString& formName ); + virtual TQStringList updateWidget( const TQString& formName, const TQString& fileName ); FunctionDefinitionDom currentFunctionDefinition(); FunctionDefinitionDom functionDefinitionAt( int line, int column ); @@ -229,17 +229,17 @@ public: KTextEditor::Document* findDocument( const KURL& url ); static KConfig *config(); - virtual QString formatTag( const Tag& tag ); - virtual QString formatModelItem( const CodeModelItem *item, bool shortDescription = false ); + virtual TQString formatTag( const Tag& tag ); + virtual TQString formatModelItem( const CodeModelItem *item, bool shortDescription = false ); virtual void addClass(); - QString extractInterface( const ClassDom& klass ); + TQString extractInterface( const ClassDom& klass ); - bool isHeader( const QString& fileName ) const; - bool isSource( const QString& fileName ) const; + bool isHeader( const TQString& fileName ) const; + bool isSource( const TQString& fileName ) const; //uses the old simple algorithm to find the header - QString findHeaderSimple( const QString &header ); + TQString findHeaderSimple( const TQString &header ); virtual KDevDesignerIntegration *designer( KInterfaceDesigner::DesignerType type ); @@ -251,7 +251,7 @@ public: * @param name The name of the method. * @param type The return type of the method. * @param parameters A string containing the parameters - * (including names, default values, but no '(' , ')', e.g.: "int, const QString& aString"). + * (including names, default values, but no '(' , ')', e.g.: "int, const TQString& aString"). * @param accessType The access specifier e.g. CodeModelItem::PUBLIC. * @param isConst true if method is const. * @param isInline true if method should be declared inline. @@ -260,12 +260,12 @@ public: * @param implementation a optional implementation, if this is not set the method body will be empty. * @author Jonas Jacobi */ - virtual void addMethod( ClassDom aClass, const QString& name, const QString type, const QString& parameters, CodeModelItem::Access accessType, bool isConst, bool isInline, bool isVirtual, bool isPureVirtual, const QString& implementation = "" ); + virtual void addMethod( ClassDom aClass, const TQString& name, const TQString type, const TQString& parameters, CodeModelItem::Access accessType, bool isConst, bool isInline, bool isVirtual, bool isPureVirtual, const TQString& implementation = "" ); void createAccessMethods( ClassDom theClass, VariableDom theVariable ); - bool isQueued( const QString& file ) const; - bool switchHeaderImpl( const QString& file, int line, int col, bool scrollOnly = false ); + bool isQueued( const TQString& file ) const; + bool switchHeaderImpl( const TQString& file, int line, int col, bool scrollOnly = false ); const Driver* driver() const; @@ -275,17 +275,17 @@ public: const SynchronizedFileSet& safeFileSet() const; SynchronizedFileSet& safeFileSet(); signals: - void fileParsed( const QString& fileName ); + void fileParsed( const TQString& fileName ); ///Emitted whenever a file was parsed, but the code-model could be updated(the file in the code-model did not have to be replaced) - void codeModelUpdated( const QString& fileName ); + void codeModelUpdated( const TQString& fileName ); ///Emitted whenever a translation-unit was parsed in the main thread - void synchronousParseReady( const QString& file, ParsedFilePointer unit ); + void synchronousParseReady( const TQString& file, ParsedFilePointer unit ); protected: virtual KDevLanguageSupport::Features features(); virtual KMimeType::List mimeTypes(); - virtual QString formatClassName( const QString &name ); - virtual QString unformatClassName( const QString &name ); + virtual TQString formatClassName( const TQString &name ); + virtual TQString unformatClassName( const TQString &name ); virtual bool shouldSplitDocument( const KURL &url ); virtual Qt::Orientation splitOrientation() const; virtual void addMethod( ClassDom klass ); @@ -299,15 +299,15 @@ private slots: void savedFile( const KURL &fileName ); void configWidget( KDialogBase *dlg ); void projectConfigWidget( KDialogBase *dlg ); - void contextMenu( QPopupMenu *popup, const Context *context ); - void addedFilesToProject( const QStringList &fileList ); - void removedFilesFromProject( const QStringList &fileList ); - void changedFilesInProject( const QStringList & fileList ); + void contextMenu( TQPopupMenu *popup, const Context *context ); + void addedFilesToProject( const TQStringList &fileList ); + void removedFilesFromProject( const TQStringList &fileList ); + void changedFilesInProject( const TQStringList & fileList ); void slotProjectCompiled(); void setupCatalog(); void codeCompletionConfigStored(); void splitHeaderSourceConfigStored(); - // void recomputeCodeModel( const QString& fileName ); + // void recomputeCodeModel( const TQString& fileName ); void slotNavigate(); void slotNewClass(); void slotSwitchHeader( bool scrollOnly = false ); @@ -318,7 +318,7 @@ private slots: // void slotFunctionHint(); void gotoLine( int line ); void gotoDeclarationLine( int line ); - void emitFileParsed( QStringList l ); + void emitFileParsed( TQStringList l ); void slotParseFiles(); void slotCreateSubclass(); void slotCreateAccessMethods(); @@ -331,7 +331,7 @@ private slots: void removeProblemReporter(); - void slotNeedTextHint( int, int, QString& ); + void slotNeedTextHint( int, int, TQString& ); /** * loads, parses and creates both classstores needed @@ -381,31 +381,31 @@ private: /** * checks if a file has to be parsed */ - FileDom fileByName( const QString& name); - void maybeParse( const QString& fileName, bool background = true ); - void removeWithReferences( const QString& fileName ); + FileDom fileByName( const TQString& name); + void maybeParse( const TQString& fileName, bool background = true ); + void removeWithReferences( const TQString& fileName ); void createIgnorePCSFile(); - void MakeMemberHelper( QString& text, int& atline, int& atcol ); + void MakeMemberHelper( TQString& text, int& atline, int& atcol ); - QString sourceOrHeaderCandidate( const KURL &url = KURL() ); + TQString sourceOrHeaderCandidate( const KURL &url = KURL() ); FunctionDom findFunction( const FunctionDom& def ); FunctionDom findFunctionInNamespace( const NamespaceDom& ns, const FunctionDom& def, const std::set& nsImports, - const QString& candidateFile, int scopeIndex, FunctionDom& bestMatch ); + const TQString& candidateFile, int scopeIndex, FunctionDom& bestMatch ); FunctionDom findFunctionInClass( const ClassDom& cs, const FunctionDom& def, const std::set& nsImports, - const QString& candidateFile, int scopeIndex, FunctionDom& bestMatch ); + const TQString& candidateFile, int scopeIndex, FunctionDom& bestMatch ); FunctionDom findFunctionDefinition( const FunctionDom& decl ); void jumpToCodeModelItem( const ItemDom& item, bool scrollOnly ); - QStringList modifiedFileList(); - QString findSourceFile(); + TQStringList modifiedFileList(); + TQString findSourceFile(); int pcsVersion(); void setPcsVersion( int version ); void saveProjectSourceInfo(); - QStringList reorder( const QStringList& list ); + TQStringList reorder( const TQStringList& list ); CppCodeCompletion* m_pCompletion; CppCodeCompletionConfig* m_pCompletionConfig; @@ -418,11 +418,11 @@ private: QtBuildConfig* m_qtBuildConfig; bool withcpp; - QString m_contextFileName; + TQString m_contextFileName; VariableDom m_curAttribute; ClassDom m_curClass; - QGuardedPtr< ProblemReporter > m_problemReporter; + TQGuardedPtr< ProblemReporter > m_problemReporter; BackgroundParser* m_backgroundParser; UIBlockTester* m_lockupTester; @@ -431,36 +431,36 @@ private: KTextEditor::SelectionInterface* m_activeSelection; KTextEditor::EditInterface* m_activeEditor; KTextEditor::ViewCursorInterface* m_activeViewCursor; - QString m_activeFileName; + TQString m_activeFileName; - QMap m_designers; + TQMap m_designers; - QWaitCondition m_eventConsumed; + TQWaitCondition m_eventConsumed; bool m_projectClosed; bool m_projectClosing; - QMap m_timestamp; + TQMap m_timestamp; bool m_valid; bool m_isTyping; bool m_hadErrors; ///Whether there were already errors when the user started typing - QPtrList m_catalogList; + TQPtrList m_catalogList; Driver* m_driver; - QString m_projectDirectory; - QStringList m_projectFileList; + TQString m_projectDirectory; + TQStringList m_projectFileList; ClassDom m_activeClass; FunctionDom m_activeFunction; VariableDom m_activeVariable; - QGuardedPtr m_navigationMenu; + TQGuardedPtr m_navigationMenu; -// QTimer* m_functionHintTimer; -// QTimer* m_deleteParserStoreTimer; - QTimer* m_saveMemoryTimer; - QTimer * m_textChangedTimer; - QTimer * m_cursorMovedTimer; - QTimer* m_buildSafeFileSetTimer; +// TQTimer* m_functionHintTimer; +// TQTimer* m_deleteParserStoreTimer; + TQTimer* m_saveMemoryTimer; + TQTimer * m_textChangedTimer; + TQTimer * m_cursorMovedTimer; + TQTimer* m_buildSafeFileSetTimer; class ParseEmitWaiting { public: @@ -472,23 +472,23 @@ private: }; private: struct Item { - QStringList first; - QStringList second; + TQStringList first; + TQStringList second; Flags flags; Item() : flags(None) { } - Item( QStringList f, QStringList s, Flags fl = None ) : first( f ), second( s ), flags( fl ) + Item( TQStringList f, TQStringList s, Flags fl = None ) : first( f ), second( s ), flags( fl ) { } }; - //typedef QPair Item; ///The files we are waiting fore, and the files we already got - typedef QValueList< Item > List; + //typedef QPair Item; ///The files we are waiting fore, and the files we already got + typedef TQValueList< Item > List; List m_waiting; - QStringList harvestUntil( List::iterator targIt ) { + TQStringList harvestUntil( List::iterator targIt ) { List::iterator it = m_waiting.begin(); - QStringList ret; + TQStringList ret; while( it != targIt && it != m_waiting.end() ) { ret += (*it).first; it = m_waiting.erase( it ); @@ -497,18 +497,18 @@ private: } public: - void addGroup( QStringList& files, Flags flag = None ) { - m_waiting << Item(files, QStringList(), flag); + void addGroup( TQStringList& files, Flags flag = None ) { + m_waiting << Item(files, TQStringList(), flag); } - void addGroupFront( QStringList& files, Flags flag = None ) { - m_waiting.push_front( Item(files, QStringList(), flag) ); + void addGroupFront( TQStringList& files, Flags flag = None ) { + m_waiting.push_front( Item(files, TQStringList(), flag) ); } void clear() { m_waiting.clear(); } ///files that were not requested must not be processed, since they maybe do not respect the group-relationships. - bool reject( QString file ) { + bool reject( TQString file ) { for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { if( (*it).first.find( file ) != (*it).first.end() ) { return false; @@ -517,7 +517,7 @@ private: return true; } - bool waiting( QString file, Flags forbidFlags = None, int count = 1 ) const { + bool waiting( TQString file, Flags forbidFlags = None, int count = 1 ) const { int hits = 0; for( List::const_iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { if( (*it).first.find( file ) != (*it).first.end() ) { @@ -531,13 +531,13 @@ private: } struct Processed { - QStringList res; + TQStringList res; Flags flag; Processed() : flag(None) { } - Processed(const QStringList& l , Flags f = None ) : res( l ), flag( f ) { + Processed(const TQStringList& l , Flags f = None ) : res( l ), flag( f ) { } - operator QStringList() { + operator TQStringList() { return res; } @@ -559,8 +559,8 @@ private: private: ///Just return all files that have been parsed - Processed errorRecover( QString currentFile ) { - QStringList ret; + Processed errorRecover( TQString currentFile ) { + TQStringList ret; kdDebug( 9007 ) << "ParseEmitWaiting: error in the waiting-chain" << endl; for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { ret += (*it).second; @@ -572,8 +572,8 @@ private: public: ///returns the parsed-messages that should be emitted - Processed processFile( QString file, Flags flag = None ) { - QStringList ret; + Processed processFile( TQString file, Flags flag = None ) { + TQStringList ret; for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { if( (*it).first.find( file ) != (*it).first.end() ) { if( (*it).second.find( file ) == (*it).second.end() ) { @@ -588,7 +588,7 @@ private: return Processed( harvestUntil( ++it ), f ); } else { ///The file was registered, now wait for the next - return QStringList(); + return TQStringList(); } } else { ///The file has already been parsed @@ -615,37 +615,37 @@ private: SynchronizedFileSet m_safeProjectFiles; BackgroundParserConfig * m_backgroundParserConfig; - static QStringList m_sourceMimeTypes; - static QStringList m_headerMimeTypes; + static TQStringList m_sourceMimeTypes; + static TQStringList m_headerMimeTypes; - static QStringList m_sourceExtensions; - static QStringList m_headerExtensions; + static TQStringList m_sourceExtensions; + static TQStringList m_headerExtensions; friend class KDevCppSupportIface; friend class CppDriver; // we need something to plug actions that are not in any menu // into in order for their shortcuts to work - QWidget m_DummyActionWidget; + TQWidget m_DummyActionWidget; void addToRepository( ParsedFilePointer ); - void emitSynchronousParseReady( const QString& file, ParsedFilePointer unit ); + void emitSynchronousParseReady( const TQString& file, ParsedFilePointer unit ); struct JobData { - QDir dir; - QGuardedPtr progressBar; - QStringList::Iterator it; - QStringList files; + TQDir dir; + TQGuardedPtr progressBar; + TQStringList::Iterator it; + TQStringList files; int cycle; int backgroundCount; int lastBackgroundState; int backgroundState; - QStringList reparseList; - QMap< QString, QPair > pcs; - QDataStream stream; - QFile file; - QTime lastParse; + TQStringList reparseList; + TQMap< TQString, QPair > pcs; + TQDataStream stream; + TQFile file; + TQTime lastParse; ~JobData() { diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp index 5b64290f..7190e796 100644 --- a/languages/cpp/creategettersetterconfiguration.cpp +++ b/languages/cpp/creategettersetterconfiguration.cpp @@ -15,12 +15,12 @@ #include -#include +#include #include -QString CreateGetterSetterConfiguration::defaultPath = QString::fromLatin1( "/kdevcppsupport/creategettersetter" ); +TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" ); CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part ) -: QObject(part), m_part(part), m_settings(0) +: TQObject(part), m_part(part), m_settings(0) { init(); } @@ -38,7 +38,7 @@ void CreateGetterSetterConfiguration::init( ) m_prefixGet = DomUtil::readEntry( *m_settings, defaultPath + "/prefixGet", "" ); m_prefixSet = DomUtil::readEntry( *m_settings, defaultPath + "/prefixSet", "set" ); - m_prefixVariable = QStringList::split(",", DomUtil::readEntry( *m_settings, defaultPath + "/prefixVariable", "m_,_" )); + m_prefixVariable = TQStringList::split(",", DomUtil::readEntry( *m_settings, defaultPath + "/prefixVariable", "m_,_" )); m_parameterName = DomUtil::readEntry( *m_settings, defaultPath + "/parameterName", "theValue" ); m_isInlineGet = DomUtil::readBoolEntry(*m_settings, defaultPath + "/inlineGet", true ); m_isInlineSet = DomUtil::readBoolEntry(*m_settings, defaultPath + "/inlineSet", true ); diff --git a/languages/cpp/creategettersetterconfiguration.h b/languages/cpp/creategettersetterconfiguration.h index e11a45ee..e89dd60b 100644 --- a/languages/cpp/creategettersetterconfiguration.h +++ b/languages/cpp/creategettersetterconfiguration.h @@ -12,9 +12,9 @@ #ifndef CREATEGETTERSETTERCONFIGURATION_H #define CREATEGETTERSETTERCONFIGURATION_H -#include -#include -#include +#include +#include +#include class CppSupportPart; class QDomDocument; @@ -44,39 +44,39 @@ public slots: void store(); public: - void setPrefixGet(const QString& theValue) + void setPrefixGet(const TQString& theValue) { m_prefixGet = theValue; } - QString prefixGet() const + TQString prefixGet() const { return m_prefixGet; } - void setPrefixSet(const QString& theValue) + void setPrefixSet(const TQString& theValue) { m_prefixSet = theValue; } - QString prefixSet() const + TQString prefixSet() const { return m_prefixSet; } - void setPrefixVariable(const QStringList& theValue) + void setPrefixVariable(const TQStringList& theValue) { m_prefixVariable = theValue; } - QStringList prefixVariable() const + TQStringList prefixVariable() const { return m_prefixVariable; } - void setParameterName(const QString& theValue) + void setParameterName(const TQString& theValue) { m_parameterName = theValue; } - QString parameterName() const + TQString parameterName() const { return m_parameterName; } @@ -101,17 +101,17 @@ public: private: CppSupportPart* m_part; - QDomDocument* m_settings; + TQDomDocument* m_settings; - QString m_prefixGet; - QString m_prefixSet; - QStringList m_prefixVariable; - QString m_parameterName; + TQString m_prefixGet; + TQString m_prefixSet; + TQStringList m_prefixVariable; + TQString m_parameterName; bool m_isInlineGet; bool m_isInlineSet; private: - static QString defaultPath; + static TQString defaultPath; }; #endif diff --git a/languages/cpp/creategettersetterdialog.cpp b/languages/cpp/creategettersetterdialog.cpp index 41a2f27e..e63fcf23 100644 --- a/languages/cpp/creategettersetterdialog.cpp +++ b/languages/cpp/creategettersetterdialog.cpp @@ -13,16 +13,16 @@ #include "cppsupportpart.h" #include -#include -#include +#include +#include #include "creategettersetterconfiguration.h" CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassDom aClass, - VariableDom aVar, QWidget *parent, const char *pName ) + VariableDom aVar, TQWidget *parent, const char *pName ) : CreateGetterSetterDialogBase( parent, pName ), m_part( part ), m_class( aClass ), m_var( aVar ) { - QString name = aVar->name(); + TQString name = aVar->name(); setCaption( "Create methods for " + name ); if ( aVar->type().startsWith( "const" ) && !aVar->type().endsWith( "*" ) ) @@ -35,11 +35,11 @@ CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassD if ( config == 0 ) return ; - QStringList prefixes = config->prefixVariable(); + TQStringList prefixes = config->prefixVariable(); unsigned int len = 0; - QStringList::ConstIterator theend = prefixes.end(); //find longest fitting prefix and remove it - for ( QStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) + TQStringList::ConstIterator theend = prefixes.end(); //find longest fitting prefix and remove it + for ( TQStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) { if ( name.startsWith( *ci ) && ( *ci ).length() > len ) len = ( *ci ).length(); @@ -50,11 +50,11 @@ CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassD m_edtGet->setText( name ); - QString getName = name; + TQString getName = name; if ( ! config->prefixGet().isEmpty() ) getName[ 0 ] = getName[ 0 ].upper(); - QString setName = name; + TQString setName = name; if ( ! config->prefixSet().isEmpty() ) setName[ 0 ] = setName[ 0 ].upper(); @@ -81,7 +81,7 @@ void CreateGetterSetterDialog::accept( ) if ( m_chkSet->isChecked() && !m_edtSet->text().isEmpty() ) { - QString parameterStr; + TQString parameterStr; if ( m_var->type().endsWith( "*" ) ) { @@ -89,7 +89,7 @@ void CreateGetterSetterDialog::accept( ) } else { - QRegExp basicTypes( "((unsigned)?\\s*(char|byte|short|int|long))|double|float|bool" ); + TQRegExp basicTypes( "((unsigned)?\\s*(char|byte|short|int|long))|double|float|bool" ); if ( basicTypes.exactMatch( m_var->type() ) ) parameterStr = m_var->type() + " " + config->parameterName(); else @@ -100,7 +100,7 @@ void CreateGetterSetterDialog::accept( ) "\t" + m_var->name() + " = " + config->parameterName() + ";" ); } //@todo illegale eingaben nicht akzeptieren wie z.b. int& ... - QDialog::accept(); + TQDialog::accept(); } /** diff --git a/languages/cpp/creategettersetterdialog.h b/languages/cpp/creategettersetterdialog.h index a535e303..435002f2 100644 --- a/languages/cpp/creategettersetterdialog.h +++ b/languages/cpp/creategettersetterdialog.h @@ -25,7 +25,7 @@ class CreateGetterSetterDialog: public CreateGetterSetterDialogBase { Q_OBJECT public: - CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, QWidget *parent = 0, const char *name = 0); + CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *parent = 0, const char *name = 0); protected slots: void accept(); diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 1dc45034..d716bcc2 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -35,13 +35,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -64,7 +64,7 @@ public: } #if 0 /// \FIXME robe - void addDocDirectory( const QString& dir ) + void addDocDirectory( const TQString& dir ) { m_docDirectoryList.append( dir ); TagCreator::setDocumentationDirectories( m_docDirectoryList ); @@ -76,8 +76,8 @@ public: /// @todo increment progress #if 0 /// @todo show problems - QValueList l = problems( fileName ); - QValueList::Iterator it = l.begin(); + TQValueList l = problems( fileName ); + TQValueList::Iterator it = l.begin(); while ( it != l.end() ) { const Problem & p = *it; @@ -99,18 +99,18 @@ public: void setup() { bool ok; - QString gccLibPath = SetupHelper::getGccIncludePath(&ok); + TQString gccLibPath = SetupHelper::getGccIncludePath(&ok); if (!ok) return; - gccLibPath = gccLibPath.replace( QRegExp( "[\r\n]" ), "" ); + gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" ); addIncludePath( gccLibPath ); //addIncludePath( "/usr/include/g++-3" ); //addIncludePath( "/usr/include/g++" ); - QStringList lines = SetupHelper::getGccMacros(&ok); + TQStringList lines = SetupHelper::getGccMacros(&ok); if (!ok) return; - for (QStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { - QStringList lst = QStringList::split( ' ', *it ); + for (TQStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { + TQStringList lst = TQStringList::split( ' ', *it ); if ( lst.count() != 3 ) continue; addMacro( Macro( lst[1], lst[2] ) ); @@ -124,7 +124,7 @@ private: Catalog* catalog; #if 0 /// \FIXME - QStringList m_docDirectoryList; + TQStringList m_docDirectoryList; #endif }; @@ -132,12 +132,12 @@ private: class PCSListViewItem: public KListViewItem { public: - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, QListViewItem* parent ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent ) : KListViewItem( parent ), m_importer( importer ) { init( ptr ); } - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, QListView* parent ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent ) : KListViewItem( parent ), m_importer( importer ) { init( ptr ); @@ -167,14 +167,14 @@ private: class CreatePCSDialog::PCSJobData { public: - QString dbName; + TQString dbName; Catalog * catalog; RppDriver * driver; - QStringList list; - QStringList::iterator it; + TQStringList list; + TQStringList::iterator it; int progress; - PCSJobData( const QString & dbName, QStringList const & fileList ) + PCSJobData( const TQString & dbName, TQStringList const & fileList ) : dbName( dbName), list( fileList ), it( list.begin() ), progress( 0 ) { catalog = new Catalog; @@ -196,7 +196,7 @@ public: -CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, QWidget* parent, const char* name, bool modal, WFlags fl ) +CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl ) : CreatePCSDialogBase( parent, name, modal, fl ), m_part( part ), m_jobData( 0 ) { helpButton()->hide(); @@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, QWidget* parent, const c KService::Ptr ptr = *it; int error = 0; - KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService( ptr, this, ptr->name().latin1(), QStringList(), &error ); + KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService( ptr, this, ptr->name().latin1(), TQStringList(), &error ); if ( importer ) { new PCSListViewItem( ptr, importer, importerListView ); @@ -221,7 +221,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, QWidget* parent, const c setNextEnabled( importerPage, false ); - QHBoxLayout* hbox = new QHBoxLayout( settingsPage ); + TQHBoxLayout* hbox = new TQHBoxLayout( settingsPage ); hbox->setAutoAdd( true ); if ( importerListView->firstChild() ) @@ -237,12 +237,12 @@ CreatePCSDialog::~CreatePCSDialog() /*$SPECIALIZATION$*/ void CreatePCSDialog::back() { - QWizard::back(); + TQWizard::back(); } void CreatePCSDialog::next() { - QWizard::next(); + TQWizard::next(); } void CreatePCSDialog::reject() @@ -254,7 +254,7 @@ void CreatePCSDialog::reject() m_jobData = 0; } - QWizard::reject(); + TQWizard::reject(); } void CreatePCSDialog::accept() @@ -262,10 +262,10 @@ void CreatePCSDialog::accept() delete m_jobData; m_jobData = 0; - QWizard::accept(); + TQWizard::accept(); } -void CreatePCSDialog::slotSelected( const QString & ) +void CreatePCSDialog::slotSelected( const TQString & ) { if ( currentPage() == settingsPage ) { @@ -276,7 +276,7 @@ void CreatePCSDialog::slotSelected( const QString & ) m_settings = importer->createSettingsPage( settingsPage ); setNextEnabled( currentPage(), false ); setHelpEnabled( currentPage(), false ); - connect( m_settings, SIGNAL( enabled( int ) ), this, SLOT( setNextPageEnabled( int ) ) ); + connect( m_settings, TQT_SIGNAL( enabled( int ) ), this, TQT_SLOT( setNextPageEnabled( int ) ) ); if ( m_settings ) { @@ -295,19 +295,19 @@ void CreatePCSDialog::slotSelected( const QString & ) setNextEnabled( currentPage(), false ); KDevPCSImporter* importer = static_cast( importerListView->selectedItem() )->importer(); - QStringList fileList = importer->fileList(); + TQStringList fileList = importer->fileList(); progressBar->setTotalSteps( fileList.size() ); progressBar->setPercentageVisible( true ); KStandardDirs *dirs = m_part->instance() ->dirs(); - QString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash(filename_edit->text()) + ".db"; + TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash(filename_edit->text()) + ".db"; kdDebug( 9007 ) << "================================> dbName = " << dbName << endl; m_part->removeCatalog( dbName ); m_jobData = new PCSJobData( dbName, fileList ); - QTimer::singleShot( 0, this, SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); } } @@ -340,7 +340,7 @@ void CreatePCSDialog::parseNext( ) ++(m_jobData->it); - QTimer::singleShot( 0, this, SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); } @@ -349,7 +349,7 @@ void CreatePCSDialog::setNextPageEnabled( int enabled ) setNextEnabled( currentPage(), enabled ); } -void CreatePCSDialog::slotSelectionChanged( QListViewItem * item ) +void CreatePCSDialog::slotSelectionChanged( TQListViewItem * item ) { setNextPageEnabled( item != 0 ); } diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index 0d03d16f..87c4818d 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -21,14 +21,14 @@ class CreatePCSDialog : public CreatePCSDialogBase Q_OBJECT public: - CreatePCSDialog( CppSupportPart* part, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreatePCSDialog(); /*$PUBLIC_FUNCTIONS$*/ public slots: /*$PUBLIC_SLOTS$*/ - virtual void slotSelected( const QString& ); - virtual void slotSelectionChanged( QListViewItem* ); + virtual void slotSelected( const TQString& ); + virtual void slotSelectionChanged( TQListViewItem* ); protected: /*$PROTECTED_FUNCTIONS$*/ @@ -45,7 +45,7 @@ protected slots: private: CppSupportPart* m_part; - QWidget* m_settings; + TQWidget* m_settings; class RppDriver; class PCSJobData; diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp index 7bcf674f..c9ed193e 100644 --- a/languages/cpp/debugger/breakpoint.cpp +++ b/languages/cpp/debugger/breakpoint.cpp @@ -20,11 +20,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -174,18 +174,18 @@ void Breakpoint::modifyBreakpoint(GDBController* controller) { controller-> addCommandBeforeRun( - new ModifyBreakpointCommand(QString("-break-condition %1 ") + + new ModifyBreakpointCommand(TQString("-break-condition %1 ") + conditional(), this)); controller-> addCommandBeforeRun( - new ModifyBreakpointCommand(QString("-break-after %1 ") + - QString::number(ignoreCount()), this)); + new ModifyBreakpointCommand(TQString("-break-after %1 ") + + TQString::number(ignoreCount()), this)); controller-> addCommandBeforeRun( new ModifyBreakpointCommand(isEnabled() ? - QString("-break-enable %1") - : QString("-break-disable %1"), this)); + TQString("-break-enable %1") + : TQString("-break-disable %1"), this)); } void Breakpoint::removedInGdb() @@ -210,12 +210,12 @@ bool Breakpoint::match(const Breakpoint* breakpoint) const /***************************************************************************/ -QString Breakpoint::dbgRemoveCommand() const +TQString Breakpoint::dbgRemoveCommand() const { if (dbgId_>0) - return QString("-break-delete %1").arg(dbgId_); // gdb command - not translatable + return TQString("-break-delete %1").arg(dbgId_); // gdb command - not translatable - return QString(); + return TQString(); } @@ -258,9 +258,9 @@ void Breakpoint::setActive(int active, int id) /***************************************************************************/ -QString Breakpoint::statusDisplay(int activeFlag) const +TQString Breakpoint::statusDisplay(int activeFlag) const { - QString status=""; + TQString status=""; if (!s_enabled_) status = i18n("Disabled"); else @@ -280,9 +280,9 @@ QString Breakpoint::statusDisplay(int activeFlag) const return status; } -QString Breakpoint::traceRealFormatString() const +TQString Breakpoint::traceRealFormatString() const { - QString result; + TQString result; if (traceFormatStringEnabled()) { @@ -298,9 +298,9 @@ QString Breakpoint::traceRealFormatString() const } else { - result += " " + QString::number(key()) + ": "; + result += " " + TQString::number(key()) + ": "; } - for(QStringList::const_iterator i = tracedExpressions_.begin(), + for(TQStringList::const_iterator i = tracedExpressions_.begin(), e = tracedExpressions_.end(); i != e; ++i) { result += " " + *i + " = %d"; @@ -310,7 +310,7 @@ QString Breakpoint::traceRealFormatString() const // Quote the thing result = "\"" + result + "\\n\""; - for(QStringList::const_iterator i = tracedExpressions_.begin(), + for(TQStringList::const_iterator i = tracedExpressions_.begin(), e = tracedExpressions_.end(); i != e; ++i) { result += ", " + *i; @@ -381,21 +381,21 @@ FilePosBreakpoint::FilePosBreakpoint() line_(-1) {} -FilePosBreakpoint::FilePosBreakpoint(const QString &fileName, int lineNum, +FilePosBreakpoint::FilePosBreakpoint(const TQString &fileName, int lineNum, bool temporary, bool enabled) : Breakpoint(temporary, enabled) { // Sets 'subtype' - setLocation(QString("%1:%2").arg(fileName).arg(lineNum)); + setLocation(TQString("%1:%2").arg(fileName).arg(lineNum)); } FilePosBreakpoint::~FilePosBreakpoint() { } -QString FilePosBreakpoint::dbgSetCommand(GDBController *c) const +TQString FilePosBreakpoint::dbgSetCommand(GDBController *c) const { - QString cmdStr = "-break-insert"; + TQString cmdStr = "-break-insert"; if (isTemporary()) cmdStr = cmdStr + " -t"; @@ -416,7 +416,7 @@ bool FilePosBreakpoint::match_data(const Breakpoint *xb) const return false; } -QString FilePosBreakpoint::displayType() const +TQString FilePosBreakpoint::displayType() const { return i18n("Code breakpoint", "Code"); } @@ -431,7 +431,7 @@ bool FilePosBreakpoint::hasFileAndLine() const return line_ != -1; } -QString FilePosBreakpoint::fileName() const +TQString FilePosBreakpoint::fileName() const { return fileName_; } @@ -443,11 +443,11 @@ unsigned FilePosBreakpoint::lineNum() const -QString FilePosBreakpoint::location(bool compact) const +TQString FilePosBreakpoint::location(bool compact) const { if (subtype_ == filepos && hasFileAndLine() && compact) { - return QFileInfo(fileName_).fileName()+":"+QString::number(line_); + return TQFileInfo(fileName_).fileName()+":"+TQString::number(line_); } else { @@ -457,21 +457,21 @@ QString FilePosBreakpoint::location(bool compact) const /***************************************************************************/ -void FilePosBreakpoint::setLocation(const QString& location) +void FilePosBreakpoint::setLocation(const TQString& location) { location_ = location; - QRegExp regExp1("(.*):(\\d+)$"); + TQRegExp regExp1("(.*):(\\d+)$"); regExp1.setMinimal(true); if ( regExp1.search(location, 0) >= 0 ) { subtype_ = filepos; - QString t = regExp1.cap(1); - QString dirPath = QFileInfo(t).dirPath(); + TQString t = regExp1.cap(1); + TQString dirPath = TQFileInfo(t).dirPath(); if ( dirPath == "." ) { - QString existingDirPath = QFileInfo(fileName_).dirPath(); + TQString existingDirPath = TQFileInfo(fileName_).dirPath(); if (existingDirPath != ".") fileName_ = existingDirPath+"/"+regExp1.cap(1); else @@ -482,7 +482,7 @@ void FilePosBreakpoint::setLocation(const QString& location) line_ = regExp1.cap(2).toInt(); - location_ = QString("%1:%2").arg(fileName_).arg(regExp1.cap(2)); + location_ = TQString("%1:%2").arg(fileName_).arg(regExp1.cap(2)); } else { @@ -516,7 +516,7 @@ void FilePosBreakpoint::handleSet(const GDBMI::ResultRecord& r) /***************************************************************************/ /***************************************************************************/ -Watchpoint::Watchpoint(const QString& varName, bool temporary, bool enabled) +Watchpoint::Watchpoint(const TQString& varName, bool temporary, bool enabled) : Breakpoint(temporary, enabled), varName_(varName) { @@ -536,7 +536,7 @@ void Watchpoint::setBreakpoint(GDBController* controller) controller->addCommandBeforeRun( new GDBCommand( - QString("-data-evaluate-expression &%1").arg(varName_), + TQString("-data-evaluate-expression &%1").arg(varName_), this, &Watchpoint::handleAddressComputed)); } @@ -547,7 +547,7 @@ void Watchpoint::handleAddressComputed(const GDBMI::ResultRecord& r) address_ = r["value"].literal().toULongLong(0, 16); controller()->addCommandBeforeRun( new GDBCommand( - QString("-break-watch *%1").arg(r["value"].literal()), + TQString("-break-watch *%1").arg(r["value"].literal()), static_cast(this), &Watchpoint::handleSet)); } @@ -577,9 +577,9 @@ void Watchpoint::removedInGdb() /***************************************************************************/ -QString Watchpoint::dbgSetCommand(GDBController *) const +TQString Watchpoint::dbgSetCommand(GDBController *) const { - return QString("-break-watch ")+varName_; // gdb command - not translatable + return TQString("-break-watch ")+varName_; // gdb command - not translatable } /***************************************************************************/ @@ -591,14 +591,14 @@ bool Watchpoint::match_data(const Breakpoint* xb) const return (varName_ == b->varName_); } -ReadWatchpoint::ReadWatchpoint(const QString& varName, bool temporary, bool enabled) +ReadWatchpoint::ReadWatchpoint(const TQString& varName, bool temporary, bool enabled) : Watchpoint(varName, temporary, enabled) { } -QString ReadWatchpoint::dbgSetCommand(GDBController *) const +TQString ReadWatchpoint::dbgSetCommand(GDBController *) const { - return QString("-break-watch -r ")+varName(); + return TQString("-break-watch -r ")+varName(); } bool ReadWatchpoint::match_data(const Breakpoint* xb) const @@ -625,7 +625,7 @@ bool ReadWatchpoint::match_data(const Breakpoint* xb) const // ///***************************************************************************/ // -//QString ExitBreakpoint::dbgSetCommand() const +//TQString ExitBreakpoint::dbgSetCommand() const //{ // return ""; //} @@ -667,14 +667,14 @@ bool ReadWatchpoint::match_data(const Breakpoint* xb) const // ///***************************************************************************/ // -//QString RegExpBreakpoint::dbgSetCommand() const +//TQString RegExpBreakpoint::dbgSetCommand() const //{ // return ""; //} // ///***************************************************************************/ // -////QString RegExpBreakpoint::dbgRemoveCommand() const +////TQString RegExpBreakpoint::dbgRemoveCommand() const ////{ //// return ""; ////} @@ -698,14 +698,14 @@ bool ReadWatchpoint::match_data(const Breakpoint* xb) const // ///***************************************************************************/ // -//QString CatchBreakpoint::dbgSetCommand() const +//TQString CatchBreakpoint::dbgSetCommand() const //{ // return ""; //} // ///***************************************************************************/ // -////QString CatchBreakpoint::dbgRemoveCommand() const +////TQString CatchBreakpoint::dbgRemoveCommand() const ////{ //// return ""; ////} diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h index f06fc3d3..8470617c 100644 --- a/languages/cpp/debugger/breakpoint.h +++ b/languages/cpp/debugger/breakpoint.h @@ -18,9 +18,9 @@ #include -#include -#include -#include +#include +#include +#include /***************************************************************************/ /***************************************************************************/ @@ -60,8 +60,8 @@ public: - virtual QString dbgSetCommand(GDBController *) const = 0; - virtual QString dbgRemoveCommand() const; + virtual TQString dbgSetCommand(GDBController *) const = 0; + virtual TQString dbgRemoveCommand() const; /** Returns true if 'breakpoint' is identical to *this. Checks for trival cases like pointer equality and differing typeid() and then calls virtual @@ -95,11 +95,11 @@ public: void setIgnoreCount(int ignoreCount) { ignoreCount_ = ignoreCount; } int ignoreCount() const { return ignoreCount_; } - void setAddress(const QString &address) { address_ = address; } - QString address() const { return address_; } + void setAddress(const TQString &address) { address_ = address; } + TQString address() const { return address_; } - void setConditional(const QString &condition) { condition_ = condition; } - QString conditional() const { return condition_; } + void setConditional(const TQString &condition) { condition_ = condition; } + TQString conditional() const { return condition_; } void setPending(bool pending) { s_pending_ = pending; } bool isPending() const { return s_pending_; } @@ -127,27 +127,27 @@ public: void setHits(int hits) { hits_ = hits; } int hits() const { return hits_; } - virtual QString statusDisplay(int activeFlag) const; + virtual TQString statusDisplay(int activeFlag) const; virtual BP_TYPES type() const { return BP_TYPE_Invalid; } - virtual QString displayType() const { return i18n( "Invalid" ); } + virtual TQString displayType() const { return i18n( "Invalid" ); } bool tracingEnabled() const { return s_tracingEnabled_; } void setTracingEnabled(bool enable) { s_tracingEnabled_ = enable; } - const QStringList& tracedExpressions() const { return tracedExpressions_; } - void setTracedExpressions(const QStringList& l) { tracedExpressions_ = l; } + const TQStringList& tracedExpressions() const { return tracedExpressions_; } + void setTracedExpressions(const TQStringList& l) { tracedExpressions_ = l; } bool traceFormatStringEnabled() const { return s_traceFormatStringEnabled_; } void setTraceFormatStringEnabled(bool en) { s_traceFormatStringEnabled_ = en; } - const QString& traceFormatString() const { return traceFormatString_; } - void setTraceFormatString(const QString& s) { traceFormatString_ = s; } + const TQString& traceFormatString() const { return traceFormatString_; } + void setTraceFormatString(const TQString& s) { traceFormatString_ = s; } - QString traceRealFormatString() const; + TQString traceRealFormatString() const; - virtual QString location(bool compact=true) const = 0; - virtual void setLocation(const QString& ) = 0; + virtual TQString location(bool compact=true) const = 0; + virtual void setLocation(const TQString& ) = 0; virtual bool isValid() const = 0; signals: @@ -187,10 +187,10 @@ private: int active_; // counter incremented on receipt of all BP's int ignoreCount_; - QString address_; - QString condition_; - QStringList tracedExpressions_; - QString traceFormatString_; + TQString address_; + TQString condition_; + TQStringList tracedExpressions_; + TQString traceFormatString_; GDBController* controller_; }; @@ -203,20 +203,20 @@ class FilePosBreakpoint : public Breakpoint public: FilePosBreakpoint(); - FilePosBreakpoint(const QString &fileName, int lineNum, + FilePosBreakpoint(const TQString &fileName, int lineNum, bool temporary=false, bool enabled=true); virtual ~FilePosBreakpoint(); - virtual QString dbgSetCommand(GDBController *) const; + virtual TQString dbgSetCommand(GDBController *) const; virtual bool match_data(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_FilePos; } - QString displayType() const; - QString location(bool compact=true) const; - void setLocation(const QString& location); + TQString displayType() const; + TQString location(bool compact=true) const; + void setLocation(const TQString& location); bool isValid() const; bool hasFileAndLine() const; - QString fileName() const; + TQString fileName() const; unsigned lineNum() const; protected: @@ -228,8 +228,8 @@ private: enum subtype { filepos = 1, function, address }; subtype subtype_; - QString location_; - QString fileName_; + TQString location_; + TQString fileName_; int line_; }; /***************************************************************************/ @@ -240,7 +240,7 @@ private: //public: // RegExpBreakpoint(bool temporary=false, bool enabled=true); // virtual ~RegExpBreakpoint(); -// virtual QString dbgSetCommand() const; +// virtual TQString dbgSetCommand() const; //}; /***************************************************************************/ /***************************************************************************/ @@ -250,7 +250,7 @@ private: //public: // CatchBreakpoint(bool temporary=false, bool enabled=true); // virtual ~CatchBreakpoint(); -// virtual QString dbgSetCommand() const; +// virtual TQString dbgSetCommand() const; // virtual CatchBreakpoint& operator=(const CatchBreakpoint& rhs); //}; /***************************************************************************/ @@ -261,7 +261,7 @@ private: //public: // ExitBreakpoint(bool temporary=false, bool enabled=true); // virtual ~ExitBreakpoint(); -// virtual QString dbgSetCommand() const; +// virtual TQString dbgSetCommand() const; // bool match(const Breakpoint* brkpt) const; // virtual void configureDisplay(); //}; @@ -271,9 +271,9 @@ private: class Watchpoint : public Breakpoint { public: - Watchpoint(const QString &varName, bool temporary=false, bool enabled=true); + Watchpoint(const TQString &varName, bool temporary=false, bool enabled=true); virtual ~Watchpoint(); - virtual QString dbgSetCommand(GDBController *) const; + virtual TQString dbgSetCommand(GDBController *) const; void applicationExited(GDBController*); void removedInGdb(); @@ -281,31 +281,31 @@ public: bool match_data(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_Watchpoint; } - QString displayType() const { return i18n("Watchpoint"); } - void setVarName(const QString& varName) { varName_ = varName; } - QString varName() const { return varName_; } + TQString displayType() const { return i18n("Watchpoint"); } + void setVarName(const TQString& varName) { varName_ = varName; } + TQString varName() const { return varName_; } unsigned long long address() const { return address_; } - QString location(bool) const { return varName_; } - void setLocation(const QString& location) { varName_ = location; } + TQString location(bool) const { return varName_; } + void setLocation(const TQString& location) { varName_ = location; } bool isValid() const { return !varName_.isEmpty(); } private: void setBreakpoint(GDBController* controller); void handleAddressComputed(const GDBMI::ResultRecord&); - QString varName_; + TQString varName_; unsigned long long address_; }; class ReadWatchpoint : public Watchpoint { public: - ReadWatchpoint(const QString &varName, bool temporary=false, bool enabled=true); - virtual QString dbgSetCommand(GDBController *) const; + ReadWatchpoint(const TQString &varName, bool temporary=false, bool enabled=true); + virtual TQString dbgSetCommand(GDBController *) const; bool match_data(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_ReadWatchpoint; } - QString displayType() const { return i18n("Read Watchpoint"); } + TQString displayType() const { return i18n("Read Watchpoint"); } }; } diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h index 8d13f2d0..5085da79 100644 --- a/languages/cpp/debugger/dbgcontroller.h +++ b/languages/cpp/debugger/dbgcontroller.h @@ -18,7 +18,7 @@ #include "mi/gdbmi.h" -#include +#include #include @@ -79,7 +79,7 @@ public: public slots: virtual void configure() = 0; - virtual void slotCoreFile(const QString &coreFile) = 0; + virtual void slotCoreFile(const TQString &coreFile) = 0; virtual void slotAttachTo(int pid) = 0; virtual void slotStopDebugger() = 0; @@ -87,8 +87,8 @@ public slots: virtual void slotRun() = 0; // Kills the application but does not stop the debugger itself. virtual void slotKill() = 0; - virtual void slotRunUntil(const QString &fileName, int lineNum) = 0; - virtual void slotJumpTo(const QString &fileName, int lineNum) = 0; + virtual void slotRunUntil(const TQString &fileName, int lineNum) = 0; + virtual void slotJumpTo(const TQString &fileName, int lineNum) = 0; virtual void slotStepInto() = 0; virtual void slotStepOver() = 0; virtual void slotStepIntoIns() = 0; @@ -107,7 +107,7 @@ protected slots: virtual void slotDbgProcessExited(KProcess *proc) = 0; signals: - void gotoSourcePosition (const QString &fileName, int lineNum); + void gotoSourcePosition (const TQString &fileName, int lineNum); void rawGDBMemoryDump (char *buf); void rawGDBRegisters (char *buf); void rawGDBLibraries (char *buf); @@ -116,8 +116,8 @@ signals: void gdbInternalCommandStdout (const char *output); void gdbUserCommandStdout (const char *output); void gdbStderr (const char *output); - void showStepInSource (const QString &fileName, int lineNum, const QString &address); - void dbgStatus (const QString &status, int statusFlag); + void showStepInSource (const TQString &fileName, int lineNum, const TQString &address); + void dbgStatus (const TQString &status, int statusFlag); protected: KProcess *dbgProcess_; diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 524e4539..e96d7395 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -26,15 +26,15 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -50,11 +50,11 @@ namespace GDBDebugger // For use with the internal debugger, but this dialog doesn't know anything // about why it's doing it. -Dbg_PS_Dialog::Dbg_PS_Dialog(QWidget *parent, const char *name) +Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) : KDialog(parent, name, true), // modal psProc_(0), pids_(new KListView(this)), - pidLines_(QString()) + pidLines_(TQString()) { setCaption(i18n("Attach to Process")); @@ -65,7 +65,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(QWidget *parent, const char *name) pids_->addColumn("COMMAND"); - QBoxLayout *topLayout = new QVBoxLayout(this, 5); + TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); searchLineWidget_ = new KListViewSearchLineWidget(pids_, this); topLayout->addWidget(searchLineWidget_); @@ -75,19 +75,19 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(QWidget *parent, const char *name) KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal); buttonbox->addStretch(); - QPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); + TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); buttonbox->layout(); topLayout->addWidget(buttonbox); - connect(ok, SIGNAL(clicked()), SLOT(accept())); - connect(cancel, SIGNAL(clicked()), SLOT(reject())); + connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); // Default display to 40 chars wide, default height is okay resize( ((KGlobalSettings::fixedFont()).pointSize())*40, height()); topLayout->activate(); - QTimer::singleShot(0, this, SLOT(slotInit())); + TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); } @@ -133,8 +133,8 @@ void Dbg_PS_Dialog::slotInit() } #endif - connect( psProc_, SIGNAL(processExited(KProcess *)), SLOT(slotProcessExited()) ); - connect( psProc_, SIGNAL(receivedStdout(KProcess *, char *, int)), SLOT(slotReceivedOutput(KProcess *, char *, int)) ); + connect( psProc_, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotProcessExited()) ); + connect( psProc_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(KProcess *, char *, int)) ); psProc_->start(KProcess::NotifyOnExit, KProcess::Stdout); } @@ -143,7 +143,7 @@ void Dbg_PS_Dialog::slotInit() void Dbg_PS_Dialog::slotReceivedOutput(KProcess */*proc*/, char *buffer, int buflen) { - pidLines_ += QString::fromLocal8Bit(buffer, buflen); + pidLines_ += TQString::fromLocal8Bit(buffer, buflen); } /***************************************************************************/ @@ -158,10 +158,10 @@ void Dbg_PS_Dialog::slotProcessExited() int start = pidLines_.find('\n', 0); // Skip the first line (header line) int pos; - static QRegExp ps_output_line("^\\s*(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.+)"); + static TQRegExp ps_output_line("^\\s*(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.+)"); while ( (pos = pidLines_.find('\n', start)) != -1) { - QString item = pidLines_.mid(start, pos-start); + TQString item = pidLines_.mid(start, pos-start); if (!item.isEmpty() && item.find(pidCmd_) == -1) { if(ps_output_line.search(item) == -1) @@ -177,7 +177,7 @@ void Dbg_PS_Dialog::slotProcessExited() break; } - new QListViewItem(pids_, + new TQListViewItem(pids_, ps_output_line.cap(1), ps_output_line.cap(2), ps_output_line.cap(3), @@ -192,7 +192,7 @@ void Dbg_PS_Dialog::slotProcessExited() searchLineWidget_->searchLine()->setFocus(); } -void Dbg_PS_Dialog::focusIn(QFocusEvent*) +void Dbg_PS_Dialog::focusIn(TQFocusEvent*) { searchLineWidget_->searchLine()->setFocus(); } diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index d88eb72f..acc725bc 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -33,7 +33,7 @@ class Dbg_PS_Dialog : public KDialog Q_OBJECT public: - Dbg_PS_Dialog( QWidget *parent=0, const char *name=0 ); + Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 ); ~Dbg_PS_Dialog(); int pidSelected(); @@ -44,14 +44,14 @@ private slots: void slotProcessExited(); protected: - void focusIn(QFocusEvent*); + void focusIn(TQFocusEvent*); private: KProcess* psProc_; KListView* pids_; KListViewSearchLineWidget* searchLineWidget_; - QString pidLines_; - QString pidCmd_; + TQString pidLines_; + TQString pidCmd_; }; } diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index a3e58343..3fbef3c4 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -25,14 +25,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // ************************************************************************** // ************************************************************************** @@ -71,25 +71,25 @@ public: DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0); virtual ~DbgMoveHandle(); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); private: DbgToolBar* toolBar_; - QPoint offset_; + TQPoint offset_; bool moving_; }; // ************************************************************************** DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f) - : QFrame(parent, name, f), + : TQFrame(parent, name, f), toolBar_(parent), - offset_(QPoint(0,0)), + offset_(TQPoint(0,0)), moving_(false) { - setFrameStyle(QFrame::Panel|QFrame::Raised); + setFrameStyle(TQFrame::Panel|TQFrame::Raised); setFixedHeight(12); } @@ -101,9 +101,9 @@ DbgMoveHandle::~DbgMoveHandle() // ************************************************************************** -void DbgMoveHandle::mousePressEvent(QMouseEvent *e) +void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) { - QFrame::mousePressEvent(e); + TQFrame::mousePressEvent(e); if (moving_) return; @@ -111,38 +111,38 @@ void DbgMoveHandle::mousePressEvent(QMouseEvent *e) KPopupMenu *menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), SLOT(slotDock())); + parent(), TQT_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"), - parent(), SLOT(slotIconifyAndDock())); + parent(), TQT_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; offset_ = parentWidget()->pos() - e->globalPos(); - setFrameStyle(QFrame::Panel|QFrame::Sunken); - QApplication::setOverrideCursor(QCursor(sizeAllCursor)); - setPalette(QPalette(colorGroup().background())); + setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); + setPalette(TQPalette(colorGroup().background())); repaint(); } } // ************************************************************************** -void DbgMoveHandle::mouseReleaseEvent(QMouseEvent *e) +void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e) { - QFrame::mouseReleaseEvent(e); + TQFrame::mouseReleaseEvent(e); moving_ = false; - offset_ = QPoint(0,0); - setFrameStyle(QFrame::Panel|QFrame::Raised); - QApplication::restoreOverrideCursor(); - setPalette(QPalette(colorGroup().background())); + offset_ = TQPoint(0,0); + setFrameStyle(TQFrame::Panel|TQFrame::Raised); + TQApplication::restoreOverrideCursor(); + setPalette(TQPalette(colorGroup().background())); repaint(); } // ************************************************************************** -void DbgMoveHandle::mouseMoveEvent(QMouseEvent *e) +void DbgMoveHandle::mouseMoveEvent(TQMouseEvent *e) { - QFrame::mouseMoveEvent(e); + TQFrame::mouseMoveEvent(e); if (!moving_) return; @@ -158,21 +158,21 @@ void DbgMoveHandle::mouseMoveEvent(QMouseEvent *e) class DbgButton : public QPushButton { public: - DbgButton(const QPixmap &pixmap, const QString &text, + DbgButton(const TQPixmap &pixmap, const TQString &text, DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; - void drawButtonLabel(QPainter *painter); - QSize sizeHint() const; + void drawButtonLabel(TQPainter *painter); + TQSize sizeHint() const; private: - QPixmap pixmap_; + TQPixmap pixmap_; }; // ************************************************************************** -DbgButton::DbgButton(const QPixmap& pixmap, const QString& text, +DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text, DbgToolBar* parent, const char* name) - : QPushButton(parent, name), + : TQPushButton(parent, name), pixmap_(pixmap) { setText(text); @@ -180,7 +180,7 @@ DbgButton::DbgButton(const QPixmap& pixmap, const QString& text, // ************************************************************************** -void DbgButton::drawButtonLabel(QPainter *painter) +void DbgButton::drawButtonLabel(TQPainter *painter) { // We always have a pixmap (today...) // Centre it if there's no text @@ -198,15 +198,15 @@ void DbgButton::drawButtonLabel(QPainter *painter) // ************************************************************************** -QSize DbgButton::sizeHint() const +TQSize DbgButton::sizeHint() const { if (text().isEmpty()) return pixmap_.size(); else { - QSize ps = pixmap_.size(); - QSize bs = QPushButton::sizeHint(); - QSize result; + TQSize ps = pixmap_.size(); + TQSize bs = TQPushButton::sizeHint(); + TQSize result; result.setWidth( ps.width() + bs.width()+10 ); result.setHeight( ps.height() > bs.height() ? ps.height() : bs.height() ); return result; @@ -217,17 +217,17 @@ QSize DbgButton::sizeHint() const // ************************************************************************** // ************************************************************************** -DbgDocker::DbgDocker(QWidget* parent, DbgToolBar* toolBar, const QPixmap& pixmap) : +DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) : KSystemTray(parent, "DbgDocker"), toolBar_(toolBar) { setPixmap(pixmap); - QToolTip::add( this, i18n("KDevelop debugger: Click to execute one line of code (\"step\")") ); + TQToolTip::add( this, i18n("KDevelop debugger: Click to execute one line of code (\"step\")") ); } // ************************************************************************** -void DbgDocker::mousePressEvent(QMouseEvent *e) +void DbgDocker::mousePressEvent(TQMouseEvent *e) { if (!rect().contains( e->pos())) return; @@ -243,8 +243,8 @@ void DbgDocker::mousePressEvent(QMouseEvent *e) { KPopupMenu* menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); - menu->insertItem(i18n("Activate"), toolBar_, SLOT(slotUndock())); - menu->insertItem(i18n("Activate (KDevelop gets focus)"), toolBar_, SLOT(slotActivateAndUndock())); + menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); + menu->insertItem(i18n("Activate (KDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); menu->popup(e->globalPos()); break; } @@ -258,8 +258,8 @@ void DbgDocker::mousePressEvent(QMouseEvent *e) // ************************************************************************** DbgToolBar::DbgToolBar(DebuggerPart* part, - QWidget* parent, const char* name) - : QFrame(0, name), + TQWidget* parent, const char* name) + : TQFrame(0, name), part_(part), activeWindow_(0), winModule_(0), @@ -272,7 +272,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, { winModule_ = new KWinModule(this); docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); - connect(docker_, SIGNAL(clicked()), part_, SLOT(slotStepOver())); + connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. // see slotDbgKdevFocus() for more comments @@ -286,65 +286,65 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, KWin::setType(winId(), NET::Dock); setFocusPolicy(NoFocus); - setFrameStyle( QFrame::Box | QFrame::Plain ); + setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth(4); setMidLineWidth(0); - QBoxLayout* topLayout = new QVBoxLayout(this); + TQBoxLayout* topLayout = new TQVBoxLayout(this); - QBoxLayout* nextLayout = new QHBoxLayout(); - QBoxLayout* stepLayout = new QHBoxLayout(); - QBoxLayout* focusLayout = new QHBoxLayout(); + TQBoxLayout* nextLayout = new TQHBoxLayout(); + TQBoxLayout* stepLayout = new TQHBoxLayout(); + TQBoxLayout* focusLayout = new TQHBoxLayout(); DbgMoveHandle* moveHandle= new DbgMoveHandle(this); - QPushButton* bRun = new DbgButton(BarIcon("dbgrun"), i18n("Run"), this); - QPushButton* bInterrupt = new DbgButton(BarIcon("player_pause"), i18n("Interrupt"), this); - QPushButton* bNext = new DbgButton(BarIcon("dbgnext"), QString::null, this); - QPushButton* bNexti = new DbgButton(BarIcon("dbgnextinst"), QString::null, this); - QPushButton* bStep = new DbgButton(BarIcon("dbgstep"), QString::null, this); - QPushButton* bStepi = new DbgButton(BarIcon("dbgstepinst"), QString::null, this); - QPushButton* bFinish = new DbgButton(BarIcon("dbgstepout"), i18n("Step Out"), this); - QPushButton* bRunTo = new DbgButton(BarIcon("dbgrunto"), i18n("Run to Cursor"), this); - QPushButton* bView = new DbgButton(BarIcon("dbgmemview"), i18n("Viewers"), this); - bKDevFocus_ = new DbgButton(BarIcon("kdevelop"), QString::null, this); - bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), QString::null, this); - - connect(bRun, SIGNAL(clicked()), part_, SLOT(slotRun())); - connect(bInterrupt, SIGNAL(clicked()), part_, SLOT(slotPause())); - connect(bNext, SIGNAL(clicked()), part_, SLOT(slotStepOver())); - connect(bNexti, SIGNAL(clicked()), part_, SLOT(slotStepOverInstruction())); - connect(bStep, SIGNAL(clicked()), part_, SLOT(slotStepInto())); - connect(bStepi, SIGNAL(clicked()), part_, SLOT(slotStepIntoInstruction())); - connect(bFinish, SIGNAL(clicked()), part_, SLOT(slotStepOut())); - connect(bRunTo, SIGNAL(clicked()), part_, SLOT(slotRunToCursor())); - connect(bView, SIGNAL(clicked()), part_, SLOT(slotMemoryView())); - connect(bKDevFocus_, SIGNAL(clicked()), this, SLOT(slotKdevFocus())); - connect(bPrevFocus_, SIGNAL(clicked()), this, SLOT(slotPrevFocus())); - - QToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); - QToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); - QToolTip::add( bNext, i18n("Execute one line of code, but run through functions") ); - QToolTip::add( bNexti, i18n("Execute one assembler instruction, but run through functions") ); - QToolTip::add( bStep, i18n("Execute one line of code, stepping into functions if appropriate") ); - QToolTip::add( bStepi, i18n("Execute one assembler instruction, stepping into functions if appropriate") ); - QToolTip::add( bFinish, i18n("Execute to end of current stack frame") ); - QToolTip::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); - QToolTip::add( bView, i18n("Memory, dissemble, registers, library viewers") ); - QToolTip::add( bKDevFocus_, i18n("Set focus on KDevelop") ); - QToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus") ); - - QWhatsThis::add( bRun, i18n("Continue with application execution. May start the application.") ); - QWhatsThis::add( bInterrupt, i18n("Interrupt the application execution.") ); - QWhatsThis::add( bNext, i18n("Execute one line of code, but run through functions.") ); - QWhatsThis::add( bNexti, i18n("Execute one assembler instruction, but run through functions.") ); - QWhatsThis::add( bStep, i18n("Execute one line of code, stepping into functions if appropriate.") ); - QWhatsThis::add( bStepi, i18n("Execute one assembler instruction, stepping into functions if appropriate.") ); - QWhatsThis::add( bFinish, i18n("Execute to end of current stack frame.") ); - QWhatsThis::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); - QWhatsThis::add( bView, i18n("Memory, dissemble, registers, library viewers.") ); - QWhatsThis::add( bKDevFocus_, i18n("Set focus on KDevelop.") ); - QWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus.") ); + TQPushButton* bRun = new DbgButton(BarIcon("dbgrun"), i18n("Run"), this); + TQPushButton* bInterrupt = new DbgButton(BarIcon("player_pause"), i18n("Interrupt"), this); + TQPushButton* bNext = new DbgButton(BarIcon("dbgnext"), TQString::null, this); + TQPushButton* bNexti = new DbgButton(BarIcon("dbgnextinst"), TQString::null, this); + TQPushButton* bStep = new DbgButton(BarIcon("dbgstep"), TQString::null, this); + TQPushButton* bStepi = new DbgButton(BarIcon("dbgstepinst"), TQString::null, this); + TQPushButton* bFinish = new DbgButton(BarIcon("dbgstepout"), i18n("Step Out"), this); + TQPushButton* bRunTo = new DbgButton(BarIcon("dbgrunto"), i18n("Run to Cursor"), this); + TQPushButton* bView = new DbgButton(BarIcon("dbgmemview"), i18n("Viewers"), this); + bKDevFocus_ = new DbgButton(BarIcon("kdevelop"), TQString::null, this); + bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString::null, this); + + connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); + connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); + connect(bNext, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); + connect(bNexti, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOverInstruction())); + connect(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); + connect(bStepi, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepIntoInstruction())); + connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); + connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); + connect(bView, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotMemoryView())); + connect(bKDevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKdevFocus())); + connect(bPrevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevFocus())); + + TQToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); + TQToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); + TQToolTip::add( bNext, i18n("Execute one line of code, but run through functions") ); + TQToolTip::add( bNexti, i18n("Execute one assembler instruction, but run through functions") ); + TQToolTip::add( bStep, i18n("Execute one line of code, stepping into functions if appropriate") ); + TQToolTip::add( bStepi, i18n("Execute one assembler instruction, stepping into functions if appropriate") ); + TQToolTip::add( bFinish, i18n("Execute to end of current stack frame") ); + TQToolTip::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); + TQToolTip::add( bView, i18n("Memory, dissemble, registers, library viewers") ); + TQToolTip::add( bKDevFocus_, i18n("Set focus on KDevelop") ); + TQToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus") ); + + TQWhatsThis::add( bRun, i18n("Continue with application execution. May start the application.") ); + TQWhatsThis::add( bInterrupt, i18n("Interrupt the application execution.") ); + TQWhatsThis::add( bNext, i18n("Execute one line of code, but run through functions.") ); + TQWhatsThis::add( bNexti, i18n("Execute one assembler instruction, but run through functions.") ); + TQWhatsThis::add( bStep, i18n("Execute one line of code, stepping into functions if appropriate.") ); + TQWhatsThis::add( bStepi, i18n("Execute one assembler instruction, stepping into functions if appropriate.") ); + TQWhatsThis::add( bFinish, i18n("Execute to end of current stack frame.") ); + TQWhatsThis::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); + TQWhatsThis::add( bView, i18n("Memory, dissemble, registers, library viewers.") ); + TQWhatsThis::add( bKDevFocus_, i18n("Set focus on KDevelop.") ); + TQWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus.") ); topLayout->addWidget(moveHandle); topLayout->addWidget(bRun); @@ -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::slotDbgStatus(const QString&, int state) +void DbgToolBar::slotDbgStatus(const TQString&, int state) { bool appIndicator = state & s_dbgBusy; if (appIndicator != appIsActive_) { @@ -435,11 +435,11 @@ void DbgToolBar::slotDbgStatus(const QString&, int state) void DbgToolBar::setAppIndicator(bool appIndicator) { if (appIndicator) { - bPrevFocus_->setPalette(QPalette(colorGroup().mid())); - bKDevFocus_->setPalette(QPalette(colorGroup().background())); + bPrevFocus_->setPalette(TQPalette(colorGroup().mid())); + bKDevFocus_->setPalette(TQPalette(colorGroup().background())); } else { - bPrevFocus_->setPalette(QPalette(colorGroup().background())); - bKDevFocus_->setPalette(QPalette(colorGroup().mid())); + bPrevFocus_->setPalette(TQPalette(colorGroup().background())); + bKDevFocus_->setPalette(TQPalette(colorGroup().mid())); } } diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h index 4f284701..188862d4 100644 --- a/languages/cpp/debugger/dbgtoolbar.h +++ b/languages/cpp/debugger/dbgtoolbar.h @@ -21,7 +21,7 @@ class KWinModule; #include #include // needed for WId :( -#include +#include namespace GDBDebugger { @@ -35,9 +35,9 @@ class DbgDocker : public KSystemTray Q_OBJECT public: - DbgDocker(QWidget *parent, DbgToolBar *toolBar, const QPixmap &pixmap); + DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap); virtual ~DbgDocker() {}; - virtual void mousePressEvent(QMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); signals: void clicked(); @@ -52,11 +52,11 @@ class DbgToolBar : public QFrame Q_OBJECT public: - DbgToolBar(DebuggerPart *part, QWidget* parent, const char* name=0); + DbgToolBar(DebuggerPart *part, TQWidget* parent, const char* name=0); virtual ~DbgToolBar(); private slots: - void slotDbgStatus(const QString&, 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 11de247f..f2891378 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.cpp +++ b/languages/cpp/debugger/debuggerconfigwidget.cpp @@ -20,24 +20,24 @@ #include #include -#include -#include -#include +#include +#include +#include namespace GDBDebugger { -DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, QWidget *parent, const char *name) +DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, const char *name) : DebuggerConfigWidgetBase(parent, name), dom(*part->projectDom()) { gdbPath_edit->setMode(KFile::File|KFile::ExistingOnly|KFile::LocalOnly); gdbPath_edit->setURL( DomUtil::readEntry(dom, "/kdevdebugger/general/gdbpath")); - QString shell = DomUtil::readEntry(dom, "/kdevdebugger/general/dbgshell","no_value"); - if( shell == QString("no_value") ) + TQString shell = DomUtil::readEntry(dom, "/kdevdebugger/general/dbgshell","no_value"); + if( shell == TQString("no_value") ) { - shell = QString::null; + shell = TQString::null; } debuggingShell_edit->setURL( shell ); diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h index dbf63d4b..3a8283a2 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.h +++ b/languages/cpp/debugger/debuggerconfigwidget.h @@ -16,7 +16,7 @@ #include "debuggerconfigwidgetbase.h" -#include +#include namespace GDBDebugger { @@ -28,14 +28,14 @@ class DebuggerConfigWidget : public DebuggerConfigWidgetBase Q_OBJECT public: - DebuggerConfigWidget( DebuggerPart* part, QWidget *parent=0, const char *name=0 ); + DebuggerConfigWidget( DebuggerPart* part, TQWidget *parent=0, const char *name=0 ); ~DebuggerConfigWidget(); public slots: void accept(); private: - QDomDocument &dom; + TQDomDocument &dom; }; } diff --git a/languages/cpp/debugger/debuggerdcopinterface.h b/languages/cpp/debugger/debuggerdcopinterface.h index 4a9bcf30..afde8b09 100644 --- a/languages/cpp/debugger/debuggerdcopinterface.h +++ b/languages/cpp/debugger/debuggerdcopinterface.h @@ -23,7 +23,7 @@ public: k_dcop: virtual ASYNC slotDebugExternalProcess() = 0; - virtual ASYNC slotDebugCommandLine(const QString& command) = 0; + virtual ASYNC slotDebugCommandLine(const TQString& command) = 0; }; #endif diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index c8c3c1a1..4842ca84 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -14,11 +14,11 @@ #include "debuggerpart.h" #include "label_with_double_click.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -76,7 +76,7 @@ static const KDevPluginInfo data("kdevdebugger"); typedef KDevGenericFactory DebuggerFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) ) -DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList & ) : +DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : KDevPlugin( &data, parent, name ? name : "DebuggerPart" ), controller(0), previousDebuggerState_(s_dbgNotStarted), justRestarted_(false), needRebuild_(true), @@ -104,7 +104,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList gdbBreakpointWidget = new GDBBreakpointWidget( controller, 0, "gdbBreakpointWidget" ); gdbBreakpointWidget->setCaption(i18n("Breakpoint List")); - QWhatsThis::add + TQWhatsThis::add (gdbBreakpointWidget, i18n("Breakpoint list

    " "Displays a list of breakpoints with " "their current status. Clicking on a " @@ -124,7 +124,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList framestackWidget = new FramestackWidget( controller, 0, "framestackWidget" ); framestackWidget->setEnabled(false); framestackWidget->setCaption(i18n("Frame Stack")); - QWhatsThis::add + TQWhatsThis::add (framestackWidget, i18n("Frame stack

    " "Often referred to as the \"call stack\", " "this is a list showing what function is " @@ -140,7 +140,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList disassembleWidget = new DisassembleWidget( controller, 0, "disassembleWidget" ); disassembleWidget->setEnabled(false); disassembleWidget->setCaption(i18n("Machine Code Display")); - QWhatsThis::add + TQWhatsThis::add (disassembleWidget, i18n("Machine code display

    " "A machine code view into your running " "executable with the current instruction " @@ -157,7 +157,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList gdbOutputWidget->setEnabled(false); gdbOutputWidget->setIcon( SmallIcon("inline_image") ); gdbOutputWidget->setCaption(i18n("GDB Output")); - QWhatsThis::add + TQWhatsThis::add (gdbOutputWidget, i18n("GDB output

    " "Shows all gdb commands being executed. " "You can also issue any other gdb command while debugging.")); @@ -166,12 +166,12 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList mainWindow()->setViewAvailable(gdbOutputWidget, false); // gdbBreakpointWidget -> this - connect( gdbBreakpointWidget, SIGNAL(refreshBPState(const Breakpoint&)), - this, SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, SIGNAL(publishBPState(const Breakpoint&)), - this, SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, SIGNAL(gotoSourcePosition(const QString&, int)), - this, SLOT(slotGotoSource(const QString&, int)) ); + connect( gdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), + this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); viewerWidget = new ViewerWidget( controller, 0, "viewerWidget"); @@ -179,15 +179,15 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList i18n("Debug views"), i18n("Special debugger views")); mainWindow()->setViewAvailable(viewerWidget, false); - connect(viewerWidget, SIGNAL(setViewShown(bool)), - this, SLOT(slotShowView(bool))); + connect(viewerWidget, TQT_SIGNAL(setViewShown(bool)), + this, TQT_SLOT(slotShowView(bool))); // Now setup the actions KAction *action; // action = new KAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new KAction(i18n("&Start"), "dbgrun", Key_F9, - this, SLOT(slotRun()), + this, TQT_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("Start in debugger

    " @@ -198,7 +198,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList "about variables, frame stack, and so on.") ); action = new KAction(i18n("&Restart"), "dbgrestart", 0, - this, SLOT(slotRestart()), + this, TQT_SLOT(slotRestart()), actionCollection(), "debug_restart"); action->setToolTip( i18n("Restart program") ); action->setWhatsThis( i18n("Restarts application

    " @@ -208,33 +208,33 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Sto&p"), "stop", 0, - this, SLOT(slotStop()), + this, TQT_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("Stop debugger

    Kills the executable and exits the debugger.")); action = new KAction(i18n("Interrupt"), "player_pause", 0, - this, SLOT(slotPause()), + this, TQT_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("Interrupt application

    Interrupts the debugged process or current GDB command.")); action = new KAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, SLOT(slotRunToCursor()), + this, TQT_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("Run to cursor

    Continues execution until the cursor position is reached.")); action = new KAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0, - this, SLOT(slotJumpToCursor()), + this, TQT_SLOT(slotJumpToCursor()), actionCollection(), "debug_jumptocursor"); action->setToolTip( i18n("Jump to cursor") ); action->setWhatsThis(i18n("Set Execution Position

    Set the execution pointer to the current cursor position.")); action = new KAction(i18n("Step &Over"), "dbgnext", Key_F10, - this, SLOT(slotStepOver()), + this, TQT_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("Step over

    " @@ -245,14 +245,14 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, - this, SLOT(slotStepOverInstruction()), + this, TQT_SLOT(slotStepOverInstruction()), actionCollection(), "debug_stepoverinst"); action->setToolTip( i18n("Step over instruction") ); action->setWhatsThis(i18n("Step over instruction

    Steps over the next assembly instruction.")); action = new KAction(i18n("Step &Into"), "dbgstep", Key_F11, - this, SLOT(slotStepInto()), + this, TQT_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("Step into

    " @@ -262,14 +262,14 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, - this, SLOT(slotStepIntoInstruction()), + this, TQT_SLOT(slotStepIntoInstruction()), actionCollection(), "debug_stepintoinst"); action->setToolTip( i18n("Step into instruction") ); action->setWhatsThis(i18n("Step into instruction

    Steps into the next assembly instruction.")); action = new KAction(i18n("Step O&ut"), "dbgstepout", Key_F12, - this, SLOT(slotStepOut()), + this, TQT_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current function") ); action->setWhatsThis( i18n("Step out

    " @@ -281,7 +281,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Viewers"), "dbgmemview", 0, - this, SLOT(slotMemoryView()), + this, TQT_SLOT(slotMemoryView()), actionCollection(), "debug_memview"); action->setToolTip( i18n("Debugger viewers") ); action->setWhatsThis(i18n("Debugger viewers

    Various information about application being executed. There are 4 views available:
    " @@ -292,7 +292,7 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Examine Core File..."), "core", 0, - this, SLOT(slotExamineCore()), + this, TQT_SLOT(slotExamineCore()), actionCollection(), "debug_core"); action->setToolTip( i18n("Examine core file") ); action->setWhatsThis( i18n("Examine core file

    " @@ -304,72 +304,72 @@ DebuggerPart::DebuggerPart( QObject *parent, const char *name, const QStringList action = new KAction(i18n("Attach to Process"), "connect_creating", 0, - this, SLOT(slotAttachProcess()), + this, TQT_SLOT(slotAttachProcess()), actionCollection(), "debug_attach"); action->setToolTip( i18n("Attach to process") ); action->setWhatsThis(i18n("Attach to process

    Attaches the debugger to a running process.")); action = new KAction(i18n("Toggle Breakpoint"), 0, 0, - this, SLOT(toggleBreakpoint()), + this, TQT_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("Toggle breakpoint

    Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), SIGNAL(clientAdded(KXMLGUIClient*)), - this, SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( partController(), SIGNAL(loadedFile(const KURL &)), - gdbBreakpointWidget, SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), SIGNAL(toggledBreakpoint(const QString &, int)), - gdbBreakpointWidget, SLOT(slotToggleBreakpoint(const QString &, int)) ); - connect( debugger(), SIGNAL(editedBreakpoint(const QString &, int)), - gdbBreakpointWidget, SLOT(slotEditBreakpoint(const QString &, int)) ); - connect( debugger(), SIGNAL(toggledBreakpointEnabled(const QString &, int)), - gdbBreakpointWidget, SLOT(slotToggleBreakpointEnabled(const QString &, int)) ); + connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), + gdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), - this, SLOT(slotStop(KDevPlugin*)) ); - connect( core(), SIGNAL(projectClosed()), - this, SLOT(projectClosed()) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQT_SIGNAL(projectClosed()), + this, TQT_SLOT(projectClosed()) ); - connect( partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, SIGNAL(receivedStdoutLine(const QCString&)), - appFrontend(), SLOT(insertStdoutLine(const QCString&)) ); - connect( procLineMaker, SIGNAL(receivedStderrLine(const QCString&)), - appFrontend(), SLOT(insertStderrLine(const QCString&)) ); + connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); - connect( procLineMaker, SIGNAL(receivedPartialStdoutLine(const QCString&)), - appFrontend(), SLOT(addPartialStdoutLine(const QCString&))); - connect( procLineMaker, SIGNAL(receivedPartialStderrLine(const QCString&)), - appFrontend(), SLOT(addPartialStderrLine(const QCString&))); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&))); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&))); // The output from tracepoints goes to "application" window, because // we don't have any better alternative, and using yet another window // is undesirable. Besides, this makes tracepoint look even more similar // to printf debugging. - connect( gdbBreakpointWidget, SIGNAL(tracingOutput(const char*)), - procLineMaker, SLOT(slotReceivedStdout(const char*))); + connect( gdbBreakpointWidget, TQT_SIGNAL(tracingOutput(const char*)), + procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); - connect(partController(), SIGNAL(savedFile(const KURL &)), - this, SLOT(slotFileSaved())); + connect(partController(), TQT_SIGNAL(savedFile(const KURL &)), + this, TQT_SLOT(slotFileSaved())); if (project()) - connect(project(), SIGNAL(projectCompiled()), - this, SLOT(slotProjectCompiled())); + connect(project(), TQT_SIGNAL(projectCompiled()), + this, TQT_SLOT(slotProjectCompiled())); setupController(); - QTimer::singleShot(0, this, SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); } void DebuggerPart::setupDcop() @@ -379,24 +379,24 @@ void DebuggerPart::setupDcop() if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); - connect(kapp->dcopClient(), SIGNAL(applicationRegistered(const QCString&)), SLOT(slotDCOPApplicationRegistered(const QCString&))); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); kapp->dcopClient()->setNotifications(true); } -void DebuggerPart::slotDCOPApplicationRegistered(const QCString& appId) +void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) { if (appId.find("drkonqi-") == 0) { - QByteArray answer; - QCString replyType; + TQByteArray answer; + TQCString replyType; - kapp->dcopClient()->call(appId, "krashinfo", "appName()", QByteArray(), replyType, answer, true, 5000); + kapp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000); - QDataStream d(answer, IO_ReadOnly); - QCString appName; + TQDataStream d(answer, IO_ReadOnly); + TQCString appName; d >> appName; if (appName.length() && project() && project()->mainProgram().endsWith(appName)) { - kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(QString)", i18n("Debug in &KDevelop")); + kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &KDevelop")); connectDCOPSignal(appId, "krashinfo", "acceptDebuggingApplication()", "slotDebugExternalProcess()", true); } } @@ -404,32 +404,32 @@ void DebuggerPart::slotDCOPApplicationRegistered(const QCString& appId) ASYNC DebuggerPart::slotDebugExternalProcess() { - QByteArray answer; - QCString replyType; + TQByteArray answer; + TQCString replyType; - kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", QByteArray(), replyType, answer, true, 5000); + kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000); - QDataStream d(answer, IO_ReadOnly); + TQDataStream d(answer, IO_ReadOnly); int pid; d >> pid; if (attachProcess(pid) && m_drkonqi.isEmpty()) { m_drkonqi = kapp->dcopClient()->senderId(); - QTimer::singleShot(15000, this, SLOT(slotCloseDrKonqi())); + TQTimer::singleShot(15000, this, TQT_SLOT(slotCloseDrKonqi())); mainWindow()->raiseView(framestackWidget); } mainWindow()->main()->raise(); } -ASYNC DebuggerPart::slotDebugCommandLine(const QString& /*command*/) +ASYNC DebuggerPart::slotDebugCommandLine(const TQString& /*command*/) { KMessageBox::information(0, "Asked to debug command line"); } void DebuggerPart::slotCloseDrKonqi() { - kapp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", QByteArray()); + kapp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray()); m_drkonqi = ""; } @@ -467,10 +467,10 @@ void DebuggerPart::guiClientAdded( KXMLGUIClient* client ) // Can't change state until after XMLGUI has been loaded... // Anyone know of a better way of doing this? if( client == this ) - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); } -void DebuggerPart::contextMenu(QPopupMenu *popup, const Context *context) +void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) { if (!context->hasType( Context::EditorContext )) return; @@ -491,13 +491,13 @@ void DebuggerPart::contextMenu(QPopupMenu *popup, const Context *context) int index = running ? 0 : -1; if (running) { - // Too bad we can't add QAction to popup menu in Qt3. + // Too bad we can't add TQAction to popup menu in Qt3. KAction* act = actionCollection()->action("debug_runtocursor"); Q_ASSERT(act); if (act) { int id = popup->insertItem( act->iconSet(), i18n("Run to &Cursor"), - this, SLOT(slotRunToCursor()), + this, TQT_SLOT(slotRunToCursor()), 0, -1, index); popup->setWhatsThis(id, act->whatsThis()); @@ -507,21 +507,21 @@ void DebuggerPart::contextMenu(QPopupMenu *popup, const Context *context) if (econtext->url().isLocalFile()) { int id = popup->insertItem( i18n("Toggle Breakpoint"), - this, SLOT(toggleBreakpoint()), + this, TQT_SLOT(toggleBreakpoint()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("Toggle breakpoint

    Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { - QString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); + TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed), - this, SLOT(contextEvaluate()), + this, TQT_SLOT(contextEvaluate()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("Evaluate expression

    Shows the value of the expression under the cursor.")); int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed), - this, SLOT(contextWatch()), + this, TQT_SLOT(contextWatch()), 0, -1, index); index += running; popup->setWhatsThis(id2, i18n("Watch expression

    Adds an expression under the cursor to the Variables/Watch list.")); @@ -560,10 +560,10 @@ void DebuggerPart::contextEvaluate() void DebuggerPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), KIcon::SizeMedium) ); + TQVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), KIcon::SizeMedium) ); DebuggerConfigWidget *w = new DebuggerConfigWidget(this, vbox, "debugger config widget"); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); - connect( dlg, SIGNAL(finished()), controller, SLOT(configure()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(finished()), controller, TQT_SLOT(configure()) ); } @@ -572,68 +572,68 @@ void DebuggerPart::setupController() VariableTree *variableTree = variableWidget->varTree(); // variableTree -> gdbBreakpointWidget - connect( variableTree, SIGNAL(toggleWatchpoint(const QString &)), - gdbBreakpointWidget, SLOT(slotToggleWatchpoint(const QString &))); + connect( variableTree, TQT_SIGNAL(toggleWatchpoint(const TQString &)), + gdbBreakpointWidget, TQT_SLOT(slotToggleWatchpoint(const TQString &))); // gdbOutputWidget -> controller - connect( gdbOutputWidget, SIGNAL(userGDBCmd(const QString &)), - controller, SLOT(slotUserGDBCmd(const QString&))); - connect( gdbOutputWidget, SIGNAL(breakInto()), - controller, SLOT(slotBreakInto())); + connect( gdbOutputWidget, TQT_SIGNAL(userGDBCmd(const TQString &)), + controller, TQT_SLOT(slotUserGDBCmd(const TQString&))); + connect( gdbOutputWidget, TQT_SIGNAL(breakInto()), + controller, TQT_SLOT(slotBreakInto())); - connect( controller, SIGNAL(breakpointHit(int)), - gdbBreakpointWidget, SLOT(slotBreakpointHit(int))); + connect( controller, TQT_SIGNAL(breakpointHit(int)), + gdbBreakpointWidget, TQT_SLOT(slotBreakpointHit(int))); // controller -> disassembleWidget - connect( controller, SIGNAL(showStepInSource(const QString&, int, const QString&)), - disassembleWidget, SLOT(slotShowStepInSource(const QString&, int, const QString&))); + connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + disassembleWidget, TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); // controller -> this - connect( controller, SIGNAL(dbgStatus(const QString&, int)), - this, SLOT(slotStatus(const QString&, int))); - connect( controller, SIGNAL(showStepInSource(const QString&, int, const QString&)), - this, SLOT(slotShowStep(const QString&, int))); - connect( controller, SIGNAL(debuggerAbnormalExit()), - this, SLOT(slotDebuggerAbnormalExit())); + 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()), + this, TQT_SLOT(slotDebuggerAbnormalExit())); - connect(controller, SIGNAL(event(GDBController::event_t)), - this, SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQT_SIGNAL(event(GDBController::event_t)), + this, TQT_SLOT(slotEvent(GDBController::event_t))); // controller -> procLineMaker - connect( controller, SIGNAL(ttyStdout(const char*)), - procLineMaker, SLOT(slotReceivedStdout(const char*))); - connect( controller, SIGNAL(ttyStderr(const char*)), - procLineMaker, SLOT(slotReceivedStderr(const char*))); + connect( controller, TQT_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQT_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); // controller -> gdbOutputWidget - connect( controller, SIGNAL(gdbInternalCommandStdout(const char*)), - gdbOutputWidget, SLOT(slotInternalCommandStdout(const char*)) ); - connect( controller, SIGNAL(gdbUserCommandStdout(const char*)), - gdbOutputWidget, SLOT(slotUserCommandStdout(const char*)) ); + connect( controller, TQT_SIGNAL(gdbInternalCommandStdout(const char*)), + gdbOutputWidget, TQT_SLOT(slotInternalCommandStdout(const char*)) ); + connect( controller, TQT_SIGNAL(gdbUserCommandStdout(const char*)), + gdbOutputWidget, TQT_SLOT(slotUserCommandStdout(const char*)) ); - connect( controller, SIGNAL(gdbStderr(const char*)), - gdbOutputWidget, SLOT(slotReceivedStderr(const char*)) ); - connect( controller, SIGNAL(dbgStatus(const QString&, int)), - gdbOutputWidget, SLOT(slotDbgStatus(const QString&, int))); + connect( controller, TQT_SIGNAL(gdbStderr(const char*)), + gdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + gdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); // controller -> viewerWidget - connect( controller, SIGNAL(dbgStatus(const QString&, int)), - viewerWidget, SLOT(slotDebuggerState(const QString&, int))); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int))); - connect(statusBarIndicator, SIGNAL(doubleClicked()), - controller, SLOT(explainDebuggerStatus())); + connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()), + controller, TQT_SLOT(explainDebuggerStatus())); } bool DebuggerPart::startDebugger() { - QString build_dir; // Currently selected build directory + TQString build_dir; // Currently selected build directory DomUtil::PairList run_envvars; // List with the environment variables - QString run_directory; // Directory from where the program should be run - QString program; // Absolute path to application - QString run_arguments; // Command line arguments to be passed to the application + TQString run_directory; // Directory from where the program should be run + TQString program; // Absolute path to application + TQString run_arguments; // Command line arguments to be passed to the application if (project()) { build_dir = project()->buildDirectory(); @@ -643,13 +643,13 @@ bool DebuggerPart::startDebugger() run_arguments = project()->debugArguments(); } - QString shell = DomUtil::readEntry(*projectDom(), "/kdevdebugger/general/dbgshell"); + TQString shell = DomUtil::readEntry(*projectDom(), "/kdevdebugger/general/dbgshell"); if( !shell.isEmpty() ) { shell = shell.simplifyWhiteSpace(); - QString shell_without_args = QStringList::split(QChar(' '), shell ).first(); + TQString shell_without_args = TQStringList::split(TQChar(' '), shell ).first(); - QFileInfo info( shell_without_args ); + TQFileInfo info( shell_without_args ); if( info.isRelative() ) { shell_without_args = build_dir + "/" + shell_without_args; @@ -670,7 +670,7 @@ bool DebuggerPart::startDebugger() { core()->running(this, true); - stateChanged( QString("active") ); + stateChanged( TQString("active") ); KActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Continue") ); @@ -748,15 +748,15 @@ void DebuggerPart::slotStopDebugger() "while it is running, in order to get information " "about variables, frame stack, and so on.") ); - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); core()->running(this, false); } void DebuggerPart::slotShowView(bool show) { - const QWidget* s = static_cast(sender()); - QWidget* ncs = const_cast(s); + const TQWidget* s = static_cast(sender()); + TQWidget* ncs = const_cast(s); mainWindow()->setViewAvailable(ncs, show); if (show) mainWindow()->raiseView(ncs); @@ -857,18 +857,18 @@ void DebuggerPart::slotRun() if (rebuild) { - disconnect(SIGNAL(buildProject())); + disconnect(TQT_SIGNAL(buildProject())); // The KDevProject has no method to build the project, // so try connecting to a slot has is present to all // existing project managers. // Note: this assumes that 'slotBuild' will save // modified files. - if (connect(this, SIGNAL(buildProject()), - project(), SLOT(slotBuild()))) + if (connect(this, TQT_SIGNAL(buildProject()), + project(), TQT_SLOT(slotBuild()))) { - connect(project(), SIGNAL(projectCompiled()), - this, SLOT(slotRun_part2())); + connect(project(), TQT_SIGNAL(projectCompiled()), + this, TQT_SLOT(slotRun_part2())); emit buildProject(); rebuild = true; @@ -894,8 +894,8 @@ void DebuggerPart::slotRun_part2() { needRebuild_ = false; - disconnect(project(), SIGNAL(projectCompiled()), - this, SLOT(slotRun_part2())); + disconnect(project(), TQT_SIGNAL(projectCompiled()), + this, TQT_SLOT(slotRun_part2())); if (controller->stateIsOn( s_dbgNotStarted )) { @@ -950,8 +950,8 @@ void DebuggerPart::slotExamineCore() { mainWindow()->statusBar()->message(i18n("Choose a core file to examine..."), 1000); - QString dirName = project()? project()->projectDirectory() : QDir::homeDirPath(); - QString coreFile = KFileDialog::getOpenFileName(dirName); + TQString dirName = project()? project()->projectDirectory() : TQDir::homeDirPath(); + TQString coreFile = KFileDialog::getOpenFileName(dirName); if (coreFile.isNull()) return; @@ -1092,33 +1092,33 @@ void DebuggerPart::slotRefreshBPState( const Breakpoint& BP) } } -void DebuggerPart::slotStatus(const QString &msg, int state) +void DebuggerPart::slotStatus(const TQString &msg, int state) { - QString stateIndicator, stateIndicatorFull; + TQString stateIndicator, stateIndicatorFull; if (state & s_dbgNotStarted) { stateIndicator = " "; stateIndicatorFull = "Debugger not started"; - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); } else if (state & s_dbgBusy) { stateIndicator = "R"; stateIndicatorFull = "Debugger is busy"; - stateChanged( QString("active") ); + stateChanged( TQString("active") ); } else if (state & s_programExited) { stateIndicator = "E"; stateIndicatorFull = "Application has exited"; - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); } else { stateIndicator = "P"; stateIndicatorFull = "Application is paused"; - stateChanged( QString("paused") ); + stateChanged( TQString("paused") ); // On the first stop, show the variables view. // We do it on first stop, and not at debugger start, because // a program might just successfully run till completion. If we show @@ -1173,7 +1173,7 @@ void DebuggerPart::slotStatus(const QString &msg, int state) kdDebug(9012) << " " << msg << endl; statusBarIndicator->setText(stateIndicator); - QToolTip::add(statusBarIndicator, stateIndicatorFull); + TQToolTip::add(statusBarIndicator, stateIndicatorFull); if (!msg.isEmpty()) mainWindow()->statusBar()->message(msg, 3000); @@ -1192,7 +1192,7 @@ void DebuggerPart::slotEvent(GDBController::event_t e) } -void DebuggerPart::slotShowStep(const QString &fileName, int lineNum) +void DebuggerPart::slotShowStep(const TQString &fileName, int lineNum) { if ( ! fileName.isEmpty() ) { @@ -1206,7 +1206,7 @@ void DebuggerPart::slotShowStep(const QString &fileName, int lineNum) } -void DebuggerPart::slotGotoSource(const QString &fileName, int lineNum) +void DebuggerPart::slotGotoSource(const TQString &fileName, int lineNum) { if ( ! fileName.isEmpty() ) partController()->editDocument(KURL( fileName ), lineNum); @@ -1229,13 +1229,13 @@ void DebuggerPart::slotActivePartChanged( KParts::Part* part ) action->setEnabled( iface != 0 ); } -void DebuggerPart::restorePartialProjectSession(const QDomElement* el) +void DebuggerPart::restorePartialProjectSession(const TQDomElement* el) { gdbBreakpointWidget->restorePartialProjectSession(el); gdbOutputWidget->restorePartialProjectSession(el); } -void DebuggerPart::savePartialProjectSession(QDomElement* el) +void DebuggerPart::savePartialProjectSession(TQDomElement* el) { gdbBreakpointWidget->savePartialProjectSession(el); gdbOutputWidget->savePartialProjectSession(el); diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index afb3b340..c20b1f39 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -14,7 +14,7 @@ #ifndef _DEBUGGERPART_H_ #define _DEBUGGERPART_H_ -#include +#include #include "kdevplugin.h" #include "kdevcore.h" @@ -49,19 +49,19 @@ class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface Q_OBJECT public: - DebuggerPart( QObject *parent, const char *name, const QStringList & ); + DebuggerPart( TQObject *parent, const char *name, const TQStringList & ); ~DebuggerPart(); - virtual void restorePartialProjectSession(const QDomElement* el); - virtual void savePartialProjectSession(QDomElement* el); + virtual void restorePartialProjectSession(const TQDomElement* el); + virtual void savePartialProjectSession(TQDomElement* el); k_dcop: virtual ASYNC slotDebugExternalProcess(); - virtual ASYNC slotDebugCommandLine(const QString& command); + virtual ASYNC slotDebugCommandLine(const TQString& command); private slots: void setupDcop(); void guiClientAdded(KXMLGUIClient*); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void toggleBreakpoint(); void contextEvaluate(); void contextWatch(); @@ -94,11 +94,11 @@ private slots: void slotRefreshBPState(const Breakpoint&); - void slotStatus(const QString &msg, int state); - void slotShowStep(const QString &fileName, int lineNum); - void slotGotoSource(const QString &fileName, int lineNum); + void slotStatus(const TQString &msg, int state); + void slotShowStep(const TQString &fileName, int lineNum); + void slotGotoSource(const TQString &fileName, int lineNum); - void slotDCOPApplicationRegistered(const QCString &appId); + void slotDCOPApplicationRegistered(const TQCString &appId); void slotCloseDrKonqi(); // Hide or show the view that's the sender of this signal. @@ -123,20 +123,20 @@ private: void setupController(); bool haveModifiedFiles(); - QGuardedPtr variableWidget; - QGuardedPtr gdbBreakpointWidget; - QGuardedPtr framestackWidget; - QGuardedPtr disassembleWidget; - QGuardedPtr gdbOutputWidget; - QGuardedPtr viewerWidget; + TQGuardedPtr variableWidget; + TQGuardedPtr gdbBreakpointWidget; + TQGuardedPtr framestackWidget; + TQGuardedPtr disassembleWidget; + TQGuardedPtr gdbOutputWidget; + TQGuardedPtr viewerWidget; GDBController *controller; - QGuardedPtr statusBarIndicator; - QGuardedPtr floatingToolBar; + TQGuardedPtr statusBarIndicator; + TQGuardedPtr floatingToolBar; ProcessLineMaker* procLineMaker; ProcessLineMaker* gdbLineMaker; - QString m_contextIdent; - QCString m_drkonqi; + TQString m_contextIdent; + TQCString m_drkonqi; KDevDebugger *m_debugger; int previousDebuggerState_; diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp index 217f0b88..41eb7896 100644 --- a/languages/cpp/debugger/debuggertracingdialog.cpp +++ b/languages/cpp/debugger/debuggertracingdialog.cpp @@ -2,9 +2,9 @@ #include "debuggertracingdialog.h" #include "breakpoint.h" -#include -#include -#include +#include +#include +#include #include #include #include @@ -14,16 +14,16 @@ namespace GDBDebugger DebuggerTracingDialog ::DebuggerTracingDialog(Breakpoint* bp, - QWidget* parent, const char* name) + TQWidget* parent, const char* name) : DebuggerTracingDialogBase(parent, name), bp_(bp) { expressions->setButtons(KEditListBox::Add | KEditListBox::Remove); - connect(enable, SIGNAL(stateChanged(int)), - this, SLOT(enableOrDisable(int))); + connect(enable, TQT_SIGNAL(stateChanged(int)), + this, TQT_SLOT(enableOrDisable(int))); - connect(enableCustomFormat, SIGNAL(stateChanged(int)), - this, SLOT(enableOrDisableCustomFormat(int))); + connect(enableCustomFormat, TQT_SIGNAL(stateChanged(int)), + this, TQT_SLOT(enableOrDisableCustomFormat(int))); enable->setChecked(bp_->tracingEnabled()); expressions->setItems(bp_->tracedExpressions()); @@ -35,7 +35,7 @@ namespace GDBDebugger void DebuggerTracingDialog::enableOrDisable(int state) { - bool enable = (state == QButton::On); + bool enable = (state == TQButton::On); expressionsLabel->setEnabled(enable); expressions->setEnabled(enable); @@ -45,7 +45,7 @@ namespace GDBDebugger void DebuggerTracingDialog::enableOrDisableCustomFormat(int state) { - customFormat->setEnabled(state == QButton::On); + customFormat->setEnabled(state == TQButton::On); } void DebuggerTracingDialog::accept() @@ -57,7 +57,7 @@ namespace GDBDebugger if (enableCustomFormat->isOn()) { - QString s = customFormat->text(); + TQString s = customFormat->text(); unsigned percent_count = 0; for (unsigned i = 0; i < s.length(); ++i) if (s[i] == '%') diff --git a/languages/cpp/debugger/debuggertracingdialog.h b/languages/cpp/debugger/debuggertracingdialog.h index 1379f684..916ae912 100644 --- a/languages/cpp/debugger/debuggertracingdialog.h +++ b/languages/cpp/debugger/debuggertracingdialog.h @@ -25,7 +25,7 @@ namespace GDBDebugger Q_OBJECT public: DebuggerTracingDialog(Breakpoint* bp, - QWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = 0); private slots: void enableOrDisable(int); diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp index 759393f5..562aa1ae 100644 --- a/languages/cpp/debugger/disassemblewidget.cpp +++ b/languages/cpp/debugger/disassemblewidget.cpp @@ -22,9 +22,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include @@ -35,8 +35,8 @@ namespace GDBDebugger /***************************************************************************/ /***************************************************************************/ -DisassembleWidget::DisassembleWidget(GDBController* controller, QWidget *parent, const char *name) - : QTextEdit(parent, name), controller_(controller), +DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *parent, const char *name) + : TQTextEdit(parent, name), controller_(controller), active_(false), lower_(0), upper_(0), @@ -92,8 +92,8 @@ void DisassembleWidget::slotActivate(bool activate) /***************************************************************************/ -void DisassembleWidget::slotShowStepInSource( const QString &, int, - const QString ¤tAddress) +void DisassembleWidget::slotShowStepInSource( const TQString &, int, + const TQString ¤tAddress) { kdDebug(9012) << "DisasssembleWidget::slotShowStepInSource()" << endl; @@ -116,7 +116,7 @@ void DisassembleWidget::getNextDisplay() { Q_ASSERT(!currentAddress_.isNull()); - QString cmd = QString("-data-disassemble -s $pc -e \"$pc + 128\" -- 0"); + TQString cmd = TQString("-data-disassemble -s $pc -e \"$pc + 128\" -- 0"); controller_->addCommandToFront( new GDBCommand( cmd, this, &DisassembleWidget::memoryRead ) ); } @@ -127,7 +127,7 @@ void DisassembleWidget::getNextDisplay() void DisassembleWidget::memoryRead(const GDBMI::ResultRecord& r) { const GDBMI::Value& content = r["asm_insns"]; - QString rawdata; + TQString rawdata; clear(); @@ -135,12 +135,12 @@ void DisassembleWidget::memoryRead(const GDBMI::ResultRecord& r) { const GDBMI::Value& line = content[i]; - QString addr = line["address"].literal(); - QString fct = line["func-name"].literal(); - QString offs = line["offset"].literal(); - QString inst = line["inst"].literal(); + TQString addr = line["address"].literal(); + TQString fct = line["func-name"].literal(); + TQString offs = line["offset"].literal(); + TQString inst = line["inst"].literal(); - rawdata += QString(addr + " " + fct+"+"+offs + " " + inst + "\n"); + rawdata += TQString(addr + " " + fct+"+"+offs + " " + inst + "\n"); if (i == 0) { lower_ = strtoul(addr.latin1(), 0, 0); @@ -155,13 +155,13 @@ void DisassembleWidget::memoryRead(const GDBMI::ResultRecord& r) } -void DisassembleWidget::showEvent(QShowEvent*) +void DisassembleWidget::showEvent(TQShowEvent*) { slotActivate(true); } -void DisassembleWidget::hideEvent(QHideEvent*) +void DisassembleWidget::hideEvent(TQHideEvent*) { slotActivate(false); } diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h index 6b2fdd3a..55288c0c 100644 --- a/languages/cpp/debugger/disassemblewidget.h +++ b/languages/cpp/debugger/disassemblewidget.h @@ -18,7 +18,7 @@ #include "mi/gdbmi.h" -#include +#include /***************************************************************************/ /***************************************************************************/ @@ -35,16 +35,16 @@ class DisassembleWidget : public QTextEdit Q_OBJECT public: - DisassembleWidget( GDBController* controller, QWidget *parent=0, const char *name=0 ); + DisassembleWidget( GDBController* controller, TQWidget *parent=0, const char *name=0 ); virtual ~DisassembleWidget(); public slots: void slotActivate(bool activate); - void slotShowStepInSource(const QString &fileName, int lineNum, const QString &address); + void slotShowStepInSource(const TQString &fileName, int lineNum, const TQString &address); private: - virtual void showEvent(QShowEvent*); - virtual void hideEvent(QHideEvent*); + virtual void showEvent(TQShowEvent*); + virtual void hideEvent(TQHideEvent*); bool displayCurrent(); void getNextDisplay(); @@ -57,7 +57,7 @@ private: unsigned long lower_; unsigned long upper_; unsigned long address_; - QString currentAddress_; + TQString currentAddress_; }; } diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index e731a1ee..fb0246e6 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -21,11 +21,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -39,9 +39,9 @@ namespace GDBDebugger { FramestackWidget::FramestackWidget(GDBController* controller, - QWidget *parent, + TQWidget *parent, const char *name, WFlags f) - : QListView(parent, name, f), + : TQListView(parent, name, f), viewedThread_(0), controller_(controller), mayUpdate_( false ) @@ -49,19 +49,19 @@ FramestackWidget::FramestackWidget(GDBController* controller, setRootIsDecorated(true); setSorting(-1); setSelectionMode(Single); - addColumn(QString::null); // Frame number - addColumn(QString::null); // function name/address - addColumn(QString::null); // source + addColumn(TQString::null); // Frame number + addColumn(TQString::null); // function name/address + addColumn(TQString::null); // source header()->hide(); // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, SIGNAL(event(GDBController::event_t)), - this, SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQT_SIGNAL(event(GDBController::event_t)), + this, TQT_SLOT(slotEvent(GDBController::event_t))); - connect( this, SIGNAL(clicked(QListViewItem*)), - this, SLOT(slotSelectionChanged(QListViewItem*)) ); + connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), + this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); } @@ -72,11 +72,11 @@ FramestackWidget::~FramestackWidget() /***************************************************************************/ -QListViewItem *FramestackWidget::lastChild() const +TQListViewItem *FramestackWidget::lastChild() const { - QListViewItem* child = firstChild(); + TQListViewItem* child = firstChild(); if (child) - while (QListViewItem* nextChild = child->nextSibling()) + while (TQListViewItem* nextChild = child->nextSibling()) child = nextChild; return child; @@ -88,12 +88,12 @@ void FramestackWidget::clear() { viewedThread_ = 0; - QListView::clear(); + TQListView::clear(); } /***************************************************************************/ -void FramestackWidget::slotSelectionChanged(QListViewItem *thisItem) +void FramestackWidget::slotSelectionChanged(TQListViewItem *thisItem) { ThreadStackItem *thread = dynamic_cast (thisItem); if (thread) @@ -110,7 +110,7 @@ void FramestackWidget::slotSelectionChanged(QListViewItem *thisItem) // Switch to the target thread. if (frame->threadNo() != -1) controller_->addCommand( - new GDBCommand(QString("-thread-select %1") + new GDBCommand(TQString("-thread-select %1") .arg(frame->threadNo()).ascii())); viewedThread_ = findThread(frame->threadNo()); @@ -186,7 +186,7 @@ void FramestackWidget::slotEvent(GDBController::event_t e) } } -void FramestackWidget::showEvent(QShowEvent*) +void FramestackWidget::showEvent(TQShowEvent*) { if (controller_->stateIsOn(s_appRunning|s_dbgBusy|s_dbgNotStarted|s_shuttingDown)) return; @@ -208,7 +208,7 @@ void FramestackWidget::getBacktrace(int min_frame, int max_frame) maxFrame_ = max_frame; controller_->addCommand( - new GDBCommand(QString("-stack-info-depth %1").arg(max_frame+1), + new GDBCommand(TQString("-stack-info-depth %1").arg(max_frame+1), this, &FramestackWidget::handleStackDepth)); } @@ -223,7 +223,7 @@ void FramestackWidget::handleStackDepth(const GDBMI::ResultRecord& r) maxFrame_ = existing_frames; //add the following command to the front, so noone switches threads in between controller_->addCommandToFront( - new GDBCommand(QString("-stack-list-frames %1 %2") + new GDBCommand(TQString("-stack-list-frames %1 %2") .arg(minFrame_).arg(maxFrame_), this, &FramestackWidget::parseGDBBacktraceList)); } @@ -235,7 +235,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo) { // Switch to the target thread. controller_->addCommand( - new GDBCommand(QString("-thread-select %1") + new GDBCommand(TQString("-thread-select %1") .arg(threadNo).ascii())); viewedThread_ = findThread(threadNo); @@ -247,7 +247,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo) { // Switch back to the original thread. controller_->addCommand( - new GDBCommand(QString("-thread-select %1") + new GDBCommand(TQString("-thread-select %1") .arg(currentThread).ascii())); } } @@ -271,15 +271,15 @@ void FramestackWidget::handleThreadList(const GDBMI::ResultRecord& r) // Really threaded program. for(unsigned i = 0, e = ids.results.size(); i != e; ++i) { - QString id = ids.results[i]->value->literal(); + TQString id = ids.results[i]->value->literal(); controller_->addCommand( - new GDBCommand(QString("-thread-select %1").arg(id).ascii(), + new GDBCommand(TQString("-thread-select %1").arg(id).ascii(), this, &FramestackWidget::handleThread)); } controller_->addCommand( - new GDBCommand(QString("-thread-select %1") + new GDBCommand(TQString("-thread-select %1") .arg(controller_->currentThread()).ascii())); } @@ -292,13 +292,13 @@ void FramestackWidget::handleThreadList(const GDBMI::ResultRecord& r) void FramestackWidget::handleThread(const GDBMI::ResultRecord& r) { - QString id = r["new-thread-id"].literal(); + TQString id = r["new-thread-id"].literal(); int id_num = id.toInt(); - QString name_column; - QString func_column; - QString args_column; - QString source_column; + TQString name_column; + TQString func_column; + TQString args_column; + TQString source_column; formatFrame(r["frame"], func_column, source_column); @@ -329,7 +329,7 @@ void FramestackWidget::parseGDBBacktraceList(const GDBMI::ResultRecord& r) Q_ASSERT(dynamic_cast(&frames)); // Remove "..." item, if there's one. - QListViewItem* last; + TQListViewItem* last; if (viewedThread_) { last = viewedThread_->firstChild(); @@ -352,13 +352,13 @@ void FramestackWidget::parseGDBBacktraceList(const GDBMI::ResultRecord& r) // For now, just produce string simular to gdb // console output. In future we might have a table, // or something better. - QString frameDesc; + TQString frameDesc; - QString name_column; - QString func_column; - QString source_column; + TQString name_column; + TQString func_column; + TQString source_column; - QString level_s = frame["level"].literal(); + TQString level_s = frame["level"].literal(); int level = level_s.toInt(); name_column = "#" + level_s; @@ -377,7 +377,7 @@ void FramestackWidget::parseGDBBacktraceList(const GDBMI::ResultRecord& r) } if (has_more_frames) { - QListViewItem* item; + TQListViewItem* item; if (viewedThread_) item = new FrameStackItem(viewedThread_, lastLevel+1, "..."); else @@ -404,7 +404,7 @@ void FramestackWidget::parseGDBBacktraceList(const GDBMI::ResultRecord& r) ThreadStackItem *FramestackWidget::findThread(int threadNo) { - QListViewItem *sibling = firstChild(); + TQListViewItem *sibling = firstChild(); while (sibling) { ThreadStackItem *thread = dynamic_cast (sibling); @@ -422,7 +422,7 @@ ThreadStackItem *FramestackWidget::findThread(int threadNo) FrameStackItem *FramestackWidget::findFrame(int frameNo, int threadNo) { - QListViewItem* frameItem = 0; + TQListViewItem* frameItem = 0; if (threadNo != -1) { @@ -445,8 +445,8 @@ FrameStackItem *FramestackWidget::findFrame(int frameNo, int threadNo) } void FramestackWidget::formatFrame(const GDBMI::Value& frame, - QString& func_column, - QString& source_column) + TQString& func_column, + TQString& source_column) { func_column = source_column = ""; @@ -476,15 +476,15 @@ void FramestackWidget::formatFrame(const GDBMI::Value& frame, } -void FramestackWidget::drawContentsOffset( QPainter * p, int ox, int oy, +void FramestackWidget::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ) { - QListView::drawContentsOffset(p, ox, oy, cx, cy, cw, ch); + TQListView::drawContentsOffset(p, ox, oy, cx, cy, cw, ch); int s1_x = header()->sectionPos(1); int s1_w = header()->sectionSize(1); - QRect section1(s1_x, contentsHeight(), s1_w, viewport()->height()); + TQRect section1(s1_x, contentsHeight(), s1_w, viewport()->height()); p->fillRect(section1, KGlobalSettings::alternateBackgroundColor()); } @@ -495,8 +495,8 @@ void FramestackWidget::drawContentsOffset( QPainter * p, int ox, int oy, FrameStackItem::FrameStackItem(FramestackWidget *parent, unsigned frameNo, - const QString &name) - : QListViewItem(parent, parent->lastChild()), + const TQString &name) + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), threadNo_(-1) { @@ -507,8 +507,8 @@ FrameStackItem::FrameStackItem(FramestackWidget *parent, FrameStackItem::FrameStackItem(ThreadStackItem *parent, unsigned frameNo, - const QString &name) - : QListViewItem(parent, parent->lastChild()), + const TQString &name) + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), threadNo_(parent->threadNo()) { @@ -522,11 +522,11 @@ FrameStackItem::~FrameStackItem() // ************************************************************************** -QListViewItem *FrameStackItem::lastChild() const +TQListViewItem *FrameStackItem::lastChild() const { - QListViewItem* child = firstChild(); + TQListViewItem* child = firstChild(); if (child) - while (QListViewItem* nextChild = child->nextSibling()) + while (TQListViewItem* nextChild = child->nextSibling()) child = nextChild; return child; @@ -547,7 +547,7 @@ void FrameStackItem::setOpen(bool open) } } #endif - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); } // ************************************************************************** @@ -555,7 +555,7 @@ void FrameStackItem::setOpen(bool open) // ************************************************************************** ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo) -: QListViewItem(parent), +: TQListViewItem(parent), threadNo_(threadNo) { setText(0, i18n("Thread %1").arg(threadNo_)); @@ -569,11 +569,11 @@ ThreadStackItem::~ThreadStackItem() // ************************************************************************** -QListViewItem *ThreadStackItem::lastChild() const +TQListViewItem *ThreadStackItem::lastChild() const { - QListViewItem* child = firstChild(); + TQListViewItem* child = firstChild(); if (child) - while (QListViewItem* nextChild = child->nextSibling()) + while (TQListViewItem* nextChild = child->nextSibling()) child = nextChild; return child; @@ -609,31 +609,31 @@ void ThreadStackItem::setOpen(bool open) setText(2, savedSource_); } - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); } -void FrameStackItem::paintCell(QPainter * p, const QColorGroup & cg, +void FrameStackItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { - QColorGroup cg2(cg); + TQColorGroup cg2(cg); if (column % 2) { - cg2.setColor(QColorGroup::Base, + cg2.setColor(TQColorGroup::Base, KGlobalSettings::alternateBackgroundColor()); } - QListViewItem::paintCell(p, cg2, column, width, align); + TQListViewItem::paintCell(p, cg2, column, width, align); } -void ThreadStackItem::paintCell(QPainter * p, const QColorGroup & cg, +void ThreadStackItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { - QColorGroup cg2(cg); + TQColorGroup cg2(cg); if (column % 2) { - cg2.setColor(QColorGroup::Base, + cg2.setColor(TQColorGroup::Base, KGlobalSettings::alternateBackgroundColor()); } - QListViewItem::paintCell(p, cg2, column, width, align); + TQListViewItem::paintCell(p, cg2, column, width, align); } diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h index 36cac1ba..656d2cdb 100644 --- a/languages/cpp/debugger/framestackwidget.h +++ b/languages/cpp/debugger/framestackwidget.h @@ -16,8 +16,8 @@ #ifndef _FRAMESTACKWIDGET_H_ #define _FRAMESTACKWIDGET_H_ -#include -#include +#include +#include #include "gdbcontroller.h" #include "mi/miparser.h" @@ -38,9 +38,9 @@ public: virtual ~ThreadStackItem(); void setOpen(bool open); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; - void paintCell(QPainter * p, const QColorGroup & cg, + void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); int threadNo() @@ -48,8 +48,8 @@ public: private: int threadNo_; - QString savedFunc_; - QString savedSource_; + TQString savedFunc_; + TQString savedSource_; }; /***************************************************************************/ @@ -61,16 +61,16 @@ class FrameStackItem : public QListViewItem public: FrameStackItem(FramestackWidget *parent, unsigned frameNo, - const QString &name); + const TQString &name); FrameStackItem(ThreadStackItem *parent, unsigned frameNo, - const QString &name); + const TQString &name); virtual ~FrameStackItem(); void setOpen(bool open); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; - void paintCell(QPainter * p, const QColorGroup & cg, + void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); int frameNo() @@ -94,11 +94,11 @@ class FramestackWidget : public QListView public: FramestackWidget( GDBController* controller, - QWidget *parent=0, + TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~FramestackWidget(); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; ThreadStackItem *findThread(int threadNo); FrameStackItem *findFrame(int frameNo, int threadNo); @@ -108,7 +108,7 @@ public: protected: - void drawContentsOffset( QPainter * p, int ox, int oy, + void drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ); @@ -120,8 +120,8 @@ private: The function is used both for frames and threads. */ void formatFrame(const GDBMI::Value& frame, - QString& func_column, - QString& source_column); + TQString& func_column, + TQString& source_column); /** Cause gdb to produce backtrace for the current thread. @@ -148,13 +148,13 @@ private: public slots: void slotEvent(GDBController::event_t e); - void slotSelectionChanged(QListViewItem *thisItem); + void slotSelectionChanged(TQListViewItem *thisItem); #if QT_VERSION < 300 private: - QListViewItem* findItemWhichBeginsWith(const QString& text) const; + TQListViewItem* findItemWhichBeginsWith(const TQString& text) const; #endif - virtual void showEvent(QShowEvent*); + virtual void showEvent(TQShowEvent*); private: diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index f9a83d6c..b092a015 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -29,18 +29,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -80,7 +80,7 @@ class BreakpointTableRow : public QTableItem { public: - BreakpointTableRow(QTable* table, EditType editType, Breakpoint* bp); + BreakpointTableRow(TQTable* table, EditType editType, Breakpoint* bp); ~BreakpointTableRow(); bool match (Breakpoint* bp) const; @@ -100,9 +100,9 @@ private: /***************************************************************************/ /***************************************************************************/ -BreakpointTableRow::BreakpointTableRow(QTable* parent, EditType editType, +BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType, Breakpoint* bp) : - QTableItem(parent, editType, ""), + TQTableItem(parent, editType, ""), m_breakpoint(bp) { appendEmptyRow(); @@ -140,13 +140,13 @@ void BreakpointTableRow::appendEmptyRow() table()->setItem(row, Control, this); - QCheckTableItem* cti = new QCheckTableItem( table(), ""); + TQCheckTableItem* cti = new TQCheckTableItem( table(), ""); table()->setItem(row, Enable, cti); ComplexEditCell* act = new ComplexEditCell(table()); table()->setItem(row, Tracing, act); - QObject::connect(act, SIGNAL(edit(QTableItem*)), - table()->parent(), SLOT(editTracing(QTableItem*))); + TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)), + table()->parent(), TQT_SLOT(editTracing(TQTableItem*))); } /***************************************************************************/ @@ -155,22 +155,22 @@ void BreakpointTableRow::setRow() { if ( m_breakpoint ) { - QTableItem *item = table()->item ( row(), Enable ); + TQTableItem *item = table()->item ( row(), Enable ); Q_ASSERT(item->rtti() == 2); - ((QCheckTableItem*)item)->setChecked(m_breakpoint->isEnabled()); + ((TQCheckTableItem*)item)->setChecked(m_breakpoint->isEnabled()); - QString status=m_breakpoint->statusDisplay(m_activeFlag); + TQString status=m_breakpoint->statusDisplay(m_activeFlag); table()->setText(row(), Status, status); table()->setText(row(), Condition, m_breakpoint->conditional()); - table()->setText(row(), IgnoreCount, QString::number(m_breakpoint->ignoreCount() )); - table()->setText(row(), Hits, QString::number(m_breakpoint->hits() )); + table()->setText(row(), IgnoreCount, TQString::number(m_breakpoint->ignoreCount() )); + table()->setText(row(), Hits, TQString::number(m_breakpoint->hits() )); - QString displayType = m_breakpoint->displayType(); + TQString displayType = m_breakpoint->displayType(); table()->setText(row(), Location, m_breakpoint->location()); - QTableItem* ce = table()->item( row(), Tracing ); + TQTableItem* ce = table()->item( row(), Tracing ); ce->setText(breakpoint()->tracingEnabled() ? "Enabled" : "Disabled"); // In case there's editor open in this cell, update it too. static_cast(ce)->updateValue(); @@ -196,15 +196,15 @@ void BreakpointTableRow::setRow() /***************************************************************************/ GDBBreakpointWidget::GDBBreakpointWidget(GDBController* controller, - QWidget *parent, const char *name) : -QHBox(parent, name), + TQWidget *parent, const char *name) : +TQHBox(parent, name), controller_(controller) { m_table = new GDBTable(0, numCols, this, name); - m_table->setSelectionMode(QTable::SingleRow); + m_table->setSelectionMode(TQTable::SingleRow); m_table->setShowGrid (false); m_table->setLeftMargin(0); - m_table->setFocusStyle(QTable::FollowStyle); + m_table->setFocusStyle(TQTable::FollowStyle); m_table->hideColumn(Control); m_table->setColumnReadOnly(Type, true); @@ -212,7 +212,7 @@ controller_(controller) m_table->setColumnReadOnly(Hits, true); m_table->setColumnWidth( Enable, 20); - QHeader *header = m_table->horizontalHeader(); + TQHeader *header = m_table->horizontalHeader(); header->setLabel( Enable, "" ); header->setLabel( Type, i18n("Type") ); @@ -223,7 +223,7 @@ controller_(controller) header->setLabel( Hits, i18n("Hits") ); header->setLabel( Tracing, i18n("Tracing") ); - QPopupMenu* newBreakpoint = new QPopupMenu(this); + TQPopupMenu* newBreakpoint = new TQPopupMenu(this); newBreakpoint->insertItem(i18n("Code breakpoint", "Code"), BP_TYPE_FilePos); newBreakpoint->insertItem(i18n("Data breakpoint", "Data write"), @@ -232,7 +232,7 @@ controller_(controller) BP_TYPE_ReadWatchpoint); - m_ctxMenu = new QPopupMenu( this ); + m_ctxMenu = new TQPopupMenu( this ); m_ctxMenu->insertItem( i18n("New breakpoint", "New"), newBreakpoint); m_ctxMenu->insertItem( i18n( "Show text" ), BW_ITEM_Show ); @@ -251,39 +251,39 @@ controller_(controller) m_table->show(); - connect( newBreakpoint, SIGNAL(activated(int)), - this, SLOT(slotAddBlankBreakpoint(int)) ); + connect( newBreakpoint, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_table, SIGNAL(contextMenuRequested(int, int, const QPoint &)), - this, SLOT(slotContextMenuShow(int, int, const QPoint & )) ); - connect( m_ctxMenu, SIGNAL(activated(int)), - this, SLOT(slotContextMenuSelect(int)) ); + connect( m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), + this, TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); + connect( m_ctxMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotContextMenuSelect(int)) ); - connect( m_table, SIGNAL(doubleClicked(int, int, int, const QPoint &)), - this, SLOT(slotRowDoubleClicked(int, int, int, const QPoint &))); + connect( m_table, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - connect( m_table, SIGNAL(valueChanged(int, int)), - this, SLOT(slotNewValue(int, int))); + connect( m_table, TQT_SIGNAL(valueChanged(int, int)), + this, TQT_SLOT(slotNewValue(int, int))); - connect( m_table, SIGNAL(returnPressed()), - this, SLOT(slotEditBreakpoint())); -// connect( m_table, SIGNAL(f2Pressed()), -// this, SLOT(slotEditBreakpoint())); - connect( m_table, SIGNAL(deletePressed()), - this, SLOT(slotRemoveBreakpoint())); + connect( m_table, TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(slotEditBreakpoint())); +// connect( m_table, TQT_SIGNAL(f2Pressed()), +// this, TQT_SLOT(slotEditBreakpoint())); + connect( m_table, TQT_SIGNAL(deletePressed()), + this, TQT_SLOT(slotRemoveBreakpoint())); // This slot doesn't exist anymore -// connect( m_table, SIGNAL(insertPressed()), -// this, SLOT(slotAddBlankBreakpoint())); +// connect( m_table, TQT_SIGNAL(insertPressed()), +// this, TQT_SLOT(slotAddBlankBreakpoint())); // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, SIGNAL(event(GDBController::event_t)), - this, SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQT_SIGNAL(event(GDBController::event_t)), + this, TQT_SLOT(slotEvent(GDBController::event_t))); connect(controller, - SIGNAL(watchpointHit(int, const QString&, const QString&)), + TQT_SIGNAL(watchpointHit(int, const TQString&, const TQString&)), this, - SLOT(slotWatchpointHit(int, const QString&, const QString&))); + TQT_SLOT(slotWatchpointHit(int, const TQString&, const TQString&))); } /***************************************************************************/ @@ -357,8 +357,8 @@ void GDBBreakpointWidget::slotBreakpointHit(int id) } void GDBBreakpointWidget::slotWatchpointHit(int id, - const QString& oldValue, - const QString& newValue) + const TQString& oldValue, + const TQString& newValue) { BreakpointTableRow* br = findId(id); @@ -451,10 +451,10 @@ bool GDBBreakpointWidget::hasWatchpointForAddress( BreakpointTableRow* GDBBreakpointWidget::addBreakpoint(Breakpoint *bp) { BreakpointTableRow* btr = - new BreakpointTableRow( m_table, QTableItem::WhenCurrent, bp ); + new BreakpointTableRow( m_table, TQTableItem::WhenCurrent, bp ); - connect(bp, SIGNAL(modified(Breakpoint*)), - this, SLOT(slotBreakpointModified(Breakpoint*))); + connect(bp, TQT_SIGNAL(modified(Breakpoint*)), + this, TQT_SLOT(slotBreakpointModified(Breakpoint*))); sendToGdb(*bp); @@ -489,7 +489,7 @@ void GDBBreakpointWidget::removeBreakpoint(BreakpointTableRow* btr) /***************************************************************************/ -void GDBBreakpointWidget::slotToggleBreakpoint(const QString &fileName, int lineNum) +void GDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lineNum) { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); @@ -504,7 +504,7 @@ void GDBBreakpointWidget::slotToggleBreakpoint(const QString &fileName, int line /***************************************************************************/ -void GDBBreakpointWidget::slotToggleBreakpointEnabled(const QString &fileName, int lineNum) +void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, int lineNum) { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); @@ -520,7 +520,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const QString &fileName, i /***************************************************************************/ -void GDBBreakpointWidget::slotToggleWatchpoint(const QString &varName) +void GDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName) { Watchpoint *watchpoint = new Watchpoint(varName, false, true); BreakpointTableRow* btr = find(watchpoint); @@ -557,7 +557,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r) if (b.hasField("cond")) bp->setConditional(b["cond"].literal()); else - bp->setConditional(QString::null); + bp->setConditional(TQString::null); btr->setRow(); emit publishBPState(*bp); } @@ -565,7 +565,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r) { // It's a breakpoint added outside, most probably // via gdb console. Add it now. - QString type = b["type"].literal(); + TQString type = b["type"].literal(); if (type == "breakpoint" || type == "hw breakpoint") { @@ -580,7 +580,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r) bp->setPending(false); new BreakpointTableRow(m_table, - QTableItem::WhenCurrent, + TQTableItem::WhenCurrent, bp); emit publishBPState(*bp); @@ -607,7 +607,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r) } } -void GDBBreakpointWidget::handleTracingPrintf(const QValueVector& s) +void GDBBreakpointWidget::handleTracingPrintf(const TQValueVector& s) { // The first line of output is the command itself, which we don't need. for(unsigned i = 1; i < s.size(); ++i) @@ -684,7 +684,7 @@ void GDBBreakpointWidget::slotRemoveAllBreakpoints() /***************************************************************************/ -void GDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const QPoint &) +void GDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const TQPoint &) { if ( btn == Qt::LeftButton ) { @@ -703,7 +703,7 @@ void GDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const } } -void GDBBreakpointWidget::slotContextMenuShow( int row, int /*col*/, const QPoint &mousePos ) +void GDBBreakpointWidget::slotContextMenuShow( int row, int /*col*/, const TQPoint &mousePos ) { BreakpointTableRow *btr = (BreakpointTableRow *)m_table->item(row, Control ); @@ -813,7 +813,7 @@ void GDBBreakpointWidget::slotContextMenuSelect( int item ) /***************************************************************************/ -void GDBBreakpointWidget::slotEditRow(int row, int col, const QPoint &) +void GDBBreakpointWidget::slotEditRow(int row, int col, const TQPoint &) { // kdDebug(9012) << "in slotEditRow row=" << row << endl; BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); @@ -830,7 +830,7 @@ void GDBBreakpointWidget::slotNewValue(int row, int col) { BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); - QString new_value = m_table->text(row, col); + TQString new_value = m_table->text(row, col); if (btr) { @@ -839,8 +839,8 @@ void GDBBreakpointWidget::slotNewValue(int row, int col) { case Enable: { - QCheckTableItem *item = - (QCheckTableItem*)m_table->item ( row, Enable ); + TQCheckTableItem *item = + (TQCheckTableItem*)m_table->item ( row, Enable ); bp->setEnabled(item->isChecked()); } break; @@ -913,7 +913,7 @@ void GDBBreakpointWidget::slotNewValue(int row, int col) /***************************************************************************/ -void GDBBreakpointWidget::slotEditBreakpoint(const QString &fileName, int lineNum) +void GDBBreakpointWidget::slotEditBreakpoint(const TQString &fileName, int lineNum) { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); @@ -922,7 +922,7 @@ void GDBBreakpointWidget::slotEditBreakpoint(const QString &fileName, int lineNu if (btr) { - QTableSelection ts; + TQTableSelection ts; ts.init(btr->row(), 0); ts.expandTo(btr->row(), numCols); m_table->addSelection(ts); @@ -1019,7 +1019,7 @@ void GDBBreakpointWidget::slotEditBreakpoint() } -void GDBBreakpointWidget::editTracing(QTableItem* item) +void GDBBreakpointWidget::editTracing(TQTableItem* item) { BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(item->row(), Control); @@ -1032,7 +1032,7 @@ void GDBBreakpointWidget::editTracing(QTableItem* item) // Note: change cell text here and explicitly call slotNewValue here. // We want this signal to be emitted when we close the tracing dialog // and not when we select some other cell, as happens in Qt by default. - if (r == QDialog::Accepted) + if (r == TQDialog::Accepted) { // The dialog has modified "btr->breakpoint()" already. // Calling 'slotNewValue' will flush the changes back @@ -1046,42 +1046,42 @@ void GDBBreakpointWidget::editTracing(QTableItem* item) /***************************************************************************/ -void GDBBreakpointWidget::savePartialProjectSession(QDomElement* el) +void GDBBreakpointWidget::savePartialProjectSession(TQDomElement* el) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); if (domDoc.isNull()) return; - QDomElement breakpointListEl = domDoc.createElement("breakpointList"); + TQDomElement breakpointListEl = domDoc.createElement("breakpointList"); for ( int row = 0; row < m_table->numRows(); row++ ) { BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); Breakpoint* bp = btr->breakpoint(); - QDomElement breakpointEl = - domDoc.createElement("breakpoint"+QString::number(row)); + TQDomElement breakpointEl = + domDoc.createElement("breakpoint"+TQString::number(row)); breakpointEl.setAttribute("type", bp->type()); breakpointEl.setAttribute("location", bp->location(false)); breakpointEl.setAttribute("enabled", bp->isEnabled()); breakpointEl.setAttribute("condition", bp->conditional()); breakpointEl.setAttribute("tracingEnabled", - QString::number(bp->tracingEnabled())); + TQString::number(bp->tracingEnabled())); breakpointEl.setAttribute("traceFormatStringEnabled", - QString::number(bp->traceFormatStringEnabled())); + TQString::number(bp->traceFormatStringEnabled())); breakpointEl.setAttribute("tracingFormatString", bp->traceFormatString()); - QDomElement tracedExpressions = + TQDomElement tracedExpressions = domDoc.createElement("tracedExpressions"); - QStringList::const_iterator i, e; + TQStringList::const_iterator i, e; for(i = bp->tracedExpressions().begin(), e = bp->tracedExpressions().end(); i != e; ++i) { - QDomElement expr = domDoc.createElement("expression"); + TQDomElement expr = domDoc.createElement("expression"); expr.setAttribute("value", *i); tracedExpressions.appendChild(expr); } @@ -1097,7 +1097,7 @@ void GDBBreakpointWidget::savePartialProjectSession(QDomElement* el) /***************************************************************************/ -void GDBBreakpointWidget::restorePartialProjectSession(const QDomElement* el) +void GDBBreakpointWidget::restorePartialProjectSession(const TQDomElement* el) { /** Eventually, would be best to make each breakpoint type handle loading/ saving it's data. The only problem is that on load, we need to allocate @@ -1106,10 +1106,10 @@ void GDBBreakpointWidget::restorePartialProjectSession(const QDomElement* el) KDE (Boost.Serialization is too much dependency, and rolling my own is boring). */ - QDomElement breakpointListEl = el->namedItem("breakpointList").toElement(); + TQDomElement breakpointListEl = el->namedItem("breakpointList").toElement(); if (!breakpointListEl.isNull()) { - QDomElement breakpointEl; + TQDomElement breakpointEl; for (breakpointEl = breakpointListEl.firstChild().toElement(); !breakpointEl.isNull(); breakpointEl = breakpointEl.nextSibling().toElement()) @@ -1155,17 +1155,17 @@ void GDBBreakpointWidget::restorePartialProjectSession(const QDomElement* el) breakpointEl.attribute("traceFormatStringEnabled", "0") .toInt()); - QDomNode tracedExpr = + TQDomNode tracedExpr = breakpointEl.namedItem("tracedExpressions"); if (!tracedExpr.isNull()) { - QStringList l; + TQStringList l; - for(QDomNode c = tracedExpr.firstChild(); !c.isNull(); + for(TQDomNode c = tracedExpr.firstChild(); !c.isNull(); c = c.nextSibling()) { - QDomElement el = c.toElement(); + TQDomElement el = c.toElement(); l.push_back(el.attribute("value", "")); } bp->setTracedExpressions(l); @@ -1186,11 +1186,11 @@ void GDBBreakpointWidget::restorePartialProjectSession(const QDomElement* el) /***************************************************************************/ -void GDBBreakpointWidget::focusInEvent( QFocusEvent */* e*/ ) +void GDBBreakpointWidget::focusInEvent( TQFocusEvent */* e*/ ) { // Without the following 'if', when we first open the breakpoints // widget, the background is all black. This happens only with - // m_table->setFocusStyle(QTable::FollowStyle); + // m_table->setFocusStyle(TQTable::FollowStyle); // in constructor, so I suspect Qt bug. But anyway, without // current cell keyboard actions like Enter for edit won't work, // so keyboard focus does not makes much sense. @@ -1203,42 +1203,42 @@ void GDBBreakpointWidget::focusInEvent( QFocusEvent */* e*/ ) } ComplexEditCell:: -ComplexEditCell(QTable* table) -: QTableItem(table, QTableItem::WhenCurrent) +ComplexEditCell(TQTable* table) +: TQTableItem(table, TQTableItem::WhenCurrent) { } -QWidget* ComplexEditCell::createEditor() const +TQWidget* ComplexEditCell::createEditor() const { - QHBox* box = new QHBox( table()->viewport() ); + TQHBox* box = new TQHBox( table()->viewport() ); box->setPaletteBackgroundColor( table()->palette().active().highlight()); - label_ = new QLabel(text(), box, "label"); + label_ = new TQLabel(text(), box, "label"); label_->setBackgroundMode(Qt::PaletteHighlight); // Sorry for hardcode, but '2' is already hardcoded in - // Qt source, in QTableItem::paint. Since I don't want the + // Qt source, in TQTableItem::paint. Since I don't want the // text to jump 2 pixels to the right when editor is activated, // need to set the same indent for label. label_->setIndent(2); - QPalette p = label_->palette(); + TQPalette p = label_->palette(); - p.setColor(QPalette::Active, QColorGroup::Foreground, + p.setColor(TQPalette::Active, TQColorGroup::Foreground, table()->palette().active().highlightedText()); - p.setColor(QPalette::Inactive, QColorGroup::Foreground, + p.setColor(TQPalette::Inactive, TQColorGroup::Foreground, table()->palette().active().highlightedText()); label_->setPalette(p); - QPushButton* b = new QPushButton("...", box); + TQPushButton* b = new TQPushButton("...", box); // This is exactly what is done in QDesigner source in the // similar context. Haven't had any success making the good look // with layout, I suppose that sizeHint for button is always larger // than 20. b->setFixedWidth( 20 ); - connect(b, SIGNAL(clicked()), this, SLOT(slotEdit())); + connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit())); return box; } diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index 91dc40a5..42d1286d 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -16,11 +16,11 @@ #ifndef _GDBBreakpointWidget_H_ #define _GDBBreakpointWidget_H_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "mi/gdbmi.h" #include "gdbcontroller.h" @@ -47,24 +47,24 @@ class GDBBreakpointWidget : public QHBox public: GDBBreakpointWidget( GDBController* controller, - QWidget* parent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); virtual ~GDBBreakpointWidget(); void reset(); - void savePartialProjectSession(QDomElement* el); - void restorePartialProjectSession(const QDomElement* el); + void savePartialProjectSession(TQDomElement* el); + void restorePartialProjectSession(const TQDomElement* el); bool hasWatchpointForAddress(unsigned long long address) const; public slots: // Connected to from the editor widget: - void slotToggleBreakpoint(const QString &filename, int lineNum); - void slotToggleBreakpointEnabled(const QString &fileName, int lineNum); + void slotToggleBreakpoint(const TQString &filename, int lineNum); + void slotToggleBreakpointEnabled(const TQString &fileName, int lineNum); // Connected to from the variable widget: - void slotToggleWatchpoint(const QString &varName); + void slotToggleWatchpoint(const TQString &varName); void slotBreakpointSet(Breakpoint*); @@ -74,33 +74,33 @@ public slots: protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); friend class BreakpointActionCell; // for access to slotNewValue private slots: void slotRemoveBreakpoint(); void slotRemoveAllBreakpoints(); - void slotEditBreakpoint(const QString &fileName, int lineNum); + void slotEditBreakpoint(const TQString &fileName, int lineNum); void slotEditBreakpoint(); void slotAddBlankBreakpoint(int idx); - void slotRowDoubleClicked(int row, int col, int button, const QPoint & mousePos); - void slotContextMenuShow( int row, int col, const QPoint &mousePos ); + void slotRowDoubleClicked(int row, int col, int button, const TQPoint & mousePos); + void slotContextMenuShow( int row, int col, const TQPoint &mousePos ); void slotContextMenuSelect( int item ); - void slotEditRow(int row, int col, const QPoint & mousePos); + void slotEditRow(int row, int col, const TQPoint & mousePos); void slotNewValue(int row, int col); - void editTracing(QTableItem* item); + void editTracing(TQTableItem* item); void slotBreakpointModified(Breakpoint*); void slotEvent(GDBController::event_t); void slotWatchpointHit(int id, - const QString& oldValue, - const QString& newValue); + const TQString& oldValue, + const TQString& newValue); signals: void publishBPState(const Breakpoint& brkpt); void refreshBPState(const Breakpoint& brkpt); - void gotoSourcePosition(const QString &fileName, int lineNum); + void gotoSourcePosition(const TQString &fileName, int lineNum); // Emitted when output from yet another passed tracepoint is available. void tracingOutput(const char*); @@ -116,13 +116,13 @@ private: void sendToGdb(Breakpoint &); void handleBreakpointList(const GDBMI::ResultRecord&); - void handleTracingPrintf(const QValueVector& s); + void handleTracingPrintf(const TQValueVector& s); private: GDBController* controller_; GDBTable* m_table; - QPopupMenu* m_ctxMenu; + TQPopupMenu* m_ctxMenu; }; class BreakpointTableRow; @@ -135,12 +135,12 @@ class BreakpointTableRow; When editing is done, the receiver of 'edit' should change the value in the table, and then call the 'updateValue' method. */ -class ComplexEditCell : public QObject, public QTableItem +class ComplexEditCell : public TQObject, public QTableItem { Q_OBJECT public: - ComplexEditCell(QTable* table); + ComplexEditCell(TQTable* table); /** Called by Qt when the current cell should become editable. In our case, when the item becomes current. Creates a widget @@ -148,7 +148,7 @@ public: content. In our case -- text plus "..." button that invokes action dialog. */ - QWidget* createEditor() const; + TQWidget* createEditor() const; void updateValue(); @@ -158,10 +158,10 @@ private slots: void slotEdit(); signals: - void edit(QTableItem*); + void edit(TQTableItem*); private: - mutable QGuardedPtr label_; + mutable TQGuardedPtr label_; }; diff --git a/languages/cpp/debugger/gdbcommand.cpp b/languages/cpp/debugger/gdbcommand.cpp index de5aeb9d..bf8d5bc4 100644 --- a/languages/cpp/debugger/gdbcommand.cpp +++ b/languages/cpp/debugger/gdbcommand.cpp @@ -20,17 +20,17 @@ namespace GDBDebugger { -GDBCommand::GDBCommand(const QString &command) +GDBCommand::GDBCommand(const TQString &command) : command_(command), run(false), handler_this(0) { } -QString GDBCommand::cmdToSend() +TQString GDBCommand::cmdToSend() { return initialString() + "\n"; } -QString GDBCommand::initialString() const +TQString GDBCommand::initialString() const { return command_; } @@ -52,12 +52,12 @@ GDBCommand::invokeHandler(const GDBMI::ResultRecord& r) } } -void GDBCommand::newOutput(const QString& line) +void GDBCommand::newOutput(const TQString& line) { lines.push_back(line); } -const QValueVector& GDBCommand::allStreamOutput() const +const TQValueVector& GDBCommand::allStreamOutput() const { return lines; } @@ -82,7 +82,7 @@ void GDBCommand::setRun(bool run) } -UserCommand::UserCommand(const QString& s) +UserCommand::UserCommand(const TQString& s) : GDBCommand(s) { } @@ -94,7 +94,7 @@ bool UserCommand::isUserCommand() const ModifyBreakpointCommand::ModifyBreakpointCommand( - const QString& command, const Breakpoint* bp) + const TQString& command, const Breakpoint* bp) : GDBCommand(command.local8Bit()), bp_(bp) {} @@ -104,7 +104,7 @@ ModifyBreakpointCommand::cmdToSend() { if (bp_->dbgId() > 0) { - QString s(initialString()); + TQString s(initialString()); s = s.arg(bp_->dbgId()) + "\n"; return s.local8Bit(); } diff --git a/languages/cpp/debugger/gdbcommand.h b/languages/cpp/debugger/gdbcommand.h index 8c928394..946bc3aa 100644 --- a/languages/cpp/debugger/gdbcommand.h +++ b/languages/cpp/debugger/gdbcommand.h @@ -16,12 +16,12 @@ #ifndef _GDBCOMMAND_H_ #define _GDBCOMMAND_H_ -#include -#include -#include +#include +#include +#include #include "mi/gdbmi.h" -#include +#include namespace GDBDebugger { @@ -38,10 +38,10 @@ class ValueCallback; class GDBCommand { public: - GDBCommand(const QString& command); + GDBCommand(const TQString& command); template - GDBCommand(const QString& command, + GDBCommand(const TQString& command, Handler* handler_this, void (Handler::* handler_method)(const GDBMI::ResultRecord&), bool handlesError = false); @@ -51,7 +51,7 @@ public: dynamically, possibly using results of the previous commands. If the empty string is returned, nothing is sent. */ - virtual QString cmdToSend(); + virtual TQString cmdToSend(); /* Returns the initial string that was specified in ctor invocation. The actual command will be @@ -59,7 +59,7 @@ public: value of this method is only used in various diagnostic messages emitted before actually sending the command. */ - QString initialString() const; + TQString initialString() const; /* Returns true if this is command entered by the user and so should be always shown in the gdb output window. */ @@ -78,9 +78,9 @@ public: // Called by gdbcontroller for each new output string // gdb emits for this command. In MI mode, this includes // all "stream" messages, but does not include MI responses. - void newOutput(const QString&); + void newOutput(const TQString&); - const QValueVector& allStreamOutput() const; + const TQValueVector& allStreamOutput() const; // True if this command run then target for // unspecified period of time -- that is either 'run' or @@ -90,11 +90,11 @@ public: void setRun(bool run); private: - QString command_; - QGuardedPtr handler_this; - typedef void (QObject::* handler_t)(const GDBMI::ResultRecord&); + TQString command_; + TQGuardedPtr handler_this; + typedef void (TQObject::* handler_t)(const GDBMI::ResultRecord&); handler_t handler_method; - QValueVector lines; + TQValueVector lines; bool run; protected: // FIXME: should be private, after I kill the first ctor @@ -106,7 +106,7 @@ protected: // FIXME: should be private, after I kill the first ctor class UserCommand : public GDBCommand { public: - UserCommand(const QString& s); + UserCommand(const TQString& s); bool isUserCommand() const; }; @@ -125,10 +125,10 @@ public: /** The 'comamnd' should include a single format specifier "%1" that will be replaced with the id of breakpoint. */ - ModifyBreakpointCommand(const QString& command, const Breakpoint* bp); + ModifyBreakpointCommand(const TQString& command, const Breakpoint* bp); public: // DbgCommand overrides - virtual QString cmdToSend(); + virtual TQString cmdToSend(); private: const Breakpoint* bp_; @@ -142,9 +142,9 @@ class CliCommand : public GDBCommand { public: template - CliCommand(const QString& command, + CliCommand(const TQString& command, Handler* handler_this, - void (Handler::* handler_method)(const QValueVector&), + void (Handler::* handler_method)(const TQValueVector&), bool handlesError = false); @@ -153,8 +153,8 @@ public: // GDBCommand overrides bool invokeHandler(const GDBMI::ResultRecord& r); private: - QGuardedPtr cli_handler_this; - typedef void (QObject::* cli_handler_t)(const QValueVector&); + TQGuardedPtr cli_handler_this; + typedef void (TQObject::* cli_handler_t)(const TQValueVector&); cli_handler_t cli_handler_method; }; @@ -165,7 +165,7 @@ private: class SentinelCommand : public GDBCommand { public: - typedef void (QObject::*handler_method_t)(); + typedef void (TQObject::*handler_method_t)(); template SentinelCommand(Handler* handler_this, @@ -180,22 +180,22 @@ public: (handler_this->*handler_method)(); } - QString cmdToSend() + TQString cmdToSend() { return ""; } private: - QGuardedPtr handler_this; + TQGuardedPtr handler_this; handler_method_t handler_method; }; /* Command for which we don't want any reply. */ -class ResultlessCommand : public QObject, public GDBCommand +class ResultlessCommand : public TQObject, public GDBCommand { public: - ResultlessCommand(const QString& command, bool handlesError = false) + ResultlessCommand(const TQString& command, bool handlesError = false) : GDBCommand(command, this, &ResultlessCommand::handle, handlesError) {} @@ -204,16 +204,16 @@ private: {} }; -class ExpressionValueCommand : public QObject, public GDBCommand +class ExpressionValueCommand : public TQObject, public GDBCommand { public: - typedef void (QObject::*handler_method_t)(const QString&); + typedef void (TQObject::*handler_method_t)(const TQString&); template ExpressionValueCommand( - const QString& expression, + const TQString& expression, Handler* handler_this, - void (Handler::* handler_method)(const QString&)) + void (Handler::* handler_method)(const TQString&)) : GDBCommand(("-data-evaluate-expression " + expression).ascii(), this, &ExpressionValueCommand::handleResponse), handler_this(handler_this), @@ -226,7 +226,7 @@ public: } private: - QGuardedPtr handler_this; + TQGuardedPtr handler_this; handler_method_t handler_method; }; @@ -234,7 +234,7 @@ private: template GDBCommand::GDBCommand( - const QString& command, + const TQString& command, Handler* handler_this, void (Handler::* handler_method)(const GDBMI::ResultRecord&), bool handlesError) @@ -248,9 +248,9 @@ GDBCommand::GDBCommand( template CliCommand::CliCommand( - const QString& command, + const TQString& command, Handler* handler_this, - void (Handler::* handler_method)(const QValueVector&), + void (Handler::* handler_method)(const TQValueVector&), bool handlesError) : GDBCommand(command.latin1()), cli_handler_this(handler_this), diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index 05954069..3fd912ec 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -33,13 +33,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -82,7 +82,7 @@ using namespace std; // output the final echo. Hence the data will be thrown away. // (certain "info locals" will generate this error. // -// queueCmd(new GDBCommand(QString().sprintf("define printlocal\n" +// queueCmd(new GDBCommand(TQString().sprintf("define printlocal\n" // "echo \32%c\ninfo locals\necho \32%c\n" // "end", // LOCALS, LOCALS))); @@ -130,14 +130,14 @@ namespace GDBDebugger int debug_controllerExists = false; -GDBController::GDBController(QDomDocument &projectDom) +GDBController::GDBController(TQDomDocument &projectDom) : DbgController(), currentFrame_(0), viewedThread_(-1), holdingZone_(), currentCmd_(0), tty_(0), - badCore_(QString()), + badCore_(TQString()), state_(s_dbgNotStarted|s_appNotStarted), programHasExited_(false), dom(projectDom), @@ -232,7 +232,7 @@ void GDBController::configure() // Disabled for MI port. if (old_outputRadix != config_outputRadix_) { - queueCmd(new GDBCommand(QCString().sprintf("set output-radix %d", + queueCmd(new GDBCommand(TQCString().sprintf("set output-radix %d", config_outputRadix_))); // FIXME: should do this in variable widget anyway. @@ -256,7 +256,7 @@ void GDBController::addCommand(GDBCommand* cmd) queueCmd(cmd); } -void GDBController::addCommand(const QString& str) +void GDBController::addCommand(const TQString& str) { queueCmd(new GDBCommand(str)); } @@ -352,9 +352,9 @@ void GDBController::executeCmd() return; } - QString commandText = currentCmd_->cmdToSend(); + TQString commandText = currentCmd_->cmdToSend(); bool bad_command = false; - QString message; + TQString message; unsigned length = commandText.length(); // No i18n for message since it's mainly for debugging. @@ -400,8 +400,8 @@ void GDBController::executeCmd() commandText.length()); setStateOn(s_waitForWrite); - QString prettyCmd = currentCmd_->cmdToSend(); - prettyCmd.replace( QRegExp("set prompt \032.\n"), "" ); + TQString prettyCmd = currentCmd_->cmdToSend(); + prettyCmd.replace( TQRegExp("set prompt \032.\n"), "" ); prettyCmd = "(gdb) " + prettyCmd; if (currentCmd_->isUserCommand()) @@ -456,7 +456,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) bool shared_library_load = false; if (currentCmd_) { - const QValueVector& lines = currentCmd_->allStreamOutput(); + const TQValueVector& lines = currentCmd_->allStreamOutput(); for(unsigned int i = 0; i < lines.count(); ++i) { if (lines[i].startsWith("Stopped due to shared library event")) @@ -488,7 +488,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) return; } - QString reason = r["reason"].literal(); + TQString reason = r["reason"].literal(); if (reason == "exited-normally" || reason == "exited") { programNoApp("Exited normally", false); @@ -509,7 +509,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) if (reason == "watchpoint-scope") { - QString number = r["wpnum"].literal(); + TQString number = r["wpnum"].literal(); // FIXME: shuld remove this watchpoint // But first, we should consider if removing all @@ -524,8 +524,8 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) if (reason == "signal-received") { - QString name = r["signal-name"].literal(); - QString user_name = r["signal-meaning"].literal(); + TQString name = r["signal-name"].literal(); + TQString user_name = r["signal-meaning"].literal(); // SIGINT is a "break into running program". // We do this when the user set/mod/clears a breakpoint but the @@ -613,7 +613,7 @@ void GDBController::reloadProgramState() // an invalid program specified or ... // gdb is still running though, but only the run command (may) make sense // all other commands are disabled. -void GDBController::programNoApp(const QString &msg, bool msgBox) +void GDBController::programNoApp(const TQString &msg, bool msgBox) { setState(s_appNotStarted|s_programExited|(state_&s_shuttingDown)); @@ -637,7 +637,7 @@ void GDBController::programNoApp(const QString &msg, bool msgBox) // Tty is no longer usable, delete it. Without this, QSocketNotifier // will continiously bomd STTY with signals, so we need to either disable - // QSocketNotifier, or delete STTY. The latter is simpler, since we can't + // TQSocketNotifier, or delete STTY. The latter is simpler, since we can't // reuse it for future debug sessions anyway. delete tty_; @@ -654,7 +654,7 @@ void GDBController::programNoApp(const QString &msg, bool msgBox) emit gdbUserCommandStdout(msg.ascii()); } -void GDBController::parseCliLine(const QString& line) +void GDBController::parseCliLine(const TQString& line) { if (line.startsWith("The program no longer exists") || line.startsWith("Program exited") @@ -694,7 +694,7 @@ void GDBController::parseCliLine(const QString& line) strncmp(buf, "ptrace: Operation not permitted.", 32)==0 || strncmp(buf, "No executable file specified.", 29)==0) { - programNoApp(QString(buf), true); + programNoApp(TQString(buf), true); kdDebug(9012) << "Bad file <" << buf << ">" << endl; return; } @@ -723,7 +723,7 @@ void GDBController::handleMiFileListExecSourceFile(const GDBMI::ResultRecord& r) #endif } - QString fullname = ""; + TQString fullname = ""; if (r.hasField("fullname")) fullname = r["fullname"].literal(); @@ -744,7 +744,7 @@ void GDBController::maybeAnnounceWatchpointHit() gdb does not report any reason at all. */ if ((*last_stop_result).hasField("reason")) { - QString last_stop_reason = (*last_stop_result)["reason"].literal(); + TQString last_stop_reason = (*last_stop_result)["reason"].literal(); if (last_stop_reason == "watchpoint-trigger") { @@ -766,7 +766,7 @@ void GDBController::handleMiFrameSwitch(const GDBMI::ResultRecord& r) const GDBMI::Value& frame = r["frame"]; - QString file; + TQString file; if (frame.hasField("fullname")) file = frame["fullname"].literal(); else if (frame.hasField("file")) @@ -789,31 +789,31 @@ void GDBController::handleMiFrameSwitch(const GDBMI::ResultRecord& r) // ************************************************************************** -bool GDBController::start(const QString& shell, const DomUtil::PairList& run_envvars, const QString& run_directory, const QString &application, const QString& run_arguments) +bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_envvars, const TQString& run_directory, const TQString &application, const TQString& run_arguments) { kdDebug(9012) << "Starting debugger controller\n"; - badCore_ = QString(); + badCore_ = TQString(); Q_ASSERT (!dbgProcess_ && !tty_); dbgProcess_ = new KProcess; - connect( dbgProcess_, SIGNAL(receivedStdout(KProcess *, char *, int)), - this, SLOT(slotDbgStdout(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + this, TQT_SLOT(slotDbgStdout(KProcess *, char *, int)) ); - connect( dbgProcess_, SIGNAL(receivedStderr(KProcess *, char *, int)), - this, SLOT(slotDbgStderr(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + this, TQT_SLOT(slotDbgStderr(KProcess *, char *, int)) ); - connect( dbgProcess_, SIGNAL(wroteStdin(KProcess *)), - this, SLOT(slotDbgWroteStdin(KProcess *)) ); + connect( dbgProcess_, TQT_SIGNAL(wroteStdin(KProcess *)), + this, TQT_SLOT(slotDbgWroteStdin(KProcess *)) ); - connect( dbgProcess_, SIGNAL(processExited(KProcess*)), - this, SLOT(slotDbgProcessExited(KProcess*)) ); + connect( dbgProcess_, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotDbgProcessExited(KProcess*)) ); application_ = application; - QString gdb = "gdb"; - // Prepend path to gdb, if needed. Using QDir, + TQString gdb = "gdb"; + // Prepend path to gdb, if needed. Using TQDir, // path can either end with slash, or not. if (!config_gdbPath_.isEmpty()) { @@ -825,7 +825,7 @@ bool GDBController::start(const QString& shell, const DomUtil::PairList& run_env *dbgProcess_ << "/bin/sh" << "-c" << shell + " " + gdb + + " " + application + " --interpreter=mi2 -quiet"; emit gdbUserCommandStdout( - QString( "/bin/sh -c " + shell + " " + gdb + TQString( "/bin/sh -c " + shell + " " + gdb + " " + application + " --interpreter=mi2 -quiet\n" ).latin1()); } @@ -834,7 +834,7 @@ bool GDBController::start(const QString& shell, const DomUtil::PairList& run_env *dbgProcess_ << gdb << application << "-interpreter=mi2" << "-quiet"; emit gdbUserCommandStdout( - QString( gdb + " " + application + + TQString( gdb + " " + application + " --interpreter=mi2 -quiet\n" ).latin1()); } @@ -888,23 +888,23 @@ bool GDBController::start(const QString& shell, const DomUtil::PairList& run_env queueCmd(new GDBCommand("set print asm-demangle off")); // make sure output radix is always set to users view. - queueCmd(new GDBCommand(QCString().sprintf("set output-radix %d", config_outputRadix_))); + queueCmd(new GDBCommand(TQCString().sprintf("set output-radix %d", config_outputRadix_))); // Change the "Working directory" to the correct one - QCString tmp( "cd " + QFile::encodeName( run_directory )); + TQCString tmp( "cd " + TQFile::encodeName( run_directory )); queueCmd(new GDBCommand(tmp)); // Set the run arguments if (!run_arguments.isEmpty()) queueCmd( - new GDBCommand(QCString("set args ") + run_arguments.local8Bit())); + new GDBCommand(TQCString("set args ") + run_arguments.local8Bit())); // Get the run environment variables pairs into the environstr string // in the form of: "ENV_VARIABLE=ENV_VALUE" and send to gdb using the // "set enviroment" command // Note that we quote the variable value due to the possibility of // embedded spaces - QString environstr; + TQString environstr; DomUtil::PairList::ConstIterator it; for (it = run_envvars.begin(); it != run_envvars.end(); ++it) { @@ -972,8 +972,8 @@ void GDBController::slotStopDebugger() setStateOn(s_shuttingDown); kdDebug(9012) << "GDBController::slotStopDebugger() executing" << endl; - QTime start; - QTime now; + TQTime start; + TQTime now; // Get gdb's attention if it's busy. We need gdb to be at the // command line so we can stop it. @@ -981,11 +981,11 @@ void GDBController::slotStopDebugger() { kdDebug(9012) << "gdb busy on shutdown - stopping gdb (SIGINT)" << endl; dbgProcess_->kill(SIGINT); - start = QTime::currentTime(); + start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput, 20 ); - now = QTime::currentTime(); + kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + now = TQTime::currentTime(); if (!stateIsOn(s_dbgBusy) || start.msecsTo( now ) > 2000) break; } @@ -999,11 +999,11 @@ void GDBController::slotStopDebugger() if (!dbgProcess_->writeStdin(detach, strlen(detach))) kdDebug(9012) << "failed to write 'detach' to gdb" << endl; emit gdbUserCommandStdout("(gdb) detach\n"); - start = QTime::currentTime(); + start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput, 20 ); - now = QTime::currentTime(); + kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + now = TQTime::currentTime(); if (!stateIsOn(s_attached) || start.msecsTo( now ) > 2000) break; } @@ -1015,11 +1015,11 @@ void GDBController::slotStopDebugger() kdDebug(9012) << "failed to write 'quit' to gdb" << endl; emit gdbUserCommandStdout("(gdb) quit"); - start = QTime::currentTime(); + start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput, 20 ); - now = QTime::currentTime(); + kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; } @@ -1050,12 +1050,12 @@ void GDBController::slotStopDebugger() // ************************************************************************** -void GDBController::slotCoreFile(const QString &coreFile) +void GDBController::slotCoreFile(const TQString &coreFile) { setStateOff(s_programExited|s_appNotStarted); setStateOn(s_core); - queueCmd(new GDBCommand(QCString("core ") + coreFile.latin1())); + queueCmd(new GDBCommand(TQCString("core ") + coreFile.latin1())); raiseEvent(connected_to_program); raiseEvent(program_state_changed); @@ -1074,12 +1074,12 @@ void GDBController::slotAttachTo(int pid) // We can't omit application name from gdb invocation // because for libtool binaries, we have no way to guess // real binary name. - queueCmd(new GDBCommand(QString("file"))); + queueCmd(new GDBCommand(TQString("file"))); // The MI interface does not implements -target-attach yet, // and we don't recognize whatever gibberish 'attach' pours out, so... queueCmd(new GDBCommand( - QCString().sprintf("attach %d", pid))); + TQCString().sprintf("attach %d", pid))); raiseEvent(connected_to_program); @@ -1101,11 +1101,11 @@ void GDBController::slotRun() tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); if (!config_dbgTerminal_) { - connect( tty_, SIGNAL(OutOutput(const char*)), SIGNAL(ttyStdout(const char*)) ); - connect( tty_, SIGNAL(ErrOutput(const char*)), SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); } - QString tty(tty_->getSlave()); + TQString tty(tty_->getSlave()); if (tty.isEmpty()) { KMessageBox::information(0, i18n("GDB cannot use the tty* or pty* devices.\n" @@ -1119,12 +1119,12 @@ void GDBController::slotRun() return; } - queueCmd(new GDBCommand(QCString("tty ")+tty.latin1())); + queueCmd(new GDBCommand(TQCString("tty ")+tty.latin1())); if (!config_runShellScript_.isEmpty()) { // Special for remote debug... - QCString tty(tty_->getSlave().latin1()); - QCString options = QCString(">") + tty + QCString(" 2>&1 <") + tty; + TQCString tty(tty_->getSlave().latin1()); + TQCString options = TQCString(">") + tty + TQCString(" 2>&1 <") + tty; KProcess *proc = new KProcess; @@ -1148,7 +1148,7 @@ void GDBController::slotRun() } else { - QFileInfo app(application_); + TQFileInfo app(application_); if (!app.exists()) { @@ -1214,7 +1214,7 @@ void GDBController::slotKill() // ************************************************************************** -void GDBController::slotRunUntil(const QString &fileName, int lineNum) +void GDBController::slotRunUntil(const TQString &fileName, int lineNum) { if (stateIsOn(s_dbgBusy|s_dbgNotStarted|s_shuttingDown)) return; @@ -1223,23 +1223,23 @@ void GDBController::slotRunUntil(const QString &fileName, int lineNum) if (fileName.isEmpty()) queueCmd(new GDBCommand( - QCString().sprintf("-exec-until %d", lineNum))); + TQCString().sprintf("-exec-until %d", lineNum))); else queueCmd(new GDBCommand( - QCString(). + TQCString(). sprintf("-exec-until %s:%d", fileName.latin1(), lineNum))); } // ************************************************************************** -void GDBController::slotJumpTo(const QString &fileName, int lineNum) +void GDBController::slotJumpTo(const TQString &fileName, int lineNum) { if (stateIsOn(s_dbgBusy|s_dbgNotStarted|s_shuttingDown)) return; if (!fileName.isEmpty()) { - queueCmd(new GDBCommand(QCString().sprintf("tbreak %s:%d", fileName.latin1(), lineNum))); - queueCmd(new GDBCommand(QCString().sprintf("jump %s:%d", fileName.latin1(), lineNum))); + queueCmd(new GDBCommand(TQCString().sprintf("tbreak %s:%d", fileName.latin1(), lineNum))); + queueCmd(new GDBCommand(TQCString().sprintf("jump %s:%d", fileName.latin1(), lineNum))); } } @@ -1324,11 +1324,11 @@ void GDBController::selectFrame(int frameNo, int threadNo) { if (viewedThread_ != threadNo) queueCmd(new GDBCommand( - QString("-thread-select %1").arg(threadNo).ascii())); + TQString("-thread-select %1").arg(threadNo).ascii())); } queueCmd(new GDBCommand( - QString("-stack-select-frame %1").arg(frameNo).ascii())); + TQString("-stack-select-frame %1").arg(frameNo).ascii())); // Will emit the 'thread_or_frame_changed' event. queueCmd(new GDBCommand("-stack-info-frame", @@ -1347,7 +1347,7 @@ void GDBController::selectFrame(int frameNo, int threadNo) void GDBController::defaultErrorHandler(const GDBMI::ResultRecord& result) { - QString msg = result["msg"].literal(); + TQString msg = result["msg"].literal(); if (msg.contains("No such process")) { @@ -1425,11 +1425,11 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) { static bool parsing = false; - QCString msg(buf, buflen+1); + TQCString msg(buf, buflen+1); // Copy the data out of the KProcess buffer before it gets overwritten // Append to the back of the holding zone. - holdingZone_ += QCString(buf, buflen+1); + holdingZone_ += TQCString(buf, buflen+1); // Already parsing? then get out quick. // VP, 2006-01-30. I'm not sure how this could happen, since @@ -1451,7 +1451,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) { got_any_command = true; - QCString reply(holdingZone_.left(i)); + TQCString reply(holdingZone_.left(i)); holdingZone_ = holdingZone_.mid(i+1); kdDebug(9012) << "REPLY: " << reply << "\n"; @@ -1561,7 +1561,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) parseCliLine(s.message); - static QRegExp print_output("^\\$(\\d+) = "); + static TQRegExp print_output("^\\$(\\d+) = "); if (print_output.search(s.message) != -1) { kdDebug(9012) << "Found 'print' output: " << s.message << "\n"; @@ -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: " << QString::fromLatin1(buf, buflen+1) << endl; + kdDebug(9012) << "STDERR: " << TQString::fromLatin1(buf, buflen+1) << endl; slotDbgStdout(proc, buf, buflen); } @@ -1729,7 +1729,7 @@ void GDBController::slotDbgProcessExited(KProcess* process) // ************************************************************************** -void GDBController::slotUserGDBCmd(const QString& cmd) +void GDBController::slotUserGDBCmd(const TQString& cmd) { queueCmd(new UserCommand(cmd.latin1())); @@ -1745,7 +1745,7 @@ void GDBController::slotUserGDBCmd(const QString& cmd) void GDBController::explainDebuggerStatus() { - QString information("%1 commands in queue\n" + TQString information("%1 commands in queue\n" "%2 commands being processed by gdb\n" "Debugger state: %3\n"); information = @@ -1754,7 +1754,7 @@ void GDBController::explainDebuggerStatus() if (currentCmd_) { - QString extra("Current command class: '%1'\n" + TQString extra("Current command class: '%1'\n" "Current command text: '%2'\n" "Current command origianl text: '%3'\n"); @@ -1795,7 +1795,7 @@ void GDBController::debugStateChange(int oldState, int newState) int delta = oldState ^ newState; if (delta) { - QString out = "STATE: "; + TQString out = "STATE: "; for(unsigned i = 1; i < s_lastDbgState; i <<= 1) { if (delta & i) @@ -1824,7 +1824,7 @@ void GDBController::debugStateChange(int oldState, int newState) #undef STATE_CHECK if (!found) - out += QString::number(i); + out += TQString::number(i); out += " "; } @@ -1840,7 +1840,7 @@ int GDBController::qtVersion( ) const void GDBController::demandAttention() const { - if ( QWidget * w = kapp->mainWidget() ) + if ( TQWidget * w = kapp->mainWidget() ) { KWin::demandAttention( w->winId(), true ); } diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index 6a9e3385..a8b6bd2b 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -22,13 +22,13 @@ #include "mi/gdbmi.h" #include "mi/miparser.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -54,7 +54,7 @@ class GDBController : public DbgController Q_OBJECT public: - GDBController(QDomDocument &projectDom); + GDBController(TQDomDocument &projectDom); ~GDBController(); enum event_t { program_state_changed = 1, program_exited, debugger_exited, @@ -82,7 +82,7 @@ public: /** Same as above, but internally constructs new GDBCommand instance from the string. */ - void addCommand(const QString& cmd); + void addCommand(const TQString& cmd); /** Adds command to the front of the commands queue. It will be executed next. @@ -127,11 +127,11 @@ public: int currentFrame() const; - bool start(const QString& shell, + bool start(const TQString& shell, const DomUtil::PairList& run_envvars, - const QString& run_directory, - const QString &application, - const QString& run_arguments); + const TQString& run_directory, + const TQString &application, + const TQString& run_arguments); int qtVersion() const; @@ -161,7 +161,7 @@ private: run "continue" there will be no MI message if the application has exited. */ - void parseCliLine (const QString&); + void parseCliLine (const TQString&); /** Handles a result response from a MI command -- that is all MI responses except for Stream and Prompt responses. @@ -188,7 +188,7 @@ private: */ void reloadProgramState(); - void programNoApp(const QString &msg, bool msgBox); + void programNoApp(const TQString &msg, bool msgBox); void setStateOn(int stateOn); void setStateOff(int stateOff); @@ -226,16 +226,16 @@ public slots: void configure(); - //void slotStart(const QString& shell, const QString &application); - void slotCoreFile(const QString &coreFile); + //void slotStart(const TQString& shell, const TQString &application); + void slotCoreFile(const TQString &coreFile); void slotAttachTo(int pid); void slotStopDebugger(); void slotRun(); void slotKill(); - void slotRunUntil(const QString &filename, int lineNum); - void slotJumpTo(const QString &filename, int lineNum); + void slotRunUntil(const TQString &filename, int lineNum); + void slotJumpTo(const TQString &filename, int lineNum); void slotStepInto(); void slotStepOver(); void slotStepIntoIns(); @@ -244,7 +244,7 @@ public slots: void slotBreakInto(); - void slotUserGDBCmd(const QString&); + void slotUserGDBCmd(const TQString&); // Pops up a dialog box with some hopefully // detailed information about which state debugger @@ -276,14 +276,14 @@ signals: void breakpointHit(int id); /** Emitted for watchpoint hit, after line indicator is shown. */ void watchpointHit(int id, - const QString& oldValue, const QString& newValue); + const TQString& oldValue, const TQString& newValue); private: int currentFrame_; int viewedThread_; // The output from gdb that was not parsed yet - QCString gdbOutput_; + TQCString gdbOutput_; // The output from gdb that arrived where we was // parsing the previous output. To avoid messing // things up, it's not directly added to @@ -291,35 +291,35 @@ private: // VP: It's not clear why the previous code was doing // this, and holdingZone_ won't be processed until // next output arrives, so probably should be just removed. - QCString holdingZone_; + TQCString holdingZone_; - QPtrList cmdList_; + TQPtrList cmdList_; GDBCommand* currentCmd_; STTY* tty_; - QString badCore_; - QString application_; + TQString badCore_; + TQString application_; // Gdb command that should be issued when we stop on breakpoint // with the given gdb breakpoint id. - QMap tracedBreakpoints_; + TQMap tracedBreakpoints_; // Some state variables int state_; bool programHasExited_; // Configuration values - QDomDocument &dom; + TQDomDocument &dom; bool config_breakOnLoadingLibrary_; bool config_forceBPSet_; bool config_displayStaticMembers_; bool config_asmDemangle_; bool config_dbgTerminal_; - QString config_gdbPath_; - QString config_dbgShell_; - QCString config_configGdbScript_; - QCString config_runShellScript_; - QCString config_runGdbScript_; + TQString config_gdbPath_; + TQString config_dbgShell_; + TQCString config_configGdbScript_; + TQCString config_runShellScript_; + TQCString config_runGdbScript_; int config_outputRadix_; MIParser mi_parser_; @@ -335,11 +335,11 @@ private: // so the only way it can work is via the "print" command. As gdb // outputs things, we'll grep for lines that look like output from // print, and store such lines in this variable, so later use. - QCString print_command_result; + TQCString print_command_result; bool state_reload_needed; - QTime commandExecutionTime; + TQTime commandExecutionTime; bool stateReloadInProgress_; diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index 817f8692..836886bb 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -24,14 +24,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace GDBDebugger @@ -39,8 +39,8 @@ namespace GDBDebugger /***************************************************************************/ -GDBOutputWidget::GDBOutputWidget( QWidget *parent, const char *name) : - QWidget(parent, name), +GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : + TQWidget(parent, name), m_userGDBCmdEditor(0), m_Interrupt(0), m_gdbView(0), @@ -49,40 +49,40 @@ GDBOutputWidget::GDBOutputWidget( QWidget *parent, const char *name) : { m_gdbView = new OutputText(this); - m_gdbView->setTextFormat(QTextEdit::LogText); + m_gdbView->setTextFormat(TQTextEdit::LogText); - QBoxLayout *userGDBCmdEntry = new QHBoxLayout(); + TQBoxLayout *userGDBCmdEntry = new TQHBoxLayout(); m_userGDBCmdEditor = new KHistoryCombo (this, "gdb-user-cmd-editor"); - QLabel *label = new QLabel(i18n("&GDB cmd:"), this); + TQLabel *label = new TQLabel(i18n("&GDB cmd:"), this); label->setBuddy(m_userGDBCmdEditor); userGDBCmdEntry->addWidget(label); userGDBCmdEntry->addWidget(m_userGDBCmdEditor); userGDBCmdEntry->setStretchFactor(m_userGDBCmdEditor, 1); - m_Interrupt = new QToolButton( this, "add breakpoint" ); - m_Interrupt->setSizePolicy ( QSizePolicy ( (QSizePolicy::SizeType)0, - ( QSizePolicy::SizeType)0, + m_Interrupt = new TQToolButton( this, "add breakpoint" ); + m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, + ( TQSizePolicy::SizeType)0, 0, 0, m_Interrupt->sizePolicy().hasHeightForWidth()) ); m_Interrupt->setPixmap ( SmallIcon ( "player_pause" ) ); userGDBCmdEntry->addWidget(m_Interrupt); - QToolTip::add ( m_Interrupt, i18n ( "Pause execution of the app to enter gdb commands" ) ); + TQToolTip::add ( m_Interrupt, i18n ( "Pause execution of the app to enter gdb commands" ) ); - QVBoxLayout *topLayout = new QVBoxLayout(this, 2); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 2); topLayout->addWidget(m_gdbView, 10); topLayout->addLayout(userGDBCmdEntry); slotDbgStatus( "", s_dbgNotStarted); - connect( m_userGDBCmdEditor, SIGNAL(returnPressed()), SLOT(slotGDBCmd()) ); - connect( m_Interrupt, SIGNAL(clicked()), SIGNAL(breakInto())); + connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) ); + connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); - connect( &updateTimer_, SIGNAL(timeout()), - this, SLOT(flushPending())); + connect( &updateTimer_, TQT_SIGNAL(timeout()), + this, TQT_SLOT(flushPending())); } /***************************************************************************/ @@ -117,7 +117,7 @@ void GDBOutputWidget::slotUserCommandStdout(const char* line) } namespace { - QString colorify(QString text, const QString& color) + TQString colorify(TQString text, const TQString& color) { // Make sure the newline is at the end of the newly-added // string. This is so that we can always correctly remove @@ -133,10 +133,10 @@ namespace { } -void GDBOutputWidget::newStdoutLine(const QString& line, +void GDBOutputWidget::newStdoutLine(const TQString& line, bool internal) { - QString s = html_escape(line); + TQString s = html_escape(line); if (s.startsWith("(gdb)")) { s = colorify(s, "blue"); @@ -160,7 +160,7 @@ void GDBOutputWidget::newStdoutLine(const QString& line, } -void GDBOutputWidget::showLine(const QString& line) +void GDBOutputWidget::showLine(const TQString& line) { pendingOutput_ += line; @@ -171,7 +171,7 @@ void GDBOutputWidget::showLine(const QString& line) } } -void GDBOutputWidget::trimList(QStringList& l, unsigned max_size) +void GDBOutputWidget::trimList(TQStringList& l, unsigned max_size) { unsigned int length = l.count(); if (length > max_size) @@ -192,10 +192,10 @@ void GDBOutputWidget::setShowInternalCommands(bool show) // Set of strings to show changes, text edit still has old // set. Refresh. m_gdbView->clear(); - QStringList& newList = + TQStringList& newList = showInternalCommands_ ? allCommands_ : userCommands_; - QStringList::iterator i = newList.begin(), e = newList.end(); + TQStringList::iterator i = newList.begin(), e = newList.end(); for(; i != e; ++i) { // Note that color formatting is already applied to '*i'. @@ -208,7 +208,7 @@ void GDBOutputWidget::setShowInternalCommands(bool show) void GDBOutputWidget::slotReceivedStderr(const char* line) { - QString colored = colorify(html_escape(line), "red"); + TQString colored = colorify(html_escape(line), "red"); // Errors are shown inside user commands too. allCommands_.append(colored); trimList(allCommands_, maxLines_); @@ -227,7 +227,7 @@ void GDBOutputWidget::slotReceivedStderr(const char* line) void GDBOutputWidget::slotGDBCmd() { - QString GDBCmd(m_userGDBCmdEditor->currentText()); + TQString GDBCmd(m_userGDBCmdEditor->currentText()); if (!GDBCmd.isEmpty()) { m_userGDBCmdEditor->addToHistory(GDBCmd); @@ -240,7 +240,7 @@ void GDBOutputWidget::flushPending() { m_gdbView->setUpdatesEnabled(false); - // QTextEdit adds newline after paragraph automatically. + // TQTextEdit adds newline after paragraph automatically. // So, remove trailing newline to avoid double newlines. if (pendingOutput_.endsWith("\n")) pendingOutput_.remove(pendingOutput_.length()-1, 1); @@ -257,7 +257,7 @@ void GDBOutputWidget::flushPending() /***************************************************************************/ -void GDBOutputWidget::slotDbgStatus(const QString &, int statusFlag) +void GDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag) { if (statusFlag & s_dbgNotStarted) { @@ -282,33 +282,33 @@ void GDBOutputWidget::slotDbgStatus(const QString &, int statusFlag) /***************************************************************************/ -void GDBOutputWidget::focusInEvent(QFocusEvent */*e*/) +void GDBOutputWidget::focusInEvent(TQFocusEvent */*e*/) { m_gdbView->scrollToBottom(); m_userGDBCmdEditor->setFocus(); } -QString GDBOutputWidget::html_escape(const QString& s) +TQString GDBOutputWidget::html_escape(const TQString& s) { - QString r(s); + TQString r(s); r.replace("<", "<"); r.replace(">", ">"); return r; } -void GDBOutputWidget::savePartialProjectSession(QDomElement* el) +void GDBOutputWidget::savePartialProjectSession(TQDomElement* el) { - QDomDocument doc = el->ownerDocument(); + TQDomDocument doc = el->ownerDocument(); - QDomElement showInternal = doc.createElement("showInternalCommands"); - showInternal.setAttribute("value", QString::number(showInternalCommands_)); + TQDomElement showInternal = doc.createElement("showInternalCommands"); + showInternal.setAttribute("value", TQString::number(showInternalCommands_)); el->appendChild(showInternal); } -void GDBOutputWidget::restorePartialProjectSession(const QDomElement* el) +void GDBOutputWidget::restorePartialProjectSession(const TQDomElement* el) { - QDomElement showInternal = + TQDomElement showInternal = el->namedItem("showInternalCommands").toElement(); if (!showInternal.isNull()) @@ -318,14 +318,14 @@ void GDBOutputWidget::restorePartialProjectSession(const QDomElement* el) } -//void OutputText::contextMenuEvent(QContextMenuEvent* e) -QPopupMenu* OutputText::createPopupMenu(const QPoint&) +//void OutputText::contextMenuEvent(TQContextMenuEvent* e) +TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) { KPopupMenu* popup = new KPopupMenu; int id = popup->insertItem(i18n("Show Internal Commands"), this, - SLOT(toggleShowInternalCommands())); + TQT_SLOT(toggleShowInternalCommands())); popup->setItemChecked(id, parent_->showInternalCommands_); popup->setWhatsThis( @@ -338,7 +338,7 @@ QPopupMenu* OutputText::createPopupMenu(const QPoint&) popup->insertItem(i18n("Copy All"), this, - SLOT(copyAll())); + TQT_SLOT(copyAll())); return popup; @@ -348,16 +348,16 @@ void OutputText::copyAll() { /* See comments for allCommandRaw_ for explanations of this complex logic, as opposed to calling text(). */ - QStringList& raw = parent_->showInternalCommands_ ? + TQStringList& raw = parent_->showInternalCommands_ ? parent_->allCommandsRaw_ : parent_->userCommandsRaw_; - QString text; + TQString text; for (unsigned i = 0; i < raw.size(); ++i) text += raw[i]; // Make sure the text is pastable both with Ctrl-C and with // middle click. - QApplication::clipboard()->setText(text, QClipboard::Clipboard); - QApplication::clipboard()->setText(text, QClipboard::Selection); + TQApplication::clipboard()->setText(text, QClipboard::Clipboard); + TQApplication::clipboard()->setText(text, QClipboard::Selection); } void OutputText::toggleShowInternalCommands() diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index ddf79823..0b14b599 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -18,10 +18,10 @@ #ifndef _GDBOUTPUTWIDGET_H_ #define _GDBOUTPUTWIDGET_H_ -#include -#include -#include -#include +#include +#include +#include +#include class KHistoryCombo; @@ -37,11 +37,11 @@ class GDBOutputWidget : public QWidget Q_OBJECT public: - GDBOutputWidget( QWidget *parent=0, const char *name=0 ); + GDBOutputWidget( TQWidget *parent=0, const char *name=0 ); ~GDBOutputWidget(); - void savePartialProjectSession(QDomElement* el); - void restorePartialProjectSession(const QDomElement* el); + void savePartialProjectSession(TQDomElement* el); + void restorePartialProjectSession(const TQDomElement* el); void clear(); @@ -49,38 +49,38 @@ public slots: void slotInternalCommandStdout(const char* line); void slotUserCommandStdout(const char* line); void slotReceivedStderr(const char* line); - void slotDbgStatus (const QString &status, int statusFlag); + void slotDbgStatus (const TQString &status, int statusFlag); void slotGDBCmd(); void flushPending(); protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); signals: - void userGDBCmd(const QString &cmd); + void userGDBCmd(const TQString &cmd); void breakInto(); private: - QString html_escape(const QString& s); + TQString html_escape(const TQString& s); - void newStdoutLine(const QString& line, bool internal); + void newStdoutLine(const TQString& line, bool internal); /** Arranges for 'line' to be shown to the user. Adds 'line' to pendingOutput_ and makes sure updateTimer_ is running. */ - void showLine(const QString& line); + void showLine(const TQString& line); /** Makes 'l' no longer then 'max_size' by removing excessive elements from the top. */ - void trimList(QStringList& l, unsigned max_size); + void trimList(TQStringList& l, unsigned max_size); KHistoryCombo* m_userGDBCmdEditor; - QToolButton* m_Interrupt; - QTextEdit* m_gdbView; + TQToolButton* m_Interrupt; + TQTextEdit* m_gdbView; void setShowInternalCommands(bool); friend class OutputText; @@ -90,39 +90,39 @@ private: "Show internal commands" on, we can show previous internal commands. */ - QStringList userCommands_, allCommands_; + TQStringList userCommands_, allCommands_; /** Same output, without any fancy formatting. Keeping it here because I can't find any way to extract raw text, - without formatting, out of QTextEdit except for + without formatting, out of TQTextEdit except for selecting everything and calling 'copy()'. The latter approach is just ugly. */ - QStringList userCommandsRaw_, allCommandsRaw_; + TQStringList userCommandsRaw_, allCommandsRaw_; /** For performance reasons, we don't immediately add new text to QTExtEdit. Instead we add it to pendingOutput_ and flush it on timer. */ - QString pendingOutput_; - QTimer updateTimer_; + TQString pendingOutput_; + TQTimer updateTimer_; bool showInternalCommands_; int maxLines_; }; -/** Add popup menu specific to gdb output window to QTextEdit. +/** Add popup menu specific to gdb output window to TQTextEdit. */ class OutputText : public QTextEdit { Q_OBJECT public: OutputText(GDBOutputWidget* parent) - : QTextEdit(parent), + : TQTextEdit(parent), parent_(parent) {} - QPopupMenu* createPopupMenu(const QPoint& pos); + TQPopupMenu* createPopupMenu(const TQPoint& pos); private slots: void copyAll(); diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp index 79057af5..5a8588b1 100644 --- a/languages/cpp/debugger/gdbparser.cpp +++ b/languages/cpp/debugger/gdbparser.cpp @@ -17,7 +17,7 @@ #include "variablewidget.h" #include -#include +#include #include #include @@ -62,32 +62,32 @@ GDBParser::~GDBParser() // ************************************************************************** -QString GDBParser::getName(const char **buf) +TQString GDBParser::getName(const char **buf) { const char *start = skipNextTokenStart(*buf); if (*start) { *buf = skipTokenValue(start); - return QCString(start, *buf - start + 1); + return TQCString(start, *buf - start + 1); } else *buf = start; - return QString(); + return TQString(); } // ************************************************************************** -QString GDBParser::getValue(const char **buf) +TQString GDBParser::getValue(const char **buf) { const char *start = skipNextTokenStart(*buf); *buf = skipTokenValue(start); - QString value(QCString(start, *buf - start + 1).data()); + TQString value(TQCString(start, *buf - start + 1).data()); return value; } -QString GDBParser::undecorateValue(DataType type, const QString& s) +TQString GDBParser::undecorateValue(DataType type, const TQString& s) { - QCString l8 = s.local8Bit(); + TQCString l8 = s.local8Bit(); const char* start = l8; const char* end = start + s.length(); @@ -106,7 +106,7 @@ QString GDBParser::undecorateValue(DataType type, const QString& s) else { // Looks like composite, strip the braces and return. - return QCString(start+1, end - start -1); + return TQCString(start+1, end - start -1); } } else if (*start == '(') @@ -131,7 +131,7 @@ QString GDBParser::undecorateValue(DataType type, const QString& s) start = skipDelim(start, '(', ')'); } - QString value(QCString(start, end - start + 1).data()); + TQString value(TQCString(start, end - start + 1).data()); value = value.stripWhiteSpace(); @@ -155,10 +155,10 @@ QString GDBParser::undecorateValue(DataType type, const QString& s) return value.stripWhiteSpace(); } -QString GDBParser::undecorateValue(const QString& s) +TQString GDBParser::undecorateValue(const TQString& s) { DataType dataType = determineType(s.local8Bit()); - QString r = undecorateValue(dataType, s.local8Bit()); + TQString r = undecorateValue(dataType, s.local8Bit()); return r; } diff --git a/languages/cpp/debugger/gdbparser.h b/languages/cpp/debugger/gdbparser.h index 8972e5df..a56c082d 100644 --- a/languages/cpp/debugger/gdbparser.h +++ b/languages/cpp/debugger/gdbparser.h @@ -25,7 +25,7 @@ class GDBParser { public: DataType determineType(const char *buf) const; - QString undecorateValue(const QString& s); + TQString undecorateValue(const TQString& s); const char *skipString(const char *buf) const; const char *skipQuotes(const char *buf, char quote) const; @@ -41,12 +41,12 @@ private: const char *skipTokenValue(const char *buf) const; const char *skipNextTokenStart(const char *buf) const; - QString getName(const char **buf); + TQString getName(const char **buf); /** Assuming 'buf' points to a value, return a pointer to the position right after the value. */ - QString getValue(const char **buf); - QString undecorateValue(DataType type, const QString& s); + TQString getValue(const char **buf); + TQString undecorateValue(DataType type, const TQString& s); protected: GDBParser(); diff --git a/languages/cpp/debugger/gdbtable.cpp b/languages/cpp/debugger/gdbtable.cpp index c4d75f3a..c9c1bf2f 100644 --- a/languages/cpp/debugger/gdbtable.cpp +++ b/languages/cpp/debugger/gdbtable.cpp @@ -11,13 +11,13 @@ namespace GDBDebugger { -GDBTable::GDBTable(QWidget *parent, const char *name) - : QTable(parent, name) +GDBTable::GDBTable(TQWidget *parent, const char *name) + : TQTable(parent, name) { } -GDBTable::GDBTable(int nr, int nc, QWidget * parent, const char * name) - : QTable(nr, nc, parent, name) +GDBTable::GDBTable(int nr, int nc, TQWidget * parent, const char * name) + : TQTable(nr, nc, parent, name) { } @@ -25,7 +25,7 @@ GDBTable::~GDBTable() { } -void GDBTable::keyPressEvent( QKeyEvent * e ) +void GDBTable::keyPressEvent( TQKeyEvent * e ) { emit keyPressed(e->key()); @@ -33,12 +33,12 @@ void GDBTable::keyPressEvent( QKeyEvent * e ) emit returnPressed(); else if (e->key() == Key_F2) emit f2Pressed(); - else if ((e->text() == QString("a")) && (e->state() == AltButton)) + else if ((e->text() == TQString("a")) && (e->state() == AltButton)) { emit insertPressed(); return; } - else if ((e->text() == QString("A")) && (e->state() == AltButton)) + else if ((e->text() == TQString("A")) && (e->state() == AltButton)) { emit insertPressed(); return; @@ -46,7 +46,7 @@ void GDBTable::keyPressEvent( QKeyEvent * e ) else if (e->key() == Key_Delete) emit deletePressed(); - QTable::keyPressEvent(e); + TQTable::keyPressEvent(e); } } diff --git a/languages/cpp/debugger/gdbtable.h b/languages/cpp/debugger/gdbtable.h index f8741e26..78c45055 100644 --- a/languages/cpp/debugger/gdbtable.h +++ b/languages/cpp/debugger/gdbtable.h @@ -10,7 +10,7 @@ #ifndef GDBDEBUGGERGDBTABLE_H #define GDBDEBUGGERGDBTABLE_H -#include +#include namespace GDBDebugger { @@ -18,11 +18,11 @@ class GDBTable : public QTable { Q_OBJECT public: - GDBTable(QWidget *parent = 0, const char *name = 0); - GDBTable( int numRows, int numCols, QWidget * parent = 0, const char * name = 0 ); + GDBTable(TQWidget *parent = 0, const char *name = 0); + GDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 ); ~GDBTable(); - virtual void keyPressEvent ( QKeyEvent * e ); + virtual void keyPressEvent ( TQKeyEvent * e ); signals: void keyPressed(int key); diff --git a/languages/cpp/debugger/label_with_double_click.cpp b/languages/cpp/debugger/label_with_double_click.cpp index a0a2014b..f08c7358 100644 --- a/languages/cpp/debugger/label_with_double_click.cpp +++ b/languages/cpp/debugger/label_with_double_click.cpp @@ -1,11 +1,11 @@ #include "label_with_double_click.h" -LabelWithDoubleClick::LabelWithDoubleClick(const QString& s, QWidget* parent) -: QLabel(s, parent) +LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* parent) +: TQLabel(s, parent) {} -void LabelWithDoubleClick::mouseDoubleClickEvent(QMouseEvent*) +void LabelWithDoubleClick::mouseDoubleClickEvent(TQMouseEvent*) { emit doubleClicked(); } diff --git a/languages/cpp/debugger/label_with_double_click.h b/languages/cpp/debugger/label_with_double_click.h index 11dec898..35ade271 100644 --- a/languages/cpp/debugger/label_with_double_click.h +++ b/languages/cpp/debugger/label_with_double_click.h @@ -2,19 +2,19 @@ #ifndef LABEL_WITH_DOUBLE_CLICK_HPP_VP_2006_04_04 #define LABEL_WITH_DOUBLE_CLICK_HPP_VP_2006_04_04 -#include +#include class LabelWithDoubleClick : public QLabel { Q_OBJECT public: - LabelWithDoubleClick(const QString& s, QWidget* parent); + LabelWithDoubleClick(const TQString& s, TQWidget* parent); signals: void doubleClicked(); protected: - void mouseDoubleClickEvent(QMouseEvent*); + void mouseDoubleClickEvent(TQMouseEvent*); }; #endif diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 5316aa91..6d700233 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -26,15 +26,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -76,28 +76,28 @@ namespace GDBDebugger public: KLineEdit* startAddressLineEdit; KLineEdit* amountLineEdit; - QPushButton* okButton; - QPushButton* cancelButton; + TQPushButton* okButton; + TQPushButton* cancelButton; - MemoryRangeSelector(QWidget* parent) - : QWidget(parent) + MemoryRangeSelector(TQWidget* parent) + : TQWidget(parent) { - QVBoxLayout* l = new QVBoxLayout(this); + TQVBoxLayout* l = new TQVBoxLayout(this); // Grid layout: labels + address field - QGridLayout* gl = new QGridLayout(l); + TQGridLayout* gl = new TQGridLayout(l); gl->setColSpacing(0, 2); gl->setColSpacing(1, 4); gl->setRowSpacing(1, 2); - QLabel* l1 = new QLabel(i18n("Start"), this); + TQLabel* l1 = new TQLabel(i18n("Start"), this); gl->addWidget(l1, 0, 1); startAddressLineEdit = new KLineEdit(this); gl->addWidget(startAddressLineEdit, 0, 3); - QLabel* l2 = new QLabel(i18n("Amount"), this); + TQLabel* l2 = new TQLabel(i18n("Amount"), this); gl->addWidget(l2, 2, 1); amountLineEdit = new KLineEdit(this); @@ -105,30 +105,30 @@ namespace GDBDebugger l->addSpacing(2); - QHBoxLayout* hb = new QHBoxLayout(l); + TQHBoxLayout* hb = new TQHBoxLayout(l); hb->addStretch(); - okButton = new QPushButton(i18n("OK"), this); + okButton = new TQPushButton(i18n("OK"), this); hb->addWidget(okButton); - cancelButton = new QPushButton(i18n("Cancel"), this); + cancelButton = new TQPushButton(i18n("Cancel"), this); hb->addWidget(cancelButton); l->addSpacing(2); - connect(startAddressLineEdit, SIGNAL(returnPressed()), - okButton, SLOT(animateClick())); + connect(startAddressLineEdit, TQT_SIGNAL(returnPressed()), + okButton, TQT_SLOT(animateClick())); - connect(amountLineEdit, SIGNAL(returnPressed()), - okButton, SLOT(animateClick())); + connect(amountLineEdit, TQT_SIGNAL(returnPressed()), + okButton, TQT_SLOT(animateClick())); } }; MemoryView::MemoryView(GDBController* controller, - QWidget* parent, const char* name) - : QWidget(parent, name), + TQWidget* parent, const char* name) + : TQWidget(parent, name), controller_(controller), // New memory view can be created only when debugger is active, // so don't set s_appNotStarted here. @@ -147,7 +147,7 @@ namespace GDBDebugger void MemoryView::initWidget() { - QVBoxLayout *l = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0); khexedit2_widget = KHE::createBytesEditWidget(this); @@ -155,22 +155,22 @@ namespace GDBDebugger if (khexedit2_widget) { - QWidget* real_widget = (QWidget*) + TQWidget* real_widget = (TQWidget*) khexedit2_widget->child("BytesEdit"); if (real_widget) { ok_ = true; - connect(real_widget, SIGNAL(bufferChanged(int, int)), - this, SLOT(memoryEdited(int, int))); + connect(real_widget, TQT_SIGNAL(bufferChanged(int, int)), + this, TQT_SLOT(memoryEdited(int, int))); khexedit2_real_widget = real_widget; - QVariant resize_style(2); // full size usage. + TQVariant resize_style(2); // full size usage. real_widget->setProperty("ResizeStyle", resize_style); - //QVariant group(8); + //TQVariant group(8); //real_widget->setProperty("StartOffset", start); //real_widget->setProperty("NoOfBytesPerLine", group); @@ -179,10 +179,10 @@ namespace GDBDebugger // 3 -- binary // 1 -- decimal // 0 -- hex - //QVariant coding(3); + //TQVariant coding(3); //real_widget->setProperty("Coding", coding); - //QVariant gap(32); + //TQVariant gap(32); //real_widget->setProperty("BinaryGapWidth", gap); } @@ -197,28 +197,28 @@ namespace GDBDebugger rangeSelector_ = new MemoryRangeSelector(this); l->addWidget(rangeSelector_); - connect(rangeSelector_->okButton, SIGNAL(clicked()), - this, SLOT(slotChangeMemoryRange())); + connect(rangeSelector_->okButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotChangeMemoryRange())); - connect(rangeSelector_->cancelButton, SIGNAL(clicked()), - this, SLOT(slotHideRangeDialog())); + connect(rangeSelector_->cancelButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotHideRangeDialog())); connect(rangeSelector_->startAddressLineEdit, - SIGNAL(textChanged(const QString&)), + TQT_SIGNAL(textChanged(const TQString&)), this, - SLOT(slotEnableOrDisable())); + TQT_SLOT(slotEnableOrDisable())); connect(rangeSelector_->amountLineEdit, - SIGNAL(textChanged(const QString&)), + TQT_SIGNAL(textChanged(const TQString&)), this, - SLOT(slotEnableOrDisable())); + TQT_SLOT(slotEnableOrDisable())); l->addWidget(khexedit2_widget); } else { - QTextEdit* edit = new QTextEdit(this); + TQTextEdit* edit = new TQTextEdit(this); l->addWidget(edit); edit->setText( @@ -257,12 +257,12 @@ namespace GDBDebugger this, &MemoryView::sizeComputed)); } - void MemoryView::sizeComputed(const QString& size) + void MemoryView::sizeComputed(const TQString& size) { controller_->addCommand( new GDBCommand( - QString("-data-read-memory %1 x 1 1 %2") + TQString("-data-read-memory %1 x 1 1 %2") .arg(rangeSelector_->startAddressLineEdit->text()) .arg(size).ascii(), this, @@ -279,7 +279,7 @@ namespace GDBDebugger amountAsString_ = rangeSelector_->amountLineEdit->text(); start_ = startAsString_.toUInt(0, 0); - setCaption(QString("%1 (%2 bytes)") + setCaption(TQString("%1 (%2 bytes)") .arg(startAsString_).arg(amount_)); emit captionChanged(caption()); @@ -302,10 +302,10 @@ namespace GDBDebugger // inserting new data. bytesEditor->setOverwriteOnly( true ); - QVariant start_v(start_); + TQVariant start_v(start_); khexedit2_real_widget->setProperty("FirstLineOffset", start_v); - //QVariant bsw(0); + //TQVariant bsw(0); //khexedit2_real_widget->setProperty("ByteSpacingWidth", bsw); // HACK: use hardcoded constant taht should match @@ -313,7 +313,7 @@ namespace GDBDebugger // 3 -- binary // 1 -- decimal // 0 -- hex - //QVariant coding(1); + //TQVariant coding(1); //khexedit2_real_widget->setProperty("Coding", coding); @@ -327,19 +327,19 @@ namespace GDBDebugger { controller_->addCommand( new GDBCommand( - QString("set *(char*)(%1 + %2) = %3") + TQString("set *(char*)(%1 + %2) = %3") .arg(start_) .arg(i) - .arg(QString::number(data_[i])))); + .arg(TQString::number(data_[i])))); } } - void MemoryView::contextMenuEvent ( QContextMenuEvent * e ) + void MemoryView::contextMenuEvent ( TQContextMenuEvent * e ) { if (!isOk()) return; - QPopupMenu menu; + TQPopupMenu menu; bool app_running = !(debuggerState_ & s_appNotStarted); @@ -373,7 +373,7 @@ namespace GDBDebugger controller_->addCommand( new GDBCommand( - QString("-data-read-memory %1 x 1 1 %2") + TQString("-data-read-memory %1 x 1 1 %2") .arg(start_).arg(amount_).ascii(), this, &MemoryView::memoryRead)); @@ -403,16 +403,16 @@ namespace GDBDebugger ViewerWidget::ViewerWidget(GDBController* controller, - QWidget* parent, + TQWidget* parent, const char* name) - : QWidget(parent, name), + : TQWidget(parent, name), controller_(controller) { setIcon(SmallIcon("math_brace")); - QVBoxLayout *l = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0); - toolBox_ = new QToolBox(this); + toolBox_ = new TQToolBox(this); l->addWidget(toolBox_); } @@ -436,14 +436,14 @@ namespace GDBDebugger toolBox_->setCurrentItem(widget); memoryViews_.push_back(widget); - connect(widget, SIGNAL(captionChanged(const QString&)), - this, SLOT(slotChildCaptionChanged(const QString&))); + connect(widget, TQT_SIGNAL(captionChanged(const TQString&)), + this, TQT_SLOT(slotChildCaptionChanged(const TQString&))); - connect(widget, SIGNAL(destroyed(QObject*)), - this, SLOT(slotChildDestroyed(QObject*))); + connect(widget, TQT_SIGNAL(destroyed(TQObject*)), + this, TQT_SLOT(slotChildDestroyed(TQObject*))); } - void ViewerWidget::slotDebuggerState(const QString&, int state) + void ViewerWidget::slotDebuggerState(const TQString&, int state) { for(unsigned i = 0; i < memoryViews_.size(); ++i) { @@ -451,19 +451,19 @@ namespace GDBDebugger } } - void ViewerWidget::slotChildCaptionChanged(const QString& caption) + void ViewerWidget::slotChildCaptionChanged(const TQString& caption) { - const QWidget* s = static_cast(sender()); - QWidget* ncs = const_cast(s); - QString cap = caption; + const TQWidget* s = static_cast(sender()); + TQWidget* ncs = const_cast(s); + TQString cap = caption; // Prevent intepreting '&' as accelerator specifier. cap.replace("&", "&&"); toolBox_->setItemLabel(toolBox_->indexOf(ncs), cap); } - void ViewerWidget::slotChildDestroyed(QObject* child) + void ViewerWidget::slotChildDestroyed(TQObject* child) { - QValueVector::iterator i, e; + TQValueVector::iterator i, e; for(i = memoryViews_.begin(), e = memoryViews_.end(); i != e; ++i) { if (*i == child) diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h index a29de924..7008fb48 100644 --- a/languages/cpp/debugger/memviewdlg.h +++ b/languages/cpp/debugger/memviewdlg.h @@ -20,7 +20,7 @@ #include -#include +#include class KLineEdit; class QMultiLineEdit; @@ -36,7 +36,7 @@ namespace GDBDebugger Q_OBJECT public: ViewerWidget(GDBController* controller, - QWidget* parent, const char* name); + TQWidget* parent, const char* name); public slots: /** Adds a new memory view to *this, initially showing @@ -45,20 +45,20 @@ namespace GDBDebugger /** Informs *this about change in debugger state. Should always be connected to, so that *this can disable itself when debugger is not running. */ - void slotDebuggerState(const QString&, int state); + void slotDebuggerState(const TQString&, int state); signals: void setViewShown(bool shown); private slots: - void slotChildCaptionChanged(const QString& caption); - void slotChildDestroyed(QObject* child); + void slotChildCaptionChanged(const TQString& caption); + void slotChildDestroyed(TQObject* child); private: // Data GDBController* controller_; - QToolBox* toolBox_; - QValueVector memoryViews_; + TQToolBox* toolBox_; + TQValueVector memoryViews_; }; class MemoryView : public QWidget @@ -66,15 +66,15 @@ namespace GDBDebugger Q_OBJECT public: MemoryView(GDBController* controller, - QWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = 0); void debuggerStateChanged(int state); signals: - void captionChanged(const QString& caption); + void captionChanged(const TQString& caption); private: // Callbacks - void sizeComputed(const QString& value); + void sizeComputed(const TQString& value); void memoryRead(const GDBMI::ResultRecord& r); @@ -95,8 +95,8 @@ namespace GDBDebugger void slotHideRangeDialog(); void slotEnableOrDisable(); - private: // QWidget overrides - void contextMenuEvent(QContextMenuEvent* e); + private: // TQWidget overrides + void contextMenuEvent(TQContextMenuEvent* e); private: void initWidget(); @@ -104,11 +104,11 @@ namespace GDBDebugger private: GDBController* controller_; class MemoryRangeSelector* rangeSelector_; - QWidget* khexedit2_widget; - QWidget* khexedit2_real_widget; + TQWidget* khexedit2_widget; + TQWidget* khexedit2_real_widget; uint start_, amount_; - QString startAsString_, amountAsString_; + TQString startAsString_, amountAsString_; char* data_; int debuggerState_; diff --git a/languages/cpp/debugger/mi/gdbmi.cpp b/languages/cpp/debugger/mi/gdbmi.cpp index fa27355f..27f90284 100644 --- a/languages/cpp/debugger/mi/gdbmi.cpp +++ b/languages/cpp/debugger/mi/gdbmi.cpp @@ -28,7 +28,7 @@ type_error::type_error() : std::logic_error("MI type error") {} -QString Value::literal() const +TQString Value::literal() const { throw type_error(); } @@ -38,12 +38,12 @@ int Value::toInt(int /*base*/) const throw type_error(); } -bool Value::hasField(const QString&) const +bool Value::hasField(const TQString&) const { throw type_error(); } -const Value& Value::operator[](const QString&) const +const Value& Value::operator[](const TQString&) const { throw type_error(); } @@ -64,7 +64,7 @@ const Value& Value::operator[](unsigned) const throw type_error(); } -QString StringLiteralValue::literal() const +TQString StringLiteralValue::literal() const { return literal_; } @@ -80,16 +80,16 @@ int StringLiteralValue::toInt(int base) const TupleValue::~TupleValue() { - for (QValueListIterator it=results.begin(); it!=results.end(); ++it) + for (TQValueListIterator it=results.begin(); it!=results.end(); ++it) delete *it; } -bool TupleValue::hasField(const QString& variable) const +bool TupleValue::hasField(const TQString& variable) const { return results_by_name.count(variable); } -const Value& TupleValue::operator[](const QString& variable) const +const Value& TupleValue::operator[](const TQString& variable) const { if (results_by_name.count(variable)) return *results_by_name[variable]->value; @@ -99,7 +99,7 @@ const Value& TupleValue::operator[](const QString& variable) const ListValue::~ListValue() { - for (QValueListIterator it=results.begin(); it!=results.end(); ++it) + for (TQValueListIterator it=results.begin(); it!=results.end(); ++it) delete *it; } diff --git a/languages/cpp/debugger/mi/gdbmi.h b/languages/cpp/debugger/mi/gdbmi.h index 667246a0..64252ee5 100644 --- a/languages/cpp/debugger/mi/gdbmi.h +++ b/languages/cpp/debugger/mi/gdbmi.h @@ -22,9 +22,9 @@ #ifndef GDBMI_H #define GDBMI_H -#include -#include -#include +#include +#include +#include #include @@ -94,7 +94,7 @@ namespace GDBMI /** If this value is a string literals, returns the string value. Othewise, throws type_error. */ - virtual QString literal() const; + virtual TQString literal() const; /** If the value is a string literal, converts it to int and returns. If conversion fails, or the value cannot be @@ -106,7 +106,7 @@ namespace GDBMI has a field named 'variable'. Otherwise, throws type_error. */ - virtual bool hasField(const QString& variable) const; + virtual bool hasField(const TQString& variable) const; /** If this value is a tuple, and contains named field 'variable', returns it. Otherwise, throws 'type_error'. @@ -114,7 +114,7 @@ namespace GDBMI we can save on casting, when we know for sure that instance is TupleValue, or ListValue. */ - virtual const Value& operator[](const QString& variable) const; + virtual const Value& operator[](const TQString& variable) const; /** If this value is a list, returns true if the list is empty. If this value is not a list, throws 'type_error'. @@ -140,22 +140,22 @@ namespace GDBMI Result() : value(0) {} ~Result() { delete value; value = 0; } - QString variable; + TQString variable; Value *value; }; struct StringLiteralValue : public Value { - StringLiteralValue(const QString &lit) + StringLiteralValue(const TQString &lit) : literal_(lit) { Value::kind = StringLiteral; } public: // Value overrides - QString literal() const; + TQString literal() const; int toInt(int base) const; private: - QString literal_; + TQString literal_; }; struct TupleValue : public Value @@ -163,12 +163,12 @@ namespace GDBMI TupleValue() { Value::kind = Tuple; } ~TupleValue(); - bool hasField(const QString&) const; - const Value& operator[](const QString& variable) const; + bool hasField(const TQString&) const; + const Value& operator[](const TQString& variable) const; - QValueList results; - QMap results_by_name; + TQValueList results; + TQMap results_by_name; }; struct ListValue : public Value @@ -182,14 +182,14 @@ namespace GDBMI const Value& operator[](unsigned index) const; - QValueList results; + TQValueList results; }; struct Record { virtual ~Record() {} - virtual QString toString() const { Q_ASSERT( 0 ); return QString::null; } + virtual TQString toString() const { Q_ASSERT( 0 ); return TQString::null; } enum { Prompt, Stream, Result } kind; }; @@ -198,14 +198,14 @@ namespace GDBMI { ResultRecord() { Record::kind = Result; } - QString reason; + TQString reason; }; struct PromptRecord : public Record { inline PromptRecord() { Record::kind = Prompt; } - virtual QString toString() const + virtual TQString toString() const { return "(prompt)\n"; } }; @@ -214,7 +214,7 @@ namespace GDBMI inline StreamRecord() : reason(0) { Record::kind = Stream; } char reason; - QString message; + TQString message; }; } diff --git a/languages/cpp/debugger/mi/milexer.cpp b/languages/cpp/debugger/mi/milexer.cpp index 847733ad..7813d091 100644 --- a/languages/cpp/debugger/mi/milexer.cpp +++ b/languages/cpp/debugger/mi/milexer.cpp @@ -281,10 +281,10 @@ void TokenStream::positionAt(int position, int *line, int *column) const Q_ASSERT( *column >= 0 ); } -QCString TokenStream::tokenText(int index) const +TQCString TokenStream::tokenText(int index) const { Token *t = index < 0 ? m_currentToken : m_firstToken + index; const char* data = m_contents; - return QCString(data + t->position, t->length+1); + return TQCString(data + t->position, t->length+1); } diff --git a/languages/cpp/debugger/mi/milexer.h b/languages/cpp/debugger/mi/milexer.h index 8f39820c..8f07ba58 100644 --- a/languages/cpp/debugger/mi/milexer.h +++ b/languages/cpp/debugger/mi/milexer.h @@ -20,9 +20,9 @@ #ifndef MILEXER_H #define MILEXER_H -#include -#include -#include +#include +#include +#include class MILexer; class TokenStream; @@ -38,7 +38,7 @@ struct Token struct FileSymbol { - QCString contents; + TQCString contents; TokenStream *tokenStream; inline FileSymbol() @@ -55,10 +55,10 @@ struct TokenStream inline int currentToken() const { return m_currentToken->kind; } - inline QCString currentTokenText() const + inline TQCString currentTokenText() const { return tokenText(-1); } - QCString tokenText(int index = 0) const; + TQCString tokenText(int index = 0) const; inline int lineOffset(int line) const { return m_lines.at(line); } @@ -84,12 +84,12 @@ struct TokenStream { m_currentToken++; m_cursor++; } //private: - QCString m_contents; + TQCString m_contents; - QMemArray m_lines; + TQMemArray m_lines; int m_line; - QMemArray m_tokens; + TQMemArray m_tokens; int m_tokensCount; Token *m_firstToken; @@ -123,15 +123,15 @@ private: static bool s_initialized; static scan_fun_ptr s_scan_table[128 + 1]; - QCString m_contents; + TQCString m_contents; int m_ptr; // Cached 'm_contents.length()' int m_length; - QMemArray m_lines; + TQMemArray m_lines; int m_line; - QMemArray m_tokens; + TQMemArray m_tokens; int m_tokensCount; int m_cursor; diff --git a/languages/cpp/debugger/mi/miparser.cpp b/languages/cpp/debugger/mi/miparser.cpp index 252c4e1b..fdd16137 100644 --- a/languages/cpp/debugger/mi/miparser.cpp +++ b/languages/cpp/debugger/mi/miparser.cpp @@ -125,7 +125,7 @@ bool MIParser::parseResultRecord(Record *&record) lex->nextToken(); MATCH(Token_identifier); - QString reason = lex->currentTokenText(); + TQString reason = lex->currentTokenText(); lex->nextToken(); std::auto_ptr res(new ResultRecord); @@ -148,7 +148,7 @@ bool MIParser::parseResultRecord(Record *&record) bool MIParser::parseResult(Result *&result) { MATCH(Token_identifier); - QString variable = lex->currentTokenText(); + TQString variable = lex->currentTokenText(); lex->nextToken(); std::auto_ptr res(new Result); @@ -289,12 +289,12 @@ bool MIParser::parseCSV(GDBMI::TupleValue& value, } -QString MIParser::parseStringLiteral() +TQString MIParser::parseStringLiteral() { - QCString message = lex->currentTokenText(); + TQCString message = lex->currentTokenText(); unsigned int length = message.length(); - QString message2; + TQString message2; message2.setLength(length); // The [1,length-1] range removes quotes without extra // call to 'mid' diff --git a/languages/cpp/debugger/mi/miparser.h b/languages/cpp/debugger/mi/miparser.h index b11ba504..9bea70b2 100644 --- a/languages/cpp/debugger/mi/miparser.h +++ b/languages/cpp/debugger/mi/miparser.h @@ -23,8 +23,8 @@ #include "milexer.h" #include "gdbmi.h" -#include -#include +#include +#include /** @author Roberto Raggi @@ -70,7 +70,7 @@ protected: // rules in the string. @pre lex->lookAhead(0) == Token_string_literal */ - QString parseStringLiteral(); + TQString parseStringLiteral(); diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index f0bc2627..cdf4c81e 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -59,10 +59,10 @@ #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -92,8 +92,8 @@ static int chownpty(int fd, int grant) if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ::exit(1); - QString path = locate("exe", BASE_CHOWN); - execle(QFile::encodeName(path), BASE_CHOWN, grant?"--grant":"--revoke", (void *)0, NULL); + TQString path = locate("exe", BASE_CHOWN); + execle(TQFile::encodeName(path), BASE_CHOWN, grant?"--grant":"--revoke", (void *)0, NULL); ::exit(1); // should not be reached } if (pid > 0) { @@ -118,8 +118,8 @@ static int chownpty(int fd, int grant) // ************************************************************************** -STTY::STTY(bool ext, const QString &termAppName) - : QObject(), +STTY::STTY(bool ext, const TQString &termAppName) + : TQObject(), out(0), ttySlave(""), pid_(0), @@ -130,9 +130,9 @@ STTY::STTY(bool ext, const QString &termAppName) } else { fout = findTTY(); if (fout >= 0) { - ttySlave = QString(tty_slave); - out = new QSocketNotifier(fout, QSocketNotifier::Read, this); - connect( out, SIGNAL(activated(int)), this, SLOT(OutReceived(int)) ); + ttySlave = TQString(tty_slave); + out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); + connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); } } } @@ -281,9 +281,9 @@ void STTY::readRemaining() #define FIFO_FILE "/tmp/debug_tty.XXXXXX" -bool STTY::findExternalTTY(const QString &termApp) +bool STTY::findExternalTTY(const TQString &termApp) { - QString appName(termApp.isEmpty() ? QString("xterm") : termApp); + TQString appName(termApp.isEmpty() ? TQString("xterm") : termApp); if ( KStandardDirs::findExe( termApp ).isEmpty() ) { @@ -319,8 +319,8 @@ bool STTY::findExternalTTY(const QString &termApp) */ const char* prog = appName.latin1(); - QString script = QString("tty>") + QString(fifo) + - QString(";" // fifo name + TQString script = TQString("tty>") + TQString(fifo) + + TQString(";" // fifo name "trap \"\" INT QUIT TSTP;" // ignore various signals "exec<&-;exec>&-;" // close stdin and stdout "while :;do sleep 3600;done"); diff --git a/languages/cpp/debugger/stty.h b/languages/cpp/debugger/stty.h index 639e8417..7c026251 100644 --- a/languages/cpp/debugger/stty.h +++ b/languages/cpp/debugger/stty.h @@ -27,8 +27,8 @@ class QSocketNotifier; -#include -#include +#include +#include namespace GDBDebugger { @@ -38,10 +38,10 @@ class STTY : public QObject Q_OBJECT public: - STTY(bool ext=false, const QString &termAppName=QString()); + STTY(bool ext=false, const TQString &termAppName=TQString()); ~STTY(); - QString getSlave() { return ttySlave; }; + TQString getSlave() { return ttySlave; }; void readRemaining(); private slots: @@ -53,13 +53,13 @@ signals: private: int findTTY(); - bool findExternalTTY(const QString &termApp); + bool findExternalTTY(const TQString &termApp); private: int fout; int ferr; - QSocketNotifier *out; - QString ttySlave; + TQSocketNotifier *out; + TQString ttySlave; int pid_; bool external_; diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.cpp b/languages/cpp/debugger/tests/print_pointers/print_pointers.cpp index 09053b51..cc03679f 100644 --- a/languages/cpp/debugger/tests/print_pointers/print_pointers.cpp +++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.cpp @@ -1,5 +1,5 @@ -#include +#include #include struct B { int i; int j; static int k; }; @@ -17,7 +17,7 @@ void func2() printf("func2\n"); } -void func(QString& xs) +void func(TQString& xs) { int ac = 10; std::string s; @@ -30,7 +30,7 @@ void func(QString& xs) class Test { public: - QString n; + TQString n; int b; }; @@ -67,9 +67,9 @@ int test_main(int ac, char* av[]) wchar_t* p15 = L"test1"; - QString s = "test test test test"; - QString* sp = &s; - const QString& sr = s; + TQString s = "test test test test"; + TQString* sp = &s; + const TQString& sr = s; func(s); i = 15; diff --git a/languages/cpp/debugger/tests/two_module/src/foo.cpp b/languages/cpp/debugger/tests/two_module/src/foo.cpp index b66f9924..f0e30f15 100644 --- a/languages/cpp/debugger/tests/two_module/src/foo.cpp +++ b/languages/cpp/debugger/tests/two_module/src/foo.cpp @@ -1,10 +1,10 @@ #include -#include +#include void foo(int a) { - QString s = "foo"; + TQString s = "foo"; int i = 10; int i2 = 12; int i3 = i + i2; diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 263afdf9..163c2024 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -24,19 +24,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include @@ -77,8 +77,8 @@ namespace GDBDebugger VariableWidget::VariableWidget(GDBController* controller, GDBBreakpointWidget* breakpointWidget, - QWidget *parent, const char *name) -: QWidget(parent, name) + TQWidget *parent, const char *name) +: TQWidget(parent, name) { setIcon(SmallIcon("math_brace")); setCaption(i18n("Variable Tree")); @@ -88,35 +88,35 @@ VariableWidget::VariableWidget(GDBController* controller, watchVarEditor_ = new KHistoryCombo( this, "var-to-watch editor"); - QHBoxLayout* buttons = new QHBoxLayout(); + TQHBoxLayout* buttons = new TQHBoxLayout(); buttons->addStretch(); - QPushButton *evalButton = new QPushButton(i18n("&Evaluate"), this ); + TQPushButton *evalButton = new TQPushButton(i18n("&Evaluate"), this ); buttons->addWidget(evalButton); - QPushButton *addButton = new QPushButton(i18n("&Watch"), this ); + TQPushButton *addButton = new TQPushButton(i18n("&Watch"), this ); buttons->addWidget(addButton); - QVBoxLayout *topLayout = new QVBoxLayout(this, 2); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 2); topLayout->addWidget(varTree_, 10); topLayout->addWidget(watchVarEditor_); topLayout->addItem(buttons); - connect( addButton, SIGNAL(clicked()), SLOT(slotAddWatchVariable()) ); - connect( evalButton, SIGNAL(clicked()), SLOT(slotEvaluateExpression()) ); + connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchVariable()) ); + connect( evalButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEvaluateExpression()) ); - connect( watchVarEditor_, SIGNAL(returnPressed()), - SLOT(slotEvaluateExpression()) ); + connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), + TQT_SLOT(slotEvaluateExpression()) ); - connect(controller, SIGNAL(event(GDBController::event_t)), - varTree_, SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQT_SIGNAL(event(GDBController::event_t)), + varTree_, TQT_SLOT(slotEvent(GDBController::event_t))); // Setup help items. - QWhatsThis::add(this, i18n( + TQWhatsThis::add(this, i18n( "Variable tree

    " "The variable tree allows you to see the values of local " "variables and arbitrary expressions." @@ -130,22 +130,22 @@ VariableWidget::VariableWidget(GDBController* controller, "

    To change the value of a variable or an expression, " "click on the value.")); - QWhatsThis::add(watchVarEditor_, + TQWhatsThis::add(watchVarEditor_, i18n("Expression entry" "

    Type in expression to evaluate.")); - QWhatsThis::add(evalButton, + TQWhatsThis::add(evalButton, i18n("Evaluate the expression.")); - QWhatsThis::add(addButton, + TQWhatsThis::add(addButton, i18n("Evaluate the expression and " "auto-update the value when stepping.")); } void VariableWidget::slotAddWatchVariable() { -// QString watchVar(watchVarEntry_->text()); - QString watchVar(watchVarEditor_->currentText()); +// TQString watchVar(watchVarEntry_->text()); + TQString watchVar(watchVarEditor_->currentText()); if (!watchVar.isEmpty()) { slotAddWatchVariable(watchVar); @@ -154,7 +154,7 @@ void VariableWidget::slotAddWatchVariable() // ************************************************************************** -void VariableWidget::slotAddWatchVariable(const QString &ident) +void VariableWidget::slotAddWatchVariable(const TQString &ident) { if (!ident.isEmpty()) { @@ -166,14 +166,14 @@ void VariableWidget::slotAddWatchVariable(const QString &ident) void VariableWidget::slotEvaluateExpression() { - QString exp(watchVarEditor_->currentText()); + TQString exp(watchVarEditor_->currentText()); if (!exp.isEmpty()) { slotEvaluateExpression(exp); } } -void VariableWidget::slotEvaluateExpression(const QString &ident) +void VariableWidget::slotEvaluateExpression(const TQString &ident) { if (!ident.isEmpty()) { @@ -185,7 +185,7 @@ void VariableWidget::slotEvaluateExpression(const QString &ident) // ************************************************************************** -void VariableWidget::focusInEvent(QFocusEvent */*e*/) +void VariableWidget::focusInEvent(TQFocusEvent */*e*/) { varTree_->setFocus(); } @@ -202,7 +202,7 @@ VariableTree::VariableTree(VariableWidget *parent, GDBBreakpointWidget* breakpointWidget, const char *name) : KListView(parent, name), - QToolTip( viewport() ), + TQToolTip( viewport() ), controller_(controller), breakpointWidget_(breakpointWidget), activeFlag_(0), @@ -213,7 +213,7 @@ VariableTree::VariableTree(VariableWidget *parent, setRootIsDecorated(true); setAllColumnsShowFocus(true); setSorting(-1); - QListView::setSelectionMode(QListView::Single); + TQListView::setSelectionMode(TQListView::Single); // Note: it might be reasonable to set width of value // column to 10 characters ('0x12345678'), and rely on @@ -223,10 +223,10 @@ VariableTree::VariableTree(VariableWidget *parent, addColumn(i18n("Value")); // setResizeMode(AllColumns); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - SLOT(slotContextMenu(KListView*, QListViewItem*)) ); - connect( this, SIGNAL(itemRenamed( QListViewItem*, int, const QString&)), - this, SLOT(slotItemRenamed( QListViewItem*, int, const QString&))); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)), + this, TQT_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); } // ************************************************************************** @@ -237,7 +237,7 @@ VariableTree::~VariableTree() // ************************************************************************** -void VariableTree::slotContextMenu(KListView *, QListViewItem *item) +void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (!item) return; @@ -293,7 +293,7 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) } - QListViewItem* root = findRoot(item); + TQListViewItem* root = findRoot(item); if (root != recentExpressions_) { @@ -337,14 +337,14 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) if (var && var->isAlive() && !controller()->stateIsOn(s_dbgNotStarted)) controller_->addCommand( new GDBCommand( - QString("-data-evaluate-expression &%1") + TQString("-data-evaluate-expression &%1") .arg(var->gdbExpression()), this, &VariableTree::handleAddressComputed, true /*handles error*/)); - int res = popup.exec(QCursor::pos()); + int res = popup.exec(TQCursor::pos()); activePopup_ = 0; @@ -401,7 +401,7 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) SmallIcon("reload"), i18n("Reevaluate All")); if (controller()->stateIsOn(s_dbgNotStarted)) popup.setItemEnabled(idReevaluate, false); - int res = popup.exec(QCursor::pos()); + int res = popup.exec(TQCursor::pos()); if (res == idRemove) { @@ -410,7 +410,7 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) } else if (res == idReevaluate) { - for(QListViewItem* child = recentExpressions_->firstChild(); + for(TQListViewItem* child = recentExpressions_->firstChild(); child; child = child->nextSibling()) { static_cast(child)->recreate(); @@ -427,10 +427,10 @@ void VariableTree::slotEvent(GDBController::event_t event) case GDBController::debugger_exited: { // Remove all locals. - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); while (child) { - QListViewItem *nextChild = child->nextSibling(); + TQListViewItem *nextChild = child->nextSibling(); // don't remove the watch root, or 'recent expressions' root. if (!(dynamic_cast (child)) @@ -444,7 +444,7 @@ void VariableTree::slotEvent(GDBController::event_t event) if (recentExpressions_) { - for(QListViewItem* child = recentExpressions_->firstChild(); + for(TQListViewItem* child = recentExpressions_->firstChild(); child; child = child->nextSibling()) { static_cast(child)->unhookFromGdb(); @@ -453,7 +453,7 @@ void VariableTree::slotEvent(GDBController::event_t event) if (WatchRoot* w = findWatch()) { - for(QListViewItem* child = w->firstChild(); + for(TQListViewItem* child = w->firstChild(); child; child = child->nextSibling()) { static_cast(child)->unhookFromGdb(); @@ -504,7 +504,7 @@ void VariableTree::updateCurrentFrame() // We'll fetch values separately: controller_->addCommand( - new GDBCommand(QString("-stack-list-arguments 0 %1 %2") + new GDBCommand(TQString("-stack-list-arguments 0 %1 %2") .arg(controller_->currentFrame()) .arg(controller_->currentFrame()) .ascii(), @@ -522,13 +522,13 @@ void VariableTree::updateCurrentFrame() // ************************************************************************** -void VariableTree::slotAddWatchVariable(const QString &watchVar) +void VariableTree::slotAddWatchVariable(const TQString &watchVar) { VarItem *varItem = 0; varItem = new VarItem(findWatch(), watchVar); } -void VariableTree::slotEvaluateExpression(const QString &expression) +void VariableTree::slotEvaluateExpression(const TQString &expression) { if (recentExpressions_ == 0) { @@ -545,7 +545,7 @@ void VariableTree::slotEvaluateExpression(const QString &expression) // ************************************************************************** -QListViewItem *VariableTree::findRoot(QListViewItem *item) const +TQListViewItem *VariableTree::findRoot(TQListViewItem *item) const { while (item->parent()) item = item->parent(); @@ -557,7 +557,7 @@ QListViewItem *VariableTree::findRoot(QListViewItem *item) const VarFrameRoot *VariableTree::findFrame(int frameNo, int threadNo) const { - QListViewItem *sibling = firstChild(); + TQListViewItem *sibling = firstChild(); // frames only exist on th top level so we only need to // check the siblings @@ -576,7 +576,7 @@ VarFrameRoot *VariableTree::findFrame(int frameNo, int threadNo) const WatchRoot *VariableTree::findWatch() { - QListViewItem *sibling = firstChild(); + TQListViewItem *sibling = firstChild(); while (sibling) { if (WatchRoot *watch = dynamic_cast (sibling)) @@ -590,11 +590,11 @@ WatchRoot *VariableTree::findWatch() // ************************************************************************** -QListViewItem *VariableTree::lastChild() const +TQListViewItem *VariableTree::lastChild() const { - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); if (child) - while (QListViewItem *nextChild = child->nextSibling()) + while (TQListViewItem *nextChild = child->nextSibling()) child = nextChild; return child; @@ -602,21 +602,21 @@ QListViewItem *VariableTree::lastChild() const // ************************************************************************** -void VariableTree::maybeTip(const QPoint &p) +void VariableTree::maybeTip(const TQPoint &p) { VarItem * item = dynamic_cast( itemAt( p ) ); if ( item ) { - QRect r = itemRect( item ); + TQRect r = itemRect( item ); if ( r.isValid() ) tip( r, item->tipText() ); } } -class ValueSpecialRepresentationCommand : public QObject, public CliCommand +class ValueSpecialRepresentationCommand : public TQObject, public CliCommand { public: - ValueSpecialRepresentationCommand(VarItem* item, const QString& command) + ValueSpecialRepresentationCommand(VarItem* item, const TQString& command) : CliCommand(command.ascii(), this, &ValueSpecialRepresentationCommand::handleReply, @@ -628,9 +628,9 @@ private: VarItem* item_; - void handleReply(const QValueVector& lines) + void handleReply(const TQValueVector& lines) { - QString s; + TQString s; for(unsigned i = 1; i < lines.count(); ++i) s += lines[i]; item_->updateSpecialRepresentation(s.local8Bit()); @@ -638,7 +638,7 @@ private: }; void VariableTree::slotVarobjNameChanged( - const QString& from, const QString& to) + const TQString& from, const TQString& to) { if (!from.isEmpty()) varobj2varitem.erase(from); @@ -686,7 +686,7 @@ void VariableTree::localsReady(const GDBMI::ResultRecord& r) for(unsigned i = 0; i < locals.size(); ++i) { - QString val = locals[i].literal(); + TQString val = locals[i].literal(); // Check ada internal variables like , ... bool is_ada_variable = (val[0] == '<' && val[val.length() - 1] == '>'); @@ -702,19 +702,19 @@ void VariableTree::localsReady(const GDBMI::ResultRecord& r) &VariableTree::frameIdReady)); } -void VariableTree::frameIdReady(const QValueVector& lines) +void VariableTree::frameIdReady(const TQValueVector& lines) { //kdDebug(9012) << "localAddresses: " << lines[1] << "\n"; - QString frame_info; + TQString frame_info; for(unsigned i = 1; i < lines.size(); ++i) frame_info += lines[i]; kdDebug(9012) << "frame info: " << frame_info << "\n"; frame_info.replace('\n', ""); - static QRegExp frame_base_rx("frame at 0x([0-9a-fA-F]*)"); - static QRegExp frame_code_rx("saved [a-zA-Z0-9]* 0x([0-9a-fA-F]*)"); + static TQRegExp frame_base_rx("frame at 0x([0-9a-fA-F]*)"); + static TQRegExp frame_code_rx("saved [a-zA-Z0-9]* 0x([0-9a-fA-F]*)"); int i = frame_base_rx.search(frame_info); int i2 = frame_code_rx.search(frame_info); @@ -741,12 +741,12 @@ void VariableTree::frameIdReady(const QValueVector& lines) frame_base_rx.cap(1).toULongLong(0, 16); unsigned long long new_code_address = frame_code_rx.cap(1).toULongLong(0, 16); - kdDebug(9012) << "Frame base = " << QString::number(new_frame_base, 16) - << " code = " << QString::number(new_code_address, 16) + kdDebug(9012) << "Frame base = " << TQString::number(new_frame_base, 16) + << " code = " << TQString::number(new_code_address, 16) << "\n"; kdDebug(9012) << "Previous frame " << - QString::number(frame->currentFrameBase, 16) - << " code = " << QString::number( + TQString::number(frame->currentFrameBase, 16) + << " code = " << TQString::number( frame->currentFrameCodeAddress, 16) << "\n"; @@ -770,8 +770,8 @@ void VariableTree::frameIdReady(const QValueVector& lines) { // Remove all variables. // FIXME: probably, need to do this in all frames. - QListViewItem* child = frame->firstChild(); - QListViewItem* next; + TQListViewItem* child = frame->firstChild(); + TQListViewItem* next; for(; child; child = next) { next = child->nextSibling(); @@ -781,15 +781,15 @@ void VariableTree::frameIdReady(const QValueVector& lines) setUpdatesEnabled(false); - std::set alive; + std::set alive; for(unsigned i = 0; i < locals_and_arguments.size(); ++i) { - QString name = locals_and_arguments[i]; + TQString name = locals_and_arguments[i]; // See if we've got VarItem for this one already. VarItem* var = 0; - for(QListViewItem *child = frame->firstChild(); + for(TQListViewItem *child = frame->firstChild(); child; child = child->nextSibling()) { @@ -811,9 +811,9 @@ void VariableTree::frameIdReady(const QValueVector& lines) // Remove VarItems that don't correspond to any local // variables any longer. Perform type/address updates // for others. - for(QListViewItem* child = frame->firstChild(); child;) + for(TQListViewItem* child = frame->firstChild(); child;) { - QListViewItem* current = child; + TQListViewItem* current = child; child = current->nextSibling(); if (!alive.count(current)) delete current; @@ -821,7 +821,7 @@ void VariableTree::frameIdReady(const QValueVector& lines) static_cast(current)->recreateLocallyMaybe(); } - for(QListViewItem* child = findWatch()->firstChild(); + for(TQListViewItem* child = findWatch()->firstChild(); child; child = child->nextSibling()) { VarItem* var = static_cast(child); @@ -848,20 +848,20 @@ void VariableTree::handleVarUpdate(const GDBMI::ResultRecord& r) { const GDBMI::Value& changed = r["changelist"]; - std::set names_to_update; + std::set names_to_update; for(unsigned i = 0; i < changed.size(); ++i) { const GDBMI::Value& c = changed[i]; - QString name = c["name"].literal(); + TQString name = c["name"].literal(); if (c.hasField("in_scope") && c["in_scope"].literal() == "false") continue; names_to_update.insert(name); } - QMap::iterator i, e; + TQMap::iterator i, e; for (i = varobj2varitem.begin(), e = varobj2varitem.end(); i != e; ++i) { if (names_to_update.count(i.key()) @@ -872,16 +872,16 @@ void VariableTree::handleVarUpdate(const GDBMI::ResultRecord& r) } } -void VarItem::handleCliPrint(const QValueVector& lines) +void VarItem::handleCliPrint(const TQValueVector& lines) { - static QRegExp r("(\\$[0-9]+)"); + static TQRegExp r("(\\$[0-9]+)"); if (lines.size() >= 2) { int i = r.search(lines[1]); if (i == 0) { controller_->addCommand( - new GDBCommand(QString("-var-create %1 * \"%2\"") + new GDBCommand(TQString("-var-create %1 * \"%2\"") .arg(varobjName_) .arg(r.cap(1)), this, @@ -907,7 +907,7 @@ void VarItem::handleCliPrint(const QValueVector& lines) void VariableTree::variablesFetchDone() { // During parsing of fetched variable values, we might have issued - // extra command to handle 'special values', like QString. + // extra command to handle 'special values', like TQString. // We don't want to enable updates just yet, because this will cause // flicker, so add a sentinel command just to enable updates. // @@ -941,7 +941,7 @@ void VariableTree::fetchSpecialValuesDone() } void -VariableTree::slotItemRenamed(QListViewItem* item, int col, const QString& text) +VariableTree::slotItemRenamed(TQListViewItem* item, int col, const TQString& text) { if (col == ValueCol) { @@ -955,11 +955,11 @@ VariableTree::slotItemRenamed(QListViewItem* item, int col, const QString& text) } -void VariableTree::keyPressEvent(QKeyEvent* e) +void VariableTree::keyPressEvent(TQKeyEvent* e) { if (VarItem* item = dynamic_cast(currentItem())) { - QString text = e->text(); + TQString text = e->text(); if (text == "n" || text == "x" || text == "d" || text == "c" || text == "t") @@ -970,7 +970,7 @@ void VariableTree::keyPressEvent(QKeyEvent* e) if (e->key() == Qt::Key_Delete) { - QListViewItem* root = findRoot(item); + TQListViewItem* root = findRoot(item); if (dynamic_cast(root) || root == recentExpressions_) { @@ -986,10 +986,10 @@ void VariableTree::keyPressEvent(QKeyEvent* e) } -void VariableTree::copyToClipboard(QListViewItem* item) +void VariableTree::copyToClipboard(TQListViewItem* item) { QClipboard *qb = KApplication::clipboard(); - QString text = item->text( 1 ); + TQString text = item->text( 1 ); qb->setText( text, QClipboard::Clipboard ); } @@ -1038,7 +1038,7 @@ TrimmableItem::~TrimmableItem() // ************************************************************************** -void TrimmableItem::paintCell(QPainter *p, const QColorGroup &cg, +void TrimmableItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if ( !p ) @@ -1046,18 +1046,18 @@ void TrimmableItem::paintCell(QPainter *p, const QColorGroup &cg, // make toplevel item (watch and frame items) names bold if (column == 0 && !parent()) { - QFont f = p->font(); + TQFont f = p->font(); f.setBold(true); p->setFont(f); } - QListViewItem::paintCell( p, cg, column, width, align ); + TQListViewItem::paintCell( p, cg, column, width, align ); } -QListViewItem *TrimmableItem::lastChild() const +TQListViewItem *TrimmableItem::lastChild() const { - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); if (child) - while (QListViewItem *nextChild = child->nextSibling()) + while (TQListViewItem *nextChild = child->nextSibling()) child = nextChild; return child; @@ -1070,7 +1070,7 @@ QListViewItem *TrimmableItem::lastChild() const int VarItem::varobjIndex = 0; VarItem::VarItem(TrimmableItem *parent, - const QString& expression, + const TQString& expression, bool frozen) : TrimmableItem (parent), expression_(expression), @@ -1085,9 +1085,9 @@ VarItem::VarItem(TrimmableItem *parent, baseClassMember_(false), alive_(true) { - connect(this, SIGNAL(varobjNameChange(const QString&, const QString&)), + connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - SLOT(slotVarobjNameChanged(const QString&, const QString&))); + TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); // User might have entered format together with expression: like @@ -1098,7 +1098,7 @@ VarItem::VarItem(TrimmableItem *parent, // - detect initial value of format_ // - remove the format specifier from the string. - static QRegExp explicit_format("^\\s*/(.)\\s*(.*)"); + static TQRegExp explicit_format("^\\s*/(.)\\s*(.*)"); if (explicit_format.search(expression_) == 0) { format_ = formatFromGdbModifier(explicit_format.cap(1)[0].latin1()); @@ -1130,9 +1130,9 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, baseClassMember_(baseClassMember), alive_(true) { - connect(this, SIGNAL(varobjNameChange(const QString&, const QString&)), + connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - SLOT(slotVarobjNameChanged(const QString&, const QString&))); + TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); expression_ = varobj["exp"].literal(); varobjName_ = varobj["name"].literal(); @@ -1158,8 +1158,8 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, void VarItem::createVarobj() { - QString old = varobjName_; - varobjName_ = QString("KDEV%1").arg(varobjIndex++); + TQString old = varobjName_; + varobjName_ = TQString("KDEV%1").arg(varobjIndex++); emit varobjNameChange(old, varobjName_); if (frozen_) @@ -1169,7 +1169,7 @@ void VarItem::createVarobj() // variable and we create variable object from that. controller_->addCommand( new CliCommand( - QString("print %1").arg(expression_), + TQString("print %1").arg(expression_), this, &VarItem::handleCliPrint)); } @@ -1177,7 +1177,7 @@ void VarItem::createVarobj() { controller_->addCommand( new CliCommand( - QString("print /x &%1").arg(expression_), + TQString("print /x &%1").arg(expression_), this, &VarItem::handleCurrentAddress, true)); @@ -1185,7 +1185,7 @@ void VarItem::createVarobj() controller_->addCommand( // Need to quote expression, otherwise gdb won't like // spaces inside it. - new GDBCommand(QString("-var-create %1 * \"%2\"") + new GDBCommand(TQString("-var-create %1 * \"%2\"") .arg(varobjName_) .arg(expression_), this, @@ -1205,15 +1205,15 @@ void VarItem::varobjCreated(const GDBMI::ResultRecord& r) } setAliveRecursively(true); - QString oldType = originalValueType_; + TQString oldType = originalValueType_; originalValueType_ = r["type"].literal(); if (!oldType.isEmpty() && oldType != originalValueType_) { // Type changed, the children might be no longer valid, // so delete them. - for(QListViewItem* child = firstChild(); child; ) + for(TQListViewItem* child = firstChild(); child; ) { - QListViewItem* cur = child; + TQListViewItem* cur = child; child = child->nextSibling(); delete cur; } @@ -1228,7 +1228,7 @@ void VarItem::varobjCreated(const GDBMI::ResultRecord& r) setVarobjName(varobjName_); } -void VarItem::setVarobjName(const QString& name) +void VarItem::setVarobjName(const TQString& name) { if (varobjName_ != name) emit varobjNameChange(varobjName_, name); @@ -1238,7 +1238,7 @@ void VarItem::setVarobjName(const QString& name) if (format_ != natural) { controller_->addCommand( - new GDBCommand(QString("-var-set-format \"%1\" %2") + new GDBCommand(TQString("-var-set-format \"%1\" %2") .arg(varobjName_).arg(varobjFormatName()))); } @@ -1256,12 +1256,12 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r) { if (r.reason == "done") { - QString s = GDBParser::getGDBParser()->undecorateValue( + TQString s = GDBParser::getGDBParser()->undecorateValue( r["value"].literal()); if (format_ == character) { - QString encoded = s; + TQString encoded = s; bool ok; int value = s.toInt(&ok); if (ok) @@ -1292,11 +1292,11 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r) if (format_ == binary) { // For binary format, split the value at 4-bit boundaries - static QRegExp r("^[01]+$"); + static TQRegExp r("^[01]+$"); int i = r.search(s); if (i == 0) { - QString split; + TQString split; for(unsigned i = 0; i < s.length(); ++i) { // For string 11111, we should split it as @@ -1317,7 +1317,7 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r) } else { - QString s = r["msg"].literal(); + TQString s = r["msg"].literal(); // Error response. if (s.startsWith("Cannot access memory")) { @@ -1344,7 +1344,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, bool structureType = false; if (!children_of_fake && children.size() > 0) { - QString exp = children[0]["exp"].literal(); + TQString exp = children[0]["exp"].literal(); bool ok = false; exp.toInt(&ok); if (!ok || exp[0] != '*') @@ -1355,12 +1355,12 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, for (unsigned i = 0; i < children.size(); ++i) { - QString exp = children[i]["exp"].literal(); + TQString exp = children[i]["exp"].literal(); // For artificial accessibility nodes, // fetch their children. if (exp == "public" || exp == "protected" || exp == "private") { - QString name = children[i]["name"].literal(); + TQString name = children[i]["name"].literal(); controller_->addCommand(new GDBCommand( "-var-list-children \"" + name + "\"", @@ -1374,7 +1374,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, bool baseObject = structureType; VarItem* existing = 0; - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { VarItem* v = static_cast(child); @@ -1414,12 +1414,12 @@ void VarItem::childrenOfFakesDone(const GDBMI::ResultRecord& r) createChildren(r, true); } -void VarItem::handleCurrentAddress(const QValueVector& lines) +void VarItem::handleCurrentAddress(const TQValueVector& lines) { lastObtainedAddress_ = ""; if (lines.count() > 1) { - static QRegExp r("\\$\\d+ = ([^\n]*)"); + static TQRegExp r("\\$\\d+ = ([^\n]*)"); int i = r.search(lines[1]); if (i == 0) { @@ -1429,7 +1429,7 @@ void VarItem::handleCurrentAddress(const QValueVector& lines) } } -void VarItem::handleType(const QValueVector& lines) +void VarItem::handleType(const TQValueVector& lines) { bool recreate = false; @@ -1444,7 +1444,7 @@ void VarItem::handleType(const QValueVector& lines) // FIXME: add error diagnostic. if (lines.count() > 1) { - static QRegExp r("type = ([^\n]*)"); + static TQRegExp r("type = ([^\n]*)"); int i = r.search(lines[1]); if (i == 0) { @@ -1464,7 +1464,7 @@ void VarItem::handleType(const QValueVector& lines) } } -QString VarItem::displayName() const +TQString VarItem::displayName() const { if (expression_[0] != '*') return expression_; @@ -1485,7 +1485,7 @@ void VarItem::setAliveRecursively(bool enable) setEnabled(enable); alive_ = true; - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { static_cast(child)->setAliveRecursively(enable); @@ -1498,7 +1498,7 @@ VarItem::~VarItem() unhookFromGdb(); } -QString VarItem::gdbExpression() const +TQString VarItem::gdbExpression() const { // The expression for this item can be either: // - number, for array element @@ -1550,26 +1550,26 @@ QString VarItem::gdbExpression() const // FIXME: we have two method to set VarItem: this one // and updateValue below. That's bad, must have just one. -void VarItem::setText(int column, const QString &data) +void VarItem::setText(int column, const TQString &data) { - QString strData=data; + TQString strData=data; if (column == ValueCol) { - QString oldValue(text(column)); + TQString oldValue(text(column)); if (!oldValue.isEmpty()) // Don't highlight new items { - highlight_ = (oldValue != QString(data)); + highlight_ = (oldValue != TQString(data)); } } - QListViewItem::setText(column, strData); + TQListViewItem::setText(column, strData); } void VarItem::clearHighlight() { highlight_ = false; - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { static_cast(child)->clearHighlight(); @@ -1600,10 +1600,10 @@ void VarItem::updateValue() true /* handle error */)); } -void VarItem::setValue(const QString& new_value) +void VarItem::setValue(const TQString& new_value) { controller_->addCommand( - new GDBCommand(QString("-var-assign \"%1\" %2").arg(varobjName_) + new GDBCommand(TQString("-var-assign \"%1\" %2").arg(varobjName_) .arg(new_value))); // And immediately reload it from gdb, @@ -1614,9 +1614,9 @@ void VarItem::setValue(const QString& new_value) updateValue(); } -void VarItem::updateSpecialRepresentation(const QString& xs) +void VarItem::updateSpecialRepresentation(const TQString& xs) { - QString s(xs); + TQString s(xs); if (s[0] == '$') { int i = s.find('='); @@ -1624,7 +1624,7 @@ void VarItem::updateSpecialRepresentation(const QString& xs) s = s.mid(i+2); } - // A hack to nicely display QStrings. The content of QString is unicode + // A hack to nicely display QStrings. The content of TQString is unicode // for for ASCII only strings we get ascii character mixed with \000. // Remove those \000 now. @@ -1634,11 +1634,11 @@ void VarItem::updateSpecialRepresentation(const QString& xs) // the data sent by gdb might contain \000 that should not be translated. // // What's even worse, ideally we should convert the string data from - // gdb into a QString again, handling all other escapes and composing - // one QChar from two characters from gdb. But to do that, we *should* + // gdb into a TQString again, handling all other escapes and composing + // one TQChar from two characters from gdb. But to do that, we *should* // now if the data if generic gdb value, and result of request for string // data. Fixing is is for later. - s.replace( QRegExp("\\\\000|\\\\0"), "" ); + s.replace( TQRegExp("\\\\000|\\\\0"), "" ); // FIXME: for now, assume that all special representations are // just strings. @@ -1661,14 +1661,14 @@ void VarItem::recreateLocallyMaybe() { controller_->addCommand( new CliCommand( - QString("print /x &%1").arg(expression_), + TQString("print /x &%1").arg(expression_), this, &VarItem::handleCurrentAddress, true)); controller_->addCommand( new CliCommand( - QString("whatis %1").arg(expression_), + TQString("whatis %1").arg(expression_), this, &VarItem::handleType)); } @@ -1686,7 +1686,7 @@ void VarItem::recreate() void VarItem::setOpen(bool open) { - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); if (open && !childrenFetched_) { @@ -1703,7 +1703,7 @@ bool VarItem::handleSpecialTypes() if (originalValueType_.isEmpty()) return false; - static QRegExp qstring("^(const)?[ ]*QString[ ]*&?$"); + static TQRegExp qstring("^(const)?[ ]*QString[ ]*&?$"); if (qstring.exactMatch(originalValueType_)) { @@ -1711,22 +1711,22 @@ bool VarItem::handleSpecialTypes() if( !varTree->controller() ) return false; varTree->controller()->addCommand( - new ResultlessCommand(QString("print $kdev_d=%1.d") + new ResultlessCommand(TQString("print $kdev_d=%1.d") .arg(gdbExpression()), true /* ignore error */)); if (varTree->controller()->qtVersion() >= 4) varTree->controller()->addCommand( - new ResultlessCommand(QString("print $kdev_s=$kdev_d.size"), + new ResultlessCommand(TQString("print $kdev_s=$kdev_d.size"), true)); else varTree->controller()->addCommand( - new ResultlessCommand(QString("print $kdev_s=$kdev_d.len"), + new ResultlessCommand(TQString("print $kdev_s=$kdev_d.len"), true)); varTree->controller()->addCommand( new ResultlessCommand( - QString("print $kdev_s= ($kdev_s > 0)? ($kdev_s > 100 ? 200 : 2*$kdev_s) : 0"), + TQString("print $kdev_s= ($kdev_s > 0)? ($kdev_s > 100 ? 200 : 2*$kdev_s) : 0"), true)); if (varTree->controller()->qtVersion() >= 4) @@ -1765,7 +1765,7 @@ void VarItem::setFormat(format_t f) // - for arrays, that's clearly right // - for pointers, this can be confusing, but nobody ever wants to // see the pointer in decimal! - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { static_cast(child)->setFormat(f); @@ -1774,7 +1774,7 @@ void VarItem::setFormat(format_t f) else { controller_->addCommand( - new GDBCommand(QString("-var-set-format \"%1\" %2") + new GDBCommand(TQString("-var-set-format \"%1\" %2") .arg(varobjName_).arg(varobjFormatName()))); updateValue(); @@ -1802,7 +1802,7 @@ VarItem::format_t VarItem::formatFromGdbModifier(char c) const return nf; } -QString VarItem::varobjFormatName() const +TQString VarItem::varobjFormatName() const { switch(format_) { @@ -1836,7 +1836,7 @@ QString VarItem::varobjFormatName() const // ************************************************************************** // Overridden to highlight the changed items -void VarItem::paintCell(QPainter *p, const QColorGroup &cg, +void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if ( !p ) @@ -1853,18 +1853,18 @@ void VarItem::paintCell(QPainter *p, const QColorGroup &cg, if (!alive_) { /* Draw this as disabled. */ - QListViewItem::paintCell(p, varTree()->QWidget::palette().disabled(), + TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(), column, width, align); } else { if (column == ValueCol && highlight_) { - QColorGroup hl_cg( cg.foreground(), cg.background(), cg.light(), + TQColorGroup hl_cg( cg.foreground(), cg.background(), cg.light(), cg.dark(), cg.mid(), red, cg.base()); - QListViewItem::paintCell( p, hl_cg, column, width, align ); + TQListViewItem::paintCell( p, hl_cg, column, width, align ); } else - QListViewItem::paintCell( p, cg, column, width, align ); + TQListViewItem::paintCell( p, cg, column, width, align ); } } @@ -1879,7 +1879,7 @@ void VarItem::unhookFromGdb() // Unhook children first, so that child varitems are deleted // before parent. Strictly speaking, we can avoid calling // -var-delete on child varitems, but that's a bit cheesy, - for(QListViewItem* child = firstChild(); + for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) { static_cast(child)->unhookFromGdb(); @@ -1894,7 +1894,7 @@ void VarItem::unhookFromGdb() { controller_->addCommand( new GDBCommand( - QString("-var-delete \"%1\"").arg(varobjName_))); + TQString("-var-delete \"%1\"").arg(varobjName_))); } varobjName_ = ""; @@ -1902,10 +1902,10 @@ void VarItem::unhookFromGdb() // ************************************************************************** -QString VarItem::tipText() const +TQString VarItem::tipText() const { const unsigned int maxTooltipSize = 70; - QString tip = text( ValueCol ); + TQString tip = text( ValueCol ); if (tip.length() > maxTooltipSize) tip = tip.mid(0, maxTooltipSize - 1 ) + " [...]"; @@ -1951,7 +1951,7 @@ VarFrameRoot::~VarFrameRoot() void VarFrameRoot::setOpen(bool open) { bool frameOpened = ( isOpen()==false && open==true ); - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); if (frameOpened && needLocals_) { diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index 369f5748..5c77ea43 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -21,12 +21,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -56,19 +56,19 @@ class VariableWidget : public QWidget public: VariableWidget( GDBController* controller, GDBBreakpointWidget* breakpointWidget, - QWidget *parent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); VariableTree *varTree() const { return varTree_; } -protected: // QWidget overrides - void focusInEvent(QFocusEvent *e); +protected: // TQWidget overrides + void focusInEvent(TQFocusEvent *e); public slots: void slotAddWatchVariable(); - void slotAddWatchVariable(const QString &ident); + void slotAddWatchVariable(const TQString &ident); void slotEvaluateExpression(); - void slotEvaluateExpression(const QString &ident); + void slotEvaluateExpression(const TQString &ident); private: VariableTree *varTree_; @@ -92,38 +92,38 @@ public: const char *name=0 ); virtual ~VariableTree(); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; - QListViewItem *findRoot(QListViewItem *item) const; + TQListViewItem *findRoot(TQListViewItem *item) const; VarFrameRoot *findFrame(int frameNo, int threadNo) const; WatchRoot *findWatch(); - // (from QToolTip) Display a tooltip when the cursor is over an item - virtual void maybeTip(const QPoint &); + // (from TQToolTip) Display a tooltip when the cursor is over an item + virtual void maybeTip(const TQPoint &); GDBController* controller() const { return controller_; } signals: - void toggleWatchpoint(const QString &varName); + void toggleWatchpoint(const TQString &varName); public slots: - void slotAddWatchVariable(const QString& watchVar); - void slotEvaluateExpression(const QString& expression); + void slotAddWatchVariable(const TQString& watchVar); + void slotEvaluateExpression(const TQString& expression); void slotEvent(GDBController::event_t); - void slotItemRenamed(QListViewItem* item, int col, const QString& text); + void slotItemRenamed(TQListViewItem* item, int col, const TQString& text); private slots: - void slotContextMenu(KListView *, QListViewItem *item); - void slotVarobjNameChanged(const QString& from, const QString& to); + void slotContextMenu(KListView *, TQListViewItem *item); + void slotVarobjNameChanged(const TQString& from, const TQString& to); private: // Callbacks for gdb commands; void argumentsReady(const GDBMI::ResultRecord&); void localsReady(const GDBMI::ResultRecord&); - void frameIdReady(const QValueVector&); + void frameIdReady(const TQValueVector&); void handleVarUpdate(const GDBMI::ResultRecord&); - void handleEvaluateExpression(const QValueVector&); + void handleEvaluateExpression(const TQValueVector&); void variablesFetchDone(); void fetchSpecialValuesDone(); @@ -148,10 +148,10 @@ private: // helper functions /** Copies the value (second column) of the specified item to the clipboard. */ - void copyToClipboard(QListViewItem*); + void copyToClipboard(TQListViewItem*); -private: // QWidget overrides - void keyPressEvent(QKeyEvent* e); +private: // TQWidget overrides + void keyPressEvent(TQKeyEvent* e); private: GDBController* controller_; @@ -165,12 +165,12 @@ private: TrimmableItem* recentExpressions_; VarFrameRoot* currentFrameItem; - QTime fetch_time; + TQTime fetch_time; // Names of locals and arguments as reported by // gdb. - std::vector locals_and_arguments; + std::vector locals_and_arguments; - QMap varobj2varitem; + TQMap varobj2varitem; KPopupMenu* activePopup_; static const int idToggleWatch = 10; @@ -210,11 +210,11 @@ public: virtual ~TrimmableItem(); - QListViewItem *lastChild() const; + TQListViewItem *lastChild() const; protected: - void paintCell( QPainter *p, const QColorGroup &cg, + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); }; @@ -222,7 +222,7 @@ protected: /***************************************************************************/ /***************************************************************************/ -class VarItem : public QObject, +class VarItem : public TQObject, public TrimmableItem { Q_OBJECT @@ -233,7 +233,7 @@ public: Optionally, alternative display name can be provided. */ VarItem( TrimmableItem *parent, - const QString& expression, + const TQString& expression, bool frozen = false); VarItem( TrimmableItem *parent, const GDBMI::Value& varobj, @@ -242,7 +242,7 @@ public: virtual ~VarItem(); /// Returns the gdb expression for *this. - QString gdbExpression() const; + TQString gdbExpression() const; /** Returns true is this VarItem should be unconditionally updated on each step, not matter what's the result of @@ -251,7 +251,7 @@ public: bool updateUnconditionally() const; void updateValue(); - void updateSpecialRepresentation(const QString& s); + void updateSpecialRepresentation(const TQString& s); /** Creates a fresh gdbs "variable object", if needed. Preconditions: @@ -273,7 +273,7 @@ public: void recreate(); void setOpen(bool open); - void setText (int column, const QString& text); + void setText (int column, const TQString& text); /** Mark the variable as alive, or not alive. Variables that are not alive a shown as "gray", @@ -290,7 +290,7 @@ public: void unhookFromGdb(); // Returns the text to be displayed as tooltip (the value) - QString tipText() const; + TQString tipText() const; format_t format() const; void setFormat(format_t f); @@ -302,7 +302,7 @@ public: /** Sets new top-level textual value of this variable. */ - void setValue(const QString& new_value); + void setValue(const TQString& new_value); bool isAlive() const; @@ -314,7 +314,7 @@ signals: Either 'from' or 'to' can be empty string. */ - void varobjNameChange(const QString& from, const QString& to); + void varobjNameChange(const TQString& from, const TQString& to); private: @@ -332,29 +332,29 @@ private: - gets initial value - if item is open, gets children. */ - void setVarobjName(const QString& name); + void setVarobjName(const TQString& name); /** Handle types that require special dispay, such as - QString. Return true if this is such a type. + TQString. Return true if this is such a type. The 'originalValueType_' is already initialized by the time this method is called. */ bool handleSpecialTypes(); - void paintCell( QPainter *p, const QColorGroup &cg, + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); void varobjCreated(const GDBMI::ResultRecord& r); void valueDone(const GDBMI::ResultRecord& r); void childrenDone(const GDBMI::ResultRecord& r); void childrenOfFakesDone(const GDBMI::ResultRecord& r); - void handleCurrentAddress(const QValueVector& lines); - void handleType(const QValueVector& lines); + void handleCurrentAddress(const TQValueVector& lines); + void handleType(const TQValueVector& lines); void createChildren(const GDBMI::ResultRecord& r, bool children_of_fake); /** Called to handle the output of the cli print command. */ - void handleCliPrint(const QValueVector& lines); + void handleCliPrint(const TQValueVector& lines); // Assuming 'expression_' is already set, returns the // displayName to use when showing this to the user. @@ -362,26 +362,26 @@ private: // gdb expression '$1' and displayName 'P4', we want the child // to show up as *P4, not as '*$1', so we can't uncondionally // use expression gdb reports to us. - QString displayName() const; + TQString displayName() const; VariableTree* varTree() const; - QString varobjFormatName() const; + TQString varobjFormatName() const; private: // The gdb expression for this varItem relatively to // parent VarItem. - QString expression_; + TQString expression_; bool highlight_; GDBController* controller_; - QString varobjName_; + TQString varobjName_; // the non-cast type of the variable - QString originalValueType_; + TQString originalValueType_; bool oldSpecialRepresentationSet_; - QString oldSpecialRepresentation_; + TQString oldSpecialRepresentation_; format_t format_; @@ -390,8 +390,8 @@ private: int numChildren_; bool childrenFetched_; - QString currentAddress_; - QString lastObtainedAddress_; + TQString currentAddress_; + TQString lastObtainedAddress_; bool updateUnconditionally_; bool frozen_; @@ -425,7 +425,7 @@ public: // this item, it will fetch new data. void setDirty(); - void setFrameName(const QString &frameName) + void setFrameName(const TQString &frameName) { setText(VarNameCol, frameName); setText(ValueCol, ""); } bool needLocals() const { return needLocals_; } diff --git a/languages/cpp/declarationinfo.h b/languages/cpp/declarationinfo.h index f1d28f26..8b55557e 100644 --- a/languages/cpp/declarationinfo.h +++ b/languages/cpp/declarationinfo.h @@ -22,16 +22,16 @@ #ifndef DECLARATIONINFO_H #define DECLARATIONINFO_H -#include +#include struct DeclarationInfo { class File { - QString m_file; + TQString m_file; public: - File( const QString& file = "" ) : m_file( file ) { + File( const TQString& file = "" ) : m_file( file ) { } - operator QString() const { + operator TQString() const { return m_file; } }; @@ -43,15 +43,15 @@ struct DeclarationInfo { return !name.isEmpty(); } - QString locationToText() const { - return QString("line %1 col %2 - line %3 col %4\nfile: %5").arg(startLine).arg(startCol).arg(endLine).arg(endCol).arg(file); + TQString locationToText() const { + return TQString("line %1 col %2 - line %3 col %4\nfile: %5").arg(startLine).arg(startCol).arg(endLine).arg(endCol).arg(file); } - QString toText() const { + TQString toText() const { if( name.isEmpty() ) return ""; - QString ret; - ret = QString("name: " + name + "\n" ) + locationToText(); + TQString ret; + ret = TQString("name: " + name + "\n" ) + locationToText(); if( !comment.isEmpty() ) { ret += "\n\"" + comment + "\""; } @@ -62,8 +62,8 @@ struct DeclarationInfo { int endLine, endCol; File file; - QString name; - QString comment; + TQString name; + TQString comment; }; diff --git a/languages/cpp/doxydoc.cpp b/languages/cpp/doxydoc.cpp index bcd36faa..54343b70 100644 --- a/languages/cpp/doxydoc.cpp +++ b/languages/cpp/doxydoc.cpp @@ -11,37 +11,37 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -void DoxyDoc::formatType( QString& str ) +void DoxyDoc::formatType( TQString& str ) { - str.replace( QRegExp( " " ), "" ); + str.replace( TQRegExp( " " ), "" ); } -DoxyDoc::DoxyDoc( const QStringList& dir ) +DoxyDoc::DoxyDoc( const TQStringList& dir ) { for ( uint i = 0; i < dir.count(); ++i ) - m_dirs.push_back( QDir( *( dir.at( i ) ) ) ); + m_dirs.push_back( TQDir( *( dir.at( i ) ) ) ); } //crappy implementation, change later -QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& name, - const QString& tmptype, const QString& tmparguments ) +TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString& name, + const TQString& tmptype, const TQString& tmparguments ) { - QString scope = tmpscope; + TQString scope = tmpscope; bool foundfile = false; //produce doxygen conform filenames - QString filename = "/class" + scope.replace( QRegExp( "_" ), "__" ).replace( QRegExp( "::" ), "_1_1" ) + ".xml"; + TQString filename = "/class" + scope.replace( TQRegExp( "_" ), "__" ).replace( TQRegExp( "::" ), "_1_1" ) + ".xml"; //search for file in all directories - for ( std::list::const_iterator ci = m_dirs.begin(); !foundfile && ci != m_dirs.end(); ++ci ) + for ( std::list::const_iterator ci = m_dirs.begin(); !foundfile && ci != m_dirs.end(); ++ci ) { - if ( QFile::exists( ci->path() + filename ) ) + if ( TQFile::exists( ci->path() + filename ) ) { if ( m_file.name() != ci->path() + filename ) { @@ -52,7 +52,7 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na m_file.setName( "" ); return ""; } - QDomDocument m_doc; + TQDomDocument m_doc; m_doc.setContent( m_file.readAll() ); m_file.close(); m_list = m_doc.elementsByTagName( "memberdef" ); @@ -64,19 +64,19 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na } } if ( !foundfile ) - return QString::null; + return TQString::null; - QString type = tmptype; + TQString type = tmptype; formatType( type ); for ( uint i = 0; i < m_list.count(); ++i ) { - QDomElement elem = m_list.item( i ).toElement(); + TQDomElement elem = m_list.item( i ).toElement(); if ( elem.elementsByTagName( "name" ).item( 0 ).toElement().text() == name && elem.elementsByTagName( "type" ).item( 0 ).toElement().text() == tmptype ) { - QDomNodeList paramnodes = elem.elementsByTagName( "param" ); - QString nodearguments = "", arguments = tmparguments; + TQDomNodeList paramnodes = elem.elementsByTagName( "param" ); + TQString nodearguments = "", arguments = tmparguments; for ( unsigned int j = 0; j < paramnodes.count(); ++j ) nodearguments += paramnodes.item( j ).childNodes().item( 0 ).toElement().text() + ","; if ( nodearguments != "" ) @@ -87,17 +87,17 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na formatType( arguments ); if ( arguments == nodearguments ) { - QString brief = ""; - QDomNode briefnode = elem.elementsByTagName( "briefdescription" ).item( 0 ); + TQString brief = ""; + TQDomNode briefnode = elem.elementsByTagName( "briefdescription" ).item( 0 ); if ( briefnode.hasChildNodes() ) brief = briefnode.firstChild().toElement().text(); - QString detailstr = "", paramstr = ""; - QDomNode detail = elem.elementsByTagName( "detaileddescription" ).item( 0 ); + TQString detailstr = "", paramstr = ""; + TQDomNode detail = elem.elementsByTagName( "detaileddescription" ).item( 0 ); if ( detail.hasChildNodes() ) detail = detail.firstChild(); - QDomNode descnode = detail.firstChild(); + TQDomNode descnode = detail.firstChild(); while ( !descnode.isNull() ) { if ( descnode.nodeName() == "parameterlist" ) @@ -125,7 +125,7 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na } - QString description = ""; + TQString description = ""; if ( brief != "" ) description += brief + "

    "; if ( detailstr != "" ) @@ -134,7 +134,7 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na description += "Parameterlist:

    " + paramstr; if ( description == "" ) - return QString::null; + return TQString::null; else return description; } @@ -142,7 +142,7 @@ QString DoxyDoc::functionDescription( const QString& tmpscope, const QString& na } - return QString::null; + return TQString::null; } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/doxydoc.h b/languages/cpp/doxydoc.h index aca424b2..c36d6ada 100644 --- a/languages/cpp/doxydoc.h +++ b/languages/cpp/doxydoc.h @@ -10,10 +10,10 @@ #ifndef DOXYDOC_H #define DOXYDOC_H -#include -#include -#include -#include +#include +#include +#include +#include #include /** @@ -28,7 +28,7 @@ public: Constructs a new DoxyDoc object. @param dir all directories, which should be searched for files containing the Doxygen-documentation. */ - DoxyDoc( const QStringList& dir ); + DoxyDoc( const TQStringList& dir ); ~DoxyDoc() {} ; @@ -39,19 +39,19 @@ public: @param type Return-type of the function @param arguments String containing the arguments of the function, separated by commas and _without_ the argument names */ - QString functionDescription( const QString& scope, const QString& name, const QString& type, const QString& arguments ); + TQString functionDescription( const TQString& scope, const TQString& name, const TQString& type, const TQString& arguments ); /*not implemented yet, maybe later, if they are useful - QString classDescription(); - QString enumDescription(); - QString namespaceDescription(); - QString memberVarDescription(); + TQString classDescription(); + TQString enumDescription(); + TQString namespaceDescription(); + TQString memberVarDescription(); */ private: - static void formatType( QString& type ); - std::list m_dirs; + static void formatType( TQString& type ); + std::list m_dirs; //used for temporary storing/performance reasons - QFile m_file; - QDomNodeList m_list; + TQFile m_file; + TQDomNodeList m_list; }; #endif diff --git a/languages/cpp/expressioninfo.h b/languages/cpp/expressioninfo.h index 836a2292..4b42a2f4 100644 --- a/languages/cpp/expressioninfo.h +++ b/languages/cpp/expressioninfo.h @@ -27,7 +27,7 @@ using namespace StringHelpers; struct ExpressionInfo { private: - QString m_expr; + TQString m_expr; public: @@ -40,15 +40,15 @@ struct ExpressionInfo { Type t; int start, end; - QString expr() { + TQString expr() { return m_expr; } - void setExpr( const QString& str ) { + void setExpr( const TQString& str ) { m_expr = clearComments( str ); } - ExpressionInfo( QString str ) : t( NormalExpression ), start( 0 ), end( str.length() ) { + ExpressionInfo( TQString str ) : t( NormalExpression ), start( 0 ), end( str.length() ) { setExpr( str ); } @@ -76,8 +76,8 @@ struct ExpressionInfo { return t & NormalExpression && !m_expr.isEmpty(); } - QString typeAsString() { - QString res ; + TQString typeAsString() { + TQString res ; if( t & NormalExpression ) res += "NormalExpression, "; if( t & TypeExpression ) diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index 117c7732..ebd536ec 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -28,8 +28,8 @@ #include #include #include "kurl.h" /* defines KURL */ -#include "qdir.h" /* defines QDir */ -#include "qregexp.h" /* defines QRegExp */ +#include "tqdir.h" /* defines TQDir */ +#include "tqregexp.h" /* defines TQRegExp */ #include "klocale.h" /* defines [function] i18n */ #include "blockingkprocess.h" /* defines BlockingKProcess */ #include "includepathresolver.h" @@ -62,8 +62,8 @@ namespace CppTools { class FileModificationTimeWrapper { public: ///@param files list of files that should be fake-modified(modtime will be set to current time) - FileModificationTimeWrapper( const QStringList& files = QStringList() ) : m_newTime( time(0) ) { - for( QStringList::const_iterator it = files.begin(); it != files.end(); ++it ) { + FileModificationTimeWrapper( const TQStringList& files = TQStringList() ) : m_newTime( time(0) ) { + for( TQStringList::const_iterator it = files.begin(); it != files.end(); ++it ) { ifTest( cout << "touching " << (*it).ascii() << endl ); struct stat s; if( stat( (*it).local8Bit().data(), &s ) == 0 ) { @@ -85,8 +85,8 @@ namespace CppTools { } //Not used yet, might be used to return LD_PRELOAD=.. FAKE_MODIFIED=.. etc. later - QString commandPrefix() const { - return QString(); + TQString commandPrefix() const { + return TQString(); } ///Undo changed modification-times @@ -120,14 +120,14 @@ namespace CppTools { } private: - typedef QMap StatMap; + typedef TQMap StatMap; StatMap m_stat; time_t m_newTime; }; class SourcePathInformation { public: - SourcePathInformation( const QString& path ) : m_path( path ), m_isUnsermake(false), m_shouldTouchFiles(false) { + SourcePathInformation( const TQString& path ) : m_path( path ), m_isUnsermake(false), m_shouldTouchFiles(false) { m_isUnsermake = isUnsermakePrivate( path ); ifTest( if( m_isUnsermake ) cout << "unsermake detected" << endl ); @@ -142,7 +142,7 @@ namespace CppTools { m_shouldTouchFiles = b; } - QString getCommand( const QString& sourceFile, const QString& makeParameters ) const { + TQString getCommand( const TQString& sourceFile, const TQString& makeParameters ) const { if( isUnsermake() ) return "unsermake -k --no-real-compare -n " + makeParameters; else @@ -150,7 +150,7 @@ namespace CppTools { } bool hasMakefile() const { - QFileInfo makeFile( m_path, "Makefile" ); + TQFileInfo makeFile( m_path, "Makefile" ); return makeFile.exists(); } @@ -158,8 +158,8 @@ namespace CppTools { return isUnsermake() || m_shouldTouchFiles; } - QStringList possibleTargets( const QString& targetBaseName ) const { - QStringList ret; + TQStringList possibleTargets( const TQString& targetBaseName ) const { + TQStringList ret; if( isUnsermake() ) { //unsermake breaks if the first given target does not exist, so in worst-case 2 calls are necessary ret << targetBaseName + ".lo"; @@ -174,12 +174,12 @@ namespace CppTools { } private: - bool isUnsermakePrivate( const QString& path ) { + bool isUnsermakePrivate( const TQString& path ) { bool ret = false; - QFileInfo makeFile( path, "Makefile" ); - QFile f( makeFile.absFilePath() ); + TQFileInfo makeFile( path, "Makefile" ); + TQFile f( makeFile.absFilePath() ); if( f.open( IO_ReadOnly ) ) { - QString firstLine; + TQString firstLine; f.readLine( firstLine, 1000 ); if( firstLine.find( "generated by unsermake" ) != -1 ) { ret = true; @@ -189,14 +189,14 @@ namespace CppTools { return ret; } - QString m_path; + TQString m_path; bool m_isUnsermake; bool m_shouldTouchFiles; }; }; -bool IncludePathResolver::executeCommandPopen ( const QString& command, const QString& workingDirectory, QString& result ) const +bool IncludePathResolver::executeCommandPopen ( const TQString& command, const TQString& workingDirectory, TQString& result ) const { ifTest( cout << "executing " << command.ascii() << endl ); @@ -207,12 +207,12 @@ bool IncludePathResolver::executeCommandPopen ( const QString& command, const QS const int BUFSIZE = 2048; char buf [BUFSIZE]; - result = QString(); + result = TQString(); int status = 1; if ((fp = popen(command.local8Bit(), "r")) != NULL) { while (fgets(buf, sizeof (buf), fp)) - result += QString(buf); + result += TQString(buf); status = pclose(fp); } @@ -230,12 +230,12 @@ IncludePathResolver::IncludePathResolver( bool continueEventLoop ) : m_isResolvi } ///More efficient solution: Only do exactly one call for each directory. During that call, mark all source-files as changed, and make all targets for those files. -PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& file ) { - QFileInfo fi( file ); +PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& file ) { + TQFileInfo fi( file ); return resolveIncludePath( fi.fileName(), fi.dirPath(true) ); } -PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& file, const QString& workingDirectory ) { +PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& file, const TQString& workingDirectory ) { struct Enabler { bool& b; @@ -253,14 +253,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil Enabler e( m_isResolving ); ///STEP 1: CACHING - QDir dir( workingDirectory ); - dir = QDir( dir.absPath() ); - QFileInfo makeFile( dir, "Makefile" ); + TQDir dir( workingDirectory ); + dir = TQDir( dir.absPath() ); + TQFileInfo makeFile( dir, "Makefile" ); if( !makeFile.exists() ) return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").arg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").arg(file) ); - QStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version - QDateTime makeFileModification = makeFile.lastModified(); + TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version + TQDateTime makeFileModification = makeFile.lastModified(); Cache::iterator it = m_cache.find( dir.path() ); if( it != m_cache.end() ) { cachedPath = (*it).path; @@ -272,7 +272,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil 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( QDateTime::currentDateTime() ) < 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; @@ -286,10 +286,10 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil } ///STEP 1: Prepare paths - QString targetName; - QFileInfo fi( file ); + TQString targetName; + TQFileInfo fi( file ); - QString absoluteFile = file; + TQString absoluteFile = file; if( !file.startsWith("/") ) absoluteFile = dir.path() + "/" + file; KURL u( absoluteFile ); @@ -302,9 +302,9 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil targetName = file.left( dot ); - QString wd = dir.path(); + TQString wd = dir.path(); if( !wd.startsWith("/") ) { - wd = QDir::currentDirPath() + "/" + wd; + wd = TQDir::currentDirPath() + "/" + wd; KURL u( wd ); u.cleanPath(); wd = u.path(); @@ -320,7 +320,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil } SourcePathInformation source( wd ); - QStringList possibleTargets = source.possibleTargets( targetName ); + TQStringList possibleTargets = source.possibleTargets( targetName ); source.setShouldTouchFiles(true); //Think about whether this should be always enabled. I've enabled it for now so there's an even bigger chance that everything works. @@ -329,7 +329,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil ///STEP 3.1: Try resolution using the absolute path PathResolutionResult res; //Try for each possible target - for( QStringList::const_iterator it = possibleTargets.begin(); it != possibleTargets.end(); ++it ) { + for( TQStringList::const_iterator it = possibleTargets.begin(); it != possibleTargets.end(); ++it ) { res = resolveIncludePathInternal( absoluteFile, wd, *it, source ); if( res ) break; } @@ -346,8 +346,8 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil ///STEP 3.2: Try resolution using the relative path - QString relativeFile = KURL::relativePath(wd, absoluteFile); - for( QStringList::const_iterator it = possibleTargets.begin(); it != possibleTargets.end(); ++it ) { + TQString relativeFile = KURL::relativePath(wd, absoluteFile); + for( TQStringList::const_iterator it = possibleTargets.begin(); it != possibleTargets.end(); ++it ) { res = resolveIncludePathInternal( relativeFile, wd, *it, source ); if( res ) break; } @@ -365,7 +365,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil ce.failed = true; ce.errorMessage = res.errorMessage; ce.longErrorMessage = res.longErrorMessage; - ce.failTime = QDateTime::currentDateTime(); + ce.failTime = TQDateTime::currentDateTime(); ce.failedFiles[file] = true; } else { ce.failed = false; @@ -375,7 +375,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const QString& fil return res; } -PathResolutionResult IncludePathResolver::getFullOutput( const QString& command, const QString& workingDirectory, QString& output ) const{ +PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command, const TQString& workingDirectory, TQString& output ) const{ if( m_continueEventLoop ) { BlockingKProcess proc; proc.setWorkingDirectory( workingDirectory ); @@ -397,25 +397,25 @@ PathResolutionResult IncludePathResolver::getFullOutput( const QString& command, return PathResolutionResult(true); } -PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QString& file, const QString& workingDirectory, const QString& makeParameters, const SourcePathInformation& source ) { +PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQString& file, const TQString& workingDirectory, const TQString& makeParameters, const SourcePathInformation& source ) { - QString processStdout; + TQString processStdout; - QStringList touchFiles; + TQStringList touchFiles; if( source.shouldTouchFiles() ) touchFiles << file; FileModificationTimeWrapper touch( touchFiles ); - QString fullOutput; + TQString fullOutput; PathResolutionResult res = getFullOutput( source.getCommand( file, makeParameters ), workingDirectory, fullOutput ); if( !res ) return res; - QRegExp newLineRx("\\\\\\n"); + TQRegExp newLineRx("\\\\\\n"); fullOutput.replace( newLineRx, "" ); ///@todo collect multiple outputs at the same time for performance-reasons - QString firstLine = fullOutput; + TQString firstLine = fullOutput; int lineEnd; if( (lineEnd = fullOutput.find('\n')) != -1 ) firstLine.truncate( lineEnd ); //Only look at the first line of output @@ -428,14 +428,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr ///STEP 1: Test if it is a recursive make-call - QRegExp makeRx( "\\bmake\\s" ); + TQRegExp makeRx( "\\bmake\\s" ); int offset = 0; while( (offset = makeRx.search( firstLine, offset )) != -1 ) { - QString prefix = firstLine.left( offset ).stripWhiteSpace(); + TQString prefix = firstLine.left( offset ).stripWhiteSpace(); if( prefix.endsWith( "&&") || prefix.endsWith( ";" ) || prefix.isEmpty() ) { - QString newWorkingDirectory = workingDirectory; + TQString newWorkingDirectory = workingDirectory; ///Extract the new working-directory if( !prefix.isEmpty() ) { if( prefix.endsWith( "&&" ) ) @@ -452,14 +452,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr newWorkingDirectory = u.path(); } } - QFileInfo d( newWorkingDirectory ); + TQFileInfo d( newWorkingDirectory ); if( d.exists() ) { ///The recursive working-directory exists. - QString makeParams = firstLine.mid( offset+5 ); + TQString makeParams = firstLine.mid( offset+5 ); if( !makeParams.contains( ";" ) && !makeParams.contains( "&&" ) ) { ///Looks like valid parameters ///Make the file-name absolute, so it can be referenced from any directory - QString absoluteFile = file; + TQString absoluteFile = file; if( !absoluteFile.startsWith("/") ) absoluteFile = workingDirectory + "/" + file; KURL u( absoluteFile ); @@ -486,18 +486,18 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr } ///STEP 2: Search the output for include-paths - QRegExp validRx( "\\b([cg]\\+\\+|gcc)" ); + TQRegExp validRx( "\\b([cg]\\+\\+|gcc)" ); if( validRx.search( fullOutput ) == -1 ) return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"").arg(workingDirectory).arg( source.getCommand(file, makeParameters) ).arg(fullOutput) ); PathResolutionResult ret( true ); ret.longErrorMessage = fullOutput; - QString includeParameterRx( "\\s(-I|--include-dir=|-I\\s)" ); - QString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc. - QString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include + TQString includeParameterRx( "\\s(-I|--include-dir=|-I\\s)" ); + TQString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc. + TQString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include - QRegExp includeRx( QString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) ); + TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) ); includeRx.setMinimal( true ); includeRx.setCaseSensitive( true ); offset = 0; @@ -519,7 +519,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr int start = offset + pathOffset; int end = offset + includeRx.matchedLength(); - QString path = fullOutput.mid( start, end-start ).stripWhiteSpace(); + TQString path = fullOutput.mid( start, end-start ).stripWhiteSpace(); if( path.startsWith( "\"") || path.startsWith( "\'") && path.length() > 2 ) { //probable a quoted path if( path.endsWith(path.left(1)) ) { @@ -542,7 +542,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const QStr return ret; } -void IncludePathResolver::setOutOfSourceBuildSystem( const QString& source, const QString& build ) { +void IncludePathResolver::setOutOfSourceBuildSystem( const TQString& source, const TQString& build ) { m_outOfSource = true; m_source = source; m_build = build; @@ -554,7 +554,7 @@ void IncludePathResolver::setOutOfSourceBuildSystem( const QString& source, cons * */ int main(int argc, char **argv) { - QApplication app(argc,argv); + TQApplication app(argc,argv); IncludePathResolver resolver; if( argc < 3 ) { cout << "params: 1. file-name, 2. working-directory [3. source-directory 4. build-directory]" << endl; diff --git a/languages/cpp/includepathresolver.h b/languages/cpp/includepathresolver.h index c182d52e..33aaecd9 100644 --- a/languages/cpp/includepathresolver.h +++ b/languages/cpp/includepathresolver.h @@ -13,20 +13,20 @@ ***************************************************************************/ #ifndef INCLUDEPATHRESOLVER_H #define INCLUDEPATHRESOLVER_H -#include /* defines QString */ -#include +#include /* defines TQString */ +#include namespace CppTools { class FileModificationTimeWrapper; struct PathResolutionResult { - PathResolutionResult( bool _success = false, const QString& _errorMessage = QString(), const QString& _longErrorMessage = QString() ) : success( _success ), errorMessage( _errorMessage ), longErrorMessage( _longErrorMessage ) { + PathResolutionResult( bool _success = false, const TQString& _errorMessage = TQString(), const TQString& _longErrorMessage = TQString() ) : success( _success ), errorMessage( _errorMessage ), longErrorMessage( _longErrorMessage ) { } bool success; - QString errorMessage; - QString longErrorMessage; + TQString errorMessage; + TQString longErrorMessage; - QStringList path; + TQStringList path; operator bool() const { return success; @@ -41,35 +41,35 @@ namespace CppTools { ///Whether the Qt event-loop should be continued(using BlockingKProcess). This crashes if enabled in a non-foreground thread. IncludePathResolver( bool continueEventLoop = false ); ///Same as below, but uses the directory of the file as working-directory. The argument must be absolute. - PathResolutionResult resolveIncludePath( const QString& file ); + PathResolutionResult resolveIncludePath( const TQString& file ); ///The include-path is only computed once for a whole directory, then it is cached using the modification-time of the Makefile. - PathResolutionResult resolveIncludePath( const QString& file, const QString& workingDirectory ); + PathResolutionResult resolveIncludePath( const TQString& file, const TQString& workingDirectory ); ///source and build must be absolute paths - void setOutOfSourceBuildSystem( const QString& source, const QString& build ); + void setOutOfSourceBuildSystem( const TQString& source, const TQString& build ); private: bool m_isResolving; bool m_continueEventLoop; struct CacheEntry { CacheEntry() : failed(false) { } - QDateTime modificationTime; - QStringList path; - QString errorMessage, longErrorMessage; + TQDateTime modificationTime; + TQStringList path; + TQString errorMessage, longErrorMessage; bool failed; - QMap failedFiles; - QDateTime failTime; + TQMap failedFiles; + TQDateTime failTime; }; - typedef QMap Cache; + typedef TQMap Cache; Cache m_cache; ///Executes the command, either using popen or BlockingKProcess - PathResolutionResult getFullOutput( const QString& command, const QString& workingDirectory, QString& output ) const; - bool executeCommandPopen ( const QString& command, const QString& workingDirectory, QString& result ) const; + PathResolutionResult getFullOutput( const TQString& command, const TQString& workingDirectory, TQString& output ) const; + bool executeCommandPopen ( const TQString& command, const TQString& workingDirectory, TQString& result ) const; ///file should be the name of the target, without extension(because that may be different) - PathResolutionResult resolveIncludePathInternal( const QString& file, const QString& workingDirectory, const QString& makeParameters, const SourcePathInformation& source ); + PathResolutionResult resolveIncludePathInternal( const TQString& file, const TQString& workingDirectory, const TQString& makeParameters, const SourcePathInformation& source ); bool m_outOfSource; - QString m_source; - QString m_build; + TQString m_source; + TQString m_build; }; }; diff --git a/languages/cpp/kdevdeepcopy.h b/languages/cpp/kdevdeepcopy.h index f006bbce..c29ee1e1 100644 --- a/languages/cpp/kdevdeepcopy.h +++ b/languages/cpp/kdevdeepcopy.h @@ -1,12 +1,12 @@ #ifndef KDEVDEEPCOPY_H #define KDEVDEEPCOPY_H -#include +#include -inline QString deepCopy( const QString& s ) +inline TQString deepCopy( const TQString& s ) { - QCString str = s.utf8(); - return QString::fromUtf8( str, str.length() ); + TQCString str = s.utf8(); + return TQString::fromUtf8( str, str.length() ); } #endif diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp index 53cf413e..f240ed36 100644 --- a/languages/cpp/kdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -24,18 +24,18 @@ CppSupportPart* KDevDriver::cppSupport() { return m_cppSupport; } void KDevDriver::setupProject() { - QMap map; + TQMap map; - QStringList fileList = m_cppSupport->project() ->allFiles(); - QStringList::ConstIterator it = fileList.begin(); + TQStringList fileList = m_cppSupport->project() ->allFiles(); + TQStringList::ConstIterator it = fileList.begin(); while ( it != fileList.end() ) { - QFileInfo info( *it ); + TQFileInfo info( *it ); ++it; map.insert( info.dirPath( true ), true ); } - QMap::Iterator mapit = map.begin(); + TQMap::Iterator mapit = map.begin(); while ( mapit != map.end() ) { addIncludePath( mapit.key() ); @@ -61,16 +61,16 @@ void KDevDriver::setup() addMacro( Macro("KDEVELOP_PARSER", "3.4") ); bool ok; - QString verboseGccOutput = SetupHelper::getVerboseGccIncludePath( &ok ); - QStringList verboseGccLines = QStringList::split( '\n', verboseGccOutput ); + TQString verboseGccOutput = SetupHelper::getVerboseGccIncludePath( &ok ); + TQStringList verboseGccLines = TQStringList::split( '\n', verboseGccOutput ); if( verboseGccLines.count() > 3 ) { ///Parse the output of gcc. It includes gcc's final include-path when parsing an empty c++-file(including dirs like /usr/include/c++/4.xx/...) //what about order? - for( QStringList::iterator it = verboseGccLines.begin(); it != verboseGccLines.end(); ++it ) { + for( TQStringList::iterator it = verboseGccLines.begin(); it != verboseGccLines.end(); ++it ) { if( (*it).startsWith(" ") && (*it).length() > 2 && (*it)[1] != ' ' ) { //it is a potential include-file - QString path = (*it).stripWhiteSpace(); - QFileInfo info( path ); + TQString path = (*it).stripWhiteSpace(); + TQFileInfo info( path ); if( info.exists() ) { kdDebug( 9007 ) << "Adding include-path from gcc-output: \"" << path << "\" absolute: \"" << info.absFilePath() << "\"" << endl; addIncludePath(info.absFilePath()); @@ -84,10 +84,10 @@ void KDevDriver::setup() addIncludePath( "/usr/local/include" ); bool ok; - QString includePath = SetupHelper::getGccIncludePath(&ok); + TQString includePath = SetupHelper::getGccIncludePath(&ok); if (ok) { - QStringList ls = QStringList::split( "\n", includePath ); - for( QStringList::const_iterator it = ls.begin(); it != ls.end(); ++it ) { + TQStringList ls = TQStringList::split( "\n", includePath ); + for( TQStringList::const_iterator it = ls.begin(); it != ls.end(); ++it ) { if( !(*it).isEmpty() ) addIncludePath( *it ); } @@ -101,15 +101,15 @@ void KDevDriver::setup() addMacro( Macro( "__cplusplus", "1" ) ); ///@todo maybe remove the following? Is there any normal user who has his environment set up correctly so this is of any use? - QString kdedir = getenv( "KDEDIR" ); + TQString kdedir = getenv( "KDEDIR" ); if( !kdedir.isNull() ) addIncludePath( kdedir + "/include" ); - QString qmakespec = getenv( "QMAKESPEC" ); + TQString qmakespec = getenv( "QMAKESPEC" ); if ( qmakespec.isNull() ) qmakespec = "linux-g++"; - QString qtdir = getenv( "QTDIR" ); + TQString qtdir = getenv( "QTDIR" ); if( !qtdir.isNull() ) { addIncludePath( qtdir + "/include" ); @@ -119,10 +119,10 @@ void KDevDriver::setup() addIncludePath( qtdir + "/mkspecs/" + qmakespec ); } - QStringList lines = SetupHelper::getGccMacros(&ok); + TQStringList lines = SetupHelper::getGccMacros(&ok); if (!ok) { - for (QStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { - QStringList lst = QStringList::split( ' ', *it ); + for (TQStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { + TQStringList lst = TQStringList::split( ' ', *it ); if ( lst.count() != 3 ) continue; addMacro( Macro( lst[1], lst[2] ) ); @@ -135,7 +135,7 @@ void KDevDriver::setup() addMacro( Macro( "Q_SCRIPTABLE", "" ) ); CppCodeCompletionConfig* cfg = m_cppSupport->codeCompletionConfig(); - QString str = cfg->customIncludePaths(); + TQString str = cfg->customIncludePaths(); int pos = 0; while( pos < str.length() ) { int end = str.find( ';', pos ); @@ -143,7 +143,7 @@ void KDevDriver::setup() end = str.length(); } - QString s = str.mid( pos, end-pos ).stripWhiteSpace(); + TQString s = str.mid( pos, end-pos ).stripWhiteSpace(); if( !s.isEmpty() ) { if( !s.startsWith( "/" ) && m_cppSupport->project() ) { s = m_cppSupport->project()->projectDirectory() + "/" + s; @@ -167,7 +167,7 @@ void KDevDriver::setup() m_shouldParseIncludedFiles = cfg->parseMissingHeaders(); } -QStringList KDevDriver::getCustomIncludePath( const QString& file ) { +TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) { if( !file.startsWith("/") ) kdDebug( 9007 ) << "KDevDriver::getCustomIncludePath(..): given file \"" << file << "\" is not absolute" << endl; if( !m_includePathResolver ) @@ -184,7 +184,7 @@ QStringList KDevDriver::getCustomIncludePath( const QString& file ) { } bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { - QString compoundString = file->fileName() + "||" + QString("%1").arg(file->usedMacros().valueHash()) + "||" + QString("%1").arg(file->usedMacros().idHash()); + TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()); if( !m_shouldParseIncludedFiles ) return false; diff --git a/languages/cpp/kdevdriver.h b/languages/cpp/kdevdriver.h index f46894b4..3a9f0ac6 100644 --- a/languages/cpp/kdevdriver.h +++ b/languages/cpp/kdevdriver.h @@ -10,7 +10,7 @@ #include #include -#include +#include class KProcess; namespace CppTools { @@ -40,7 +40,7 @@ protected: void setupLexer( Lexer* lexer ); ///Returns the complete include-path for that file. Not constant because it may add Problem-items to the driver. Must be absolute path. - virtual QStringList getCustomIncludePath( const QString& file ); + virtual TQStringList getCustomIncludePath( const TQString& file ); virtual bool shouldParseIncludedFile( const ParsedFilePointer& /*file*/ ); diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index 079fba37..b3e6bacb 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -7,11 +7,11 @@ #include "tag_creator.h" #include "setuphelper.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -39,7 +39,7 @@ public: m_generateTags = b; } - void addDocDirectory( const QString& dir ) + void addDocDirectory( const TQString& dir ) { m_docDirectoryList.append( dir ); TagCreator::setDocumentationDirectories( m_docDirectoryList ); @@ -48,15 +48,15 @@ public: void fileParsed( const ParsedFile& fileName ) { std::cout << ( m_generateTags ? "generate tags for " : "checking " ) - << QFile::encodeName( fileName.fileName() ).data() << std::endl; + << TQFile::encodeName( fileName.fileName() ).data() << std::endl; - QValueList l = problems( fileName.fileName() ); - QValueList::Iterator it = l.begin(); + TQValueList l = problems( fileName.fileName() ); + TQValueList::Iterator it = l.begin(); while ( it != l.end() ) { const Problem & p = *it; ++it; - std::cout << QFile::encodeName( fileName.fileName() ).data() << ":" << p.line() << ":" + std::cout << TQFile::encodeName( fileName.fileName() ).data() << ":" << p.line() << ":" << p.column() << ": " << p.text().latin1() << std::endl; } @@ -82,15 +82,15 @@ public: // code provided by Reginald Stadlbauer void setup() { - QString kdedir = getenv( "KDEDIR" ); + TQString kdedir = getenv( "KDEDIR" ); if ( !kdedir.isNull() ) addIncludePath( kdedir + "/include" ); - QString qtdir = getenv( "QTDIR" ); + TQString qtdir = getenv( "QTDIR" ); if ( !qtdir.isNull() ) addIncludePath( qtdir + "/include" ); - QString qmakespec = getenv( "QMAKESPEC" ); + TQString qmakespec = getenv( "QMAKESPEC" ); if ( qmakespec.isNull() ) qmakespec = "linux-g++"; // #### implement other mkspecs and find a better way to find the @@ -104,27 +104,27 @@ public: addIncludePath( "/usr/include" ); addIncludePath( "/ust/local/include" ); bool ok; - QString gccLibPath = SetupHelper::getGccIncludePath(&ok); + TQString gccLibPath = SetupHelper::getGccIncludePath(&ok); if (!ok) return; - gccLibPath = gccLibPath.replace( QRegExp( "[\r\n]" ), "" ); + gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" ); addIncludePath( gccLibPath ); addIncludePath( "/usr/include/g++-3" ); addIncludePath( "/usr/include/g++" ); - QStringList lines = SetupHelper::getGccMacros(&ok); + TQStringList lines = SetupHelper::getGccMacros(&ok); if (!ok) return; - for (QStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { - QStringList lst = QStringList::split( ' ', *it ); + for (TQStringList::ConstIterator it = lines.constBegin(); it != lines.constEnd(); ++it) { + TQStringList lst = TQStringList::split( ' ', *it ); if ( lst.count() != 3 ) continue; addMacro( Macro( lst[1], lst[2] ) ); } addMacro( Macro( "__cplusplus", "1" ) ); - QString incl = getenv( "INCLUDE" ); - QStringList includePaths = QStringList::split( ':', incl ); - QStringList::Iterator it = includePaths.begin(); + TQString incl = getenv( "INCLUDE" ); + TQStringList includePaths = TQStringList::split( ':', incl ); + TQStringList::Iterator it = includePaths.begin(); while ( it != includePaths.end() ) { addIncludePath( ( *it ).stripWhiteSpace() ); @@ -134,9 +134,9 @@ public: } else if ( qmakespec == "win32-borland" ) { - QString incl = getenv( "INCLUDE" ); - QStringList includePaths = QStringList::split( ';', incl ); - QStringList::Iterator it = includePaths.begin(); + TQString incl = getenv( "INCLUDE" ); + TQStringList includePaths = TQStringList::split( ';', incl ); + TQStringList::Iterator it = includePaths.begin(); while ( it != includePaths.end() ) { addIncludePath( ( *it ).stripWhiteSpace() ); @@ -151,22 +151,22 @@ public: private: Catalog* catalog; bool m_generateTags; - QStringList m_docDirectoryList; + TQStringList m_docDirectoryList; }; -void parseDirectory( Driver& driver, QDir& dir, bool rec, bool parseAllFiles ) +void parseDirectory( Driver& driver, TQDir& dir, bool rec, bool parseAllFiles ) { - QStringList fileList; + TQStringList fileList; if ( parseAllFiles ) - fileList = dir.entryList( QDir::Files ); + fileList = dir.entryList( TQDir::Files ); else fileList = dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh" ); - QStringList::Iterator it = fileList.begin(); + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { - QString fn = dir.path() + "/" + ( *it ); + TQString fn = dir.path() + "/" + ( *it ); ++it; driver.parseFile( fn ); @@ -174,8 +174,8 @@ void parseDirectory( Driver& driver, QDir& dir, bool rec, bool parseAllFiles ) if ( rec ) { - QStringList fileList = dir.entryList( QDir::Dirs ); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = dir.entryList( TQDir::Dirs ); + TQStringList::Iterator it = fileList.begin(); while ( it != fileList.end() ) { if ( ( *it ).startsWith( "." ) ) @@ -184,7 +184,7 @@ void parseDirectory( Driver& driver, QDir& dir, bool rec, bool parseAllFiles ) continue; } - QDir subdir( dir.path() + "/" + ( *it ) ); + TQDir subdir( dir.path() + "/" + ( *it ) ); ++it; parseDirectory( driver, subdir, rec, parseAllFiles ); @@ -205,7 +205,7 @@ int main( int argc, char* argv[] ) bool rec = false; bool parseAllFiles = false; - QString datadir = stddir.localkdedir() + "/" + KStandardDirs::kde_default( "data" ); + TQString datadir = stddir.localkdedir() + "/" + KStandardDirs::kde_default( "data" ); if ( ! KStandardDirs::makeDir( datadir + "/kdevcppsupport/pcs/" ) ) { kdWarning() << "*error* " << "could not create " << datadir + "/kdevcppsupport/pcs/" << endl << endl; @@ -213,15 +213,15 @@ int main( int argc, char* argv[] ) } - if ( !QFile::exists( datadir + "/kdevcppsupport/pcs/" ) ) + if ( !TQFile::exists( datadir + "/kdevcppsupport/pcs/" ) ) { kdWarning() << "*error* " << datadir + "/kdevcppsupport/pcs/" << " doesn't exists!!" << endl << endl; return -1; } - QString dbFileName = datadir + "/kdevcppsupport/pcs/" + argv[ 1 ] + ".db"; + TQString dbFileName = datadir + "/kdevcppsupport/pcs/" + argv[ 1 ] + ".db"; // std::cout << "dbFileName = " << dbFileName << std::endl; - if ( QFile::exists( dbFileName ) ) + if ( TQFile::exists( dbFileName ) ) { kdWarning() << "*error* " << "database " << dbFileName << " already exists!" << endl << endl; return -1; @@ -240,7 +240,7 @@ int main( int argc, char* argv[] ) for ( int i = 2; i < argc; ++i ) { - QString s( argv[ i ] ); + TQString s( argv[ i ] ); if ( s == "-r" || s == "--recursive" ) { rec = true; @@ -267,7 +267,7 @@ int main( int argc, char* argv[] ) continue; } - QDir dir( s ); + TQDir dir( s ); if ( !dir.exists() ) { kdWarning() << "*error* " << "the directory " << dir.path() << " doesn't exists!" << endl << endl; diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp index c3e5cb43..5551cd02 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp @@ -11,15 +11,15 @@ #include "settingsdialog.h" -#include -#include +#include +#include #include #include K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory( "kdevcustompcsimporter" ) ) -KDevCustomImporter::KDevCustomImporter( QObject* parent, const char* name, const QStringList & // args +KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args ) : KDevPCSImporter( parent, name ) {} @@ -29,34 +29,34 @@ KDevCustomImporter::~KDevCustomImporter() {} -QString KDevCustomImporter::dbName() const +TQString KDevCustomImporter::dbName() const { return m_settings->dbName(); } -QStringList KDevCustomImporter::fileList( const QString& path ) +TQStringList KDevCustomImporter::fileList( const TQString& path ) { - QDir dir( path ); + TQDir dir( path ); if ( !dir.exists() ) - return QStringList(); -// QStringList lst = dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh" ); - QStringList lst = dir.entryList( m_settings->filePattern() ); - QStringList fileList; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + return TQStringList(); +// TQStringList lst = dir.entryList( "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh" ); + TQStringList lst = dir.entryList( m_settings->filePattern() ); + TQStringList fileList; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { fileList.push_back( dir.absPath() + "/" + ( *it ) ); } return fileList; } -QStringList KDevCustomImporter::fileList() +TQStringList KDevCustomImporter::fileList() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QStringList lst = m_settings->dirs(); - QStringList files; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + TQStringList lst = m_settings->dirs(); + TQStringList files; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( !m_settings->recursive() ) files += fileList( *it ); @@ -67,27 +67,27 @@ QStringList KDevCustomImporter::fileList() return files; } -QStringList KDevCustomImporter::includePaths() +TQStringList KDevCustomImporter::includePaths() { if ( !m_settings ) - return QStringList(); + return TQStringList(); return m_settings->dirs(); } -QWidget* KDevCustomImporter::createSettingsPage( QWidget* parent, const char* name ) +TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; } -void KDevCustomImporter::processDir( const QString path, QStringList & files ) +void KDevCustomImporter::processDir( const TQString path, TQStringList & files ) { - QValueStack s; + TQValueStack s; s.push( path ); files += fileList( path ); - QDir dir; + TQDir dir; do { dir.setPath( s.pop() ); @@ -96,15 +96,15 @@ void KDevCustomImporter::processDir( const QString path, QStringList & files ) kdDebug( 9015 ) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; - QPtrListIterator it( *dirEntries ); + TQPtrListIterator it( *dirEntries ); for ( ; dirEntries && it.current(); ++it ) { - QString fileName = it.current() ->fileName(); + TQString fileName = it.current() ->fileName(); if ( fileName == "." || fileName == ".." ) continue; if ( it.current() ->isDir() ) { - QString tmpPath = it.current() ->absFilePath(); + TQString tmpPath = it.current() ->absFilePath(); kdDebug( 9015 ) << "Pushing: " << tmpPath << endl; s.push( tmpPath ); files += fileList( tmpPath ); diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index 5a522785..bca53eeb 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -12,7 +12,7 @@ #include "kdevpcsimporter.h" -#include +#include class SettingsDialog; @@ -20,21 +20,21 @@ class KDevCustomImporter : public KDevPCSImporter { Q_OBJECT public: - KDevCustomImporter(QObject* parent = 0, const char* name = 0, const QStringList &args = QStringList()); + KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~KDevCustomImporter(); - virtual QString dbName() const; - virtual QStringList fileList(); - virtual QStringList includePaths(); - virtual QWidget* createSettingsPage(QWidget* parent, const char* name); + virtual TQString dbName() const; + virtual TQStringList fileList(); + virtual TQStringList includePaths(); + virtual TQWidget* createSettingsPage(TQWidget* parent, const char* name); protected: - QStringList fileList( const QString& path ); - void processDir(const QString path, QStringList &files ); + TQStringList fileList( const TQString& path ); + void processDir(const TQString path, TQStringList &files ); private: - QGuardedPtr m_settings; + TQGuardedPtr m_settings; }; #endif diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index f6df0902..37f2bfef 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -12,7 +12,7 @@ * * ***************************************************************************/ -#include +#include #include #include @@ -27,14 +27,14 @@ // should be included after possible KEditListBox redefinition #include "settingsdialog.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { KURLRequester * req = new KURLRequester( this ); @@ -45,27 +45,27 @@ SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) grid->addMultiCellWidget( elb, 3, 3, 0, grid->numCols() ); - // connect( dbName_edit, SIGNAL( textChanged( const QString& ) ), this, SLOT( validate() ) ); - connect( elb->addButton(), SIGNAL( clicked() ), this, SLOT( validate() ) ); - connect( elb->removeButton(), SIGNAL( clicked() ), this, SLOT( validate() ) ); - connect( elb, SIGNAL( added( const QString& ) ), this, SLOT( validateDirectory( const QString& ) ) ); + // connect( dbName_edit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( validate() ) ); + connect( elb->addButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); + connect( elb->removeButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); + connect( elb, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( validateDirectory( const TQString& ) ) ); } SettingsDialog::~SettingsDialog() {} -QString SettingsDialog::dbName( ) const +TQString SettingsDialog::dbName( ) const { - return QString(); + return TQString(); // return dbName_edit->text(); } -QStringList SettingsDialog::dirs( ) const +TQStringList SettingsDialog::dirs( ) const { return elb->items(); } -QString SettingsDialog::filePattern( ) const +TQString SettingsDialog::filePattern( ) const { return pattern_edit->text(); } @@ -81,19 +81,19 @@ void SettingsDialog::validate() emit enabled( elb->listBox()->count() > 0 ); } -void SettingsDialog::validateDirectory( const QString & dir ) +void SettingsDialog::validateDirectory( const TQString & dir ) { - QDir d( dir, QString::null, QDir::DefaultSort, QDir::Dirs ); + TQDir d( dir, TQString::null, TQDir::DefaultSort, TQDir::Dirs ); if ( !d.exists() ) { elb->lineEdit() ->setText( dir ); - if ( QListBoxItem * item = elb->listBox() ->findItem( dir, Qt::ExactMatch ) ) + if ( TQListBoxItem * item = elb->listBox() ->findItem( dir, Qt::ExactMatch ) ) { elb->listBox() ->removeItem( elb->listBox() ->index( item ) ); } - QString errormsg = QString( "%1 is not a directory" ).arg( dir ); + TQString errormsg = TQString( "%1 is not a directory" ).arg( dir ); KMessageBox::error( 0, errormsg, "Couldn't find directory" ); } emit enabled( elb->listBox()->count() > 0 ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h index 309df8ab..02336f98 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h @@ -21,22 +21,22 @@ class SettingsDialog : public SettingsDialogBase Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); - bool isValidQtDir( const QString& path ) const; + bool isValidQtDir( const TQString& path ) const; - QString qtDir() const; - QString configuration() const; + TQString qtDir() const; + TQString configuration() const; - QString dbName() const; - QStringList dirs() const; + TQString dbName() const; + TQStringList dirs() const; bool recursive() const; - QString filePattern() const; + TQString filePattern() const; private slots: void validate(); - void validateDirectory( const QString & dir ); + void validateDirectory( const TQString & dir ); private: KEditListBox *elb; diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp index 341256b7..a52da5d7 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp @@ -16,26 +16,26 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include K_EXPORT_COMPONENT_FACTORY( libkdevkdelibsimporter, KGenericFactory( "kdevkdelibsimporter" ) ) -KDevKDELibsImporter::KDevKDELibsImporter( QObject * parent, const char * name, const QStringList& ) +KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& ) : KDevPCSImporter( parent, name ) {} KDevKDELibsImporter::~KDevKDELibsImporter() {} -QStringList KDevKDELibsImporter::fileList( const QString& path ) +TQStringList KDevKDELibsImporter::fileList( const TQString& path ) { - QDir dir( path ); - QStringList lst = dir.entryList( "*.h" ); - QStringList fileList; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + TQDir dir( path ); + TQStringList lst = dir.entryList( "*.h" ); + TQStringList fileList; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { fileList.push_back( dir.absPath() + "/" + ( *it ) ); } @@ -43,12 +43,12 @@ QStringList KDevKDELibsImporter::fileList( const QString& path ) } -QStringList KDevKDELibsImporter::fileList() +TQStringList KDevKDELibsImporter::fileList() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QStringList files; + TQStringList files; int scope = m_settings->cbParsingScope->currentItem(); if ( scope == 0 ) { @@ -67,24 +67,24 @@ QStringList KDevKDELibsImporter::fileList() } else if ( scope == 1 ) { - QValueStack s; + TQValueStack s; s.push( m_settings->kdeDir() ); files += fileList( m_settings->kdeDir() ); - QDir dir; + TQDir dir; do { dir.setPath( s.pop() ); kdDebug( 9015 ) << "Examining: " << dir.path() << endl; const QFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; - QPtrListIterator it( *dirEntries ); + TQPtrListIterator it( *dirEntries ); for ( ; it.current(); ++it ) { - QString fileName = it.current() ->fileName(); + TQString fileName = it.current() ->fileName(); if ( fileName == "." || fileName == ".." ) continue; - QString path = it.current() ->absFilePath(); + TQString path = it.current() ->absFilePath(); if ( it.current() ->isDir() ) { kdDebug( 9015 ) << "Pushing: " << path << endl; @@ -99,17 +99,17 @@ QStringList KDevKDELibsImporter::fileList() return files; } -QStringList KDevKDELibsImporter::includePaths() +TQStringList KDevKDELibsImporter::includePaths() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QStringList includePaths; + TQStringList includePaths; includePaths.push_back( m_settings->kdeDir() ); return includePaths; } -QWidget * KDevKDELibsImporter::createSettingsPage( QWidget * parent, const char * name ) +TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h index 9514f287..45cf470a 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h @@ -13,7 +13,7 @@ #define KDEVQTIMPORTER_H #include -#include +#include class SettingsDialog; @@ -21,20 +21,20 @@ class KDevKDELibsImporter : public KDevPCSImporter { Q_OBJECT public: - KDevKDELibsImporter( QObject* parent=0, const char* name=0, const QStringList& args=QStringList() ); + KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevKDELibsImporter(); - virtual QString dbName() const { return QString::fromLatin1("KDElibs"); } - virtual QStringList fileList(); - virtual QStringList includePaths(); + virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); } + virtual TQStringList fileList(); + virtual TQStringList includePaths(); - virtual QWidget* createSettingsPage( QWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: - QStringList fileList( const QString& path ); + TQStringList fileList( const TQString& path ); private: - QGuardedPtr m_settings; + TQGuardedPtr m_settings; }; #endif diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp index 29ef96e9..a0763380 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp @@ -22,30 +22,30 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "settingsdialog.h" -QListBoxItem* QListBox_selectedItem( QListBox* cpQListBox ) +TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox ) { - if ( cpQListBox->selectionMode() != QListBox::Single ) + if ( cpQListBox->selectionMode() != TQListBox::Single ) return 0; if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) return cpQListBox->item( cpQListBox->currentItem() ); return 0; } -SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { KApplication::kApplication()->dirs()->addResourceType("include","include"); - QStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); - for( QStringList::Iterator it=kdedirs.begin(); it!=kdedirs.end(); ++it ) + TQStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); + for( TQStringList::Iterator it=kdedirs.begin(); it!=kdedirs.end(); ++it ) { - QString kdedir = *it; + TQString kdedir = *it; if ( !kdedir.isEmpty() && isValidKDELibsDir( kdedir ) ) if ( !kdeListBox->findItem( kdedir, ExactMatch ) ) kdeListBox->insertItem( kdedir ); @@ -53,23 +53,23 @@ SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) kdeUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, SIGNAL(clicked()), this, SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() {} -void SettingsDialog::slotSelectionChanged( QListBoxItem* ) +void SettingsDialog::slotSelectionChanged( TQListBoxItem* ) { emit enabled( kdeListBox->selectedItem() != 0 ); } -bool SettingsDialog::isValidKDELibsDir( const QString & path ) const +bool SettingsDialog::isValidKDELibsDir( const TQString & path ) const { - return QFile::exists( path + "/kapplication.h" ); + return TQFile::exists( path + "/kapplication.h" ); } -QString SettingsDialog::kdeDir( ) const +TQString SettingsDialog::kdeDir( ) const { return kdeListBox->currentText(); } @@ -81,7 +81,7 @@ void SettingsDialog::addUrlButton_clicked() if ( isValidKDELibsDir( kdeUrl->url() ) ) { kdeListBox->insertItem( kdeUrl->url() ); - if ( QListBoxItem * item = kdeListBox->findItem( kdeUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = kdeListBox->findItem( kdeUrl->url(), ExactMatch ) ) { kdeListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h index ba15019b..4a06dd12 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h @@ -19,17 +19,17 @@ class SettingsDialog : public SettingsDialogBase Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ - bool isValidKDELibsDir( const QString& path ) const; + bool isValidKDELibsDir( const TQString& path ) const; - QString kdeDir() const; + TQString kdeDir() const; public slots: /*$PUBLIC_SLOTS$*/ - virtual void slotSelectionChanged(QListBoxItem*); + virtual void slotSelectionChanged(TQListBoxItem*); protected: /*$PROTECTED_FUNCTIONS$*/ diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index f4fedea0..d4635ba4 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -18,13 +18,13 @@ #include #include -#include -#include -#include +#include +#include +#include K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory( "kdevqt4importer" ) ) -KDevQt4Importer::KDevQt4Importer( QObject * parent, const char * name, const QStringList& ) +KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) : KDevPCSImporter( parent, name ) { m_qtfile = 0; @@ -38,16 +38,16 @@ KDevQt4Importer::~KDevQt4Importer() m_qtfile = 0; } -QStringList KDevQt4Importer::fileList() +TQStringList KDevQt4Importer::fileList() { if( !m_settings ) - return QStringList(); + return TQStringList(); if (m_qtfile) delete m_qtfile; KTempFile ifile; - QTextStream &is = *ifile.textStream(); + TQTextStream &is = *ifile.textStream(); is << "#include \n" << "#undef Q_SLOTS\n#undef Q_SIGNALS\n#undef slots\n#undef signals" @@ -70,13 +70,13 @@ QStringList KDevQt4Importer::fileList() m_qtfile = new KTempFile(); // include paths - QStringList paths = includePaths(); - for (QStringList::Iterator it = paths.begin(); it != paths.end(); ++it) + TQStringList paths = includePaths(); + for (TQStringList::Iterator it = paths.begin(); it != paths.end(); ++it) proc << "-I" << *it; ifile.close(); - QString o; + TQString o; o += "-o"; o += m_qtfile->name(); @@ -86,12 +86,12 @@ QStringList KDevQt4Importer::fileList() return m_qtfile->name(); } -QStringList KDevQt4Importer::includePaths() +TQStringList KDevQt4Importer::includePaths() { if( !m_settings || !m_qtfile) - return QStringList(); + return TQStringList(); - QStringList includePaths; + TQStringList includePaths; includePaths.push_back( m_settings->qtDir() ); includePaths.push_back( m_settings->qtDir() + "/Qt" ); @@ -99,7 +99,7 @@ QStringList KDevQt4Importer::includePaths() return includePaths; } -QWidget * KDevQt4Importer::createSettingsPage( QWidget * parent, const char * name ) +TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h index 821e6fef..c430db19 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -13,7 +13,7 @@ #define KDEVQTIMPORTER_H #include -#include +#include class SettingsDialog; class KTempFile; @@ -22,17 +22,17 @@ class KDevQt4Importer : public KDevPCSImporter { Q_OBJECT public: - KDevQt4Importer( QObject* parent=0, const char* name=0, const QStringList& args=QStringList() ); + KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQt4Importer(); - virtual QString dbName() const { return QString::fromLatin1("Qt4"); } - virtual QStringList fileList(); - virtual QStringList includePaths(); + virtual TQString dbName() const { return TQString::fromLatin1("Qt4"); } + virtual TQStringList fileList(); + virtual TQStringList includePaths(); - virtual QWidget* createSettingsPage( QWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: - QGuardedPtr m_settings; + TQGuardedPtr m_settings; KTempFile *m_qtfile; }; diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp index cc59c6e9..755b14c4 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp @@ -20,34 +20,34 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "settingsdialog.h" -QListBoxItem* QListBox_selectedItem(QListBox* cpQListBox) +TQListBoxItem* QListBox_selectedItem(TQListBox* cpQListBox) { - if ( cpQListBox->selectionMode() != QListBox::Single ) + if ( cpQListBox->selectionMode() != TQListBox::Single ) return 0; if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) return cpQListBox->item(cpQListBox->currentItem()); return 0; } -SettingsDialog::SettingsDialog(QWidget* parent, const char* name, WFlags fl) +SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl) : SettingsDialogBase(parent,name,fl) { - QStringList qtdirs; - qtdirs.push_back( ::getenv("QTDIR") + QString("/include") ); - qtdirs.push_back( QString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" ); - qtdirs.push_back( QString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" ); + TQStringList qtdirs; + qtdirs.push_back( ::getenv("QTDIR") + TQString("/include") ); + qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" ); + qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" ); qtdirs.push_back( "/usr/qt/4/include" ); - for( QStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) + for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) { - QString qtdir = *it; + TQString qtdir = *it; if( !qtdir.isEmpty() && isValidQtDir(qtdir) ) if (!qtListBox->findItem(qtdir, ExactMatch)) qtListBox->insertItem( qtdir ); @@ -55,14 +55,14 @@ SettingsDialog::SettingsDialog(QWidget* parent, const char* name, WFlags fl) qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, SIGNAL(clicked()), this, SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() { } -void SettingsDialog::slotSelectionChanged(QListBoxItem* item) +void SettingsDialog::slotSelectionChanged(TQListBoxItem* item) { if( !qtListBox->selectedItem() ) { @@ -74,17 +74,17 @@ void SettingsDialog::slotSelectionChanged(QListBoxItem* item) emit enabled( true ); } -bool SettingsDialog::isValidQtDir( const QString & path ) const +bool SettingsDialog::isValidQtDir( const TQString & path ) const { - return QFile::exists( path + "/QtCore/QtCore" ); + return TQFile::exists( path + "/QtCore/QtCore" ); } -QString SettingsDialog::qtDir( ) const +TQString SettingsDialog::qtDir( ) const { return qtListBox->currentText(); } -QString SettingsDialog::configuration( ) const +TQString SettingsDialog::configuration( ) const { return ""; } @@ -96,7 +96,7 @@ void SettingsDialog::addUrlButton_clicked( ) if ( isValidQtDir( qtUrl->url() ) ) { qtListBox->insertItem( qtUrl->url() ); - if ( QListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) { qtListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h index 1ec5663e..118564fb 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h @@ -19,18 +19,18 @@ class SettingsDialog : public SettingsDialogBase Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ - bool isValidQtDir( const QString& path ) const; + bool isValidQtDir( const TQString& path ) const; - QString qtDir() const; - QString configuration() const; + TQString qtDir() const; + TQString configuration() const; public slots: /*$PUBLIC_SLOTS$*/ - virtual void slotSelectionChanged(QListBoxItem*); + virtual void slotSelectionChanged(TQListBoxItem*); protected: /*$PROTECTED_FUNCTIONS$*/ diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp index add8574a..62eb38fd 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp @@ -15,27 +15,27 @@ #include -#include -#include +#include +#include K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory( "kdevqtimporter" ) ) -KDevQtImporter::KDevQtImporter( QObject * parent, const char * name, const QStringList& ) +KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) : KDevPCSImporter( parent, name ) {} KDevQtImporter::~KDevQtImporter() {} -QStringList KDevQtImporter::fileList() +TQStringList KDevQtImporter::fileList() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QDir dir( m_settings->qtDir() ); - QStringList lst = dir.entryList( "*.h" ); - QStringList fileList; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + TQDir dir( m_settings->qtDir() ); + TQStringList lst = dir.entryList( "*.h" ); + TQStringList fileList; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( ( *it ).startsWith( "qconfig-" ) ) { @@ -50,12 +50,12 @@ QStringList KDevQtImporter::fileList() return fileList; } -QStringList KDevQtImporter::includePaths() +TQStringList KDevQtImporter::includePaths() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QStringList includePaths; + TQStringList includePaths; includePaths.push_back( m_settings->qtDir() ); includePaths.push_back( m_settings->qtDir() + "/private" ); includePaths.push_back( m_settings->qtDir() + "/default" ); @@ -64,7 +64,7 @@ QStringList KDevQtImporter::includePaths() return includePaths; } -QWidget * KDevQtImporter::createSettingsPage( QWidget * parent, const char * name ) +TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index c53b0a8a..3ae35b96 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -13,7 +13,7 @@ #define KDEVQTIMPORTER_H #include -#include +#include class SettingsDialog; @@ -21,17 +21,17 @@ class KDevQtImporter : public KDevPCSImporter { Q_OBJECT public: - KDevQtImporter( QObject* parent=0, const char* name=0, const QStringList& args=QStringList() ); + KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQtImporter(); - virtual QString dbName() const { return QString::fromLatin1("Qt"); } - virtual QStringList fileList(); - virtual QStringList includePaths(); + virtual TQString dbName() const { return TQString::fromLatin1("Qt"); } + virtual TQStringList fileList(); + virtual TQStringList includePaths(); - virtual QWidget* createSettingsPage( QWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: - QGuardedPtr m_settings; + TQGuardedPtr m_settings; }; #endif diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index b0db10cc..2df475b7 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -20,35 +20,35 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "settingsdialog.h" -QListBoxItem* QListBox_selectedItem( QListBox* cpQListBox ) +TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox ) { - if ( cpQListBox->selectionMode() != QListBox::Single ) + if ( cpQListBox->selectionMode() != TQListBox::Single ) return 0; if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) return cpQListBox->item( cpQListBox->currentItem() ); return 0; } -SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { - QStringList qtdirs; - qtdirs.push_back( ::getenv( "QTDIR" ) + QString("/include") ); + TQStringList qtdirs; + qtdirs.push_back( ::getenv( "QTDIR" ) + TQString("/include") ); qtdirs.push_back( "/usr/lib/qt3/include" ); qtdirs.push_back( "/usr/lib/qt/include" ); qtdirs.push_back( "/usr/share/qt3/include" ); qtdirs.push_back( "/usr/qt/3/include" ); // gentoo style - for ( QStringList::Iterator it = qtdirs.begin(); it != qtdirs.end(); ++it ) + for ( TQStringList::Iterator it = qtdirs.begin(); it != qtdirs.end(); ++it ) { - QString qtdir = *it; + TQString qtdir = *it; if ( !qtdir.isEmpty() && isValidQtDir( qtdir ) ) if ( !qtListBox->findItem( qtdir, ExactMatch ) ) qtListBox->insertItem( qtdir ); @@ -56,13 +56,13 @@ SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, SIGNAL(clicked()), this, SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() {} -void SettingsDialog::slotSelectionChanged( QListBoxItem* ) +void SettingsDialog::slotSelectionChanged( TQListBoxItem* ) { if ( !qtListBox->selectedItem() ) { @@ -70,11 +70,11 @@ void SettingsDialog::slotSelectionChanged( QListBoxItem* ) return ; } - QDir dir( qtDir() ); - QStringList qconfigFileList = dir.entryList( "qconfig-*.h" ); + TQDir dir( qtDir() ); + TQStringList qconfigFileList = dir.entryList( "qconfig-*.h" ); qtConfiguration->clear(); - QRegExp rx( "qconfig-(\\w+)\\.h" ); - for ( QStringList::Iterator it = qconfigFileList.begin(); it != qconfigFileList.end(); ++it ) + TQRegExp rx( "qconfig-(\\w+)\\.h" ); + for ( TQStringList::Iterator it = qconfigFileList.begin(); it != qconfigFileList.end(); ++it ) { ( void ) rx.exactMatch( *it ); qtConfiguration->insertItem( rx.cap( 1 ) ); @@ -83,17 +83,17 @@ void SettingsDialog::slotSelectionChanged( QListBoxItem* ) emit enabled( true ); } -bool SettingsDialog::isValidQtDir( const QString & path ) const +bool SettingsDialog::isValidQtDir( const TQString & path ) const { - return QFile::exists( path + "/qt.h" ); + return TQFile::exists( path + "/tqt.h" ); } -QString SettingsDialog::qtDir( ) const +TQString SettingsDialog::qtDir( ) const { return qtListBox->currentText(); } -QString SettingsDialog::configuration( ) const +TQString SettingsDialog::configuration( ) const { return qtConfiguration->currentText(); } @@ -104,7 +104,7 @@ void SettingsDialog::addUrlButton_clicked( ) if ( isValidQtDir( qtUrl->url() ) ) { qtListBox->insertItem( qtUrl->url() ); - if ( QListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) { qtListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h index 1ec5663e..118564fb 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h @@ -19,18 +19,18 @@ class SettingsDialog : public SettingsDialogBase Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ - bool isValidQtDir( const QString& path ) const; + bool isValidQtDir( const TQString& path ) const; - QString qtDir() const; - QString configuration() const; + TQString qtDir() const; + TQString configuration() const; public slots: /*$PUBLIC_SLOTS$*/ - virtual void slotSelectionChanged(QListBoxItem*); + virtual void slotSelectionChanged(TQListBoxItem*); protected: /*$PROTECTED_FUNCTIONS$*/ diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 55ca30a8..c7a8e9b6 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -44,30 +44,30 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include class ProblemItem: public KListViewItem { public: - ProblemItem( QListView* parent, const QString& problem, - const QString& file, const QString& line, const QString& column ) + ProblemItem( TQListView* parent, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, problem, file, line, column ) {} - ProblemItem( QListViewItem* parent, const QString& problem, - const QString& file, const QString& line, const QString& column ) + ProblemItem( TQListViewItem* parent, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, problem, file, line, column ) {} - int compare( QListViewItem* item, int column, bool ascending ) const + int compare( TQListViewItem* item, int column, bool ascending ) const { if ( column == 1 || column == 2 ) { @@ -82,22 +82,22 @@ public: }; -ProblemReporter::ProblemReporter( CppSupportPart* part, QWidget* parent, const char* name ) -: QWidget( parent, name ? name : "problemreporter" ), +ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* parent, const char* name ) +: TQWidget( parent, name ? name : "problemreporter" ), m_cppSupport( part ), // m_document( 0 ), m_markIface( 0 ) { - QWhatsThis::add(this, i18n("Problem reporter

    This window shows various \"problems\" in your project. " + TQWhatsThis::add(this, i18n("Problem reporter

    This window shows various \"problems\" in your project. " "It displays TODO entries, FIXME's and errors reported by a language parser. " "To add a TODO or FIXME entry, just type
    " "//@todo my todo
    " "//TODO: my todo
    " "//FIXME fix this")); - m_initCurrentTimer = new QTimer( this ); - connect( m_initCurrentTimer, SIGNAL(timeout()), this, SLOT(initCurrentList()) ); - m_gridLayout = new QGridLayout(this,2,3); + m_initCurrentTimer = new TQTimer( this ); + connect( m_initCurrentTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initCurrentList()) ); + m_gridLayout = new TQGridLayout(this,2,3); m_errorList = new KListView(this); m_warningList = new KListView(this); @@ -118,7 +118,7 @@ m_markIface( 0 ) InitListView(m_currentList); m_currentList->removeColumn(1); - m_widgetStack = new QWidgetStack(this); + m_widgetStack = new TQWidgetStack(this); m_widgetStack->addWidget(m_currentList,0); m_widgetStack->addWidget(m_errorList,1); m_widgetStack->addWidget(m_warningList,2); @@ -126,38 +126,38 @@ m_markIface( 0 ) m_widgetStack->addWidget(m_todoList,4); m_widgetStack->addWidget(m_filteredList,5); - m_tabBar = new QTabBar(this); - m_tabBar->insertTab(new QTab(i18n("Current")),0); - m_tabBar->insertTab(new QTab(i18n("Errors")),1); - m_tabBar->insertTab(new QTab(i18n("Warnings")),2); - m_tabBar->insertTab(new QTab(i18n("Fixme")),3); - m_tabBar->insertTab(new QTab(i18n("Todo")),4); - m_tabBar->insertTab(new QTab(i18n("Filtered")),5); + m_tabBar = new TQTabBar(this); + m_tabBar->insertTab(new TQTab(i18n("Current")),0); + m_tabBar->insertTab(new TQTab(i18n("Errors")),1); + m_tabBar->insertTab(new TQTab(i18n("Warnings")),2); + m_tabBar->insertTab(new TQTab(i18n("Fixme")),3); + m_tabBar->insertTab(new TQTab(i18n("Todo")),4); + m_tabBar->insertTab(new TQTab(i18n("Filtered")),5); m_tabBar->setTabEnabled(0,false); m_tabBar->setTabEnabled(5,false); m_filterEdit = new KLineEdit(this); - QLabel* m_filterLabel = new QLabel(i18n("Lookup:"),this); + TQLabel* m_filterLabel = new TQLabel(i18n("Lookup:"),this); m_gridLayout->addWidget(m_tabBar,0,0); m_gridLayout->addMultiCellWidget(m_widgetStack,1,1,0,2); m_gridLayout->addWidget(m_filterLabel,0,1,Qt::AlignRight); m_gridLayout->addWidget(m_filterEdit,0,2,Qt::AlignLeft); - connect( m_filterEdit, SIGNAL(returnPressed()), - this, SLOT(slotFilter()) ); - connect( m_filterEdit, SIGNAL(textChanged( const QString & )), - this, SLOT(slotFilter()) ); - connect( m_tabBar, SIGNAL(selected(int)), - this, SLOT(slotTabSelected(int)) ); - connect( part->partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partAdded(KParts::Part*)), - this, SLOT(slotPartAdded(KParts::Part*)) ); + connect( m_filterEdit, TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(slotFilter()) ); + connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), + this, TQT_SLOT(slotFilter()) ); + connect( m_tabBar, TQT_SIGNAL(selected(int)), + this, TQT_SLOT(slotTabSelected(int)) ); + connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), + this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); // any editors that were open when we loaded the project needs to have their markType07 icon set too.. - QPtrListIterator it( *m_cppSupport->partController()->parts() ); + TQPtrListIterator it( *m_cppSupport->partController()->parts() ); while( it.current() ) { if ( KTextEditor::MarkInterfaceExtension* iface = dynamic_cast( it.current() ) ) @@ -193,9 +193,9 @@ void ProblemReporter::slotFilter() } -void ProblemReporter::filterList(KListView* listview, const QString& level) +void ProblemReporter::filterList(KListView* listview, const TQString& level) { - QListViewItemIterator it( listview ); + TQListViewItemIterator it( listview ); while ( it.current() ) { if ( it.current()->text(3).contains(m_filterEdit->text(),false)) @@ -221,11 +221,11 @@ void ProblemReporter::InitListView(KListView* listview) listview->addColumn( i18n("Problem") ); listview->setAllColumnsShowFocus( TRUE ); - connect( listview, SIGNAL(executed(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem*)) ); + connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, SIGNAL(returnPressed(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem* )) ); + connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem* )) ); } @@ -255,15 +255,15 @@ void EfficientKListView::limitSize( int size ) { if( m_map.size() <= size + 50 ) return; - QMap backMap; + TQMap backMap; for( InsertionMap::const_iterator it = m_insertionNumbers.begin(); it != m_insertionNumbers.end(); ++it ) backMap[ (*it).second ] = (*it).first; - for( QMap::const_iterator it = backMap.begin(); it != backMap.end() && m_map.size() > size; ++it ) + for( TQMap::const_iterator it = backMap.begin(); it != backMap.end() && m_map.size() > size; ++it ) removeAllItems( (*it).str() ); } -void EfficientKListView::removeAllItems( const QString& str ) +void EfficientKListView::removeAllItems( const TQString& str ) { HashedString h(str); m_insertionNumbers.erase( h ) ; @@ -277,9 +277,9 @@ void EfficientKListView::removeAllItems( const QString& str ) m_map.erase( p.first, p.second ); } -void ProblemReporter::removeAllProblems( const QString& filename ) +void ProblemReporter::removeAllProblems( const TQString& filename ) { - QString relFileName = m_cppSupport->project()->relativeProjectFile(filename); + TQString relFileName = m_cppSupport->project()->relativeProjectFile(filename); kdDebug(9007) << "ProblemReporter::removeAllProblems()" << relFileName << endl; @@ -295,8 +295,8 @@ void ProblemReporter::removeAllProblems( const QString& filename ) if( m_markIface ) { - QPtrList marks = m_markIface->marks(); - QPtrListIterator it( marks ); + TQPtrList marks = m_markIface->marks(); + TQPtrListIterator it( marks ); while( it.current() ) { m_markIface->removeMark( it.current()->line, KTextEditor::MarkInterface::markType07 ); @@ -310,7 +310,7 @@ void ProblemReporter::initCurrentList() { m_tabBar->setTabEnabled(0,true); - QString relFileName = m_cppSupport->project()->relativeProjectFile(m_fileName); + TQString relFileName = m_cppSupport->project()->relativeProjectFile(m_fileName); m_currentList->clear(); @@ -322,14 +322,14 @@ void ProblemReporter::initCurrentList() // m_tabBar->setCurrentTab(0); } -void ProblemReporter::updateCurrentWith(EfficientKListView& listview, const QString& level, const QString& filename) +void ProblemReporter::updateCurrentWith(EfficientKListView& listview, const TQString& level, const TQString& filename) { EfficientKListView::Range r = listview.getRange( filename ); for( ; r.first != r.second; ++r.first ) new ProblemItem(m_currentList,level,(*r.first).second->text(1),(*r.first).second->text(2),(*r.first).second->text(3)); } -void ProblemReporter::slotSelected( QListViewItem* item ) +void ProblemReporter::slotSelected( TQListViewItem* item ) { bool is_filtered = false; bool is_current = false; @@ -345,20 +345,20 @@ void ProblemReporter::slotSelected( QListViewItem* item ) m_cppSupport->partController()->editDocument( url, line-1 ); } -bool ProblemReporter::hasErrors( const QString& fileName ) { +bool ProblemReporter::hasErrors( const TQString& fileName ) { return m_errorList.hasItem( fileName ); } -void ProblemReporter::reportProblem( const QString& fileName, const Problem& p ) +void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p ) { int markType = levelToMarkType( p.level() ); if( markType != -1 && m_markIface && m_fileName == fileName ) m_markIface->addMark( p.line(), markType ); - QString msg = p.text(); - msg = msg.replace( QRegExp("\n"), "" ); + TQString msg = p.text(); + msg = msg.replace( TQRegExp("\n"), "" ); - QString relFileName = m_cppSupport->project()->relativeProjectFile(fileName); + TQString relFileName = m_cppSupport->project()->relativeProjectFile(fileName); EfficientKListView* list; @@ -384,8 +384,8 @@ void ProblemReporter::reportProblem( const QString& fileName, const Problem& p ) { list->addItem( relFileName, new ProblemItem( *list, relFileName, - QString::number( p.line() + 1 ), - QString::number( p.column() + 1 ), + TQString::number( p.line() + 1 ), + TQString::number( p.column() + 1 ), msg ) ); } @@ -403,20 +403,20 @@ void ProblemReporter::slotPartAdded( KParts::Part* part ) iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("stop") ); } -QString ProblemReporter::levelToString( int level ) const +TQString ProblemReporter::levelToString( int level ) const { switch( level ) { case Problem::Level_Error: - return QString( i18n("Error") ); + return TQString( i18n("Error") ); case Problem::Level_Warning: - return QString( i18n("Warning") ); + return TQString( i18n("Warning") ); case Problem::Level_Todo: - return QString( i18n("Todo") ); + return TQString( i18n("Todo") ); case Problem::Level_Fixme: - return QString( i18n("Fixme") ); + return TQString( i18n("Fixme") ); default: - return QString::null; + return TQString::null; } } diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h index d63c2cda..2d5741f4 100644 --- a/languages/cpp/problemreporter.h +++ b/languages/cpp/problemreporter.h @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include #include "hashedstring.h" @@ -38,7 +38,7 @@ class KURL; class EfficientKListView { public: - typedef __gnu_cxx::hash_multimap Map; + typedef __gnu_cxx::hash_multimap Map; typedef std::pair< Map::const_iterator, Map::const_iterator > Range; EfficientKListView( KListView* list = 0 ) : m_list( list ), m_insertionNumber( 0 ) { } @@ -64,22 +64,22 @@ public: return m_list; } - void addItem( const QString& str, QListViewItem* item ) { + void addItem( const TQString& str, TQListViewItem* item ) { HashedString h( str ); m_insertionNumbers[h] = ++m_insertionNumber; m_map.insert( std::make_pair( h, item ) ); } - Range getRange( const QString& str ) const { + Range getRange( const TQString& str ) const { return m_map.equal_range( HashedString(str) ); } ///If the list has more then size items, the first items are removed until the size fits. void limitSize( int size ); - void removeAllItems( const QString& str ); + void removeAllItems( const TQString& str ); - bool hasItem( const QString& str ) const { + bool hasItem( const TQString& str ) const { Map::const_iterator it = m_map.find( HashedString(str) ); return it != m_map.end(); } @@ -106,36 +106,36 @@ class ProblemReporter: public QWidget { Q_OBJECT public: - ProblemReporter( CppSupportPart* part, QWidget* parent = 0, const char* name = 0 ); + ProblemReporter( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); virtual ~ProblemReporter(); - void removeAllProblems( const QString& filename ); - void reportProblem( const QString& fileName, const Problem& p ); - bool hasErrors(const QString& file); + void removeAllProblems( const TQString& filename ); + void reportProblem( const TQString& fileName, const Problem& p ); + bool hasErrors(const TQString& file); public slots: private slots: void slotPartAdded( KParts::Part* ); void slotActivePartChanged( KParts::Part* ); - void slotSelected( QListViewItem* ); + void slotSelected( TQListViewItem* ); void slotTabSelected( int tabindex ); void slotFilter(); void initCurrentList(); private: - QString levelToString( int level ) const; + TQString levelToString( int level ) const; int levelToMarkType( int level ) const; void InitListView( KListView* listview ); - void filterList( KListView* listview, const QString& level ); - void updateCurrentWith( EfficientKListView& listview, const QString& level, const QString& filename ); + void filterList( KListView* listview, const TQString& level ); + void updateCurrentWith( EfficientKListView& listview, const TQString& level, const TQString& filename ); private: - QGridLayout* m_gridLayout; - QTabBar* m_tabBar; - QWidgetStack* m_widgetStack; + TQGridLayout* m_gridLayout; + TQTabBar* m_tabBar; + TQWidgetStack* m_widgetStack; KListView* m_currentList; - QTimer* m_initCurrentTimer; + TQTimer* m_initCurrentTimer; EfficientKListView m_errorList; EfficientKListView m_fixmeList; EfficientKListView m_todoList; @@ -145,7 +145,7 @@ private: CppSupportPart* m_cppSupport; KTextEditor::MarkInterface* m_markIface; - QString m_fileName; + TQString m_fileName; ///@todo move these to cppsupportpart int m_active; diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp index f2972fdd..46fa7897 100644 --- a/languages/cpp/qtbuildconfig.cpp +++ b/languages/cpp/qtbuildconfig.cpp @@ -21,14 +21,14 @@ #include #include -#include +#include #include -const QString QtBuildConfig::m_configRoot = QString( "/kdevcppsupport/qt" ); +const TQString QtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" ); -QtBuildConfig::QtBuildConfig( CppSupportPart * part, QDomDocument* dom ) - : QObject( part ), m_part( part ), m_dom( dom ) +QtBuildConfig::QtBuildConfig( CppSupportPart * part, TQDomDocument* dom ) + : TQObject( part ), m_part( part ), m_dom( dom ) { init(); } @@ -61,13 +61,13 @@ void QtBuildConfig::init( ) } if( m_qmakePath.isEmpty() || !isExecutable( m_qmakePath ) ) { - m_qmakePath = findExecutable( "qmake-qt"+ QString::number( m_version ) ); + m_qmakePath = findExecutable( "qmake-qt"+ TQString::number( m_version ) ); if( m_qmakePath.isEmpty() || !isExecutable( m_qmakePath ) ) m_qmakePath = findExecutable( "qmake" ); } if( m_designerPath.isEmpty() || !isExecutable( m_designerPath ) ) { - m_designerPath = findExecutable( "designer-qt"+QString::number( m_version ) ); + m_designerPath = findExecutable( "designer-qt"+TQString::number( m_version ) ); if( m_designerPath.isEmpty() || !isExecutable( m_designerPath ) ) m_designerPath = findExecutable( "designer" ); } @@ -83,45 +83,45 @@ void QtBuildConfig::init( ) } } -bool QtBuildConfig::isValidQtDir( const QString& path ) const +bool QtBuildConfig::isValidQtDir( const TQString& path ) const { - QFileInfo inc( path + QString( QChar( QDir::separator() ) )+ - "include"+QString( QChar( QDir::separator() ) )+ - "qt.h" ); + TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+ + "include"+TQString( TQChar( TQDir::separator() ) )+ + "tqt.h" ); return ( m_version == 4 || ( m_version != 4 && inc.exists() ) ); } -void QtBuildConfig::buildBinDirs( QStringList & dirs ) const +void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const { if( m_version == 3 ) { if( !m_root.isEmpty() ) - dirs << (m_root + QString( QChar( QDir::separator() ) ) + "bin"); - dirs << (::getenv("QTDIR") + QString( QChar( QDir::separator() ) ) + "bin"); + dirs << (m_root + TQString( TQChar( TQDir::separator() ) ) + "bin"); + dirs << (::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin"); } - QStringList paths = QStringList::split(":",::getenv("PATH")); + TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; - QString binpath = QDir::rootDirPath() + "bin"; + TQString binpath = TQDir::rootDirPath() + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; - binpath = QDir::rootDirPath() + "usr" + QString( QChar( QDir::separator() ) ) + "bin"; + binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; - binpath = QDir::rootDirPath() + "usr" + QString( QChar( QDir::separator() ) ) + "local" + QString( QChar( QDir::separator() ) ) + "bin"; + binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin"; if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; } -QString QtBuildConfig::findExecutable( const QString& execname ) const +TQString QtBuildConfig::findExecutable( const TQString& execname ) const { - QStringList dirs; + TQStringList dirs; buildBinDirs( dirs ); - for( QStringList::Iterator it=dirs.begin(); it!=dirs.end(); ++it ) + for( TQStringList::Iterator it=dirs.begin(); it!=dirs.end(); ++it ) { - QString designer = *it + QString( QChar( QDir::separator() ) ) + execname; + TQString designer = *it + TQString( TQChar( TQDir::separator() ) ) + execname; if( !designer.isEmpty() && isExecutable( designer ) ) { return designer; @@ -130,26 +130,26 @@ QString QtBuildConfig::findExecutable( const QString& execname ) const return ""; } -bool QtBuildConfig::isExecutable( const QString& path ) const +bool QtBuildConfig::isExecutable( const TQString& path ) const { - QFileInfo fi(path); + TQFileInfo fi(path); return( fi.exists() && fi.isExecutable() ); } void QtBuildConfig::findQtDir() { - QStringList qtdirs; + TQStringList qtdirs; if( m_version == 3 ) qtdirs.push_back( ::getenv("QTDIR") ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt"+QString("%1").arg( m_version ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt"+QString( QChar( QDir::separator() ) )+QString("%1").arg( m_version ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"share"+QString( QChar( QDir::separator() ) )+"qt"+QString("%1").arg( m_version ) ); - qtdirs.push_back( QDir::rootDirPath()+"usr" ); - qtdirs.push_back( QDir::rootDirPath()+"usr"+QString( QChar( QDir::separator() ) )+"lib"+QString( QChar( QDir::separator() ) )+"qt" ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr" ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" ); - for( QStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) + for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) { - QString qtdir = *it; + TQString qtdir = *it; if( !qtdir.isEmpty() && isValidQtDir(qtdir) ) { m_root = qtdir; @@ -187,27 +187,27 @@ void QtBuildConfig::setIncludeStyle( int style ) m_includeStyle = style; } -void QtBuildConfig::setRoot( const QString& root ) +void QtBuildConfig::setRoot( const TQString& root ) { m_root = root; } -void QtBuildConfig::setQMakePath( const QString& path ) +void QtBuildConfig::setQMakePath( const TQString& path ) { m_qmakePath = path; } -void QtBuildConfig::setDesignerPluginPaths( const QStringList& pfx ) +void QtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx ) { m_designerPluginPaths = pfx; } -void QtBuildConfig::setDesignerPath( const QString& path ) +void QtBuildConfig::setDesignerPath( const TQString& path ) { m_designerPath = path; } -void QtBuildConfig::setDesignerIntegration( const QString& designerIntegration ) +void QtBuildConfig::setDesignerIntegration( const TQString& designerIntegration ) { m_designerIntegration = designerIntegration; } diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h index 6042281d..d9790111 100644 --- a/languages/cpp/qtbuildconfig.h +++ b/languages/cpp/qtbuildconfig.h @@ -18,8 +18,8 @@ #ifndef QTBUILDCONFIG_H #define QTBUILDCONFIG_H -#include -#include +#include +#include class CppSupportPart; class QDomDocument; @@ -34,26 +34,26 @@ class QtBuildConfig : public QObject Q_OBJECT public: - QtBuildConfig( CppSupportPart* part, QDomDocument* dom ); + QtBuildConfig( CppSupportPart* part, TQDomDocument* dom ); virtual ~QtBuildConfig(); inline bool isUsed() const { return m_used; } inline int version() const { return m_version; } inline int includeStyle() const { return m_includeStyle; } - inline const QString& root() const { return m_root; } - inline const QString& qmakePath() const { return m_qmakePath; } - inline const QString& designerPath() const { return m_designerPath; } - inline const QStringList& designerPluginPaths() const { return m_designerPluginPaths; } - inline const QString& designerIntegration() const { return m_designerIntegration; } + inline const TQString& root() const { return m_root; } + inline const TQString& qmakePath() const { return m_qmakePath; } + inline const TQString& designerPath() const { return m_designerPath; } + inline const TQStringList& designerPluginPaths() const { return m_designerPluginPaths; } + inline const TQString& designerIntegration() const { return m_designerIntegration; } void setUsed( bool used ); void setVersion( int version ); void setIncludeStyle( int style ); - void setRoot( const QString& root ); - void setDesignerPath( const QString& path ); - void setDesignerPluginPaths( const QStringList& pfx ); - void setQMakePath( const QString& path ); - void setDesignerIntegration( const QString& designerIntegration ); + void setRoot( const TQString& root ); + void setDesignerPath( const TQString& path ); + void setDesignerPluginPaths( const TQStringList& pfx ); + void setQMakePath( const TQString& path ); + void setDesignerIntegration( const TQString& designerIntegration ); void init(); public slots: @@ -64,25 +64,25 @@ signals: private: - bool isValidQtDir( const QString& ) const; + bool isValidQtDir( const TQString& ) const; void findQtDir(); - QString findExecutable( const QString& ) const; - void buildBinDirs( QStringList& ) const; - bool isExecutable( const QString& ) const; + TQString findExecutable( const TQString& ) const; + void buildBinDirs( TQStringList& ) const; + bool isExecutable( const TQString& ) const; CppSupportPart* m_part; ///< The cpp support part - QDomDocument* m_dom; ///< The project configuration + TQDomDocument* m_dom; ///< The project configuration bool m_used; ///< Flag if qt is used in this project. int m_version; ///< The major version of the qt library (3 or 4) int m_includeStyle; ///< The type of include style used (qt 3 or 4) - QString m_root; ///< The root directory of the used qt installation for Qt3 - QString m_designerPath; ///< The path including the binary name of Qt Designer - QString m_qmakePath; ///< The path including the binary name of QMake - QStringList m_designerPluginPaths; ///< The Prefix for Designer - QString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer + TQString m_root; ///< The root directory of the used qt installation for Qt3 + TQString m_designerPath; ///< The path including the binary name of Qt Designer + TQString m_qmakePath; ///< The path including the binary name of QMake + TQStringList m_designerPluginPaths; ///< The Prefix for Designer + TQString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer - static const QString m_configRoot; ///< The root path of the configuration + static const TQString m_configRoot; ///< The root path of the configuration }; #endif diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index 420cf38e..9314aceb 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -20,8 +20,8 @@ ***************************************************************************/ #include "qtdesignercppintegration.h" -#include -#include +#include +#include #include #include @@ -52,7 +52,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function if ( !editIface ) { /// @todo show messagebox - // QDialog::accept(); + // TQDialog::accept(); return ; } @@ -60,14 +60,14 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function klass->getEndPosition( &line, &column ); // compute the insertion point map - QMap > points; + TQMap > points; const FunctionList functionList = klass->functionList(); for ( FunctionList::ConstIterator it = functionList.begin(); it != functionList.end(); ++it ) { int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); - QString access = accessID( *it ); + TQString access = accessID( *it ); QPair funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) @@ -78,9 +78,9 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function int insertedLine = 0; - QString access = function.access + ( function.type == KInterfaceDesigner::ftQtSlot ? " slots" : "" ); + TQString access = function.access + ( function.type == KInterfaceDesigner::ftQtSlot ? " slots" : "" ); - QString str = function.returnType + " " + function.function; + TQString str = function.returnType + " " + function.function; if ( function.specifier == "virtual" ) str = "virtual " + str; else if ( function.specifier == "pure virtual" ) @@ -103,7 +103,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.contains( QChar( '\n' ) ); + insertedLine += str.contains( TQChar( '\n' ) ); CppSupportPart *cppPart = dynamic_cast( m_part ); cppPart->backgroundParser() ->addFile( klass->fileName() ); @@ -113,18 +113,18 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function //implementation - QString stri = function.returnType + " " + klass->name() + "::" + function.function; + TQString stri = function.returnType + " " + klass->name() + "::" + function.function; if ( function.specifier == "static" ) stri = "static " + stri; stri += "\n{\n}\n"; stri = "\n" + stri; - QFileInfo fi( klass->fileName() ); - QString implementationFile = fi.absFilePath(); + TQFileInfo fi( klass->fileName() ); + TQString implementationFile = fi.absFilePath(); implementationFile.replace( ".h", ".cpp" ); - QFileInfo fileInfo( implementationFile ); - if ( !QFile::exists( fileInfo.absFilePath() ) ) + TQFileInfo fileInfo( implementationFile ); + if ( !TQFile::exists( fileInfo.absFilePath() ) ) { if ( KDevCreateFile * createFileSupp = m_part->extension( "KDevelop/CreateFile" ) ) createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.fileName() ); @@ -158,7 +158,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function } else { - if ( editIface->textLine( line ).contains( QRegExp( ".*#include .*\\.moc.*" ) ) ) + if ( editIface->textLine( line ).contains( TQRegExp( ".*#include .*\\.moc.*" ) ) ) atLine = line; break; } @@ -167,7 +167,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function atColumn = 0; } - // editIface->insertLine( atLine + 1, QString::fromLatin1("") ); + // editIface->insertLine( atLine + 1, TQString::fromLatin1("") ); kdDebug() << "at line in intg: " << atLine << " atCol: " << atColumn << endl; kdDebug() << "text: " << stri << endl; editIface->insertText( atLine, atColumn, stri ); @@ -182,33 +182,33 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function cppPart->backgroundParser() ->addFile( implementationFile ); } -QString QtDesignerCppIntegration::accessID( FunctionDom fun ) const +TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const { if ( fun->isSignal() ) - return QString::fromLatin1( "signals" ); + return TQString::fromLatin1( "signals" ); switch ( fun->access() ) { case CodeModelItem::Public: if ( fun->isSlot() ) - return QString::fromLatin1( "public slots" ); - return QString::fromLatin1( "public" ); + return TQString::fromLatin1( "public slots" ); + return TQString::fromLatin1( "public" ); case CodeModelItem::Protected: if ( fun->isSlot() ) - return QString::fromLatin1( "protected slots" ); - return QString::fromLatin1( "protected" ); + return TQString::fromLatin1( "protected slots" ); + return TQString::fromLatin1( "protected" ); case CodeModelItem::Private: if ( fun->isSlot() ) - return QString::fromLatin1( "private slots" ); - return QString::fromLatin1( "private" ); + return TQString::fromLatin1( "private slots" ); + return TQString::fromLatin1( "private" ); } - return QString::null; + return TQString::null; } -void QtDesignerCppIntegration::processImplementationName( QString &name ) +void QtDesignerCppIntegration::processImplementationName( TQString &name ) { name.replace( ".h", ".cpp" ); } diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h index 93a250a1..6721c9df 100644 --- a/languages/cpp/qtdesignercppintegration.h +++ b/languages/cpp/qtdesignercppintegration.h @@ -30,9 +30,9 @@ public: protected: virtual void addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass ); - QString accessID( FunctionDom fun ) const; + TQString accessID( FunctionDom fun ) const; - virtual void processImplementationName( QString &name ); + virtual void processImplementationName( TQString &name ); }; #endif diff --git a/languages/cpp/setuphelper.cpp b/languages/cpp/setuphelper.cpp index deab6135..63b4fd94 100644 --- a/languages/cpp/setuphelper.cpp +++ b/languages/cpp/setuphelper.cpp @@ -16,39 +16,39 @@ #include #include "ktempfile.h" /* defines [function] KTempDir */ #include "kstandarddirs.h" /* defines [function] locateLocal */ -#include "qdir.h" /* defines QDir */ +#include "tqdir.h" /* defines TQDir */ #include namespace SetupHelper { -QString getGccIncludePath(bool *ok) +TQString getGccIncludePath(bool *ok) { *ok = true; - QString processStdout; + TQString processStdout; BlockingKProcess proc; proc << "gcc" ; proc << "-print-file-name=include" ; if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; - return QString(); + return TQString(); } processStdout = proc.stdOut(); return processStdout; } -QString getVerboseGccIncludePath(bool *ok) +TQString getVerboseGccIncludePath(bool *ok) { *ok = false; ///Create temp file KTempFile tempFile(locateLocal("tmp", "kdevelop_temp"), ".cpp"); tempFile.setAutoDelete(true); if( tempFile.status() != 0 ) - return QString();//Failed to create temp file + return TQString();//Failed to create temp file - QString path = tempFile.name(); - QFileInfo pathInfo( path ); + TQString path = tempFile.name(); + TQFileInfo pathInfo( path ); char fileText[] = "//This source-file is empty"; fwrite(fileText, strlen(fileText), 1, tempFile.fstream() ); @@ -61,16 +61,16 @@ QString getVerboseGccIncludePath(bool *ok) if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; - return QString(); + return TQString(); } *ok = true; return proc.stdOut(); } -QStringList getGccMacros(bool *ok) +TQStringList getGccMacros(bool *ok) { *ok = true; - QString processStdout; + TQString processStdout; BlockingKProcess proc; proc << "gcc"; proc << "-E"; @@ -80,11 +80,11 @@ QStringList getGccMacros(bool *ok) if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; - return QStringList(); + return TQStringList(); } proc.closeStdin(); processStdout = proc.stdOut(); - QStringList lines = QStringList::split('\n', processStdout); + TQStringList lines = TQStringList::split('\n', processStdout); return lines; } diff --git a/languages/cpp/setuphelper.h b/languages/cpp/setuphelper.h index 380994b4..aa95296a 100644 --- a/languages/cpp/setuphelper.h +++ b/languages/cpp/setuphelper.h @@ -13,7 +13,7 @@ #ifndef SETUPHELPER_H #define SETUPHELPER_H -#include +#include /** A helper methods for setting up the various Driver derivates. @@ -24,19 +24,19 @@ namespace SetupHelper { /** Get the include paths returned by gcc. * @param ok false if there was a problem running gcc */ - QString getGccIncludePath(bool *ok); + TQString getGccIncludePath(bool *ok); /** Get the include-path return by gcc -v * this path includes the path from the environment, * the c++-include-path, etc., and of couse it also includes the above path. * @param ok false if there was a problem running gcc * */ - QString getVerboseGccIncludePath(bool* ok); + TQString getVerboseGccIncludePath(bool* ok); /** Get the predefined macros returned by gcc * @param ok false if there was a problem running gcc */ - QStringList getGccMacros(bool *ok); + TQStringList getGccMacros(bool *ok); }; #endif diff --git a/languages/cpp/simplecontext.cpp b/languages/cpp/simplecontext.cpp index 08af929d..225bfc84 100644 --- a/languages/cpp/simplecontext.cpp +++ b/languages/cpp/simplecontext.cpp @@ -34,7 +34,7 @@ SimpleType getGlobal( SimpleType t ) { } void SimpleContext::offset( int lineOffset, int colOffset ) { - for( QValueList::iterator it = m_vars.begin(); it != m_vars.end(); ++it ) { + for( TQValueList::iterator it = m_vars.begin(); it != m_vars.end(); ++it ) { if( (*it).endLine != (*it).startLine || (*it).endCol != (*it).startCol) { if( (*it).startLine == 0 ) { (*it).startCol += colOffset; @@ -48,12 +48,12 @@ void SimpleContext::offset( int lineOffset, int colOffset ) { } } -SimpleVariable SimpleContext::findVariable( const QString& varname ) +SimpleVariable SimpleContext::findVariable( const TQString& varname ) { SimpleContext * ctx = this; while ( ctx ) { - const QValueList& vars = ctx->vars(); + const TQValueList& vars = ctx->vars(); for ( int i = vars.count() - 1; i >= 0; --i ) { SimpleVariable v = vars[ i ]; diff --git a/languages/cpp/simplecontext.h b/languages/cpp/simplecontext.h index 310d4f4d..d1fde70a 100644 --- a/languages/cpp/simplecontext.h +++ b/languages/cpp/simplecontext.h @@ -22,8 +22,8 @@ #ifndef SIMPLECONTEXT_H #define SIMPLECONTEXT_H -#include -#include +#include +#include #include "declarationinfo.h" #include "typedesc.h" @@ -65,14 +65,14 @@ public: return *this; } - QString name; - QString comment; + TQString name; + TQString comment; int startLine, startCol; int endLine, endCol; TypeDesc type; - QStringList ptrList; + TQStringList ptrList; - DeclarationInfo toDeclarationInfo( QString activeFileName ) { + DeclarationInfo toDeclarationInfo( TQString activeFileName ) { DeclarationInfo decl; decl.name = name; decl.file = activeFileName; @@ -118,7 +118,7 @@ class SimpleContext m_prev = 0; } - const QValueList& vars() const + const TQValueList& vars() const { return m_vars; } @@ -128,24 +128,24 @@ class SimpleContext m_vars.append( v ); } - void add( const QValueList& vars ) + void add( const TQValueList& vars ) { m_vars += vars; } //First the new name, aka "" for real imports, second the name to be imported - void addImport( const QPair& import ) { + void addImport( const QPair& import ) { m_imports << import; } //Key the new name, aka "" for real imports, second the name to be imported - QValueList > imports() { + TQValueList > imports() { return m_imports; } void offset( int lineOffset, int colOffset ); - SimpleVariable findVariable( const QString& varname ); + SimpleVariable findVariable( const TQString& varname ); SimpleType global() { return getGlobal( container() ); @@ -161,8 +161,8 @@ class SimpleContext } private: - QValueList m_vars; - QValueList > m_imports; + TQValueList m_vars; + TQValueList > m_imports; SimpleContext* m_prev; SimpleType m_container; }; diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index e4334ae5..5111a2a0 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -17,7 +17,7 @@ #include "simpletypefunction.h" #include -QMap BuiltinTypes::m_types; +TQMap BuiltinTypes::m_types; BuiltinTypes builtin; //Needed so BuiltinTypes::BuiltinTypes is called and the types are initialized BuiltinTypes::BuiltinTypes() { @@ -42,12 +42,12 @@ bool BuiltinTypes::isBuiltin( const TypeDesc& desc ) { return m_types.find( desc.name() ) != m_types.end(); } -QString BuiltinTypes::comment( const TypeDesc& desc ) { - QMap::iterator it = m_types.find( desc.name() ); +TQString BuiltinTypes::comment( const TypeDesc& desc ) { + TQMap::iterator it = m_types.find( desc.name() ); if( it != m_types.end() ) { return *it; } else { - return QString::null; + return TQString::null; } } @@ -56,7 +56,7 @@ extern SafetyCounter safetyCounter; TypePointer SimpleType::m_globalNamespace; SimpleType::TypeStore SimpleType::m_typeStore; SimpleType::TypeStore SimpleType::m_destroyedStore; -QString globalCurrentFile = ""; +TQString globalCurrentFile = ""; //SimpleType implementation @@ -178,15 +178,15 @@ void SimpleType::makePrivate() { m_type = m_type->clone(); } -const QStringList& SimpleType::scope() const { +const TQStringList& SimpleType::scope() const { return m_type -> scope(); } -const QString SimpleType::str() const { +const TQString SimpleType::str() const { return m_type -> str(); } -void SimpleType::init( const QStringList& scope, const HashedStringSet& files, Repository rep ) { +void SimpleType::init( const TQStringList& scope, const HashedStringSet& files, Repository rep ) { m_includeFiles = files; m_type = TypePointer( new SimpleTypeImpl( scope ) ); @@ -204,10 +204,10 @@ SimpleType::SimpleType( Tag tag ) : m_resolved(true) { // //SimpleTypeImpl implementation -QValueList SimpleTypeImpl::getBases() { -QValueList ret; - QStringList bases = getBaseStrings(); - for( QStringList::const_iterator it = bases.begin(); it != bases.end(); ++it ) { +TQValueList SimpleTypeImpl::getBases() { +TQValueList ret; + TQStringList bases = getBaseStrings(); + for( TQStringList::const_iterator it = bases.begin(); it != bases.end(); ++it ) { TypeDesc d( *it ); d.setIncludeFiles( m_findIncludeFiles ); LocateResult res = locateDecType( d, LocateBase ); @@ -286,7 +286,7 @@ SimpleTypeFunctionInterface* SimpleTypeImpl::asFunction() { return dynamic_cast ( this ); } -QString SimpleTypeImpl::operatorToString( Operator op ) { +TQString SimpleTypeImpl::operatorToString( Operator op ) { switch ( op ) { case NoOp: return "NoOp"; @@ -301,11 +301,11 @@ QString SimpleTypeImpl::operatorToString( Operator op ) { case ParenOp: return "paren-operator"; default: - return QString( "%1" ).arg( ( long ) op ); + return TQString( "%1" ).arg( ( long ) op ); }; } -LocateResult SimpleTypeImpl::getFunctionReturnType( QString functionName, QValueList params ) { +LocateResult SimpleTypeImpl::getFunctionReturnType( TQString functionName, TQValueList params ) { LocateResult t = typeOf( functionName, MemberInfo::Function ).type; if ( t->resolved() && t->resolved() ->asFunction() ) { return t->resolved() ->applyOperator( ParenOp, params ); @@ -315,7 +315,7 @@ LocateResult SimpleTypeImpl::getFunctionReturnType( QString functionName, QValue } } -LocateResult SimpleTypeImpl::applyOperator( Operator op , QValueList params ) { +LocateResult SimpleTypeImpl::applyOperator( Operator op , TQValueList params ) { Debug d( "#applyn#" ); if ( !d || !safetyCounter ) return LocateResult(); @@ -540,7 +540,7 @@ class TemplateParamMatch { private: TypePointer m_candidate; SimpleTypeImpl::TemplateParamInfo m_candidateParams; - QMap m_hadParameters; + TQMap m_hadParameters; bool m_matched; int m_maxDepth; }; @@ -562,7 +562,7 @@ void SimpleTypeImpl::chooseSpecialization( MemberInfo& member ) { if ( m_masterProxy ) t = m_masterProxy; - QValueList classes = t->getMemberClasses( type->desc() ); + TQValueList classes = t->getMemberClasses( type->desc() ); //Find the specialization that fits the given template-parameters the best @@ -591,7 +591,7 @@ void SimpleTypeImpl::chooseSpecialization( MemberInfo& member ) { TemplateParamMatch bestMatch; - for ( QValueList::iterator it = classes.begin(); it != classes.end(); ++it ) { + for ( TQValueList::iterator it = classes.begin(); it != classes.end(); ++it ) { if ( ( *it ) ->specialization().isEmpty() ) continue; TemplateParamMatch match( ( *it ), member.type.desc() ); @@ -776,11 +776,11 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ///Ask bases but only on this level if ( ! ( mode & ExcludeBases ) ) { - QValueList bases = getBases(); + TQValueList bases = getBases(); if ( !bases.isEmpty() ) { TypeDesc nameInBase = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration - for ( QValueList::iterator it = bases.begin(); it != bases.end(); ++it ) { + for ( TQValueList::iterator it = bases.begin(); it != bases.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; LocateResult t = ( *it ) ->resolved() ->locateType( nameInBase, addFlag( addFlag( mode, ExcludeTemplates ), ExcludeParents ), dir ); ///The searched Type cannot directly be a template-param in the base-class, so ExcludeTemplates. It's forgotten early enough. @@ -806,9 +806,9 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ///Ask the bases and allow them to search in their parents. if ( ! ( mode & ExcludeBases ) ) { TypeDesc baseName = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration - QValueList bases = getBases(); + TQValueList bases = getBases(); if ( !bases.isEmpty() ) { - for ( QValueList::iterator it = bases.begin(); it != bases.end(); ++it ) { + for ( TQValueList::iterator it = bases.begin(); it != bases.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; LocateResult t = ( *it ) ->resolved() ->locateType( baseName, addFlag( mode, ExcludeTemplates ), dir ); ///The searched Type cannot directly be a template-param in the base-class, so ExcludeTemplates. It's forgotten early enough. @@ -849,7 +849,7 @@ SimpleType SimpleTypeImpl::parent() { } else { ifVerbose( dbg() << "\"" << str() << "\": locating parent" << endl ); invalidateSecondaryCache(); - QStringList sc = scope(); + TQStringList sc = scope(); if ( !sc.isEmpty() ) { sc.pop_back(); @@ -880,11 +880,11 @@ TypeDesc& SimpleTypeImpl::descForEdit() { return m_desc; } -QString SimpleTypeImpl::describeWithParams() { +TQString SimpleTypeImpl::describeWithParams() { TemplateParamInfo pinfo = getTemplateParamInfo(); int num = 0; TemplateParamInfo::TemplateParam param; - QString str = desc().name(); + TQString str = desc().name(); if ( desc().hasTemplateParams() ) { str += "< "; @@ -904,7 +904,7 @@ QString SimpleTypeImpl::describeWithParams() { return str; } -QString SimpleTypeImpl::fullTypeResolved( int depth ) { +TQString SimpleTypeImpl::fullTypeResolved( int depth ) { Debug d( "#tre#" ); TypeDesc t = desc(); @@ -924,7 +924,7 @@ QString SimpleTypeImpl::fullTypeResolved( int depth ) { } -QString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { +TQString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { if ( m_parent && !m_parent->scope().isEmpty() ) { return m_parent->fullTypeUnresolvedWithScope() + "::" + m_desc.fullNameChain(); } else { @@ -932,7 +932,7 @@ QString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { } } -QString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { +TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { Q_UNUSED( depth ); if ( !m_scope.isEmpty() && parent() ) { return parent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); @@ -944,7 +944,7 @@ QString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { void SimpleTypeImpl::checkTemplateParams () { invalidateCache(); if ( ! m_scope.isEmpty() ) { - QString str = m_scope.back(); + TQString str = m_scope.back(); m_desc = str; if ( !m_desc.name().isEmpty() ) { m_scope.pop_back(); @@ -955,18 +955,18 @@ void SimpleTypeImpl::checkTemplateParams () { } } -void SimpleTypeImpl::setScope( const QStringList& scope ) { +void SimpleTypeImpl::setScope( const TQStringList& scope ) { invalidateCache(); m_scope = scope; if ( m_scope.count() == 1 && m_scope.front().isEmpty() ) { //kdDebug() << "bad scope set " << kdBacktrace() << endl; - m_scope = QStringList(); + m_scope = TQStringList(); } } SimpleTypeImpl::TypeOfResult SimpleTypeImpl::searchBases ( const TypeDesc& name /*option!!*/ ) { - QValueList parents = getBases(); - for ( QValueList::iterator it = parents.begin(); it != parents.end(); ++it ) { + TQValueList parents = getBases(); + for ( TQValueList::iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; TypeOfResult type = ( *it ) ->resolved() ->typeOf( name ); @@ -997,8 +997,8 @@ void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) { //SimpleTypeImpl::TemplateParamInfo implementation -bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, QString name ) const { - QMap::const_iterator it = m_paramsByName.find( name ); +bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQString name ) const { + TQMap::const_iterator it = m_paramsByName.find( name ); if ( it != m_paramsByName.end() ) { target = *it; return true; @@ -1007,7 +1007,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, QString } bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int number ) const { - QMap::const_iterator it = m_paramsByNumber.find( number ); + TQMap::const_iterator it = m_paramsByNumber.find( number ); if ( it != m_paramsByNumber.end() ) { target = *it; return true; @@ -1016,7 +1016,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int num } void SimpleTypeImpl::TemplateParamInfo::removeParam( int number ) { - QMap::iterator it = m_paramsByNumber.find( number ); + TQMap::iterator it = m_paramsByNumber.find( number ); if ( it != m_paramsByNumber.end() ) { m_paramsByName.remove( ( *it ).name ); m_paramsByNumber.remove( it ); @@ -1029,7 +1029,7 @@ void SimpleTypeImpl::TemplateParamInfo::addParam( const TemplateParam& param ) { } int SimpleTypeImpl::TemplateParamInfo::count() const { - QMap::const_iterator it = m_paramsByNumber.end(); + TQMap::const_iterator it = m_paramsByNumber.end(); if ( it != m_paramsByNumber.begin() ) { --it; return ( *it ).number + 1; diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h index 3e6f82d3..19fb22cc 100644 --- a/languages/cpp/simpletype.h +++ b/languages/cpp/simpletype.h @@ -23,14 +23,14 @@ #include "completiondebug.h" #include "typedesc.h" #include "declarationinfo.h" -#include +#include #include "cpp_tags.h" #include "codemodel.h" #define NOBACKTRACE -extern QString globalCurrentFile; +extern TQString globalCurrentFile; using namespace CompletionDebug; using namespace BitHelpers; @@ -58,10 +58,10 @@ class BuiltinTypes { ///This should be used for checking whether a type is builtin static bool isBuiltin( const TypeDesc& desc ); ///If it is a builtin type this returns a short description of the type - static QString comment( const TypeDesc& desc ); + static TQString comment( const TypeDesc& desc ); BuiltinTypes(); private: - static QMap m_types; + static TQMap m_types; }; @@ -82,16 +82,16 @@ class SimpleType { *this = rhs; } - SimpleType( const QStringList& scope, const HashedStringSet& files, Repository rep = RepoUndefined ) : m_resolved( false ) { + SimpleType( const TQStringList& scope, const HashedStringSet& files, Repository rep = RepoUndefined ) : m_resolved( false ) { init( scope, files, rep ); } - SimpleType( const QString& text,const HashedStringSet& files, Repository rep = RepoUndefined ) : m_resolved( false ) { + SimpleType( const TQString& text,const HashedStringSet& files, Repository rep = RepoUndefined ) : m_resolved( false ) { init( splitType( text ), files, rep ); }; SimpleType( Repository rep = RepoUndefined ) : m_resolved( false ) { - init( QStringList(), HashedStringSet(), rep ); + init( TQStringList(), HashedStringSet(), rep ); }; SimpleType( SimpleTypeImpl* ip ) : m_type( TypePointer( ip ) ), m_resolved( true ) {} @@ -132,14 +132,14 @@ class SimpleType { void makePrivate(); - operator QString() const { + operator TQString() const { return str(); } ///lazily returns the scope - const QStringList& scope() const; + const TQStringList& scope() const; - const QString str() const; + const TQString str() const; ///valid() does not check whether the type was found in some model, ///it just checks whether this theoretically represents a type. @@ -168,7 +168,7 @@ class SimpleType { private: - void init( const QStringList& scope, const HashedStringSet& files, Repository rep ); + void init( const TQStringList& scope, const HashedStringSet& files, Repository rep ); void resolve( Repository rep = RepoUndefined ) const ; @@ -201,7 +201,7 @@ class SimpleType { class SimpleTypeConfiguration { bool m_invalid; public: - SimpleTypeConfiguration( QString currentFileName = "" ) : m_invalid( false ) { + SimpleTypeConfiguration( TQString currentFileName = "" ) : m_invalid( false ) { globalCurrentFile = currentFileName; dbgState.clearCounter(); } @@ -231,7 +231,7 @@ class SimpleTypeImpl : public KShared { public: typedef KSharedPtr TypePointer; - SimpleTypeImpl( const QStringList& scope ) : m_resolutionCount( 0 ), m_resolutionFlags( NoFlag ), m_scope( scope ) { + SimpleTypeImpl( const TQStringList& scope ) : m_resolutionCount( 0 ), m_resolutionFlags( NoFlag ), m_scope( scope ) { setScope( m_scope ); checkTemplateParams(); reg(); @@ -250,14 +250,14 @@ class SimpleTypeImpl : public KShared { }; ///Returns the template-specialization-string for classes - virtual QString specialization() const { - return QString::null; + virtual TQString specialization() const { + return TQString::null; } class TemplateParamInfo { public: struct TemplateParam { - QString name; + TQString name; TypeDesc def; TypeDesc value; int number; @@ -267,7 +267,7 @@ class SimpleTypeImpl : public KShared { TemplateParamInfo( ) {} - bool getParam( TemplateParam& target, QString name ) const; + bool getParam( TemplateParam& target, TQString name ) const; bool getParam( TemplateParam& target, int number ) const; @@ -278,8 +278,8 @@ class SimpleTypeImpl : public KShared { int count() const; private: - QMap m_paramsByNumber; - QMap m_paramsByName; + TQMap m_paramsByNumber; + TQMap m_paramsByName; }; int resolutionCount() { @@ -317,7 +317,7 @@ class SimpleTypeImpl : public KShared { return false; }; - virtual QString comment() const { + virtual TQString comment() const { return ""; }; @@ -334,7 +334,7 @@ class SimpleTypeImpl : public KShared { } ///@todo remove this and use getTemplateParamInfo instead - virtual const LocateResult findTemplateParam( const QString& /*name*/ ) { + virtual const LocateResult findTemplateParam( const TQString& /*name*/ ) { return LocateResult(); } @@ -386,10 +386,10 @@ class SimpleTypeImpl : public KShared { m_resolutionCount = val; } #ifndef NOBACKTRACE - QString create_bt; + TQString create_bt; #endif - inline QString createInfo() const { + inline TQString createInfo() const { #ifndef NOBACKTRACE return "\n" + create_bt + "\n"; #endif @@ -424,15 +424,15 @@ class SimpleTypeImpl : public KShared { ///when the object pointed to changes virtual void invalidatePrimaryCache( bool onlyNegative = false ) {} - static QString operatorToString( Operator op ); + static TQString operatorToString( Operator op ); public: /* - operator QString() const { + operator TQString() const { return str(); } - inline operator QStringList() const { + inline operator TQStringList() const { return m_scope; }*/ @@ -458,22 +458,22 @@ class SimpleTypeImpl : public KShared { ///returns the scope(including own name) as string - QString str() const { + TQString str() const { if ( m_scope.isEmpty() ) return ""; return m_scope.join( "::" ); } ///returns the scope(including own name) as string-list - inline const QStringList& scope() const { + inline const TQStringList& scope() const { return m_scope; } ///Returns the scope including template-specialization - QStringList specializedScope() const { - QStringList ts = m_scope; + TQStringList specializedScope() const { + TQStringList ts = m_scope; if( !ts.isEmpty() ) { - QString s = ts.back() + specialization(); + TQString s = ts.back() + specialization(); ts.pop_back(); ts.push_back( s ); } @@ -554,7 +554,7 @@ class SimpleTypeImpl : public KShared { memberType = NotFound; } - QString memberTypeToString() { + TQString memberTypeToString() { switch ( memberType ) { case Namespace: return "namespace"; @@ -599,7 +599,7 @@ class SimpleTypeImpl : public KShared { return memberType != NotFound; } - QString name; + TQString name; LocateResult type; ///This member is only filles for variables, typedefs and template-params! @@ -651,17 +651,17 @@ class SimpleTypeImpl : public KShared { public: - LocateResult getFunctionReturnType( QString functionName, QValueList params = QValueList() ); + LocateResult getFunctionReturnType( TQString functionName, TQValueList params = TQValueList() ); ///Tries to apply the operator and returns the new type. If it fails, it returns an invalid type. - virtual LocateResult applyOperator( Operator op , QValueList params = QValueList() ); + virtual LocateResult applyOperator( Operator op , TQValueList params = TQValueList() ); /** In case of a class, returns all base-types */ - virtual QValueList getBases(); + virtual TQValueList getBases(); - virtual QStringList getBaseStrings() { - return QStringList(); + virtual TQStringList getBaseStrings() { + return TQStringList(); }; ///This pair contains the found type, and additionally the member-information that helped finding the type @@ -708,8 +708,8 @@ class SimpleTypeImpl : public KShared { }; ///Should return all specializations of a specific class-name - virtual QValueList findSpecializations( const QString& name ) { - return QValueList(); + virtual TQValueList findSpecializations( const TQString& name ) { + return TQValueList(); } /**TypeDescs and SimpleTypeImpls usually have a cross-reference, which creates a circular dependency so that they are never freed using KShared. This function breaks the loop, and also breaks all other possible dependency-loops. After this function was called, the type still contains its private information, but can not not be used to resolve anything anymore. This function is called automatically while the destruction of SimpleTypeConfiguration */ @@ -727,37 +727,37 @@ class SimpleTypeImpl : public KShared { TypeDesc& descForEdit(); ///short version - QString fullType() const { + TQString fullType() const { return m_desc.fullName(); } ///Similar to fullTypeResolved, except that it also shows addition information about template-params - QString describeWithParams() ; + TQString describeWithParams() ; ///returns all information that is available constantly - QString describe() const { - QString description = m_desc.fullName() + " (" + m_scope.join( "::" ) + ")" + createInfo(); + TQString describe() const { + TQString description = m_desc.fullName() + " (" + m_scope.join( "::" ) + ")" + createInfo(); return description; } ///this completely evaluates everything - QString fullTypeResolved( int depth = 0 ); + TQString fullTypeResolved( int depth = 0 ); ///this completely evaluates everything - QString fullTypeResolvedWithScope( int depth = 0 ); + TQString fullTypeResolvedWithScope( int depth = 0 ); - QString fullTypeUnresolvedWithScope(); + TQString fullTypeUnresolvedWithScope(); - virtual QValueList getMemberClasses( const TypeDesc& name ) { - return QValueList(); + virtual TQValueList getMemberClasses( const TypeDesc& name ) { + return TQValueList(); } ///Returns the include-file-set used for resolving this type IncludeFiles getFindIncludeFiles(); private: - QStringList m_scope; + TQStringList m_scope; TypePointer m_parent; IncludeFiles m_findIncludeFiles; //Set of include-files used for finding this object @@ -771,7 +771,7 @@ class SimpleTypeImpl : public KShared { /** Tries to extract template-parameters from the scope, resets the params-list */ virtual void checkTemplateParams (); - void setScope( const QStringList& scope ); + void setScope( const TQStringList& scope ); ///Searches the item IN the bases TypeOfResult searchBases ( const TypeDesc& name ); @@ -786,10 +786,10 @@ class SimpleTypeImpl : public KShared { class TypeTrace { - QValueList > m_trace; + TQValueList > m_trace; public: - QValueList >& trace() { + TQValueList >& trace() { return m_trace; }; @@ -799,9 +799,9 @@ class TypeTrace { void prepend( const TypeTrace& trace, int indent = 0 ) { /* if( indent != 0 ) { - QString ind; + TQString ind; for( int a = 0; a < indent; a++ ) ind += " "; - for( QValueList >::const_iterator it = trace.m_trace.end(); it != trace.m_trace.begin(); ) { + for( TQValueList >::const_iterator it = trace.m_trace.end(); it != trace.m_trace.begin(); ) { --it; QPair item = *it; item.second.prependDecoration( ind ); diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h index 0cc5e2b0..3f950cbf 100644 --- a/languages/cpp/simpletypecachebinder.h +++ b/languages/cpp/simpletypecachebinder.h @@ -41,7 +41,7 @@ class SimpleTypeCacheBinder : public Base { struct LocateDesc { TypeDesc mname; - //QString fullName; + //TQString fullName; SimpleTypeImpl::LocateMode mmode; int mdir; SimpleTypeImpl::MemberInfo::MemberType mtypeMask; @@ -120,7 +120,7 @@ class SimpleTypeCacheBinder : public Base { struct MemberFindDesc { TypeDesc m_desc; - QString fullName; + TQString fullName; SimpleTypeImpl::MemberInfo::MemberType findType; size_t m_hashKey; //in time check why it is necessary to cache this key size_t m_hashKey2; @@ -134,8 +134,8 @@ class SimpleTypeCacheBinder : public Base { int compare( const MemberFindDesc& rhs ) const { if ( fullName.isEmpty() ) const_cast(this)->fullName = m_desc.fullNameChain(); if ( rhs.fullName.isEmpty() ) const_cast(&rhs)->fullName = rhs.m_desc.fullNameChain(); - const QString& a = fullName; //m_desc.fullNameChain(); - const QString& b = rhs.fullName; //m_desc.fullNameChain(); + const TQString& a = fullName; //m_desc.fullNameChain(); + const TQString& b = rhs.fullName; //m_desc.fullNameChain(); if ( a != b ) { if ( a < b ) return -1; @@ -179,7 +179,7 @@ class SimpleTypeCacheBinder : public Base { typedef __gnu_cxx::hash_map LocateMap; typedef __gnu_cxx::hash_map MemberMap; - typedef __gnu_cxx::hash_map, typename MemberFindDesc::hash > ClassListMap; + typedef __gnu_cxx::hash_map, typename MemberFindDesc::hash > ClassListMap; virtual SimpleTypeImpl::MemberInfo findMember( TypeDesc name, SimpleTypeImpl::MemberInfo::MemberType type ) { if ( !primaryActive ) @@ -211,7 +211,7 @@ class SimpleTypeCacheBinder : public Base { } } - virtual QValueList getMemberClasses( const TypeDesc& name ) { + virtual TQValueList getMemberClasses( const TypeDesc& name ) { if ( !primaryActive ) return Base::getMemberClasses( name ); MemberFindDesc key( name, Base::MemberInfo::NestedType ); @@ -221,7 +221,7 @@ class SimpleTypeCacheBinder : public Base { /*ifVerbose( dbg() << "\"" << Base::str() << "\" took member-info for \"" << name.fullNameChain() << "\" from the cache: " << (*it).second. << endl );*/ return (*it).second; } else { - QValueList mem; + TQValueList mem; m_classListCache.insert( std::make_pair( key, mem ) ); @@ -267,7 +267,7 @@ class SimpleTypeCacheBinder : public Base { } } - virtual QValueList getBases() { + virtual TQValueList getBases() { ///@todo this needs a lookup for different includeFiles.. if ( m_haveBasesCache ) { ifVerbose( dbg() << "\"" << Base::str() << "\" took base-info from the cache" << endl ); @@ -283,7 +283,7 @@ class SimpleTypeCacheBinder : public Base { LocateMap m_locateCache; MemberMap m_memberCache; ClassListMap m_classListCache; - QValueList m_basesCache; + TQValueList m_basesCache; bool m_haveBasesCache; bool secondaryActive, primaryActive; diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp index 2b02cd9e..f662acc5 100644 --- a/languages/cpp/simpletypecatalog.cpp +++ b/languages/cpp/simpletypecatalog.cpp @@ -24,21 +24,21 @@ TypePointer SimpleTypeCatalog::clone() { return new SimpleTypeCachedCatalog( this ); } -QString SimpleTypeCatalog::specialization() const { +TQString SimpleTypeCatalog::specialization() const { return m_tag.getSpecializationDeclaration(); } void SimpleTypeCatalog::addAliasesTo( SimpleTypeNamespace* ns ) { if ( m_tag.kind() != Tag::Kind_Namespace ) return; - QValueList args; + TQValueList args; ///Insert all namespace-imports args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "kind", Tag::Kind_UsingDirective ); - QValueList tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList tags( cppCompletionInstance->m_repository->query( args ) ); - for ( QValueList::iterator it = tags.begin(); it != tags.end(); ++it ) { + for ( TQValueList::iterator it = tags.begin(); it != tags.end(); ++it ) { TypeDesc d( (*it).name() ); d.setIncludeFiles( HashedString((*it).fileName()) ); ///@todo implement the include-file-logic ns->addAliasMap( TypeDesc(), d, HashedString((*it).fileName()), true, false, bigContainer() ); @@ -50,9 +50,9 @@ void SimpleTypeCatalog::addAliasesTo( SimpleTypeNamespace* ns ) { tags = cppCompletionInstance->m_repository->query( args ); - for ( QValueList::iterator it = tags.begin(); it != tags.end(); ++it ) { - QVariant v = (*it).attribute( "alias" ); - if ( v.type() == QVariant::String ) { + for ( TQValueList::iterator it = tags.begin(); it != tags.end(); ++it ) { + TQVariant v = (*it).attribute( "alias" ); + if ( v.type() == TQVariant::String ) { TypeDesc d( v.asString() ); d.setIncludeFiles( HashedString((*it).fileName()) ); ns->addAliasMap( (*it).name(), d, HashedString((*it).fileName()), true, false, bigContainer() ); @@ -61,17 +61,17 @@ void SimpleTypeCatalog::addAliasesTo( SimpleTypeNamespace* ns ) { } } -QValueList SimpleTypeCatalog::getMemberClasses( const TypeDesc& name ) { - QValueList ret; +TQValueList SimpleTypeCatalog::getMemberClasses( const TypeDesc& name ) { + TQValueList ret; - QValueList args; + TQValueList args; args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "name", name.name() ); - QValueList tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList tags( cppCompletionInstance->m_repository->query( args ) ); - for ( QValueList::iterator it = tags.begin(); it != tags.end(); ++it ) { + for ( TQValueList::iterator it = tags.begin(); it != tags.end(); ++it ) { if ( (*it).kind() == Tag::Kind_Class ) { ///It would be better to return all matched class-names from within findMember and use them from there so all this will be cached too. CatalogBuildInfo b( *it, name, TypePointer( this ) ); @@ -101,17 +101,17 @@ SimpleTypeImpl::MemberInfo SimpleTypeCatalog::findMember( TypeDesc name, SimpleT } } - QValueList args; + TQValueList args; args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "name", name.name() ); - QValueList tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList tags( cppCompletionInstance->m_repository->query( args ) ); if ( tags.isEmpty() ) return ret; ///skip all using-directives - QValueList::iterator it = tags.begin(); + TQValueList::iterator it = tags.begin(); while ( ( (*it).kind() == Tag::Kind_UsingDirective || (*it).kind() == Tag::Kind_NamespaceAlias ) && it != tags.end() ) ++it; @@ -148,7 +148,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCatalog::findMember( TypeDesc name, SimpleT bool hasSpecializationDeclaration = tag.hasSpecializationDeclaration(); bool isIncluded = name.includeFiles()[tag.fileName()]; if ( hasSpecializationDeclaration || !isIncluded ) { - for ( QValueList::const_iterator it = tags.begin(); it != tags.end(); ++it ) { + for ( TQValueList::const_iterator it = tags.begin(); it != tags.end(); ++it ) { if ( (*it).kind() == Tag::Kind_Class && !(*it).hasSpecializationDeclaration() ) { if ( name.includeFiles()[(*it).fileName()] ) { tag = *it; @@ -212,17 +212,17 @@ SimpleTypeImpl::MemberInfo SimpleTypeCatalog::findMember( TypeDesc name, SimpleT return ret; } -Tag SimpleTypeCatalog::findSubTag( const QString& name ) { +Tag SimpleTypeCatalog::findSubTag( const TQString& name ) { if ( name.isEmpty() ) return Tag(); - QValueList args; - QTime t; + TQValueList args; + TQTime t; t.start(); args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "name", name ); - QValueList tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList tags( cppCompletionInstance->m_repository->query( args ) ); if ( ! tags.isEmpty() ) { //ifVerbose( dbg() << "findTag: \"" << str() << "\": tag \"" << name << "\" found " << endl ); return tags.front(); @@ -232,22 +232,22 @@ Tag SimpleTypeCatalog::findSubTag( const QString& name ) { } } -QValueList SimpleTypeCatalog::getBaseClassList( ) { +TQValueList SimpleTypeCatalog::getBaseClassList( ) { if ( scope().isEmpty() ) - return QValueList(); + return TQValueList(); return cppCompletionInstance->m_repository->getBaseClassList( scope().join("::") + specialization() ); } void SimpleTypeCatalog::initFromTag() { - QStringList l = m_tag.scope(); + TQStringList l = m_tag.scope(); l << m_tag.name(); setScope( l ); } void SimpleTypeCatalog::init() { if ( !scope().isEmpty() ) { - QStringList l = scope(); - QStringList cp = l; + TQStringList l = scope(); + TQStringList cp = l; cp.pop_back(); setScope( cp ); m_tag = findSubTag( l.back() ); @@ -270,21 +270,21 @@ DeclarationInfo SimpleTypeCatalog::getDeclarationInfo() { return ret; } -QStringList SimpleTypeCatalog::getBaseStrings() { +TQStringList SimpleTypeCatalog::getBaseStrings() { Debug d( "#getbases#" ); if ( !d || !safetyCounter ) { //ifVerbose( dbg() << "\"" << str() << "\": recursion to deep while getting bases" << endl ); - return QStringList(); + return TQStringList(); } - QStringList ret; - QMap bases; + TQStringList ret; + TQMap bases; // try with parentsc - QTime t; + TQTime t; t.restart(); - QValueList parents( getBaseClassList() ); + TQValueList parents( getBaseClassList() ); - QValueList::Iterator it = parents.begin(); + TQValueList::Iterator it = parents.begin(); while ( it != parents.end() ) { Tag & tag = *it; ++it; @@ -301,11 +301,11 @@ SimpleTypeImpl::TemplateParamInfo SimpleTypeCatalog::getTemplateParamInfo() { if ( m_tag ) { if ( m_tag.hasAttribute( "tpl" ) ) { - QStringList l = m_tag.attribute( "tpl" ).asStringList(); + TQStringList l = m_tag.attribute( "tpl" ).asStringList(); TypeDesc::TemplateParams templateParams = m_desc.templateParams(); uint pi = 0; - QStringList::const_iterator it = l.begin(); + TQStringList::const_iterator it = l.begin(); while ( it != l.end() ) { TemplateParamInfo::TemplateParam curr; curr.name = *it; @@ -326,14 +326,14 @@ SimpleTypeImpl::TemplateParamInfo SimpleTypeCatalog::getTemplateParamInfo() { return ret; } -const LocateResult SimpleTypeCatalog::findTemplateParam( const QString& name ) { +const LocateResult SimpleTypeCatalog::findTemplateParam( const TQString& name ) { if ( m_tag ) { if ( m_tag.hasAttribute( "tpl" ) ) { - QStringList l = m_tag.attribute( "tpl" ).asStringList(); + TQStringList l = m_tag.attribute( "tpl" ).asStringList(); ///we need the index, so count the items through uint pi = 0; - QStringList::const_iterator it = l.begin(); + TQStringList::const_iterator it = l.begin(); while ( it != l.end() && *it != name ) { ++pi; ++it; diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h index ecfdb833..e22a3fcf 100644 --- a/languages/cpp/simpletypecatalog.h +++ b/languages/cpp/simpletypecatalog.h @@ -35,7 +35,7 @@ public: } /** empty scope means global scope */ - SimpleTypeCatalog( const QStringList& scope ) : SimpleTypeImpl( scope ) { + SimpleTypeCatalog( const TQStringList& scope ) : SimpleTypeImpl( scope ) { init(); } @@ -48,7 +48,7 @@ public: initFromTag(); } - virtual QString comment() const { + virtual TQString comment() const { return m_tag.comment(); }; @@ -62,29 +62,29 @@ public: return (bool)m_tag; }; - virtual QStringList getBaseStrings(); + virtual TQStringList getBaseStrings(); virtual TemplateParamInfo getTemplateParamInfo(); - virtual const LocateResult findTemplateParam( const QString& name ); + virtual const LocateResult findTemplateParam( const TQString& name ); - virtual QString specialization() const; + virtual TQString specialization() const; virtual void addAliasesTo( SimpleTypeNamespace* ns ); private: Tag m_tag; - int pointerDepthFromString( const QString& str ) { - QRegExp ptrRx( "(\\*|\\&)" ); - QString ptr = str.mid( str.find( ptrRx ) ); - QStringList ptrList = QStringList::split( "", ptr ); + int pointerDepthFromString( const TQString& str ) { + TQRegExp ptrRx( "(\\*|\\&)" ); + TQString ptr = str.mid( str.find( ptrRx ) ); + TQStringList ptrList = TQStringList::split( "", ptr ); return ptrList.size(); } - Tag findSubTag( const QString& name ); + Tag findSubTag( const TQString& name ); - QValueList getBaseClassList(); + TQValueList getBaseClassList(); void initFromTag(); @@ -108,7 +108,7 @@ protected: virtual MemberInfo findMember( TypeDesc name, MemberInfo::MemberType type = MemberInfo::AllTypes); - virtual QValueList getMemberClasses( const TypeDesc& name ) ; + virtual TQValueList getMemberClasses( const TypeDesc& name ) ; }; diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp index 898228bb..3fc1ce52 100644 --- a/languages/cpp/simpletypefunction.cpp +++ b/languages/cpp/simpletypefunction.cpp @@ -40,24 +40,24 @@ HashedStringSet getIncludeFiles( const ItemDom& item ) { //SimpleTypeFunctionInterface implementation -QString SimpleTypeFunctionInterface::signature() { - QString sig = "( "; +TQString SimpleTypeFunctionInterface::signature() { + TQString sig = "( "; SimpleTypeImpl* asType = dynamic_cast( this ); - QStringList argDefaults = getArgumentDefaults(); - QStringList argNames = getArgumentNames(); - QValueList argTypes = getArgumentTypes(); - QValueList argRealTypes; + TQStringList argDefaults = getArgumentDefaults(); + TQStringList argNames = getArgumentNames(); + TQValueList argTypes = getArgumentTypes(); + TQValueList argRealTypes; if ( asType ) { - for ( QValueList::iterator it = argTypes.begin(); it != argTypes.end(); ++it ) { + for ( TQValueList::iterator it = argTypes.begin(); it != argTypes.end(); ++it ) { argRealTypes << asType->locateDecType( *it ); } } - QStringList::iterator def = argDefaults.begin(); - QStringList::iterator name = argNames.begin(); - QValueList::iterator realType = argRealTypes.begin(); + TQStringList::iterator def = argDefaults.begin(); + TQStringList::iterator name = argNames.begin(); + TQValueList::iterator realType = argRealTypes.begin(); while ( realType != argRealTypes.end() ) { if ( sig != "( " ) @@ -128,9 +128,9 @@ void SimpleTypeFunctionInterface::resolveImplicitTypes( TypeDesc::TemplateParams } } -void SimpleTypeFunctionInterface::resolveImplicitTypes( QValueList& argTypes, QValueList& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ) { - QValueList::iterator it = argTypes.begin(); - QValueList::iterator it2 = gottenArgTypes.begin(); +void SimpleTypeFunctionInterface::resolveImplicitTypes( TQValueList& argTypes, TQValueList& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ) { + TQValueList::iterator it = argTypes.begin(); + TQValueList::iterator it2 = gottenArgTypes.begin(); while ( it != argTypes.end() && it2 != gottenArgTypes.end() ) { resolveImplicitTypes( *it, *it2, paramInfo ); @@ -191,13 +191,13 @@ SimpleTypeCodeModel::SimpleTypeCodeModel( ItemDom& item ) : m_item( item ) { FunctionModel* m = dynamic_cast( i ); ClassModel* c = dynamic_cast( i ); if ( m ) { - QStringList l = m->scope(); + TQStringList l = m->scope(); l << m->name(); setScope( l ); return; } if ( c ) { - QStringList l = c->scope(); + TQStringList l = c->scope(); l << c->name(); setScope( l ); return; @@ -237,7 +237,7 @@ ItemDom SimpleTypeCodeModel::locateModelContainer( class CodeModel* m, TypeDesc } ///Until header-parsing is implemented, this tries to find the class that is most related to this item -/*ClassDom SimpleTypeCodeModel::pickMostRelated( ClassList lst, QString fn ) { +/*ClassDom SimpleTypeCodeModel::pickMostRelated( ClassList lst, TQString fn ) { if( lst.isEmpty() ) return ClassDom(); ClassDom best = lst.front(); @@ -247,7 +247,7 @@ ItemDom SimpleTypeCodeModel::locateModelContainer( class CodeModel* m, TypeDesc for( ClassList::iterator it = lst.begin(); it != lst.end(); ++it ) { if( !(*it)->getSpecializationDeclaration().isEmpty() ) continue; ///Don't consider specialized classes //kdDebug() << "comparing " << (*it)->fileName() << endl; - QString str = (*it)->fileName(); + TQString str = (*it)->fileName(); uint len = str.length(); if( fn.length() < len ) len = fn.length(); @@ -271,11 +271,11 @@ ItemDom SimpleTypeCodeModel::locateModelContainer( class CodeModel* m, TypeDesc return best; }*/ -/*QValueList SimpleTypeCodeModel::findSpecializations( const QString& name ) { +/*TQValueList SimpleTypeCodeModel::findSpecializations( const TQString& name ) { ClassModel* klass = dynamic_cast ( & (*m_item) ); if( !klass ) { ifVerbose( dbg() << "\"" << str() << "\": search for member " << name.name() << " unsuccessful because the own type is invalid" << endl ); - return QValueList(); + return TQValueList(); } ClassList l = klass->classByName( name.name() ); @@ -290,12 +290,12 @@ ItemDom SimpleTypeCodeModel::locateModelContainer( class CodeModel* m, TypeDesc } } - return QValueList(); + return TQValueList(); }*/ -QValueList SimpleTypeCodeModel::getMemberClasses( const TypeDesc& name ) { - QValueList ret; +TQValueList SimpleTypeCodeModel::getMemberClasses( const TypeDesc& name ) { + TQValueList ret; if ( !m_item ) return ret; @@ -319,10 +319,10 @@ QValueList SimpleTypeCodeModel::getMemberClasses( const TypeDesc& n } template -Item pickMostRelated( const HashedStringSet& includeFiles, const QValueList& list ) { +Item pickMostRelated( const HashedStringSet& includeFiles, const TQValueList& list ) { if ( list.isEmpty() ) return Item(); - for ( typename QValueList::const_iterator it = list.begin(); it != list.end(); ++it ) { + for ( typename TQValueList::const_iterator it = list.begin(); it != list.end(); ++it ) { if ( includeFiles[( *it )->fileName()] ) return *it; } @@ -330,10 +330,10 @@ Item pickMostRelated( const HashedStringSet& includeFiles, const QValueList -ClassDom pickMostRelated( const HashedStringSet& includeFiles, const QValueList& list ) { +ClassDom pickMostRelated( const HashedStringSet& includeFiles, const TQValueList& list ) { if ( list.isEmpty() ) return ClassDom(); ///@todo the current file must be preferred - for ( QValueList::const_iterator it = list.begin(); it != list.end(); ++it ) { + for ( TQValueList::const_iterator it = list.begin(); it != list.end(); ++it ) { if ( !( *it )->getSpecializationDeclaration().isEmpty() ) continue; ///Don't consider specialized classes if ( includeFiles[( *it )->fileName()] ) return *it; @@ -466,7 +466,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCodeModel::findMember( TypeDesc name , Memb } bool SimpleTypeCodeModel::findItem() { - QString key = str(); + TQString key = str(); m_item = locateModelContainer( cppCompletionInstance->m_pSupport->codeModel(), str() ); return ( bool ) m_item; } @@ -492,9 +492,9 @@ DeclarationInfo SimpleTypeCodeModel::getDeclarationInfo() { return ret; } -QString SimpleTypeCodeModel::specialization() const { +TQString SimpleTypeCodeModel::specialization() const { const ClassModel* klass = dynamic_cast( m_item.data() ); - if ( !klass ) return QString::null; + if ( !klass ) return TQString::null; return klass->getSpecializationDeclaration(); } @@ -520,7 +520,7 @@ SimpleTypeImpl::TemplateParamInfo SimpleTypeCodeModel::getTemplateParamInfo() { return ret; } -const LocateResult SimpleTypeCodeModel::findTemplateParam( const QString& name ) { +const LocateResult SimpleTypeCodeModel::findTemplateParam( const TQString& name ) { if ( m_item ) { TemplateModelItem* ti = dynamic_cast( & ( *m_item ) ); TypeDesc::TemplateParams& templateParams = m_desc.templateParams(); @@ -529,7 +529,7 @@ const LocateResult SimpleTypeCodeModel::findTemplateParam( const QString& name ) return *templateParams[pi]; } else { if ( pi != -1 && !ti->getParam( pi ).second.isEmpty() ) { - QString def = ti->getParam( pi ).second; + TQString def = ti->getParam( pi ).second; ifVerbose( dbg() << "\"" << str() << "\": using default-template-parameter \"" << def << "\" for " << name << endl ); return TypeDesc( def ); } else if ( pi != -1 ) { @@ -540,21 +540,21 @@ const LocateResult SimpleTypeCodeModel::findTemplateParam( const QString& name ) return LocateResult(); } -QStringList SimpleTypeCodeModel::getBaseStrings() { +TQStringList SimpleTypeCodeModel::getBaseStrings() { Debug d( "#getbases#" ); if ( !d || !safetyCounter ) { //ifVerbose( dbg() << "\"" << str() << "\": recursion to deep while getting bases" << endl ); - return QStringList(); + return TQStringList(); } - QStringList ret; + TQStringList ret; ClassModel* klass; if ( !m_item || ( klass = dynamic_cast( & ( *m_item ) ) ) == 0 ) return ret; - QStringList parents = klass->baseClassList(); - for ( QStringList::Iterator it = parents.begin(); it != parents.end(); ++it ) { + TQStringList parents = klass->baseClassList(); + for ( TQStringList::Iterator it = parents.begin(); it != parents.end(); ++it ) { ret << *it; } @@ -592,8 +592,8 @@ bool SimpleTypeCodeModelFunction::isConst() { } -QValueList SimpleTypeCodeModelFunction::getArgumentTypes() { - QValueList ret; +TQValueList SimpleTypeCodeModelFunction::getArgumentTypes() { + TQValueList ret; if ( item() ) { IncludeFiles files; @@ -611,8 +611,8 @@ QValueList SimpleTypeCodeModelFunction::getArgumentTypes() { return ret; } -QStringList SimpleTypeCodeModelFunction::getArgumentNames() { - QStringList ret; +TQStringList SimpleTypeCodeModelFunction::getArgumentNames() { + TQStringList ret; if ( item() ) { if ( FunctionModel* m = dynamic_cast( & ( *item() ) ) ) { @@ -625,8 +625,8 @@ QStringList SimpleTypeCodeModelFunction::getArgumentNames() { return ret; } -QStringList SimpleTypeCodeModelFunction::getArgumentDefaults() { - QStringList ret; +TQStringList SimpleTypeCodeModelFunction::getArgumentDefaults() { + TQStringList ret; if ( item() ) { if ( FunctionModel* m = dynamic_cast( & ( *item() ) ) ) { @@ -650,7 +650,7 @@ SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildI } TypePointer SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::build() { - QValueList ret; + TQValueList ret; TypePointer last; for ( FunctionList::iterator it = m_items.begin(); it != m_items.end(); ++it ) { TypePointer tp = new SimpleTypeCodeModelFunction( model_cast ( *it ) ); @@ -684,19 +684,19 @@ bool SimpleTypeCatalogFunction::isConst() { return tagInfo.isConst(); } -QStringList SimpleTypeCatalogFunction::getArgumentNames() { - QStringList ret; +TQStringList SimpleTypeCatalogFunction::getArgumentNames() { + TQStringList ret; Tag t = tag(); CppFunction tagInfo( t ); return tagInfo.argumentNames(); } -QValueList SimpleTypeCatalogFunction::getArgumentTypes() { - QValueList ret; +TQValueList SimpleTypeCatalogFunction::getArgumentTypes() { + TQValueList ret; Tag t = tag(); CppFunction tagInfo( t ); - QStringList arguments = tagInfo.arguments(); - for ( QStringList::iterator it = arguments.begin(); it != arguments.end(); ++it ) + TQStringList arguments = tagInfo.arguments(); + for ( TQStringList::iterator it = arguments.begin(); it != arguments.end(); ++it ) ret << TypeDesc( *it ); return ret; } @@ -704,9 +704,9 @@ QValueList SimpleTypeCatalogFunction::getArgumentTypes() { //SimpleTypeCatalogFunction::CatalogFunctionBuildInfo implementation TypePointer SimpleTypeCatalogFunction::CatalogFunctionBuildInfo::build() { - QValueList ret; + TQValueList ret; TypePointer last; - for ( QValueList::iterator it = m_tags.begin(); it != m_tags.end(); ++it ) { + for ( TQValueList::iterator it = m_tags.begin(); it != m_tags.end(); ++it ) { TypePointer tp = new SimpleTypeCatalogFunction( *it ); tp->takeTemplateParams( m_desc ); tp->descForEdit().increaseFunctionDepth(); diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h index a0bd34fc..90b5fcab 100644 --- a/languages/cpp/simpletypefunction.h +++ b/languages/cpp/simpletypefunction.h @@ -46,20 +46,20 @@ class SimpleTypeFunctionInterface { ///Returns the totally unresolved return-type virtual TypeDesc getReturnType() = 0; - virtual QValueList getArgumentTypes() = 0; + virtual TQValueList getArgumentTypes() = 0; - virtual QStringList getArgumentDefaults() = 0; + virtual TQStringList getArgumentDefaults() = 0; - virtual QStringList getArgumentNames() = 0; + virtual TQStringList getArgumentNames() = 0; virtual bool isConst() = 0; - virtual QString signature(); + virtual TQString signature(); ///TODO: This function should locate the correct overloaded method in the chain, fitting the parameters ///should also moved into another class then - SimpleTypeImpl* match( const QValueList& /*params*/ ) { - // QValueList args = getArgumentTypes(); + SimpleTypeImpl* match( const TQValueList& /*params*/ ) { + // TQValueList args = getArgumentTypes(); return dynamic_cast( this ); } @@ -80,7 +80,7 @@ class SimpleTypeFunctionInterface { void resolveImplicitTypes( TypeDesc::TemplateParams& argTypes, TypeDesc::TemplateParams& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ); ///Tries to match the types, filling implicit template-params into paramInfo - void resolveImplicitTypes( QValueList& argTypes, QValueList& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ); + void resolveImplicitTypes( TQValueList& argTypes, TQValueList& gottenArgTypes, SimpleTypeImpl::TemplateParamInfo& paramInfo ); }; template @@ -114,7 +114,7 @@ public: return ret; } - virtual LocateResult applyOperator( typename Base::Operator op , QValueList params ) { + virtual LocateResult applyOperator( typename Base::Operator op , TQValueList params ) { Debug d("#apply#"); if( !d ) return LocateResult(); @@ -131,9 +131,9 @@ public: /** This is the place where implicit template-function-instatiation takes place. * Match the given param-types with the argument-types to resolve new template-params. */ - QValueList args = getArgumentTypes(); - QValueList paramDescs; - for( QValueList::iterator it = params.begin(); it != params.end(); ++it ) + TQValueList args = getArgumentTypes(); + TQValueList paramDescs; + for( TQValueList::iterator it = params.begin(); it != params.end(); ++it ) paramDescs << (TypeDesc)(*it); resolveImplicitTypes( args, paramDescs, paramInfo ); ///paramInfo now contains the information for all implicit types @@ -167,7 +167,7 @@ public: init(); } - SimpleTypeCodeModel( const QStringList& scope ) : SimpleTypeImpl( scope ) { + SimpleTypeCodeModel( const TQStringList& scope ) : SimpleTypeImpl( scope ) { init(); } @@ -175,7 +175,7 @@ public: return (bool)m_item; }; - virtual QString comment() const { + virtual TQString comment() const { if( m_item ) { return m_item->comment(); } else { @@ -209,14 +209,14 @@ public: virtual TemplateParamInfo getTemplateParamInfo(); - virtual const LocateResult findTemplateParam( const QString& name ); + virtual const LocateResult findTemplateParam( const TQString& name ); /** In case of a class, returns all base-types */ - virtual QStringList getBaseStrings(); + virtual TQStringList getBaseStrings(); ItemDom locateModelContainer( class CodeModel* m, TypeDesc t, ClassDom cnt = ClassDom() ); - virtual QString specialization() const; + virtual TQString specialization() const; virtual void addAliasesTo( SimpleTypeNamespace* ns ); @@ -227,7 +227,7 @@ private: void init(); - //ClassDom pickMostRelated( ClassList lst, QString fn ); + //ClassDom pickMostRelated( ClassList lst, TQString fn ); protected: SimpleTypeCodeModel() : SimpleTypeImpl() { @@ -247,7 +247,7 @@ protected: virtual MemberInfo findMember( TypeDesc name , MemberInfo::MemberType type = MemberInfo::AllTypes) ; - virtual QValueList getMemberClasses( const TypeDesc& name ) ; + virtual TQValueList getMemberClasses( const TypeDesc& name ) ; }; @@ -270,11 +270,11 @@ public: virtual bool isConst(); - virtual QValueList getArgumentTypes(); + virtual TQValueList getArgumentTypes(); - virtual QStringList getArgumentNames(); + virtual TQStringList getArgumentNames(); - virtual QStringList getArgumentDefaults(); + virtual TQStringList getArgumentDefaults(); struct CodeModelFunctionBuildInfo : public TypeBuildInfo { FunctionList m_items; @@ -313,11 +313,11 @@ public: } struct CatalogFunctionBuildInfo : public TypeBuildInfo { - QValueList m_tags; + TQValueList m_tags; TypeDesc m_desc; TypePointer m_parent; - CatalogFunctionBuildInfo( QValueList tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) { + CatalogFunctionBuildInfo( TQValueList tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) { } virtual TypePointer build(); @@ -327,13 +327,13 @@ public: virtual bool isConst (); - virtual QStringList getArgumentDefaults() { - return QStringList(); + virtual TQStringList getArgumentDefaults() { + return TQStringList(); } - virtual QStringList getArgumentNames(); + virtual TQStringList getArgumentNames(); - virtual QValueList getArgumentTypes(); + virtual TQValueList getArgumentTypes(); }; diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp index 2ae35401..f7937db1 100644 --- a/languages/cpp/simpletypenamespace.cpp +++ b/languages/cpp/simpletypenamespace.cpp @@ -11,7 +11,7 @@ email : david.nolden.kdevelop@art-master.de * (at your option) any later version. * * * ***************************************************************************/ -#include +#include #include #include "simpletypenamespace.h" #include "simpletypecachebinder.h" @@ -30,7 +30,7 @@ TypePointer SimpleTypeNamespace::clone() { return new SimpleTypeCachedNamespace( this ); } -SimpleTypeNamespace::SimpleTypeNamespace( const QStringList& fakeScope, const QStringList& realScope ) : SimpleTypeImpl( fakeScope ), m_currentSlaveId(0) { +SimpleTypeNamespace::SimpleTypeNamespace( const TQStringList& fakeScope, const TQStringList& realScope ) : SimpleTypeImpl( fakeScope ), m_currentSlaveId(0) { ifVerbose( dbg() << "\"" << str() << "\": created namespace-proxy with real scope \"" << realScope.join( "::" ) << "\"" << endl ); SimpleType cm = SimpleType( realScope, HashedStringSet(), RepoCodeModel ); SimpleType ct = SimpleType( realScope, HashedStringSet(), RepoCatalog ); @@ -42,7 +42,7 @@ SimpleTypeNamespace::SimpleTypeNamespace( const QStringList& fakeScope, const QS addImport( ct->desc() ); } -SimpleTypeNamespace::SimpleTypeNamespace( const QStringList& fakeScope ) : SimpleTypeImpl( fakeScope ), m_currentSlaveId(0) { +SimpleTypeNamespace::SimpleTypeNamespace( const TQStringList& fakeScope ) : SimpleTypeImpl( fakeScope ), m_currentSlaveId(0) { ifVerbose( dbg() << "\"" << str() << "\": created namespace-proxy" << endl ); } @@ -67,20 +67,20 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe return ret; } -QValueList SimpleTypeNamespace::getMemberClasses( const TypeDesc& name ) { +TQValueList SimpleTypeNamespace::getMemberClasses( const TypeDesc& name ) { std::set ignore; return getMemberClasses( name, ignore ); } -QValueList SimpleTypeNamespace::getMemberClasses( const TypeDesc& name, std::set& ignore ) { +TQValueList SimpleTypeNamespace::getMemberClasses( const TypeDesc& name, std::set& ignore ) { HashedString myName = HashedString( scope().join( "::" ) +"%"+typeid( *this ).name() ); if ( ignore.find( myName ) != ignore.end() || !safetyCounter ) - return QValueList(); + return TQValueList(); ignore.insert( myName ); - QValueList ret; + TQValueList ret; SlaveList l = getSlaves( name.includeFiles() ); for ( SlaveList::iterator it = l.begin(); it != l.end(); ++it ) { @@ -198,11 +198,11 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe // } // } -SimpleTypeImpl::MemberInfo SimpleTypeNamespace::setupMemberInfo( const QStringList& subName, const ImportList& imports ) { +SimpleTypeImpl::MemberInfo SimpleTypeNamespace::setupMemberInfo( const TQStringList& subName, const ImportList& imports ) { MemberInfo mem; mem.name = subName.join( "::" ); mem.memberType = MemberInfo::NotFound; - QStringList sc = scope(); + TQStringList sc = scope(); sc += subName; mem.type = sc.join( "::" ); mem.memberType = MemberInfo::Namespace; @@ -318,7 +318,7 @@ std::set SimpleTypeNamespace::updateAliases( const IncludeFiles& files/* } -void SimpleTypeNamespace::addAliases( QString map, const IncludeFiles& files ) { +void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) { while ( !map.isEmpty() ) { int mid = map.find( "=" ); int mid2 = map.find( "<<" ); diff --git a/languages/cpp/simpletypenamespace.h b/languages/cpp/simpletypenamespace.h index 169c4548..b465cfb6 100644 --- a/languages/cpp/simpletypenamespace.h +++ b/languages/cpp/simpletypenamespace.h @@ -62,9 +62,9 @@ class SimpleTypeNamespace : public SimpleTypeImpl { typedef std::multiset ImportList; - SimpleTypeNamespace( const QStringList& fakeScope, const QStringList& realScope ); + SimpleTypeNamespace( const TQStringList& fakeScope, const TQStringList& realScope ); - SimpleTypeNamespace( const QStringList& fakeScope ); + SimpleTypeNamespace( const TQStringList& fakeScope ); SimpleTypeNamespace( SimpleTypeNamespace* ns ); @@ -87,13 +87,13 @@ class SimpleTypeNamespace : public SimpleTypeImpl { /**Takes a map of multiple aliases in form "A=B;C=D;....;" similar to the C++ "namespace A=B;" statement * @param files Set of files that must be included for this alias-map to be active. If the set is empty, the alias will be used globally. */ - void addAliases( QString map, const IncludeFiles& files = IncludeFiles() ); + void addAliases( TQString map, const IncludeFiles& files = IncludeFiles() ); private: SlaveMap m_activeSlaves; size_t m_currentSlaveId; HashedStringSetGroup m_activeSlaveGroups; - typedef QMap AliasMap; + typedef TQMap AliasMap; AliasMap m_aliases; //Inserts all aliases necessary fo handling a request using the given IncludeFiles @@ -106,12 +106,12 @@ class SimpleTypeNamespace : public SimpleTypeImpl { friend class NamespaceBuildInfo; struct NamespaceBuildInfo : public TypeBuildInfo { - QStringList m_fakeScope; + TQStringList m_fakeScope; ImportList m_imports; TypePointer m_built; - NamespaceBuildInfo( QStringList fakeScope, const ImportList& imports ) { + NamespaceBuildInfo( TQStringList fakeScope, const ImportList& imports ) { m_fakeScope = fakeScope; m_imports = imports; } @@ -139,7 +139,7 @@ class SimpleTypeNamespace : public SimpleTypeImpl { virtual MemberInfo findMember( TypeDesc name, MemberInfo::MemberType type = MemberInfo::AllTypes ); - virtual QValueList getMemberClasses( const TypeDesc& name ) ; + virtual TQValueList getMemberClasses( const TypeDesc& name ) ; private: struct HashedStringHasher { @@ -150,9 +150,9 @@ class SimpleTypeNamespace : public SimpleTypeImpl { //Maps from HashedStringSet to the count of slaves when the item was cached, and the SlaveList // typedef __gnu_cxx::hash_map, HashedStringHasher> SlavesCache; //SlavesCache m_slavesCache; - QValueList getMemberClasses( const TypeDesc& name, std::set& ignore ) ; + TQValueList getMemberClasses( const TypeDesc& name, std::set& ignore ) ; - MemberInfo setupMemberInfo( const QStringList& subName, const ImportList& imports ); + MemberInfo setupMemberInfo( const TQStringList& subName, const ImportList& imports ); //TypePointer locateNamespace( const TypeDesc& alias ); diff --git a/languages/cpp/store_walker.cpp b/languages/cpp/store_walker.cpp index cd66dd23..bcea1a05 100644 --- a/languages/cpp/store_walker.cpp +++ b/languages/cpp/store_walker.cpp @@ -15,10 +15,10 @@ #include "driver.h" #include -#include -#include +#include +#include -StoreWalker::StoreWalker( const QString& fileName, CodeModel* store ) +StoreWalker::StoreWalker( const TQString& fileName, CodeModel* store ) : m_store( store ), m_anon( 0 ) { m_fileName = URLUtil::canonicalPath( fileName ); @@ -53,7 +53,7 @@ void StoreWalker::parseTranslationUnit( const ParsedFile& ast ) m_anon = 0; m_imports.clear(); - m_imports << QPair, QStringList>(QMap(), QStringList()); + m_imports << QPair, TQStringList>(TQMap(), TQStringList()); TreeParser::parseTranslationUnit( ast ); m_imports.pop_back(); } @@ -84,11 +84,11 @@ void StoreWalker::parseNamespace( NamespaceAST* ast ) ast->getStartPosition( &startLine, &startColumn ); ast->getEndPosition( &endLine, &endColumn ); - QString nsName; + TQString nsName; if ( !ast->namespaceName() || ast->namespaceName()->text().isEmpty() ) { - QFileInfo fileInfo( m_fileName ); - QString shortFileName = fileInfo.baseName(); + TQFileInfo fileInfo( m_fileName ); + TQString shortFileName = fileInfo.baseName(); nsName.sprintf( "(%s_%d)", shortFileName.local8Bit().data(), m_anon++ ); } @@ -110,8 +110,8 @@ void StoreWalker::parseNamespace( NamespaceAST* ast ) void StoreWalker::parseNamespaceAlias( NamespaceAliasAST* ast ) { - QString nsName; - QString aliasName; + TQString nsName; + TQString aliasName; if( !ast->namespaceName() || ast->namespaceName()->text().isEmpty() ) { @@ -145,7 +145,7 @@ void StoreWalker::parseUsing( UsingAST* ast ) void StoreWalker::parseUsingDirective( UsingDirectiveAST* ast ) { - QString name; + TQString name; if( ast->name() ) name = ast->name()->text(); @@ -169,7 +169,7 @@ void StoreWalker::parseTypedef( TypedefAST* ast ) if ( ast && ast->initDeclaratorList() && ast->initDeclaratorList() ->initDeclaratorList().count() > 0 ) { - QPtrList lst( ast->initDeclaratorList() ->initDeclaratorList() ); + TQPtrList lst( ast->initDeclaratorList() ->initDeclaratorList() ); m_currentDeclarator = lst.at( 0 ) ->declarator(); } @@ -186,19 +186,19 @@ void StoreWalker::parseTypedef( TypedefAST* ast ) if ( typeSpec && declarators ) { - QString typeId; + TQString typeId; if ( typeSpec->name() ) typeId = typeSpec->name() ->text(); - QPtrList l( declarators->initDeclaratorList() ); - QPtrListIterator it( l ); + TQPtrList l( declarators->initDeclaratorList() ); + TQPtrListIterator it( l ); InitDeclaratorAST* initDecl = 0; while ( 0 != ( initDecl = it.current() ) ) { - QString type, id; + TQString type, id; if ( initDecl->declarator() ) { type = typeOfDeclaration( typeSpec, initDecl->declarator() ); @@ -283,9 +283,9 @@ void StoreWalker::parseSimpleDeclaration( SimpleDeclarationAST* ast ) if ( declarators ) { - QPtrList l = declarators->initDeclaratorList(); + TQPtrList l = declarators->initDeclaratorList(); - QPtrListIterator it( l ); + TQPtrListIterator it( l ); while ( it.current() ) { parseDeclaration( ast->functionSpecifier(), ast->storageSpecifier(), @@ -296,11 +296,11 @@ void StoreWalker::parseSimpleDeclaration( SimpleDeclarationAST* ast ) } -QStringList StoreWalker::findScope( const QStringList& scope ) { +TQStringList StoreWalker::findScope( const TQStringList& scope ) { ClassDom d = findClassFromScope( scope ); if( d ) { - QStringList ret = d->scope(); + TQStringList ret = d->scope(); ret << d->name(); return ret; } @@ -330,11 +330,11 @@ void StoreWalker::parseFunctionDefinition( FunctionDefinitionAST* ast ) if ( funSpec ) { - QPtrList l = funSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = funSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "virtual" ) isVirtual = true; else if ( text == "inline" ) @@ -345,11 +345,11 @@ void StoreWalker::parseFunctionDefinition( FunctionDefinitionAST* ast ) if ( storageSpec ) { - QPtrList l = storageSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = storageSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -363,9 +363,9 @@ void StoreWalker::parseFunctionDefinition( FunctionDefinitionAST* ast ) ast->getStartPosition( &startLine, &startColumn ); ast->getEndPosition( &endLine, &endColumn ); - QString id = d->declaratorId() ->unqualifiedName() ->text().stripWhiteSpace(); + TQString id = d->declaratorId() ->unqualifiedName() ->text().stripWhiteSpace(); - QStringList scope = scopeOfDeclarator( d, m_currentScope ); + TQStringList scope = scopeOfDeclarator( d, m_currentScope ); ClassDom c; ///c should be nonzero if it is a function-definition for a function within another class if( !m_currentClass.top() ) { ///It is not a local definition within a class, so search the scope so it can be corrected using imports @@ -383,7 +383,7 @@ void StoreWalker::parseFunctionDefinition( FunctionDefinitionAST* ast ) parseFunctionArguments( d, model_cast( method ) ); - QString text = typeOfDeclaration( typeSpec, d ); + TQString text = typeOfDeclaration( typeSpec, d ); if ( !text.isEmpty() ) method->setResultType( text ); @@ -437,11 +437,11 @@ void StoreWalker::parseTypeSpecifier( TypeSpecifierAST* ast ) void StoreWalker::takeTemplateParams( TemplateModelItem& target, TemplateDeclarationAST* ast) { TemplateParameterListAST* pl = ast->templateParameterList(); if( pl ) { - QPtrList list = pl->templateParameterList(); + TQPtrList list = pl->templateParameterList(); TemplateParameterAST* curr = list.first(); while( curr != 0 ) { - QString a, b; + TQString a, b; if( curr->typeParameter() && curr->typeParameter()->name() ) { a = curr->typeParameter()->name()->text(); if( curr->typeParameter()->typeId() ) @@ -450,7 +450,7 @@ void StoreWalker::takeTemplateParams( TemplateModelItem& target, TemplateDeclara target.addTemplateParam( a, b ); CodeModelItem* cmi = dynamic_cast(&target); - QString nm = "0"; + TQString nm = "0"; if(cmi) nm = cmi->name(); kdDebug() << "item " << nm << " taking template-parameters " << a << ", default=" << b << "\n"; curr = list.next(); @@ -471,7 +471,7 @@ void StoreWalker::checkTemplateDeclarator( TemplateModelItem* item ) { int StoreWalker::mergeGroups( int g1, int g2 ) { int ng = m_store->mergeGroups( g1, g2 ); - for( QMap::iterator it = m_overrides.begin(); it != m_overrides.end(); ++it ) { + for( TQMap::iterator it = m_overrides.begin(); it != m_overrides.end(); ++it ) { int g =(*it)->groupId(); if( g == g1 || g == g2 ) (*it)->setGroupId( ng ); @@ -490,7 +490,7 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) bool oldInSlots = m_inSlots; bool oldInSignals = m_inSignals; - QString kind = ast->classKey() ->text(); + TQString kind = ast->classKey() ->text(); if ( kind == "class" ) m_currentAccess = CodeModelItem::Private; else @@ -498,15 +498,15 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) m_inSlots = false; m_inSignals = false; - QString className; + TQString className; if ( !ast->name() && m_currentDeclarator && m_currentDeclarator->declaratorId() ) { className = m_currentDeclarator->declaratorId() ->text().stripWhiteSpace(); } else if ( !ast->name() ) { - QFileInfo fileInfo( m_fileName ); - QString shortFileName = fileInfo.baseName(); + TQFileInfo fileInfo( m_fileName ); + TQString shortFileName = fileInfo.baseName(); className.sprintf( "(%s_%d)", shortFileName.local8Bit().data(), m_anon++ ); } else @@ -530,13 +530,13 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) checkTemplateDeclarator( &(*klass) ); - bool embed = !scopeOfName( ast->name(), QStringList() ).isEmpty(); + bool embed = !scopeOfName( ast->name(), TQStringList() ).isEmpty(); - QStringList oldScope; + TQStringList oldScope; if( embed ) { - ClassDom embedderClass = findClassFromScope( m_currentScope + scopeOfName( ast->name(), QStringList() )); + ClassDom embedderClass = findClassFromScope( m_currentScope + scopeOfName( ast->name(), TQStringList() )); if(embedderClass) { if(embedderClass->fileName() != klass->fileName()) { @@ -556,7 +556,7 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) //m_file->addClass( klass );//experiment }else{ - kdDebug( 9007 ) << "could not find embedding class " << QStringList(m_currentScope + scopeOfName( ast->name(), QStringList() )).join("::") << " for " << className << endl; + kdDebug( 9007 ) << "could not find embedding class " << TQStringList(m_currentScope + scopeOfName( ast->name(), TQStringList() )).join("::") << " for " << className << endl; embed = false; } } @@ -577,7 +577,7 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) m_currentScope.push_back( className ); m_currentClass.push( klass ); - //m_imports.push_back( QStringList() ); + //m_imports.push_back( TQStringList() ); TreeParser::parseClassSpecifier( ast ); @@ -621,8 +621,8 @@ void StoreWalker::parseEnumSpecifier( EnumSpecifierAST* ast ) m_file->addTypeAlias( typeAlias ); } - QPtrList l = ast->enumeratorList(); - QPtrListIterator it( l ); + TQPtrList l = ast->enumeratorList(); + TQPtrListIterator it( l ); while ( it.current() ) { VariableDom attr = m_store->create(); @@ -688,13 +688,13 @@ void StoreWalker::parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec, while ( t && t->subDeclarator() ) t = t->subDeclarator(); - QString id; + TQString id; if ( t && t->declaratorId() && t->declaratorId() ->unqualifiedName() ) id = t->declaratorId() ->unqualifiedName() ->text(); - if ( !scopeOfDeclarator( d, QStringList() ).isEmpty() ) + if ( !scopeOfDeclarator( d, TQStringList() ).isEmpty() ) { - kdDebug( 9007 ) << "skip declaration of " << QStringList(scopeOfDeclarator( d, QStringList() )).join("::") << "::" << id << endl; + kdDebug( 9007 ) << "skip declaration of " << TQStringList(scopeOfDeclarator( d, TQStringList() )).join("::") << "::" << id << endl; return ; } @@ -712,7 +712,7 @@ void StoreWalker::parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec, attr->setAccess( m_currentAccess ); - QString text = typeOfDeclaration( typeSpec, d ); + TQString text = typeOfDeclaration( typeSpec, d ); if ( !text.isEmpty() ) { attr->setType( text ); } @@ -725,11 +725,11 @@ void StoreWalker::parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec, if ( storageSpec ) { - QPtrList l = storageSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = storageSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -750,9 +750,9 @@ void StoreWalker::parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec, void StoreWalker::parseAccessDeclaration( AccessDeclarationAST * access ) { - QPtrList l = access->accessList(); + TQPtrList l = access->accessList(); - QString accessStr = l.at( 0 ) ->text(); + TQString accessStr = l.at( 0 ) ->text(); if ( accessStr == "public" ) m_currentAccess = CodeModelItem::Public; else if ( accessStr == "protected" ) @@ -768,7 +768,7 @@ void StoreWalker::parseAccessDeclaration( AccessDeclarationAST * access ) m_inSignals = l.count() >= 1 ? l.at( 0 ) ->text() == "signals" : false; } -NamespaceDom StoreWalker::findOrInsertNamespace( NamespaceAST* ast, const QString & name ) +NamespaceDom StoreWalker::findOrInsertNamespace( NamespaceAST* ast, const TQString & name ) { if ( m_currentNamespace.top() && m_currentNamespace.top() ->hasNamespace( name ) ) return m_currentNamespace.top() ->namespaceByName( name ); @@ -809,11 +809,11 @@ void StoreWalker::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storage if ( funSpec ) { - QPtrList l = funSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = funSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "virtual" ) isVirtual = true; else if ( text == "inline" ) @@ -824,11 +824,11 @@ void StoreWalker::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storage if ( storageSpec ) { - QPtrList l = storageSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = storageSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -843,7 +843,7 @@ void StoreWalker::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storage decl->getEndPosition( &endLine, &endColumn ); DeclaratorAST* d = decl->declarator(); - QString id = d->declaratorId() ->unqualifiedName() ->text(); + TQString id = d->declaratorId() ->unqualifiedName() ->text(); FunctionDom method = m_store->create(); method->setName( id ); @@ -867,7 +867,7 @@ void StoreWalker::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storage if ( m_inSlots ) method->setSlot( true ); - QString text = typeOfDeclaration( typeSpec, d ); + TQString text = typeOfDeclaration( typeSpec, d ); if ( !text.isEmpty() ) method->setResultType( text ); @@ -889,8 +889,8 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom if ( clause && clause->parameterDeclarationList() ) { ParameterDeclarationListAST * params = clause->parameterDeclarationList(); - QPtrList l( params->parameterList() ); - QPtrListIterator it( l ); + TQPtrList l( params->parameterList() ); + TQPtrListIterator it( l ); while ( it.current() ) { ParameterDeclarationAST * param = it.current(); @@ -900,12 +900,12 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom if ( param->declarator() ) { - QString text = declaratorToString( param->declarator(), QString::null, true ); + TQString text = declaratorToString( param->declarator(), TQString::null, true ); if ( !text.isEmpty() ) arg->setName( text ); } - QString tp = typeOfDeclaration( param->typeSpec(), param->declarator() ); + TQString tp = typeOfDeclaration( param->typeSpec(), param->declarator() ); if ( !tp.isEmpty() ) arg->setType( tp ); @@ -914,17 +914,17 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom } } -QString StoreWalker::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) +TQString StoreWalker::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) { if ( !typeSpec || !declarator ) - return QString::null; + return TQString::null; - QString text; + TQString text; text += typeSpec->text(); - QPtrList ptrOpList = declarator->ptrOpList(); - for ( QPtrListIterator it( ptrOpList ); it.current(); ++it ) + TQPtrList ptrOpList = declarator->ptrOpList(); + for ( TQPtrListIterator it( ptrOpList ); it.current(); ++it ) { text += it.current() ->text(); } @@ -938,13 +938,13 @@ QString StoreWalker::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAS void StoreWalker::parseBaseClause( BaseClauseAST * baseClause, ClassDom klass ) { - QPtrList l = baseClause->baseSpecifierList(); - QPtrListIterator it( l ); + TQPtrList l = baseClause->baseSpecifierList(); + TQPtrListIterator it( l ); while ( it.current() ) { BaseSpecifierAST * baseSpecifier = it.current(); - QString baseName; + TQString baseName; if ( baseSpecifier->name() ) baseName = baseSpecifier->name() ->text(); @@ -954,15 +954,15 @@ void StoreWalker::parseBaseClause( BaseClauseAST * baseClause, ClassDom klass ) } } -QStringList StoreWalker::scopeOfName( NameAST* id, const QStringList& startScope ) +TQStringList StoreWalker::scopeOfName( NameAST* id, const TQStringList& startScope ) { - QStringList scope = startScope; + TQStringList scope = startScope; if ( id && id->classOrNamespaceNameList().count() ) { if ( id->isGlobal() ) scope.clear(); - QPtrList l = id->classOrNamespaceNameList(); - QPtrListIterator it( l ); + TQPtrList l = id->classOrNamespaceNameList(); + TQPtrListIterator it( l ); while ( it.current() ) { if ( it.current() ->name() ) @@ -978,11 +978,11 @@ QStringList StoreWalker::scopeOfName( NameAST* id, const QStringList& startScope ///@todo respect the imports that result from the headers etc. -ClassDom StoreWalker::findClassFromScope( const QStringList& scope ) +ClassDom StoreWalker::findClassFromScope( const TQStringList& scope ) { - QString scopeText = scope.join("::"); + TQString scopeText = scope.join("::"); if( !m_imports.isEmpty() ) { - QMapIterator it = m_imports.back().first.find( scopeText ); + TQMapIterator it = m_imports.back().first.find( scopeText ); if( it != m_imports.back().first.end() ) { return *it; } @@ -997,9 +997,9 @@ ClassDom StoreWalker::findClassFromScope( const QStringList& scope ) if(!m_imports.isEmpty() && !m_imports.back().second.isEmpty()) { ///try the same using one of the imports(performance-wise this is not good, but simple) - QStringList::iterator it = m_imports.back().second.begin(); + TQStringList::iterator it = m_imports.back().second.begin(); while(it != m_imports.back().second.end()) { - QStringList scp = QStringList::split("::", *it) + m_currentScope + scope; + TQStringList scp = TQStringList::split("::", *it) + m_currentScope + scope; c = classFromScope( scp ); if( c ) { if( !m_imports.isEmpty() ) m_imports.back().first[ scopeText ] = c; @@ -1011,12 +1011,12 @@ ClassDom StoreWalker::findClassFromScope( const QStringList& scope ) return c; } -ClassDom findScopeInFile( const QStringList& scope, NamespaceModel* glob ) { +ClassDom findScopeInFile( const TQStringList& scope, NamespaceModel* glob ) { if( !glob ) return ClassDom(); ClassModel* curr = glob ; - QStringList::const_iterator mit = scope.begin(); + TQStringList::const_iterator mit = scope.begin(); while(curr->isNamespace() && mit != scope.end() && ((NamespaceModel*)curr)->hasNamespace( *mit )) { curr = &(*( ((NamespaceModel*)curr)->namespaceByName( *mit ) )); @@ -1036,7 +1036,7 @@ ClassDom findScopeInFile( const QStringList& scope, NamespaceModel* glob ) { } } -ClassDom StoreWalker::classFromScope(const QStringList& scope) { +ClassDom StoreWalker::classFromScope(const TQStringList& scope) { if(scope.isEmpty())return ClassDom(0); //Since another instance of the current file may still be in the code-model this must be testede BEFORE the code-model @@ -1048,7 +1048,7 @@ ClassDom StoreWalker::classFromScope(const QStringList& scope) { c = findScopeInFile( scope, glob ); - QMap::const_iterator it; + TQMap::const_iterator it; if( c ) { ///Check the file that overrides the code-model file @@ -1062,7 +1062,7 @@ ClassDom StoreWalker::classFromScope(const QStringList& scope) { } } else { ///Search in all overrides, because they will be added later all at once - for( QMap::const_iterator it = m_overrides.begin(); it != m_overrides.end(); ++it ) { + for( TQMap::const_iterator it = m_overrides.begin(); it != m_overrides.end(); ++it ) { c = findScopeInFile( scope, *it ); if( c ) return c; @@ -1073,7 +1073,7 @@ ClassDom StoreWalker::classFromScope(const QStringList& scope) { } -QStringList StoreWalker::scopeOfDeclarator( DeclaratorAST* d, const QStringList& startScope ) +TQStringList StoreWalker::scopeOfDeclarator( DeclaratorAST* d, const TQStringList& startScope ) { return scopeOfName( d->declaratorId(), startScope ); } diff --git a/languages/cpp/store_walker.h b/languages/cpp/store_walker.h index 488e692b..49c4bb8f 100644 --- a/languages/cpp/store_walker.h +++ b/languages/cpp/store_walker.h @@ -14,14 +14,14 @@ #include "tree_parser.h" #include -#include -#include +#include +#include #include class StoreWalker: public TreeParser { public: - StoreWalker( const QString& fileName, CodeModel* store ); + StoreWalker( const TQString& fileName, CodeModel* store ); virtual ~StoreWalker(); FileDom file() @@ -61,19 +61,19 @@ public: virtual void parseBaseClause( BaseClauseAST* baseClause, ClassDom klass ); private: - NamespaceDom findOrInsertNamespace( NamespaceAST* ast, const QString& name ); - QString typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ); - QStringList scopeOfName( NameAST* id, const QStringList& scope ); - QStringList scopeOfDeclarator( DeclaratorAST* d, const QStringList& scope ); - ClassDom classFromScope(const QStringList& scope); - ClassDom findClassFromScope(const QStringList& scope); + NamespaceDom findOrInsertNamespace( NamespaceAST* ast, const TQString& name ); + TQString typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ); + TQStringList scopeOfName( NameAST* id, const TQStringList& scope ); + TQStringList scopeOfDeclarator( DeclaratorAST* d, const TQStringList& scope ); + ClassDom classFromScope(const TQStringList& scope); + ClassDom findClassFromScope(const TQStringList& scope); void checkTemplateDeclarator( TemplateModelItem* item ); private: class CommentPusher { StoreWalker& m_ref; public: - CommentPusher( StoreWalker& ref, QString comment ) : m_ref( ref ) { + CommentPusher( StoreWalker& ref, TQString comment ) : m_ref( ref ) { m_ref.pushComment( comment ); } ~CommentPusher() { @@ -81,9 +81,9 @@ private: } }; - QStringList m_comments; + TQStringList m_comments; - QString comment() { + TQString comment() { if( m_comments.isEmpty() ) { return ""; } else { @@ -95,7 +95,7 @@ private: int mergeGroups( int g1, int g2 ); public: - void pushComment( QString comm ) { + void pushComment( TQString comm ) { m_comments.push_front( comm ); } @@ -103,19 +103,19 @@ public: m_comments.pop_front(); } - void setOverrides( const QMap& overrides ) { + void setOverrides( const TQMap& overrides ) { m_overrides = overrides; } private: - QMap m_overrides; + TQMap m_overrides; FileDom m_file; - QString m_fileName; + TQString m_fileName; HashedString m_hashedFileName; - QStringList m_currentScope; + TQStringList m_currentScope; CodeModel* m_store; - QValueList, QStringList> > m_imports; + TQValueList, TQStringList> > m_imports; int m_currentAccess; bool m_inSlots; bool m_inSignals; @@ -124,11 +124,11 @@ private: bool m_inTypedef; DeclaratorAST* m_currentDeclarator; - QValueStack m_currentTemplateDeclarator; - QValueStack m_currentNamespace; - QValueStack m_currentClass; + TQValueStack m_currentTemplateDeclarator; + TQValueStack m_currentNamespace; + TQValueStack m_currentClass; - QStringList findScope( const QStringList& scope ); + TQStringList findScope( const TQStringList& scope ); private: diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp index 3569bdea..6ad55925 100644 --- a/languages/cpp/storeconverter.cpp +++ b/languages/cpp/storeconverter.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "storeconverter.h" -#include +#include #include @@ -25,20 +25,20 @@ StoreConverter::StoreConverter(CppSupportPart *part, CodeModel *model) { } -void StoreConverter::PCSClassToCodeModel(const QString &className, const QStringList &/*classScope*/) +void StoreConverter::PCSClassToCodeModel(const TQString &className, const TQStringList &/*classScope*/) { - QValueList catalogs = m_part->codeRepository()->registeredCatalogs(); - for (QValueList::iterator it = catalogs.begin(); + TQValueList catalogs = m_part->codeRepository()->registeredCatalogs(); + for (TQValueList::iterator it = catalogs.begin(); it != catalogs.end(); ++it) { Catalog *catalog = *it; kdDebug() << "looking in catalog: " << catalog->dbName() << endl; - QValueList args; + TQValueList args; args << Catalog::QueryArgument( "kind", Tag::Kind_Class ); args << Catalog::QueryArgument( "name", className ); - QValueList tags = catalog->query(args); - for (QValueList::iterator it = tags.begin(); it != tags.end(); ++it ) + TQValueList tags = catalog->query(args); + for (TQValueList::iterator it = tags.begin(); it != tags.end(); ++it ) { Tag& tag = *it; kdDebug() << "TAG: " << tag.name() << " in file " << tag.fileName() << endl; @@ -67,13 +67,13 @@ void StoreConverter::parseClass(Tag &classTag, FileDom file) klass->setName(classTag.name()); klass->setFileName(classTag.fileName()); - QStringList scope; + TQStringList scope; scope.append(classTag.name()); - QValueList symbolTags = m_part->codeCompletion()->repository()-> + TQValueList symbolTags = m_part->codeCompletion()->repository()-> getTagsInScope(scope, false); // kdDebug() << "got tags: " << endl; - for (QValueList::iterator sit = symbolTags.begin(); sit != symbolTags.end(); ++sit ) + for (TQValueList::iterator sit = symbolTags.begin(); sit != symbolTags.end(); ++sit ) { Tag &symbol = *sit; // kdDebug() << symbol.name() << endl; @@ -88,8 +88,8 @@ void StoreConverter::parseClass(Tag &classTag, FileDom file) } } - QValueList baseClassTags = m_part->codeCompletion()->repository()->getBaseClassList(classTag.name()); - for (QValueList::iterator bit = baseClassTags.begin(); + TQValueList baseClassTags = m_part->codeCompletion()->repository()->getBaseClassList(classTag.name()); + for (TQValueList::iterator bit = baseClassTags.begin(); bit != baseClassTags.end(); ++bit) klass->addBaseClass((*bit).name()); @@ -135,8 +135,8 @@ void StoreConverter::parseVariable(Tag &var, ClassDom klass) void StoreConverter::parseArguments(FunctionDom function, CppFunction &cppFun) { - QStringList args = cppFun.arguments(); - for (QStringList::const_iterator it = args.constBegin(); it != args.constEnd(); ++it) + TQStringList args = cppFun.arguments(); + for (TQStringList::const_iterator it = args.constBegin(); it != args.constEnd(); ++it) { ArgumentDom arg = m_model->create(); arg->setType(*it); diff --git a/languages/cpp/storeconverter.h b/languages/cpp/storeconverter.h index 34a5d3d3..1aa48e6b 100644 --- a/languages/cpp/storeconverter.h +++ b/languages/cpp/storeconverter.h @@ -11,7 +11,7 @@ #ifndef STORECONVERTER_H #define STORECONVERTER_H -#include +#include #include #include @@ -26,7 +26,7 @@ class StoreConverter public: StoreConverter( CppSupportPart *part, CodeModel *model ); - void PCSClassToCodeModel( const QString &className, const QStringList &classScope ); + void PCSClassToCodeModel( const TQString &className, const TQStringList &classScope ); protected: /**Parses class from PCS and adds it into a file dom.*/ diff --git a/languages/cpp/stringhelpers.cpp b/languages/cpp/stringhelpers.cpp index d380fd64..13a39de2 100644 --- a/languages/cpp/stringhelpers.cpp +++ b/languages/cpp/stringhelpers.cpp @@ -19,17 +19,17 @@ k copyright : (C) 2006 by David Nolden namespace StringHelpers { -void clearStr( QString& str, int start, int end ) { +void clearStr( TQString& str, int start, int end ) { for( int a = start; a < end; a++) str[a] = ' '; } -bool isValidIdentifierSign( const QChar& c ) { +bool isValidIdentifierSign( const TQChar& c ) { if( c.isLetter() || c.isDigit() || c == '_' ) return true; else return false; } -QString clearComments( QString str ) { +TQString clearComments( TQString str ) { if( str.isEmpty() ) return ""; SafetyCounter s( 1000 ); @@ -64,7 +64,7 @@ QString clearComments( QString str ) { return str; } -QString cutTemplateParams( QString str ) { +TQString cutTemplateParams( TQString str ) { int p; if( (p = str.find('<') ) != -1) { return str.left( p ); @@ -73,8 +73,8 @@ QString cutTemplateParams( QString str ) { return str.stripWhiteSpace().replace('*',""); } -QPair splitTemplateParams( QString str ) { - QPair ret; +QPair splitTemplateParams( TQString str ) { + QPair ret; int p; if( (p = str.find('<') ) != -1) { ret.first = str.left( p ).stripWhiteSpace(); @@ -86,7 +86,7 @@ QPair splitTemplateParams( QString str ) { return ret; } -bool parenFits( QChar c1, QChar c2 ) { +bool parenFits( TQChar c1, TQChar c2 ) { if( c1 == '<' && c2 == '>' ) return true; else if( c1 == '(' && c2 == ')' ) return true; else if( c1 == '[' && c2 == ']' ) return true; @@ -95,7 +95,7 @@ bool parenFits( QChar c1, QChar c2 ) { return false; } -bool isParen( QChar c1 ) { +bool isParen( TQChar c1 ) { if( c1 == '<' || c1 == '>' ) return true; else if( c1 == '(' || c1 == ')' ) return true; else if( c1 == '[' || c1 == ']' ) return true; @@ -104,25 +104,25 @@ bool isParen( QChar c1 ) { return false; } -bool isTypeParen( QChar c1 ) { +bool isTypeParen( TQChar c1 ) { if( c1 == '<' || c1 == '>' ) return true; else return false; } -bool isTypeOpenParen( QChar c1 ) { +bool isTypeOpenParen( TQChar c1 ) { if( c1 == '<' ) return true; else return false; } -bool isTypeCloseParen( QChar c1 ) { +bool isTypeCloseParen( TQChar c1 ) { if( c1 == '>' ) return true; else return false; } -bool isLeftParen( QChar c1 ) { +bool isLeftParen( TQChar c1 ) { if( c1 == '<' ) return true; else if( c1 == '(' ) return true; else if( c1 == '[' ) return true; @@ -131,10 +131,10 @@ bool isLeftParen( QChar c1 ) { return false; } -int findClose( const QString& str , int pos ) { +int findClose( const TQString& str , int pos ) { int depth = 0; - QValueList st; - QChar last = ' '; + TQValueList st; + TQChar last = ' '; for( int a = pos; a < (int)str.length(); a++) { switch(str[a]) { @@ -176,23 +176,23 @@ int findClose( const QString& str , int pos ) { return -1; } -QString tagType( const Tag& tag ) +TQString tagType( const Tag& tag ) { if ( tag.hasAttribute( "t" ) ) { - QString type = tag.attribute( "t" ).toString(); + TQString type = tag.attribute( "t" ).toString(); return type; } else if ( tag.kind() == Tag::Kind_Class || tag.kind() == Tag::Kind_Namespace ) { - QStringList l = tag.scope(); + TQStringList l = tag.scope(); l << tag.name(); return l.join("::"); } - return QString(); + return TQString(); } -int findCommaOrEnd( const QString& str , int pos, QChar validEnd) { +int findCommaOrEnd( const TQString& str , int pos, TQChar validEnd) { for( int a = pos; a < (int)str.length(); a++) { switch(str[a]) { @@ -218,7 +218,7 @@ int findCommaOrEnd( const QString& str , int pos, QChar validEnd) { return str.length(); } -int countExtract( QChar c, const QString& str ) { +int countExtract( TQChar c, const TQString& str ) { int ret = 0; for( int a = 0; a < (int)str.length(); a++) { if( str[a] == c ) ++ret; @@ -236,7 +236,7 @@ int countExtract( QChar c, const QString& str ) { return ret; } -QString templateParamFromString( int num, QString str ) { +TQString templateParamFromString( int num, TQString str ) { if( str.endsWith("::") ) str.truncate( str.length() - 2 ); int begin = str.find('<'); int end = str.findRev('>'); @@ -257,8 +257,8 @@ QString templateParamFromString( int num, QString str ) { return str.mid( begin, end - begin ).stripWhiteSpace(); } -QStringList splitType( QString str ) { - QStringList ret; +TQStringList splitType( TQString str ) { + TQStringList ret; int currentStart = 0; bool was = false; for( int a = 0; a < (int)str.length(); ++a ) { @@ -287,8 +287,8 @@ QStringList splitType( QString str ) { return ret; } -QString stringMult( int count, QString str ){ - QString ret; +TQString stringMult( int count, TQString str ){ + TQString ret; for( int a = 0; a < count; a++ ) ret += str; return ret; } diff --git a/languages/cpp/stringhelpers.h b/languages/cpp/stringhelpers.h index d15f57aa..c8783413 100644 --- a/languages/cpp/stringhelpers.h +++ b/languages/cpp/stringhelpers.h @@ -23,46 +23,46 @@ namespace StringHelpers { -void clearStr( QString& str, int start, int end ); +void clearStr( TQString& str, int start, int end ); ///Fills all comments with whitespaces -QString clearComments( QString str ); +TQString clearComments( TQString str ); -QString cutTemplateParams( QString str ); +TQString cutTemplateParams( TQString str ); -QPair splitTemplateParams( QString str ); +QPair splitTemplateParams( TQString str ); -bool parenFits( QChar c1, QChar c2 ); +bool parenFits( TQChar c1, TQChar c2 ); -bool isParen( QChar c1 ); +bool isParen( TQChar c1 ); -bool isTypeParen( QChar c1 ); +bool isTypeParen( TQChar c1 ); -bool isTypeOpenParen( QChar c1 ); +bool isTypeOpenParen( TQChar c1 ); -bool isTypeCloseParen( QChar c1 ); +bool isTypeCloseParen( TQChar c1 ); -bool isLeftParen( QChar c1 ); +bool isLeftParen( TQChar c1 ); /*only from left to right searches a fitting closing sign ( a ')' for a '(', ']' for '[' ignores quoted text comments are currently not allowed */ -int findClose( const QString& str , int pos ); //todo: make this respect strings +int findClose( const TQString& str , int pos ); //todo: make this respect strings -QString tagType( const Tag& tag ); +TQString tagType( const Tag& tag ); -int findCommaOrEnd( const QString& str , int pos, QChar validEnd = ' ' ); +int findCommaOrEnd( const TQString& str , int pos, TQChar validEnd = ' ' ); -int countExtract( QChar c, const QString& str ); +int countExtract( TQChar c, const TQString& str ); -QString templateParamFromString( int num, QString str ); +TQString templateParamFromString( int num, TQString str ); -QStringList splitType( QString str ) ; +TQStringList splitType( TQString str ) ; class ParamIterator { public: - ParamIterator( QString parens, QString source ) : m_source( source ), m_parens( parens ), m_cur( 0 ), m_curEnd ( 0 ) { + ParamIterator( TQString parens, TQString source ) : m_source( source ), m_parens( parens ), m_cur( 0 ), m_curEnd ( 0 ) { int begin = m_source.find( m_parens[ 0 ] ); int end = m_source.findRev( m_parens[ 1 ] ); m_prefix = m_source.left( begin ); @@ -83,7 +83,7 @@ class ParamIterator { return *this; } - QString operator *() { + TQString operator *() { return m_source.mid( m_cur, m_curEnd - m_cur ).stripWhiteSpace(); } @@ -91,14 +91,14 @@ class ParamIterator { return m_cur < ( int ) m_source.length(); } - QString prefix() const { + TQString prefix() const { return m_prefix; } private: - QString m_prefix; - QString m_source; - QString m_parens; + TQString m_prefix; + TQString m_source; + TQString m_parens; int m_cur; int m_curEnd; @@ -108,9 +108,9 @@ class ParamIterator { }; -bool isValidIdentifierSign( const QChar& c ); +bool isValidIdentifierSign( const TQChar& c ); -QString stringMult( int count, QString str ); +TQString stringMult( int count, TQString str ); } diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.cpp b/languages/cpp/subclassing_template/subclass_qt4_template.cpp index 6c008d43..c7b3e1f1 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.cpp +++ b/languages/cpp/subclassing_template/subclass_qt4_template.cpp @@ -2,7 +2,7 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(QWidget* parent, Qt::WFlags fl) +$NEWCLASS$::$NEWCLASS$(TQWidget* parent, Qt::WFlags fl) : $QTBASECLASS$( parent, fl ), Ui::$BASECLASS$() { setupUi(this); diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.h b/languages/cpp/subclassing_template/subclass_qt4_template.h index a8a02303..a84cf0d0 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.h +++ b/languages/cpp/subclassing_template/subclass_qt4_template.h @@ -10,7 +10,7 @@ class $NEWCLASS$ : public $QTBASECLASS$, private Ui::$BASECLASS$ Q_OBJECT public: - $NEWCLASS$(QWidget* parent = 0, Qt::WFlags fl = 0 ); + $NEWCLASS$(TQWidget* parent = 0, Qt::WFlags fl = 0 ); ~$NEWCLASS$(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/subclassing_template/subclass_template.cpp b/languages/cpp/subclassing_template/subclass_template.cpp index 19269531..adc89082 100644 --- a/languages/cpp/subclassing_template/subclass_template.cpp +++ b/languages/cpp/subclassing_template/subclass_template.cpp @@ -2,7 +2,7 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(QWidget* parent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) +$NEWCLASS$::$NEWCLASS$(TQWidget* parent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) : $BASECLASS$(parent,name$CAN_BE_MODAL_CPP2$,fl) { } diff --git a/languages/cpp/subclassing_template/subclass_template.h b/languages/cpp/subclassing_template/subclass_template.h index 18846cc6..8e238bae 100644 --- a/languages/cpp/subclassing_template/subclass_template.h +++ b/languages/cpp/subclassing_template/subclass_template.h @@ -9,7 +9,7 @@ class $NEWCLASS$ : public $BASECLASS$ Q_OBJECT public: - $NEWCLASS$(QWidget* parent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 ); + $NEWCLASS$(TQWidget* parent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 ); ~$NEWCLASS$(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index fa5aece9..562cd010 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -22,20 +22,20 @@ #include "filetemplate.h" #include "codemodel.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include #include -#include +#include #include #include #include -#include -#include +#include +#include #include @@ -54,17 +54,17 @@ #define SLOT_HELP SlotItem(m_slotView,"help()","virtual","protected","void",false,true) -SlotItem::SlotItem(QListView *parent,const QString &methodName, - const QString &specifier, - const QString &access, const QString &returnType, +SlotItem::SlotItem(TQListView *parent,const TQString &methodName, + const TQString &specifier, + const TQString &access, const TQString &returnType, bool isFunc,bool callBaseClass) -: QCheckListItem(parent,methodName,QCheckListItem::CheckBox) +: TQCheckListItem(parent,methodName,TQCheckListItem::CheckBox) { setOn(true); m_methodName = methodName; - m_access = access.isEmpty() ? (const QString) "public" : access; - m_specifier = specifier.isEmpty() ? (const QString) "virtual" : specifier; - m_returnType = returnType.isEmpty() ? (const QString) "void" : returnType; + m_access = access.isEmpty() ? (const TQString) "public" : access; + m_specifier = specifier.isEmpty() ? (const TQString) "virtual" : specifier; + m_returnType = returnType.isEmpty() ? (const TQString) "void" : returnType; m_isFunc = isFunc; m_callBaseClass = callBaseClass; setText(0,m_methodName); @@ -93,8 +93,8 @@ void SlotItem::setAllreadyInSubclass() } -SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const QString &formFile, - QStringList &newFileNames, QWidget* parent, +SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile, + TQStringList &newFileNames, TQWidget* parent, const char* name,bool modal, WFlags fl) : SubclassingDlgBase(parent,name,modal,fl), m_newFileNames(newFileNames), m_cppSupport( cppSupport ) @@ -115,9 +115,9 @@ m_newFileNames(newFileNames), m_cppSupport( cppSupport ) } -SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const QString &formFile, - const QString &filename, QStringList &dummy, - QWidget* parent, const char* name, bool modal, WFlags fl) +SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile, + const TQString &filename, TQStringList &dummy, + TQWidget* parent, const char* name, bool modal, WFlags fl) : SubclassingDlgBase(parent, name, modal, fl), m_newFileNames(dummy), m_cppSupport( cppSupport ) @@ -135,12 +135,12 @@ m_newFileNames(dummy), m_cppSupport( cppSupport ) reformat_box->setChecked(true); } - QStringList pathsplit(QStringList::split('/',filename)); + TQStringList pathsplit(TQStringList::split('/',filename)); - QString baseClass = readBaseClassName(); - if (!cppSupport->codeModel()->hasFile(filename+QString(".h"))) + TQString baseClass = readBaseClassName(); + if (!cppSupport->codeModel()->hasFile(filename+TQString(".h"))) return; - ClassList myClasses = cppSupport->codeModel()->fileByName(filename+QString(".h"))->classList(); + ClassList myClasses = cppSupport->codeModel()->fileByName(filename+TQString(".h"))->classList(); for (ClassList::const_iterator classIt = myClasses.begin(); classIt != myClasses.end(); ++classIt) { kdDebug() << "base class " << baseClass << " class " << (*classIt)->name() @@ -163,7 +163,7 @@ m_newFileNames(dummy), m_cppSupport( cppSupport ) m_btnOk->setEnabled(true); } -bool SubclassingDlg::alreadyInSubclass(const QString &method) +bool SubclassingDlg::alreadyInSubclass(const TQString &method) { for (uint i=0;isetEnabled(false); - QDomDocument doc; + TQDomDocument doc; DomUtil::openDOMFile(doc,m_formFile); m_baseClassName = DomUtil::elementByPathExt(doc,WIDGET_CLASS_NAME).text(); @@ -191,13 +191,13 @@ void SubclassingDlg::readUiFile() // Special widget specific slots SlotItem *newSlot; - m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","QDialog"); + m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog"); - if ( (m_qtBaseClassName=="QMainWindow") || (m_qtBaseClassName=="QWidget") ) + if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") ) m_canBeModal = false; else m_canBeModal = true; - if (m_qtBaseClassName != "QWidget") + if (m_qtBaseClassName != "TQWidget") { newSlot = new SLOT_ACCEPT; newSlot->setOn(false); @@ -214,7 +214,7 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - if (m_qtBaseClassName == "QWizard") + if (m_qtBaseClassName == "TQWizard") { newSlot = new SLOT_NEXT; m_slotView->insertItem(newSlot); @@ -234,12 +234,12 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - QDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); - QDomNodeList slotnodes = slotsElem.childNodes(); + TQDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); + TQDomNodeList slotnodes = slotsElem.childNodes(); for (unsigned int i=0; itext().upper()); replace(buffer,"$BASEFILENAMELC$",m_formName.lower()); @@ -327,11 +327,11 @@ bool SubclassingDlg::replaceKeywords(QString &buffer,bool canBeModal) return true; } -bool SubclassingDlg::saveBuffer(QString &buffer, const QString& filename) +bool SubclassingDlg::saveBuffer(TQString &buffer, const TQString& filename) { // save buffer - QFile dataFile(filename); + TQFile dataFile(filename); if (!dataFile.open(IO_WriteOnly | IO_Truncate)) return false; dataFile.writeBlock((buffer+"\n").ascii(),(buffer+"\n").length()); @@ -353,19 +353,19 @@ void SubclassingDlg::accept() // h - file - QString public_slot = + TQString public_slot = "/*$PUBLIC_SLOTS$*/\n "; - QString protected_slot = + TQString protected_slot = "/*$PROTECTED_SLOTS$*/\n "; - QString public_func = + TQString public_func = "/*$PUBLIC_FUNCTIONS$*/\n "; - QString protected_func = + TQString protected_func = "/*$PROTECTED_FUNCTIONS$*/\n "; - QString buffer; + TQString buffer; int qtVersion = DomUtil::readIntEntry( *m_cppSupport->project()->projectDom(), "/kdevcppsupport/qt/version", 3 ); if (m_creatingNewSubclass) { @@ -375,11 +375,11 @@ void SubclassingDlg::accept() loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.h")); buffer = FileTemplate::read(m_cppSupport, "h") + buffer; - QFileInfo fi(m_filename + ".h"); - QString module = fi.baseName(); - QString basefilename = fi.baseName(true); - buffer.replace(QRegExp("\\$MODULE\\$"),module); - buffer.replace(QRegExp("\\$FILENAME\\$"),basefilename); + TQFileInfo fi(m_filename + ".h"); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName(true); + buffer.replace(TQRegExp("\\$MODULE\\$"),module); + buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); } else loadBuffer(buffer,m_filename+".h"); @@ -391,7 +391,7 @@ void SubclassingDlg::accept() if (!slitem->isOn() || slitem->m_alreadyInSubclass) continue; - QString declBuild; + TQString declBuild; if (slitem->m_access=="public") if (!slitem->m_isFunc) declBuild = public_slot; @@ -405,7 +405,7 @@ void SubclassingDlg::accept() if (!(slitem->m_specifier=="non virtual")) declBuild += "virtual "; declBuild += slitem->m_returnType + " "; - QString spacer; + TQString spacer; if (slitem->m_access=="public") { if (!slitem->m_isFunc) @@ -448,13 +448,13 @@ void SubclassingDlg::accept() // cpp - file - QString implementation = + TQString implementation = "/*$SPECIALIZATION$*/\n" "$RETURNTYPE$ $NEWCLASS$::$METHOD$\n" "{\n" "}\n"; - QString implementation_callbase = + TQString implementation_callbase = "/*$SPECIALIZATION$*/\n" "$RETURNTYPE$ $NEWCLASS$::$METHOD$\n" "{\n" @@ -470,11 +470,11 @@ void SubclassingDlg::accept() loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.cpp")); buffer = FileTemplate::read(m_cppSupport, "cpp") + buffer; - QFileInfo fi(m_filename + ".cpp"); - QString module = fi.baseName(); - QString basefilename = fi.baseName(true); - buffer.replace(QRegExp("\\$MODULE\\$"),module); - buffer.replace(QRegExp("\\$FILENAME\\$"),basefilename); + TQFileInfo fi(m_filename + ".cpp"); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName(true); + buffer.replace(TQRegExp("\\$MODULE\\$"),module); + buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem)) buffer += "\n#include \"$NEWFILENAMELC$.moc\"\n"; } @@ -488,7 +488,7 @@ void SubclassingDlg::accept() if (!slitem->isOn() || slitem->m_alreadyInSubclass) continue; - QString impl = slitem->m_callBaseClass ? implementation_callbase : implementation; + TQString impl = slitem->m_callBaseClass ? implementation_callbase : implementation; replace(impl,"$RETURNTYPE$",slitem->m_returnType); replace(impl,"$NEWCLASS$",m_edClassName->text()); replace(impl,"$METHOD$", slitem->m_methodName); @@ -526,9 +526,9 @@ void SubclassingDlg::onChangedClassName() m_btnOk->setEnabled(true); } -QString SubclassingDlg::readBaseClassName() +TQString SubclassingDlg::readBaseClassName() { - QDomDocument doc; + TQDomDocument doc; DomUtil::openDOMFile(doc,m_formFile); return DomUtil::elementByPathExt(doc,WIDGET_CLASS_NAME).text(); } diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index 2f645f09..2e2e9e95 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -12,7 +12,7 @@ #ifndef SUBCLASSINGDLG_H #define SUBCLASSINGDLG_H -#include +#include #include "subclassingdlgbase.h" @@ -23,15 +23,15 @@ class CppSupportPart; class SlotItem : public QCheckListItem { public: - SlotItem( QListView *parent, const QString &text, - const QString &specifier, const QString &Access, - const QString &returnType, bool isFunc, + SlotItem( TQListView *parent, const TQString &text, + const TQString &specifier, const TQString &Access, + const TQString &returnType, bool isFunc, bool callBaseClass = false ); void setAllreadyInSubclass(); - QString m_access; - QString m_methodName; - QString m_returnType; - QString m_specifier; + TQString m_access; + TQString m_methodName; + TQString m_returnType; + TQString m_specifier; bool m_isFunc; bool m_callBaseClass; bool m_alreadyInSubclass; @@ -41,23 +41,23 @@ public: class SubclassingDlg : public SubclassingDlgBase { public: - SubclassingDlg( CppSupportPart* cppSupport, const QString &formFile, QStringList &newFileNames, - QWidget* parent = 0, const char* name = 0, + SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, TQStringList &newFileNames, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); - SubclassingDlg( CppSupportPart* cppSupport, const QString &formFile, const QString &filename, QStringList &dummy, - QWidget* parent = 0, const char* name = 0, + SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassingDlg(); private: void readUiFile(); - QString readBaseClassName(); + TQString readBaseClassName(); void updateDlg(); - bool replaceKeywords( QString &buffer, bool canBeModal = true ); - void replace( QString &string, const QString& search, const QString& replace ); - bool saveBuffer( QString &buffer, const QString& filename ); - bool loadBuffer( QString &buffer, const QString& filename ); - bool alreadyInSubclass( const QString &method ); + bool replaceKeywords( TQString &buffer, bool canBeModal = true ); + void replace( TQString &string, const TQString& search, const TQString& replace ); + bool saveBuffer( TQString &buffer, const TQString& filename ); + bool loadBuffer( TQString &buffer, const TQString& filename ); + bool alreadyInSubclass( const TQString &method ); bool m_creatingNewSubclass; public slots: @@ -65,18 +65,18 @@ public slots: virtual void onChangedClassName(); protected: - QStringList &m_newFileNames; - QString m_filename; - QString m_formFile; - QString m_baseClassName; - QString m_qtBaseClassName; - QString m_baseCaption; - QString m_formName; - QString m_formPath; - QStringList m_parsedMethods; + TQStringList &m_newFileNames; + TQString m_filename; + TQString m_formFile; + TQString m_baseClassName; + TQString m_qtBaseClassName; + TQString m_baseCaption; + TQString m_formName; + TQString m_formPath; + TQStringList m_parsedMethods; bool m_canBeModal; - QValueList m_slots; - QValueList m_functions; + TQValueList m_slots; + TQValueList m_functions; CppSupportPart* m_cppSupport; }; diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp index 8ad22d38..15849ad1 100644 --- a/languages/cpp/tag_creator.cpp +++ b/languages/cpp/tag_creator.cpp @@ -17,12 +17,12 @@ #include "driver.h" #include -#include -#include +#include +#include -DoxyDoc* TagCreator::m_documentation = new DoxyDoc( QStringList() ); +DoxyDoc* TagCreator::m_documentation = new DoxyDoc( TQStringList() ); -TagCreator::TagCreator( const QString& fileName, Catalog* c ) +TagCreator::TagCreator( const TQString& fileName, Catalog* c ) : m_catalog( c ), m_fileName( fileName ), m_anon( 0 ) { } @@ -36,7 +36,7 @@ void TagCreator::destroyDocumentation() delete m_documentation; } -void TagCreator::setDocumentationDirectories( const QStringList& str ) +void TagCreator::setDocumentationDirectories( const TQStringList& str ) { if ( m_documentation ) delete m_documentation; @@ -59,28 +59,28 @@ void TagCreator::parseDeclaration( DeclarationAST* ast ) void TagCreator::parseTranslationUnit( const ParsedFile& ast ) { m_currentScope.clear(); - m_currentAccess = QString::null; + m_currentAccess = TQString::null; m_inSlots = false; m_inSignals = false; m_anon = 0; m_imports.clear(); m_inClass = false; - m_imports << QStringList(); + m_imports << TQStringList(); Tag tag; tag.setKind( Tag::Kind_TranslationUnit ); tag.setFileName( m_fileName ); tag.setName( m_fileName ); - QByteArray data; - QDataStream stream(data, IO_WriteOnly ); + TQByteArray data; + TQDataStream stream(data, IO_WriteOnly ); ast.write( stream ); tag.setAttribute( "cppparsedfile", data ); tag.setAttribute( "includedFrom", ast.includedFrom() ); - tag.setAttribute( "skippedLines", QString("%1").arg( ast.skippedLines()) ); - tag.setAttribute( "macroValueHash", QString("%1").arg( ast.usedMacros().valueHash()) ); - tag.setAttribute( "macroIdHash", QString("%1").arg( ast.usedMacros().idHash() ) ); + tag.setAttribute( "skippedLines", TQString("%1").arg( ast.skippedLines()) ); + tag.setAttribute( "macroValueHash", TQString("%1").arg( ast.usedMacros().valueHash()) ); + tag.setAttribute( "macroIdHash", TQString("%1").arg( ast.usedMacros().idHash() ) ); tag.setScope( m_currentScope ); if( !ast->comment().isEmpty() ) @@ -93,8 +93,8 @@ void TagCreator::parseTranslationUnit( const ParsedFile& ast ) } void TagCreator::parseNamespaceAlias( NamespaceAliasAST* ast ) { - QString nsName; - QString aliasName; + TQString nsName; + TQString aliasName; if( !ast->namespaceName() || ast->namespaceName()->text().isEmpty() ) { @@ -129,7 +129,7 @@ void TagCreator::parseNamespaceAlias( NamespaceAliasAST* ast ) { void TagCreator::parseNamespace( NamespaceAST* ast ) { - QString nsName; + TQString nsName; if( !ast->namespaceName() || ast->namespaceName()->text().isEmpty() ) { // anonymous namespace @@ -166,7 +166,7 @@ void TagCreator::parseElaboratedTypeSpecifier( ElaboratedTypeSpecifierAST* ast ) void TagCreator::parseUsingDirective( UsingDirectiveAST* ast ) { - QString name; + TQString name; if( ast->name() ) name = ast->name()->text(); @@ -196,19 +196,19 @@ void TagCreator::parseTypedef( TypedefAST* ast ) InitDeclaratorListAST* declarators = ast->initDeclaratorList(); if( typeSpec && declarators ){ - QString typeId; + TQString typeId; if( typeSpec->name() ) typeId = typeSpec->name()->text(); - QPtrList l( declarators->initDeclaratorList() ); - QPtrListIterator it( l ); + TQPtrList l( declarators->initDeclaratorList() ); + TQPtrListIterator it( l ); InitDeclaratorAST* initDecl = 0; while( 0 != (initDecl = it.current()) ) { - QString type, id; + TQString type, id; if( initDecl->declarator() ) { type = typeOfDeclaration( typeSpec, initDecl->declarator() ); @@ -272,9 +272,9 @@ void TagCreator::parseSimpleDeclaration( SimpleDeclarationAST* ast ) if( declarators ) { - QPtrList l = declarators->initDeclaratorList(); + TQPtrList l = declarators->initDeclaratorList(); - QPtrListIterator it( l ); + TQPtrListIterator it( l ); while( it.current() ) { parseMyDeclaration( ast->functionSpecifier(), ast->storageSpecifier(), typeSpec, it.current() ); @@ -304,11 +304,11 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) if ( funSpec ) { - QPtrList l = funSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = funSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "virtual" ) isVirtual = true; else if ( text == "inline" ) @@ -319,11 +319,11 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) if ( storageSpec ) { - QPtrList l = storageSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = storageSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -333,8 +333,8 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) } - QString id = d->declaratorId() ->unqualifiedName() ->text().stripWhiteSpace(); - QString scopeStr = scopeOfDeclarator( d ); + TQString id = d->declaratorId() ->unqualifiedName() ->text().stripWhiteSpace(); + TQString scopeStr = scopeOfDeclarator( d ); Tag tag; if( !comment() ) @@ -345,7 +345,7 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) tag.setFileName( m_fileName ); tag.setName( id ); - tag.setScope( QStringList::split( ".", scopeStr ) ); + tag.setScope( TQStringList::split( ".", scopeStr ) ); if( !ast->comment().isEmpty() ) tag.setComment( ast->comment() ); @@ -361,8 +361,8 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) parseFunctionArguments( tag, d ); checkTemplateDeclarator( tag ); - QString arguments = tag.attribute( "a" ).toStringList().join( "," ); -tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.replace( QRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) ); + TQString arguments = tag.attribute( "a" ).toStringList().join( "," ); +tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.replace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) ); tagBuilder.setAccess( TagUtils::stringToAccess( m_currentAccess ) ); @@ -386,8 +386,8 @@ tag.setAttribute( "description", m_documentation->functionDescription( scopeStr. void TagCreator::parseLinkageBody( LinkageBodyAST* ast ) { - QPtrList l = ast->declarationList(); - QPtrListIterator it( l ); + TQPtrList l = ast->declarationList(); + TQPtrListIterator it( l ); while ( it.current() ) { parseDeclaration( it.current() ); @@ -411,11 +411,11 @@ void TagCreator::checkTemplateDeclarator( Tag& tag ) { void TagCreator::takeTemplateParams( Tag& target, TemplateDeclarationAST* ast) { TemplateParameterListAST* pl = ast->templateParameterList(); if( pl ) { - QPtrList list = pl->templateParameterList(); + TQPtrList list = pl->templateParameterList(); TemplateParameterAST* curr = list.first(); while( curr != 0 ) { - QString a, b; + TQString a, b; if( curr->typeParameter() ) { if( curr->typeParameter()->name() ) a = curr->typeParameter()->name()->text(); @@ -437,11 +437,11 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast ) ast->getStartPosition( &startLine, &startColumn ); ast->getEndPosition( &endLine, &endColumn ); - QString oldAccess = m_currentAccess; + TQString oldAccess = m_currentAccess; bool oldInSlots = m_inSlots; bool oldInSignals = m_inSignals; - QString kind = ast->classKey() ->text(); + TQString kind = ast->classKey() ->text(); if ( kind == "class" ) m_currentAccess = "private"; else @@ -449,11 +449,11 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast ) m_inSlots = false; m_inSignals = false; - QString className; + TQString className; if ( !ast->name() ) { - //QFileInfo fileInfo( m_fileName ); - //QString shortFileName = fileInfo.baseName(); + //TQFileInfo fileInfo( m_fileName ); + //TQString shortFileName = fileInfo.baseName(); //className.sprintf( "(%s_%d)", shortFileName.local8Bit(), m_anon++ ); } else @@ -470,7 +470,7 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast ) tag.setFileName( m_fileName ); int i = className.find( '<' ); - QString specialization; + TQString specialization; if( i != -1 ) { specialization = className.mid( i ); @@ -529,11 +529,11 @@ void TagCreator::parseEnumSpecifier( EnumSpecifierAST* ast ) m_catalog->addItem( tag ); - QPtrList l = ast->enumeratorList(); - QPtrListIterator it( l ); + TQPtrList l = ast->enumeratorList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString name = it.current() ->id() ->text(); + TQString name = it.current() ->id() ->text(); Tag tag; tag.setKind( Tag::Kind_Enumerator ); @@ -578,13 +578,13 @@ void TagCreator::parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, T while ( t && t->subDeclarator() ) t = t->subDeclarator(); - QString id; + TQString id; if ( t && t->declaratorId() && t->declaratorId() ->unqualifiedName() ) id = t->declaratorId() ->unqualifiedName() ->text(); - QString scopeStr = scopeOfDeclarator( d ); + TQString scopeStr = scopeOfDeclarator( d ); - QString type = typeOfDeclaration( typeSpec, d ); + TQString type = typeOfDeclaration( typeSpec, d ); bool isFriend = false; @@ -595,11 +595,11 @@ void TagCreator::parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, T if ( storageSpec ) { - QPtrList l = storageSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = storageSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -614,7 +614,7 @@ void TagCreator::parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, T tag.setKind( Tag::Kind_Variable ); tag.setFileName( m_fileName ); tag.setName( id ); - tag.setScope( QStringList::split( ".", scopeStr ) ); + tag.setScope( TQStringList::split( ".", scopeStr ) ); if( !comment().isEmpty() ) tag.setComment( comment() ); @@ -635,7 +635,7 @@ void TagCreator::parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, T void TagCreator::parseAccessDeclaration( AccessDeclarationAST * access ) { - QPtrList l = access->accessList(); + TQPtrList l = access->accessList(); m_currentAccess = l.at( 0 )->text(); if( m_currentAccess == "signals" ) @@ -656,11 +656,11 @@ void TagCreator::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageS if ( funSpec ) { - QPtrList l = funSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = funSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "virtual" ) isVirtual = true; else if ( text == "inline" ) @@ -671,11 +671,11 @@ void TagCreator::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageS if ( storageSpec ) { - QPtrList l = storageSpec->nodeList(); - QPtrListIterator it( l ); + TQPtrList l = storageSpec->nodeList(); + TQPtrListIterator it( l ); while ( it.current() ) { - QString text = it.current() ->text(); + TQString text = it.current() ->text(); if ( text == "friend" ) isFriend = true; else if ( text == "static" ) @@ -690,9 +690,9 @@ void TagCreator::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageS decl->getEndPosition( &endLine, &endColumn ); DeclaratorAST* d = decl->declarator(); - QString id = d->declaratorId() ->unqualifiedName() ->text(); + TQString id = d->declaratorId() ->unqualifiedName() ->text(); - QString type = typeOfDeclaration( typeSpec, d ); + TQString type = typeOfDeclaration( typeSpec, d ); Tag tag; CppFunction tagBuilder( tag ); @@ -724,8 +724,8 @@ void TagCreator::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageS parseFunctionArguments( tag, d ); checkTemplateDeclarator( tag ); - QString arguments = tag.attribute( "a" ).toStringList().join( "," ); - QString scopeStr = m_currentScope.join( "::" ); + TQString arguments = tag.attribute( "a" ).toStringList().join( "," ); + TQString scopeStr = m_currentScope.join( "::" ); tag.setAttribute( "description", m_documentation->functionDescription( scopeStr, id, type, arguments ) ); m_catalog->addItem( tag ); @@ -735,23 +735,23 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator ) { ParameterDeclarationClauseAST* clause = declarator->parameterDeclarationClause(); - QStringList types; - QStringList args; + TQStringList types; + TQStringList args; if( clause && clause->parameterDeclarationList() ){ ParameterDeclarationListAST* params = clause->parameterDeclarationList(); - QPtrList l( params->parameterList() ); - QPtrListIterator it( l ); + TQPtrList l( params->parameterList() ); + TQPtrListIterator it( l ); while( it.current() ){ ParameterDeclarationAST* param = it.current(); ++it; - QString name; + TQString name; if( param->declarator() ){ - name = declaratorToString(param->declarator(), QString::null, true ); + name = declaratorToString(param->declarator(), TQString::null, true ); } - QString type = typeOfDeclaration( param->typeSpec(), param->declarator() ); + TQString type = typeOfDeclaration( param->typeSpec(), param->declarator() ); types << type; args << name; @@ -770,18 +770,18 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator ) tagBuilder.setArgumentNames( args ); } -QString TagCreator::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) +TQString TagCreator::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) { if( !typeSpec || !declarator ) - return QString::null; + return TQString::null; - QString text; + TQString text; text += typeSpec->text(); text = text.simplifyWhiteSpace(); - QPtrList ptrOpList = declarator->ptrOpList(); - for( QPtrListIterator it(ptrOpList); it.current(); ++it ) + TQPtrList ptrOpList = declarator->ptrOpList(); + for( TQPtrListIterator it(ptrOpList); it.current(); ++it ) text += it.current()->text(); for( int a = 0; a < declarator->arrayDimensionList().count(); a++ ) @@ -790,22 +790,22 @@ QString TagCreator::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST return text; } -void TagCreator::parseBaseClause( const QString& className, BaseClauseAST * baseClause ) +void TagCreator::parseBaseClause( const TQString& className, BaseClauseAST * baseClause ) { - QPtrList l = baseClause->baseSpecifierList(); - QPtrListIterator it( l ); + TQPtrList l = baseClause->baseSpecifierList(); + TQPtrListIterator it( l ); while ( it.current() ) { BaseSpecifierAST * baseSpecifier = it.current(); - QString access; + TQString access; if ( baseSpecifier->access() ) access = baseSpecifier->access() ->text(); bool isVirtual = baseSpecifier->isVirtual() != 0; if( baseSpecifier->name() == 0 ) return; ///Workaround for some bug elsewhere - QString baseName; + TQString baseName; if ( baseSpecifier->name() ) baseName = baseSpecifier->name() ->text(); @@ -834,15 +834,15 @@ void TagCreator::parseBaseClause( const QString& className, BaseClauseAST * base } } -QString TagCreator::scopeOfDeclarator( DeclaratorAST* d ) +TQString TagCreator::scopeOfDeclarator( DeclaratorAST* d ) { - QStringList scope = m_currentScope; + TQStringList scope = m_currentScope; if ( d && d->declaratorId() && d->declaratorId() ->classOrNamespaceNameList().count() ) { if ( d->declaratorId() ->isGlobal() ) scope.clear(); - QPtrList l = d->declaratorId() ->classOrNamespaceNameList(); - QPtrListIterator it( l ); + TQPtrList l = d->declaratorId() ->classOrNamespaceNameList(); + TQPtrListIterator it( l ); while ( it.current() ) { if ( it.current() ->name() ) @@ -855,9 +855,9 @@ QString TagCreator::scopeOfDeclarator( DeclaratorAST* d ) return scope.join( "." ); } -int TagUtils::stringToAccess( const QString & access ) +int TagUtils::stringToAccess( const TQString & access ) { - QStringList l = QStringList() + TQStringList l = TQStringList() << "public" << "protected" << "private" << "public slots" << "protected slots" << "private slots" << "signals"; @@ -866,11 +866,11 @@ int TagUtils::stringToAccess( const QString & access ) return idx == -1 ? 0 : idx+1; } -QString TagUtils::accessToString( int id ) +TQString TagUtils::accessToString( int id ) { if( id == 0 ) return "unknown"; - QStringList l = QStringList() + TQStringList l = TQStringList() << "public" << "protected" << "private" << "public slots" << "protected slots" << "private slots" << "signals"; @@ -878,7 +878,7 @@ QString TagUtils::accessToString( int id ) if( l.at(id-1) != l.end() ) return l[ id-1 ]; - return QString::null; + return TQString::null; } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/tag_creator.h b/languages/cpp/tag_creator.h index 47d0b66f..425d7135 100644 --- a/languages/cpp/tag_creator.h +++ b/languages/cpp/tag_creator.h @@ -14,22 +14,22 @@ #include "tree_parser.h" -#include -#include +#include +#include class Catalog; class Tag; namespace TagUtils { - int stringToAccess( const QString& access ); - QString accessToString( int id ); + int stringToAccess( const TQString& access ); + TQString accessToString( int id ); } class TagCreator: public TreeParser { public: - TagCreator( const QString& fileName, Catalog* c ); + TagCreator( const TQString& fileName, Catalog* c ); virtual ~TagCreator(); // translation-unit @@ -55,7 +55,7 @@ public: virtual void parseMyDeclaration( GroupAST* funSpec, GroupAST* storageSpec, TypeSpecifierAST* typeSpec, InitDeclaratorAST* decl ); virtual void parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageSpec, TypeSpecifierAST* typeSpec, InitDeclaratorAST* decl ); virtual void parseFunctionArguments( Tag& tag, DeclaratorAST* declarator ); - virtual void parseBaseClause( const QString& className, BaseClauseAST* baseClause ); + virtual void parseBaseClause( const TQString& className, BaseClauseAST* baseClause ); /** call this function after the last use of a TagCreator object, to do cleanup work @@ -64,14 +64,14 @@ public: /** This sets the directories, where the doxygen documentation should be searched in. - @param dirs QStringList containing strings, which define the pathes, where documentation is searched in + @param dirs TQStringList containing strings, which define the pathes, where documentation is searched in */ - static void setDocumentationDirectories( const QStringList& dirs ); + static void setDocumentationDirectories( const TQStringList& dirs ); private: - QString scopeOfDeclarator( DeclaratorAST* d ); - QString typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ); + TQString scopeOfDeclarator( DeclaratorAST* d ); + TQString typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ); private: @@ -81,7 +81,7 @@ private: class CommentPusher { TagCreator& m_ref; public: - CommentPusher( TagCreator& ref, QString comment ) : m_ref( ref ) { + CommentPusher( TagCreator& ref, TQString comment ) : m_ref( ref ) { m_ref.pushComment( comment ); } ~CommentPusher() { @@ -89,9 +89,9 @@ private: } }; - QStringList m_comments; + TQStringList m_comments; - QString comment() { + TQString comment() { if( m_comments.isEmpty() ) { return ""; } else { @@ -99,7 +99,7 @@ private: } } - void pushComment( QString comm ) { + void pushComment( TQString comm ) { m_comments.push_front( comm ); } @@ -108,16 +108,16 @@ private: } Catalog* m_catalog; - QString m_fileName; - QStringList m_currentScope; - QValueList m_imports; - QString m_currentAccess; + TQString m_fileName; + TQStringList m_currentScope; + TQValueList m_imports; + TQString m_currentAccess; bool m_inClass; bool m_inSlots; bool m_inSignals; int m_anon; - QValueStack m_currentTemplateDeclarator; + TQValueStack m_currentTemplateDeclarator; static class DoxyDoc* m_documentation; diff --git a/languages/cpp/typedecoration.h b/languages/cpp/typedecoration.h index 3d2e8382..e142d837 100644 --- a/languages/cpp/typedecoration.h +++ b/languages/cpp/typedecoration.h @@ -23,21 +23,21 @@ class TypeDecoration { } ///Removes the decoration from the given string - TypeDecoration( QString& str ) { + TypeDecoration( TQString& str ) { init( str ); } ~TypeDecoration() {} ///Removes the decoration from the assigned - TypeDecoration& operator = ( QString& str ) { + TypeDecoration& operator = ( TQString& str ) { clear(); init( str ); return *this; } - QString apply( const QString& str ) const { - QString ret = str; + TQString apply( const TQString& str ) const { + TQString ret = str; if ( !ret.startsWith( m_decoration_front ) ) ret = m_decoration_front + ret; @@ -54,11 +54,11 @@ class TypeDecoration { } void clear() { - m_decoration_front = QString(); - m_decoration_back = QString(); + m_decoration_front = TQString(); + m_decoration_back = TQString(); } - void prepend( const QString& str ) { + void prepend( const TQString& str ) { m_decoration_front = str + m_decoration_front; } @@ -70,11 +70,11 @@ class TypeDecoration { }*/ private: - void init( QString& str ) { + void init( TQString& str ) { str = str.stripWhiteSpace(); - static const QString cnst = "const"; - static const QString ref = "&"; + static const TQString cnst = "const"; + static const TQString ref = "&"; if ( str.startsWith( cnst ) ) { str.remove( 0, cnst.length() ); if( str.isEmpty() || ( !str[0].isLetterOrNumber() && str[0] != '_' ) ) { @@ -111,7 +111,7 @@ class TypeDecoration { } } - QString m_decoration_front, m_decoration_back; + TQString m_decoration_front, m_decoration_back; }; #endif diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp index 2e4e28a0..89d32931 100644 --- a/languages/cpp/typedesc.cpp +++ b/languages/cpp/typedesc.cpp @@ -21,7 +21,7 @@ #include "driver.h" #include "lexer.h" #include "parser.h" -#include +#include #include @@ -139,7 +139,7 @@ TypeTrace* LocateResult::trace() { TypeDesc::TypeDesc() {} -TypeDesc::TypeDesc( const QString& name ) { +TypeDesc::TypeDesc( const TQString& name ) { init( name ); } @@ -169,7 +169,7 @@ TypeDesc& TypeDesc::operator = ( const TypeDesc& rhs ) { return *this; } -void TypeDesc::prependDecoration( const QString& str ) { +void TypeDesc::prependDecoration( const TQString& str ) { makePrivate(); m_data->m_dec.prepend( str ); } @@ -350,13 +350,13 @@ int TypeDesc::compare ( const TypeDesc& rhs ) const { } #ifdef USE_TEXT_STREAM -QString TypeDesc::nameWithParams() const { +TQString TypeDesc::nameWithParams() const { if ( !m_data ) return ""; - QString ret; + TQString ret; { - QTextStream s( &ret, IO_WriteOnly ); + TQTextStream s( &ret, IO_WriteOnly ); s << m_data->m_cleanName; if ( !m_data->m_templateParams.isEmpty() ) { s << "<"; @@ -375,14 +375,14 @@ QString TypeDesc::nameWithParams() const { #else -QString TypeDesc::nameWithParams() const { +TQString TypeDesc::nameWithParams() const { if( compare( *this ) != 0 ) { compare( *this ); } if ( !m_data ) return ""; - QString ret = m_data->m_cleanName; + TQString ret = m_data->m_cleanName; if ( !m_data->m_templateParams.isEmpty() ) { ret += "<"; bool first = true; @@ -399,13 +399,13 @@ QString TypeDesc::nameWithParams() const { #endif -QString TypeDesc::fullName( ) const { +TQString TypeDesc::fullName( ) const { if ( !m_data ) return ""; - QString ret = nameWithParams(); + TQString ret = nameWithParams(); for ( int a = 0; a < m_data->m_functionDepth; ++a ) - ret = QString( functionMark ) + ret; + ret = TQString( functionMark ) + ret; for ( int a = 0; a < m_data->m_pointerDepth; ++a ) ret += "*"; return m_data->m_dec.apply( ret ); @@ -427,21 +427,21 @@ size_t TypeDesc::hashKey2() const { return ret; } -QString TypeDesc::fullNameChain( ) const { +TQString TypeDesc::fullNameChain( ) const { if ( !m_data ) return ""; - QString ret = fullName(); + TQString ret = fullName(); if ( m_data->m_nextType ) { ret += "::" + m_data->m_nextType->fullNameChain(); } return m_data->m_dec.apply( ret ); } -QString TypeDesc::fullTypeStructure() const { +TQString TypeDesc::fullTypeStructure() const { if ( !m_data ) return ""; - QString ret = m_data->m_cleanName; + TQString ret = m_data->m_cleanName; if ( !m_data->m_templateParams.isEmpty() ) { ret += "<"; for ( TemplateParams::const_iterator it = m_data->m_templateParams.begin(); it != m_data->m_templateParams.end(); ++it ) { @@ -455,10 +455,10 @@ QString TypeDesc::fullTypeStructure() const { } -QStringList TypeDesc::fullNameList( ) const { +TQStringList TypeDesc::fullNameList( ) const { if ( !m_data ) return ""; - QStringList ret; + TQStringList ret; ret << fullName(); if ( m_data->m_nextType ) { ret += m_data->m_nextType->fullNameList(); @@ -575,7 +575,7 @@ void TypeDesc::clearInstanceInfo() { m_data->m_dec.clear(); } -void TypeDesc::takeTemplateParams( const QString& string ) { +void TypeDesc::takeTemplateParams( const TQString& string ) { makeDataPrivate(); m_data->m_templateParams.clear(); for ( ParamIterator it( "<>", string ); it; ++it ) @@ -650,7 +650,7 @@ int TypeDesc::decorationDepth() { return m_data->m_dec.depth(); }*/ -void TypeDesc::init( QString stri ) { +void TypeDesc::init( TQString stri ) { m_data = 0; maybeInit(); @@ -659,8 +659,8 @@ void TypeDesc::init( QString stri ) { m_data->m_dec = stri; ///Store the decoration - QStringList ls = splitType( stri ); - QString str = ls.front().stripWhiteSpace(); + TQStringList ls = splitType( stri ); + TQString str = ls.front().stripWhiteSpace(); ///Extract multiple types that may be written as a scope and put them to the next-types-list if ( !ls.isEmpty() ) { @@ -670,7 +670,7 @@ void TypeDesc::init( QString stri ) { } } - while ( str.startsWith( QString( functionMark ) ) ) { + while ( str.startsWith( TQString( functionMark ) ) ) { m_data->m_functionDepth++; str = str.mid( strlen( functionMark ) ).stripWhiteSpace(); } @@ -678,7 +678,7 @@ void TypeDesc::init( QString stri ) { //Little hack done for performance-reasons, to do less comparing if( str.length() >= 4 ) { - QChar c = str[0]; + TQChar c = str[0]; switch( c.latin1() ) { case 's': if( str[1] == 'h' ) { @@ -735,10 +735,10 @@ void TypeDesc::init( QString stri ) { if ( parser.parseTypeSpecifier( typeSpec ) ) { NameAST * name = typeSpec->name(); - QPtrList l = name->classOrNamespaceNameList(); - QPtrListIterator it( l ); + TQPtrList l = name->classOrNamespaceNameList(); + TQPtrListIterator it( l ); - QString type; + TQString type; while ( it.current() ) { if ( it.current() ->name() ) { type += it.current() ->name() ->text() + "::"; @@ -766,11 +766,11 @@ void TypeDesc::init( QString stri ) { } -void TypeDesc::takeData( const QString& string ) { +void TypeDesc::takeData( const TQString& string ) { makeDataPrivate(); m_data->m_templateParams.clear(); ParamIterator it( "<>", string ); - QString name = it.prefix(); + TQString name = it.prefix(); name.remove( "*" ); name.remove( "&" ); m_data->m_cleanName = name.stripWhiteSpace(); diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h index 924372df..ddb072d2 100644 --- a/languages/cpp/typedesc.h +++ b/languages/cpp/typedesc.h @@ -145,8 +145,8 @@ enum TypeDescFlags { struct TypeDescData : public KShared { - typedef QValueList TemplateParams; - QString m_cleanName; + typedef TQValueList TemplateParams; + TQString m_cleanName; int m_pointerDepth; int m_functionDepth; TemplateParams m_templateParams; @@ -175,11 +175,11 @@ private: class TypeDesc { public: - typedef QValueList TemplateParams; + typedef TQValueList TemplateParams; TypeDesc(); - TypeDesc( const QString& str ); + TypeDesc( const TQString& str ); TypeDesc( const TypeDesc& rhs ); @@ -193,7 +193,7 @@ class TypeDesc { TypeDesc& operator = ( const TypeDesc& rhs ); - TypeDesc& operator = ( const QString& rhs ) { + TypeDesc& operator = ( const TQString& rhs ) { init( rhs ); return *this; } @@ -243,19 +243,19 @@ class TypeDesc { void addIncludeFiles( const HashedStringSet& files ); - QString nameWithParams() const; + TQString nameWithParams() const; ///returns the type including template-parameters and pointer-depth - QString fullName( ) const; + TQString fullName( ) const; /**returns the type include template-parameters, pointer-depth, and possible sub-types. Example "A::B": A is the type, and B is the subtype */ - QString fullNameChain( ) const ; + TQString fullNameChain( ) const ; ///Returns the type-structure(full name-chain without any instance-info) - QString fullTypeStructure() const; + TQString fullTypeStructure() const; - void prependDecoration( const QString& str ); + void prependDecoration( const TQString& str ); ///Since the pointer-depth of a resolved type is always stored in the last element of its chain, this gives fast access to that depth int totalPointerDepth() const; @@ -283,22 +283,22 @@ class TypeDesc { }*/ ///returns a list include the full name of this type, and all subtypes - QStringList fullNameList( ) const; + TQStringList fullNameList( ) const; - QString decoratedName() const { + TQString decoratedName() const { if( !m_data ) return ""; - QString ret = m_data->m_dec.apply( name() ); + TQString ret = m_data->m_dec.apply( name() ); for( int a = 0; a < pointerDepth(); a++ ) ret += "*"; return ret; } - QString name() const { + TQString name() const { if( !m_data ) return ""; return m_data->m_cleanName; }; - void setName( QString name ) { + void setName( TQString name ) { makeDataPrivate(); m_data->m_cleanName = name; } @@ -310,7 +310,7 @@ class TypeDesc { const TemplateParams& templateParams() const; ///clears the current template-parameters, and extracts those from the given string - void takeTemplateParams( const QString& string ); + void takeTemplateParams( const TQString& string ); /**makes all references/pointers private, so everything about this structure may be changed without side-effects*/ TypeDesc& makePrivate(); @@ -370,12 +370,12 @@ class TypeDesc { private: - void takeData( const QString& string ); + void takeData( const TQString& string ); void makeDataPrivate(); KSharedPtr m_data; void maybeInit(); - void init( QString stri ); + void init( TQString stri ); }; @@ -392,7 +392,7 @@ class TypeDescShared : public TypeDesc, public KShared { return *this; } - TypeDescShared( const QString& name ) : TypeDesc( name ) {} + TypeDescShared( const TQString& name ) : TypeDesc( name ) {} TypeDescShared() : TypeDesc() {} } ; diff --git a/languages/csharp/csharpconfigwidget.cpp b/languages/csharp/csharpconfigwidget.cpp index b18d3e69..620f7881 100644 --- a/languages/csharp/csharpconfigwidget.cpp +++ b/languages/csharp/csharpconfigwidget.cpp @@ -11,13 +11,13 @@ #include "csharpconfigwidget.h" -#include +#include #include #include "domutil.h" -CSharpConfigWidget::CSharpConfigWidget(QDomDocument &projectDom, - QWidget *parent, const char *name) +CSharpConfigWidget::CSharpConfigWidget(TQDomDocument &projectDom, + TQWidget *parent, const char *name) : CSharpConfigWidgetBase(parent, name), dom(projectDom) { interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevcsharpsupport/run/interpreter")); diff --git a/languages/csharp/csharpconfigwidget.h b/languages/csharp/csharpconfigwidget.h index bf1b063e..a44570cd 100644 --- a/languages/csharp/csharpconfigwidget.h +++ b/languages/csharp/csharpconfigwidget.h @@ -13,7 +13,7 @@ #define _CSHARPCONFIGWIDGET_H_ #include "csharpconfigwidgetbase.h" -#include +#include class CSharpConfigWidget : public CSharpConfigWidgetBase @@ -21,14 +21,14 @@ class CSharpConfigWidget : public CSharpConfigWidgetBase Q_OBJECT public: - CSharpConfigWidget( QDomDocument &projectDom, QWidget *parent=0, const char *name=0 ); + CSharpConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 ); ~CSharpConfigWidget(); public slots: void accept(); private: - QDomDocument &dom; + TQDomDocument &dom; }; #endif diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp index 8755be2b..f70df162 100644 --- a/languages/csharp/csharpdoc.cpp +++ b/languages/csharp/csharpdoc.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ using namespace KIO; -CSharpdocProtocol::CSharpdocProtocol(const QCString &pool, const QCString &app) +CSharpdocProtocol::CSharpdocProtocol(const TQCString &pool, const TQCString &app) : SlaveBase("csharpdoc", pool, app) {} @@ -28,12 +28,12 @@ CSharpdocProtocol::~CSharpdocProtocol() void CSharpdocProtocol::get(const KURL& url) { - QStringList l = QStringList::split('/', url.path()); + TQStringList l = TQStringList::split('/', url.path()); mimeType("text/html"); bool plain = false; - QString cmd = "csharpdoc "; + TQString cmd = "csharpdoc "; if (l[0] == "functions") { plain = true; cmd += "-t -f "; @@ -43,7 +43,7 @@ void CSharpdocProtocol::get(const KURL& url) cmd += KProcess::quote(l[1]); cmd += " | pod2html"; } else { - QCString errstr(i18n("The only existing directories are functions and faq.").local8Bit()); + TQCString errstr(i18n("The only existing directories are functions and faq.").local8Bit()); data(errstr); finished(); return; @@ -52,11 +52,11 @@ void CSharpdocProtocol::get(const KURL& url) kdDebug() << "Command: " << cmd << endl; if (plain) - data(QCString("

    ")); + data(TQCString("
    ")); FILE *fd = popen(cmd.local8Bit().data(), "r"); char buffer[4090]; - QByteArray array; + TQByteArray array; while (!feof(fd)) { int n = fread(buffer, 1, 2048, fd); @@ -72,7 +72,7 @@ void CSharpdocProtocol::get(const KURL& url) pclose(fd); if (plain) - data(QCString("
    ")); + data(TQCString("
    ")); finished(); } @@ -80,15 +80,15 @@ void CSharpdocProtocol::get(const KURL& url) void CSharpdocProtocol::mimetype(const KURL &url) { - QStringList l = QStringList::split('/', url.path()); + TQStringList l = TQStringList::split('/', url.path()); mimeType((l[0] == "faq")? "text/html" : "text/plain"); finished(); } -QCString CSharpdocProtocol::errorMessage() +TQCString CSharpdocProtocol::errorMessage() { - return QCString( "" + i18n("Error in csharpdoc").local8Bit() + "" ); + return TQCString( "" + i18n("Error in csharpdoc").local8Bit() + "" ); } diff --git a/languages/csharp/csharpdoc.h b/languages/csharp/csharpdoc.h index 85fa8cf5..caf8392d 100644 --- a/languages/csharp/csharpdoc.h +++ b/languages/csharp/csharpdoc.h @@ -1,14 +1,14 @@ #ifndef _CSHARPDOC_H_ #define _CSHARPDOC_H_ -#include +#include #include class CSharpdocProtocol : public KIO::SlaveBase { public: - CSharpdocProtocol(const QCString &pool, const QCString &app); + CSharpdocProtocol(const TQCString &pool, const TQCString &app); virtual ~CSharpdocProtocol(); virtual void get(const KURL& url); @@ -18,8 +18,8 @@ public: protected: void decodeURL(const KURL &url); - void decodePath(QString path); - QCString errorMessage(); + void decodePath(TQString path); + TQCString errorMessage(); }; #endif diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 01a21ffb..292a63f3 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -11,20 +11,20 @@ #include "csharpsupportpart.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include "kdevmainwindow.h" @@ -48,42 +48,42 @@ typedef KDevGenericFactory CSharpSupportFactory; static const KDevPluginInfo data("kdevcsharpsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) ) -CSharpSupportPart::CSharpSupportPart(QObject *parent, const char *name, const QStringList &) +CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &) : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart") { setInstance(CSharpSupportFactory::instance()); setXMLFile("kdevcsharpsupport.rc"); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), - this, SLOT(savedFile(const KURL&)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), + this, TQT_SLOT(savedFile(const KURL&)) ); KAction *action; action = new KAction( i18n("Execute Main Program"), "exec", 0, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the CSharp program") ); action = new KAction( i18n("Execute String..."), "exec", 0, - this, SLOT(slotExecuteString()), + this, TQT_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as CSharp code") ); action = new KAction( i18n("Start CSharp Interpreter"), "exec", 0, - this, SLOT(slotStartInterpreter()), + this, TQT_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the CSharp interpreter without a program") ); action = new KAction( i18n("Find CSharp Function Documentation..."), 0, - this, SLOT(slotCSharpdocFunction()), + this, TQT_SLOT(slotCSharpdocFunction()), actionCollection(), "help_csharpdocfunction" ); action->setToolTip( i18n("Show the documentation page of a CSharp function") ); action = new KAction( i18n("Find CSharp FAQ Entry..."), 0, - this, SLOT(slotCSharpdocFAQ()), + this, TQT_SLOT(slotCSharpdocFAQ()), actionCollection(), "help_csharpdocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); @@ -106,14 +106,14 @@ void CSharpSupportPart::projectOpened() { kdDebug(9007) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // procsharpy initialized - QTimer::singleShot(0, this, SLOT(initialParse())); + TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); } @@ -121,11 +121,11 @@ void CSharpSupportPart::projectClosed() { } -void CSharpSupportPart::maybeParse(const QString fileName) +void CSharpSupportPart::maybeParse(const TQString fileName) { - QFileInfo fi(fileName); - QString path = fi.filePath(); - QString extension = fi.extension(); + TQFileInfo fi(fileName); + TQString path = fi.filePath(); + TQString extension = fi.extension(); if (extension == "cs") { kdDebug(9016) << "maybe " << fileName << endl; removeWithReference(fileName); @@ -134,11 +134,11 @@ void CSharpSupportPart::maybeParse(const QString fileName) } } -void CSharpSupportPart::addedFilesToProject(const QStringList &fileList) +void CSharpSupportPart::addedFilesToProject(const TQStringList &fileList) { kdDebug(9016) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -147,13 +147,13 @@ void CSharpSupportPart::addedFilesToProject(const QStringList &fileList) } -void CSharpSupportPart::removedFilesFromProject(const QStringList &fileList) +void CSharpSupportPart::removedFilesFromProject(const TQStringList &fileList) { kdDebug(9016) << "removedFilesFromProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); removeWithReference(fileName); } emit updatedSourceInfo(); @@ -180,9 +180,9 @@ KDevLanguageSupport::Features CSharpSupportPart::features() // return Functions; } -QString CSharpSupportPart::interpreter() +TQString CSharpSupportPart::interpreter() { - QString prog = DomUtil::readEntry(*projectDom(), "/kdevcsharpsupport/run/interpreter"); + TQString prog = DomUtil::readEntry(*projectDom(), "/kdevcsharpsupport/run/interpreter"); if (prog.isEmpty()) prog = "csharp"; @@ -190,18 +190,18 @@ QString CSharpSupportPart::interpreter() } -void CSharpSupportPart::startApplication(const QString &program) +void CSharpSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevcsharpsupport/run/terminal"); if (KDevAppFrontend *appFrontend = extension("KDevelop/AppFrontend")) - appFrontend->startAppCommand(QString::QString(), program, inTerminal); + appFrontend->startAppCommand(TQString::TQString(), program, inTerminal); } void CSharpSupportPart::slotExecute() { - QString program = project()->mainProgram(); - QString cmd = interpreter() + " " + program; + TQString program = project()->mainProgram(); + TQString cmd = interpreter() + " " + program; startApplication(cmd); } @@ -215,7 +215,7 @@ void CSharpSupportPart::slotStartInterpreter() void CSharpSupportPart::slotExecuteString() { bool ok; - QString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), QString::null, &ok, 0); + TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString::null, &ok, 0); if (ok) { cmd.prepend("'"); cmd.append("'"); @@ -227,9 +227,9 @@ void CSharpSupportPart::slotExecuteString() void CSharpSupportPart::slotCSharpdocFunction() { bool ok; - QString key = KInputDialog::getText(i18n("Show CSharp Documentation"), i18n("Show CSharp documentation for function:"), "", &ok, 0); + TQString key = KInputDialog::getText(i18n("Show CSharp Documentation"), i18n("Show CSharp documentation for function:"), "", &ok, 0); if (ok && !key.isEmpty()) { - QString url = "csharpdoc:functions/"; + TQString url = "csharpdoc:functions/"; url += key; partController()->showDocument(KURL(url)); } @@ -239,9 +239,9 @@ void CSharpSupportPart::slotCSharpdocFunction() void CSharpSupportPart::slotCSharpdocFAQ() { bool ok; - QString key = KInputDialog::getText(i18n("Show FAQ Entry"), i18n("Show FAQ entry for keyword:"), "", &ok, 0); + TQString key = KInputDialog::getText(i18n("Show FAQ Entry"), i18n("Show FAQ entry for keyword:"), "", &ok, 0); if (ok && !key.isEmpty()) { - QString url = "csharpdoc:faq/"; + TQString url = "csharpdoc:faq/"; url += key; partController()->showDocument(KURL(url)); } @@ -265,17 +265,17 @@ void CSharpSupportPart::initialParse() kapp->processEvents( ); kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); + TQStringList files = project()->allFiles(); // m_parser->initialParse(); //progress bar - QProgressBar* bar = new QProgressBar( files.count( ), mainWindow( )->statusBar( ) ); + TQProgressBar* bar = new TQProgressBar( files.count( ), mainWindow( )->statusBar( ) ); bar->setMinimumWidth( 120 ); bar->setCenterIndicator( true ); mainWindow( )->statusBar( )->addWidget( bar ); bar->show( ); int n = 0; - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) { + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { // kdDebug(9016) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; maybeParse(project()->projectDirectory() + "/" + *it); //update progress bar @@ -297,7 +297,7 @@ void CSharpSupportPart::initialParse() } } -void CSharpSupportPart::removeWithReference( const QString & fileName ) +void CSharpSupportPart::removeWithReference( const TQString & fileName ) { kdDebug(9016) << "remove with references: " << fileName << endl; //m_timestamp.remove( fileName ); @@ -312,12 +312,12 @@ void CSharpSupportPart::parseUseFiles() { kdDebug(9016) << "parse addional libs" << endl; return; - QString filename; - QStringList m_usefiles; - // QStringList m_usefiles = m_parser->UseFiles(); + TQString filename; + TQStringList m_usefiles; + // TQStringList m_usefiles = m_parser->UseFiles(); //parse addional use files - for (QStringList::Iterator it = m_usefiles.begin(); it != m_usefiles.end() ;++it) + for (TQStringList::Iterator it = m_usefiles.begin(); it != m_usefiles.end() ;++it) { // filename = m_parser->findLib(*it); //if something found , parse it diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h index 166285a6..35d2b7ba 100644 --- a/languages/csharp/csharpsupportpart.h +++ b/languages/csharp/csharpsupportpart.h @@ -21,7 +21,7 @@ class CSharpSupportPart : public KDevLanguageSupport Q_OBJECT public: - CSharpSupportPart( QObject *parent, const char *name, const QStringList & ); + CSharpSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~CSharpSupportPart(); protected: @@ -32,8 +32,8 @@ private slots: void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void slotExecute(); void slotExecuteString(); void slotStartInterpreter(); @@ -44,12 +44,12 @@ private slots: void slotCSharpdocFAQ(); private: - QString interpreter(); - void startApplication(const QString &program); - void maybeParse(const QString fileName); - void parse(const QString &fileName); - void parseLines(QStringList* lines,const QString& fileName); - void removeWithReference( const QString & fileName ); + TQString interpreter(); + void startApplication(const TQString &program); + void maybeParse(const TQString fileName); + void parse(const TQString &fileName); + void parseLines(TQStringList* lines,const TQString& fileName); + void removeWithReference( const TQString & fileName ); void parseUseFiles(); //CSharp Parser // csharpparser* m_parser; diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index 5fad6630..66a12fbb 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -25,7 +25,7 @@ extern "C" { } -PgiOptionsFactory::PgiOptionsFactory(QObject *parent, const char *name) +PgiOptionsFactory::PgiOptionsFactory(TQObject *parent, const char *name) : KLibFactory(parent, name) { instance(); @@ -39,8 +39,8 @@ PgiOptionsFactory::~PgiOptionsFactory() } -QObject *PgiOptionsFactory::createObject(QObject *parent, const char *name, - const char * /*classname*/, const QStringList &args) +TQObject *PgiOptionsFactory::createObject(TQObject *parent, const char *name, + const char * /*classname*/, const TQStringList &args) { if (args.count() > 0 && qstrcmp(args[0].latin1(), "pghpf") == 0) { kdDebug(9021) << "Building PgiOptions for PGHPF" << endl; diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h index 9e3113a7..4fd73b7f 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h @@ -20,11 +20,11 @@ class PgiOptionsFactory : public KLibFactory Q_OBJECT public: - PgiOptionsFactory( QObject *parent=0, const char *name=0 ); + PgiOptionsFactory( TQObject *parent=0, const char *name=0 ); ~PgiOptionsFactory(); - virtual QObject* createObject( QObject *parent, const char *name, - const char *classname, const QStringList &args); + virtual TQObject* createObject( TQObject *parent, const char *name, + const char *classname, const TQStringList &args); static KInstance *instance(); private: diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp index 8bed362e..8f22453a 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp @@ -9,13 +9,13 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -75,68 +75,68 @@ const char * const hpf_flags[] = { class GeneralTab : public QWidget { public: - GeneralTab( QWidget *parent=0, const char *name=0 ); + GeneralTab( TQWidget *parent=0, const char *name=0 ); ~GeneralTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); }; class OptimizationTab : public QWidget { public: - OptimizationTab( PgiOptionsPlugin::Type type, QWidget *parent=0, const char *name=0 ); + OptimizationTab( PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~OptimizationTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: - QRadioButton *Odefault, *O0, *O1, *O2; - QListView *optBox; + TQRadioButton *Odefault, *O0, *O1, *O2; + TQListView *optBox; }; class HpfTab : public QWidget { public: - HpfTab( QWidget *parent=0, const char *name=0 ); + HpfTab( TQWidget *parent=0, const char *name=0 ); ~HpfTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: - QListView *hpfBox; + TQListView *hpfBox; }; -OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, QWidget *parent, const char *name) - : QWidget(parent, name) +OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QVButtonGroup *group = new QVButtonGroup(i18n("Optimization Level"), this); - Odefault = new QRadioButton(i18n("Default"), group); + TQVButtonGroup *group = new TQVButtonGroup(i18n("Optimization Level"), this); + Odefault = new TQRadioButton(i18n("Default"), group); Odefault->setChecked(true); - O0 = new QRadioButton(i18n("No optimization"), group); - O1 = new QRadioButton(i18n("Level 1"), group); - O2 = new QRadioButton(i18n("Level 2"), group); + O0 = new TQRadioButton(i18n("No optimization"), group); + O1 = new TQRadioButton(i18n("Level 1"), group); + O2 = new TQRadioButton(i18n("Level 2"), group); if (type == PgiOptionsPlugin::PGHPF) { - optBox = new QListView(this); - optBox->addColumn(QString::null); + optBox = new TQListView(this); + optBox->addColumn(TQString::null); optBox->header()->hide(); for (const char * const *p = optimization_flags; *p; ++p) { - new QCheckListItem(optBox, *p, QCheckListItem::CheckBox); + new TQCheckListItem(optBox, *p, TQCheckListItem::CheckBox); kdDebug() << (*p) << endl; } } else optBox = 0; - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -145,20 +145,20 @@ OptimizationTab::~OptimizationTab() {} -void OptimizationTab::readFlags(QStringList *list) +void OptimizationTab::readFlags(TQStringList *list) { if (optBox) { - QListViewItem *item = optBox->firstChild(); + TQListViewItem *item = optBox->firstChild(); for (; item; item = item->nextSibling()) { - QStringList::Iterator sli = list->find(item->text(0)); + TQStringList::Iterator sli = list->find(item->text(0)); if (sli != list->end()) { - static_cast(item)->setOn(true); + static_cast(item)->setOn(true); list->remove(sli); } } } - QStringList::Iterator sli; + TQStringList::Iterator sli; sli = list->find("-O0"); if (sli != list->end()) { O0->setChecked(true); @@ -177,12 +177,12 @@ void OptimizationTab::readFlags(QStringList *list) } -void OptimizationTab::writeFlags(QStringList *list) +void OptimizationTab::writeFlags(TQStringList *list) { if (optBox) { - QListViewItem *item = optBox->firstChild(); + TQListViewItem *item = optBox->firstChild(); for (; item; item = item->nextSibling()) - if (static_cast(item)->isOn()) + if (static_cast(item)->isOn()) (*list) << item->text(0); } @@ -195,19 +195,19 @@ void OptimizationTab::writeFlags(QStringList *list) } -HpfTab::HpfTab(QWidget *parent, const char *name) - : QWidget(parent, name) +HpfTab::HpfTab(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - hpfBox = new QListView(this); - hpfBox->addColumn(QString::null); + hpfBox = new TQListView(this); + hpfBox->addColumn(TQString::null); hpfBox->header()->hide(); for (const char * const *p = hpf_flags; *p; ++p) - new QCheckListItem(hpfBox, *p, QCheckListItem::CheckBox); + new TQCheckListItem(hpfBox, *p, TQCheckListItem::CheckBox); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -216,34 +216,34 @@ HpfTab::~HpfTab() {} -void HpfTab::readFlags(QStringList *list) +void HpfTab::readFlags(TQStringList *list) { - QListViewItem *item = hpfBox->firstChild(); + TQListViewItem *item = hpfBox->firstChild(); for (; item; item = item->nextSibling()) { - QStringList::Iterator sli = list->find(item->text(0)); + TQStringList::Iterator sli = list->find(item->text(0)); if (sli != list->end()) { - static_cast(item)->setOn(true); + static_cast(item)->setOn(true); list->remove(sli); } } } -void HpfTab::writeFlags(QStringList *list) +void HpfTab::writeFlags(TQStringList *list) { - QListViewItem *item = hpfBox->firstChild(); + TQListViewItem *item = hpfBox->firstChild(); for (; item; item = item->nextSibling()) { - if (static_cast(item)->isOn()) + if (static_cast(item)->isOn()) (*list) << item->text(0); } } -PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, QWidget *parent, const char *name) +PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name) : KDialogBase(Tabbed, (type == PgiOptionsPlugin::PGHPF)? i18n("PGHPF Compiler Options") : i18n("PGF77 Compiler Options"), Ok|Cancel, Ok, parent, name, true) { - QVBox *vbox; + TQVBox *vbox; // vbox = addVBoxPage(i18n("General")); // general = new GeneralTab(vbox, "general tab"); @@ -265,9 +265,9 @@ PgiOptionsDialog::~PgiOptionsDialog() } -void PgiOptionsDialog::setFlags(const QString &flags) +void PgiOptionsDialog::setFlags(const TQString &flags) { - QStringList flaglist = QStringList::split(" ", flags); + TQStringList flaglist = TQStringList::split(" ", flags); // Hand them to 'general' at last, so it can make a line edit // with the unprocessed items @@ -278,17 +278,17 @@ void PgiOptionsDialog::setFlags(const QString &flags) } -QString PgiOptionsDialog::flags() const +TQString PgiOptionsDialog::flags() const { - QStringList flaglist; + TQStringList flaglist; if (hpf) hpf->writeFlags(&flaglist); optimization->writeFlags(&flaglist); // general->writeFlags(&flaglist); - QString flags; - QStringList::ConstIterator li; + TQString flags; + TQStringList::ConstIterator li; for (li = flaglist.begin(); li != flaglist.end(); ++li) { flags += (*li); flags += " "; @@ -299,7 +299,7 @@ QString PgiOptionsDialog::flags() const } -PgiOptionsPlugin::PgiOptionsPlugin(Type type, QObject *parent, const char *name) +PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *parent, const char *name) : KDevCompilerOptions(parent, name) { pgitype = type; @@ -310,12 +310,12 @@ PgiOptionsPlugin::~PgiOptionsPlugin() {} -QString PgiOptionsPlugin::exec(QWidget *parent, const QString &flags) +TQString PgiOptionsPlugin::exec(TQWidget *parent, const TQString &flags) { PgiOptionsDialog *dlg = new PgiOptionsDialog(pgitype, parent, "pgi options dialog"); - QString newFlags = flags; + TQString newFlags = flags; dlg->setFlags(flags); - if (dlg->exec() == QDialog::Accepted) + if (dlg->exec() == TQDialog::Accepted) newFlags = dlg->flags(); delete dlg; return newFlags; diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h index dfbf4547..aba83fbc 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h @@ -28,10 +28,10 @@ class PgiOptionsPlugin : public KDevCompilerOptions public: enum Type { PGHPF, PGF77 }; - PgiOptionsPlugin( Type type, QObject *parent=0, const char *name=0 ); + PgiOptionsPlugin( Type type, TQObject *parent=0, const char *name=0 ); ~PgiOptionsPlugin(); - virtual QString exec(QWidget *parent, const QString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); private: Type pgitype; @@ -41,11 +41,11 @@ private: class PgiOptionsDialog : public KDialogBase { public: - PgiOptionsDialog(PgiOptionsPlugin::Type type, QWidget *parent=0, const char *name=0 ); + PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~PgiOptionsDialog(); - void setFlags(const QString &flags); - QString flags() const; + void setFlags(const TQString &flags); + TQString flags() const; private: OptimizationTab *optimization; diff --git a/languages/fortran/fixedformparser.cpp b/languages/fortran/fixedformparser.cpp index 7084fbba..312d811e 100644 --- a/languages/fortran/fixedformparser.cpp +++ b/languages/fortran/fixedformparser.cpp @@ -11,8 +11,8 @@ #include "fixedformparser.h" -#include -#include +#include +#include #include #include @@ -30,9 +30,9 @@ FixedFormParser::FixedFormParser(CodeModel* model) } -void FixedFormParser::process(const QCString &line, const QString &fileName, int lineNum) +void FixedFormParser::process(const TQCString &line, const TQString &fileName, int lineNum) { - QCString simplified; + TQCString simplified; int l = line.length(); for (int i=0; i < l; ++i) if (line[i] != ' ') @@ -40,7 +40,7 @@ void FixedFormParser::process(const QCString &line, const QString &fileName, int if ( simplified.isEmpty() ) return; - QString name; + TQString name; if (functionre.search(simplified) != -1) name = functionre.cap(3); else if (subroutinere.search(simplified) != -1) @@ -58,22 +58,22 @@ void FixedFormParser::process(const QCString &line, const QString &fileName, int } -void FixedFormParser::parse(const QString &fileName) +void FixedFormParser::parse(const TQString &fileName) { - QFile f(QFile::encodeName(fileName)); + TQFile f(TQFile::encodeName(fileName)); if (!f.open(IO_ReadOnly)) return; - QTextStream stream(&f); + TQTextStream stream(&f); m_file = m_model->create(); m_file->setName( fileName ); - QCString line; + TQCString line; int lineNum=0, startLineNum=0; while (!stream.atEnd()) { ++lineNum; - QCString str = stream.readLine().local8Bit(); - if (!str.isEmpty() && QCString("*Cc#!").find(str[0]) != -1) + TQCString str = stream.readLine().local8Bit(); + if (!str.isEmpty() && TQCString("*Cc#!").find(str[0]) != -1) continue; // Continuation line if (str.length() > 6 && str.left(5) == " " && str[5] != ' ') { diff --git a/languages/fortran/fixedformparser.h b/languages/fortran/fixedformparser.h index a7016510..f219e5ca 100644 --- a/languages/fortran/fixedformparser.h +++ b/languages/fortran/fixedformparser.h @@ -12,9 +12,9 @@ #ifndef _FIXEDFORMPARSER_H_ #define _FIXEDFORMPARSER_H_ -#include -#include -#include +#include +#include +#include #include @@ -23,13 +23,13 @@ class FixedFormParser public: FixedFormParser(CodeModel* model); - void parse(const QString &fileName); + void parse(const TQString &fileName); private: - void process(const QCString &line, const QString &fileName, int lineNum); + void process(const TQCString &line, const TQString &fileName, int lineNum); CodeModel* m_model; FileDom m_file; - QRegExp functionre, subroutinere; + TQRegExp functionre, subroutinere; }; #endif diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index e0c0bde9..7d4ed1bc 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -17,13 +17,13 @@ #include "ftnchekconfigwidget.h" #include "fixedformparser.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -48,24 +48,24 @@ typedef KDevGenericFactory FortranSupportFactory; static const KDevPluginInfo data("kdevfortransupport"); K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) ) -FortranSupportPart::FortranSupportPart(QObject *parent, const char *name, const QStringList &) +FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &) : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart") { setInstance(FortranSupportFactory::instance()); setXMLFile("kdevfortransupport.rc"); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), - this, SLOT(savedFile(const KURL&)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), + this, TQT_SLOT(savedFile(const KURL&)) ); KAction *action; action = new KAction( i18n("&Ftnchek"), 0, - this, SLOT(slotFtnchek()), + this, TQT_SLOT(slotFtnchek()), actionCollection(), "project_ftnchek" ); action->setToolTip(i18n("Run ftnchek")); action->setWhatsThis(i18n("Run ftnchek

    Runs ftnchek to check fortran programs for semantic errors. Configure ftnchek options in project settings dialog, Ftnchek tab.")); @@ -89,9 +89,9 @@ void FortranSupportPart::slotFtnchek() if (partController()->saveAllFiles()==false) return; //user cancelled - QDomDocument &dom = *projectDom(); + TQDomDocument &dom = *projectDom(); - QString cmdline = "cd "; + TQString cmdline = "cd "; cmdline += KProcess::quote(project()->projectDirectory()); cmdline += "&& ftnchek -nonovice "; @@ -140,26 +140,26 @@ void FortranSupportPart::slotFtnchek() else cmdline += DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/portabilityonly") + " "; - QStringList list = project()->allFiles(); - QStringList::ConstIterator it; + TQStringList list = project()->allFiles(); + TQStringList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { - QFileInfo fi(*it); - QString extension = fi.extension(); + TQFileInfo fi(*it); + TQString extension = fi.extension(); if (extension == "f77" || extension == "f" || extension == "for" || extension == "ftn") { cmdline += *it + " "; } } - makeFrontend()->queueCommand(QString::null, cmdline); + makeFrontend()->queueCommand(TQString::null, cmdline); } void FortranSupportPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("kdevelop", KIcon::SizeMedium)); + TQVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("kdevelop", KIcon::SizeMedium)); FtnchekConfigWidget *w = new FtnchekConfigWidget(*projectDom(), vbox, "ftnchek config widget"); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } @@ -167,16 +167,16 @@ void FortranSupportPart::projectOpened() { kdDebug(9019) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized parser = new FixedFormParser(codeModel()); - QTimer::singleShot(0, this, SLOT(initialParse())); + TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); } @@ -187,10 +187,10 @@ void FortranSupportPart::projectClosed() } -void FortranSupportPart::maybeParse(const QString fileName) +void FortranSupportPart::maybeParse(const TQString fileName) { - QFileInfo fi(fileName); - QString extension = fi.extension(); + TQFileInfo fi(fileName); + TQString extension = fi.extension(); if (extension == "f77" || extension == "f" || extension == "for" || extension == "ftn") { if( codeModel()->hasFile(fileName) ){ @@ -209,9 +209,9 @@ void FortranSupportPart::initialParse() if (project()) { kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) { - QFileInfo fileInfo( project()->projectDirectory(), *it ); + TQStringList files = project()->allFiles(); + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { + TQFileInfo fileInfo( project()->projectDirectory(), *it ); kdDebug(9019) << "maybe parse " << fileInfo.absFilePath() << endl; maybeParse( fileInfo.absFilePath() ); } @@ -224,16 +224,16 @@ void FortranSupportPart::initialParse() } -void FortranSupportPart::addedFilesToProject(const QStringList &fileList) +void FortranSupportPart::addedFilesToProject(const TQStringList &fileList) { kdDebug(9019) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QFileInfo fileInfo( project()->projectDirectory(), *it ); - QString path = fileInfo.absFilePath(); + TQFileInfo fileInfo( project()->projectDirectory(), *it ); + TQString path = fileInfo.absFilePath(); maybeParse( path ); emit addedSourceInfo( path ); } @@ -242,16 +242,16 @@ void FortranSupportPart::addedFilesToProject(const QStringList &fileList) } -void FortranSupportPart::removedFilesFromProject(const QStringList &fileList) +void FortranSupportPart::removedFilesFromProject(const TQStringList &fileList) { kdDebug(9019) << "removedFilesFromProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QFileInfo fileInfo( project()->projectDirectory(), *it ); - QString path = fileInfo.absFilePath(); + TQFileInfo fileInfo( project()->projectDirectory(), *it ); + TQString path = fileInfo.absFilePath(); if( codeModel()->hasFile(path) ){ emit aboutToRemoveSourceInfo( path ); diff --git a/languages/fortran/fortransupportpart.h b/languages/fortran/fortransupportpart.h index 52dcba5a..9f7cbcdd 100644 --- a/languages/fortran/fortransupportpart.h +++ b/languages/fortran/fortransupportpart.h @@ -25,7 +25,7 @@ class FortranSupportPart : public KDevLanguageSupport Q_OBJECT public: - FortranSupportPart( QObject *parent, const char *name, const QStringList & ); + FortranSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~FortranSupportPart(); protected: @@ -37,14 +37,14 @@ private slots: void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); // Internal void initialParse(); private: - void maybeParse(const QString fileName); + void maybeParse(const TQString fileName); KDevMakeFrontend *makeFrontend(); FixedFormParser *parser; diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchekconfigwidget.cpp index fd4f7a87..3448a343 100644 --- a/languages/fortran/ftnchekconfigwidget.cpp +++ b/languages/fortran/ftnchekconfigwidget.cpp @@ -11,12 +11,12 @@ #include "ftnchekconfigwidget.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include "domutil.h" @@ -25,30 +25,30 @@ class FtnchekItem : public QCheckListItem { public: - FtnchekItem(QListView *parent, const QString &flagstr, - const QString &description) - : QCheckListItem(parent, flagstr, QCheckListItem::CheckBox), + FtnchekItem(TQListView *parent, const TQString &flagstr, + const TQString &description) + : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), desc(description) { setText(1, desc); } - static void readFlagsToListView(QListView *listview, QStringList *list); - static void writeFlagsFromListView(QListView *listview, QStringList *list); + static void readFlagsToListView(TQListView *listview, TQStringList *list); + static void writeFlagsFromListView(TQListView *listview, TQStringList *list); private: - QString flag; - QString desc; + TQString flag; + TQString desc; friend class FtnchekToolTip; }; -void FtnchekItem::readFlagsToListView(QListView *listview, QStringList *list) +void FtnchekItem::readFlagsToListView(TQListView *listview, TQStringList *list) { - QListViewItem *item = listview->firstChild(); + TQListViewItem *item = listview->firstChild(); for (; item; item = item->nextSibling()) { FtnchekItem *flitem = static_cast(item); - QStringList::Iterator sli = list->find(flitem->flag); + TQStringList::Iterator sli = list->find(flitem->flag); if (sli != list->end()) { flitem->setOn(true); list->remove(sli); @@ -57,11 +57,11 @@ void FtnchekItem::readFlagsToListView(QListView *listview, QStringList *list) } -void FtnchekItem::writeFlagsFromListView(QListView *listview, QStringList *list) +void FtnchekItem::writeFlagsFromListView(TQListView *listview, TQStringList *list) { (*list).clear(); - QListViewItem *item = listview->firstChild(); + TQListViewItem *item = listview->firstChild(); for (; item; item = item->nextSibling()) { FtnchekItem *flitem = static_cast(item); if (flitem->isOn()) @@ -73,14 +73,14 @@ void FtnchekItem::writeFlagsFromListView(QListView *listview, QStringList *list) class FtnchekToolTip : public QToolTip { public: - FtnchekToolTip(QWidget *parent) - : QToolTip(parent) + FtnchekToolTip(TQWidget *parent) + : TQToolTip(parent) {} protected: - void maybeTip(const QPoint &pos) + void maybeTip(const TQPoint &pos) { - QListView *listview = static_cast(parentWidget()); - QListViewItem *item = listview->itemAt(pos); + TQListView *listview = static_cast(parentWidget()); + TQListViewItem *item = listview->itemAt(pos); FtnchekItem *flitem = static_cast(item); if (item) @@ -147,7 +147,7 @@ const char *portability_flags[] = { }; -FtnchekConfigWidget::FtnchekConfigWidget(QDomDocument &projectDom, QWidget *parent, const char *name) +FtnchekConfigWidget::FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) : FtnchekConfigWidgetBase(parent, name), dom(projectDom) { arguments_group = new QButtonGroup; @@ -188,22 +188,22 @@ FtnchekConfigWidget::FtnchekConfigWidget(QDomDocument &projectDom, QWidget *pare new FtnchekToolTip(portability_listview); for (const char **p = arguments_flags; *p; p += 2) - new FtnchekItem(arguments_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(arguments_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = common_flags; *p; p += 2) - new FtnchekItem(common_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(common_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = truncation_flags; *p; p += 2) - new FtnchekItem(truncation_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(truncation_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = usage_flags; *p; p += 2) - new FtnchekItem(usage_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(usage_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = f77_flags; *p; p += 2) - new FtnchekItem(f77_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(f77_listview, TQString::fromUtf8(*p), i18n(*(p+1))); for (const char **p = portability_flags; *p; p += 2) - new FtnchekItem(portability_listview, QString::fromUtf8(*p), i18n(*(p+1))); + new FtnchekItem(portability_listview, TQString::fromUtf8(*p), i18n(*(p+1))); readConfig(); } @@ -240,19 +240,19 @@ void FtnchekConfigWidget::readConfig() f77all_button->setChecked(DomUtil::readBoolEntry(dom, "/kdevfortransupport/ftnchek/f77all")); portabilityall_button->setChecked(DomUtil::readBoolEntry(dom, "/kdevfortransupport/ftnchek/portabilityall")); - QStringList list; + TQStringList list; - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/argumentsonly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/argumentsonly")); FtnchekItem::readFlagsToListView(arguments_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/commononly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/commononly")); FtnchekItem::readFlagsToListView(common_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/truncationonly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/truncationonly")); FtnchekItem::readFlagsToListView(truncation_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/usageonly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/usageonly")); FtnchekItem::readFlagsToListView(usage_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/f77only")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/f77only")); FtnchekItem::readFlagsToListView(f77_listview, &list); - list = QStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/portabilityonly")); + list = TQStringList::split(',', DomUtil::readEntry(dom, "/kdevfortransupport/ftnchek/portabilityonly")); FtnchekItem::readFlagsToListView(portability_listview, &list); } @@ -271,7 +271,7 @@ void FtnchekConfigWidget::storeConfig() DomUtil::writeBoolEntry(dom, "/kdevfortransupport/ftnchek/f77all", f77all_button->isChecked()); DomUtil::writeBoolEntry(dom, "/kdevfortransupport/ftnchek/portabilityall", portabilityall_button->isChecked()); - QStringList list; + TQStringList list; FtnchekItem::writeFlagsFromListView(arguments_listview, &list); DomUtil::writeEntry(dom, "/kdevfortransupport/ftnchek/argumentsonly", list.join(",")); diff --git a/languages/fortran/ftnchekconfigwidget.h b/languages/fortran/ftnchekconfigwidget.h index 053b2598..f465ac3f 100644 --- a/languages/fortran/ftnchekconfigwidget.h +++ b/languages/fortran/ftnchekconfigwidget.h @@ -12,7 +12,7 @@ #ifndef _FTNCHEKCONFIGWIDGET_H_ #define _FTNCHEKCONFIGWIDGET_H_ -#include +#include #include "ftnchekconfigwidgetbase.h" class QButtonGroup; @@ -22,7 +22,7 @@ class FtnchekConfigWidget : public FtnchekConfigWidgetBase Q_OBJECT public: - FtnchekConfigWidget(QDomDocument &projectDom, QWidget *parent, const char *name); + FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name); ~FtnchekConfigWidget(); public slots: @@ -32,10 +32,10 @@ private: void readConfig(); void storeConfig(); - QButtonGroup *arguments_group, *common_group; - QButtonGroup *truncation_group, *usage_group; - QButtonGroup *f77_group, *portability_group; - QDomDocument dom; + TQButtonGroup *arguments_group, *common_group; + TQButtonGroup *truncation_group, *usage_group; + TQButtonGroup *f77_group, *portability_group; + TQDomDocument dom; }; #endif diff --git a/languages/java/JavaLexer.hpp b/languages/java/JavaLexer.hpp index a46022cd..9d185686 100644 --- a/languages/java/JavaLexer.hpp +++ b/languages/java/JavaLexer.hpp @@ -6,7 +6,7 @@ #include "driver.h" #include "JavaAST.hpp" - #include + #include #include #define SET_POSITION(ast,t)\ @@ -32,18 +32,18 @@ private: public: void setDriver( Driver* d ) { m_driver = d; } - void setFileName( const QString& fileName ) { m_driver->currentFileName() = fileName; } + void setFileName( const TQString& fileName ) { m_driver->currentFileName() = fileName; } virtual void reportError( const ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); } virtual void reportError( const ANTLR_USE_NAMESPACE(std)string& errorMessage ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(errorMessage.c_str()), getLine(), getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(errorMessage.c_str()), getLine(), getColumn()) ); } virtual void reportWarning( const ANTLR_USE_NAMESPACE(std)string& warnMessage ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(warnMessage.c_str()), getLine(), getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(warnMessage.c_str()), getLine(), getColumn()) ); } #line 30 "JavaLexer.hpp" private: diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.hpp index e9e426b7..fab59972 100644 --- a/languages/java/JavaRecognizer.hpp +++ b/languages/java/JavaRecognizer.hpp @@ -6,7 +6,7 @@ #include "driver.h" #include "JavaAST.hpp" - #include + #include #include #define SET_POSITION(ast,t)\ @@ -144,18 +144,18 @@ private: public: void setDriver( Driver* d ) { m_driver = d; } - void setFileName( const QString& fileName ) { m_driver->currentFileName() = fileName; } + void setFileName( const TQString& fileName ) { m_driver->currentFileName() = fileName; } void reportError( const ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); } void reportError( const ANTLR_USE_NAMESPACE(std)string& errorMessage ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(errorMessage.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(errorMessage.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); } void reportMessage( const ANTLR_USE_NAMESPACE(std)string& message ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(message.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(message.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); } #line 142 "JavaRecognizer.hpp" public: diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp index b442aafd..1bdb9522 100644 --- a/languages/java/JavaStoreWalker.cpp +++ b/languages/java/JavaStoreWalker.cpp @@ -15,7 +15,7 @@ JavaStoreWalker::JavaStoreWalker() void JavaStoreWalker::compilationUnit(RefJavaAST _t) { RefJavaAST compilationUnit_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; #line 75 "java.store.g" - QString package; QString imp; QStringList imports; + TQString package; TQString imp; TQStringList imports; #line 20 "JavaStoreWalker.cpp" try { // for error handling @@ -87,9 +87,9 @@ void JavaStoreWalker::compilationUnit(RefJavaAST _t) { _retTree = _t; } - QString JavaStoreWalker::packageDefinition(RefJavaAST _t) { + TQString JavaStoreWalker::packageDefinition(RefJavaAST _t) { #line 82 "java.store.g" - QString id ; + TQString id ; #line 94 "JavaStoreWalker.cpp" RefJavaAST packageDefinition_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; @@ -112,9 +112,9 @@ void JavaStoreWalker::compilationUnit(RefJavaAST _t) { return id ; } - QString JavaStoreWalker::importDefinition(RefJavaAST _t) { + TQString JavaStoreWalker::importDefinition(RefJavaAST _t) { #line 86 "java.store.g" - QString id ; + TQString id ; #line 119 "JavaStoreWalker.cpp" RefJavaAST importDefinition_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; @@ -140,7 +140,7 @@ void JavaStoreWalker::compilationUnit(RefJavaAST _t) { void JavaStoreWalker::typeDefinition(RefJavaAST _t) { RefJavaAST typeDefinition_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; #line 90 "java.store.g" - QStringList bases; QString className; ClassDom klass; QStringList m; + TQStringList bases; TQString className; ClassDom klass; TQStringList m; #line 145 "JavaStoreWalker.cpp" try { // for error handling @@ -161,8 +161,8 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { #line 92 "java.store.g" klass = m_model->create(); - QString name = QString::fromUtf8( tmp4_AST_in->getText().c_str(), tmp4_AST_in->getText().length() ); - QStringList path = QStringList::split( ".", name ); + TQString name = TQString::fromUtf8( tmp4_AST_in->getText().c_str(), tmp4_AST_in->getText().length() ); + TQStringList path = TQStringList::split( ".", name ); className = path.back(); klass->setName( path.back() ); @@ -181,7 +181,7 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { _t = _retTree; #line 110 "java.store.g" - for( QStringList::Iterator it = bases.begin(); it != bases.end(); ++it ) + for( TQStringList::Iterator it = bases.begin(); it != bases.end(); ++it ) klass->addBaseClass( *it ); #line 188 "JavaStoreWalker.cpp" @@ -219,8 +219,8 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { #line 126 "java.store.g" klass = m_model->create(); - QString name = QString::fromUtf8( tmp6_AST_in->getText().c_str(), tmp6_AST_in->getText().length() ); - QStringList path = QStringList::split( ".", name ); + TQString name = TQString::fromUtf8( tmp6_AST_in->getText().c_str(), tmp6_AST_in->getText().length() ); + TQStringList path = TQStringList::split( ".", name ); className = path.back(); klass->setName( path.back() ); @@ -270,9 +270,9 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { _retTree = _t; } - QString JavaStoreWalker::identifier(RefJavaAST _t) { + TQString JavaStoreWalker::identifier(RefJavaAST _t) { #line 363 "java.store.g" - QString id ; + TQString id ; #line 277 "JavaStoreWalker.cpp" RefJavaAST identifier_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; @@ -307,7 +307,7 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { _t = _t->getNextSibling(); #line 367 "java.store.g" - id += QString(".") + tmp9_AST_in->getText().c_str(); + id += TQString(".") + tmp9_AST_in->getText().c_str(); #line 313 "JavaStoreWalker.cpp" break; @@ -327,9 +327,9 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { return id ; } - QString JavaStoreWalker::identifierStar(RefJavaAST _t) { + TQString JavaStoreWalker::identifierStar(RefJavaAST _t) { #line 372 "java.store.g" - QString id ; + TQString id ; #line 334 "JavaStoreWalker.cpp" RefJavaAST identifierStar_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; @@ -367,7 +367,7 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),STAR); _t = _t->getNextSibling(); #line 376 "java.store.g" - id += QString(".") + tmp12_AST_in->getText().c_str(); + id += TQString(".") + tmp12_AST_in->getText().c_str(); #line 372 "JavaStoreWalker.cpp" break; } @@ -377,7 +377,7 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),IDENT); _t = _t->getNextSibling(); #line 377 "java.store.g" - id += QString(".") + tmp13_AST_in->getText().c_str(); + id += TQString(".") + tmp13_AST_in->getText().c_str(); #line 382 "JavaStoreWalker.cpp" break; } @@ -406,9 +406,9 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { return id ; } - QStringList JavaStoreWalker::modifiers(RefJavaAST _t) { + TQStringList JavaStoreWalker::modifiers(RefJavaAST _t) { #line 183 "java.store.g" - QStringList l ; + TQStringList l ; #line 413 "JavaStoreWalker.cpp" RefJavaAST modifiers_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; RefJavaAST m = RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); @@ -449,13 +449,13 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { return l ; } - QStringList JavaStoreWalker::extendsClause(RefJavaAST _t) { + TQStringList JavaStoreWalker::extendsClause(RefJavaAST _t) { #line 202 "java.store.g" - QStringList l ; + TQStringList l ; #line 456 "JavaStoreWalker.cpp" RefJavaAST extendsClause_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; #line 202 "java.store.g" - QString id; + TQString id; #line 460 "JavaStoreWalker.cpp" try { // for error handling @@ -493,13 +493,13 @@ void JavaStoreWalker::typeDefinition(RefJavaAST _t) { return l ; } - QStringList JavaStoreWalker::implementsClause(RefJavaAST _t) { + TQStringList JavaStoreWalker::implementsClause(RefJavaAST _t) { #line 206 "java.store.g" - QStringList l ; + TQStringList l ; #line 500 "JavaStoreWalker.cpp" RefJavaAST implementsClause_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; #line 206 "java.store.g" - QString id; + TQString id; #line 504 "JavaStoreWalker.cpp" try { // for error handling @@ -695,9 +695,9 @@ void JavaStoreWalker::interfaceBlock(RefJavaAST _t, _retTree = _t; } - QString JavaStoreWalker::typeSpec(RefJavaAST _t) { + TQString JavaStoreWalker::typeSpec(RefJavaAST _t) { #line 157 "java.store.g" - QString tp ; + TQString tp ; #line 702 "JavaStoreWalker.cpp" RefJavaAST typeSpec_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; @@ -720,9 +720,9 @@ void JavaStoreWalker::interfaceBlock(RefJavaAST _t, return tp ; } - QString JavaStoreWalker::typeSpecArray(RefJavaAST _t) { + TQString JavaStoreWalker::typeSpecArray(RefJavaAST _t) { #line 161 "java.store.g" - QString tp ; + TQString tp ; #line 727 "JavaStoreWalker.cpp" RefJavaAST typeSpecArray_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; @@ -776,9 +776,9 @@ void JavaStoreWalker::interfaceBlock(RefJavaAST _t, return tp ; } - QString JavaStoreWalker::type(RefJavaAST _t) { + TQString JavaStoreWalker::type(RefJavaAST _t) { #line 166 "java.store.g" - QString tp ; + TQString tp ; #line 783 "JavaStoreWalker.cpp" RefJavaAST type_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; RefJavaAST b = RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); @@ -1023,8 +1023,8 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { RefJavaAST methodDecl_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; #line 257 "java.store.g" - QStringList m; - QString tp; + TQStringList m; + TQString tp; meth = m_model->create(); meth->setFileName( m_file->name() ); @@ -1071,8 +1071,8 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { RefJavaAST variableDef_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; #line 293 "java.store.g" - QStringList m; - QString tp; + TQStringList m; + TQString tp; attr = m_model->create(); attr->setFileName( m_file->name() ); @@ -1123,7 +1123,7 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { RefJavaAST ctorDef_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; #line 239 "java.store.g" - QStringList m; + TQStringList m; meth = m_model->create(); meth->setFileName( m_file->name() ); @@ -1169,8 +1169,8 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { RefJavaAST methodDef_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; #line 275 "java.store.g" - QStringList m; - QString tp; + TQStringList m; + TQString tp; meth = m_model->create(); meth->setFileName( m_file->name() ); @@ -1426,7 +1426,7 @@ void JavaStoreWalker::varInitializer(RefJavaAST _t) { RefJavaAST parameterDef_AST_in = (_t == RefJavaAST(ASTNULL)) ? RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; #line 313 "java.store.g" - QString tp; + TQString tp; arg = m_model->create(); #line 1433 "JavaStoreWalker.cpp" diff --git a/languages/java/JavaStoreWalker.hpp b/languages/java/JavaStoreWalker.hpp index ed43efcc..676163ad 100644 --- a/languages/java/JavaStoreWalker.hpp +++ b/languages/java/JavaStoreWalker.hpp @@ -6,10 +6,10 @@ #include #include "JavaAST.hpp" - #include - #include - #include - #include + #include + #include + #include + #include #line 15 "JavaStoreWalker.hpp" #include @@ -42,10 +42,10 @@ class CUSTOM_API JavaStoreWalker : public ANTLR_USE_NAMESPACE(antlr)TreeParser, #line 43 "java.store.g" private: - QStringList m_currentScope; + TQStringList m_currentScope; CodeModel* m_model; FileDom m_file; - QValueStack m_currentClass; + TQValueStack m_currentClass; int m_currentAccess; int m_anon; ANTLR_USE_NAMESPACE(antlr)JavaASTFactory ast_factory; @@ -88,23 +88,23 @@ public: return JavaStoreWalker::tokenNames; } public: void compilationUnit(RefJavaAST _t); - public: QString packageDefinition(RefJavaAST _t); - public: QString importDefinition(RefJavaAST _t); + public: TQString packageDefinition(RefJavaAST _t); + public: TQString importDefinition(RefJavaAST _t); public: void typeDefinition(RefJavaAST _t); - public: QString identifier(RefJavaAST _t); - public: QString identifierStar(RefJavaAST _t); - public: QStringList modifiers(RefJavaAST _t); - public: QStringList extendsClause(RefJavaAST _t); - public: QStringList implementsClause(RefJavaAST _t); + public: TQString identifier(RefJavaAST _t); + public: TQString identifierStar(RefJavaAST _t); + public: TQStringList modifiers(RefJavaAST _t); + public: TQStringList extendsClause(RefJavaAST _t); + public: TQStringList implementsClause(RefJavaAST _t); public: void objBlock(RefJavaAST _t, ClassDom klass ); public: void interfaceBlock(RefJavaAST _t, ClassDom klass ); - public: QString typeSpec(RefJavaAST _t); - public: QString typeSpecArray(RefJavaAST _t); - public: QString type(RefJavaAST _t); + public: TQString typeSpec(RefJavaAST _t); + public: TQString typeSpecArray(RefJavaAST _t); + public: TQString type(RefJavaAST _t); public: void builtInType(RefJavaAST _t); public: void modifier(RefJavaAST _t); public: FunctionDom methodDecl(RefJavaAST _t); diff --git a/languages/java/KDevJavaSupportIface.cpp b/languages/java/KDevJavaSupportIface.cpp index 306ad76e..b1225700 100644 --- a/languages/java/KDevJavaSupportIface.cpp +++ b/languages/java/KDevJavaSupportIface.cpp @@ -3,7 +3,7 @@ #include "javasupportpart.h" KDevJavaSupportIface::KDevJavaSupportIface( JavaSupportPart* javaSupport ) - : QObject( javaSupport ), DCOPObject( "KDevJavaSupport" ), m_javaSupport( javaSupport ) + : TQObject( javaSupport ), DCOPObject( "KDevJavaSupport" ), m_javaSupport( javaSupport ) { } diff --git a/languages/java/KDevJavaSupportIface.h b/languages/java/KDevJavaSupportIface.h index e0dce53f..ae5ee39f 100644 --- a/languages/java/KDevJavaSupportIface.h +++ b/languages/java/KDevJavaSupportIface.h @@ -2,12 +2,12 @@ #ifndef KDEVJAVASUPPORTIFACE_H #define KDEVJAVASUPPORTIFACE_H -#include +#include #include class JavaSupportPart; -class KDevJavaSupportIface : public QObject, public DCOPObject +class KDevJavaSupportIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 4081949c..0820b4d1 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -19,7 +19,7 @@ #if QT_VERSION < 0x030100 #include #else -#include +#include #endif #include @@ -34,9 +34,9 @@ #include #include -#include -#include -#include +#include +#include +#include class KDevSourceProvider: public SourceProvider { @@ -48,7 +48,7 @@ public: void setReadFromDisk( bool b ) { m_readFromDisk = b; } bool readFromDisk() const { return m_readFromDisk; } - virtual QString contents( const QString& fileName ) + virtual TQString contents( const TQString& fileName ) { if( !m_readFromDisk ){ //kdDebug(9013) << "-------> kapp is locked = " << kapp->locked() << endl; @@ -59,8 +59,8 @@ public: //kdDebug(9013) << "-------> kapp locked" << endl; - QPtrList parts( *m_javaSupport->partController()->parts() ); - QPtrListIterator it( parts ); + TQPtrList parts( *m_javaSupport->partController()->parts() ); + TQPtrListIterator it( parts ); while( it.current() ){ KTextEditor::Document* doc = dynamic_cast( it.current() ); ++it; @@ -69,7 +69,7 @@ public: if( !doc || !editIface || doc->url().path() != fileName ) continue; - QString contents = QString( editIface->text().ascii() ); // deep copy + TQString contents = TQString( editIface->text().ascii() ); // deep copy if( needToLock ) kapp->unlock(); @@ -84,18 +84,18 @@ public: //kdDebug(9013) << "-------> kapp unlocked" << endl; } - QFile f( fileName ); - QTextStream stream( &f ); + TQFile f( fileName ); + TQTextStream stream( &f ); if( f.open(IO_ReadOnly) ){ - QString contents = stream.read(); + TQString contents = stream.read(); f.close(); return contents; } - return QString::null; + return TQString::null; } - virtual bool isModified( const QString& fileName ) + virtual bool isModified( const TQString& fileName ) { Q_UNUSED( fileName ); return true; @@ -116,44 +116,44 @@ public: bool isEmpty() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList.isEmpty(); } uint count() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList.count(); } - QPair front() const + QPair front() const { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList.front(); } void clear() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.clear(); } - void push_back( const QString& fileName, bool readFromDisk=false ) + void push_back( const TQString& fileName, bool readFromDisk=false ) { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.append( qMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?! } void pop_front() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_fileList.pop_front(); } - bool contains( const QString& fileName ) const + bool contains( const TQString& fileName ) const { - QMutexLocker locker( &m_mutex ); - QValueList< QPair >::ConstIterator it = m_fileList.begin(); + TQMutexLocker locker( &m_mutex ); + TQValueList< QPair >::ConstIterator it = m_fileList.begin(); while( it != m_fileList.end() ){ if( (*it).first == fileName ) return true; @@ -162,10 +162,10 @@ public: return false; } - void remove( const QString& fileName ) + void remove( const TQString& fileName ) { - QMutexLocker locker( &m_mutex ); - QValueList< QPair >::Iterator it = m_fileList.begin(); + TQMutexLocker locker( &m_mutex ); + TQValueList< QPair >::Iterator it = m_fileList.begin(); while( it != m_fileList.end() ){ if( (*it).first == fileName ) m_fileList.remove( it ); @@ -174,11 +174,11 @@ public: } private: - mutable QMutex m_mutex; - QValueList< QPair > m_fileList; + mutable TQMutex m_mutex; + TQValueList< QPair > m_fileList; }; -BackgroundParser::BackgroundParser( JavaSupportPart* part, QWaitCondition* consumed ) +BackgroundParser::BackgroundParser( JavaSupportPart* part, TQWaitCondition* consumed ) : m_consumed( consumed ), m_javaSupport( part ), m_close( false ) { m_fileList = new SynchronizedFileList(); @@ -198,9 +198,9 @@ BackgroundParser::~BackgroundParser() m_fileList = 0; } -void BackgroundParser::addFile( const QString& fileName, bool readFromDisk ) +void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk ) { - QString fn = deepCopy( fileName ); + TQString fn = deepCopy( fileName ); bool added = false; if( !m_fileList->contains(fn) ){ @@ -215,9 +215,9 @@ void BackgroundParser::addFile( const QString& fileName, bool readFromDisk ) void BackgroundParser::removeAllFiles() { kdDebug(9013) << "BackgroundParser::removeAllFiles()" << endl; - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); - QMap::Iterator it = m_unitDict.begin(); + TQMap::Iterator it = m_unitDict.begin(); while( it != m_unitDict.end() ){ Unit* unit = it.data(); ++it; @@ -231,9 +231,9 @@ void BackgroundParser::removeAllFiles() m_isEmpty.wakeAll(); } -void BackgroundParser::removeFile( const QString& fileName ) +void BackgroundParser::removeFile( const TQString& fileName ) { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); if( Unit* unit = findUnit(fileName) ){ m_driver->remove( fileName ); @@ -246,7 +246,7 @@ void BackgroundParser::removeFile( const QString& fileName ) m_isEmpty.wakeAll(); } -Unit* BackgroundParser::parseFile( const QString& fileName, bool readFromDisk ) +Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) { static_cast( m_driver->sourceProvider() )->setReadFromDisk( readFromDisk ); @@ -276,7 +276,7 @@ Unit* BackgroundParser::parseFile( const QString& fileName, bool readFromDisk ) KApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) ); } - m_currentFile = QString::null; + m_currentFile = TQString::null; if( m_fileList->isEmpty() ) m_isEmpty.wakeAll(); @@ -284,13 +284,13 @@ Unit* BackgroundParser::parseFile( const QString& fileName, bool readFromDisk ) return unit; } -Unit* BackgroundParser::findUnit( const QString& fileName ) +Unit* BackgroundParser::findUnit( const TQString& fileName ) { - QMap::Iterator it = m_unitDict.find( fileName ); + TQMap::Iterator it = m_unitDict.find( fileName ); return it != m_unitDict.end() ? *it : 0; } -RefJavaAST BackgroundParser::translationUnit( const QString& fileName ) +RefJavaAST BackgroundParser::translationUnit( const TQString& fileName ) { Unit* u = 0; if( (u = findUnit(fileName)) == 0 ){ @@ -301,7 +301,7 @@ RefJavaAST BackgroundParser::translationUnit( const QString& fileName ) return u->translationUnit; } -QValueList BackgroundParser::problems( const QString& fileName ) +TQValueList BackgroundParser::problems( const TQString& fileName ) { Unit* u = 0; if( (u = findUnit(fileName)) == 0 ){ @@ -309,26 +309,26 @@ QValueList BackgroundParser::problems( const QString& fileName ) u = parseFile( fileName, false ); } - return u ? u->problems : QValueList(); + return u ? u->problems : TQValueList(); } void BackgroundParser::close() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); m_close = true; m_canParse.wakeAll(); } bool BackgroundParser::filesInQueue() { - QMutexLocker locker( &m_mutex ); + TQMutexLocker locker( &m_mutex ); return m_fileList->count() || !m_currentFile.isEmpty(); } void BackgroundParser::run() { - // (void) m_javaSupport->codeCompletion()->repository()->getEntriesInScope( QStringList(), false ); + // (void) m_javaSupport->codeCompletion()->repository()->getEntriesInScope( TQStringList(), false ); while( !m_close ){ @@ -346,8 +346,8 @@ void BackgroundParser::run() break; } - QPair entry = m_fileList->front(); - QString fileName = entry.first; + QPair entry = m_fileList->front(); + TQString fileName = entry.first; bool readFromDisk = entry.second; m_currentFile = fileName; m_fileList->pop_front(); @@ -359,5 +359,5 @@ void BackgroundParser::run() kdDebug(9013) << "!!!!!!!!!!!!!!!!!! BG PARSER DESTROYED !!!!!!!!!!!!" << endl; //commented to fix #83352 - //QThread::exit(); + //TQThread::exit(); } diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h index 2029ebf5..4cc52f33 100644 --- a/languages/java/backgroundparser.h +++ b/languages/java/backgroundparser.h @@ -15,10 +15,10 @@ #include "driver.h" #include "JavaAST.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include class JavaSupportPart; @@ -31,8 +31,8 @@ public: Unit() {} ~Unit() {} - QString fileName; - QValueList problems; + TQString fileName; + TQValueList problems; RefJavaAST translationUnit; protected: @@ -43,44 +43,44 @@ protected: class BackgroundParser: public QThread { public: - BackgroundParser( JavaSupportPart*, QWaitCondition* consumed ); + BackgroundParser( JavaSupportPart*, TQWaitCondition* consumed ); virtual ~BackgroundParser(); - QMutex& mutex() { return m_mutex; } + TQMutex& mutex() { return m_mutex; } void lock() { m_mutex.lock(); } void unlock() { m_mutex.unlock(); } - QWaitCondition& canParse() { return m_canParse; } - QWaitCondition& isEmpty() { return m_isEmpty; } + TQWaitCondition& canParse() { return m_canParse; } + TQWaitCondition& isEmpty() { return m_isEmpty; } bool filesInQueue(); - void addFile( const QString& fileName, bool readFromDisk=false ); - void removeFile( const QString& fileName ); + void addFile( const TQString& fileName, bool readFromDisk=false ); + void removeFile( const TQString& fileName ); void removeAllFiles(); - RefJavaAST translationUnit( const QString& fileName ); - QValueList problems( const QString& fileName ); + RefJavaAST translationUnit( const TQString& fileName ); + TQValueList problems( const TQString& fileName ); void close(); virtual void run(); protected: - Unit* findUnit( const QString& fileName ); - Unit* parseFile( const QString& fileName, bool readFromDisk ); + Unit* findUnit( const TQString& fileName ); + Unit* parseFile( const TQString& fileName, bool readFromDisk ); private: class KDevDriver* m_driver; - QString m_currentFile; - QWaitCondition m_canParse; - QWaitCondition m_isEmpty; - QWaitCondition* m_consumed; - QMutex m_mutex; + TQString m_currentFile; + TQWaitCondition m_canParse; + TQWaitCondition m_isEmpty; + TQWaitCondition* m_consumed; + TQMutex m_mutex; SynchronizedFileList* m_fileList; JavaSupportPart* m_javaSupport; bool m_close; - QMap m_unitDict; + TQMap m_unitDict; }; #endif diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp index ee49625d..f856fc74 100644 --- a/languages/java/driver.cpp +++ b/languages/java/driver.cpp @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -35,20 +35,20 @@ class DefaultSourceProvider: public SourceProvider public: DefaultSourceProvider() {} - virtual QString contents( const QString& fileName ) + virtual TQString contents( const TQString& fileName ) { - QString source; + TQString source; - QFile f( fileName ); + TQFile f( fileName ); if( f.open(IO_ReadOnly) ){ - QTextStream s( &f ); + TQTextStream s( &f ); source = s.read(); f.close(); } return source; } - virtual bool isModified( const QString& fileName ) + virtual bool isModified( const TQString& fileName ) { Q_UNUSED( fileName ); return true; @@ -96,11 +96,11 @@ void Driver::reset( ) } } -void Driver::remove( const QString & fileName ) +void Driver::remove( const TQString & fileName ) { m_problems.remove( fileName ); - QMap::Iterator it = m_parsedUnits.find( fileName ); + TQMap::Iterator it = m_parsedUnits.find( fileName ); if( it != m_parsedUnits.end() ){ RefJavaAST unit = *it; m_parsedUnits.remove( it ); @@ -108,51 +108,51 @@ void Driver::remove( const QString & fileName ) } } -RefJavaAST Driver::takeTranslationUnit( const QString& fileName ) +RefJavaAST Driver::takeTranslationUnit( const TQString& fileName ) { - QMap::Iterator it = m_parsedUnits.find( fileName ); + TQMap::Iterator it = m_parsedUnits.find( fileName ); RefJavaAST unit( *it ); //m_parsedUnits.remove( it ); m_parsedUnits[ fileName] = 0; return unit; } -RefJavaAST Driver::translationUnit( const QString& fileName ) const +RefJavaAST Driver::translationUnit( const TQString& fileName ) const { - QMap::ConstIterator it = m_parsedUnits.find( fileName ); + TQMap::ConstIterator it = m_parsedUnits.find( fileName ); return it != m_parsedUnits.end() ? *it : RefJavaAST(); } -void Driver::addProblem( const QString & fileName, const Problem & problem ) +void Driver::addProblem( const TQString & fileName, const Problem & problem ) { findOrInsertProblemList( fileName ).append( problem ); } -QValueList < Problem >& Driver::findOrInsertProblemList( const QString & fileName ) +TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName ) { - QMap >::Iterator it = m_problems.find( fileName ); + TQMap >::Iterator it = m_problems.find( fileName ); if( it != m_problems.end() ) return it.data(); - QValueList l; + TQValueList l; m_problems.insert( fileName, l ); return m_problems[ fileName ]; } -QValueList < Problem > Driver::problems( const QString & fileName ) const +TQValueList < Problem > Driver::problems( const TQString & fileName ) const { - QMap >::ConstIterator it = m_problems.find( fileName ); + TQMap >::ConstIterator it = m_problems.find( fileName ); if( it != m_problems.end() ) return it.data(); - return QValueList(); + return TQValueList(); } -void Driver::parseFile( const QString& fileName, bool onlyPreProcess, bool force ) +void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool force ) { - QFileInfo fileInfo( fileName ); - QString absFilePath = fileInfo.absFilePath(); + TQFileInfo fileInfo( fileName ); + TQString absFilePath = fileInfo.absFilePath(); - QMap::Iterator it = m_parsedUnits.find( absFilePath ); + TQMap::Iterator it = m_parsedUnits.find( absFilePath ); if( force && it != m_parsedUnits.end() ){ takeTranslationUnit( absFilePath ); @@ -199,7 +199,7 @@ void Driver::parseFile( const QString& fileName, bool onlyPreProcess, bool force } - m_currentFileName = QString::null; + m_currentFileName = TQString::null; lexer = 0; fileParsed( fileName ); @@ -215,13 +215,13 @@ void Driver::setupParser( JavaRecognizer * parser ) Q_UNUSED( parser ); } -void Driver::addIncludePath( const QString &path ) +void Driver::addIncludePath( const TQString &path ) { if( !path.stripWhiteSpace().isEmpty() ) m_includePaths << path; } -void Driver::fileParsed( const QString & fileName ) +void Driver::fileParsed( const TQString & fileName ) { Q_UNUSED( fileName ); } diff --git a/languages/java/driver.h b/languages/java/driver.h index 66813e38..5b8c522a 100644 --- a/languages/java/driver.h +++ b/languages/java/driver.h @@ -22,10 +22,10 @@ #include "JavaAST.hpp" -#include -#include -#include -#include +#include +#include +#include +#include class JavaLexer; class JavaRecognizer; @@ -46,7 +46,7 @@ public: Problem( const Problem& source ) : m_text( source.m_text ), m_line( source.m_line ), m_column( source.m_column ), m_level( source.m_level ) {} - Problem( const QString& text, int line, int column, int level=Level_Error ) + Problem( const TQString& text, int line, int column, int level=Level_Error ) : m_text( text ), m_line( line ), m_column( column ), m_level(level) {} Problem& operator = ( const Problem& source ) @@ -63,13 +63,13 @@ public: return m_text == p.m_text && m_line == p.m_line && m_column == p.m_column && m_level == p.m_level; } - QString text() const { return m_text; } + TQString text() const { return m_text; } int line() const { return m_line; } int column() const { return m_column; } int level() const { return m_level; } private: - QString m_text; + TQString m_text; int m_line; int m_column; int m_level; @@ -81,8 +81,8 @@ public: SourceProvider() {} virtual ~SourceProvider() {} - virtual QString contents( const QString& fileName ) = 0; - virtual bool isModified( const QString& fileName ) = 0; + virtual TQString contents( const TQString& fileName ) = 0; + virtual bool isModified( const TQString& fileName ) = 0; private: SourceProvider( const SourceProvider& source ); @@ -100,34 +100,34 @@ public: virtual void reset(); - virtual void parseFile( const QString& fileName, bool onlyPreProcesss=false, bool force=false ); - virtual void fileParsed( const QString& fileName ); - virtual void remove( const QString& fileName ); + virtual void parseFile( const TQString& fileName, bool onlyPreProcesss=false, bool force=false ); + virtual void fileParsed( const TQString& fileName ); + virtual void remove( const TQString& fileName ); - virtual void addProblem( const QString& fileName, const Problem& problem ); + virtual void addProblem( const TQString& fileName, const Problem& problem ); - QString currentFileName() const { return m_currentFileName; } - RefJavaAST takeTranslationUnit( const QString& fileName ); - RefJavaAST translationUnit( const QString& fileName ) const; - QValueList problems( const QString& fileName ) const; + TQString currentFileName() const { return m_currentFileName; } + RefJavaAST takeTranslationUnit( const TQString& fileName ); + RefJavaAST translationUnit( const TQString& fileName ) const; + TQValueList problems( const TQString& fileName ) const; - QStringList includePaths() const { return m_includePaths; } - virtual void addIncludePath( const QString &path ); + TQStringList includePaths() const { return m_includePaths; } + virtual void addIncludePath( const TQString &path ); - const QMap &parsedUnits() const { return m_parsedUnits; } + const TQMap &parsedUnits() const { return m_parsedUnits; } protected: virtual void setupLexer( JavaLexer* lexer ); virtual void setupParser( JavaRecognizer* parser ); private: - QValueList& findOrInsertProblemList( const QString& fileName ); + TQValueList& findOrInsertProblemList( const TQString& fileName ); private: - QString m_currentFileName; - QMap< QString, QValueList > m_problems; - QMap< QString, RefJavaAST > m_parsedUnits; - QStringList m_includePaths; + TQString m_currentFileName; + TQMap< TQString, TQValueList > m_problems; + TQMap< TQString, RefJavaAST > m_parsedUnits; + TQStringList m_includePaths; JavaLexer *lexer; SourceProvider* m_sourceProvider; diff --git a/languages/java/javasupport_events.h b/languages/java/javasupport_events.h index c267b8e5..e325e635 100644 --- a/languages/java/javasupport_events.h +++ b/languages/java/javasupport_events.h @@ -15,28 +15,28 @@ #include "driver.h" #include "kdevdeepcopy.h" -#include -#include +#include +#include #if QT_VERSION < 0x030100 #include #else -#include +#include #endif enum { - Event_FileParsed = QEvent::User + 1000 + Event_FileParsed = TQEvent::User + 1000 }; class FileParsedEvent: public QCustomEvent { public: - FileParsedEvent( const QString& fileName, const QValueList& problems ) - : QCustomEvent(Event_FileParsed), m_fileName( deepCopy(fileName) ) + FileParsedEvent( const TQString& fileName, const TQValueList& problems ) + : TQCustomEvent(Event_FileParsed), m_fileName( deepCopy(fileName) ) { // the members are deep copies - QValueListConstIterator it = problems.begin(); + TQValueListConstIterator it = problems.begin(); while (it != problems.end()) { Problem p = *it; m_problems.append(Problem(deepCopy(p.text()), p.line(), p.column(), p.level())); @@ -44,12 +44,12 @@ public: } } - QString fileName() const { return m_fileName; } - QValueList problems() const { return m_problems; } + TQString fileName() const { return m_fileName; } + TQValueList problems() const { return m_problems; } private: - QString m_fileName; - QValueList m_problems; + TQString m_fileName; + TQValueList m_problems; private: FileParsedEvent( const FileParsedEvent& source ); diff --git a/languages/java/javasupport_utils.cpp b/languages/java/javasupport_utils.cpp index 1fa28b81..f3c00904 100644 --- a/languages/java/javasupport_utils.cpp +++ b/languages/java/javasupport_utils.cpp @@ -2,26 +2,26 @@ #include "javasupport_utils.h" #include -static void typeNameList( QStringList& path, QStringList & lst, const CodeModel * model ); -static void typeNameList( QStringList& path, QStringList & lst, NamespaceDom ns ); -static void typeNameList( QStringList & path, QStringList & lst, ClassDom klass ); +static void typeNameList( TQStringList& path, TQStringList & lst, const CodeModel * model ); +static void typeNameList( TQStringList& path, TQStringList & lst, NamespaceDom ns ); +static void typeNameList( TQStringList & path, TQStringList & lst, ClassDom klass ); -QStringList typeNameList( const CodeModel* model ) +TQStringList typeNameList( const CodeModel* model ) { - QStringList lst; - QStringList path; + TQStringList lst; + TQStringList path; typeNameList( path, lst, model ); return lst; } -static void typeNameList( QStringList& path, QStringList & lst, const CodeModel * model ) +static void typeNameList( TQStringList& path, TQStringList & lst, const CodeModel * model ) { const FileList fileList = model->fileList(); for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ) typeNameList( path, lst, model_cast(*it) ); } -static void typeNameList( QStringList& path, QStringList & lst, NamespaceDom ns ) +static void typeNameList( TQStringList& path, TQStringList & lst, NamespaceDom ns ) { if( !ns->isFile() ) path.push_back( ns->name() ); @@ -38,7 +38,7 @@ static void typeNameList( QStringList& path, QStringList & lst, NamespaceDom ns path.pop_back(); } -static void typeNameList( QStringList & path, QStringList & lst, ClassDom klass ) +static void typeNameList( TQStringList & path, TQStringList & lst, ClassDom klass ) { path.push_back( klass->name() ); diff --git a/languages/java/javasupport_utils.h b/languages/java/javasupport_utils.h index 12d2fec0..ad380966 100644 --- a/languages/java/javasupport_utils.h +++ b/languages/java/javasupport_utils.h @@ -12,10 +12,10 @@ #ifndef __javasupport_utils_h #define __javasupport_utils_h -#include +#include class CodeModel; -QStringList typeNameList( const CodeModel* model ); +TQStringList typeNameList( const CodeModel* model ); #endif // __javasupport_utils_h diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index c8122a47..62d4811f 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -26,20 +26,20 @@ #include "JavaStoreWalker.hpp" #include "JavaAST.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -85,7 +85,7 @@ public: { } - void fileParsed( const QString& fileName ) + void fileParsed( const TQString& fileName ) { //kdDebug(9013) << "-----> file " << fileName << " parsed!" << endl; RefJavaAST ast = takeTranslationUnit( fileName ); @@ -93,8 +93,8 @@ public: if( javaSupport()->problemReporter() ){ javaSupport()->problemReporter()->removeAllProblems( fileName ); - QValueList pl = problems( fileName ); - QValueList::ConstIterator it = pl.begin(); + TQValueList pl = problems( fileName ); + TQValueList::ConstIterator it = pl.begin(); while( it != pl.end() ){ const Problem& p = *it++; javaSupport()->problemReporter()->reportProblem( fileName, p ); @@ -118,7 +118,7 @@ public: } }; -JavaSupportPart::JavaSupportPart(QObject *parent, const char *name, const QStringList &/*args*/) +JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStringList &/*args*/) : KDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "KDevJavaSupport"), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_valid( false ) @@ -135,37 +135,37 @@ JavaSupportPart::JavaSupportPart(QObject *parent, const char *name, const QStrin m_backgroundParser = new BackgroundParser( this, &m_eventConsumed ); m_backgroundParser->start(); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), - this, SLOT(savedFile(const KURL&)) ); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); - connect( partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(activePartChanged(KParts::Part*))); - connect( partController(), SIGNAL(partRemoved(KParts::Part*)), - this, SLOT(partRemoved(KParts::Part*))); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), + this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect( partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), + this, TQT_SLOT(partRemoved(KParts::Part*))); m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" ); m_problemReporter->setIcon( SmallIcon("info") ); mainWindow( )->embedOutputView( m_problemReporter, i18n("Problems"), i18n("Problem reporter")); - connect( core(), SIGNAL(configWidget(KDialogBase*)), - m_problemReporter, SLOT(configWidget(KDialogBase*)) ); - connect( core(), SIGNAL(configWidget(KDialogBase*)), - this, SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), + m_problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), + this, TQT_SLOT(configWidget(KDialogBase*)) ); KAction *action; action = new KAction(i18n("New Class..."), "classnew", 0, - this, SLOT(slotNewClass()), + this, TQT_SLOT(slotNewClass()), actionCollection(), "project_newclass"); action->setToolTip( i18n("Generate a new class") ); action->setWhatsThis( i18n("New ClassGenerates a new class.

    ") ); // daniel - connect( core( ), SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevJavaSupportIface( this ); //(void) dcopClient(); @@ -186,7 +186,7 @@ JavaSupportPart::~JavaSupportPart() codeRepository()->setMainCatalog( 0 ); - QPtrListIterator it( m_catalogList ); + TQPtrListIterator it( m_catalogList ); while( Catalog* catalog = it.current() ){ ++it; codeRepository()->unregisterCatalog( catalog ); @@ -198,20 +198,20 @@ JavaSupportPart::~JavaSupportPart() m_problemReporter = 0; } -void JavaSupportPart::customEvent( QCustomEvent* ev ) +void JavaSupportPart::customEvent( TQCustomEvent* ev ) { //kdDebug(9013) << "JavaSupportPart::customEvent()" << endl; if( ev->type() == int(Event_FileParsed) ){ FileParsedEvent* event = (FileParsedEvent*) ev; - QString fileName = event->fileName(); + TQString fileName = event->fileName(); if( m_problemReporter ){ m_problemReporter->removeAllProblems( fileName ); bool hasErrors = false; - QValueList problems = event->problems(); - QValueList::ConstIterator it = problems.begin(); + TQValueList problems = event->problems(); + TQValueList::ConstIterator it = problems.begin(); while( it != problems.end() ){ const Problem& p = *it++; if( p.level() == Problem::Level_Error ) @@ -267,12 +267,12 @@ void JavaSupportPart::activePartChanged(KParts::Part *part) m_activeSelection = dynamic_cast( part ); m_activeViewCursor = part ? dynamic_cast( m_activeView ) : 0; - m_activeFileName = QString::null; + m_activeFileName = TQString::null; if (m_activeDocument) { m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() ); - QFileInfo fi( m_activeFileName ); - QString ext = fi.extension(); + TQFileInfo fi( m_activeFileName ); + TQString ext = fi.extension(); if (fileExtensions().contains(ext)) enabled = true; } @@ -288,8 +288,8 @@ void JavaSupportPart::activePartChanged(KParts::Part *part) if( !textHintIface ) return; - connect( view, SIGNAL(needTextHint(int,int,QString&)), - this, SLOT(slotNeedTextHint(int,int,QString&)) ); + connect( view, TQT_SIGNAL(needTextHint(int,int,TQString&)), + this, TQT_SLOT(slotNeedTextHint(int,int,TQString&)) ); textHintIface->enableTextHints( 1000 ); #endif @@ -302,20 +302,20 @@ void JavaSupportPart::projectOpened( ) m_projectDirectory = URLUtil::canonicalPath( project()->projectDirectory() ); - connect( project( ), SIGNAL( addedFilesToProject( const QStringList & ) ), - this, SLOT( addedFilesToProject( const QStringList & ) ) ); - connect( project( ), SIGNAL( removedFilesFromProject( const QStringList &) ), - this, SLOT( removedFilesFromProject( const QStringList & ) ) ); - connect( project( ), SIGNAL( changedFilesInProject( const QStringList & ) ), - this, SLOT( changedFilesInProject( const QStringList & ) ) ); - connect( project(), SIGNAL(projectCompiled()), - this, SLOT(slotProjectCompiled()) ); + connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList &) ), + this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQT_SIGNAL(projectCompiled()), + this, TQT_SLOT(slotProjectCompiled()) ); m_timestamp.clear(); m_projectClosed = false; - QTimer::singleShot( 500, this, SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); } @@ -331,7 +331,7 @@ void JavaSupportPart::projectClosed( ) m_projectClosed = true; } -void JavaSupportPart::contextMenu(QPopupMenu */*popup*/, const Context *context) +void JavaSupportPart::contextMenu(TQPopupMenu */*popup*/, const Context *context) { m_activeClass = 0; m_activeFunction = 0; @@ -350,37 +350,37 @@ void JavaSupportPart::contextMenu(QPopupMenu */*popup*/, const Context *context) } } -void JavaSupportPart::addedFilesToProject(const QStringList &fileList) +void JavaSupportPart::addedFilesToProject(const TQStringList &fileList) { - QStringList files = fileList; + TQStringList files = fileList; - for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - QString path = URLUtil::canonicalPath( m_projectDirectory + "/" + (*it) ); + TQString path = URLUtil::canonicalPath( m_projectDirectory + "/" + (*it) ); maybeParse( path ); emit addedSourceInfo( path ); } } -void JavaSupportPart::removedFilesFromProject(const QStringList &fileList) +void JavaSupportPart::removedFilesFromProject(const TQStringList &fileList) { - for ( QStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) + for ( TQStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) { - QString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); + TQString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); removeWithReferences( path ); m_backgroundParser->removeFile( path ); } } -void JavaSupportPart::changedFilesInProject( const QStringList & fileList ) +void JavaSupportPart::changedFilesInProject( const TQStringList & fileList ) { - QStringList files = fileList; + TQStringList files = fileList; - for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) + for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - QString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); + TQString path = URLUtil::canonicalPath( m_projectDirectory + "/" + *it ); maybeParse( path ); emit addedSourceInfo( path ); @@ -394,7 +394,7 @@ void JavaSupportPart::savedFile(const KURL &fileName) #if 0 // not needed anymore kdDebug(9013) << "savedFile(): " << fileName.mid ( m_projectDirectory.length() + 1 ) << endl; - QStringList projectFileList = project()->allFiles(); + TQStringList projectFileList = project()->allFiles(); if (projectFileList.contains(fileName.mid ( m_projectDirectory.length() + 1 ))) { maybeParse( fileName ); emit addedSourceInfo( fileName ); @@ -402,13 +402,13 @@ void JavaSupportPart::savedFile(const KURL &fileName) #endif } -QString JavaSupportPart::findSourceFile() +TQString JavaSupportPart::findSourceFile() { - QFileInfo fi( m_activeFileName ); - QString path = fi.filePath(); - QString ext = fi.extension(); - QString base = path.left( path.length() - ext.length() ); - QStringList candidates; + TQFileInfo fi( m_activeFileName ); + TQString path = fi.filePath(); + TQString ext = fi.extension(); + TQString base = path.left( path.length() - ext.length() ); + TQStringList candidates; if (ext == "h" || ext == "H" || ext == "hh" || ext == "hxx" || ext == "hpp" || ext == "tlh") { candidates << (base + "c"); @@ -423,10 +423,10 @@ QString JavaSupportPart::findSourceFile() candidates << (base + "inl"); } - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = candidates.begin(); it != candidates.end(); ++it) { kdDebug(9013) << "Trying " << (*it) << endl; - if (QFileInfo(*it).exists()) { + if (TQFileInfo(*it).exists()) { return *it; } } @@ -439,19 +439,19 @@ KDevLanguageSupport::Features JavaSupportPart::features() return Features( Classes | Functions | Variables ); } -QString JavaSupportPart::formatClassName(const QString &name) +TQString JavaSupportPart::formatClassName(const TQString &name) { return name; } -QString JavaSupportPart::unformatClassName(const QString &name) +TQString JavaSupportPart::unformatClassName(const TQString &name) { return name; } -QStringList JavaSupportPart::fileExtensions() const +TQStringList JavaSupportPart::fileExtensions() const { - return QStringList::split(",", "java"); + return TQStringList::split(",", "java"); } void JavaSupportPart::slotNewClass() @@ -482,8 +482,8 @@ void JavaSupportPart::initialParse( ) } #if QT_VERSION < 0x030100 -// Taken from qt-3.2/tools/qdatetime.java/QDateTime::toTime_t() and modified for normal function -uint toTime_t(QDateTime t) +// Taken from qt-3.2/tools/qdatetime.java/TQDateTime::toTime_t() and modified for normal function +uint toTime_t(TQDateTime t) { tm brokenDown; brokenDown.tm_sec = t.time().second(); @@ -503,7 +503,7 @@ uint toTime_t(QDateTime t) bool JavaSupportPart::parseProject( ) { - //QLabel* label = new QLabel( "", mainWindow( )->statusBar( ) ); + //TQLabel* label = new TQLabel( "", mainWindow( )->statusBar( ) ); //label->setMinimumWidth( 600 ); //mainWindow( )->statusBar( )->addWidget( label ); //label->show( ); @@ -513,30 +513,30 @@ JavaSupportPart::parseProject( ) kapp->processEvents( ); kapp->setOverrideCursor( waitCursor ); - QStringList files = modifiedFileList(); + TQStringList files = modifiedFileList(); - QProgressBar* bar = new QProgressBar( files.count( ), mainWindow( )->statusBar( ) ); + TQProgressBar* bar = new TQProgressBar( files.count( ), mainWindow( )->statusBar( ) ); bar->setMinimumWidth( 120 ); bar->setCenterIndicator( true ); mainWindow( )->statusBar( )->addWidget( bar ); bar->show( ); - QDir d( m_projectDirectory ); + TQDir d( m_projectDirectory ); - QDataStream stream; - QMap< QString, QPair > pcs; + TQDataStream stream; + TQMap< TQString, QPair > pcs; - if( QFileInfo( project()->projectDirectory() + "/" + + if( TQFileInfo( project()->projectDirectory() + "/" + project()->projectName().lower() + ".kdevelop.pcs" ).exists() ) { d.rename(project()->projectName().lower() + ".kdevelop.pcs", project()->projectName() + ".kdevelop.pcs"); } - QFile f(project()->projectDirectory() + "/" + project()->projectName() + ".kdevelop.pcs"); + TQFile f(project()->projectDirectory() + "/" + project()->projectName() + ".kdevelop.pcs"); if( f.open(IO_ReadOnly) ){ stream.setDevice( &f ); - QString sig; + TQString sig; int pcs_version = 0; stream >> sig >> pcs_version; if( sig == "PCS" && pcs_version == KDEV_PCS_VERSION ){ @@ -545,7 +545,7 @@ JavaSupportPart::parseProject( ) stream >> numFiles; for( int i=0; isetProgress( n++ ); - QFileInfo fileInfo( d, *it ); + TQFileInfo fileInfo( d, *it ); if( fileInfo.exists() && fileInfo.isFile() && fileInfo.isReadable() ){ - QString absFilePath = URLUtil::canonicalPath( fileInfo.absFilePath() ); + TQString absFilePath = URLUtil::canonicalPath( fileInfo.absFilePath() ); kdDebug(9013) << "parse file: " << absFilePath << endl; if( (n%5) == 0 ){ @@ -574,7 +574,7 @@ JavaSupportPart::parseProject( ) } if( isValidSource(absFilePath) ){ - QDateTime t = fileInfo.lastModified(); + TQDateTime t = fileInfo.lastModified(); if( m_timestamp.contains(absFilePath) && m_timestamp[absFilePath] == t ) continue; @@ -616,21 +616,21 @@ JavaSupportPart::parseProject( ) return true; } -void JavaSupportPart::maybeParse( const QString& fileName ) +void JavaSupportPart::maybeParse( const TQString& fileName ) { if( !isValidSource(fileName) ) return; - QFileInfo fileInfo( fileName ); - QString path = URLUtil::canonicalPath( fileName ); - QDateTime t = fileInfo.lastModified(); + TQFileInfo fileInfo( fileName ); + TQString path = URLUtil::canonicalPath( fileName ); + TQDateTime t = fileInfo.lastModified(); if( !fileInfo.exists() ){ removeWithReferences( path ); return; } - QMap::Iterator it = m_timestamp.find( path ); + TQMap::Iterator it = m_timestamp.find( path ); if( it != m_timestamp.end() && *it == t ){ return; } @@ -639,19 +639,19 @@ void JavaSupportPart::maybeParse( const QString& fileName ) m_driver->parseFile( path ); } -void JavaSupportPart::slotNeedTextHint( int /*line*/, int /*column*/, QString& /*textHint*/ ) +void JavaSupportPart::slotNeedTextHint( int /*line*/, int /*column*/, TQString& /*textHint*/ ) { } -QStringList JavaSupportPart::subclassWidget(const QString& /*formName*/) +TQStringList JavaSupportPart::subclassWidget(const TQString& /*formName*/) { - QStringList newFileNames; + TQStringList newFileNames; return newFileNames; } -QStringList JavaSupportPart::updateWidget(const QString& /*formName*/, const QString& /*fileName*/) +TQStringList JavaSupportPart::updateWidget(const TQString& /*formName*/, const TQString& /*fileName*/) { - QStringList dummy; + TQStringList dummy; return dummy; } @@ -661,11 +661,11 @@ void JavaSupportPart::partRemoved( KParts::Part* part ) if( KTextEditor::Document* doc = dynamic_cast( part ) ){ - QString fileName = doc->url().path(); + TQString fileName = doc->url().path(); if( fileName.isEmpty() ) return; - QString canonicalFileName = URLUtil::canonicalPath( fileName ); + TQString canonicalFileName = URLUtil::canonicalPath( fileName ); m_backgroundParser->removeFile( canonicalFileName ); m_backgroundParser->addFile( canonicalFileName, true ); } @@ -677,24 +677,24 @@ void JavaSupportPart::slotProjectCompiled() parseProject(); } -QStringList JavaSupportPart::modifiedFileList() +TQStringList JavaSupportPart::modifiedFileList() { - QStringList lst; + TQStringList lst; - QStringList fileList = project()->allFiles(); - QStringList::Iterator it = fileList.begin(); + TQStringList fileList = project()->allFiles(); + TQStringList::Iterator it = fileList.begin(); while( it != fileList.end() ){ - QString fileName = *it; + TQString fileName = *it; ++it; - QFileInfo fileInfo( m_projectDirectory, fileName ); + TQFileInfo fileInfo( m_projectDirectory, fileName ); if( !fileExtensions().contains(fileInfo.extension()) ) continue; - QDateTime t = fileInfo.lastModified(); - QString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); - QMap::Iterator dictIt = m_timestamp.find( path ); + TQDateTime t = fileInfo.lastModified(); + TQString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); + TQMap::Iterator dictIt = m_timestamp.find( path ); if( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t ) continue; @@ -709,8 +709,8 @@ KTextEditor::Document * JavaSupportPart::findDocument( const KURL & url ) if( !partController()->parts() ) return 0; - QPtrList parts( *partController()->parts() ); - QPtrListIterator it( parts ); + TQPtrList parts( *partController()->parts() ); + TQPtrListIterator it( parts ); while( KParts::Part* part = it.current() ){ KTextEditor::Document* doc = dynamic_cast( part ); if( doc && doc->url() == url ) @@ -725,19 +725,19 @@ void JavaSupportPart::setupCatalog( ) { kdDebug(9013) << "JavaSupportPart::setupCatalog()" << endl; - QStringList indexList = QStringList() << "kind" << "name" << "scope" << "fileName"; + TQStringList indexList = TQStringList() << "kind" << "name" << "scope" << "fileName"; KStandardDirs *dirs = JavaSupportFactory::instance()->dirs(); - QStringList pcsList = dirs->findAllResources( "pcs", "*.db", false, true ); - QStringList pcsIdxList = dirs->findAllResources( "pcs", "*.idx", false, true ); + TQStringList pcsList = dirs->findAllResources( "pcs", "*.db", false, true ); + TQStringList pcsIdxList = dirs->findAllResources( "pcs", "*.idx", false, true ); if( pcsList.size() && pcsVersion() < KDEV_DB_VERSION ){ - QStringList l = pcsList + pcsIdxList; + TQStringList l = pcsList + pcsIdxList; int rtn = KMessageBox::questionYesNoList( 0, i18n("Persistent class store will be disabled: you have a wrong version of pcs installed.\nRemove old pcs files?"), l, i18n("Java Support"), KStdGuiItem::remove(), i18n("Keep Them") ); if( rtn == KMessageBox::Yes ){ - QStringList::Iterator it = l.begin(); + TQStringList::Iterator it = l.begin(); while( it != l.end() ){ - QFile::remove( *it ); + TQFile::remove( *it ); ++it; } // @todo regenerate the pcs list @@ -747,13 +747,13 @@ void JavaSupportPart::setupCatalog( ) } } - QStringList::Iterator it = pcsList.begin(); + TQStringList::Iterator it = pcsList.begin(); while( it != pcsList.end() ){ Catalog* catalog = new Catalog(); catalog->open( *it ); ++it; - for( QStringList::Iterator idxIt=indexList.begin(); idxIt!=indexList.end(); ++idxIt ) + for( TQStringList::Iterator idxIt=indexList.begin(); idxIt!=indexList.end(); ++idxIt ) catalog->addIndex( (*idxIt).utf8() ); m_catalogList.append( catalog ); @@ -790,12 +790,12 @@ void JavaSupportPart::setPcsVersion( int version ) config->sync(); } -QString JavaSupportPart::formatTag( const Tag & /*inputTag*/ ) +TQString JavaSupportPart::formatTag( const Tag & /*inputTag*/ ) { - return QString::null; + return TQString::null; } -void JavaSupportPart::removeWithReferences( const QString & fileName ) +void JavaSupportPart::removeWithReferences( const TQString & fileName ) { kdDebug(9013) << "remove with references: " << fileName << endl; m_timestamp.remove( fileName ); @@ -807,19 +807,19 @@ void JavaSupportPart::removeWithReferences( const QString & fileName ) codeModel()->removeFile( codeModel()->fileByName(fileName) ); } -bool JavaSupportPart::isValidSource( const QString& fileName ) const +bool JavaSupportPart::isValidSource( const TQString& fileName ) const { - QFileInfo fileInfo( fileName ); - return fileExtensions().contains( fileInfo.extension() ) && !QFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore"); + TQFileInfo fileInfo( fileName ); + return fileExtensions().contains( fileInfo.extension() ) && !TQFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore"); } -QString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription ) +TQString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription ) { if (item->isFunction()) { const FunctionModel *model = static_cast(item); - QString function; - QString args; + TQString function; + TQString args; ArgumentList argumentList = model->argumentList(); for (ArgumentList::const_iterator it = argumentList.begin(); it != argumentList.end(); ++it) { @@ -830,7 +830,7 @@ QString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool shortD function += model->resultType() + " "; function += model->name() + "(" + args + ")" + - (model->isAbstract() ? QString(" = 0") : QString("") ); + (model->isAbstract() ? TQString(" = 0") : TQString("") ); return function; } @@ -844,12 +844,12 @@ QString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool shortD else if (item->isArgument()) { const ArgumentModel *model = static_cast(item); - QString arg; + TQString arg; if( !shortDescription ) arg += model->type() + " "; arg += model->name(); if( !shortDescription ) - arg += model->defaultValue().isEmpty() ? QString("") : QString(" = ") + model->defaultValue(); + arg += model->defaultValue().isEmpty() ? TQString("") : TQString(" = ") + model->defaultValue(); return arg.stripWhiteSpace(); } else @@ -868,15 +868,15 @@ void JavaSupportPart::saveProjectSourceInfo( ) if( !project() || fileList.isEmpty() ) return; - QFile f( project()->projectDirectory() + "/" + + TQFile f( project()->projectDirectory() + "/" + project()->projectName() + ".kdevelop.pcs" ); if( !f.open( IO_WriteOnly ) ) return; - QDataStream stream( &f ); - QMap offsets; + TQDataStream stream( &f ); + TQMap offsets; - QString pcs( "PCS" ); + TQString pcs( "PCS" ); stream << pcs << KDEV_PCS_VERSION; stream << int( fileList.size() ); diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h index e6280560..3b1f08be 100644 --- a/languages/java/javasupportpart.h +++ b/languages/java/javasupportpart.h @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include class Context; class ProblemReporter; @@ -51,7 +51,7 @@ class JavaSupportPart : public KDevLanguageSupport Q_OBJECT public: - JavaSupportPart( QObject *parent, const char *name, const QStringList &args ); + JavaSupportPart( TQObject *parent, const char *name, const TQStringList &args ); virtual ~JavaSupportPart(); bool isValid() const { return m_valid; } @@ -59,32 +59,32 @@ public: ProblemReporter* problemReporter() { return m_problemReporter; } BackgroundParser* backgroundParser() { return m_backgroundParser; } - const QPtrList& catalogList() { return m_catalogList; } + const TQPtrList& catalogList() { return m_catalogList; } - bool isValidSource( const QString& fileName ) const; - QStringList fileExtensions( ) const; + bool isValidSource( const TQString& fileName ) const; + TQStringList fileExtensions( ) const; - virtual void customEvent( QCustomEvent* ev ); + virtual void customEvent( TQCustomEvent* ev ); - virtual QStringList subclassWidget(const QString& formName); - virtual QStringList updateWidget(const QString& formName, const QString& fileName); + virtual TQStringList subclassWidget(const TQString& formName); + virtual TQStringList updateWidget(const TQString& formName, const TQString& fileName); KTextEditor::Document* findDocument( const KURL& url ); static KConfig *config(); - virtual QString formatTag( const Tag& tag ); - virtual QString formatModelItem( const CodeModelItem *item, bool shortDescription=false ); + virtual TQString formatTag( const Tag& tag ); + virtual TQString formatModelItem( const CodeModelItem *item, bool shortDescription=false ); virtual void addClass(); signals: - void fileParsed( const QString& fileName ); + void fileParsed( const TQString& fileName ); protected: virtual KDevLanguageSupport::Features features(); virtual KMimeType::List mimeTypes(); - virtual QString formatClassName(const QString &name); - virtual QString unformatClassName(const QString &name); + virtual TQString formatClassName(const TQString &name); + virtual TQString unformatClassName(const TQString &name); virtual void addMethod( ClassDom klass ); virtual void addAttribute( ClassDom klass ); @@ -96,16 +96,16 @@ private slots: void savedFile(const KURL &fileName); void configWidget(KDialogBase *dlg); void projectConfigWidget(KDialogBase *dlg); - void contextMenu(QPopupMenu *popup, const Context *context); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); - void changedFilesInProject( const QStringList & fileList ); + void contextMenu(TQPopupMenu *popup, const Context *context); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); + void changedFilesInProject( const TQStringList & fileList ); void slotProjectCompiled(); void setupCatalog(); void slotNewClass(); - void slotNeedTextHint( int, int, QString& ); + void slotNeedTextHint( int, int, TQString& ); /** * loads, parses and creates both classstores needed @@ -122,19 +122,19 @@ private: /** * checks if a file has to be parsed */ - void maybeParse( const QString& fileName ); - void removeWithReferences( const QString& fileName ); + void maybeParse( const TQString& fileName ); + void removeWithReferences( const TQString& fileName ); - QStringList modifiedFileList(); - QString findSourceFile(); + TQStringList modifiedFileList(); + TQString findSourceFile(); int pcsVersion(); void setPcsVersion( int version ); void saveProjectSourceInfo(); - QString m_contextFileName; + TQString m_contextFileName; - QGuardedPtr< ProblemReporter > m_problemReporter; + TQGuardedPtr< ProblemReporter > m_problemReporter; BackgroundParser* m_backgroundParser; KTextEditor::Document* m_activeDocument; @@ -142,17 +142,17 @@ private: KTextEditor::SelectionInterface* m_activeSelection; KTextEditor::EditInterface* m_activeEditor; KTextEditor::ViewCursorInterface* m_activeViewCursor; - QString m_activeFileName; + TQString m_activeFileName; - QWaitCondition m_eventConsumed; + TQWaitCondition m_eventConsumed; bool m_projectClosed; - QMap m_timestamp; + TQMap m_timestamp; bool m_valid; - QPtrList m_catalogList; + TQPtrList m_catalogList; Driver* m_driver; - QString m_projectDirectory; + TQString m_projectDirectory; ClassDom m_activeClass; FunctionDom m_activeFunction; diff --git a/languages/java/kdevdeepcopy.h b/languages/java/kdevdeepcopy.h index 8e7d8fbe..dd4d8f4d 100644 --- a/languages/java/kdevdeepcopy.h +++ b/languages/java/kdevdeepcopy.h @@ -1,12 +1,12 @@ #ifndef KDEVDEEPCOPY_H #define KDEVDEEPCOPY_H -#include +#include -inline QString deepCopy( const QString& s ) +inline TQString deepCopy( const TQString& s ) { - QCString str = s.utf8(); - return QString::fromUtf8( str, str.length() ); + TQCString str = s.utf8(); + return TQString::fromUtf8( str, str.length() ); } #endif diff --git a/languages/java/kdevdriver.cpp b/languages/java/kdevdriver.cpp index 444217ff..d19a20c3 100644 --- a/languages/java/kdevdriver.cpp +++ b/languages/java/kdevdriver.cpp @@ -2,7 +2,7 @@ #include "kdevdriver.h" #include "JavaLexer.hpp" #include -#include +#include KDevDriver::KDevDriver( JavaSupportPart* javaSupport ) : m_javaSupport( javaSupport ) @@ -16,13 +16,13 @@ JavaSupportPart* KDevDriver::javaSupport() void KDevDriver::setupProject() { - QMap map; + TQMap map; { - QStringList fileList = m_javaSupport->project()->allFiles(); - QStringList::ConstIterator it = fileList.begin(); + TQStringList fileList = m_javaSupport->project()->allFiles(); + TQStringList::ConstIterator it = fileList.begin(); while( it != fileList.end() ){ - QFileInfo info( *it ); + TQFileInfo info( *it ); ++it; map.insert( info.dirPath(true), true ); @@ -30,7 +30,7 @@ void KDevDriver::setupProject() } { - QMap::Iterator it = map.begin(); + TQMap::Iterator it = map.begin(); while( it != map.end() ){ addIncludePath( it.key() ); ++it; diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index e7cbbcb5..a5beaaf2 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -43,26 +43,26 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include class ProblemItem: public KListViewItem { public: - ProblemItem( QListView* parent, const QString& level, const QString& problem, - const QString& file, const QString& line, const QString& column ) + ProblemItem( TQListView* parent, const TQString& level, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, level, problem, file, line, column ) {} - ProblemItem( QListViewItem* parent, const QString& level, const QString& problem, - const QString& file, const QString& line, const QString& column ) + ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, level, problem, file, line, column ) {} - int compare( QListViewItem* item, int column, bool ascending ) const { + int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 2 || column == 3 ){ int a = text( column ).toInt(); int b = item->text( column ).toInt(); @@ -75,13 +75,13 @@ public: }; -ProblemReporter::ProblemReporter( JavaSupportPart* part, QWidget* parent, const char* name ) +ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const char* name ) : KListView( parent, name ? name : "problemreporter" ), m_javaSupport( part ), m_document( 0 ), m_markIface( 0 ) { - QWhatsThis::add(this, i18n("Problem reporter

    This window shows various \"problems\" in your project. " + TQWhatsThis::add(this, i18n("Problem reporter

    This window shows various \"problems\" in your project. " "It displays TODO entries, FIXME's and errors reported by a language parser. " "To add a TODO or FIXME entry, just type
    " "//@todo my todo
    " @@ -95,19 +95,19 @@ ProblemReporter::ProblemReporter( JavaSupportPart* part, QWidget* parent, const addColumn( i18n("Problem") ); setAllColumnsShowFocus( TRUE ); - m_timer = new QTimer( this ); + m_timer = new TQTimer( this ); - connect( part->partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partAdded(KParts::Part*)), - this, SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partRemoved(KParts::Part*)), - this, SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), + this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), + this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, SIGNAL(timeout()), this, SLOT(reparse()) ); + connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); - connect( this, SIGNAL(executed(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem*)) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -137,7 +137,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) if( !m_javaSupport->isValidSource(m_fileName) ) return; - connect( m_document, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) ); + connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast( part ); if( !m_javaSupport->backgroundParser() ) @@ -159,11 +159,11 @@ void ProblemReporter::slotTextChanged() m_timer->changeInterval( m_delay ); } -void ProblemReporter::removeAllProblems( const QString& filename ) +void ProblemReporter::removeAllProblems( const TQString& filename ) { - QListViewItem* current = firstChild(); + TQListViewItem* current = firstChild(); while( current ){ - QListViewItem* i = current; + TQListViewItem* i = current; current = current->nextSibling(); if( i->text(1) == filename ) @@ -171,8 +171,8 @@ void ProblemReporter::removeAllProblems( const QString& filename ) } if( m_document && m_markIface ){ - QPtrList marks = m_markIface->marks(); - QPtrListIterator it( marks ); + TQPtrList marks = m_markIface->marks(); + TQPtrListIterator it( marks ); while( it.current() ){ m_markIface->removeMark( it.current()->line, KTextEditor::MarkInterface::markType07 ); ++it; @@ -197,7 +197,7 @@ void ProblemReporter::reparse() kdDebug(9013) << "---> file added " << m_fileName << endl; } -void ProblemReporter::slotSelected( QListViewItem* item ) +void ProblemReporter::slotSelected( TQListViewItem* item ) { KURL url( item->text(1) ); int line = item->text( 2 ).toInt(); @@ -206,21 +206,21 @@ void ProblemReporter::slotSelected( QListViewItem* item ) // m_javaSupport->mainWindow()->lowerView( this ); } -void ProblemReporter::reportProblem( const QString& fileName, const Problem& p ) +void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p ) { int markType = levelToMarkType( p.level() ); if( markType != -1 && m_document && m_markIface && m_fileName == fileName ){ m_markIface->addMark( p.line(), markType ); } - QString msg = p.text(); - msg = msg.replace( QRegExp("\n"), "" ); + TQString msg = p.text(); + msg = msg.replace( TQRegExp("\n"), "" ); new ProblemItem( this, levelToString( p.level() ), fileName, - QString::number( p.line() + 1 ), - QString::number( p.column() + 1 ), + TQString::number( p.line() + 1 ), + TQString::number( p.column() + 1 ), msg ); } @@ -235,12 +235,12 @@ void ProblemReporter::configure() void ProblemReporter::configWidget( KDialogBase* dlg ) { - QVBox *vbox = dlg->addVBoxPage(i18n("Java Parsing")); + TQVBox *vbox = dlg->addVBoxPage(i18n("Java Parsing")); ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); //FIXME adymo: unused functionality w->groupBox3->hide(); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); - connect(dlg, SIGNAL(okClicked()), this, SLOT(configure())); + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure())); } void ProblemReporter::slotPartAdded( KParts::Part* part ) @@ -262,20 +262,20 @@ void ProblemReporter::slotPartRemoved( KParts::Part* part ) } } -QString ProblemReporter::levelToString( int level ) const +TQString ProblemReporter::levelToString( int level ) const { switch( level ) { case Problem::Level_Error: - return QString::fromLatin1( "Error" ); + return TQString::fromLatin1( "Error" ); case Problem::Level_Warning: - return QString::fromLatin1( "Warning" ); + return TQString::fromLatin1( "Warning" ); case Problem::Level_Todo: - return QString::fromLatin1( "Todo" ); + return TQString::fromLatin1( "Todo" ); case Problem::Level_Fixme: - return QString::fromLatin1( "Fixme" ); + return TQString::fromLatin1( "Fixme" ); default: - return QString::null; + return TQString::null; } } diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h index 579a1afd..40467c08 100644 --- a/languages/java/problemreporter.h +++ b/languages/java/problemreporter.h @@ -20,7 +20,7 @@ #define PROBLEMSREPORTER_H #include -#include +#include class JavaSupportPart; class QTimer; @@ -39,11 +39,11 @@ namespace KTextEditor{ class ProblemReporter: public KListView{ Q_OBJECT public: - ProblemReporter( JavaSupportPart* part, QWidget* parent=0, const char* name=0 ); + ProblemReporter( JavaSupportPart* part, TQWidget* parent=0, const char* name=0 ); virtual ~ProblemReporter(); - void removeAllProblems( const QString& filename ); - void reportProblem( const QString& fileName, const Problem& p ); + void removeAllProblems( const TQString& filename ); + void reportProblem( const TQString& fileName, const Problem& p ); public slots: void reparse(); @@ -55,18 +55,18 @@ private slots: void slotPartRemoved( KParts::Part* ); void slotActivePartChanged( KParts::Part* ); void slotTextChanged(); - void slotSelected( QListViewItem* ); + void slotSelected( TQListViewItem* ); private: - QString levelToString( int level ) const; + TQString levelToString( int level ) const; int levelToMarkType( int level ) const; private: JavaSupportPart* m_javaSupport; - QGuardedPtr m_document; + TQGuardedPtr m_document; KTextEditor::MarkInterface* m_markIface; - QTimer* m_timer; - QString m_fileName; + TQTimer* m_timer; + TQString m_fileName; int m_active; int m_delay; }; diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp index 8fd59f57..5717858a 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -10,14 +10,14 @@ // // #include "jscodecompletion.h" -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include @@ -37,8 +37,8 @@ #include #include -JSCodeCompletion::JSCodeCompletion(QObject *parent, const char *name) - : QObject(parent, name) +JSCodeCompletion::JSCodeCompletion(TQObject *parent, const char *name) + : TQObject(parent, name) { m_argWidgetShow = false; m_completionBoxShow=false; @@ -82,22 +82,22 @@ void JSCodeCompletion::setActiveEditorPart( KParts::Part * part ) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice - connect(part->widget(), SIGNAL(cursorPositionChanged()), - this, SLOT(cursorPositionChanged())); - connect(part->widget(), SIGNAL(argHintHidden()), this, SLOT(argHintHidden())); - connect(part->widget(), SIGNAL(completionAborted()), this, SLOT(completionBoxAbort())); - connect(part->widget(), SIGNAL(completionDone()), this, SLOT(completionBoxHidden())); + connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), + this, TQT_SLOT(cursorPositionChanged())); + connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHidden())); + connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxAbort())); + connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHidden())); } -QValueList< KTextEditor::CompletionEntry > JSCodeCompletion::getVars( const QString & startText ) +TQValueList< KTextEditor::CompletionEntry > JSCodeCompletion::getVars( const TQString & startText ) { kdDebug() << "getVars for " << startText << endl; - QValueList varList; + TQValueList varList; /* - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for (it = m_vars.begin(); it != m_vars.end(); ++it) { - QString var = "$" + (*it); + TQString var = "$" + (*it); kdDebug() << "Compair " << var << endl; if( var.startsWith( startText )) { @@ -119,7 +119,7 @@ void JSCodeCompletion::cursorPositionChanged( ) m_cursorInterface->cursorPositionReal(&line, &col); kdDebug() << "JSCodeCompletion::cursorPositionChanged:" << line << ":" << col << endl; - QString lineStr = m_editInterface->textLine(line); + TQString lineStr = m_editInterface->textLine(line); if(lineStr.isNull() || lineStr.isEmpty()) { kdDebug() << "No Text..." << endl; @@ -127,8 +127,8 @@ void JSCodeCompletion::cursorPositionChanged( ) } // if(m_config->getCodeCompletion()) // { - QString restLine = lineStr.mid(col); - QString prevText = lineStr.mid(0,col); + TQString restLine = lineStr.mid(col); + TQString prevText = lineStr.mid(0,col); if(restLine.left(1) != " " && restLine.left(1) != "\t" && !restLine.isNull()) { @@ -136,12 +136,12 @@ void JSCodeCompletion::cursorPositionChanged( ) return; } - QRegExp prevReg("([\\d\\w]*)[.]$"); + TQRegExp prevReg("([\\d\\w]*)[.]$"); if (prevReg.search( prevText ) != -1 ) { // We are in completion mode - QString startMatch = prevReg.cap(0); + TQString startMatch = prevReg.cap(0); kdDebug() << "Matching: " << startMatch << endl; m_completionBoxShow=true; m_codeInterface->showCompletionBox(getVars(startMatch),2); diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h index 0cceb1e0..03247917 100644 --- a/languages/kjssupport/jscodecompletion.h +++ b/languages/kjssupport/jscodecompletion.h @@ -12,7 +12,7 @@ #ifndef JSCODECOMPLETION_H #define JSCODECOMPLETION_H -#include +#include #include #include #include @@ -30,11 +30,11 @@ class JSCodeCompletion : public QObject { Q_OBJECT public: - JSCodeCompletion(QObject *parent = 0, const char *name = 0); + JSCodeCompletion(TQObject *parent = 0, const char *name = 0); ~JSCodeCompletion(); void setActiveEditorPart(KParts::Part* editorPart); - QValueList getVars(const QString& textHint); + TQValueList getVars(const TQString& textHint); public slots: void cursorPositionChanged(); diff --git a/languages/kjssupport/kjsproblems.cpp b/languages/kjssupport/kjsproblems.cpp index 20951af4..31882e7c 100644 --- a/languages/kjssupport/kjsproblems.cpp +++ b/languages/kjssupport/kjsproblems.cpp @@ -23,17 +23,17 @@ class KJSProblemItem: public KListViewItem { public: - KJSProblemItem( QListView* parent, const QString& level, const QString& problem, - const QString& file, const QString& line, const QString& column ) + KJSProblemItem( TQListView* parent, const TQString& level, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, level, problem, file, line, column ) {} - KJSProblemItem( QListViewItem* parent, const QString& level, const QString& problem, - const QString& file, const QString& line, const QString& column ) + KJSProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, level, problem, file, line, column ) {} - int compare( QListViewItem* item, int column, bool ascending ) const + int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 2 || column == 3 ) { @@ -48,7 +48,7 @@ class KJSProblemItem: public KListViewItem }; -KJSProblems::KJSProblems(kjsSupportPart *part, QWidget *parent, const char *name) : KListView(parent,name), m_part(part) +KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *parent, const char *name) : KListView(parent,name), m_part(part) { addColumn ("File"); addColumn ("Line #"); @@ -68,9 +68,9 @@ void KJSProblems::clearItems() setIcon( SmallIcon("info") ); } -void KJSProblems::addLine(const QString &file, int lineNo, const QString &message) +void KJSProblems::addLine(const TQString &file, int lineNo, const TQString &message) { - new QListViewItem( this, file, QString::number( lineNo ), message); + new TQListViewItem( this, file, TQString::number( lineNo ), message); setIcon( SmallIcon("error") ); } diff --git a/languages/kjssupport/kjsproblems.h b/languages/kjssupport/kjsproblems.h index d5647b16..7ca0d3ee 100644 --- a/languages/kjssupport/kjsproblems.h +++ b/languages/kjssupport/kjsproblems.h @@ -30,11 +30,11 @@ class KJSProblems : public KListView Q_OBJECT public: - KJSProblems(kjsSupportPart *part, QWidget *parent = 0L, const char *name = 0L); + KJSProblems(kjsSupportPart *part, TQWidget *parent = 0L, const char *name = 0L); ~KJSProblems(); void clearItems(); - void addLine(const QString &file, int lineNo, const QString &message); + void addLine(const TQString &file, int lineNo, const TQString &message); private: kjsSupportPart *m_part; diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index c3fa2954..dcb8c1e3 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -16,12 +16,12 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -57,32 +57,32 @@ K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) ); class typeProperty { public: - QString type; - QString name; + TQString type; + TQString name; int depth; }; -kjsSupportPart::kjsSupportPart(QObject *parent, const char *name, const QStringList& ) +kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& ) : KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" ) { setInstance(kjsSupportFactory::instance()); setXMLFile("kdevkjssupport.rc"); - m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); m_build->setStatusText( i18n("Test the active script.") ); kdDebug() << "Creating kjssupport Part" << endl; - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const QString&)), this, SLOT(savedFile(const QString&)) ); - connect(partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part *))); - connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *))); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const TQString&)), this, TQT_SLOT(savedFile(const TQString&)) ); + connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); // Building kjs interpreter. @@ -140,20 +140,20 @@ void kjsSupportPart::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - QTimer::singleShot(0, this, SLOT(parse())); + TQTimer::singleShot(0, this, TQT_SLOT(parse())); } void kjsSupportPart::projectClosed() { } -void kjsSupportPart::savedFile(const QString &fileName) +void kjsSupportPart::savedFile(const TQString &fileName) { @@ -164,11 +164,11 @@ void kjsSupportPart::savedFile(const QString &fileName) emit addedSourceInfo( fileName ); } } -void kjsSupportPart::addedFilesToProject(const QStringList &fileList) +void kjsSupportPart::addedFilesToProject(const TQStringList &fileList) { kdDebug(9014) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -178,15 +178,15 @@ void kjsSupportPart::addedFilesToProject(const QStringList &fileList) emit updatedSourceInfo(); } -void kjsSupportPart::removedFilesFromProject(const QStringList &fileList) +void kjsSupportPart::removedFilesFromProject(const TQStringList &fileList) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); if( codeModel()->hasFile(fileName) ) { kdDebug(9014) << "removed " << fileName << endl; @@ -203,10 +203,10 @@ void kjsSupportPart::parse() if (project()) { kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); + TQStringList files = project()->allFiles(); m_problemReporter->clear(); - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; @@ -226,11 +226,11 @@ void kjsSupportPart::slotActivePartChanged(KParts::Part *part) } /*! - \fn kjsSupportPart::parse(const QString &fileName) + \fn kjsSupportPart::parse(const TQString &fileName) */ -void kjsSupportPart::parse(const QString &fileName) +void kjsSupportPart::parse(const TQString &fileName) { - QFileInfo fi(fileName); + TQFileInfo fi(fileName); if (fi.extension() == "js") { if( codeModel()->hasFile(fileName) ) @@ -243,25 +243,25 @@ void kjsSupportPart::parse(const QString &fileName) m_file->setName( fileName ); m_file->setFileName( fileName ); - QFile f(QFile::encodeName(fileName)); + TQFile f(TQFile::encodeName(fileName)); if (!f.open(IO_ReadOnly)) return; - QString rawline; - QString line; + TQString rawline; + TQString line; uint lineNo = 0; - QTextStream stream(&f); + TQTextStream stream(&f); int depth = 0; bool inFunction = false; - QString lastFunction = ""; + TQString lastFunction = ""; int lastLineNo = 0; ClassDom currentClass; - QRegExp varRx("var[\\s]([_a-zA-Z\\d]+)"); - QRegExp classVarRx("this\\.([_a-zA-Z\\d]+)"); - QRegExp classMethRx("this\\.([_a-zA-Z\\d]+)[\\s]*=[\\s]*function(\\([^){}\\n\\r]*\\))"); - QRegExp methRx("function[\\s]+([_a-zA-Z\\d]+[\\s]*\\([^){}\\n\\r]*\\))"); - QRegExp allocRx("([_\\d\\w]+)[\\s]*=[\\s]*new[\\s]*([_\\d\\w]+)"); - QRegExp assnRx("var[\\s]+([_\\d\\w]+)[\\s]+[=][\\s]+([_\\d\\w]+)[;]"); + TQRegExp varRx("var[\\s]([_a-zA-Z\\d]+)"); + TQRegExp classVarRx("this\\.([_a-zA-Z\\d]+)"); + TQRegExp classMethRx("this\\.([_a-zA-Z\\d]+)[\\s]*=[\\s]*function(\\([^){}\\n\\r]*\\))"); + TQRegExp methRx("function[\\s]+([_a-zA-Z\\d]+[\\s]*\\([^){}\\n\\r]*\\))"); + TQRegExp allocRx("([_\\d\\w]+)[\\s]*=[\\s]*new[\\s]*([_\\d\\w]+)"); + TQRegExp assnRx("var[\\s]+([_\\d\\w]+)[\\s]+[=][\\s]+([_\\d\\w]+)[;]"); while (!stream.atEnd()) { @@ -301,8 +301,8 @@ void kjsSupportPart::parse(const QString &fileName) if( allocRx.search(line) != -1 ) { - QString varName = allocRx.cap(1); - QString varType = allocRx.cap(2); + TQString varName = allocRx.cap(1); + TQString varType = allocRx.cap(2); typeProperty *type = new typeProperty(); type->depth = depth; @@ -348,7 +348,7 @@ void kjsSupportPart::parse(const QString &fileName) } } -ClassDom kjsSupportPart::addClass(const QString &name, FileDom file, uint lineNo) +ClassDom kjsSupportPart::addClass(const TQString &name, FileDom file, uint lineNo) { ClassDom clazz = codeModel()->create(); clazz->setName(name); @@ -362,7 +362,7 @@ ClassDom kjsSupportPart::addClass(const QString &name, FileDom file, uint lineNo return clazz; } -void kjsSupportPart::addMethod(const QString &name, ClassDom clazz, uint lineNo) +void kjsSupportPart::addMethod(const TQString &name, ClassDom clazz, uint lineNo) { FunctionDom method = codeModel()->create(); method->setName(name); @@ -375,7 +375,7 @@ void kjsSupportPart::addMethod(const QString &name, ClassDom clazz, uint lineNo) } } -void kjsSupportPart::addAttribute(const QString &name, ClassDom clazz, uint lineNo) +void kjsSupportPart::addAttribute(const TQString &name, ClassDom clazz, uint lineNo) { VariableDom var = codeModel()->create(); var->setName(name); @@ -389,7 +389,7 @@ void kjsSupportPart::addAttribute(const QString &name, ClassDom clazz, uint line } } -void kjsSupportPart::addMethod(const QString &name, FileDom file, uint lineNo) +void kjsSupportPart::addMethod(const TQString &name, FileDom file, uint lineNo) { FunctionDom method = codeModel()->create(); method->setName(name); @@ -402,7 +402,7 @@ void kjsSupportPart::addMethod(const QString &name, FileDom file, uint lineNo) } } -void kjsSupportPart::addAttribute(const QString &name, FileDom file, uint lineNo) +void kjsSupportPart::addAttribute(const TQString &name, FileDom file, uint lineNo) { VariableDom var = codeModel()->create(); var->setName(name); @@ -416,7 +416,7 @@ void kjsSupportPart::addAttribute(const QString &name, FileDom file, uint lineNo } } -void kjsSupportPart::contextMenu(QPopupMenu * popupMenu, const Context *context) +void kjsSupportPart::contextMenu(TQPopupMenu * popupMenu, const Context *context) { kdDebug() << "1" << endl; if (!context->hasType( Context::FileContext )) @@ -427,9 +427,9 @@ void kjsSupportPart::contextMenu(QPopupMenu * popupMenu, const Context *context) m_selectedUI = fcontext->fileName(); if (m_selectedUI.right(3).lower() == ".ui") int id = popupMenu->insertItem(i18n("Implement Slots"), - this, SLOT(implementSlots())); + this, TQT_SLOT(implementSlots())); else - m_selectedUI = QString::null; + m_selectedUI = TQString::null; } void kjsSupportPart::implementSlots() @@ -437,7 +437,7 @@ void kjsSupportPart::implementSlots() if (m_selectedUI.isEmpty()) return; - QStringList newFiles; + TQStringList newFiles; SubclassingDlg *sub = new SubclassingDlg(this, m_selectedUI, newFiles); if (sub->exec()) project()->addFiles(newFiles); diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h index ceb85db2..47561c1e 100644 --- a/languages/kjssupport/kjssupport_part.h +++ b/languages/kjssupport/kjssupport_part.h @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include namespace KJSEmbed { @@ -47,7 +47,7 @@ class kjsSupportPart : public KDevLanguageSupport { Q_OBJECT public: - kjsSupportPart(QObject *parent, const char *name, const QStringList &); + kjsSupportPart(TQObject *parent, const char *name, const TQStringList &); ~kjsSupportPart(); protected: virtual Features features(); @@ -58,27 +58,27 @@ class kjsSupportPart : public KDevLanguageSupport void projectConfigWidget(KDialogBase *dlg); void projectOpened(); void projectClosed(); - void savedFile(const QString &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void savedFile(const TQString &fileName); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void parse(); void slotActivePartChanged(KParts::Part *part); - void contextMenu(QPopupMenu *popupMenu, const Context *context); + void contextMenu(TQPopupMenu *popupMenu, const Context *context); void implementSlots(); private: - void parse(const QString &fileName); - void addAttribute(const QString &name, ClassDom clazz, uint lineNo); - void addMethod(const QString &name, ClassDom clazz, uint lineNo); - void addAttribute(const QString &name, FileDom file, uint lineNo); - void addMethod(const QString &name, FileDom file, uint lineNo); - ClassDom addClass(const QString &name, FileDom file, uint lineNo); + void parse(const TQString &fileName); + void addAttribute(const TQString &name, ClassDom clazz, uint lineNo); + void addMethod(const TQString &name, ClassDom clazz, uint lineNo); + void addAttribute(const TQString &name, FileDom file, uint lineNo); + void addMethod(const TQString &name, FileDom file, uint lineNo); + ClassDom addClass(const TQString &name, FileDom file, uint lineNo); KAction *m_build; KJSEmbed::KJSEmbedPart *m_js; KJSProblems *m_problemReporter; - QDict m_typeMap; + TQDict m_typeMap; JSCodeCompletion *m_cc; - QString m_selectedUI; + TQString m_selectedUI; }; diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index be1ad83e..284d0471 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -21,20 +21,20 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include #include -#include +#include #include #include #include -#include -#include +#include +#include #include @@ -53,17 +53,17 @@ #define SLOT_HELP SlotItem(m_slotView,"help()","virtual","protected","void",false,true) -SlotItem::SlotItem(QListView *parent,const QString &methodName, - const QString &specifier, - const QString &access, const QString &returnType, +SlotItem::SlotItem(TQListView *parent,const TQString &methodName, + const TQString &specifier, + const TQString &access, const TQString &returnType, bool isFunc,bool callBaseClass) -: QCheckListItem(parent,methodName,QCheckListItem::CheckBox) +: TQCheckListItem(parent,methodName,TQCheckListItem::CheckBox) { setOn(true); m_methodName = methodName; - m_access = access.isEmpty() ? (const QString) "public" : access; - m_specifier = specifier.isEmpty() ? (const QString) "virtual" : specifier; - m_returnType = returnType.isEmpty() ? (const QString) "void" : returnType; + m_access = access.isEmpty() ? (const TQString) "public" : access; + m_specifier = specifier.isEmpty() ? (const TQString) "virtual" : specifier; + m_returnType = returnType.isEmpty() ? (const TQString) "void" : returnType; m_isFunc = isFunc; m_callBaseClass = callBaseClass; setText(0,m_methodName); @@ -93,8 +93,8 @@ void SlotItem::setAllreadyInSubclass() } -SubclassingDlg::SubclassingDlg(kjsSupportPart* kjsSupport, const QString &formFile,QStringList &newFileNames, - QWidget* parent, const char* name,bool modal, WFlags fl) +SubclassingDlg::SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames, + TQWidget* parent, const char* name,bool modal, WFlags fl) : SubclassingDlgBase(parent,name,modal,fl), m_newFileNames(newFileNames), m_kjsSupport( kjsSupport ) //================================================= @@ -115,8 +115,8 @@ m_newFileNames(newFileNames), m_kjsSupport( kjsSupport ) } -/*SubclassingDlg::SubclassingDlg(kjsSupportPart* kjsSupport, const QString &formFile,const QString &filename,QStringList &dummy, - QWidget* parent, const char* name,bool modal, WFlags fl) +/*SubclassingDlg::SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy, + TQWidget* parent, const char* name,bool modal, WFlags fl) : SubclassingDlgBase(parent,name,modal,fl), m_newFileNames(dummy), m_kjsSupport( kjsSupport ) //================================================= @@ -134,12 +134,12 @@ m_newFileNames(dummy), m_kjsSupport( kjsSupport ) reformat_box->setChecked(true); } - QStringList pathsplit(QStringList::split('/',filename)); + TQStringList pathsplit(TQStringList::split('/',filename)); - QString baseClass = readBaseClassName(); - if (!kjsSupport->codeModel()->hasFile(filename+QString(".h"))) + TQString baseClass = readBaseClassName(); + if (!kjsSupport->codeModel()->hasFile(filename+TQString(".h"))) return; - ClassList myClasses = kjsSupport->codeModel()->fileByName(filename+QString(".h"))->classList(); + ClassList myClasses = kjsSupport->codeModel()->fileByName(filename+TQString(".h"))->classList(); for (ClassList::const_iterator classIt = myClasses.begin(); classIt != myClasses.end(); ++classIt) { kdDebug() << "base class " << baseClass << " class " << (*classIt)->name() @@ -162,7 +162,7 @@ m_newFileNames(dummy), m_kjsSupport( kjsSupport ) m_btnOk->setEnabled(true); } */ -bool SubclassingDlg::alreadyInSubclass(const QString &method) +bool SubclassingDlg::alreadyInSubclass(const TQString &method) { for (uint i=0;isetEnabled(false); - QDomDocument doc; + TQDomDocument doc; DomUtil::openDOMFile(doc,m_formFile); m_baseClassName = DomUtil::elementByPathExt(doc,WIDGET_CLASS_NAME).text(); @@ -188,13 +188,13 @@ void SubclassingDlg::readUiFile() // Special widget specific slots SlotItem *newSlot; - m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","QDialog"); + m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog"); - if ( (m_qtBaseClassName=="QMainWindow") || (m_qtBaseClassName=="QWidget") ) + if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") ) m_canBeModal = false; else m_canBeModal = true; - if (m_qtBaseClassName != "QWidget") + if (m_qtBaseClassName != "TQWidget") { newSlot = new SLOT_ACCEPT; newSlot->setOn(false); @@ -211,7 +211,7 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - if (m_qtBaseClassName == "QWizard") + if (m_qtBaseClassName == "TQWizard") { newSlot = new SLOT_NEXT; m_slotView->insertItem(newSlot); @@ -231,12 +231,12 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - QDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); - QDomNodeList slotnodes = slotsElem.childNodes(); + TQDomElement slotsElem = DomUtil::elementByPathExt(doc,WIDGET_SLOTS); + TQDomNodeList slotnodes = slotsElem.childNodes(); for (unsigned int i=0; itext().upper()); @@ -346,12 +346,12 @@ bool SubclassingDlg::replaceKeywords(QString &buffer,bool canBeModal) return true; } -bool SubclassingDlg::saveBuffer(QString &buffer, const QString& filename) +bool SubclassingDlg::saveBuffer(TQString &buffer, const TQString& filename) //======================================================================= { // save buffer - QFile dataFile(filename); + TQFile dataFile(filename); if (!dataFile.open(IO_WriteOnly | IO_Truncate)) return false; dataFile.writeBlock((buffer+"\n").ascii(),(buffer+"\n").length()); @@ -374,19 +374,19 @@ void SubclassingDlg::accept() // h - file - QString public_slot = + TQString public_slot = "/*$PUBLIC_SLOTS$*/\n "; - QString protected_slot = + TQString protected_slot = "/*$PROTECTED_SLOTS$*/\n "; - QString public_func = + TQString public_func = "/*$PUBLIC_FUNCTIONS$*/\n "; - QString protected_func = + TQString protected_func = "/*$PROTECTED_FUNCTIONS$*/\n "; - QString buffer; + TQString buffer; if (m_creatingNewSubclass) { loadBuffer(buffer,::locate("data", "kdevkjssupport/subclassing/subclass_template.js")); @@ -394,18 +394,18 @@ void SubclassingDlg::accept() buffer = "var $NEWCLASS$ = Factory.loadui(\"$BASEFILENAME$.ui\", this);\n\n" + buffer; buffer = FileTemplate::read(m_kjsSupport, "js") + buffer + connections; kdDebug() << "buffer: " << buffer << endl; - QFileInfo fi(m_filename + ".js"); - QString module = fi.baseName(); - QString basefilename = fi.baseName(true); - buffer.replace(QRegExp("\\$MODULE\\$"),module); - buffer.replace(QRegExp("\\$FILENAME\\$"),basefilename); + TQFileInfo fi(m_filename + ".js"); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName(true); + buffer.replace(TQRegExp("\\$MODULE\\$"),module); + buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); } else loadBuffer(buffer,m_filename+".js"); // js - file - QString implementation = + TQString implementation = "/*$SPECIALIZATION$*/\n" "function $METHOD$\n" "{\n" @@ -418,7 +418,7 @@ void SubclassingDlg::accept() if (!slitem->isOn() || slitem->m_alreadyInSubclass) continue; - QString impl = implementation; + TQString impl = implementation; replace(impl,"$RETURNTYPE$",slitem->m_returnType); replace(impl,"$NEWCLASS$",m_edClassName->text()); replace(impl,"$METHOD$", slitem->m_methodName); @@ -453,9 +453,9 @@ void SubclassingDlg::onChangedClassName() m_btnOk->setEnabled(true); } -QString SubclassingDlg::readBaseClassName( ) +TQString SubclassingDlg::readBaseClassName( ) { - QDomDocument doc; + TQDomDocument doc; DomUtil::openDOMFile(doc,m_formFile); return DomUtil::elementByPathExt(doc,WIDGET_CLASS_NAME).text(); } diff --git a/languages/kjssupport/subclassingdlg.h b/languages/kjssupport/subclassingdlg.h index c727b648..8cf9ad32 100644 --- a/languages/kjssupport/subclassingdlg.h +++ b/languages/kjssupport/subclassingdlg.h @@ -12,7 +12,7 @@ #ifndef SUBCLASSINGDLG_H #define SUBCLASSINGDLG_H -#include +#include #include "subclassingdlgbase.h" @@ -23,15 +23,15 @@ class kjsSupportPart; class SlotItem : public QCheckListItem { public: - SlotItem(QListView *parent,const QString &text, - const QString &specifier, const QString &Access, - const QString &returnType,bool isFunc, + SlotItem(TQListView *parent,const TQString &text, + const TQString &specifier, const TQString &Access, + const TQString &returnType,bool isFunc, bool callBaseClass=false); void setAllreadyInSubclass(); - QString m_access; - QString m_methodName; - QString m_returnType; - QString m_specifier; + TQString m_access; + TQString m_methodName; + TQString m_returnType; + TQString m_specifier; bool m_isFunc; bool m_callBaseClass; bool m_alreadyInSubclass; @@ -41,23 +41,23 @@ class SlotItem : public QCheckListItem class SubclassingDlg : public SubclassingDlgBase { public: - SubclassingDlg(kjsSupportPart* kjsSupport, const QString &formFile,QStringList &newFileNames, - QWidget* parent = 0, const char* name = 0, + SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); -/* SubclassingDlg(CppSupportPart* kjsSupport, const QString &formFile,const QString &filename,QStringList &dummy, - QWidget* parent = 0, const char* name = 0, +/* SubclassingDlg(CppSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );*/ ~SubclassingDlg(); private: void readUiFile(); - QString readBaseClassName(); + TQString readBaseClassName(); void updateDlg(); - bool replaceKeywords(QString &buffer, bool canBeModal=true); - void replace(QString &string, const QString& search, const QString& replace); - bool saveBuffer(QString &buffer, const QString& filename); - bool loadBuffer(QString &buffer, const QString& filename); - bool alreadyInSubclass(const QString &method); + bool replaceKeywords(TQString &buffer, bool canBeModal=true); + void replace(TQString &string, const TQString& search, const TQString& replace); + bool saveBuffer(TQString &buffer, const TQString& filename); + bool loadBuffer(TQString &buffer, const TQString& filename); + bool alreadyInSubclass(const TQString &method); bool m_creatingNewSubclass; public slots: @@ -65,20 +65,20 @@ public slots: virtual void onChangedClassName(); protected: - QStringList &m_newFileNames; - QString m_filename; - QString m_formFile; - QString m_baseClassName; - QString m_qtBaseClassName; - QString m_baseCaption; - QString m_formName; - QString m_formPath; - QStringList m_parsedMethods; + TQStringList &m_newFileNames; + TQString m_filename; + TQString m_formFile; + TQString m_baseClassName; + TQString m_qtBaseClassName; + TQString m_baseCaption; + TQString m_formName; + TQString m_formPath; + TQStringList m_parsedMethods; bool m_canBeModal; - QValueList m_slots; - QValueList m_functions; + TQValueList m_slots; + TQValueList m_functions; kjsSupportPart* m_kjsSupport; - QString connections; + TQString connections; }; #endif diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp index 92765efe..5d33ee8c 100644 --- a/languages/lib/debugger/debugger.cpp +++ b/languages/lib/debugger/debugger.cpp @@ -16,8 +16,8 @@ Debugger *Debugger::s_instance = 0; Debugger::Debugger(KDevPartController *partController) :m_partController(partController) { - connect( m_partController, SIGNAL(partAdded(KParts::Part*)), - this, SLOT(partAdded(KParts::Part*)) ); + connect( m_partController, TQT_SIGNAL(partAdded(KParts::Part*)), + this, TQT_SLOT(partAdded(KParts::Part*)) ); } @@ -34,7 +34,7 @@ Debugger::~Debugger() // } -void Debugger::setBreakpoint(const QString &fileName, int lineNum, int id, bool enabled, bool pending) +void Debugger::setBreakpoint(const TQString &fileName, int lineNum, int id, bool enabled, bool pending) { KParts::Part *part = m_partController->partForURL(KURL(fileName)); if( !part ) @@ -46,11 +46,11 @@ void Debugger::setBreakpoint(const QString &fileName, int lineNum, int id, bool // Temporarily disconnect so we don't get confused by receiving extra // marksChanged signals - disconnect( part, SIGNAL(marksChanged()), this, SLOT(marksChanged()) ); + disconnect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); iface->removeMark( lineNum, Breakpoint | ActiveBreakpoint | ReachedBreakpoint | DisabledBreakpoint ); BPItem bpItem(fileName, lineNum); - QValueList::Iterator it = BPList.find(bpItem); + TQValueList::Iterator it = BPList.find(bpItem); if (it != BPList.end()) { // kdDebug(9012) << "Removing BP=" << fileName << ":" << lineNum << endl; @@ -71,21 +71,21 @@ void Debugger::setBreakpoint(const QString &fileName, int lineNum, int id, bool BPList.append(BPItem(fileName, lineNum)); } - connect( part, SIGNAL(marksChanged()), this, SLOT(marksChanged()) ); + connect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); } void Debugger::clearExecutionPoint() { - QPtrListIterator it(*m_partController->parts()); + TQPtrListIterator it(*m_partController->parts()); for ( ; it.current(); ++it) { MarkInterface *iface = dynamic_cast(it.current()); if (!iface) continue; - QPtrList list = iface->marks(); - QPtrListIterator markIt(list); + TQPtrList list = iface->marks(); + TQPtrListIterator markIt(list); for( ; markIt.current(); ++markIt ) { Mark* mark = markIt.current(); @@ -125,8 +125,8 @@ void Debugger::marksChanged() return; // Probably means the document is being closed. KTextEditor::Mark *m; - QValueList oldBPList = BPList; - QPtrList newMarks = iface->marks(); + TQValueList oldBPList = BPList; + TQPtrList newMarks = iface->marks(); // Compare the oldBPlist to the new list from the editor. // @@ -203,7 +203,7 @@ void Debugger::partAdded( KParts::Part* part ) iface->setPixmap((MarkInterface::MarkTypes)ExecutionPoint, *executionPointPixmap()); iface->setMarksUserChangable( Bookmark | Breakpoint ); - connect( part, SIGNAL(marksChanged()), this, SLOT(marksChanged()) ); + connect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); } #include "debugger.moc" diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h index ed545f28..f1a48452 100644 --- a/languages/lib/debugger/debugger.h +++ b/languages/lib/debugger/debugger.h @@ -1,7 +1,7 @@ #ifndef __DEBUGGER_H__ #define __DEBUGGER_H__ -#include +#include #include "kdevdebugger.h" @@ -29,13 +29,13 @@ public: BPItem() : m_fileName(""), m_lineNum(0) {} - BPItem( const QString& fileName, const uint lineNum) + BPItem( const TQString& fileName, const uint lineNum) : m_fileName(fileName), m_lineNum(lineNum) {} uint lineNum() const { return m_lineNum; } - QString fileName() const { return m_fileName; } + TQString fileName() const { return m_fileName; } bool operator==( const BPItem& rhs ) const { @@ -44,7 +44,7 @@ public: } private: - QString m_fileName; + TQString m_fileName; uint m_lineNum; }; @@ -75,7 +75,7 @@ public: * @param enabled The breakpoint could be enabled, disabled * @param pending pending or active. Each state has a different icon. */ - void setBreakpoint(const QString &fileName, int lineNum, + void setBreakpoint(const TQString &fileName, int lineNum, int id, bool enabled, bool pending); /** @@ -126,7 +126,7 @@ private: static Debugger *s_instance; KDevPartController *m_partController; - QValueList BPList; + TQValueList BPList; }; #endif diff --git a/languages/lib/debugger/kdevdebugger.cpp b/languages/lib/debugger/kdevdebugger.cpp index d5c4e3b5..b9ee4a05 100644 --- a/languages/lib/debugger/kdevdebugger.cpp +++ b/languages/lib/debugger/kdevdebugger.cpp @@ -19,8 +19,8 @@ */ #include "kdevdebugger.h" -KDevDebugger::KDevDebugger(QObject *parent, const char *name) - : QObject(parent, name) +KDevDebugger::KDevDebugger(TQObject *parent, const char *name) + : TQObject(parent, name) { } @@ -29,7 +29,7 @@ KDevDebugger::~KDevDebugger() { } -const QPixmap* KDevDebugger::inactiveBreakpointPixmap() +const TQPixmap* KDevDebugger::inactiveBreakpointPixmap() { const char*breakpoint_gr_xpm[]={ "11 16 6 1", @@ -55,11 +55,11 @@ const QPixmap* KDevDebugger::inactiveBreakpointPixmap() "...........", "...........", "..........."}; - static QPixmap pixmap( breakpoint_gr_xpm ); + static TQPixmap pixmap( breakpoint_gr_xpm ); return &pixmap; } -const QPixmap* KDevDebugger::activeBreakpointPixmap() +const TQPixmap* KDevDebugger::activeBreakpointPixmap() { const char* breakpoint_xpm[]={ "11 16 6 1", @@ -85,11 +85,11 @@ const QPixmap* KDevDebugger::activeBreakpointPixmap() "...........", "...........", "..........."}; - static QPixmap pixmap( breakpoint_xpm ); + static TQPixmap pixmap( breakpoint_xpm ); return &pixmap; } -const QPixmap* KDevDebugger::reachedBreakpointPixmap() +const TQPixmap* KDevDebugger::reachedBreakpointPixmap() { const char*breakpoint_bl_xpm[]={ "11 16 7 1", @@ -116,11 +116,11 @@ const QPixmap* KDevDebugger::reachedBreakpointPixmap() "...........", "...........", "..........."}; - static QPixmap pixmap( breakpoint_bl_xpm ); + static TQPixmap pixmap( breakpoint_bl_xpm ); return &pixmap; } -const QPixmap* KDevDebugger::disabledBreakpointPixmap() +const TQPixmap* KDevDebugger::disabledBreakpointPixmap() { const char*breakpoint_wh_xpm[]={ "11 16 7 1", @@ -147,11 +147,11 @@ const QPixmap* KDevDebugger::disabledBreakpointPixmap() "...........", "...........", "..........."}; - static QPixmap pixmap( breakpoint_wh_xpm ); + static TQPixmap pixmap( breakpoint_wh_xpm ); return &pixmap; } -const QPixmap* KDevDebugger::executionPointPixmap() +const TQPixmap* KDevDebugger::executionPointPixmap() { const char*exec_xpm[]={ "11 16 4 1", @@ -175,7 +175,7 @@ const QPixmap* KDevDebugger::executionPointPixmap() "...........", "...........", "..........."}; - static QPixmap pixmap( exec_xpm ); + static TQPixmap pixmap( exec_xpm ); return &pixmap; } diff --git a/languages/lib/debugger/kdevdebugger.h b/languages/lib/debugger/kdevdebugger.h index d0b87721..288854e5 100644 --- a/languages/lib/debugger/kdevdebugger.h +++ b/languages/lib/debugger/kdevdebugger.h @@ -21,8 +21,8 @@ #define _KDEVDEBUGGER_H_ -#include -#include +#include +#include #include @@ -37,14 +37,14 @@ class KDevDebugger : public QObject public: - KDevDebugger(QObject *parent=0, const char *name=0); + KDevDebugger(TQObject *parent=0, const char *name=0); ~KDevDebugger(); /** * Sets a breakpoint in the editor document belong to fileName. * If id==-1, the breakpoint is deleted. */ - virtual void setBreakpoint(const QString &fileName, int lineNum, + virtual void setBreakpoint(const TQString &fileName, int lineNum, int id, bool enabled, bool pending) = 0; /** @@ -59,28 +59,28 @@ public: */ virtual void clearExecutionPoint() = 0; - static const QPixmap* inactiveBreakpointPixmap(); - static const QPixmap* activeBreakpointPixmap(); - static const QPixmap* reachedBreakpointPixmap(); - static const QPixmap* disabledBreakpointPixmap(); - static const QPixmap* executionPointPixmap(); + static const TQPixmap* inactiveBreakpointPixmap(); + static const TQPixmap* activeBreakpointPixmap(); + static const TQPixmap* reachedBreakpointPixmap(); + static const TQPixmap* disabledBreakpointPixmap(); + static const TQPixmap* executionPointPixmap(); signals: /** * The user has toggled a breakpoint. */ - void toggledBreakpoint(const QString &fileName, int lineNum); + void toggledBreakpoint(const TQString &fileName, int lineNum); /* * The user wants to edit the properties of a breakpoint. */ - void editedBreakpoint(const QString &fileName, int lineNum); + void editedBreakpoint(const TQString &fileName, int lineNum); /** * The user wants to enable/disable a breakpoint. */ - void toggledBreakpointEnabled(const QString &fileName, int lineNum); + void toggledBreakpointEnabled(const TQString &fileName, int lineNum); }; diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp index 5e958bfa..c961657b 100644 --- a/languages/lib/designer_integration/implementationwidget.cpp +++ b/languages/lib/designer_integration/implementationwidget.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "implementationwidget.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -61,12 +61,12 @@ private: }; } -ImplementationWidget::ImplementationWidget(KDevLanguageSupport *part, QWidget* parent, const char* name, bool modal) +ImplementationWidget::ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent, const char* name, bool modal) :CreateImplemenationWidgetBase(parent, name, modal), m_part(part) { } -void ImplementationWidget::init(const QString &formName) +void ImplementationWidget::init(const TQString &formName) { m_formName = formName; @@ -74,7 +74,7 @@ void ImplementationWidget::init(const QString &formName) fileNameEdit->clear(); classNameEdit->clear(); - QDomDocument doc; + TQDomDocument doc; DomUtil::openDOMFile(doc, m_formName); m_baseClassName = DomUtil::elementByPathExt(doc, "class").text(); setCaption(i18n("Create or Select Implementation Class for: %1").arg(m_baseClassName)); @@ -106,7 +106,7 @@ ImplementationWidget::~ImplementationWidget() } /*$SPECIALIZATION$*/ -void ImplementationWidget::classNameChanged(const QString &text) +void ImplementationWidget::classNameChanged(const TQString &text) { fileNameEdit->setText(text.lower()); } @@ -134,7 +134,7 @@ void ImplementationWidget::accept() return; m_selectedClass = item->dom(); } - QDialog::accept(); + TQDialog::accept(); } ClassDom ImplementationWidget::selectedClass() @@ -148,10 +148,10 @@ bool ImplementationWidget::createClass() return true; } -int ImplementationWidget::exec(const QString &formName) +int ImplementationWidget::exec(const TQString &formName) { init(formName); - return QDialog::exec(); + return TQDialog::exec(); } #include "implementationwidget.moc" diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h index 0b7d784f..b639b0e8 100644 --- a/languages/lib/designer_integration/implementationwidget.h +++ b/languages/lib/designer_integration/implementationwidget.h @@ -41,7 +41,7 @@ class ImplementationWidget : public CreateImplemenationWidgetBase { Q_OBJECT public: - ImplementationWidget(KDevLanguageSupport *part, QWidget* parent = 0, const char* name = 0, bool modal = false); + ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false); virtual ~ImplementationWidget(); /*$PUBLIC_FUNCTIONS$*/ @@ -49,7 +49,7 @@ public: ClassDom selectedClass(); /**Executes implementation widget for a form @p formName.*/ - int exec(const QString &formName); + int exec(const TQString &formName); public slots: /*$PUBLIC_SLOTS$*/ @@ -58,7 +58,7 @@ protected: /*$PROTECTED_FUNCTIONS$*/ /**Sets up the dialog. No need to reimplement unless you want to restrict the number of classes being displayed as possible implementation classes.*/ - void init(const QString &formName); + void init(const TQString &formName); void processNamespaces(NamespaceDom dom, KListViewItem *parent); void processClasses(ClassDom dom, KListViewItem *parent); @@ -68,18 +68,18 @@ protected: /**Reimplement to create actual files with the form implementation. @return The list of absolute paths to a files created.*/ - virtual QStringList createClassFiles() = 0; + virtual TQStringList createClassFiles() = 0; protected slots: /*$PROTECTED_SLOTS$*/ - virtual void classNameChanged(const QString &text); + virtual void classNameChanged(const TQString &text); virtual void accept(); protected: KDevLanguageSupport *m_part; ClassDom m_selectedClass; - QString m_formName; - QString m_baseClassName; + TQString m_formName; + TQString m_baseClassName; }; #endif diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp index c3215c1e..f66b1b61 100644 --- a/languages/lib/designer_integration/qtdesignerintegration.cpp +++ b/languages/lib/designer_integration/qtdesignerintegration.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "qtdesignerintegration.h" -#include -#include -#include +#include +#include +#include #include #include @@ -49,7 +49,7 @@ QtDesignerIntegration::~QtDesignerIntegration() delete m_impl; } -void QtDesignerIntegration::addFunction(const QString& formName, KInterfaceDesigner::Function function) +void QtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesigner::Function function) { kdDebug() << "QtDesignerIntegration::addFunction: form: " << formName << ", function: " << function.function << endl; @@ -67,21 +67,21 @@ void QtDesignerIntegration::addFunction(const QString& formName, KInterfaceDesig addFunctionToClass(function, klass); } -void QtDesignerIntegration::editFunction(const QString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function) +void QtDesignerIntegration::editFunction(const TQString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function) { kdDebug() << "QtDesignerIntegration::editFunction: form: " << formName << ", old function: " << oldFunction.function << ", function: " << function.function << endl; } -void QtDesignerIntegration::removeFunction(const QString& formName, KInterfaceDesigner::Function function) +void QtDesignerIntegration::removeFunction(const TQString& formName, KInterfaceDesigner::Function function) { kdDebug() << "QtDesignerIntegration::removeFunction: form: " << formName << ", function: " << function.function << endl; } -bool QtDesignerIntegration::selectImplementation(const QString &formName) +bool QtDesignerIntegration::selectImplementation(const TQString &formName) { - QFileInfo fi(formName); + TQFileInfo fi(formName); if (!fi.exists()) return false; @@ -93,38 +93,38 @@ bool QtDesignerIntegration::selectImplementation(const QString &formName) return false; } -void QtDesignerIntegration::loadSettings(QDomDocument dom, QString path) +void QtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path) { - QDomElement el = DomUtil::elementByPath(dom, path + "/qtdesigner"); + TQDomElement el = DomUtil::elementByPath(dom, path + "/qtdesigner"); if (el.isNull()) return; - QDomNodeList impls = el.elementsByTagName("implementation"); + TQDomNodeList impls = el.elementsByTagName("implementation"); for (uint i = 0; i < impls.count(); ++i) { - QDomElement el = impls.item(i).toElement(); + TQDomElement el = impls.item(i).toElement(); if (el.isNull()) continue; - QString implementationPath = Relative::File(m_part->project()->projectDirectory(), + TQString implementationPath = Relative::File(m_part->project()->projectDirectory(), el.attribute("implementationpath"), true).urlPath(); FileDom file = m_part->codeModel()->fileByName(implementationPath); if (!file) continue; ClassList cllist = file->classByName(el.attribute("class")); - QString uiPath = Relative::File(m_part->project()->projectDirectory(), + TQString uiPath = Relative::File(m_part->project()->projectDirectory(), el.attribute("path"), true).urlPath(); if (cllist.count() > 0) m_implementations[uiPath] = cllist.first(); } } -void QtDesignerIntegration::saveSettings(QDomDocument dom, QString path) +void QtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path) { kdDebug() << "QtDesignerIntegration::saveSettings" << endl; - QDomElement el = DomUtil::createElementByPath(dom, path + "/qtdesigner"); - for (QMap::const_iterator it = m_implementations.begin(); + TQDomElement el = DomUtil::createElementByPath(dom, path + "/qtdesigner"); + for (TQMap::const_iterator it = m_implementations.begin(); it != m_implementations.end(); ++it) { - QDomElement il = dom.createElement("implementation"); + TQDomElement il = dom.createElement("implementation"); el.appendChild(il); il.setAttribute("path", Relative::File(m_part->project()->projectDirectory(), it.key()).rurl()); @@ -134,11 +134,11 @@ void QtDesignerIntegration::saveSettings(QDomDocument dom, QString path) } } -void QtDesignerIntegration::openFunction(const QString &formName, const QString &functionName) +void QtDesignerIntegration::openFunction(const TQString &formName, const TQString &functionName) { kdDebug() << "QtDesignerIntegration::openFunction, formName = " << formName << ", functionName = " << functionName << endl; - QString fn = functionName; + TQString fn = functionName; if (fn.find("(") > 0) fn.remove(fn.find("("), fn.length()); @@ -147,7 +147,7 @@ void QtDesignerIntegration::openFunction(const QString &formName, const QString int line = -1, col = -1; - QString impl = m_implementations[formName]->fileName(); + TQString impl = m_implementations[formName]->fileName(); processImplementationName(impl); if (m_part->codeModel()->hasFile(impl)) @@ -177,17 +177,17 @@ void QtDesignerIntegration::openFunction(const QString &formName, const QString m_part->partController()->editDocument(KURL(impl), line, col); } -void QtDesignerIntegration::processImplementationName(QString &// name +void QtDesignerIntegration::processImplementationName(TQString &// name ) { } -void QtDesignerIntegration::openSource(const QString &formName) +void QtDesignerIntegration::openSource(const TQString &formName) { if (!m_implementations.contains(formName)) if (!selectImplementation(formName)) return; - QString impl = m_implementations[formName]->fileName(); + TQString impl = m_implementations[formName]->fileName(); processImplementationName(impl); m_part->partController()->editDocument(KURL(impl), -1, -1); } diff --git a/languages/lib/designer_integration/qtdesignerintegration.h b/languages/lib/designer_integration/qtdesignerintegration.h index 3f2602f8..a31310eb 100644 --- a/languages/lib/designer_integration/qtdesignerintegration.h +++ b/languages/lib/designer_integration/qtdesignerintegration.h @@ -20,7 +20,7 @@ #ifndef QTDESIGNERINTEGRATION_H #define QTDESIGNERINTEGRATION_H -#include +#include #include #include "kdevdesignerintegration.h" @@ -44,18 +44,18 @@ public: virtual ~QtDesignerIntegration(); public slots: - virtual void addFunction(const QString& formName, KInterfaceDesigner::Function function); - virtual void editFunction(const QString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function); - virtual void removeFunction(const QString& formName, KInterfaceDesigner::Function function); + virtual void addFunction(const TQString& formName, KInterfaceDesigner::Function function); + virtual void editFunction(const TQString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function); + virtual void removeFunction(const TQString& formName, KInterfaceDesigner::Function function); - virtual void openFunction(const QString &formName, const QString &functionName); + virtual void openFunction(const TQString &formName, const TQString &functionName); - virtual void openSource(const QString &formName); + virtual void openSource(const TQString &formName); - virtual void saveSettings(QDomDocument dom, QString path); - virtual void loadSettings(QDomDocument dom, QString path); + virtual void saveSettings(TQDomDocument dom, TQString path); + virtual void loadSettings(TQDomDocument dom, TQString path); - bool selectImplementation(const QString &formName); + bool selectImplementation(const TQString &formName); protected: /**Reimplement this to add a function to a class. This means you need to modify @@ -67,10 +67,10 @@ protected: @code name.replace(".h", ".cpp"); @endcode*/ - virtual void processImplementationName(QString &name); + virtual void processImplementationName(TQString &name); //Form file - derived class name - QMap m_implementations; + TQMap m_implementations; KDevLanguageSupport *m_part; ImplementationWidget *m_impl; diff --git a/languages/lib/interfaces/kdevpcsimporter.cpp b/languages/lib/interfaces/kdevpcsimporter.cpp index 7dfe6a10..fb204328 100644 --- a/languages/lib/interfaces/kdevpcsimporter.cpp +++ b/languages/lib/interfaces/kdevpcsimporter.cpp @@ -20,8 +20,8 @@ #include "kdevpcsimporter.h" #include "kdevpcsimporter.moc" -KDevPCSImporter::KDevPCSImporter( QObject * parent, const char * name ) - : QObject( parent, name ) +KDevPCSImporter::KDevPCSImporter( TQObject * parent, const char * name ) + : TQObject( parent, name ) { } @@ -29,7 +29,7 @@ KDevPCSImporter::~ KDevPCSImporter( ) { } -QWidget * KDevPCSImporter::createSettingsPage( QWidget * /*parent*/, const char * /*name*/ ) +TQWidget * KDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const char * /*name*/ ) { return 0; } diff --git a/languages/lib/interfaces/kdevpcsimporter.h b/languages/lib/interfaces/kdevpcsimporter.h index b5ff74de..dee168e9 100644 --- a/languages/lib/interfaces/kdevpcsimporter.h +++ b/languages/lib/interfaces/kdevpcsimporter.h @@ -20,8 +20,8 @@ #ifndef KDEVPCSIMPORTER_H #define KDEVPCSIMPORTER_H -#include -#include +#include +#include class QWidget; @@ -36,14 +36,14 @@ class KDevPCSImporter: public QObject { Q_OBJECT public: - KDevPCSImporter( QObject* parent=0, const char* name=0 ); + KDevPCSImporter( TQObject* parent=0, const char* name=0 ); virtual ~KDevPCSImporter(); - virtual QString dbName() const = 0; - virtual QStringList includePaths() = 0; - virtual QStringList fileList() = 0; + virtual TQString dbName() const = 0; + virtual TQStringList includePaths() = 0; + virtual TQStringList fileList() = 0; - virtual QWidget* createSettingsPage( QWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); }; #endif // KDEVPCSIMPORTER_H diff --git a/languages/pascal/PascalLexer.hpp b/languages/pascal/PascalLexer.hpp index f63ac84d..99a14959 100644 --- a/languages/pascal/PascalLexer.hpp +++ b/languages/pascal/PascalLexer.hpp @@ -6,7 +6,7 @@ #include "problemreporter.h" #include "PascalAST.hpp" - #include + #include #include #define SET_POSITION(ast,t)\ diff --git a/languages/pascal/PascalParser.hpp b/languages/pascal/PascalParser.hpp index d37d76c5..dfd4e5f2 100644 --- a/languages/pascal/PascalParser.hpp +++ b/languages/pascal/PascalParser.hpp @@ -6,7 +6,7 @@ #include "problemreporter.h" #include "PascalAST.hpp" - #include + #include #include #define SET_POSITION(ast,t)\ diff --git a/languages/pascal/PascalStoreWalker.hpp b/languages/pascal/PascalStoreWalker.hpp index bc354743..ada7c020 100644 --- a/languages/pascal/PascalStoreWalker.hpp +++ b/languages/pascal/PascalStoreWalker.hpp @@ -6,9 +6,9 @@ #include #include "PascalAST.hpp" - #include - #include - #include + #include + #include + #include #line 14 "PascalStoreWalker.hpp" #include @@ -27,8 +27,8 @@ class CUSTOM_API PascalStoreWalker : public ANTLR_USE_NAMESPACE(antlr)TreeParser #line 47 "pascal.tree.g" private: - QString m_fileName; - QStringList m_currentScope; + TQString m_fileName; + TQStringList m_currentScope; int m_currentAccess; int m_anon; CodeModel* m_model; @@ -38,8 +38,8 @@ public: CodeModel* codeModel() { return m_model; } const CodeModel* codeModel() const { return m_model; } - QString fileName() const { return m_fileName; } - void setFileName( const QString& fileName ) { m_fileName = fileName; } + TQString fileName() const { return m_fileName; } + void setFileName( const TQString& fileName ) { m_fileName = fileName; } void init(){ m_currentScope.clear(); diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.hpp b/languages/pascal/PascalStoreWalkerTokenTypes.hpp index 0f4142f5..e8e19eb9 100644 --- a/languages/pascal/PascalStoreWalkerTokenTypes.hpp +++ b/languages/pascal/PascalStoreWalkerTokenTypes.hpp @@ -183,7 +183,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes { INHERITED = 172, NEW = 173, SELF = 174, - METHOD = 175, + TQT_METHOD = 175, ADDSUBOR = 176, ASSIGNEQUAL = 177, SIGN = 178, diff --git a/languages/pascal/PascalTokenTypes.hpp b/languages/pascal/PascalTokenTypes.hpp index 3e613221..fc8692d3 100644 --- a/languages/pascal/PascalTokenTypes.hpp +++ b/languages/pascal/PascalTokenTypes.hpp @@ -183,7 +183,7 @@ struct CUSTOM_API PascalTokenTypes { INHERITED = 172, NEW = 173, SELF = 174, - METHOD = 175, + TQT_METHOD = 175, ADDSUBOR = 176, ASSIGNEQUAL = 177, SIGN = 178, diff --git a/languages/pascal/backgroundparser.cpp b/languages/pascal/backgroundparser.cpp index a61c9774..ff202374 100644 --- a/languages/pascal/backgroundparser.cpp +++ b/languages/pascal/backgroundparser.cpp @@ -17,12 +17,12 @@ #include "PascalParser.hpp" #include "PascalAST.hpp" #include -#include +#include #include BackgroundParser::BackgroundParser( ProblemReporter* reporter, - const QString& source, - const QString& filename ) + const TQString& source, + const TQString& filename ) : m_reporter( reporter ), m_source( source.unicode(), source.length() ), m_fileName( filename ) @@ -37,10 +37,10 @@ void BackgroundParser::run() { kdDebug() << "11" << endl; - QCString _fn = QFile::encodeName(m_fileName); + TQCString _fn = TQFile::encodeName(m_fileName); std::string fn( _fn.data() ); - QCString text = m_source.utf8(); + TQCString text = m_source.utf8(); std::istringstream stream( text.data() ); kdDebug() << "12" << endl; diff --git a/languages/pascal/backgroundparser.h b/languages/pascal/backgroundparser.h index 7118c7f2..2ad77f83 100644 --- a/languages/pascal/backgroundparser.h +++ b/languages/pascal/backgroundparser.h @@ -12,24 +12,24 @@ #ifndef BACKGROUNDPARSER_H #define BACKGROUNDPARSER_H -#include -#include +#include +#include class ProblemReporter; class BackgroundParser: public QThread{ public: BackgroundParser( ProblemReporter* reporter, - const QString& source, - const QString& filename ); + const TQString& source, + const TQString& filename ); virtual ~BackgroundParser(); virtual void run(); private: ProblemReporter* m_reporter; - QString m_source; - QString m_fileName; + TQString m_source; + TQString m_fileName; }; #endif diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp index a65ca9d6..2d267519 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp @@ -8,8 +8,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include +#include +#include #include #include @@ -21,7 +21,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevdccoptions, KGenericFactory( "kdevdccoptions" ) ) -DccOptionsPlugin::DccOptionsPlugin(QObject *parent, const char *name, const QStringList/* &args*/) +DccOptionsPlugin::DccOptionsPlugin(TQObject *parent, const char *name, const QStringList/* &args*/) : KDevCompilerOptions(parent, name) { } @@ -30,22 +30,22 @@ DccOptionsPlugin::~DccOptionsPlugin() { } -QString DccOptionsPlugin::exec(QWidget *parent, const QString &flags) +TQString DccOptionsPlugin::exec(TQWidget *parent, const TQString &flags) { DccOptionsDialog *dlg = new DccOptionsDialog(parent, "dcc options dialog"); - QString newFlags = flags; + TQString newFlags = flags; dlg->setFlags(flags); - if(dlg->exec() == QDialog::Accepted) + if(dlg->exec() == TQDialog::Accepted) newFlags = dlg->flags(); delete dlg; return newFlags; } -DccOptionsDialog::DccOptionsDialog( QWidget * parent, const char * name ) +DccOptionsDialog::DccOptionsDialog( TQWidget * parent, const char * name ) : KDialogBase(Tabbed, i18n("Delphi Compiler Options"), Ok|Cancel, Ok, parent, name, true) { - QVBox *vbox; + TQVBox *vbox; vbox = addVBoxPage(i18n("General")); general = new GeneralTab(vbox, "general tab"); @@ -70,9 +70,9 @@ DccOptionsDialog::~DccOptionsDialog( ) { } -void DccOptionsDialog::setFlags( const QString & flags ) +void DccOptionsDialog::setFlags( const TQString & flags ) { - QStringList flaglist = QStringList::split(" ", flags); + TQStringList flaglist = TQStringList::split(" ", flags); general->readFlags(&flaglist); codegen->readFlags(&flaglist); @@ -84,9 +84,9 @@ void DccOptionsDialog::setFlags( const QString & flags ) unrecognizedFlags = flaglist; } -QString DccOptionsDialog::flags( ) const +TQString DccOptionsDialog::flags( ) const { - QStringList flaglist; + TQStringList flaglist; general->writeFlags(&flaglist); locations->writeFlags(&flaglist); @@ -95,8 +95,8 @@ QString DccOptionsDialog::flags( ) const debug_optim->writeFlags(&flaglist); linker->writeFlags(&flaglist); - QString flags; - QStringList::ConstIterator li; + TQString flags; + TQStringList::ConstIterator li; for (li = flaglist.begin(); li != flaglist.end(); ++li) { flags += (*li); flags += " "; diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h index 35f34532..04a2392e 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h @@ -20,10 +20,10 @@ class DccOptionsPlugin : public KDevCompilerOptions Q_OBJECT public: - DccOptionsPlugin( QObject *parent, const char *name, const QStringList/* &args */); + DccOptionsPlugin( TQObject *parent, const char *name, const QStringList/* &args */); ~DccOptionsPlugin(); - virtual QString exec(QWidget *parent, const QString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); }; class GeneralTab; @@ -36,11 +36,11 @@ class DebugOptimTab; class DccOptionsDialog : public KDialogBase { public: - DccOptionsDialog( QWidget *parent=0, const char *name=0 ); + DccOptionsDialog( TQWidget *parent=0, const char *name=0 ); ~DccOptionsDialog(); - void setFlags(const QString &flags); - QString flags() const; + void setFlags(const TQString &flags); + TQString flags() const; private: GeneralTab *general; @@ -49,7 +49,7 @@ private: Locations2Tab *locations2; CodegenTab *codegen; DebugOptimTab *debug_optim; - QStringList unrecognizedFlags; + TQStringList unrecognizedFlags; }; diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp index 97622606..94c8b35c 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.cpp +++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp @@ -10,27 +10,27 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "flagboxes.h" #include "optiontabs.h" -LinkerTab::LinkerTab( QWidget * parent, const char * name ) - : QWidget(parent, name), radioController(new FlagRadioButtonController()), +LinkerTab::LinkerTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), radioController(new FlagRadioButtonController()), pathController(new FlagPathEditController()), editController(new FlagEditController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QVButtonGroup *map_group = new QVButtonGroup(i18n("Map File"), this); - QRadioButton *m_defaultMap = new QRadioButton(i18n("Off"), map_group); + TQVButtonGroup *map_group = new TQVButtonGroup(i18n("Map File"), this); + TQRadioButton *m_defaultMap = new TQRadioButton(i18n("Off"), map_group); m_defaultMap->setChecked(true); new FlagRadioButton(map_group, radioController, "-GS", i18n("Segments")); @@ -38,17 +38,17 @@ LinkerTab::LinkerTab( QWidget * parent, const char * name ) "-GP", i18n("Publics")); new FlagRadioButton(map_group, radioController, "-GD", i18n("Detailed")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); new FlagPathEdit(this, "", pathController, "--dynamicloader=", i18n("Default dynamic loader:"), KFile::File); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); new FlagSpinEdit(this, 0, 2147483647, 1024, 1048576, editController, "-$M", i18n("Reserved address space:")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); layout->addStretch(); @@ -61,14 +61,14 @@ LinkerTab::~LinkerTab( ) delete editController; } -void LinkerTab::readFlags( QStringList * str ) +void LinkerTab::readFlags( TQStringList * str ) { pathController->readFlags(str); radioController->readFlags(str); editController->readFlags(str); } -void LinkerTab::writeFlags( QStringList * str ) +void LinkerTab::writeFlags( TQStringList * str ) { pathController->writeFlags(str); radioController->writeFlags(str); @@ -77,10 +77,10 @@ void LinkerTab::writeFlags( QStringList * str ) -LocationsTab::LocationsTab( QWidget * parent, const char * name ) - :QWidget(parent, name), pathController(new FlagPathEditController()) +LocationsTab::LocationsTab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), pathController(new FlagPathEditController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); new FlagPathEdit(this, ":", pathController, @@ -91,7 +91,7 @@ LocationsTab::LocationsTab( QWidget * parent, const char * name ) "-U", i18n("Unit search path (delimited by \":\"):")); new FlagPathEdit(this, ":", pathController, "-O", i18n("Object search path (delimited by \":\"):")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -100,22 +100,22 @@ LocationsTab::~LocationsTab( ) delete pathController; } -void LocationsTab::readFlags( QStringList * str ) +void LocationsTab::readFlags( TQStringList * str ) { pathController->readFlags(str); } -void LocationsTab::writeFlags( QStringList * str ) +void LocationsTab::writeFlags( TQStringList * str ) { pathController->writeFlags(str); } -Locations2Tab::Locations2Tab( QWidget * parent, const char * name ) - :QWidget(parent, name), pathController(new FlagPathEditController()) +Locations2Tab::Locations2Tab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), pathController(new FlagPathEditController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); new FlagPathEdit(this, "", pathController, @@ -126,7 +126,7 @@ Locations2Tab::Locations2Tab( QWidget * parent, const char * name ) "-LE", i18n("Package directory:")); new FlagPathEdit(this, "", pathController, "-LN", i18n("Package source code directory:")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -135,26 +135,26 @@ Locations2Tab::~Locations2Tab( ) delete pathController; } -void Locations2Tab::readFlags( QStringList * str ) +void Locations2Tab::readFlags( TQStringList * str ) { pathController->readFlags(str); } -void Locations2Tab::writeFlags( QStringList * str ) +void Locations2Tab::writeFlags( TQStringList * str ) { pathController->writeFlags(str); } -GeneralTab::GeneralTab( QWidget * parent, const char * name ) - :QWidget(parent, name), controller(new FlagCheckBoxController()), +GeneralTab::GeneralTab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), controller(new FlagCheckBoxController()), editController(new FlagEditController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QVButtonGroup *build_group = new QVButtonGroup(i18n("Build"), this); + TQVButtonGroup *build_group = new TQVButtonGroup(i18n("Build"), this); new FlagCheckBox(build_group, controller, "-B", i18n("Build all units")); new FlagCheckBox(build_group, controller, @@ -163,29 +163,29 @@ GeneralTab::GeneralTab( QWidget * parent, const char * name ) "-Q", i18n("Quiet compile")); new FlagCheckBox(build_group, controller, "-Z", i18n("Disable implicit package compilation")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); new FlagListEdit(this, ":", editController, "-D", i18n("Conditional defines (delimited by \":\"):")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); new FlagListEdit(this, ":", editController, "-A", i18n("Unit aliases in form unit=alias (delimited by \":\"):")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *message_group = new QVButtonGroup(i18n("Messages"), this); + TQVButtonGroup *message_group = new TQVButtonGroup(i18n("Messages"), this); new FlagCheckBox(message_group, controller, "-H", i18n("Output hint messages")); new FlagCheckBox(message_group, controller, "-W", i18n("Output warning messages")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *package_group = new QVButtonGroup(i18n("Packages"), this); + TQVButtonGroup *package_group = new TQVButtonGroup(i18n("Packages"), this); new FlagListEdit(package_group, ":", editController, "-LU", i18n("Build with packages (delimited by \":\"):")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -196,13 +196,13 @@ GeneralTab::~GeneralTab( ) delete editController; } -void GeneralTab::readFlags( QStringList * str ) +void GeneralTab::readFlags( TQStringList * str ) { controller->readFlags(str); editController->readFlags(str); } -void GeneralTab::writeFlags( QStringList * str ) +void GeneralTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); editController->writeFlags(str); @@ -210,18 +210,18 @@ void GeneralTab::writeFlags( QStringList * str ) -CodegenTab::CodegenTab( QWidget * parent, const char * name ) - :QWidget(parent, name), controller(new FlagCheckBoxController()), +CodegenTab::CodegenTab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()), radioController(new FlagRadioButtonController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); // layout->setAutoAdd(true); - QGridLayout *layout2 = new QGridLayout(layout, 2, 2, KDialog::spacingHint()); + TQGridLayout *layout2 = new TQGridLayout(layout, 2, 2, KDialog::spacingHint()); - QVButtonGroup *align_group = new QVButtonGroup(i18n("Code Alignment && Stack Frames"), this); - QRadioButton *align_def = new QRadioButton(i18n("Default (-$A8)"), align_group); + TQVButtonGroup *align_group = new TQVButtonGroup(i18n("Code Alignment && Stack Frames"), this); + TQRadioButton *align_def = new TQRadioButton(i18n("Default (-$A8)"), align_group); align_def->setChecked(true); new FlagRadioButton(align_group, radioController, "'-$A1'", i18n("Never align")); @@ -233,11 +233,11 @@ CodegenTab::CodegenTab( QWidget * parent, const char * name ) "'-$A8'", i18n("On quad word boundaries")); new FlagCheckBox(align_group, controller, "'-$W+'", i18n("Generate stack frames"), "'-$W-'"); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout2->addWidget(align_group, 0, 0); - QVButtonGroup *enum_group = new QVButtonGroup(i18n("Enumeration Size"), this); - QRadioButton *enum_def = new QRadioButton(i18n("Default (-$Z1)"), enum_group); + TQVButtonGroup *enum_group = new TQVButtonGroup(i18n("Enumeration Size"), this); + TQRadioButton *enum_def = new TQRadioButton(i18n("Default (-$Z1)"), enum_group); enum_def->setChecked(true); new FlagRadioButton(enum_group, radioController, "'-$Z1'", i18n("Unsigned byte (256 values)")); @@ -245,10 +245,10 @@ CodegenTab::CodegenTab( QWidget * parent, const char * name ) "'-$Z2'", i18n("Unsigned word (64K values)")); new FlagRadioButton(enum_group, radioController, "'-$Z4'", i18n("Unsigned double word (4096M values)")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout2->addWidget(enum_group, 0, 1); - QVButtonGroup *compile_group = new QVButtonGroup(i18n("Compile Time Checks"), this); + TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this); new FlagCheckBox(compile_group, controller, "'-$C+'", i18n("Assertions"), "'-$C-'", "'-$C+'"); new FlagCheckBox(compile_group, controller, @@ -265,10 +265,10 @@ CodegenTab::CodegenTab( QWidget * parent, const char * name ) "'-$V+'", i18n("Var-string checking"), "'-$V-'", "'-$V+'"); new FlagCheckBox(compile_group, controller, "'-$J+'", i18n("Writable typed constants"), "'-$J-'"); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout2->addWidget(compile_group, 1, 0); - QVButtonGroup *run_group = new QVButtonGroup(i18n("Run Time Checks"), this); + TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this); new FlagCheckBox(run_group, controller, "'-$M+'", i18n("Runtime type information"), "'-$M-'"); new FlagCheckBox(run_group, controller, @@ -279,7 +279,7 @@ CodegenTab::CodegenTab( QWidget * parent, const char * name ) "'-$Q+'", i18n("Overflow checking"), "'-$Q-'"); new FlagCheckBox(run_group, controller, "'-$R+'", i18n("Range checking"), "'-$R-'"); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout2->addWidget(run_group, 1, 1); layout->addStretch(); @@ -292,14 +292,14 @@ CodegenTab::~CodegenTab( ) delete radioController; } -void CodegenTab::readFlags( QStringList * str ) +void CodegenTab::readFlags( TQStringList * str ) { controller->readFlags(str); listController->readFlags(str); radioController->readFlags(str); } -void CodegenTab::writeFlags( QStringList * str ) +void CodegenTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); listController->writeFlags(str); @@ -308,23 +308,23 @@ void CodegenTab::writeFlags( QStringList * str ) -DebugOptimTab::DebugOptimTab( QWidget * parent, const char * name ) - : QWidget(parent, name), controller(new FlagCheckBoxController()), +DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), radioController(new FlagRadioButtonController) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); // layout->setAutoAdd(true); - QVButtonGroup *optim_group = new QVButtonGroup(i18n("Optimization"), this); + TQVButtonGroup *optim_group = new TQVButtonGroup(i18n("Optimization"), this); new FlagCheckBox(optim_group, controller, "'-$O+'", i18n("Enable optimizations"), "'-$O-'", "'-$O+'"); layout->addWidget(optim_group); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QBoxLayout *layout2 = new QHBoxLayout(layout, KDialog::spacingHint()); + TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); - QVButtonGroup *debug_group = new QVButtonGroup(i18n("Debugging"), this); + TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this); new FlagCheckBox(debug_group, controller, "'-$D+'", i18n("Debug information"), "'-$D-'", "'-$D+'"); new FlagCheckBox(debug_group, controller, @@ -336,10 +336,10 @@ DebugOptimTab::DebugOptimTab( QWidget * parent, const char * name ) symboldb = new FlagCheckBox(debug_group, controller, "-VR", i18n("Write symbol info in an .rsm file")); layout2->addWidget(debug_group); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - QVButtonGroup *debug_add = new QVButtonGroup(i18n("Symbol Reference Information"), this); - QRadioButton *m_default = new QRadioButton(i18n("Default (-$YD)"), debug_add); + TQVButtonGroup *debug_add = new TQVButtonGroup(i18n("Symbol Reference Information"), this); + TQRadioButton *m_default = new TQRadioButton(i18n("Default (-$YD)"), debug_add); m_default->setChecked(true); new FlagRadioButton(debug_add, radioController, "'-$Y-'", i18n("No information")); @@ -348,17 +348,17 @@ DebugOptimTab::DebugOptimTab( QWidget * parent, const char * name ) new FlagRadioButton(debug_add, radioController, "'-$Y+'", i18n("Full reference information")); layout2->addWidget(debug_add); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QHBoxLayout *layout3 = new QHBoxLayout(layout, KDialog::spacingHint()); - QPushButton *release = new QPushButton(i18n("Release"), this); - QPushButton *debug = new QPushButton(i18n("Debug"), this); + TQHBoxLayout *layout3 = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQPushButton *release = new TQPushButton(i18n("Release"), this); + TQPushButton *debug = new TQPushButton(i18n("Debug"), this); layout3->addWidget(release); layout3->addWidget(debug); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); - connect(release, SIGNAL(clicked()), this, SLOT(setReleaseOptions())); - connect(debug, SIGNAL(clicked()), this, SLOT(setDebugOptions())); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); + connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); + connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); layout->addStretch(); } @@ -369,13 +369,13 @@ DebugOptimTab::DebugOptimTab( QWidget * parent, const char * name ) delete radioController; } -void DebugOptimTab::readFlags( QStringList * str ) +void DebugOptimTab::readFlags( TQStringList * str ) { controller->readFlags(str); radioController->readFlags(str); } -void DebugOptimTab::writeFlags( QStringList * str ) +void DebugOptimTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); radioController->writeFlags(str); @@ -383,7 +383,7 @@ void DebugOptimTab::writeFlags( QStringList * str ) void DebugOptimTab::setReleaseOptions() { - QStringList sl = QStringList::split(",", "'-$O+','-$Y-','-$D-','-$L-'"); + TQStringList sl = TQStringList::split(",", "'-$O+','-$Y-','-$D-','-$L-'"); readFlags(&sl); gdb->setChecked(false); namespacedb->setChecked(false); @@ -392,7 +392,7 @@ void DebugOptimTab::setReleaseOptions() void DebugOptimTab::setDebugOptions() { - QStringList sl = QStringList::split(",", "'-$O-','-$Y+','-$D+','-$L+',-V,-VN"); + TQStringList sl = TQStringList::split(",", "'-$O-','-$Y+','-$D+','-$L+',-V,-VN"); readFlags(&sl); } diff --git a/languages/pascal/compiler/dccoptions/optiontabs.h b/languages/pascal/compiler/dccoptions/optiontabs.h index 048684a5..835c2ddb 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.h +++ b/languages/pascal/compiler/dccoptions/optiontabs.h @@ -10,7 +10,7 @@ #ifndef OPTIONTABS_H #define OPTIONTABS_H -#include +#include class FlagRadioButtonController; class FlagPathEditController; @@ -23,11 +23,11 @@ class FlagCheckBox; class LinkerTab : public QWidget { public: - LinkerTab( QWidget *parent=0, const char *name=0 ); + LinkerTab( TQWidget *parent=0, const char *name=0 ); ~LinkerTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagRadioButtonController *radioController; @@ -38,11 +38,11 @@ private: class LocationsTab : public QWidget { public: - LocationsTab( QWidget *parent=0, const char *name=0 ); + LocationsTab( TQWidget *parent=0, const char *name=0 ); ~LocationsTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagPathEditController *pathController; @@ -51,11 +51,11 @@ private: class Locations2Tab : public QWidget { public: - Locations2Tab( QWidget *parent=0, const char *name=0 ); + Locations2Tab( TQWidget *parent=0, const char *name=0 ); ~Locations2Tab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagPathEditController *pathController; @@ -64,11 +64,11 @@ private: class GeneralTab: public QWidget { public: - GeneralTab( QWidget *parent=0, const char *name=0 ); + GeneralTab( TQWidget *parent=0, const char *name=0 ); ~GeneralTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; @@ -78,11 +78,11 @@ private: class CodegenTab : public QWidget { public: - CodegenTab( QWidget *parent=0, const char *name=0 ); + CodegenTab( TQWidget *parent=0, const char *name=0 ); ~CodegenTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; @@ -94,11 +94,11 @@ class DebugOptimTab : public QWidget { Q_OBJECT public: - DebugOptimTab( QWidget *parent=0, const char *name=0 ); + DebugOptimTab( TQWidget *parent=0, const char *name=0 ); ~DebugOptimTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp index 6fd73e5f..567d5c86 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp @@ -8,7 +8,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include #include #include @@ -18,7 +18,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfpcoptions, KGenericFactory( "kdevfpcoptions" ) ) -FpcOptionsPlugin::FpcOptionsPlugin(QObject *parent, const char *name, const QStringList& /*args*/) +FpcOptionsPlugin::FpcOptionsPlugin(TQObject *parent, const char *name, const TQStringList& /*args*/) : KDevCompilerOptions(parent, name) { } @@ -27,12 +27,12 @@ FpcOptionsPlugin::~FpcOptionsPlugin() { } -QString FpcOptionsPlugin::exec(QWidget *parent, const QString &flags) +TQString FpcOptionsPlugin::exec(TQWidget *parent, const TQString &flags) { FpcOptionsDialog *dlg = new FpcOptionsDialog(parent, "fpc options dialog"); - QString newFlags = flags; + TQString newFlags = flags; dlg->setFlags(flags); - if (dlg->exec() == QDialog::Accepted) + if (dlg->exec() == TQDialog::Accepted) newFlags = dlg->flags(); delete dlg; return newFlags; @@ -40,10 +40,10 @@ QString FpcOptionsPlugin::exec(QWidget *parent, const QString &flags) -FpcOptionsDialog::FpcOptionsDialog( QWidget *parent, const char *name ) +FpcOptionsDialog::FpcOptionsDialog( TQWidget *parent, const char *name ) : KDialogBase(Tabbed, i18n("Free Pascal Compiler Options"), Ok|Cancel, Ok, parent, name, true) { - QVBox *vbox; + TQVBox *vbox; vbox = addVBoxPage(i18n("Language")); language = new LanguageTab(vbox, "language tab"); @@ -77,9 +77,9 @@ FpcOptionsDialog::~FpcOptionsDialog() { } -void FpcOptionsDialog::setFlags(const QString &flags) +void FpcOptionsDialog::setFlags(const TQString &flags) { - QStringList flaglist = QStringList::split(" ", flags); + TQStringList flaglist = TQStringList::split(" ", flags); feedback->readFlags(&flaglist); language->readFlags(&flaglist); @@ -93,9 +93,9 @@ void FpcOptionsDialog::setFlags(const QString &flags) unrecognizedFlags = flaglist; } -QString FpcOptionsDialog::flags() const +TQString FpcOptionsDialog::flags() const { - QStringList flaglist; + TQStringList flaglist; language->writeFlags(&flaglist); directories->writeFlags(&flaglist); @@ -107,8 +107,8 @@ QString FpcOptionsDialog::flags() const feedback->writeFlags(&flaglist); misc->writeFlags(&flaglist); - QString flags; - QStringList::ConstIterator li; + TQString flags; + TQStringList::ConstIterator li; for (li = flaglist.begin(); li != flaglist.end(); ++li) { flags += (*li); flags += " "; diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h index f6b15fff..55e65321 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h @@ -20,10 +20,10 @@ class FpcOptionsPlugin : public KDevCompilerOptions Q_OBJECT public: - FpcOptionsPlugin( QObject *parent, const char *name, const QStringList &args ); + FpcOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~FpcOptionsPlugin(); - virtual QString exec(QWidget *parent, const QString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); }; @@ -35,11 +35,11 @@ class CodegenTab; class FpcOptionsDialog : public KDialogBase { public: - FpcOptionsDialog( QWidget *parent=0, const char *name=0 ); + FpcOptionsDialog( TQWidget *parent=0, const char *name=0 ); ~FpcOptionsDialog(); - void setFlags(const QString &flags); - QString flags() const; + void setFlags(const TQString &flags); + TQString flags() const; private: /* GeneralTab *general; @@ -57,7 +57,7 @@ private: AssemblerTab *assembler; LinkerTab *linker; MiscTab *misc; - QStringList unrecognizedFlags; + TQStringList unrecognizedFlags; }; #endif diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp index 2579cb3c..445ab826 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp +++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp @@ -11,31 +11,31 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "flagboxes.h" #include "optiontabs.h" -FeedbackTab::FeedbackTab(QWidget *parent, const char *name) - : QWidget(parent, name), controller(new FlagCheckBoxController(QStringList::split(",","-v"))) +FeedbackTab::FeedbackTab(TQWidget *parent, const char *name) + : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QVButtonGroup *output_group = new QVButtonGroup(i18n("Output"), this); + TQVButtonGroup *output_group = new TQVButtonGroup(i18n("Output"), this); new FlagCheckBox(output_group, controller, "-vr", i18n("Format errors like GCC does")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *verbose_group = new QVButtonGroup(i18n("Verbose"), this); + TQVButtonGroup *verbose_group = new TQVButtonGroup(i18n("Verbose"), this); new FlagCheckBox(verbose_group, controller, "-va", i18n("Write all possible info")); new FlagCheckBox(verbose_group, controller, @@ -53,10 +53,10 @@ FeedbackTab::FeedbackTab(QWidget *parent, const char *name) new FlagCheckBox(verbose_group, controller, "-vd", i18n("Write other debugging info")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *other_group = new QVButtonGroup(i18n("Other Information"), this); + TQVButtonGroup *other_group = new TQVButtonGroup(i18n("Other Information"), this); new FlagCheckBox(other_group, controller, "-vl", i18n("Show line numbers when processing files")); new FlagCheckBox(other_group, controller, @@ -72,7 +72,7 @@ FeedbackTab::FeedbackTab(QWidget *parent, const char *name) new FlagCheckBox(other_group, controller, "-vb", i18n("Show all procedure declarations if an overloaded function error occurs")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -82,23 +82,23 @@ FeedbackTab::~FeedbackTab() delete controller; } -void FeedbackTab::readFlags(QStringList *list) +void FeedbackTab::readFlags(TQStringList *list) { controller->readFlags(list); } -void FeedbackTab::writeFlags(QStringList *list) +void FeedbackTab::writeFlags(TQStringList *list) { controller->writeFlags(list); } -FilesAndDirectoriesTab::FilesAndDirectoriesTab( QWidget * parent, const char * name ) - :QWidget(parent, name), controller(new FlagCheckBoxController()), +FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), controller(new FlagCheckBoxController()), pathController(new FlagPathEditController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); new FlagPathEdit(this, ":", pathController, @@ -109,7 +109,7 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( QWidget * parent, const char * n "-Fo", i18n("Object file search path (delimited by \":\"):")); new FlagPathEdit(this, ":", pathController, "-Fl", i18n("Library search path (delimited by \":\"):")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -119,23 +119,23 @@ FilesAndDirectoriesTab::~FilesAndDirectoriesTab( ) delete pathController; } -void FilesAndDirectoriesTab::readFlags( QStringList * str ) +void FilesAndDirectoriesTab::readFlags( TQStringList * str ) { controller->readFlags(str); pathController->readFlags(str); } -void FilesAndDirectoriesTab::writeFlags( QStringList * str ) +void FilesAndDirectoriesTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); pathController->writeFlags(str); } -FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( QWidget * parent, const char * name ) - :QWidget(parent, name), controller(new FlagCheckBoxController()), +FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char * name ) + :TQWidget(parent, name), controller(new FlagCheckBoxController()), pathController(new FlagPathEditController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); new FlagPathEdit(this, "", pathController, @@ -144,21 +144,21 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( QWidget * parent, const char * "-FU", i18n("Write units in:")); new FlagPathEdit(this, "", pathController, "-o", i18n("Executable name:"), KFile::File); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(20); new FlagPathEdit(this, "", pathController, "-e", i18n("Location of as and ld programs:")); new FlagPathEdit(this, "", pathController, "-FL", i18n("Dynamic linker executable:"), KFile::File); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(20); new FlagPathEdit(this, "", pathController, "-Fr", i18n("Compiler messages file:"), KFile::File); new FlagPathEdit(this, "", pathController, "-Fe", i18n("Write compiler messages to file:"), KFile::File); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -169,26 +169,26 @@ FilesAndDirectoriesTab2::~FilesAndDirectoriesTab2( ) delete pathController; } -void FilesAndDirectoriesTab2::readFlags( QStringList * str ) +void FilesAndDirectoriesTab2::readFlags( TQStringList * str ) { controller->readFlags(str); pathController->readFlags(str); } -void FilesAndDirectoriesTab2::writeFlags( QStringList * str ) +void FilesAndDirectoriesTab2::writeFlags( TQStringList * str ) { controller->writeFlags(str); pathController->writeFlags(str); } -LanguageTab::LanguageTab( QWidget * parent, const char * name ) - : QWidget(parent, name), controller(new FlagCheckBoxController(QStringList::split(",","-v"))) +LanguageTab::LanguageTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QVButtonGroup *compat_group = new QVButtonGroup(i18n("Pascal Compatibility"), this); + TQVButtonGroup *compat_group = new TQVButtonGroup(i18n("Pascal Compatibility"), this); new FlagCheckBox(compat_group, controller, "-S2", i18n("Switch on Delphi 2 extensions")); new FlagCheckBox(compat_group, controller, @@ -197,20 +197,20 @@ LanguageTab::LanguageTab( QWidget * parent, const char * name ) "-So", i18n("Borland TP 7.0 compatibility mode")); new FlagCheckBox(compat_group, controller, "-Sp", i18n("GNU Pascal compatibility mode")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *ccompat_group = new QVButtonGroup(i18n("C/C++ Compatibility"), this); + TQVButtonGroup *ccompat_group = new TQVButtonGroup(i18n("C/C++ Compatibility"), this); new FlagCheckBox(ccompat_group, controller, "-Sc", i18n("Support C style operators *=, +=, /=, -=")); new FlagCheckBox(ccompat_group, controller, "-Si", i18n("Support C++ style INLINE")); new FlagCheckBox(ccompat_group, controller, "-Sm", i18n("Support C style macros")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *lang_group = new QVButtonGroup(i18n("Language"), this); + TQVButtonGroup *lang_group = new TQVButtonGroup(i18n("Language"), this); new FlagCheckBox(lang_group, controller, "-Sg", i18n("Support the label and goto commands")); new FlagCheckBox(lang_group, controller, @@ -219,7 +219,7 @@ LanguageTab::LanguageTab( QWidget * parent, const char * name ) "-Ss", i18n("Require the name of constructors to be init\n and the name of destructors to be done")); new FlagCheckBox(lang_group, controller, "-St", i18n("Allow the static keyword in objects")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -229,26 +229,26 @@ LanguageTab::LanguageTab( QWidget * parent, const char * name ) delete controller; } -void LanguageTab::readFlags( QStringList * str ) +void LanguageTab::readFlags( TQStringList * str ) { controller->readFlags(str); } -void LanguageTab::writeFlags( QStringList * str ) +void LanguageTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); } -AssemblerTab::AssemblerTab( QWidget * parent, const char * name ) - : QWidget(parent, name), controller(new FlagCheckBoxController()), +AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), asmController(new FlagRadioButtonController) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); // layout->setAutoAdd(true); - QBoxLayout *layout2 = new QHBoxLayout(layout, KDialog::spacingHint()); + TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); - QVButtonGroup *info_group = new QVButtonGroup(i18n("Assembler Info"), this); + TQVButtonGroup *info_group = new TQVButtonGroup(i18n("Assembler Info"), this); new FlagCheckBox(info_group, controller, "-a", i18n("Do not delete assembler files")); new FlagCheckBox(info_group, controller, @@ -258,11 +258,11 @@ AssemblerTab::AssemblerTab( QWidget * parent, const char * name ) new FlagCheckBox(info_group, controller, "-at", i18n("List temporary allocations and deallocations")); layout2->addWidget(info_group); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); //layout->addSpacing(10); - QVButtonGroup *asmkind_group = new QVButtonGroup(i18n("Assembler Reader"), this); - QRadioButton *m_defaultkind = new QRadioButton(i18n("Use default reader"), asmkind_group); + TQVButtonGroup *asmkind_group = new TQVButtonGroup(i18n("Assembler Reader"), this); + TQRadioButton *m_defaultkind = new TQRadioButton(i18n("Use default reader"), asmkind_group); m_defaultkind->setChecked(true); new FlagRadioButton(asmkind_group, asmController, "-Ratt", i18n("AT&T style assembler")); @@ -271,14 +271,14 @@ AssemblerTab::AssemblerTab( QWidget * parent, const char * name ) new FlagRadioButton(asmkind_group, asmController, "-Rdirect", i18n("Direct assembler")); layout2->addWidget(asmkind_group); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *asm_group = new QVButtonGroup(i18n("Assembler Output"), this); + TQVButtonGroup *asm_group = new TQVButtonGroup(i18n("Assembler Output"), this); new FlagCheckBox(asm_group, controller, "-P", i18n("Use pipes instead of files when assembling")); - QRadioButton *m_default = new QRadioButton(i18n("Use default output"), asm_group); + TQRadioButton *m_default = new TQRadioButton(i18n("Use default output"), asm_group); m_default->setChecked(true); new FlagRadioButton(asm_group, asmController, "-Aas", i18n("Use GNU as")); @@ -299,7 +299,7 @@ AssemblerTab::AssemblerTab( QWidget * parent, const char * name ) new FlagRadioButton(asm_group, asmController, "-Apecoff", i18n("Use pecoff")); layout->addWidget(asm_group); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -310,13 +310,13 @@ AssemblerTab::AssemblerTab( QWidget * parent, const char * name ) delete asmController; } -void AssemblerTab::readFlags( QStringList * str ) +void AssemblerTab::readFlags( TQStringList * str ) { controller->readFlags(str); asmController->readFlags(str); } -void AssemblerTab::writeFlags( QStringList * str ) +void AssemblerTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); asmController->writeFlags(str); @@ -324,18 +324,18 @@ void AssemblerTab::writeFlags( QStringList * str ) -DebugOptimTab::DebugOptimTab( QWidget * parent, const char * name ) - : QWidget(parent, name), controller(new FlagCheckBoxController()), +DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), optimController(new FlagRadioButtonController) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); // layout->setAutoAdd(true); - QBoxLayout *layout2 = new QHBoxLayout(layout, KDialog::spacingHint()); + TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); - QBoxLayout *layout3 = new QVBoxLayout(layout2, KDialog::spacingHint()); + TQBoxLayout *layout3 = new TQVBoxLayout(layout2, KDialog::spacingHint()); - QVButtonGroup *debug_group = new QVButtonGroup(i18n("Debugging"), this); + TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this); new FlagCheckBox(debug_group, controller, "-g", i18n("Generate information for GDB"), "-!g"); new FlagCheckBox(debug_group, controller, @@ -347,31 +347,31 @@ DebugOptimTab::DebugOptimTab( QWidget * parent, const char * name ) new FlagCheckBox(debug_group, controller, "-gc", i18n("Generate checks for pointers"), "-!gc"); layout3->addWidget(debug_group); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout3->addSpacing(10); - QVButtonGroup *profile_group = new QVButtonGroup(i18n("Profiling"), this); + TQVButtonGroup *profile_group = new TQVButtonGroup(i18n("Profiling"), this); new FlagCheckBox(profile_group, controller, "-pg", i18n("Generate profiler code for gprof"), "-!pg"); layout3->addWidget(profile_group); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout3->addSpacing(10); - QBoxLayout *layout4 = new QVBoxLayout(layout2, KDialog::spacingHint()); + TQBoxLayout *layout4 = new TQVBoxLayout(layout2, KDialog::spacingHint()); - QVButtonGroup *optim_group1 = new QVButtonGroup(i18n("General Optimization"), this); - m_default = new QRadioButton(i18n("Default"), optim_group1); + TQVButtonGroup *optim_group1 = new TQVButtonGroup(i18n("General Optimization"), this); + m_default = new TQRadioButton(i18n("Default"), optim_group1); m_default->setChecked(true); new FlagRadioButton(optim_group1, optimController, "-Og", i18n("Generate smaller code")); optim1 = new FlagRadioButton(optim_group1, optimController, "-OG", i18n("Generate faster code")); layout4->addWidget(optim_group1); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout4->addSpacing(10); - QVButtonGroup *optim_group2 = new QVButtonGroup(i18n("Optimization Levels"), this); - m_default2 = new QRadioButton(i18n("Default"), optim_group2); + TQVButtonGroup *optim_group2 = new TQVButtonGroup(i18n("Optimization Levels"), this); + m_default2 = new TQRadioButton(i18n("Default"), optim_group2); m_default2->setChecked(true); new FlagRadioButton(optim_group2, optimController, "-O1", i18n("Level 1")); @@ -380,13 +380,13 @@ DebugOptimTab::DebugOptimTab( QWidget * parent, const char * name ) optim2 = new FlagRadioButton(optim_group2, optimController, "-O3", i18n("Level 3")); layout4->addWidget(optim_group2); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout4->addSpacing(10); - QHBoxLayout *layout5 = new QHBoxLayout(layout, KDialog::spacingHint()); + TQHBoxLayout *layout5 = new TQHBoxLayout(layout, KDialog::spacingHint()); - QVButtonGroup *optim_group3 = new QVButtonGroup(i18n("Architecture"), this); - m_default3 = new QRadioButton(i18n("Default"), optim_group3); + TQVButtonGroup *optim_group3 = new TQVButtonGroup(i18n("Architecture"), this); + m_default3 = new TQRadioButton(i18n("Default"), optim_group3); m_default3->setChecked(true); new FlagRadioButton(optim_group3, optimController, "-Op1", i18n("386/486")); @@ -395,23 +395,23 @@ DebugOptimTab::DebugOptimTab( QWidget * parent, const char * name ) new FlagRadioButton(optim_group3, optimController, "-Op2", i18n("PentiumPro/PII/Cyrix 6x86/K6")); layout5->addWidget(optim_group3); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - QVButtonGroup *optim_group4 = new QVButtonGroup(i18n("Another Optimization"), this); + TQVButtonGroup *optim_group4 = new TQVButtonGroup(i18n("Another Optimization"), this); new FlagCheckBox(optim_group4, controller, "-Or", i18n("Use register variables"), "-!Or"); new FlagCheckBox(optim_group4, controller, "-Ou", i18n("Uncertain optimizations"), "-!Ou"); layout5->addWidget(optim_group4); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - QHBoxLayout *layout6 = new QHBoxLayout(layout, KDialog::spacingHint()); - QPushButton *release = new QPushButton(i18n("Release"), this); - QPushButton *debug = new QPushButton(i18n("Debug"), this); + TQHBoxLayout *layout6 = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQPushButton *release = new TQPushButton(i18n("Release"), this); + TQPushButton *debug = new TQPushButton(i18n("Debug"), this); layout6->addWidget(release); layout6->addWidget(debug); - connect(release, SIGNAL(clicked()), this, SLOT(setReleaseOptions())); - connect(debug, SIGNAL(clicked()), this, SLOT(setDebugOptions())); + connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); + connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); layout->addStretch(); } @@ -422,13 +422,13 @@ DebugOptimTab::DebugOptimTab( QWidget * parent, const char * name ) delete optimController; } -void DebugOptimTab::readFlags( QStringList * str ) +void DebugOptimTab::readFlags( TQStringList * str ) { controller->readFlags(str); optimController->readFlags(str); } -void DebugOptimTab::writeFlags( QStringList * str ) +void DebugOptimTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); optimController->writeFlags(str); @@ -439,7 +439,7 @@ void DebugOptimTab::setReleaseOptions() m_default->setChecked(true); m_default2->setChecked(true); // m_default3->setChecked(true); - QStringList sl = QStringList::split(",", "-!g,-!gd,-!gl,-!gh,-!gc,-!pg,-!Ou,-!Or"); + TQStringList sl = TQStringList::split(",", "-!g,-!gd,-!gl,-!gh,-!gc,-!pg,-!Ou,-!Or"); readFlags(&sl); optim1->setChecked(true); optim2->setChecked(true); @@ -447,29 +447,29 @@ void DebugOptimTab::setReleaseOptions() void DebugOptimTab::setDebugOptions() { - QStringList sl = QStringList::split(",", "-g,-gl,-gh,-gc"); + TQStringList sl = TQStringList::split(",", "-g,-gl,-gh,-gc"); readFlags(&sl); m_default->setChecked(true); m_default2->setChecked(true); // m_default3->setChecked(true); } -CodegenTab::CodegenTab( QWidget * parent, const char * name ) - : QWidget(parent, name), controller(new FlagCheckBoxController()), +CodegenTab::CodegenTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QVButtonGroup *compile_group = new QVButtonGroup(i18n("Compile Time Checks"), this); + TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this); new FlagCheckBox(compile_group, controller, "-Sa", i18n("Include assert statements in compiled code")); new FlagCheckBox(compile_group, controller, "-Un", i18n("Do not check the unit name for being the same as the file name")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *run_group = new QVButtonGroup(i18n("Run Time Checks"), this); + TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this); new FlagCheckBox(run_group, controller, "-Cr", i18n("Range checking")); new FlagCheckBox(run_group, controller, @@ -478,21 +478,21 @@ CodegenTab::CodegenTab( QWidget * parent, const char * name ) "-Ci", i18n("Input/Output checking")); new FlagCheckBox(run_group, controller, "-Co", i18n("Integer overflow checking")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); new FlagListEdit(this, ":", listController, "-d", i18n("Conditional defines (delimited by \":\"):")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); new FlagListEdit(this, ":", listController, "-u", i18n("Undefine conditional defines (delimited by \":\"):")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); new FlagSpinEdit(this, 1024, 67107840, 1, 131072, listController, "-Cs", i18n("Stack size:")); new FlagSpinEdit(this, 1024, 67107840, 1, 2097152, listController, "-Ch", i18n("Heap size:")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -503,27 +503,27 @@ CodegenTab::~ CodegenTab( ) delete listController; } -void CodegenTab::readFlags( QStringList * str ) +void CodegenTab::readFlags( TQStringList * str ) { controller->readFlags(str); listController->readFlags(str); } -void CodegenTab::writeFlags( QStringList * str ) +void CodegenTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); listController->writeFlags(str); } -LinkerTab::LinkerTab( QWidget * parent, const char * name ) - : QWidget(parent, name), controller(new FlagCheckBoxController()), +LinkerTab::LinkerTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QBoxLayout *layout2 = new QHBoxLayout(layout, KDialog::spacingHint()); + TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); - QVButtonGroup *link_group = new QVButtonGroup(i18n("Linking Stage"), this); + TQVButtonGroup *link_group = new TQVButtonGroup(i18n("Linking Stage"), this); new FlagCheckBox(link_group, controller, "-CD", i18n("Create dynamic library")); new FlagCheckBox(link_group, controller, @@ -535,9 +535,9 @@ LinkerTab::LinkerTab( QWidget * parent, const char * name ) new FlagCheckBox(link_group, controller, "-s", i18n("Create assembling and linking script")); layout2->addWidget(link_group); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - QVButtonGroup *exec_group = new QVButtonGroup(i18n("Executable Generation"), this); + TQVButtonGroup *exec_group = new TQVButtonGroup(i18n("Executable Generation"), this); new FlagCheckBox(exec_group, controller, "-Xs", i18n("Strip the symbols from the executable")); new FlagCheckBox(exec_group, controller, @@ -549,12 +549,12 @@ LinkerTab::LinkerTab( QWidget * parent, const char * name ) new FlagCheckBox(exec_group, controller, "-Xc", i18n("Link with the C library")); layout2->addWidget(exec_group); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); FlagListEdit *led = new FlagListEdit(this, ":", listController, "-k", i18n("Options passed to the linker (delimited by \":\"):")); layout->addWidget(led); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addStretch(); } @@ -565,25 +565,25 @@ LinkerTab::~LinkerTab( ) delete listController; } -void LinkerTab::readFlags( QStringList * str ) +void LinkerTab::readFlags( TQStringList * str ) { controller->readFlags(str); listController->readFlags(str); } -void LinkerTab::writeFlags( QStringList * str ) +void LinkerTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); listController->writeFlags(str); } -MiscTab::MiscTab( QWidget * parent, const char * name ) - : QWidget(parent, name), controller(new FlagCheckBoxController()), +MiscTab::MiscTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), radioController(new FlagRadioButtonController()), pathController(new FlagPathEditController()), editController(new FlagEditController()) { - QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); new FlagCheckBox(this, controller, @@ -594,21 +594,21 @@ MiscTab::MiscTab( QWidget * parent, const char * name ) "@", i18n("Compiler configuration file:"), KFile::File); new FlagSpinEdit(this, 1, 1000, 1, 50, editController, "-Se", i18n("Stop after the error:")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *browser_group = new QVButtonGroup(i18n("Browser Info"), this); - QRadioButton *m_defaultBrowser = new QRadioButton(i18n("No browser info"), browser_group); + TQVButtonGroup *browser_group = new TQVButtonGroup(i18n("Browser Info"), this); + TQRadioButton *m_defaultBrowser = new TQRadioButton(i18n("No browser info"), browser_group); m_defaultBrowser->setChecked(true); new FlagRadioButton(browser_group, radioController, "-b", i18n("Global browser info")); new FlagRadioButton(browser_group, radioController, "-bl", i18n("Global and local browser info")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); - QVButtonGroup *target_group = new QVButtonGroup(i18n("Target OS"), this); - QRadioButton *m_defaultTarget = new QRadioButton(i18n("Default"), target_group); + TQVButtonGroup *target_group = new TQVButtonGroup(i18n("Target OS"), this); + TQRadioButton *m_defaultTarget = new TQRadioButton(i18n("Default"), target_group); m_defaultTarget->setChecked(true); new FlagRadioButton(target_group, radioController, "-TGO32V1", i18n("DOS and version 1 of the DJ DELORIE extender")); @@ -624,7 +624,7 @@ MiscTab::MiscTab( QWidget * parent, const char * name ) "-TSUNOS", i18n("SunOS/Solaris")); new FlagRadioButton(target_group, radioController, "-TBEOS", i18n("BeOS")); - QApplication::sendPostedEvents(this, QEvent::ChildInserted); + TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); layout->addSpacing(10); layout->addStretch(); @@ -638,7 +638,7 @@ MiscTab::~ MiscTab( ) delete editController; } -void MiscTab::readFlags( QStringList * str ) +void MiscTab::readFlags( TQStringList * str ) { controller->readFlags(str); radioController->readFlags(str); @@ -646,7 +646,7 @@ void MiscTab::readFlags( QStringList * str ) editController->readFlags(str); } -void MiscTab::writeFlags( QStringList * str ) +void MiscTab::writeFlags( TQStringList * str ) { controller->writeFlags(str); radioController->writeFlags(str); diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.h b/languages/pascal/compiler/fpcoptions/optiontabs.h index 56109ae2..b1c4fa8f 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.h +++ b/languages/pascal/compiler/fpcoptions/optiontabs.h @@ -11,7 +11,7 @@ #ifndef OPTIONTABS_H #define OPTIONTABS_H -#include +#include class QSpinBox; class QRadioButton; @@ -24,11 +24,11 @@ class FlagEditController; class FeedbackTab : public QWidget { public: - FeedbackTab( QWidget *parent=0, const char *name=0 ); + FeedbackTab( TQWidget *parent=0, const char *name=0 ); ~FeedbackTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; @@ -37,11 +37,11 @@ private: class FilesAndDirectoriesTab: public QWidget { public: - FilesAndDirectoriesTab( QWidget *parent = 0, const char *name = 0); + FilesAndDirectoriesTab( TQWidget *parent = 0, const char *name = 0); ~FilesAndDirectoriesTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; @@ -51,11 +51,11 @@ private: class FilesAndDirectoriesTab2: public QWidget { public: - FilesAndDirectoriesTab2( QWidget *parent = 0, const char *name = 0); + FilesAndDirectoriesTab2( TQWidget *parent = 0, const char *name = 0); ~FilesAndDirectoriesTab2(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; @@ -65,11 +65,11 @@ private: class LanguageTab : public QWidget { public: - LanguageTab( QWidget *parent=0, const char *name=0 ); + LanguageTab( TQWidget *parent=0, const char *name=0 ); ~LanguageTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; @@ -78,11 +78,11 @@ private: class AssemblerTab : public QWidget { public: - AssemblerTab( QWidget *parent=0, const char *name=0 ); + AssemblerTab( TQWidget *parent=0, const char *name=0 ); ~AssemblerTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; @@ -93,19 +93,19 @@ class DebugOptimTab : public QWidget { Q_OBJECT public: - DebugOptimTab( QWidget *parent=0, const char *name=0 ); + DebugOptimTab( TQWidget *parent=0, const char *name=0 ); ~DebugOptimTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; FlagRadioButtonController *optimController; - QRadioButton *m_default; - QRadioButton *m_default2; - QRadioButton *m_default3; + TQRadioButton *m_default; + TQRadioButton *m_default2; + TQRadioButton *m_default3; FlagRadioButton *optim1; FlagRadioButton *optim2; @@ -117,11 +117,11 @@ private slots: class CodegenTab : public QWidget { public: - CodegenTab( QWidget *parent=0, const char *name=0 ); + CodegenTab( TQWidget *parent=0, const char *name=0 ); ~CodegenTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; @@ -131,11 +131,11 @@ private: class LinkerTab : public QWidget { public: - LinkerTab( QWidget *parent=0, const char *name=0 ); + LinkerTab( TQWidget *parent=0, const char *name=0 ); ~LinkerTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; @@ -145,11 +145,11 @@ private: class MiscTab : public QWidget { public: - MiscTab( QWidget *parent=0, const char *name=0 ); + MiscTab( TQWidget *parent=0, const char *name=0 ); ~MiscTab(); - void readFlags(QStringList *str); - void writeFlags(QStringList *str); + void readFlags(TQStringList *str); + void writeFlags(TQStringList *str); private: FlagCheckBoxController *controller; diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 0c5f96f2..0d8c049b 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -9,9 +9,9 @@ ***************************************************************************/ #include -#include -#include -#include +#include +#include +#include #include #include @@ -47,7 +47,7 @@ typedef KDevGenericFactory PascalSupportFactory; static const KDevPluginInfo data("kdevpascalsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) ) -PascalSupportPart::PascalSupportPart(QObject *parent, const char *name, const QStringList &) +PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &) : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ), d( new PascalSupportPartData() ) { @@ -55,22 +55,22 @@ PascalSupportPart::PascalSupportPart(QObject *parent, const char *name, const QS setXMLFile("kdevpascalsupport.rc"); d->problemReporter = new ProblemReporter( this ); - connect( core(), SIGNAL(configWidget(KDialogBase*)), - d->problemReporter, SLOT(configWidget(KDialogBase*)) ); - - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), - this, SLOT(savedFile(const KURL&)) ); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); - connect( core(), SIGNAL(configWidget(KDialogBase*)), - this, SLOT(configWidget(KDialogBase*)) ); - connect( core( ), SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), + d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); + + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), + this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), + this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); mainWindow()->embedOutputView( d->problemReporter, i18n("Problems"), i18n("problem reporter") ); - QWhatsThis::add(d->problemReporter, i18n("Problem reporter

    This window shows various \"problems\" in your project. " + TQWhatsThis::add(d->problemReporter, i18n("Problem reporter

    This window shows various \"problems\" in your project. " "It displays errors reported by a language parser.")); } @@ -89,17 +89,17 @@ PascalSupportPart::Features PascalSupportPart::features() void PascalSupportPart::projectOpened() { - connect(project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &))); - connect(project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &))); - connect(project(), SIGNAL(projectCompiled()), - this, SLOT(slotProjectCompiled()) ); + connect(project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &))); + connect(project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &))); + connect(project(), TQT_SIGNAL(projectCompiled()), + this, TQT_SLOT(slotProjectCompiled()) ); m_projectFileList = project()->allFiles(); m_projectClosed = false; - QTimer::singleShot(0, this, SLOT(initialParse())); + TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); } void PascalSupportPart::projectClosed() @@ -119,7 +119,7 @@ void PascalSupportPart::projectConfigWidget(KDialogBase *dlg) return; } -void PascalSupportPart::contextMenu(QPopupMenu *popup, const Context *context) +void PascalSupportPart::contextMenu(TQPopupMenu *popup, const Context *context) { Q_UNUSED( popup ); Q_UNUSED( context ); @@ -132,22 +132,22 @@ void PascalSupportPart::savedFile(const KURL &fileName) emit updatedSourceInfo(); } -void PascalSupportPart::addedFilesToProject(const QStringList &fileList) +void PascalSupportPart::addedFilesToProject(const TQStringList &fileList) { - for (QStringList::ConstIterator it = fileList.begin(); it != fileList.end() ;++it) + for (TQStringList::ConstIterator it = fileList.begin(); it != fileList.end() ;++it) { - QString fn = project()->projectDirectory() + "/" + *it; + TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); kapp->processEvents( 500 ); emit addedSourceInfo(fn); } } -void PascalSupportPart::removedFilesFromProject(const QStringList &fileList) +void PascalSupportPart::removedFilesFromProject(const TQStringList &fileList) { - for (QStringList::ConstIterator it = fileList.begin(); it != fileList.end() ;++it) + for (TQStringList::ConstIterator it = fileList.begin(); it != fileList.end() ;++it) { - QString fn = project()->projectDirectory() + "/" + *it; + TQString fn = project()->projectDirectory() + "/" + *it; emit aboutToRemoveSourceInfo(fn); codeModel()->removeFile( codeModel()->fileByName(fn) ); @@ -169,9 +169,9 @@ void PascalSupportPart::initialParse( ) /// @todo Progress indicator! - QStringList files = project()->allFiles(); - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it){ - QString fn = project()->projectDirectory() + "/" + *it; + TQStringList files = project()->allFiles(); + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it){ + TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); kapp->processEvents( 500 ); } @@ -183,7 +183,7 @@ void PascalSupportPart::initialParse( ) } } -void PascalSupportPart::maybeParse( const QString & fileName ) +void PascalSupportPart::maybeParse( const TQString & fileName ) { kdDebug(9013) << "Maybe parse: " << fileName << endl; @@ -195,12 +195,12 @@ void PascalSupportPart::maybeParse( const QString & fileName ) parse( fileName ); } -void PascalSupportPart::parse( const QString & fileName ) +void PascalSupportPart::parse( const TQString & fileName ) { kdDebug(9013) << "PascalSupportPart::parse() -- " << fileName << endl; - std::ifstream stream( QFile::encodeName( fileName ).data() ); - QCString _fn = fileName.utf8(); + std::ifstream stream( TQFile::encodeName( fileName ).data() ); + TQCString _fn = fileName.utf8(); std::string fn( _fn.data() ); PascalLexer lexer( stream ); @@ -249,17 +249,17 @@ KMimeType::List PascalSupportPart::mimeTypes( ) return list; } -QString PascalSupportPart::formatTag( const Tag & inputTag ) +TQString PascalSupportPart::formatTag( const Tag & inputTag ) { Tag tag = inputTag; switch( tag.kind() ) { case Tag::Kind_Namespace: - return QString::fromLatin1("unit ") + tag.name(); + return TQString::fromLatin1("unit ") + tag.name(); case Tag::Kind_Class: - return QString::fromLatin1("class ") + tag.name(); + return TQString::fromLatin1("class ") + tag.name(); case Tag::Kind_Function: case Tag::Kind_FunctionDeclaration: @@ -271,20 +271,20 @@ QString PascalSupportPart::formatTag( const Tag & inputTag ) case Tag::Kind_Variable: case Tag::Kind_VariableDeclaration: { - return QString::fromLatin1("var ") + tag.name(); + return TQString::fromLatin1("var ") + tag.name(); } break; } return tag.name(); } -QString PascalSupportPart::formatModelItem( const CodeModelItem * item, bool shortDescription ) +TQString PascalSupportPart::formatModelItem( const CodeModelItem * item, bool shortDescription ) { if (item->isFunction() || item->isFunctionDefinition() ) { const FunctionModel *model = static_cast(item); - QString function; - QString args; + TQString function; + TQString args; ArgumentList argumentList = model->argumentList(); for (ArgumentList::const_iterator it = argumentList.begin(); it != argumentList.end(); ++it) { @@ -295,7 +295,7 @@ QString PascalSupportPart::formatModelItem( const CodeModelItem * item, bool sho function += model->name() + "(" + args + ")"; if( !shortDescription ) - function += (model->isVirtual() ? QString("virtual; ") : QString("") ) + model->resultType() + " "; + function += (model->isVirtual() ? TQString("virtual; ") : TQString("") ) + model->resultType() + " "; return function; } @@ -309,11 +309,11 @@ QString PascalSupportPart::formatModelItem( const CodeModelItem * item, bool sho else if (item->isArgument()) { const ArgumentModel *model = static_cast(item); - QString arg; + TQString arg; arg += model->name(); arg += ": " + model->type(); if( !shortDescription ) - arg += model->defaultValue().isEmpty() ? QString("") : QString(" = ") + model->defaultValue(); + arg += model->defaultValue().isEmpty() ? TQString("") : TQString(" = ") + model->defaultValue(); return arg.stripWhiteSpace(); } else diff --git a/languages/pascal/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h index 4319d1f9..2cc8089d 100644 --- a/languages/pascal/pascalsupport_part.h +++ b/languages/pascal/pascalsupport_part.h @@ -10,7 +10,7 @@ #ifndef __KDEVPART_PASCALSUPPORT_H__ #define __KDEVPART_PASCALSUPPORT_H__ -#include +#include #include "kdevlanguagesupport.h" class PascalSupportWidget; @@ -23,14 +23,14 @@ class PascalSupportPart : public KDevLanguageSupport { Q_OBJECT public: - PascalSupportPart(QObject *parent, const char *name, const QStringList &); + PascalSupportPart(TQObject *parent, const char *name, const TQStringList &); ~PascalSupportPart(); virtual Features features(); virtual KMimeType::List mimeTypes(); - virtual QString formatTag( const Tag& tag ); - virtual QString formatModelItem( const CodeModelItem *item, bool shortDescription=false ); + virtual TQString formatTag( const Tag& tag ); + virtual TQString formatModelItem( const CodeModelItem *item, bool shortDescription=false ); private slots: void projectOpened(); @@ -38,22 +38,22 @@ private slots: void savedFile(const KURL &fileName); void configWidget(KDialogBase *dlg); void projectConfigWidget(KDialogBase *dlg); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void slotProjectCompiled(); void initialParse(); private: - void maybeParse(const QString &fileName); - void parse(const QString &fileName); + void maybeParse(const TQString &fileName); + void parse(const TQString &fileName); - QGuardedPtr m_widget; + TQGuardedPtr m_widget; bool m_projectClosed; - QStringList m_projectFileList; + TQStringList m_projectFileList; PascalSupportPartData* d; diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index b2c2fee8..30a65739 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -40,23 +40,23 @@ #include -#include -#include -#include +#include +#include +#include #include class ProblemItem: public QListViewItem{ public: - ProblemItem( QListView* parent, const QString& level, const QString& problem, - const QString& file, const QString& line, const QString& column ) - : QListViewItem( parent, level, problem, file, line, column ) {} + ProblemItem( TQListView* parent, const TQString& level, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) + : TQListViewItem( parent, level, problem, file, line, column ) {} - ProblemItem( QListViewItem* parent, const QString& level, const QString& problem, - const QString& file, const QString& line, const QString& column ) - : QListViewItem( parent, level, problem, file, line, column ) {} + ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) + : TQListViewItem( parent, level, problem, file, line, column ) {} - int compare( QListViewItem* item, int column, bool ascending ) const { + int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 3 || column == 4 ){ int a = text( column ).toInt(); int b = item->text( column ).toInt(); @@ -64,13 +64,13 @@ public: return 0; return( a > b ? -1 : 1 ); } - return QListViewItem::compare( item, column, ascending ); + return TQListViewItem::compare( item, column, ascending ); } }; -ProblemReporter::ProblemReporter( PascalSupportPart* part, QWidget* parent, const char* name ) - : QListView( parent, name ), +ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, const char* name ) + : TQListView( parent, name ), m_pascalSupport( part ), m_editor( 0 ), m_document( 0 ), @@ -84,21 +84,21 @@ ProblemReporter::ProblemReporter( PascalSupportPart* part, QWidget* parent, cons //addColumn( i18n("Column") ); setAllColumnsShowFocus( TRUE ); - m_timer = new QTimer( this ); + m_timer = new TQTimer( this ); - connect( part->partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partAdded(KParts::Part*)), - this, SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partRemoved(KParts::Part*)), - this, SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), + this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), + this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, SIGNAL(timeout()), this, SLOT(reparse()) ); + connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); - connect( this, SIGNAL(doubleClicked(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem*)) ); - connect( this, SIGNAL(returnPressed(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem*)) ); + connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -128,7 +128,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) m_editor = dynamic_cast( part ); if( m_editor ) - connect( m_document, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) ); + connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast( part ); @@ -168,9 +168,9 @@ void ProblemReporter::reparse() kdDebug() << "4" << endl; - QListViewItem* current = firstChild(); + TQListViewItem* current = firstChild(); while( current ){ - QListViewItem* i = current; + TQListViewItem* i = current; current = current->nextSibling(); if( i->text(2) == m_filename ) @@ -180,8 +180,8 @@ void ProblemReporter::reparse() kdDebug() << "5" << endl; if( m_markIface ){ - QPtrList marks = m_markIface->marks(); - QPtrListIterator it( marks ); + TQPtrList marks = m_markIface->marks(); + TQPtrListIterator it( marks ); while( it.current() ){ m_markIface->removeMark( it.current()->line, KTextEditor::MarkInterface::markType07 ); ++it; @@ -199,7 +199,7 @@ void ProblemReporter::reparse() kdDebug() << "8" << endl; } -void ProblemReporter::slotSelected( QListViewItem* item ) +void ProblemReporter::slotSelected( TQListViewItem* item ) { KURL url( item->text(2) ); int line = item->text( 3 ).toInt(); @@ -207,8 +207,8 @@ void ProblemReporter::slotSelected( QListViewItem* item ) m_pascalSupport->partController()->editDocument( url, line-1 ); } -void ProblemReporter::reportError( QString message, - QString filename, +void ProblemReporter::reportError( TQString message, + TQString filename, int line, int column ) { if( m_markIface ){ @@ -217,34 +217,34 @@ void ProblemReporter::reportError( QString message, new ProblemItem( this, "error", - message.replace( QRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, - QString::number( line ), - QString::number( column ) ); + TQString::number( line ), + TQString::number( column ) ); } -void ProblemReporter::reportWarning( QString message, - QString filename, +void ProblemReporter::reportWarning( TQString message, + TQString filename, int line, int column ) { new ProblemItem( this, "warning", - message.replace( QRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, - QString::number( line ), - QString::number( column ) ); + TQString::number( line ), + TQString::number( column ) ); } -void ProblemReporter::reportMessage( QString message, - QString filename, +void ProblemReporter::reportMessage( TQString message, + TQString filename, int line, int column ) { - new QListViewItem( this, + new TQListViewItem( this, "message", - message.replace( QRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, - QString::number( line ), - QString::number( column ) ); + TQString::number( line ), + TQString::number( column ) ); } void ProblemReporter::configure() @@ -260,10 +260,10 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) { /// \FIXME adymo: use problem reporter configuration Q_UNUSED(dlg); -/* QVBox *vbox = dlg->addVBoxPage(i18n("Pascal Parsing")); +/* TQVBox *vbox = dlg->addVBoxPage(i18n("Pascal Parsing")); ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); - connect(dlg, SIGNAL(okClicked()), w, SLOT(accept())); - connect(dlg, SIGNAL(okClicked()), this, SLOT(configure()));*/ + connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure()));*/ } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/pascal/problemreporter.h b/languages/pascal/problemreporter.h index 936a63a0..fdb798e8 100644 --- a/languages/pascal/problemreporter.h +++ b/languages/pascal/problemreporter.h @@ -19,7 +19,7 @@ #ifndef PROBLEMSREPORTER_H #define PROBLEMSREPORTER_H -#include +#include class PascalSupportPart; class QTimer; @@ -39,16 +39,16 @@ namespace KTextEditor{ class ProblemReporter: public QListView{ Q_OBJECT public: - ProblemReporter( PascalSupportPart* part, QWidget* parent=0, const char* name=0 ); + ProblemReporter( PascalSupportPart* part, TQWidget* parent=0, const char* name=0 ); virtual ~ProblemReporter(); - virtual void reportError( QString message, QString filename, + virtual void reportError( TQString message, TQString filename, int line, int column ); - virtual void reportWarning( QString message, QString filename, + virtual void reportWarning( TQString message, TQString filename, int line, int column ); - virtual void reportMessage( QString message, QString filename, + virtual void reportMessage( TQString message, TQString filename, int line, int column ); public slots: @@ -61,15 +61,15 @@ private slots: void slotPartRemoved( KParts::Part* ); void slotActivePartChanged( KParts::Part* ); void slotTextChanged(); - void slotSelected( QListViewItem* ); + void slotSelected( TQListViewItem* ); private: PascalSupportPart* m_pascalSupport; KTextEditor::EditInterface* m_editor; KTextEditor::Document* m_document; KTextEditor::MarkInterface* m_markIface; - QTimer* m_timer; - QString m_filename; + TQTimer* m_timer; + TQString m_filename; int m_active; int m_delay; BackgroundParser* m_bgParser; diff --git a/languages/perl/perlconfigwidget.cpp b/languages/perl/perlconfigwidget.cpp index 475ed8af..e41def0c 100644 --- a/languages/perl/perlconfigwidget.cpp +++ b/languages/perl/perlconfigwidget.cpp @@ -11,13 +11,13 @@ #include "perlconfigwidget.h" -#include -#include +#include +#include #include "domutil.h" -PerlConfigWidget::PerlConfigWidget(QDomDocument &projectDom, - QWidget *parent, const char *name) +PerlConfigWidget::PerlConfigWidget(TQDomDocument &projectDom, + TQWidget *parent, const char *name) : PerlConfigWidgetBase(parent, name), dom(projectDom) { interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevperlsupport/run/interpreter")); diff --git a/languages/perl/perlconfigwidget.h b/languages/perl/perlconfigwidget.h index 07364a40..9fbcc804 100644 --- a/languages/perl/perlconfigwidget.h +++ b/languages/perl/perlconfigwidget.h @@ -13,7 +13,7 @@ #define _PERLCONFIGWIDGET_H_ #include "perlconfigwidgetbase.h" -#include +#include class PerlConfigWidget : public PerlConfigWidgetBase @@ -21,14 +21,14 @@ class PerlConfigWidget : public PerlConfigWidgetBase Q_OBJECT public: - PerlConfigWidget( QDomDocument &projectDom, QWidget *parent=0, const char *name=0 ); + PerlConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 ); ~PerlConfigWidget(); public slots: void accept(); private: - QDomDocument &dom; + TQDomDocument &dom; }; #endif diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp index cbb4d18f..cc0a03f9 100644 --- a/languages/perl/perldoc.cpp +++ b/languages/perl/perldoc.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ using namespace KIO; -PerldocProtocol::PerldocProtocol(const QCString &pool, const QCString &app) +PerldocProtocol::PerldocProtocol(const TQCString &pool, const TQCString &app) : SlaveBase("perldoc", pool, app) {} @@ -28,12 +28,12 @@ PerldocProtocol::~PerldocProtocol() void PerldocProtocol::get(const KURL& url) { - QStringList l = QStringList::split('/', url.path()); + TQStringList l = TQStringList::split('/', url.path()); mimeType("text/html"); bool plain = false; - QString cmd = "perldoc "; + TQString cmd = "perldoc "; if (l[0] == "functions") { plain = true; cmd += "-t -f "; @@ -43,7 +43,7 @@ void PerldocProtocol::get(const KURL& url) cmd += KProcess::quote(l[1]); cmd += " | pod2html"; } else { - QCString errstr(i18n("The only existing directories are functions and faq.").local8Bit()); + TQCString errstr(i18n("The only existing directories are functions and faq.").local8Bit()); data(errstr); finished(); return; @@ -52,11 +52,11 @@ void PerldocProtocol::get(const KURL& url) kdDebug() << "Command: " << cmd << endl; if (plain) - data(QCString("

    ")); + data(TQCString("
    ")); FILE *fd = popen(cmd.local8Bit().data(), "r"); char buffer[4090]; - QByteArray array; + TQByteArray array; while (!feof(fd)) { int n = fread(buffer, 1, 2048, fd); @@ -72,7 +72,7 @@ void PerldocProtocol::get(const KURL& url) pclose(fd); if (plain) - data(QCString("
    ")); + data(TQCString("
    ")); finished(); } @@ -80,15 +80,15 @@ void PerldocProtocol::get(const KURL& url) void PerldocProtocol::mimetype(const KURL &url) { - QStringList l = QStringList::split('/', url.path()); + TQStringList l = TQStringList::split('/', url.path()); mimeType((l[0] == "faq")? "text/html" : "text/plain"); finished(); } -QCString PerldocProtocol::errorMessage() +TQCString PerldocProtocol::errorMessage() { - return QCString( "" + i18n("Error in perldoc").local8Bit() + "" ); + return TQCString( "" + i18n("Error in perldoc").local8Bit() + "" ); } diff --git a/languages/perl/perldoc.h b/languages/perl/perldoc.h index 00cced89..4540c045 100644 --- a/languages/perl/perldoc.h +++ b/languages/perl/perldoc.h @@ -1,14 +1,14 @@ #ifndef _PERLDOC_H_ #define _PERLDOC_H_ -#include +#include #include class PerldocProtocol : public KIO::SlaveBase { public: - PerldocProtocol(const QCString &pool, const QCString &app); + PerldocProtocol(const TQCString &pool, const TQCString &app); virtual ~PerldocProtocol(); virtual void get(const KURL& url); @@ -18,8 +18,8 @@ public: protected: void decodeURL(const KURL &url); - void decodePath(QString path); - QCString errorMessage(); + void decodePath(TQString path); + TQCString errorMessage(); }; #endif diff --git a/languages/perl/perlparser.cpp b/languages/perl/perlparser.cpp index a6a5a834..ad0b5de2 100644 --- a/languages/perl/perlparser.cpp +++ b/languages/perl/perlparser.cpp @@ -18,11 +18,11 @@ #include "perlparser.h" #include -#include -#include -#include +#include +#include +#include -perlparser::perlparser(KDevCore* core,CodeModel* model, QString interpreter) { +perlparser::perlparser(KDevCore* core,CodeModel* model, TQString interpreter) { m_core = core; m_model = model; m_interpreter=interpreter; @@ -34,7 +34,7 @@ perlparser::perlparser(KDevCore* core,CodeModel* model, QString interpreter) { perlparser::~perlparser(){ } -const QStringList perlparser::UseFiles() +const TQStringList perlparser::UseFiles() { return m_usefiles; } @@ -43,13 +43,13 @@ void perlparser::initialParse() { m_usefiles.clear(); } -void perlparser::parse(const QString &fileName){ - QFile f(fileName); +void perlparser::parse(const TQString &fileName){ + TQFile f(fileName); if (!f.open(IO_ReadOnly)) return; - QTextStream stream(&f); - QStringList list; - QString rawline; + TQTextStream stream(&f); + TQStringList list; + TQString rawline; while (!stream.eof()) { rawline = stream.readLine(); list.append(rawline.stripWhiteSpace().local8Bit()); @@ -63,23 +63,23 @@ void perlparser::parse(const QString &fileName){ m_model->addFile( m_file ); } -void perlparser::parseLines(QStringList* lines,const QString &fileName) +void perlparser::parseLines(TQStringList* lines,const TQString &fileName) { - QRegExp packagere("^[ \t]*package[ \t]+([+A-Za-z0-9_:]*).*\\;"); - QRegExp basere("^[ \t]*use[ \t]+base[ \t]*\\(\'*\"*([A-Za-z0-9_:]*)"); - QRegExp libre("^[ \t]*use[ \t]+lib[ \t]*\\(\'*\"*([A-Za-z0-9_:]*)"); - QRegExp usere("^[ \t]*use[ \t]+([+A-Za-z0-9_:]*).*\\;"); - QRegExp isare("^[ \t]*@ISA[ \t=qw\\(\'\"]*([A-Za-z0-9_: ]*)"); - QRegExp globalre("^[ \t]*our[ \t]+\\(*([ \t,$%@*+A-Za-z0-9_]*)\\)*.*"); - QRegExp myre("^[ \t]*my[ \t]+\\(*([ \t,$%@*+A-Za-z0-9_]*)\\)*.*"); - QRegExp subre("^[ \t]*sub[ \t]+([A-Za-z0-9_]+)([A-Za-z0-9_]|([ \t]*[{])?)$"); - QRegExp blessre("bless[ \t]*[\\( ]*([,$%@*+A-Za-z0-9_]*).*;"); - QRegExp namere("^[ \t]*([$%@*])([A-Za-z0-9_]*).*$"); - QRegExp privatere("^_([A-Za-z0-9_]*)"); - QRegExp startpod("^=[a-z0-9]+ [a-z0-9]*"); - QRegExp cutpod("^=cut"); - - QString line; + TQRegExp packagere("^[ \t]*package[ \t]+([+A-Za-z0-9_:]*).*\\;"); + TQRegExp basere("^[ \t]*use[ \t]+base[ \t]*\\(\'*\"*([A-Za-z0-9_:]*)"); + TQRegExp libre("^[ \t]*use[ \t]+lib[ \t]*\\(\'*\"*([A-Za-z0-9_:]*)"); + TQRegExp usere("^[ \t]*use[ \t]+([+A-Za-z0-9_:]*).*\\;"); + TQRegExp isare("^[ \t]*@ISA[ \t=qw\\(\'\"]*([A-Za-z0-9_: ]*)"); + TQRegExp globalre("^[ \t]*our[ \t]+\\(*([ \t,$%@*+A-Za-z0-9_]*)\\)*.*"); + TQRegExp myre("^[ \t]*my[ \t]+\\(*([ \t,$%@*+A-Za-z0-9_]*)\\)*.*"); + TQRegExp subre("^[ \t]*sub[ \t]+([A-Za-z0-9_]+)([A-Za-z0-9_]|([ \t]*[{])?)$"); + TQRegExp blessre("bless[ \t]*[\\( ]*([,$%@*+A-Za-z0-9_]*).*;"); + TQRegExp namere("^[ \t]*([$%@*])([A-Za-z0-9_]*).*$"); + TQRegExp privatere("^_([A-Za-z0-9_]*)"); + TQRegExp startpod("^=[a-z0-9]+ [a-z0-9]*"); + TQRegExp cutpod("^=cut"); + + TQString line; //clear all "last" know things m_lastsub=""; @@ -98,7 +98,7 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) bool endpod = false; //check if we are parsing a script or module - QFileInfo fi(fileName); + TQFileInfo fi(fileName); bool inscript =(fi.extension() == "pl"); kdDebug(9016) << "inscript : " << inscript << "," << fi.extension() << endl; @@ -106,7 +106,7 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) addScript(fileName,lineNo,fi.fileName()); } - for ( QStringList::Iterator it = lines->begin(); it != lines->end(); ++it ) { + for ( TQStringList::Iterator it = lines->begin(); it != lines->end(); ++it ) { ++lineNo; line = (*it).local8Bit(); //empty line ? @@ -121,7 +121,7 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) //sub matching if (subre.search(line)>=0){ - QString subname=subre.cap(1); + TQString subname=subre.cap(1); kdDebug(9016) << "subre match [" << subname << "]" << endl; bool prive = privatere.search(subname) >= 0; kdDebug(9016) << "prive match [" << prive << "]" << endl; @@ -136,12 +136,12 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) //our matching if (globalre.search(line)>=0) { //splitup multible ours - QString varlist=globalre.cap(1); + TQString varlist=globalre.cap(1); kdDebug(9016) << "globalre match [" << varlist <<"]" << endl; - QStringList vars=QStringList::split(",",varlist); - for ( QStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { + TQStringList vars=TQStringList::split(",",varlist); + for ( TQStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { if (namere.search(*it)>=0) { - QString var = namere.cap(2); + TQString var = namere.cap(2); kdDebug(9016) << "namere match [" << var << "]" << endl; if (m_lastpackage) { addAttributetoPackage(fileName,lineNo,var); } else { addAttributetoScript(fileName,lineNo,var); } @@ -161,7 +161,7 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) //base matching if ((basere.search(line)>=0) && (!m_inscript)) { - QString parent = basere.cap(1); + TQString parent = basere.cap(1); //create child & parent classes kdDebug(9016) << "basere match [" << parent << "]" << endl; addClass(fileName,lineNo); @@ -169,7 +169,7 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) continue; } else { if (libre.search(line)>=0) { - QString path = libre.cap(1); + TQString path = libre.cap(1); //add lib to INC path list kdDebug(9016) << "libre match [" << path << "]" << endl; m_INClist.append(path); @@ -177,7 +177,7 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) } else { if (usere.search(line)>=0) { //add lib to use list for later parsing - QString lib = usere.cap(1); + TQString lib = usere.cap(1); kdDebug(9016) << "usere match [" << lib << "]" << endl; addUseLib(lib); continue; @@ -186,7 +186,7 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) } //base if ((isare.search(line)>=0) && (!m_inscript)) { - QString parent = isare.cap(1); + TQString parent = isare.cap(1); //create child & parent classes kdDebug(9016) << "isare match [" << parent << "]" << endl; addClass(fileName,lineNo); @@ -195,7 +195,7 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) } //isa if ((packagere.search(line)>=0) && (!m_inscript)) { - QString package=packagere.cap(1); + TQString package=packagere.cap(1); kdDebug(9016) << "packagere match [" << package << "]" << endl; addPackage(fileName,lineNo,package); continue; @@ -204,7 +204,7 @@ void perlparser::parseLines(QStringList* lines,const QString &fileName) } // for lines loop } -void perlparser::addPackage(const QString& fileName ,int lineNr , const QString& name) +void perlparser::addPackage(const TQString& fileName ,int lineNr , const TQString& name) { kdDebug(9016) << "AddPackage [" << name << "]" << endl; NamespaceDom package = m_model->create(); @@ -234,7 +234,7 @@ void perlparser::addPackage(const QString& fileName ,int lineNr , const QString& } -void perlparser::addScript(const QString& fileName ,int lineNr ,const QString& name) +void perlparser::addScript(const TQString& fileName ,int lineNr ,const TQString& name) { kdDebug(9016) << "addScript [" << name << "]" << endl; @@ -269,7 +269,7 @@ void perlparser::addScript(const QString& fileName ,int lineNr ,const QString& n } -void perlparser::addAttributetoPackage(const QString& fileName ,int lineNr ,const QString& name) +void perlparser::addAttributetoPackage(const TQString& fileName ,int lineNr ,const TQString& name) { kdDebug(9016) << "addAttributetoPackage [" << name << "]" << endl; VariableDom var = m_model->create(); @@ -286,7 +286,7 @@ void perlparser::addAttributetoPackage(const QString& fileName ,int lineNr ,cons m_lastattr=name; } -void perlparser::addAttributetoScript(const QString& fileName ,int lineNr ,const QString& name) +void perlparser::addAttributetoScript(const TQString& fileName ,int lineNr ,const TQString& name) { kdDebug(9016) << "addAttributetoScript [" << name << "]" << endl; VariableDom var = m_model->create(); @@ -301,7 +301,7 @@ void perlparser::addAttributetoScript(const QString& fileName ,int lineNr ,const } } -void perlparser::addClass(const QString& fileName ,int lineNr) +void perlparser::addClass(const TQString& fileName ,int lineNr) { kdDebug(9016) << "addClass [ " << m_lastpackagename << " ]" << endl; if (m_lastpackage->hasClass(m_lastpackagename)) { @@ -318,7 +318,7 @@ void perlparser::addClass(const QString& fileName ,int lineNr) } } -void perlparser::addConstructor(const QString& fileName ,int lineNr ,const QString& name) +void perlparser::addConstructor(const TQString& fileName ,int lineNr ,const TQString& name) { kdDebug(9016) << "set Constructor["<< name << "]" << endl; @@ -344,7 +344,7 @@ void perlparser::addConstructor(const QString& fileName ,int lineNr ,const QStri m_lastclass->setStartPosition(lineNr,0); } -void perlparser::addGlobalSub(const QString& fileName ,int lineNr ,const QString& name ,bool privatesub) +void perlparser::addGlobalSub(const TQString& fileName ,int lineNr ,const TQString& name ,bool privatesub) { kdDebug(9016) << "addGlobalSub[ " << name << "]" << endl; @@ -367,7 +367,7 @@ void perlparser::addGlobalSub(const QString& fileName ,int lineNr ,const QString m_lastsub=name; } -void perlparser::addScriptSub(const QString& fileName ,int lineNr ,const QString& name ,bool privatesub) +void perlparser::addScriptSub(const TQString& fileName ,int lineNr ,const TQString& name ,bool privatesub) { kdDebug(9016) << "addScriptSub[ " << name << "]" << endl; @@ -385,7 +385,7 @@ void perlparser::addScriptSub(const QString& fileName ,int lineNr ,const QString m_lastsub=name; } -void perlparser::addClassMethod(const QString& fileName ,int lineNr ,const QString& name ,bool privatesub) +void perlparser::addClassMethod(const TQString& fileName ,int lineNr ,const TQString& name ,bool privatesub) { kdDebug(9016) << "addClassMethod[ " << name << "]" << endl; FunctionDom method = m_model->create(); @@ -406,7 +406,7 @@ void perlparser::addClassMethod(const QString& fileName ,int lineNr ,const QStri m_lastsub=name; } -void perlparser::addPackageSub(const QString& fileName ,int lineNr ,const QString& name ,bool privatesub) +void perlparser::addPackageSub(const TQString& fileName ,int lineNr ,const TQString& name ,bool privatesub) { kdDebug(9016) << "addPackageSub[ " << name << "]" << endl; FunctionDom method = m_model->create(); @@ -424,7 +424,7 @@ void perlparser::addPackageSub(const QString& fileName ,int lineNr ,const QStrin m_lastsub=name; } -void perlparser::addParentClass(const QString& parent) +void perlparser::addParentClass(const TQString& parent) { kdDebug(9016) << "addParentClass[ " << parent << "]" << endl; if (m_lastclass) { @@ -434,7 +434,7 @@ void perlparser::addParentClass(const QString& parent) } } -void perlparser::addUseLib(const QString& lib) +void perlparser::addUseLib(const TQString& lib) { if (!m_model->hasFile(lib)) { if (m_usefiles.findIndex(lib) == -1) { @@ -450,12 +450,12 @@ void perlparser::getPerlINC() { m_INClist.clear(); - QString cmd = "/usr/bin/perl -e\" print join('|',@INC);\""; - QString result; + TQString cmd = "/usr/bin/perl -e\" print join('|',@INC);\""; + TQString result; FILE *fd = popen(cmd.local8Bit().data(), "r"); char buffer[4090]; - QByteArray array; + TQByteArray array; while (!feof(fd)) { int n = fread(buffer, 1, 2048, fd); @@ -464,26 +464,26 @@ void perlparser::getPerlINC() { return; } array.setRawData(buffer, n); - result=QString::QString(array); + result=TQString::TQString(array); array.resetRawData(buffer, n); } pclose(fd); //get INC list so we can use it to parse "use" modules - m_INClist = QStringList::split(QString("|"),result); + m_INClist = TQStringList::split(TQString("|"),result); kdDebug(9016) << "INC " << m_INClist.size() << " "<< result << endl; } -QString perlparser::findLib( const QString& lib) +TQString perlparser::findLib( const TQString& lib) { - QString result; + TQString result; - QString file=lib; - file.replace( QRegExp("::"), QString("/")); + TQString file=lib; + file.replace( TQRegExp("::"), TQString("/")); //find the correct path by using the INC list - QStringList::Iterator inc = m_INClist.begin(); + TQStringList::Iterator inc = m_INClist.begin(); while((inc != m_INClist.end()) && (result.isEmpty()) ) { - QFileInfo fi((*inc) + "/" + file + ".pm"); + TQFileInfo fi((*inc) + "/" + file + ".pm"); if ( fi.exists() ) { result = (*inc) + "/" + file + ".pm"; } diff --git a/languages/perl/perlparser.h b/languages/perl/perlparser.h index 01ded7d8..b536596b 100644 --- a/languages/perl/perlparser.h +++ b/languages/perl/perlparser.h @@ -28,41 +28,41 @@ class perlparser { public: - perlparser(KDevCore* core,CodeModel* model, QString interpreter); + perlparser(KDevCore* core,CodeModel* model, TQString interpreter); perlparser(); ~perlparser(); void initialParse(); - void parse(const QString &fileName); - void parseLines(QStringList* lines,const QString& fileName); - const QStringList UseFiles(); - QString findLib( const QString& lib); + void parse(const TQString &fileName); + void parseLines(TQStringList* lines,const TQString& fileName); + const TQStringList UseFiles(); + TQString findLib( const TQString& lib); private: //global functions to add to ClassStore - void addPackage(const QString& fileName ,int lineNr , const QString& name); - void addAttributetoScript(const QString& fileName ,int lineNr ,const QString& name); - void addAttributetoPackage(const QString& fileName ,int lineNr ,const QString& name); - void addClass(const QString& fileName ,int lineNr ); - void addConstructor(const QString& fileName ,int lineNr ,const QString& methodname); - void addGlobalSub(const QString& fileName ,int lineNr , const QString& name, bool privatesub); - void addScriptSub(const QString& fileName ,int lineNr , const QString& name, bool privatesub); - void addClassMethod(const QString& fileName ,int lineNr , const QString& name , bool privatesub); - void addPackageSub(const QString& fileName ,int lineNr , const QString& name, bool privatesub); - void addParentClass(const QString& parent); - void addScript(const QString& fileName ,int lineNr , const QString& name); - void addUseLib(const QString& lib); + void addPackage(const TQString& fileName ,int lineNr , const TQString& name); + void addAttributetoScript(const TQString& fileName ,int lineNr ,const TQString& name); + void addAttributetoPackage(const TQString& fileName ,int lineNr ,const TQString& name); + void addClass(const TQString& fileName ,int lineNr ); + void addConstructor(const TQString& fileName ,int lineNr ,const TQString& methodname); + void addGlobalSub(const TQString& fileName ,int lineNr , const TQString& name, bool privatesub); + void addScriptSub(const TQString& fileName ,int lineNr , const TQString& name, bool privatesub); + void addClassMethod(const TQString& fileName ,int lineNr , const TQString& name , bool privatesub); + void addPackageSub(const TQString& fileName ,int lineNr , const TQString& name, bool privatesub); + void addParentClass(const TQString& parent); + void addScript(const TQString& fileName ,int lineNr , const TQString& name); + void addUseLib(const TQString& lib); void getPerlINC(); bool m_inpackage; bool m_inscript; bool m_inclass; - QString m_lastsub; - QString m_lastparentclass; - QString m_lastattr; - QString m_lastpackagename; - QString m_lastscriptname; + TQString m_lastsub; + TQString m_lastparentclass; + TQString m_lastattr; + TQString m_lastpackagename; + TQString m_lastscriptname; NamespaceDom m_lastscript; NamespaceDom m_lastpackage; @@ -74,12 +74,12 @@ class perlparser { FileDom m_file; //this willhav a list of INC paths - QStringList m_INClist; + TQStringList m_INClist; //this will get a list off all files "use" in the perl files //and need additional parsing to include the classes in the classview - QStringList m_usefiles; + TQStringList m_usefiles; - QString m_interpreter; + TQString m_interpreter; }; diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index 4305644e..bb9b51c3 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -11,20 +11,20 @@ #include "perlsupportpart.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include "kdevmainwindow.h" @@ -48,42 +48,42 @@ typedef KDevGenericFactory PerlSupportFactory; static const KDevPluginInfo data("kdevperlsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) ) -PerlSupportPart::PerlSupportPart(QObject *parent, const char *name, const QStringList &) +PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &) : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart") { setInstance(PerlSupportFactory::instance()); setXMLFile("kdevperlsupport.rc"); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), - this, SLOT(savedFile(const KURL&)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), + this, TQT_SLOT(savedFile(const KURL&)) ); KAction *action; action = new KAction( i18n("Execute Main Program"), "exec", 0, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the Perl program") ); action = new KAction( i18n("Execute String..."), "exec", 0, - this, SLOT(slotExecuteString()), + this, TQT_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as Perl code") ); action = new KAction( i18n("Start Perl Interpreter"), "exec", 0, - this, SLOT(slotStartInterpreter()), + this, TQT_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the Perl interpreter without a program") ); action = new KAction( i18n("Find Perl Function Documentation..."), 0, - this, SLOT(slotPerldocFunction()), + this, TQT_SLOT(slotPerldocFunction()), actionCollection(), "help_perldocfunction" ); action->setToolTip( i18n("Show the documentation page of a Perl function") ); action = new KAction( i18n("Find Perl FAQ Entry..."), 0, - this, SLOT(slotPerldocFAQ()), + this, TQT_SLOT(slotPerldocFAQ()), actionCollection(), "help_perldocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); @@ -106,14 +106,14 @@ void PerlSupportPart::projectOpened() { kdDebug(9007) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - QTimer::singleShot(0, this, SLOT(initialParse())); + TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); } @@ -121,11 +121,11 @@ void PerlSupportPart::projectClosed() { } -void PerlSupportPart::maybeParse(const QString fileName) +void PerlSupportPart::maybeParse(const TQString fileName) { - QFileInfo fi(fileName); - QString path = fi.filePath(); - QString extension = fi.extension(); + TQFileInfo fi(fileName); + TQString path = fi.filePath(); + TQString extension = fi.extension(); if (extension == "pl" || extension == "pm") { kdDebug(9016) << "maybe " << fileName << endl; removeWithReference(fileName); @@ -134,11 +134,11 @@ void PerlSupportPart::maybeParse(const QString fileName) } } -void PerlSupportPart::addedFilesToProject(const QStringList &fileList) +void PerlSupportPart::addedFilesToProject(const TQStringList &fileList) { kdDebug(9016) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { @@ -147,13 +147,13 @@ void PerlSupportPart::addedFilesToProject(const QStringList &fileList) } -void PerlSupportPart::removedFilesFromProject(const QStringList &fileList) +void PerlSupportPart::removedFilesFromProject(const TQStringList &fileList) { kdDebug(9016) << "removedFilesFromProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); removeWithReference(fileName); } emit updatedSourceInfo(); @@ -180,9 +180,9 @@ KDevLanguageSupport::Features PerlSupportPart::features() // return Functions; } -QString PerlSupportPart::interpreter() +TQString PerlSupportPart::interpreter() { - QString prog = DomUtil::readEntry(*projectDom(), "/kdevperlsupport/run/interpreter"); + TQString prog = DomUtil::readEntry(*projectDom(), "/kdevperlsupport/run/interpreter"); if (prog.isEmpty()) prog = "perl"; @@ -190,18 +190,18 @@ QString PerlSupportPart::interpreter() } -void PerlSupportPart::startApplication(const QString &program) +void PerlSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevperlsupport/run/terminal"); if (KDevAppFrontend *appFrontend = extension("KDevelop/AppFrontend")) - appFrontend->startAppCommand(QString::QString(), program, inTerminal); + appFrontend->startAppCommand(TQString::TQString(), program, inTerminal); } void PerlSupportPart::slotExecute() { - QString program = project()->mainProgram(); - QString cmd = interpreter() + " " + program; + TQString program = project()->mainProgram(); + TQString cmd = interpreter() + " " + program; startApplication(cmd); } @@ -215,7 +215,7 @@ void PerlSupportPart::slotStartInterpreter() void PerlSupportPart::slotExecuteString() { bool ok; - QString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), QString::null, &ok, 0); + TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString::null, &ok, 0); if (ok) { cmd.prepend("'"); cmd.append("'"); @@ -227,9 +227,9 @@ void PerlSupportPart::slotExecuteString() void PerlSupportPart::slotPerldocFunction() { bool ok; - QString key = KInputDialog::getText(i18n("Show Perl Documentation"), i18n("Show Perl documentation for function:"), "", &ok, 0); + TQString key = KInputDialog::getText(i18n("Show Perl Documentation"), i18n("Show Perl documentation for function:"), "", &ok, 0); if (ok && !key.isEmpty()) { - QString url = "perldoc:functions/"; + TQString url = "perldoc:functions/"; url += key; partController()->showDocument(KURL(url)); } @@ -239,9 +239,9 @@ void PerlSupportPart::slotPerldocFunction() void PerlSupportPart::slotPerldocFAQ() { bool ok; - QString key = KInputDialog::getText(i18n("Show FAQ Entry"), i18n("Show FAQ entry for keyword:"), "", &ok, 0); + TQString key = KInputDialog::getText(i18n("Show FAQ Entry"), i18n("Show FAQ entry for keyword:"), "", &ok, 0); if (ok && !key.isEmpty()) { - QString url = "perldoc:faq/"; + TQString url = "perldoc:faq/"; url += key; partController()->showDocument(KURL(url)); } @@ -265,17 +265,17 @@ void PerlSupportPart::initialParse() kapp->processEvents( ); kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); + TQStringList files = project()->allFiles(); m_parser->initialParse(); //progress bar - QProgressBar* bar = new QProgressBar( files.count( ), mainWindow( )->statusBar( ) ); + TQProgressBar* bar = new TQProgressBar( files.count( ), mainWindow( )->statusBar( ) ); bar->setMinimumWidth( 120 ); bar->setCenterIndicator( true ); mainWindow( )->statusBar( )->addWidget( bar ); bar->show( ); int n = 0; - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) { + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { // kdDebug(9016) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; maybeParse(project()->projectDirectory() + "/" + *it); //update progress bar @@ -297,7 +297,7 @@ void PerlSupportPart::initialParse() } } -void PerlSupportPart::removeWithReference( const QString & fileName ) +void PerlSupportPart::removeWithReference( const TQString & fileName ) { kdDebug(9016) << "remove with references: " << fileName << endl; //m_timestamp.remove( fileName ); @@ -312,11 +312,11 @@ void PerlSupportPart::parseUseFiles() { kdDebug(9016) << "parse addional libs" << endl; return; - QString filename; - QStringList m_usefiles = m_parser->UseFiles(); + TQString filename; + TQStringList m_usefiles = m_parser->UseFiles(); //parse addional use files - for (QStringList::Iterator it = m_usefiles.begin(); it != m_usefiles.end() ;++it) + for (TQStringList::Iterator it = m_usefiles.begin(); it != m_usefiles.end() ;++it) { filename = m_parser->findLib(*it); //if something found , parse it diff --git a/languages/perl/perlsupportpart.h b/languages/perl/perlsupportpart.h index 91765a47..11a5f417 100644 --- a/languages/perl/perlsupportpart.h +++ b/languages/perl/perlsupportpart.h @@ -21,7 +21,7 @@ class PerlSupportPart : public KDevLanguageSupport Q_OBJECT public: - PerlSupportPart( QObject *parent, const char *name, const QStringList & ); + PerlSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~PerlSupportPart(); protected: @@ -32,8 +32,8 @@ private slots: void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void slotExecute(); void slotExecuteString(); void slotStartInterpreter(); @@ -44,12 +44,12 @@ private slots: void slotPerldocFAQ(); private: - QString interpreter(); - void startApplication(const QString &program); - void maybeParse(const QString fileName); - void parse(const QString &fileName); - void parseLines(QStringList* lines,const QString& fileName); - void removeWithReference( const QString & fileName ); + TQString interpreter(); + void startApplication(const TQString &program); + void maybeParse(const TQString fileName); + void parse(const TQString &fileName); + void parseLines(TQStringList* lines,const TQString& fileName); + void removeWithReference( const TQString & fileName ); void parseUseFiles(); //Perl Parser perlparser* m_parser; diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index c9bd7213..b2b1eb33 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include @@ -36,7 +36,7 @@ using namespace std; -PHPCodeCompletion::PHPCodeCompletion(PHPSupportPart *phpSupport, PHPConfigData *config) : QObject(), m_cursorInterface(0), m_codeInterface(0), m_editInterface(0), m_selectionInterface(0) { +PHPCodeCompletion::PHPCodeCompletion(PHPSupportPart *phpSupport, PHPConfigData *config) : TQObject(), m_cursorInterface(0), m_codeInterface(0), m_editInterface(0), m_selectionInterface(0) { m_phpSupport = phpSupport; m_config = config; @@ -52,21 +52,21 @@ PHPCodeCompletion::~PHPCodeCompletion(){ void PHPCodeCompletion::readGlobalPHPFunctionsFile(){ KStandardDirs *dirs = PHPSupportFactory::instance()->dirs(); - QString phpFuncFile = dirs->findResource("data","kdevphpsupport/phpfunctions"); - QRegExp lineReg(":([0-9A-Za-z_]+) ([0-9A-Za-z_]+)\\((.*)\\)"); + TQString phpFuncFile = dirs->findResource("data","kdevphpsupport/phpfunctions"); + TQRegExp lineReg(":([0-9A-Za-z_]+) ([0-9A-Za-z_]+)\\((.*)\\)"); FunctionCompletionEntry e; - QFile f(phpFuncFile); + TQFile f(phpFuncFile); if ( f.open(IO_ReadOnly) ) { // file opened successfully - QTextStream t( &f ); // use a text stream - QString s; + TQTextStream t( &f ); // use a text stream + TQString s; while ( !t.eof() ) { // until end of file... s = t.readLine(); // line of text excluding '\n' if (lineReg.search(s.local8Bit()) != -1) { e.prefix = lineReg.cap(1); e.text = lineReg.cap(2); - e.postfix = "(" + QString(lineReg.cap(3)) + ")"; - e.prototype = QString(lineReg.cap(1)) + " " + QString(lineReg.cap(2)) + "(" + QString(lineReg.cap(3)) + ")"; + e.postfix = "(" + TQString(lineReg.cap(3)) + ")"; + e.prototype = TQString(lineReg.cap(1)) + " " + TQString(lineReg.cap(2)) + "(" + TQString(lineReg.cap(3)) + ")"; m_globalFunctions.append(e); } } @@ -119,11 +119,11 @@ void PHPCodeCompletion::setActiveEditorPart(KParts::Part *part) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice -// connect(part->widget(), SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChanged())); - connect( part, SIGNAL(textChanged()), this, SLOT(cursorPositionChanged()) ); - connect(part->widget(), SIGNAL(argHintHidden()), this, SLOT(argHintHided())); - connect(part->widget(), SIGNAL(completionAborted()), this, SLOT(completionBoxHided())); - connect(part->widget(), SIGNAL(completionDone()), this, SLOT(completionBoxHided())); +// connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect( part, TQT_SIGNAL(textChanged()), this, TQT_SLOT(cursorPositionChanged()) ); + connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHided())); + connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxHided())); + connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHided())); } void PHPCodeCompletion::cursorPositionChanged(){ @@ -135,7 +135,7 @@ void PHPCodeCompletion::cursorPositionChanged(){ kdDebug(9018) << "cursorPositionChanged:" << line << ":" << col << endl; m_currentLine = line; - QString lineStr = m_editInterface->textLine(line); + TQString lineStr = m_editInterface->textLine(line); if (lineStr.isNull() || lineStr.isEmpty()) { return; } @@ -147,11 +147,11 @@ void PHPCodeCompletion::cursorPositionChanged(){ if (m_config->getCodeHinting()) { int pos1 = lineStr.findRev("(", col - 1); - int pos2 = lineStr.findRev(QRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1); + int pos2 = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1); int pos3 = lineStr.findRev(")", col); if (pos1 > pos2 && pos1 != -1 && pos3 < pos1) { - QString line = lineStr.mid(pos2 + 1, pos1 - pos2 - 1).stripWhiteSpace(); + TQString line = lineStr.mid(pos2 + 1, pos1 - pos2 - 1).stripWhiteSpace(); checkForArgHint(line, col); kdDebug(9018) << "end checkForArgHint" << endl; } @@ -163,8 +163,8 @@ void PHPCodeCompletion::cursorPositionChanged(){ return; } - int pos = lineStr.findRev(QRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); - QString line = lineStr.mid(pos + 1, col - pos).stripWhiteSpace(); + int pos = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); + TQString line = lineStr.mid(pos + 1, col - pos).stripWhiteSpace(); if (checkForVariable(line, col)) { kdDebug(9018) << "end checkForVariable" << endl; @@ -180,7 +180,7 @@ kdDebug(9018) << "end checkForGlobalFunction" << endl; return; } - pos = lineStr.stripWhiteSpace().findRev(QRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); + pos = lineStr.stripWhiteSpace().findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); line = lineStr.mid(pos + 1, col - pos); if (checkForNew(line, col)) { @@ -196,7 +196,7 @@ kdDebug(9018) << "end checkFor" << endl; } } -bool PHPCodeCompletion::showCompletionBox(QValueList list, unsigned long max) { +bool PHPCodeCompletion::showCompletionBox(TQValueList list, unsigned long max) { if (list.count() > 0) { if (list.count() == 1) { KTextEditor::CompletionEntry e = list.first(); @@ -210,19 +210,19 @@ bool PHPCodeCompletion::showCompletionBox(QValueList list; + TQValueList list; if (line.find("::") == -1) return false; - QRegExp Class("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); + TQRegExp Class("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); Class.setCaseSensitive(FALSE); if (Class.search(line) != -1) { - QString classname = Class.cap(1); - QString function = Class.cap(2); + TQString classname = Class.cap(1); + TQString function = Class.cap(2); ClassList classList = getClassByName(classname); @@ -248,8 +248,8 @@ bool PHPCodeCompletion::checkForStaticFunction(QString line, int col) { } if (nClass->baseClassList().count() != 0) { - QStringList base = nClass->baseClassList(); - QStringList::Iterator nameIt; + TQStringList base = nClass->baseClassList(); + TQStringList::Iterator nameIt; for (nameIt = base.begin(); nameIt != base.end(); ++nameIt) { ClassList baseList = getClassByName(*nameIt); ClassList::Iterator baseIt; @@ -263,14 +263,14 @@ bool PHPCodeCompletion::checkForStaticFunction(QString line, int col) { return false; } -bool PHPCodeCompletion::checkForNew(QString line, int col){ +bool PHPCodeCompletion::checkForNew(TQString line, int col){ kdDebug(9018) << "checkForNew" << endl; - QValueList list; + TQValueList list; if (line.find("new ", 0, FALSE) == -1) return false; - QRegExp New("[& \t]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); + TQRegExp New("[& \t]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); New.setCaseSensitive(FALSE); if (New.search(line) != -1) { @@ -293,14 +293,14 @@ bool PHPCodeCompletion::checkForNew(QString line, int col){ return false; } -bool PHPCodeCompletion::checkForExtends(QString line, int col){ +bool PHPCodeCompletion::checkForExtends(TQString line, int col){ kdDebug(9018) << "checkForExtends" << endl; - QValueList list; + TQValueList list; if (line.find("extends", 0, FALSE) == -1) return false; - QRegExp extends("[ \t]*extends[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); + TQRegExp extends("[ \t]*extends[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); extends.setCaseSensitive(FALSE); if (extends.search(line) != -1) { @@ -311,10 +311,10 @@ bool PHPCodeCompletion::checkForExtends(QString line, int col){ return false; } -bool PHPCodeCompletion::checkForVariable(QString line, int col){ +bool PHPCodeCompletion::checkForVariable(TQString line, int col){ kdDebug(9018) << "checkForVariable" << endl; - QValueList list; - QString args; + TQValueList list; + TQString args; if (line.find("->") == -1) { return false; @@ -326,10 +326,10 @@ bool PHPCodeCompletion::checkForVariable(QString line, int col){ line = line.mid(0, pos); } - QStringList vars = QStringList::split("->", line); - QString classname; + TQStringList vars = TQStringList::split("->", line); + TQString classname; - for ( QStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { + for ( TQStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { classname = getClassName(*it, classname); } @@ -343,9 +343,9 @@ bool PHPCodeCompletion::checkForVariable(QString line, int col){ return showCompletionBox(list, args.length()); } -bool PHPCodeCompletion::checkForGlobalFunction(QString line, int col) { +bool PHPCodeCompletion::checkForGlobalFunction(TQString line, int col) { kdDebug(9018) << "checkForGlobalFunction(" + line + "," << col << endl; - QValueList list; + TQValueList list; if (line.length() < 3) return false; @@ -354,9 +354,9 @@ bool PHPCodeCompletion::checkForGlobalFunction(QString line, int col) { return showCompletionBox(list, line.length()); } -QValueList PHPCodeCompletion::getClasses(QString name) { - QValueList list; - QStringList added; +TQValueList PHPCodeCompletion::getClasses(TQString name) { + TQValueList list; + TQStringList added; ClassList classList = m_model->globalNamespace()->classList(); ClassList::Iterator classIt; @@ -365,7 +365,7 @@ QValueList PHPCodeCompletion::getClasses(QString n if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, FALSE)) { KTextEditor::CompletionEntry e; - QStringList::Iterator it = added.find(nClass->name()); + TQStringList::Iterator it = added.find(nClass->name()); if (it == added.end()) { e.text = nClass->name(); list.append(e); @@ -376,12 +376,12 @@ QValueList PHPCodeCompletion::getClasses(QString n return list; } -QValueList PHPCodeCompletion::getFunctionsAndVars(QString classname, QString function) { +TQValueList PHPCodeCompletion::getFunctionsAndVars(TQString classname, TQString function) { kdDebug(9018) << "getFunctionsAndVars " << classname << endl; - QValueList list; + TQValueList list; if (classname.isEmpty()) { - QValueList::Iterator it; + TQValueList::Iterator it; for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) { if((*it).text.startsWith(function, FALSE)){ KTextEditor::CompletionEntry e; @@ -440,8 +440,8 @@ QValueList PHPCodeCompletion::getFunctionsAndVars( } if (nClass->baseClassList().count() != 0) { - QStringList base = nClass->baseClassList(); - QStringList::Iterator nameIt; + TQStringList base = nClass->baseClassList(); + TQStringList::Iterator nameIt; for (nameIt = base.begin(); nameIt != base.end(); ++nameIt) { ClassList baseList = getClassByName(*nameIt); ClassList::Iterator baseIt; @@ -453,12 +453,12 @@ QValueList PHPCodeCompletion::getFunctionsAndVars( return list; } -QStringList PHPCodeCompletion::getArguments(QString classname, QString function) { +TQStringList PHPCodeCompletion::getArguments(TQString classname, TQString function) { kdDebug(9018) << "getArguments " << function << endl; - QStringList list; + TQStringList list; if (classname.isEmpty()) { - QValueList::Iterator it; + TQValueList::Iterator it; for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) { if((*it).text.lower() == function.lower()){ KTextEditor::CompletionEntry e = (*it); @@ -472,7 +472,7 @@ QStringList PHPCodeCompletion::getArguments(QString classname, QString function) if ((*methodIt)->name().lower() == function.lower()){ KTextEditor::CompletionEntry e; ArgumentDom pArgs; - QString args = "()"; + TQString args = "()"; ArgumentDom pArg = (*methodIt)->argumentList().first(); if (pArgs) @@ -500,8 +500,8 @@ QStringList PHPCodeCompletion::getArguments(QString classname, QString function) } if (nClass->baseClassList().count() != 0) { - QStringList base = nClass->baseClassList(); - QStringList::Iterator nameIt; + TQStringList base = nClass->baseClassList(); + TQStringList::Iterator nameIt; for (nameIt = base.begin(); nameIt != base.end(); ++nameIt) { ClassList baseList = getClassByName(*nameIt); ClassList::Iterator baseIt; @@ -514,22 +514,22 @@ QStringList PHPCodeCompletion::getArguments(QString classname, QString function) return list; } -QString PHPCodeCompletion::getCurrentClassName() { +TQString PHPCodeCompletion::getCurrentClassName() { kdDebug(9018) << "getCurrentClassName" << endl; - QRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); + TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); Class.setCaseSensitive(FALSE); for(int i = m_currentLine; i >= 0; i--){ - QString line = m_editInterface->textLine(i); + TQString line = m_editInterface->textLine(i); if (!line.isNull()) { if (Class.search(line) != -1) return Class.cap(2); } } - return QString::null; + return TQString::null; } -QString PHPCodeCompletion::getClassName(QString varName, QString classname) { +TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) { kdDebug(9018) << "getClassName " << varName << "::" << classname << endl; if (varName.find("$") == 0) @@ -557,7 +557,7 @@ QString PHPCodeCompletion::getClassName(QString varName, QString classname) { FunctionList::Iterator funcIt; for (funcIt = funcList.begin(); funcIt != funcList.end(); ++funcIt) { - if (QString((*funcIt)->name().lower() + "(") == varName.lower()) + if (TQString((*funcIt)->name().lower() + "(") == varName.lower()) return (*funcIt)->resultType(); } @@ -573,23 +573,23 @@ QString PHPCodeCompletion::getClassName(QString varName, QString classname) { kdDebug(9018) << "Need " << classname << " " << varName << endl; /* /// @fixme peut devenir recursif voir xbutton.php ligne 204 - QRegExp createmember("\\" + varName + "[ \t]*=[ \t]*(.*)[ \t]*;"); + TQRegExp createmember("\\" + varName + "[ \t]*=[ \t]*(.*)[ \t]*;"); for(int i = m_currentLine; i >= 0; i--){ - QString line = m_editInterface->textLine(i); + TQString line = m_editInterface->textLine(i); if (!line.isNull() && line.find(varName,0 , FALSE) != -1) { if (createmember.search(line) != -1) { - QString right = createmember.cap(1).stripWhiteSpace(); + TQString right = createmember.cap(1).stripWhiteSpace(); - QStringList vars = QStringList::split("->", right); - for ( QStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { - QString objet = *it; + TQStringList vars = TQStringList::split("->", right); + for ( TQStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { + TQString objet = *it; ++it; if (it == vars.end()) break; - QString var = *it; + TQString var = *it; if (objet.lower() == "$this") objet = this->getCurrentClassName(); @@ -597,9 +597,9 @@ QString PHPCodeCompletion::getClassName(QString varName, QString classname) { classname = getClassName(var, objet); NamespaceDom varns = m_model->globalNamespace()->namespaceByName("varsns"); - QString fromns; + TQString fromns; if (varns) { - QString name = objet + "::" + var; + TQString name = objet + "::" + var; kdDebug(9018) << name << endl; VariableDom nVar = varns->variableByName(name); fromns = nVar->type(); @@ -618,8 +618,8 @@ QString PHPCodeCompletion::getClassName(QString varName, QString classname) { return ""; } -QValueList PHPCodeCompletion::getClassByName(QString classname) { - QValueList CList; +TQValueList PHPCodeCompletion::getClassByName(TQString classname) { + TQValueList CList; ClassList classList = m_model->globalNamespace()->classList(); @@ -632,21 +632,21 @@ QValueList PHPCodeCompletion::getClassByName(QString classname) { return CList; } -bool PHPCodeCompletion::checkForArgHint(QString line, int col) { +bool PHPCodeCompletion::checkForArgHint(TQString line, int col) { kdDebug(9018) << "checkForArgHint" << endl; - QValueList list; - QStringList argsList; + TQValueList list; + TQStringList argsList; if (m_argWidgetShow == true) return false; if (line.find("::") != -1) { - QRegExp Static("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); + TQRegExp Static("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); Static.setCaseSensitive(FALSE); if (Static.search(line) != -1) { - QString classname = Static.cap(1); - QString function = Static.cap(2); + TQString classname = Static.cap(1); + TQString function = Static.cap(2); argsList = getArguments(classname, function); @@ -661,16 +661,16 @@ bool PHPCodeCompletion::checkForArgHint(QString line, int col) { if (line.findRev("->") != -1) { int pos1 = line.findRev("->"); - QString classname; - QString function = line.mid(pos1 + 2); + TQString classname; + TQString function = line.mid(pos1 + 2); line = line.mid(0, pos1); kdDebug(9018) << "checkForArgHint 2 " << line << endl; - QStringList vars = QStringList::split("->", line); + TQStringList vars = TQStringList::split("->", line); - for ( QStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { + for ( TQStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) { kdDebug(9018) << "for " << line << endl; classname = getClassName(*it, classname); kdDebug(9018) << "next " << line << endl; @@ -705,7 +705,7 @@ kdDebug(9018) << "checkForArgHint 0 " << line << endl; return false; } -void PHPCodeCompletion::setStatusBar(QString expr, QString type) { +void PHPCodeCompletion::setStatusBar(TQString expr, TQString type) { m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").arg(expr).arg(type), 1000 ); } diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h index 41d79934..505bdcbd 100644 --- a/languages/php/phpcodecompletion.h +++ b/languages/php/phpcodecompletion.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include @@ -42,10 +42,10 @@ class PHPConfigData; class FunctionCompletionEntry : public KTextEditor::CompletionEntry { public: - QString prototype; + TQString prototype; }; -class PHPCodeCompletion : public QObject { +class PHPCodeCompletion : public TQObject { Q_OBJECT public: @@ -61,29 +61,29 @@ protected slots: void completionBoxHided(); protected: - bool showCompletionBox(QValueList list, unsigned long max); + bool showCompletionBox(TQValueList list, unsigned long max); - bool checkForVariable(QString line, int col); - bool checkForStaticFunction(QString line, int col); - bool checkForNew(QString line, int col); - bool checkForExtends(QString line, int col); - bool checkForGlobalFunction(QString line, int col); + bool checkForVariable(TQString line, int col); + bool checkForStaticFunction(TQString line, int col); + bool checkForNew(TQString line, int col); + bool checkForExtends(TQString line, int col); + bool checkForGlobalFunction(TQString line, int col); - bool checkForArgHint(QString line, int col); + bool checkForArgHint(TQString line, int col); - QValueList getClasses(QString name); - QValueList getFunctionsAndVars(QString classname, QString str); - QStringList getArguments(QString classname, QString function); - QString getCurrentClassName(); - QString getClassName(QString varName, QString classname); - QValueList getClassByName(QString classname); + TQValueList getClasses(TQString name); + TQValueList getFunctionsAndVars(TQString classname, TQString str); + TQStringList getArguments(TQString classname, TQString function); + TQString getCurrentClassName(); + TQString getClassName(TQString varName, TQString classname); + TQValueList getClassByName(TQString classname); void readGlobalPHPFunctionsFile(); - void setStatusBar(QString expr, QString type); + void setStatusBar(TQString expr, TQString type); private: int m_currentLine; - QValueList m_globalFunctions; + TQValueList m_globalFunctions; PHPSupportPart* m_phpSupport; PHPConfigData* m_config; @@ -97,7 +97,7 @@ protected: KTextEditor::ViewCursorInterface *m_cursorInterface; KTextEditor::SelectionInterface *m_selectionInterface; - QString findDeclaration(QString name, int line = -1); + TQString findDeclaration(TQString name, int line = -1); }; #endif diff --git a/languages/php/phpconfigdata.cpp b/languages/php/phpconfigdata.cpp index 45f27a79..00baec12 100644 --- a/languages/php/phpconfigdata.cpp +++ b/languages/php/phpconfigdata.cpp @@ -22,8 +22,8 @@ #include "domutil.h" #include -PHPConfigData::PHPConfigData(QDomDocument* dom) { - QString file = KStandardDirs::findExe("php"); +PHPConfigData::PHPConfigData(TQDomDocument* dom) { + TQString file = KStandardDirs::findExe("php"); if (file.isEmpty()) file = "/usr/local/bin/php"; diff --git a/languages/php/phpconfigdata.h b/languages/php/phpconfigdata.h index 0c7a49eb..49c49da8 100644 --- a/languages/php/phpconfigdata.h +++ b/languages/php/phpconfigdata.h @@ -20,15 +20,15 @@ #ifndef PHPCONFIGDATA_H #define PHPCONFIGDATA_H -#include -#include -#include +#include +#include +#include /** *@author Sandy Meier */ -class PHPConfigData : public QObject { +class PHPConfigData : public TQObject { Q_OBJECT signals: @@ -38,7 +38,7 @@ public: enum InvocationMode {Web=1,Shell=2}; enum StartupFileMode {Current=1,Default=2}; - PHPConfigData(QDomDocument* document); + PHPConfigData(TQDomDocument* document); ~PHPConfigData(); /** returns true if the configuration is ok, false if something is missing @@ -57,43 +57,43 @@ public: } // web - QString getWebURL() { + TQString getWebURL() { return webURL; } - void setWebURL(QString weburl) { + void setWebURL(TQString weburl) { webURL = weburl; } // shell - QString getPHPExecPath() { + TQString getPHPExecPath() { return phpExePath; } - void setPHPExePath(QString path) { + void setPHPExePath(TQString path) { phpExePath = path; } // config - QString getPHPIniPath() { + TQString getPHPIniPath() { return phpIniPath; } - void setPHPIniPath(QString path) { + void setPHPIniPath(TQString path) { phpIniPath = path; } // options - QString getPHPIncludePath() { + TQString getPHPIncludePath() { return phpIncludePath; } - void setPHPIncludePath(QString path) { + void setPHPIncludePath(TQString path) { phpIncludePath = path; } - QString getStartupFile() { + TQString getStartupFile() { return phpStartupFile; } - void setStartupFile(QString defaultFile) { + void setStartupFile(TQString defaultFile) { phpStartupFile = defaultFile; } @@ -131,19 +131,19 @@ public: } private: - QDomDocument* document; + TQDomDocument* document; InvocationMode invocationMode; // web - QString webURL; + TQString webURL; // shell - QString phpExePath; - QString phpIniPath; - QString phpStartupFile; + TQString phpExePath; + TQString phpIniPath; + TQString phpStartupFile; // options - QString phpIncludePath; - QString phpDefaultFile; + TQString phpIncludePath; + TQString phpDefaultFile; StartupFileMode phpStartupFileMode; // code help diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 829e3038..5b5dfda7 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -1,11 +1,11 @@ #include "domutil.h" #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include @@ -16,7 +16,7 @@ using namespace std; -PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,QWidget* parent, const char* name, WFlags fl ) +PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* parent, const char* name, WFlags fl ) : PHPConfigWidgetBase( parent, name, fl ) { configData = data; @@ -34,15 +34,15 @@ PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,QWidget* parent, const cha } // page webserver - QString weburl = configData->getWebURL(); + TQString weburl = configData->getWebURL(); if (weburl.isEmpty()) weburl = "http://localhost/"; weburl_edit->setText(weburl); // page shell - QString exepath = configData->getPHPExecPath(); + TQString exepath = configData->getPHPExecPath(); if (exepath.isEmpty()) { - QString fiexepath = KStandardDirs::findExe("php"); + TQString fiexepath = KStandardDirs::findExe("php"); if (exepath.isEmpty()) exepath = "/usr/local/bin/php"; @@ -52,7 +52,7 @@ PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,QWidget* parent, const cha // page options PHPConfigData::StartupFileMode phpStartupFileMode = configData->getStartupFileMode(); - QString phpStartupFile = configData->getStartupFile(); + TQString phpStartupFile = configData->getStartupFile(); useDefaultFile_edit->setText(phpStartupFile); @@ -64,7 +64,7 @@ PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,QWidget* parent, const cha useDefaultFile_radio->setChecked(true); } - QString includepath = configData->getPHPIncludePath(); + TQString includepath = configData->getPHPIncludePath(); include_path_edit->setText(includepath); codeCompletion_checkbox->setChecked(configData->getCodeCompletion()); @@ -129,8 +129,8 @@ void PHPConfigWidget::slotAboutClicked() proc << exe_edit->text(); proc << "-m"; - connect( &proc, SIGNAL(receivedStdout (KProcess*, char*, int)), - this, SLOT(slotReceivedPHPInfo (KProcess*, char*, int))); + connect( &proc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPInfo (KProcess*, char*, int))); proc.start(KProcess::Block,KProcess::Stdout); PHPInfoDlg dlg(this,"phpinfo",true); dlg.php_edit->setText(m_phpInfo); @@ -139,11 +139,11 @@ void PHPConfigWidget::slotAboutClicked() } void PHPConfigWidget::slotReceivedPHPInfo (KProcess* /*proc*/, char* buffer, int buflen){ - m_phpInfo += QCString(buffer,buflen+1); + m_phpInfo += TQCString(buffer,buflen+1); } void PHPConfigWidget::slotPHPExeButtonClicked(){ - QString exe = KFileDialog::getOpenFileName(QFileInfo(exe_edit->text()).filePath()); + TQString exe = KFileDialog::getOpenFileName(TQFileInfo(exe_edit->text()).filePath()); if (!exe.isEmpty()){ exe_edit->setText(exe); } @@ -151,7 +151,7 @@ void PHPConfigWidget::slotPHPExeButtonClicked(){ void PHPConfigWidget::slotPHPIniButtonClicked() { - QString file = KFileDialog::getOpenFileName(QFileInfo(exe_edit->text()).filePath(), QString("*.ini|INI File (*.ini)")); + TQString file = KFileDialog::getOpenFileName(TQFileInfo(exe_edit->text()).filePath(), TQString("*.ini|INI File (*.ini)")); if (!file.isEmpty()){ ini_edit->setText(file); diff --git a/languages/php/phpconfigwidget.h b/languages/php/phpconfigwidget.h index 87bb6ab3..c404643c 100644 --- a/languages/php/phpconfigwidget.h +++ b/languages/php/phpconfigwidget.h @@ -2,7 +2,7 @@ #define PHPCONFIGWIDGET_H #include "phpconfigwidgetbase.h" -#include +#include class KProcess; class PHPConfigData; @@ -11,7 +11,7 @@ class PHPConfigWidget : public PHPConfigWidgetBase Q_OBJECT public: - PHPConfigWidget( PHPConfigData* data,QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PHPConfigWidget( PHPConfigData* data,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PHPConfigWidget(); public slots: @@ -23,8 +23,8 @@ public slots: void slotReceivedPHPInfo (KProcess* proc, char* buffer, int buflen); private: - QDomDocument* dom; - QString m_phpInfo; + TQDomDocument* dom; + TQString m_phpInfo; PHPConfigData* configData; }; diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index 011e8b77..e5d479ec 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -43,28 +43,28 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include class ProblemItem: public KListViewItem { public: - ProblemItem( QListView* parent, const QString& problem, - const QString& file, const QString& line, const QString& column ) + ProblemItem( TQListView* parent, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, problem, file, line, column ) {} - ProblemItem( QListViewItem* parent, const QString& problem, - const QString& file, const QString& line, const QString& column ) + ProblemItem( TQListViewItem* parent, const TQString& problem, + const TQString& file, const TQString& line, const TQString& column ) : KListViewItem( parent, problem, file, line, column ) {} - int compare( QListViewItem* item, int column, bool ascending ) const { + int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 2 || column == 3 ){ int a = text( column ).toInt(); int b = item->text( column ).toInt(); @@ -77,20 +77,20 @@ public: }; -PHPErrorView::PHPErrorView( PHPSupportPart* part, QWidget* parent, const char* name ) - : QWidget( parent, name ? name : "problemreporter" ), +PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char* name ) + : TQWidget( parent, name ? name : "problemreporter" ), m_phpSupport( part ), m_document( 0 ), m_markIface( 0 ) { - QWhatsThis::add(this, i18n("Problem reporter

    This window shows various \"problems\" in your project. " + TQWhatsThis::add(this, i18n("Problem reporter

    This window shows various \"problems\" in your project. " "It displays TODO entries, FIXME's and errors reported by a language parser. " "To add a TODO or FIXME entry, just type
    " "//@todo my todo
    " "//TODO: my todo
    " "//FIXME fix this")); - m_gridLayout = new QGridLayout(this,2,3); + m_gridLayout = new TQGridLayout(this,2,3); m_errorList = new KListView(this); m_fixmeList = new KListView(this); @@ -109,19 +109,19 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, QWidget* parent, const char* n InitListView(m_currentList); m_currentList->removeColumn(1); - m_widgetStack = new QWidgetStack(this); + m_widgetStack = new TQWidgetStack(this); m_widgetStack->addWidget(m_currentList,0); m_widgetStack->addWidget(m_errorList,1); m_widgetStack->addWidget(m_fixmeList,2); m_widgetStack->addWidget(m_todoList,3); m_widgetStack->addWidget(m_filteredList,4); - m_tabBar = new QTabBar(this); - m_tabBar->insertTab(new QTab(i18n("Current")),0); - m_tabBar->insertTab(new QTab(i18n("Errors")),1); - m_tabBar->insertTab(new QTab(i18n("Fixme")),2); - m_tabBar->insertTab(new QTab(i18n("Todo")),3); - m_tabBar->insertTab(new QTab(i18n("Filtered")),4); + m_tabBar = new TQTabBar(this); + m_tabBar->insertTab(new TQTab(i18n("Current")),0); + m_tabBar->insertTab(new TQTab(i18n("Errors")),1); + m_tabBar->insertTab(new TQTab(i18n("Fixme")),2); + m_tabBar->insertTab(new TQTab(i18n("Todo")),3); + m_tabBar->insertTab(new TQTab(i18n("Filtered")),4); m_tabBar->setTabEnabled(0,false); m_tabBar->setTabEnabled(4,false); @@ -129,19 +129,19 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, QWidget* parent, const char* n m_filterEdit = new KLineEdit(this); - QLabel* m_filterLabel = new QLabel(i18n("Lookup:"),this); + TQLabel* m_filterLabel = new TQLabel(i18n("Lookup:"),this); m_gridLayout->addWidget(m_tabBar,0,0); m_gridLayout->addMultiCellWidget(m_widgetStack,1,1,0,2); m_gridLayout->addWidget(m_filterLabel,0,1,Qt::AlignRight); m_gridLayout->addWidget(m_filterEdit,0,2,Qt::AlignLeft); - connect( m_filterEdit, SIGNAL(returnPressed()), this, SLOT(slotFilter()) ); - connect( m_filterEdit, SIGNAL(textChanged( const QString & )), this, SLOT(slotFilter()) ); - connect( m_tabBar, SIGNAL(selected(int)), this, SLOT(slotTabSelected(int)) ); - connect( part->partController(), SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partAdded(KParts::Part*)), this, SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), SIGNAL(partRemoved(KParts::Part*)), this, SLOT(slotPartRemoved(KParts::Part*)) ); + connect( m_filterEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotFilter()) ); + connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotFilter()) ); + connect( m_tabBar, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotTabSelected(int)) ); + connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); slotActivePartChanged( part->partController()->activePart() ); } @@ -162,9 +162,9 @@ void PHPErrorView::slotFilter() } -void PHPErrorView::filterList(KListView* listview, const QString& level) +void PHPErrorView::filterList(KListView* listview, const TQString& level) { - QListViewItemIterator it( listview ); + TQListViewItemIterator it( listview ); while ( it.current() ) { if ( it.current()->text(3).contains(m_filterEdit->text(),false)) new KListViewItem(m_filteredList,level, @@ -186,11 +186,11 @@ void PHPErrorView::InitListView(KListView* listview) listview->addColumn( i18n("Problem") ); listview->setAllColumnsShowFocus( TRUE ); - connect( listview, SIGNAL(executed(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem*)) ); + connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, SIGNAL(returnPressed(QListViewItem*)), - this, SLOT(slotSelected(QListViewItem* )) ); + connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), + this, TQT_SLOT(slotSelected(TQListViewItem* )) ); } @@ -223,11 +223,11 @@ void PHPErrorView::slotActivePartChanged( KParts::Part* part ) m_markIface = dynamic_cast( part ); } -void PHPErrorView::removeAllItems( QListView* listview, const QString& filename ) +void PHPErrorView::removeAllItems( TQListView* listview, const TQString& filename ) { - QListViewItem* current = listview->firstChild(); + TQListViewItem* current = listview->firstChild(); while( current ){ - QListViewItem* i = current; + TQListViewItem* i = current; current = current->nextSibling(); if( i->text(0) == filename ) @@ -235,9 +235,9 @@ void PHPErrorView::removeAllItems( QListView* listview, const QString& filename } } -void PHPErrorView::removeAllProblems( const QString& filename ) +void PHPErrorView::removeAllProblems( const TQString& filename ) { - QString relFileName = filename; + TQString relFileName = filename; relFileName.remove(m_phpSupport->project()->projectDirectory()); kdDebug(9008) << "PHPErrorView::removeAllProblems()" << relFileName << endl; @@ -250,8 +250,8 @@ void PHPErrorView::removeAllProblems( const QString& filename ) removeAllItems(m_todoList,relFileName); if ( m_document && m_markIface ) { - QPtrList marks = m_markIface->marks(); - QPtrListIterator it( marks ); + TQPtrList marks = m_markIface->marks(); + TQPtrListIterator it( marks ); while( it.current() ) { m_markIface->removeMark( it.current()->line, KTextEditor::MarkInterface::markType07 ); ++it; @@ -263,7 +263,7 @@ void PHPErrorView::initCurrentList() { m_tabBar->setTabEnabled(0,true); - QString relFileName = m_fileName; + TQString relFileName = m_fileName; if (m_phpSupport->project()) relFileName.remove(m_phpSupport->project()->projectDirectory()); @@ -275,17 +275,17 @@ void PHPErrorView::initCurrentList() updateCurrentWith(m_todoList,i18n("Todo"),relFileName); } -void PHPErrorView::updateCurrentWith(QListView* listview, const QString& level, const QString& filename) +void PHPErrorView::updateCurrentWith(TQListView* listview, const TQString& level, const TQString& filename) { - QListViewItemIterator it(listview); + TQListViewItemIterator it(listview); while ( it.current() ) { if ( it.current()->text(0) == filename) - new QListViewItem(m_currentList,level,it.current()->text(1),it.current()->text(2),it.current()->text(3)); + new TQListViewItem(m_currentList,level,it.current()->text(1),it.current()->text(2),it.current()->text(3)); ++it; } } -void PHPErrorView::slotSelected( QListViewItem* item ) +void PHPErrorView::slotSelected( TQListViewItem* item ) { bool is_filtered = false; bool is_current = false; @@ -300,17 +300,17 @@ void PHPErrorView::slotSelected( QListViewItem* item ) m_phpSupport->partController()->editDocument( url, line-1 ); } -void PHPErrorView::reportProblem( int level, const QString& fileName, int line, const QString& text) +void PHPErrorView::reportProblem( int level, const TQString& fileName, int line, const TQString& text) { int markType = levelToMarkType( level ); if ( markType != -1 && m_document && m_markIface && m_fileName == fileName ) { m_markIface->addMark( line, markType ); } - QString msg = text; - msg = msg.replace( QRegExp("\n"), "" ); + TQString msg = text; + msg = msg.replace( TQRegExp("\n"), "" ); - QString relFileName = fileName; + TQString relFileName = fileName; relFileName.remove(m_phpSupport->project()->projectDirectory()); KListView* list; @@ -342,11 +342,11 @@ void PHPErrorView::reportProblem( int level, const QString& fileName, int line, if (list) { kdDebug(9018) << "PB " << msg << endl; - new ProblemItem( list, relFileName, QString::number( line + 1 ), 0, msg ); + new ProblemItem( list, relFileName, TQString::number( line + 1 ), 0, msg ); } if (fileName == m_fileName) - new QListViewItem(m_currentList, levelToString( level ), QString::number( line + 1 ), 0, msg); + new TQListViewItem(m_currentList, levelToString( level ), TQString::number( line + 1 ), 0, msg); } void PHPErrorView::slotPartAdded( KParts::Part* part ) @@ -367,30 +367,30 @@ void PHPErrorView::slotPartRemoved( KParts::Part* part ) } } -QString PHPErrorView::levelToString( int level ) const +TQString PHPErrorView::levelToString( int level ) const { switch( level ) { case ErrorNoSuchFunction: - return QString( i18n("Undefined function") ); + return TQString( i18n("Undefined function") ); case ErrorParse: - return QString( i18n("Parse Error") ); + return TQString( i18n("Parse Error") ); case Error: - return QString( i18n("Error") ); + return TQString( i18n("Error") ); case Warning: - return QString( i18n("Warning") ); + return TQString( i18n("Warning") ); case Todo: - return QString( i18n("Todo") ); + return TQString( i18n("Todo") ); case Fixme: - return QString( i18n("Fixme") ); + return TQString( i18n("Fixme") ); default: - return QString::null; + return TQString::null; } } diff --git a/languages/php/phperrorview.h b/languages/php/phperrorview.h index bc8b0df5..aaf3f9f3 100644 --- a/languages/php/phperrorview.h +++ b/languages/php/phperrorview.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "phpfile.h" class PHPSupportPart; @@ -54,36 +54,36 @@ enum Errors Fixme = 5 }; -class PHPErrorView: public QWidget { +class PHPErrorView: public TQWidget { Q_OBJECT public: - PHPErrorView( PHPSupportPart* part, QWidget* parent=0, const char* name=0 ); + PHPErrorView( PHPSupportPart* part, TQWidget* parent=0, const char* name=0 ); virtual ~PHPErrorView(); - void removeAllProblems( const QString& filename ); - void reportProblem( int level, const QString& fileName, int line, const QString& text); + void removeAllProblems( const TQString& filename ); + void reportProblem( int level, const TQString& fileName, int line, const TQString& text); private slots: void slotPartAdded( KParts::Part* ); void slotPartRemoved( KParts::Part* ); void slotActivePartChanged( KParts::Part* ); - void slotSelected( QListViewItem* ); + void slotSelected( TQListViewItem* ); void slotTabSelected( int tabindex ); void slotFilter(); private: - QString levelToString( int level ) const; + TQString levelToString( int level ) const; int levelToMarkType( int level ) const; void InitListView(KListView* listview); - void removeAllItems( QListView* listview, const QString& filename ); - void filterList(KListView* listview, const QString& level); - void updateCurrentWith(QListView* listview, const QString& level, const QString& filename); + void removeAllItems( TQListView* listview, const TQString& filename ); + void filterList(KListView* listview, const TQString& level); + void updateCurrentWith(TQListView* listview, const TQString& level, const TQString& filename); void initCurrentList(); private: - QGridLayout* m_gridLayout; - QTabBar* m_tabBar; - QWidgetStack* m_widgetStack; + TQGridLayout* m_gridLayout; + TQTabBar* m_tabBar; + TQWidgetStack* m_widgetStack; KListView* m_currentList; KListView* m_errorList; KListView* m_fixmeList; @@ -93,10 +93,10 @@ private: KLineEdit* m_filterEdit; PHPSupportPart* m_phpSupport; - QGuardedPtr m_document; + TQGuardedPtr m_document; KTextEditor::MarkInterface* m_markIface; - QTimer* m_timer; - QString m_fileName; + TQTimer* m_timer; + TQString m_fileName; int m_active; int m_delay; }; diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index afd741bd..d54028da 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -17,9 +17,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include @@ -34,9 +34,9 @@ using namespace std; -PHPFile::PHPFile(PHPSupportPart *phpSupport, const QString& fileName) +PHPFile::PHPFile(PHPSupportPart *phpSupport, const TQString& fileName) { - m_fileinfo = new QFileInfo(fileName); + m_fileinfo = new TQFileInfo(fileName); m_part = phpSupport; modified = true; inClass = FALSE; @@ -44,9 +44,9 @@ PHPFile::PHPFile(PHPSupportPart *phpSupport, const QString& fileName) /* phpCheckProc = new KShellProcess("/bin/sh"); - connect(phpCheckProc, SIGNAL(receivedStdout (KProcess*, char*, int)), this, SLOT(slotReceivedPHPCheckStdout (KProcess*, char*, int))); - connect(phpCheckProc, SIGNAL(receivedStderr (KProcess*, char*, int)), this, SLOT(slotReceivedPHPCheckStderr (KProcess*, char*, int))); - connect(phpCheckProc, SIGNAL(processExited(KProcess*)), this, SLOT(slotPHPCheckExited(KProcess*))); + connect(phpCheckProc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (KProcess*, char*, int))); + connect(phpCheckProc, TQT_SIGNAL(receivedStderr (KProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (KProcess*, char*, int))); + connect(phpCheckProc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPHPCheckExited(KProcess*))); */ } @@ -58,22 +58,22 @@ PHPFile::~PHPFile() // delete phpCheckProc; } -QStringList PHPFile::getContents() +TQStringList PHPFile::getContents() { return m_contents; } -QString PHPFile::fileName() { +TQString PHPFile::fileName() { return m_fileinfo->filePath(); } -QStringList PHPFile::readFromEditor() +TQStringList PHPFile::readFromEditor() { - QStringList contents; + TQStringList contents; kapp->lock(); - QPtrList parts( *m_part->partController()->parts() ); - QPtrListIterator it( parts ); + TQPtrList parts( *m_part->partController()->parts() ); + TQPtrListIterator it( parts ); while( it.current() ){ KTextEditor::Document* doc = dynamic_cast( it.current() ); ++it; @@ -82,7 +82,7 @@ QStringList PHPFile::readFromEditor() if ( !doc || !editIface || doc->url().path() != fileName() ) continue; - contents = QStringList::split("\n", editIface->text().ascii(), true); + contents = TQStringList::split("\n", editIface->text().ascii(), true); break; } kapp->unlock(); @@ -90,15 +90,15 @@ QStringList PHPFile::readFromEditor() return contents; } -QStringList PHPFile::readFromDisk() +TQStringList PHPFile::readFromDisk() { - QStringList contents; - QFile f( fileName() ); + TQStringList contents; + TQFile f( fileName() ); if (f.open(IO_ReadOnly)) { - QTextStream stream( &f ); - QStringList list; - QString rawline; + TQTextStream stream( &f ); + TQStringList list; + TQString rawline; while (!stream.eof()) { rawline = stream.readLine(); contents.append(rawline.stripWhiteSpace().local8Bit()); @@ -137,11 +137,11 @@ void PHPFile::Analyse() { postEvent( new FileParseEvent( Event_EndParse, this->fileName() ) ); } -bool PHPFile::ParseClass(QString line, int lineNo) { +bool PHPFile::ParseClass(TQString line, int lineNo) { if (line.find("class ", 0, FALSE) == -1) return FALSE; - QRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); + TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); Class.setCaseSensitive(FALSE); if (Class.search(line) != -1) { @@ -158,11 +158,11 @@ bool PHPFile::ParseClass(QString line, int lineNo) { return FALSE; } -bool PHPFile::ParseFunction(QString line, int lineNo) { +bool PHPFile::ParseFunction(TQString line, int lineNo) { if (line.find("function", 0, FALSE) == -1) return FALSE; - QRegExp function("^[ \t]*(final|abstract|static|)[ \t]*(public|private|protected|)[ \t]*(static|)[ \t]*function[ \t&]*([_a-zA-Z\x7f-\xff][_a-zA-Z0-9\x7f-\xff]*)[ \t]*\\(([_a-zA-Z\x7f-\xff]*[_$, &'\\\"0-9A-Za-z\x7f-\xff\t-=]*)\\).*$"); + TQRegExp function("^[ \t]*(final|abstract|static|)[ \t]*(public|private|protected|)[ \t]*(static|)[ \t]*function[ \t&]*([_a-zA-Z\x7f-\xff][_a-zA-Z0-9\x7f-\xff]*)[ \t]*\\(([_a-zA-Z\x7f-\xff]*[_$, &'\\\"0-9A-Za-z\x7f-\xff\t-=]*)\\).*$"); function.setCaseSensitive(FALSE); if (function.search(line) != -1) { @@ -197,11 +197,11 @@ bool PHPFile::ParseFunction(QString line, int lineNo) { return FALSE; } -bool PHPFile::ParseVariable(QString line, int lineNo) { +bool PHPFile::ParseVariable(TQString line, int lineNo) { if (line.find("var") == -1 && line.find("public") == -1 && line.find("private") == -1 && line.find("protected") == -1) return FALSE; - QRegExp variable("^[ \t]*(var|public|private|protected|static)[ \t]*\\$([a-zA-Z_\x7f-\xff][0-9A-Za-z_\x7f-\xff]*)[ \t;=].*$"); + TQRegExp variable("^[ \t]*(var|public|private|protected|static)[ \t]*\\$([a-zA-Z_\x7f-\xff][0-9A-Za-z_\x7f-\xff]*)[ \t;=].*$"); variable.setCaseSensitive(FALSE); if (variable.search(line) != -1) { @@ -226,11 +226,11 @@ bool PHPFile::ParseVariable(QString line, int lineNo) { return FALSE; } -bool PHPFile::ParseThisMember(QString line, int lineNo) { +bool PHPFile::ParseThisMember(TQString line, int lineNo) { if (line.find("$this->", 0, FALSE) == -1) return FALSE; - QRegExp createthis; + TQRegExp createthis; createthis.setCaseSensitive(FALSE); createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*([0-9]*)[ \t]*;"); @@ -270,13 +270,13 @@ bool PHPFile::ParseThisMember(QString line, int lineNo) { return FALSE; } -bool PHPFile::ParseMember(QString line, int lineNo) { +bool PHPFile::ParseMember(TQString line, int lineNo) { if (line.find("$", 0, FALSE) == -1) return FALSE; /// @todo Ajouter plus de test .... - QRegExp createmember; + TQRegExp createmember; createmember.setCaseSensitive(FALSE); createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*([0-9]*)[ \t]*;"); @@ -323,18 +323,18 @@ bool PHPFile::ParseMember(QString line, int lineNo) { return FALSE; } -bool PHPFile::ParseReturn(QString line, int lineNo) { - QString rettype; +bool PHPFile::ParseReturn(TQString line, int lineNo) { + TQString rettype; if (line.find("return", 0, FALSE) == -1) return FALSE; - QRegExp typeex; + TQRegExp typeex; typeex.setCaseSensitive(FALSE); typeex.setPattern("return[ \t]*(\\(|)([a-zA-Z_\x7f-\xff$][a-zA-Z0-9_\x7f-\xff]*)(\\)|)[ \t]*;"); if (typeex.search(line) != -1) { - QString varname = typeex.cap(2).ascii(); + TQString varname = typeex.cap(2).ascii(); rettype = varname; if (varname.find("$") == 0) { @@ -342,7 +342,7 @@ bool PHPFile::ParseReturn(QString line, int lineNo) { /* varname = varname.mid(1); - QValueList::ConstIterator it = m_vars.begin(); + TQValueList::ConstIterator it = m_vars.begin(); while ( it != m_vars.end() ) { Action *p = *it++; @@ -365,11 +365,11 @@ bool PHPFile::ParseReturn(QString line, int lineNo) { return TRUE; } -bool PHPFile::ParseTodo(QString line, int lineNo) { +bool PHPFile::ParseTodo(TQString line, int lineNo) { if (line.find("todo", 0, FALSE) == -1) return FALSE; - QRegExp todo("/[/]+[ \t]*[@]*todo([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); + TQRegExp todo("/[/]+[ \t]*[@]*todo([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); todo.setCaseSensitive(FALSE); if (todo.search(line) != -1) { @@ -380,11 +380,11 @@ bool PHPFile::ParseTodo(QString line, int lineNo) { return FALSE; } -bool PHPFile::ParseFixme(QString line, int lineNo) { +bool PHPFile::ParseFixme(TQString line, int lineNo) { if (line.find("fixme", 0, FALSE) == -1) return FALSE; - QRegExp fixme("/[/]+[ \t]*[@]*fixme([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); + TQRegExp fixme("/[/]+[ \t]*[@]*fixme([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); fixme.setCaseSensitive(FALSE); if (fixme.search(line) != -1) { @@ -396,34 +396,34 @@ bool PHPFile::ParseFixme(QString line, int lineNo) { } void PHPFile::ParseSource() { - QString line; + TQString line; int lineNo = 0; int bracketOpen = 0; int bracketClose = 0; int bracketFuncOpen = 0; int bracketFuncClose = 0; - QRegExp includere("^[ \t]*(include|require|include_once|require_once)[ \t]*(\\(|)[ \t]*[\"'](.*)[\"'][ \t]*(\\)|)[ \t]*;$"); + TQRegExp includere("^[ \t]*(include|require|include_once|require_once)[ \t]*(\\(|)[ \t]*[\"'](.*)[\"'][ \t]*(\\)|)[ \t]*;$"); includere.setCaseSensitive(FALSE); - for ( QStringList::Iterator it = m_contents.begin(); it != m_contents.end(); ++it ) { + for ( TQStringList::Iterator it = m_contents.begin(); it != m_contents.end(); ++it ) { line = (*it).local8Bit(); if (!line.isNull()) { if (line.find("include", 0, FALSE) != -1 || line.find("require", 0, FALSE) != -1) { if (includere.search(line) != -1) { - QStringList include_path; + TQStringList include_path; include_path = include_path.split(":", m_part->getIncludePath()); include_path.append(URLUtil::directory(fileName()) + "/"); include_path.append(""); - QStringList list = includere.capturedTexts(); + TQStringList list = includere.capturedTexts(); - for ( QStringList::Iterator it = include_path.begin(); it != include_path.end(); ++it ) { - QString abso = URLUtil::canonicalPath(*it + "/" + list[3]); + for ( TQStringList::Iterator it = include_path.begin(); it != include_path.end(); ++it ) { + TQString abso = URLUtil::canonicalPath(*it + "/" + list[3]); if (!abso.isNull()) { - QString rel = URLUtil::relativePathToFile (m_part->project()->projectDirectory(), abso); + TQString rel = URLUtil::relativePathToFile (m_part->project()->projectDirectory(), abso); postEvent( new FileParseEvent( Event_AddFile, abso ) ); } } @@ -492,7 +492,7 @@ void PHPFile::PHPCheck() { /* char buf[255]; - FILE *fd = popen(QString(m_phpSupport->getExePath() + " -l -f " + KShellProcess::quote(fileName())).ascii(), "r"); + FILE *fd = popen(TQString(m_phpSupport->getExePath() + " -l -f " + KShellProcess::quote(fileName())).ascii(), "r"); while (!feof(fd)) { memset(buf, 0, 255); fgets(buf, 255, fd); @@ -507,12 +507,12 @@ void PHPFile::PHPCheck() { /* void PHPFile::slotReceivedPHPCheckStdout (KProcess* proc, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStdout()" << endl; - m_phpCheckOutput += QString::fromLocal8Bit(buffer,buflen+1); + m_phpCheckOutput += TQString::fromLocal8Bit(buffer,buflen+1); } void PHPFile::slotReceivedPHPCheckStderr (KProcess* proc, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStderr()" << endl; - m_phpCheckOutput += QString::fromLocal8Bit(buffer,buflen+1); + m_phpCheckOutput += TQString::fromLocal8Bit(buffer,buflen+1); } void PHPFile::slotPHPCheckExited (KProcess* proc) { @@ -520,15 +520,15 @@ void PHPFile::slotPHPCheckExited (KProcess* proc) { } */ -void PHPFile::ParseStdout(QString phpOutput) { +void PHPFile::ParseStdout(TQString phpOutput) { kdDebug(9018) << "ParseStdout()" << endl; - QRegExp parseError("^(|)Parse error(|): parse error, (.*) in (|)(.*)(|) on line (|)(.*)(|).*$"); - QRegExp undefFunctionError("^(|)Fatal error(|): Call to undefined function: (.*) in (|)(.*)(|) on line (|)(.*)(|).*$"); - QRegExp warning("^(|)Warning(|): (|)(.*)(|) in (.*) on line (|)(.*)(|).*$"); - QRegExp generalFatalError("^(|)Fatal error(|): (.*) in (|)(.*)(|) on line (|)(.*)(|).*$"); + TQRegExp parseError("^(|)Parse error(|): parse error, (.*) in (|)(.*)(|) on line (|)(.*)(|).*$"); + TQRegExp undefFunctionError("^(|)Fatal error(|): Call to undefined function: (.*) in (|)(.*)(|) on line (|)(.*)(|).*$"); + TQRegExp warning("^(|)Warning(|): (|)(.*)(|) in (.*) on line (|)(.*)(|).*$"); + TQRegExp generalFatalError("^(|)Fatal error(|): (.*) in (|)(.*)(|) on line (|)(.*)(|).*$"); - QStringList list = QStringList::split("\n", phpOutput); - QStringList::Iterator it; + TQStringList list = TQStringList::split("\n", phpOutput); + TQStringList::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { if (generalFatalError.search(*it) >= 0) { // m_errorview->reportProblem(Error, parseError.cap(5), parseError.cap(8).toInt(), parseError.cap(3)); @@ -546,9 +546,9 @@ void PHPFile::ParseStdout(QString phpOutput) { } /* -ClassDom PHPFile::classByName(QString filename, QString classname) { - QValueList CList; - QString abso = URLUtil::canonicalPath(filename); +ClassDom PHPFile::classByName(TQString filename, TQString classname) { + TQValueList CList; + TQString abso = URLUtil::canonicalPath(filename); ClassList classList = m_model->globalNamespace()->classList(); ClassList::Iterator classIt; @@ -560,8 +560,8 @@ ClassDom PHPFile::classByName(QString filename, QString classname) { return NULL; } -QValueList PHPFile::classByName(QString classname) { - QValueList CList; +TQValueList PHPFile::classByName(TQString classname) { + TQValueList CList; ClassList classList = m_model->globalNamespace()->classList(); @@ -580,13 +580,13 @@ void PHPFile::postEvent(FileParseEvent *event) { usleep(100); } -bool PHPFile::AddClass(QString name, QString extends, int start) { +bool PHPFile::AddClass(TQString name, TQString extends, int start) { postEvent( new FileParseEvent( Event_AddClass, this->fileName(), name, extends, start ) ); inClass = TRUE; return TRUE; } -bool PHPFile::SetClass(QString arguments) { +bool PHPFile::SetClass(TQString arguments) { postEvent( new FileParseEvent( Event_SetClass, this->fileName(), "", arguments ) ); return TRUE; } @@ -597,13 +597,13 @@ bool PHPFile::CloseClass(int end) { return TRUE; } -bool PHPFile::AddFunction(QString name, QString arguments, int start) { +bool PHPFile::AddFunction(TQString name, TQString arguments, int start) { postEvent( new FileParseEvent( Event_AddFunction, this->fileName(), name, arguments, start ) ); inMethod = TRUE; return TRUE; } -bool PHPFile::SetFunction(QString name, QString arguments) { +bool PHPFile::SetFunction(TQString name, TQString arguments) { postEvent( new FileParseEvent( Event_SetFunction, this->fileName(), name, arguments ) ); return TRUE; } @@ -614,23 +614,23 @@ bool PHPFile::CloseFunction(int end) { return TRUE; } -bool PHPFile::AddVariable(QString name, QString type, int position, bool classvar) { +bool PHPFile::AddVariable(TQString name, TQString type, int position, bool classvar) { postEvent( new FileParseEvent( Event_AddVariable, this->fileName(), name, type, position, classvar ) ); return TRUE; } -bool PHPFile::SetVariable(QString arguments) { +bool PHPFile::SetVariable(TQString arguments) { postEvent( new FileParseEvent( Event_SetVariable, this->fileName(), "", arguments ) ); return TRUE; } -bool PHPFile::AddTodo(QString arguments, int position) { +bool PHPFile::AddTodo(TQString arguments, int position) { postEvent( new FileParseEvent( Event_AddTodo, this->fileName(), "", arguments, position ) ); inClass = TRUE; return TRUE; } -bool PHPFile::AddFixme(QString arguments, int position) { +bool PHPFile::AddFixme(TQString arguments, int position) { postEvent( new FileParseEvent( Event_AddFixme, this->fileName(), "", arguments, position ) ); inClass = TRUE; return TRUE; diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index cb1573f3..b8aad71b 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -20,11 +20,11 @@ #define PHPFILE_H #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -45,23 +45,23 @@ /** @author Escuder Nicolas */ -class PHPFile : public QObject { +class PHPFile : public TQObject { Q_OBJECT public: - PHPFile(PHPSupportPart *phpSupport, const QString& fileName); + PHPFile(PHPSupportPart *phpSupport, const TQString& fileName); ~PHPFile(); - QStringList getContents(); + TQStringList getContents(); bool isModified(); void setModified(bool value); - QString fileName(); + TQString fileName(); void Analyse(); - void ParseStdout(QString phpOutput); + void ParseStdout(TQString phpOutput); /* - ClassDom classByName(QString filename, QString classname); - QValueList classByName(QString classname); + ClassDom classByName(TQString filename, TQString classname); + TQValueList classByName(TQString classname); */ /* @@ -71,37 +71,37 @@ private slots: void slotPHPCheckExited (KProcess* proc); */ private: - QStringList readFromEditor(); - QStringList readFromDisk(); + TQStringList readFromEditor(); + TQStringList readFromDisk(); - bool ParseClass(QString line, int lineNo); - bool ParseFunction(QString line, int lineNo); - bool ParseVariable(QString line, int lineNo); + bool ParseClass(TQString line, int lineNo); + bool ParseFunction(TQString line, int lineNo); + bool ParseVariable(TQString line, int lineNo); - bool ParseThisMember(QString line, int lineNo); - bool ParseMember(QString line, int lineNo); - bool ParseReturn(QString line, int lineNo); - bool ParseTodo(QString line, int lineNo); - bool ParseFixme(QString line, int lineNo); + bool ParseThisMember(TQString line, int lineNo); + bool ParseMember(TQString line, int lineNo); + bool ParseReturn(TQString line, int lineNo); + bool ParseTodo(TQString line, int lineNo); + bool ParseFixme(TQString line, int lineNo); void ParseSource(); void PHPCheck(); void postEvent(FileParseEvent *event); - bool AddClass(QString name, QString extends, int start); - bool SetClass(QString arguments); + bool AddClass(TQString name, TQString extends, int start); + bool SetClass(TQString arguments); bool CloseClass(int end); - bool AddFunction(QString name, QString arguments, int start); - bool SetFunction(QString name, QString arguments = ""); + bool AddFunction(TQString name, TQString arguments, int start); + bool SetFunction(TQString name, TQString arguments = ""); bool CloseFunction(int end); - bool AddVariable(QString name, QString type, int position, bool classvar = FALSE); - bool SetVariable(QString arguments); + bool AddVariable(TQString name, TQString type, int position, bool classvar = FALSE); + bool SetVariable(TQString arguments); - bool AddTodo(QString arguments, int position); - bool AddFixme(QString arguments, int position); + bool AddTodo(TQString arguments, int position); + bool AddFixme(TQString arguments, int position); PHPSupportPart *m_part; @@ -110,9 +110,9 @@ private: bool inClass; bool inMethod; - QFileInfo* m_fileinfo; - QStringList m_contents; - QString m_phpCheckOutput; + TQFileInfo* m_fileinfo; + TQStringList m_contents; + TQString m_phpCheckOutput; // KShellProcess* phpCheckProc; }; diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index f17034db..282e6c01 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -19,10 +19,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -30,17 +30,17 @@ using namespace std; -PHPNewClassDlg::PHPNewClassDlg(const QStringList& baseClassNames,const QString& directory,QWidget *parent, const char *name) : PHPNewClassDlgBase(parent,name,true) { +PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent, const char *name) : PHPNewClassDlgBase(parent,name,true) { m_filenameModified = false; KCompletion *comp = new KCompletion(); comp->setItems(baseClassNames); m_dirEdit->setText(directory); // load the class template if available - QString templateFile = KGlobal::instance()->dirs()->findResource("data","kdevphpsupport/newclasstemplate.txt"); + TQString templateFile = KGlobal::instance()->dirs()->findResource("data","kdevphpsupport/newclasstemplate.txt"); if(!templateFile.isNull()){ - QFile file(templateFile); - QTextStream stream(&file); + TQFile file(templateFile); + TQTextStream stream(&file); if(file.open(IO_ReadOnly)){ m_classTemplate->setText(stream.read()); file.close(); @@ -49,30 +49,30 @@ PHPNewClassDlg::PHPNewClassDlg(const QStringList& baseClassNames,const QString& m_baseClassEdit->setCompletionObject( comp ); /// @todo change it to KLineEdit - connect(m_baseClassEdit,SIGNAL(returnPressed(const QString&)),comp,SLOT(addItem(const QString&))); - connect(m_classNameEdit,SIGNAL(textChanged(const QString&)), - this,SLOT(classNameTextChanged(const QString&))); - connect(m_fileNameEdit,SIGNAL(textChanged(const QString&)), - this,SLOT(fileNameTextChanged(const QString&))); - connect(m_dirButton,SIGNAL(clicked()), - this,SLOT(slotDirButtonClicked())); + connect(m_baseClassEdit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + connect(m_classNameEdit,TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(classNameTextChanged(const TQString&))); + connect(m_fileNameEdit,TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(fileNameTextChanged(const TQString&))); + connect(m_dirButton,TQT_SIGNAL(clicked()), + this,TQT_SLOT(slotDirButtonClicked())); } PHPNewClassDlg::~PHPNewClassDlg(){ } void PHPNewClassDlg::slotDirButtonClicked(){ - QString dir = KFileDialog::getExistingDirectory(m_dirEdit->text(),this); + TQString dir = KFileDialog::getExistingDirectory(m_dirEdit->text(),this); if(!dir.isEmpty()){ m_dirEdit->setText(dir); } } -void PHPNewClassDlg::classNameTextChanged(const QString& str){ +void PHPNewClassDlg::classNameTextChanged(const TQString& str){ if(!m_filenameModified){ m_fileNameEdit->setText(str.lower() + ".inc"); } } -void PHPNewClassDlg::fileNameTextChanged(const QString&){ +void PHPNewClassDlg::fileNameTextChanged(const TQString&){ if(m_fileNameEdit->hasFocus()){ m_filenameModified = true; } @@ -80,22 +80,22 @@ void PHPNewClassDlg::fileNameTextChanged(const QString&){ void PHPNewClassDlg::accept(){ PHPNewClassDlgBase::accept(); // hide the dialog - QString text = m_classTemplate->text(); - QString classDir = m_dirEdit->text(); + TQString text = m_classTemplate->text(); + TQString classDir = m_dirEdit->text(); if(!classDir.endsWith("/")) classDir += "/"; // append / - QString absFileName = classDir + m_fileNameEdit->text(); + TQString absFileName = classDir + m_fileNameEdit->text(); // save the template for the next time - QString templateDir = KGlobal::instance()->dirs()->saveLocation("data") + "/kdevphpsupport/"; - QString templateFile = templateDir + "newclasstemplate.txt"; - QDir dir(templateDir); + TQString templateDir = KGlobal::instance()->dirs()->saveLocation("data") + "/kdevphpsupport/"; + TQString templateFile = templateDir + "newclasstemplate.txt"; + TQDir dir(templateDir); if(!dir.exists()){ if(!dir.mkdir(templateDir)){ kdWarning() << "Error on creating directory for the classtemplate" << templateDir << endl; } } - QFile file(templateFile); - QTextStream stream(&file); + TQFile file(templateFile); + TQTextStream stream(&file); if(file.open(IO_WriteOnly)){ stream << text; // write @@ -104,14 +104,14 @@ void PHPNewClassDlg::accept(){ // generate the sourcecode for the class if(m_baseClassEdit->text().isEmpty()){ - text = text.replace(QRegExp("extends BASECLASS"),""); - text = text.replace(QRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),""); + text = text.replace(TQRegExp("extends BASECLASS"),""); + text = text.replace(TQRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),""); }else{ - text = text.replace(QRegExp("BASECLASS"),m_baseClassEdit->text()); + text = text.replace(TQRegExp("BASECLASS"),m_baseClassEdit->text()); } - text = text.replace(QRegExp("CLASSNAME"),m_classNameEdit->text()); - text = text.replace(QRegExp("FILENAME"),m_fileNameEdit->text().upper()); - text = text.replace(QRegExp("AUTHOR"),"not implemented"); + text = text.replace(TQRegExp("CLASSNAME"),m_classNameEdit->text()); + text = text.replace(TQRegExp("FILENAME"),m_fileNameEdit->text().upper()); + text = text.replace(TQRegExp("AUTHOR"),"not implemented"); file.setName(absFileName); if(file.open(IO_WriteOnly)){ diff --git a/languages/php/phpnewclassdlg.h b/languages/php/phpnewclassdlg.h index d94bfffb..14db74b2 100644 --- a/languages/php/phpnewclassdlg.h +++ b/languages/php/phpnewclassdlg.h @@ -18,7 +18,7 @@ #ifndef PHPNEWCLASSDLG_H #define PHPNEWCLASSDLG_H -#include +#include #include "phpnewclassdlgbase.h" /** @@ -28,11 +28,11 @@ class PHPNewClassDlg : public PHPNewClassDlgBase { Q_OBJECT public: - PHPNewClassDlg(const QStringList& baseClassNames,const QString& directory,QWidget *parent=0, const char *name=0); + PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent=0, const char *name=0); ~PHPNewClassDlg(); protected slots: - void classNameTextChanged(const QString&); - void fileNameTextChanged(const QString&); + void classNameTextChanged(const TQString&); + void fileNameTextChanged(const TQString&); void accept(); void slotDirButtonClicked(); protected: diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp index b13c5479..a0f1179e 100644 --- a/languages/php/phpparser.cpp +++ b/languages/php/phpparser.cpp @@ -25,11 +25,11 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include @@ -46,37 +46,37 @@ PHPParser::~PHPParser(){ removeAllFiles(); } -bool PHPParser::hasFile( const QString& fileName ) +bool PHPParser::hasFile( const TQString& fileName ) { // kdDebug(9018) << "hasFile " << fileName.latin1() << endl; - QString abso = URLUtil::canonicalPath(fileName); - QMap::Iterator it = m_files.find(abso); + TQString abso = URLUtil::canonicalPath(fileName); + TQMap::Iterator it = m_files.find(abso); if ( it == m_files.end() ) return false; return true; } -void PHPParser::addFile( const QString& fileName ) +void PHPParser::addFile( const TQString& fileName ) { - QString abso = URLUtil::canonicalPath(fileName); + TQString abso = URLUtil::canonicalPath(fileName); if ( hasFile(abso) ) return; kdDebug(9018) << "addFile " << fileName.latin1() << endl; - QFileInfo fi( abso ); + TQFileInfo fi( abso ); if ((fi.extension().contains("inc") || fi.extension().contains("php") || fi.extension().contains("html") || fi.extension().contains("php3") || !fi.extension()) && !fi.extension().contains("~")) { m_files.insert(abso, new PHPFile(m_part, abso)); } } -void PHPParser::removeFile( const QString& fileName ) +void PHPParser::removeFile( const TQString& fileName ) { // kdDebug(9018) << "removeFile " << fileName.latin1() << endl; - QString abso = URLUtil::canonicalPath(fileName); - QMap::Iterator it = m_files.find(abso); + TQString abso = URLUtil::canonicalPath(fileName); + TQMap::Iterator it = m_files.find(abso); if ( it != m_files.end()) { PHPFile *file = it.data(); @@ -89,7 +89,7 @@ void PHPParser::removeFile( const QString& fileName ) void PHPParser::removeAllFiles() { kdDebug(9018) << "removeAllFiles" << endl; - QMap::Iterator it = m_files.begin(); + TQMap::Iterator it = m_files.begin(); while( it != m_files.end() ){ PHPFile * file = it.data(); @@ -100,11 +100,11 @@ void PHPParser::removeAllFiles() m_files.clear(); } -void PHPParser::reparseFile( const QString& fileName ) +void PHPParser::reparseFile( const TQString& fileName ) { kdDebug(9018) << "reparseFile" << endl; - QString abso = URLUtil::canonicalPath(fileName); - QMap::Iterator it = m_files.find(abso); + TQString abso = URLUtil::canonicalPath(fileName); + TQMap::Iterator it = m_files.find(abso); if ( it != m_files.end()) { PHPFile *file = it.data(); @@ -115,8 +115,8 @@ void PHPParser::reparseFile( const QString& fileName ) } void PHPParser::run() { - kdDebug(9018) << "run thread " << QThread::currentThread() << endl; - QMap::Iterator it; + kdDebug(9018) << "run thread " << TQThread::currentThread() << endl; + TQMap::Iterator it; while ( !m_close ) { m_canParse.wait(); diff --git a/languages/php/phpparser.h b/languages/php/phpparser.h index c5d7e378..24687ea3 100644 --- a/languages/php/phpparser.h +++ b/languages/php/phpparser.h @@ -19,19 +19,19 @@ #ifndef PHPPARSER_H #define PHPPARSER_H -#include +#include #if QT_VERSION < 0x030100 #include #else -#include +#include #endif #include -#include -#include -#include +#include +#include +#include #include "phpfile.h" @@ -42,16 +42,16 @@ class PHPSupportPart; *@author Sandy Meier */ -class PHPParser: public QThread { +class PHPParser: public TQThread { public: PHPParser(PHPSupportPart *part); ~PHPParser(); - void addFile( const QString& fileName ); - bool hasFile( const QString& fileName ); - void reparseFile( const QString& fileName ); - void removeFile( const QString& fileName ); + void addFile( const TQString& fileName ); + bool hasFile( const TQString& fileName ); + void reparseFile( const TQString& fileName ); + void removeFile( const TQString& fileName ); void removeAllFiles(); void run(); @@ -63,10 +63,10 @@ private: KDevCore* m_core; PHPSupportPart* m_part; - QMutex m_mutex; - QWaitCondition m_canParse; + TQMutex m_mutex; + TQWaitCondition m_canParse; bool m_close; - QMap m_files; + TQMap m_files; }; diff --git a/languages/php/phpsupport_event.h b/languages/php/phpsupport_event.h index 4a1a175b..09c5f49e 100644 --- a/languages/php/phpsupport_event.h +++ b/languages/php/phpsupport_event.h @@ -20,18 +20,18 @@ #ifndef __phpsupport_events_h #define __phpsupport_events_h -#include -#include +#include +#include #if QT_VERSION < 0x030100 #include #else -#include +#include #endif enum { - Event_AddFile = QEvent::User + 1000, + Event_AddFile = TQEvent::User + 1000, Event_StartParse, Event_EndParse, Event_AddClass, @@ -49,8 +49,8 @@ enum class FileParseEvent: public QCustomEvent { public: - FileParseEvent(long event, const QString& fileName ) - : QCustomEvent(event), m_fileName( fileName ) + FileParseEvent(long event, const TQString& fileName ) + : TQCustomEvent(event), m_fileName( fileName ) { m_name = ""; m_arguments = ""; @@ -58,29 +58,29 @@ public: m_global = FALSE; } - FileParseEvent(long event, const QString& fileName, int position ) - : QCustomEvent(event), m_fileName( fileName ), m_position( position ) + FileParseEvent(long event, const TQString& fileName, int position ) + : TQCustomEvent(event), m_fileName( fileName ), m_position( position ) { m_name = ""; m_arguments = ""; m_global = FALSE; } - FileParseEvent(long event, const QString& fileName, const QString& name, const QString& arguments ) - : QCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ) + FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments ) + : TQCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ) { m_position = 0; m_global = FALSE; } - FileParseEvent(long event, const QString& fileName, const QString& name, const QString& arguments, int position ) - : QCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ), m_position( position ) + FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments, int position ) + : TQCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ), m_position( position ) { m_global = FALSE; } - FileParseEvent(long event, const QString& fileName, const QString& name, const QString& arguments, int position, bool global ) - : QCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ), m_position( position ), m_global( global ) + FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments, int position, bool global ) + : TQCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ), m_position( position ), m_global( global ) { } @@ -88,17 +88,17 @@ public: { } - QString fileName() const { return m_fileName; } - QString name() const { return m_name; } - QString arguments() const { return m_arguments; } + TQString fileName() const { return m_fileName; } + TQString name() const { return m_name; } + TQString arguments() const { return m_arguments; } int posititon() const { return m_position; } bool global() const { return m_global; } private: - QString m_fileName; - QString m_name; - QString m_arguments; - QString m_accesstype; + TQString m_fileName; + TQString m_name; + TQString m_arguments; + TQString m_accesstype; int m_position; bool m_global; diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 4c4de794..d31bc933 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -21,16 +21,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -69,7 +69,7 @@ using namespace std; static const KDevPluginInfo data("kdevphpsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) ) -PHPSupportPart::PHPSupportPart(QObject *parent, const char *name, const QStringList &) +PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &) : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart") { m_htmlView = 0; @@ -79,23 +79,23 @@ PHPSupportPart::PHPSupportPart(QObject *parent, const char *name, const QStringL setXMLFile("kdevphpsupport.rc"); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), - this, SLOT(savedFile(const KURL&)) ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), + this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); KAction *action; action = new KAction( i18n("&Run"), "exec",Key_F9, - this, SLOT(slotRun()), + this, TQT_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("Run

    Executes script on a terminal or a webserver.")); action = new KAction( i18n("&New Class..."),0, - this, SLOT(slotNewClass()), + this, TQT_SLOT(slotNewClass()), actionCollection(), "project_new_class" ); action->setToolTip(i18n("New class")); action->setWhatsThis(i18n("New class

    Runs New Class wizard.")); @@ -103,33 +103,33 @@ PHPSupportPart::PHPSupportPart(QObject *parent, const char *name, const QStringL m_phpErrorView = new PHPErrorView(this, 0, "phpErrorWidget"); m_phpErrorView->setIcon( SmallIcon("info") ); - QWhatsThis::add(m_phpErrorView, i18n("PHP problems

    This view shows PHP parser warnings, errors, and fatal errors.")); + TQWhatsThis::add(m_phpErrorView, i18n("PHP problems

    This view shows PHP parser warnings, errors, and fatal errors.")); mainWindow()->embedOutputView(m_phpErrorView, i18n("Problems"), i18n("Problems")); phpExeProc = new KShellProcess("/bin/sh"); - connect( phpExeProc, SIGNAL(receivedStdout (KProcess*, char*, int)), - this, SLOT(slotReceivedPHPExeStdout (KProcess*, char*, int))); - connect( phpExeProc, SIGNAL(receivedStderr (KProcess*, char*, int)), - this, SLOT(slotReceivedPHPExeStderr (KProcess*, char*, int))); - connect( phpExeProc, SIGNAL(processExited(KProcess*)), - this, SLOT(slotPHPExeExited(KProcess*))); + connect( phpExeProc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPExeStdout (KProcess*, char*, int))); + connect( phpExeProc, TQT_SIGNAL(receivedStderr (KProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPExeStderr (KProcess*, char*, int))); + connect( phpExeProc, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotPHPExeExited(KProcess*))); m_htmlView = new PHPHTMLView(this); mainWindow()->embedOutputView(m_htmlView->view(), i18n("PHP"), i18n("PHP")); - connect( m_htmlView, SIGNAL(started(KIO::Job*)), - this, SLOT(slotWebJobStarted(KIO::Job*))); + connect( m_htmlView, TQT_SIGNAL(started(KIO::Job*)), + this, TQT_SLOT(slotWebJobStarted(KIO::Job*))); configData = new PHPConfigData(projectDom()); - connect( configData, SIGNAL(configStored()), - this, SLOT(slotConfigStored())); + connect( configData, TQT_SIGNAL(configStored()), + this, TQT_SLOT(slotConfigStored())); m_codeCompletion = new PHPCodeCompletion(this, configData); - new KAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); + new KAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQT_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); - connect( partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part *))); - connect( this, SIGNAL(fileParsed( PHPFile* )), this, SLOT(slotfileParsed( PHPFile* ))); + connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect( this, TQT_SIGNAL(fileParsed( PHPFile* )), this, TQT_SLOT(slotfileParsed( PHPFile* ))); } PHPSupportPart::~PHPSupportPart() @@ -180,7 +180,7 @@ void PHPSupportPart::slotActivePartChanged(KParts::Part *part) { if (m_editInterface) { // connect to the editor disconnect(part, 0, this, 0 ); // to make sure that it is't connected twice if (configData->getRealtimeParsing()) { - connect(part,SIGNAL(textChanged()),this,SLOT(slotTextChanged())); + connect(part,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged())); } m_codeCompletion->setActiveEditorPart(part); } @@ -194,7 +194,7 @@ void PHPSupportPart::slotTextChanged() { if (!ro_part) return; - QString fileName = ro_part->url().directory() + "/" + ro_part->url().fileName(); + TQString fileName = ro_part->url().directory() + "/" + ro_part->url().fileName(); if (m_parser) { if (m_parser->hasFile( fileName )) @@ -208,13 +208,13 @@ void PHPSupportPart::slotConfigStored() { } void PHPSupportPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "source", KIcon::SizeMedium )); + TQVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "source", KIcon::SizeMedium )); PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget"); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } void PHPSupportPart::slotNewClass() { - QStringList classNames = sortedNameList( codeModel()->globalNamespace()->classList() ); + TQStringList classNames = sortedNameList( codeModel()->globalNamespace()->classList() ); PHPNewClassDlg dlg(classNames,project()->projectDirectory()); dlg.exec(); } @@ -240,9 +240,9 @@ bool PHPSupportPart::validateConfig() { KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, 0, "php config dialog"); - QVBox *vbox = dlg.addVBoxPage(i18n("PHP Settings")); + TQVBox *vbox = dlg.addVBoxPage(i18n("PHP Settings")); PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget"); - connect( &dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( &dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); dlg.exec(); } if (configData->validateConfig()) { @@ -257,8 +257,8 @@ void PHPSupportPart::executeOnWebserver() { return; //user cancelled // Figure out the name of the remote file - QString weburl = configData->getWebURL(); - QString file = getExecuteFile(); + TQString weburl = configData->getWebURL(); + TQString file = getExecuteFile(); // Force KHTMLPart to reload the page KParts::BrowserExtension* be = m_htmlView->browserExtension(); @@ -274,11 +274,11 @@ void PHPSupportPart::executeOnWebserver() { m_htmlView->show(); } -QString PHPSupportPart::getExecuteFile() { - QString file; +TQString PHPSupportPart::getExecuteFile() { + TQString file; PHPConfigData::StartupFileMode mode = configData->getStartupFileMode(); - QString weburl = configData->getWebURL(); + TQString weburl = configData->getWebURL(); if (mode == PHPConfigData::Current) { KParts::ReadOnlyPart *ro_part = dynamic_cast(partController()->activePart()); if (ro_part) { @@ -295,25 +295,25 @@ QString PHPSupportPart::getExecuteFile() { } void PHPSupportPart::slotWebJobStarted(KIO::Job* job) { - if (job && job->className() == QString("KIO::TransferJob")) { + if (job && job->className() == TQString("KIO::TransferJob")) { kdDebug(9018) << endl << "job started" << job->progressId(); KIO::TransferJob *tjob = static_cast(job); - connect( tjob, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(slotWebData(KIO::Job*, const QByteArray&))); - connect( tjob, SIGNAL(result(KIO::Job*)), - this, SLOT(slotWebResult(KIO::Job*))); + connect( tjob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotWebData(KIO::Job*, const TQByteArray&))); + connect( tjob, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotWebResult(KIO::Job*))); } } -void PHPSupportPart::slotWebData(KIO::Job* /*job*/,const QByteArray& data) { +void PHPSupportPart::slotWebData(KIO::Job* /*job*/,const TQByteArray& data) { kdDebug(9018) << "slotWebData()" << endl; - QString strData(data); + TQString strData(data); m_phpExeOutput += strData; } void PHPSupportPart::slotWebResult(KIO::Job* /*job*/) { kdDebug(9018) << "slotWebResult()" << endl; - QString file = getExecuteFile(); + TQString file = getExecuteFile(); PHPFile *pfile = new PHPFile(this, file); pfile->ParseStdout(m_phpExeOutput); delete pfile; @@ -326,7 +326,7 @@ void PHPSupportPart::executeInTerminal() { if (partController()->saveAllFiles()==false) return; //user cancelled - QString file = getExecuteFile(); + TQString file = getExecuteFile(); if (m_htmlView == 0) { m_htmlView = new PHPHTMLView(this); @@ -350,9 +350,9 @@ void PHPSupportPart::executeInTerminal() { void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStdout()" << endl; - m_phpExeOutput += QString::fromLocal8Bit(buffer,buflen+1); + m_phpExeOutput += TQString::fromLocal8Bit(buffer,buflen+1); - QString buf = buffer; + TQString buf = buffer; if (configData->getInvocationMode() == PHPConfigData::Shell) buf.replace("\n", "
    "); m_htmlView->write(buf); @@ -360,9 +360,9 @@ void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStderr()" << endl; - m_phpExeOutput += QString::fromLocal8Bit(buffer,buflen+1); + m_phpExeOutput += TQString::fromLocal8Bit(buffer,buflen+1); - QString buf = buffer; + TQString buf = buffer; if (configData->getInvocationMode() == PHPConfigData::Shell) buf.replace("\n", "
    "); m_htmlView->write(buf); @@ -371,7 +371,7 @@ void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, void PHPSupportPart::slotPHPExeExited (KProcess* /*proc*/) { kdDebug(9018) << "slotPHPExeExited()" << endl; m_htmlView->end(); - QString file = getExecuteFile(); + TQString file = getExecuteFile(); PHPFile *pfile = new PHPFile(this, file); pfile->ParseStdout(m_phpExeOutput); delete pfile; @@ -381,10 +381,10 @@ void PHPSupportPart::projectOpened() { kdDebug(9018) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); if (!m_parser) { m_parser = new PHPParser( this ); @@ -393,7 +393,7 @@ void PHPSupportPart::projectOpened() // We want to parse only after all components have been // properly initialized - QTimer::singleShot(500, this, SLOT( initialParse() ) ); + TQTimer::singleShot(500, this, TQT_SLOT( initialParse() ) ); } void PHPSupportPart::initialParse( ) @@ -432,7 +432,7 @@ bool PHPSupportPart::parseProject() _jd->files = project()->allFiles(); - QProgressBar* bar = new QProgressBar( _jd->files.count( ), mainWindow( ) ->statusBar( ) ); + TQProgressBar* bar = new TQProgressBar( _jd->files.count( ), mainWindow( ) ->statusBar( ) ); bar->setMinimumWidth( 120 ); bar->setCenterIndicator( true ); mainWindow()->statusBar()->addWidget( bar ); @@ -442,7 +442,7 @@ bool PHPSupportPart::parseProject() _jd->it = _jd->files.begin(); _jd->dir.setPath( project()->projectDirectory() ); - QTimer::singleShot( 0, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); return TRUE; } @@ -456,11 +456,11 @@ void PHPSupportPart::slotParseFiles() { _jd->progressBar->setProgress( _jd->progressBar->progress() + 1 ); - QFileInfo fileInfo( _jd->dir, *( _jd->it ) ); + TQFileInfo fileInfo( _jd->dir, *( _jd->it ) ); if ( fileInfo.exists() && fileInfo.isFile() && fileInfo.isReadable() ) { - QString absFilePath = URLUtil::canonicalPath( fileInfo.absFilePath() ); + TQString absFilePath = URLUtil::canonicalPath( fileInfo.absFilePath() ); // if ( isValidSource( absFilePath ) ) { @@ -470,7 +470,7 @@ void PHPSupportPart::slotParseFiles() ++( _jd->it ); } - QTimer::singleShot( 0, this, SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); } else // finished or interrupted { @@ -489,15 +489,15 @@ void PHPSupportPart::slotParseFiles() kapp->unlock(); } -void PHPSupportPart::addedFilesToProject(const QStringList &fileList) +void PHPSupportPart::addedFilesToProject(const TQStringList &fileList) { kdDebug(9018) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QFileInfo fileInfo( project()->projectDirectory(), *it ); + TQFileInfo fileInfo( project()->projectDirectory(), *it ); if (m_parser) { m_parser->addFile( fileInfo.absFilePath() ); emit addedSourceInfo( fileInfo.absFilePath() ); @@ -505,16 +505,16 @@ void PHPSupportPart::addedFilesToProject(const QStringList &fileList) } } -void PHPSupportPart::removedFilesFromProject(const QStringList &fileList) +void PHPSupportPart::removedFilesFromProject(const TQStringList &fileList) { kdDebug(9018) << "removedFilesFromProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QFileInfo fileInfo( project()->projectDirectory(), *it ); - QString path = fileInfo.absFilePath(); + TQFileInfo fileInfo( project()->projectDirectory(), *it ); + TQString path = fileInfo.absFilePath(); if ( codeModel()->hasFile(path) ) { emit aboutToRemoveSourceInfo( path ); codeModel()->removeFile( codeModel()->fileByName(path) ); @@ -535,12 +535,12 @@ void PHPSupportPart::savedFile(const KURL &fileName) */ } -QString PHPSupportPart::getIncludePath() +TQString PHPSupportPart::getIncludePath() { return configData->getPHPIncludePath(); } -QString PHPSupportPart::getExePath() +TQString PHPSupportPart::getExePath() { return configData->getPHPExecPath(); } @@ -563,9 +563,9 @@ KMimeType::List PHPSupportPart::mimeTypes( ) return list; } -void PHPSupportPart::customEvent( QCustomEvent* ev ) +void PHPSupportPart::customEvent( TQCustomEvent* ev ) { -// kdDebug(9018) << "phpSupportPart::customEvent(" << ev->type() << ") " << QThread::currentThread() << endl; +// kdDebug(9018) << "phpSupportPart::customEvent(" << ev->type() << ") " << TQThread::currentThread() << endl; if ( ev->type() < Event_AddFile || ev->type() > Event_AddFixme ) return; @@ -663,7 +663,7 @@ void PHPSupportPart::customEvent( QCustomEvent* ev ) else if ( event->name() == "protected" ) LastMethod->setAccess(FunctionModel::Protected); else if ( event->name() == "result" ) { - QString ret = ""; + TQString ret = ""; if (event->arguments().lower() == "$this" && LastClass ) { ret = LastClass->name(); } diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index 83478283..5f7ba13b 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -20,9 +20,9 @@ #ifndef _PHPSUPPORTPART_H_ #define _PHPSUPPORTPART_H_ -#include -#include -#include +#include +#include +#include #include #include "kdevlanguagesupport.h" @@ -46,17 +46,17 @@ class PHPSupportPart : public KDevLanguageSupport Q_OBJECT public: - PHPSupportPart( QObject *parent, const char *name, const QStringList & ); + PHPSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~PHPSupportPart(); PHPErrorView *ErrorView(); PHPParser *Parser( ) ; - QString getIncludePath(); - QString getExePath(); + TQString getIncludePath(); + TQString getExePath(); void emitFileParsed( PHPFile *file ); - virtual void customEvent( QCustomEvent* ev ); + virtual void customEvent( TQCustomEvent* ev ); protected: virtual Features features(); @@ -66,15 +66,15 @@ private slots: void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void slotRun(); void slotNewClass(); void projectConfigWidget(KDialogBase *dlg); void slotReceivedPHPExeStderr (KProcess* proc, char* buffer, int buflen); void slotReceivedPHPExeStdout (KProcess* proc, char* buffer, int buflen); void slotPHPExeExited (KProcess* proc); - void slotWebData(KIO::Job* job,const QByteArray& data); + void slotWebData(KIO::Job* job,const TQByteArray& data); void slotWebResult(KIO::Job* job); void slotWebJobStarted(KIO::Job* job); @@ -91,7 +91,7 @@ private slots: void slotConfigStored(); private: - QString getExecuteFile(); + TQString getExecuteFile(); void executeOnWebserver(); void executeInTerminal(); bool validateConfig(); @@ -99,7 +99,7 @@ private: PHPHTMLView* m_htmlView; PHPErrorView* m_phpErrorView; KShellProcess* phpExeProc; - QString m_phpExeOutput; + TQString m_phpExeOutput; PHPConfigData* configData; PHPCodeCompletion* m_codeCompletion; PHPParser* m_parser; @@ -107,13 +107,13 @@ private: struct JobData { - QDir dir; - QGuardedPtr progressBar; - QStringList::Iterator it; - QStringList files; - QMap< QString, QPair > pcs; - QDataStream stream; - QFile file; + TQDir dir; + TQGuardedPtr progressBar; + TQStringList::Iterator it; + TQStringList files; + TQMap< TQString, QPair > pcs; + TQDataStream stream; + TQFile file; ~JobData() { diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index 79f184d7..4b70e170 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include @@ -16,7 +16,7 @@ using namespace KIO; -PydocProtocol::PydocProtocol(const QCString &pool, const QCString &app) +PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app) : SlaveBase("pydoc", pool, app), key() { python = KGlobal::dirs()->findExe("python"); @@ -33,7 +33,7 @@ void PydocProtocol::get(const KURL& url) mimeType("text/html"); key = url.path(); - QString cmd = KProcess::quote(python); + TQString cmd = KProcess::quote(python); cmd += " "; cmd += KProcess::quote(script); cmd += " -w "; @@ -41,7 +41,7 @@ void PydocProtocol::get(const KURL& url) FILE *fd = popen(cmd.local8Bit().data(), "r"); char buffer[4096]; - QByteArray array; + TQByteArray array; while (!feof(fd)) { int n = fread(buffer, 1, 2048, fd); @@ -66,9 +66,9 @@ void PydocProtocol::mimetype(const KURL&) } -QCString PydocProtocol::errorMessage() +TQCString PydocProtocol::errorMessage() { - return QCString( "" + i18n("Error in pydoc").local8Bit() + "" ); + return TQCString( "" + i18n("Error in pydoc").local8Bit() + "" ); } diff --git a/languages/python/pydoc.h b/languages/python/pydoc.h index e17a257a..9e848a04 100644 --- a/languages/python/pydoc.h +++ b/languages/python/pydoc.h @@ -1,14 +1,14 @@ #ifndef _PYDOC_H_ #define _PYDOC_H_ -#include +#include #include class PydocProtocol : public KIO::SlaveBase { public: - PydocProtocol(const QCString &pool, const QCString &app); + PydocProtocol(const TQCString &pool, const TQCString &app); virtual ~PydocProtocol(); virtual void get(const KURL& url); @@ -18,13 +18,13 @@ public: protected: void decodeURL(const KURL &url); - void decodePath(QString path); - QCString errorMessage(); + void decodePath(TQString path); + TQCString errorMessage(); private: - QString python; - QString script; - QString key; + TQString python; + TQString script; + TQString key; }; #endif diff --git a/languages/python/pythonconfigwidget.cpp b/languages/python/pythonconfigwidget.cpp index 87472477..29103705 100644 --- a/languages/python/pythonconfigwidget.cpp +++ b/languages/python/pythonconfigwidget.cpp @@ -11,13 +11,13 @@ #include "pythonconfigwidget.h" -#include +#include #include #include "domutil.h" -PythonConfigWidget::PythonConfigWidget(QDomDocument &projectDom, - QWidget *parent, const char *name) +PythonConfigWidget::PythonConfigWidget(TQDomDocument &projectDom, + TQWidget *parent, const char *name) : PythonConfigWidgetBase(parent, name), dom(projectDom) { interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevpythonsupport/run/interpreter")); diff --git a/languages/python/pythonconfigwidget.h b/languages/python/pythonconfigwidget.h index 22708c29..674b8e3c 100644 --- a/languages/python/pythonconfigwidget.h +++ b/languages/python/pythonconfigwidget.h @@ -13,7 +13,7 @@ #define _PYTHONCONFIGWIDGET_H_ #include "pythonconfigwidgetbase.h" -#include +#include class PythonConfigWidget : public PythonConfigWidgetBase @@ -21,14 +21,14 @@ class PythonConfigWidget : public PythonConfigWidgetBase Q_OBJECT public: - PythonConfigWidget( QDomDocument &projectDom, QWidget *parent=0, const char *name=0 ); + PythonConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 ); ~PythonConfigWidget(); public slots: void accept(); private: - QDomDocument &dom; + TQDomDocument &dom; }; #endif diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp index 439c7706..9aba5441 100644 --- a/languages/python/pythonimplementationwidget.cpp +++ b/languages/python/pythonimplementationwidget.cpp @@ -19,11 +19,11 @@ ***************************************************************************/ #include "pythonimplementationwidget.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -34,7 +34,7 @@ #include PythonImplementationWidget::PythonImplementationWidget(KDevLanguageSupport* part, - QWidget* parent, const char* name, bool modal) + TQWidget* parent, const char* name, bool modal) : ImplementationWidget(part, parent, name, modal) { } @@ -45,31 +45,31 @@ PythonImplementationWidget::~PythonImplementationWidget() } -QStringList PythonImplementationWidget::createClassFiles() +TQStringList PythonImplementationWidget::createClassFiles() { -// QString template_py = "require '$BASEFILENAME$'\n\nclass $CLASSNAME$ < $BASECLASSNAME$\n\n def initialize(*k)\n super(*k)\n end\n\nend\n"; - QString template_py = "from qt import *\nfrom $BASEFILENAME$ import *\nclass $CLASSNAME$($BASECLASSNAME$):\n\n def __init__(self,parent,name):\n $BASECLASSNAME$.__init__(self,parent,name)\n \n\n\n"; +// TQString template_py = "require '$BASEFILENAME$'\n\nclass $CLASSNAME$ < $BASECLASSNAME$\n\n def initialize(*k)\n super(*k)\n end\n\nend\n"; + TQString template_py = "from qt import *\nfrom $BASEFILENAME$ import *\nclass $CLASSNAME$($BASECLASSNAME$):\n\n def __init__(self,parent,name):\n $BASECLASSNAME$.__init__(self,parent,name)\n \n\n\n"; - QFileInfo formInfo(m_formName); - template_py.replace(QRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".py"); - template_py.replace(QRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); - template_py.replace(QRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); + TQFileInfo formInfo(m_formName); + template_py.replace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".py"); + template_py.replace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); + template_py.replace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); template_py = FileTemplate::read(m_part, "py") + template_py; - QString file_py = fileNameEdit->text() + ".py"; + TQString file_py = fileNameEdit->text() + ".py"; if (!m_part->project()->activeDirectory().isEmpty()) file_py = m_part->project()->activeDirectory() + "/" + file_py; - QFile file(QDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + file_py)); + TQFile file(TQDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + file_py)); if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("Cannot write to file")); - return QStringList(); + return TQStringList(); } - QTextStream stream(&file); + TQTextStream stream(&file); stream << template_py; file.close(); - QStringList files; + TQStringList files; files.append(file_py); return files; } diff --git a/languages/python/pythonimplementationwidget.h b/languages/python/pythonimplementationwidget.h index e767ecc9..e8838bab 100644 --- a/languages/python/pythonimplementationwidget.h +++ b/languages/python/pythonimplementationwidget.h @@ -26,11 +26,11 @@ class PythonImplementationWidget : public ImplementationWidget { Q_OBJECT public: - PythonImplementationWidget(KDevLanguageSupport* part, QWidget* parent = 0, const char* name = 0, bool modal = true); + PythonImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true); ~PythonImplementationWidget(); - virtual QStringList createClassFiles(); + virtual TQStringList createClassFiles(); }; diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 1b0e76da..9e6b0b0c 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -19,12 +19,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "qtdesignerpythonintegration.h" #include "pythonimplementationwidget.h" @@ -42,44 +42,44 @@ typedef KDevGenericFactory PythonSupportFactory; static const KDevPluginInfo data("kdevpythonsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) ) -PythonSupportPart::PythonSupportPart(QObject *parent, const char *name, const QStringList &) +PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &) : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart") { setInstance(PythonSupportFactory::instance()); setXMLFile("kdevpythonsupport.rc"); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), - this, SLOT(savedFile(const KURL&)) ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), + this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); KAction *action; action = new KAction( i18n("Execute Program"), "exec", 0, - this, SLOT(slotExecute()), + this, TQT_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Execute program") ); action->setWhatsThis(i18n("Execute program

    Runs the Python program.")); action = new KAction( i18n("Execute String..."), "exec", 0, - this, SLOT(slotExecuteString()), + this, TQT_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Execute string") ); action->setWhatsThis(i18n("Execute String

    Executes a string as Python code.")); action = new KAction( i18n("Start Python Interpreter"), "exec", 0, - this, SLOT(slotStartInterpreter()), + this, TQT_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Start Python interpreter") ); action->setWhatsThis(i18n("Start python interpreter

    Starts the Python interpreter without a program")); action = new KAction( i18n("Python Documentation..."), 0, - this, SLOT(slotPydoc()), + this, TQT_SLOT(slotPydoc()), actionCollection(), "help_pydoc" ); action->setToolTip( i18n("Python documentation") ); action->setWhatsThis(i18n("Python documentation

    Shows a Python documentation page.")); @@ -90,7 +90,7 @@ PythonSupportPart::~PythonSupportPart() {} -void PythonSupportPart::contextMenu(QPopupMenu *popup, const Context *context) +void PythonSupportPart::contextMenu(TQPopupMenu *popup, const Context *context) { if (context->hasType(Context::FileContext)){ const FileContext *fc = static_cast(context); @@ -99,7 +99,7 @@ void PythonSupportPart::contextMenu(QPopupMenu *popup, const Context *context) if (url.fileName().endsWith(".ui")) { m_contextFileName = url.fileName(); - int id = popup->insertItem(i18n("Create or Select Implementation..."), this, SLOT(slotCreateSubclass())); + int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); popup->setWhatsThis(id, i18n("Create or select implementation

    Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } @@ -108,9 +108,9 @@ void PythonSupportPart::contextMenu(QPopupMenu *popup, const Context *context) void PythonSupportPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Python")); + TQVBox *vbox = dlg->addVBoxPage(i18n("Python")); PythonConfigWidget *w = new PythonConfigWidget(*projectDom(), vbox, "python config widget"); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } @@ -118,14 +118,14 @@ void PythonSupportPart::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - QTimer::singleShot(0, this, SLOT(initialParse())); + TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); } @@ -134,9 +134,9 @@ void PythonSupportPart::projectClosed() } -void PythonSupportPart::maybeParse(const QString fileName) +void PythonSupportPart::maybeParse(const TQString fileName) { - QFileInfo fi(fileName); + TQFileInfo fi(fileName); if (fi.extension() == "py") { if( codeModel()->hasFile(fileName) ){ @@ -155,8 +155,8 @@ void PythonSupportPart::initialParse() if (project()) { kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) { + TQStringList files = project()->allFiles(); + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; maybeParse(project()->projectDirectory() + "/" + *it); } @@ -169,15 +169,15 @@ void PythonSupportPart::initialParse() } -void PythonSupportPart::addedFilesToProject(const QStringList &fileList) +void PythonSupportPart::addedFilesToProject(const TQStringList &fileList) { kdDebug(9014) << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); maybeParse( fileName ); emit addedSourceInfo( fileName ); } @@ -186,15 +186,15 @@ void PythonSupportPart::addedFilesToProject(const QStringList &fileList) } -void PythonSupportPart::removedFilesFromProject(const QStringList &fileList) +void PythonSupportPart::removedFilesFromProject(const TQStringList &fileList) { kdDebug(9014) << "removedFilesFromProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); if( codeModel()->hasFile(fileName) ){ emit aboutToRemoveSourceInfo( fileName ); @@ -237,22 +237,22 @@ KMimeType::List PythonSupportPart::mimeTypes( ) return list; } -void PythonSupportPart::parse(const QString &fileName) +void PythonSupportPart::parse(const TQString &fileName) { - QFile f(QFile::encodeName(fileName)); + TQFile f(TQFile::encodeName(fileName)); if (!f.open(IO_ReadOnly)) return; - QTextStream stream(&f); + TQTextStream stream(&f); - QRegExp classre("^[ \t]*class[ \t]+([A-Za-z0-9_]+)[ \t]*(\\(([A-Za-z0-9_, \t]+)\\))?.*$"); - QRegExp methodre("^[ \t]*def[ \t]+([A-Za-z0-9_]+).*$"); + TQRegExp classre("^[ \t]*class[ \t]+([A-Za-z0-9_]+)[ \t]*(\\(([A-Za-z0-9_, \t]+)\\))?.*$"); + TQRegExp methodre("^[ \t]*def[ \t]+([A-Za-z0-9_]+).*$"); FileDom m_file = codeModel()->create(); m_file->setName( fileName ); ClassDom lastClass; - QString rawline; - QCString line; + TQString rawline; + TQCString line; int lineNo = 0; while (!stream.atEnd()) { rawline = stream.readLine(); @@ -264,10 +264,10 @@ void PythonSupportPart::parse(const QString &fileName) lastClass->setFileName( fileName ); lastClass->setStartPosition( lineNo, 0 ); - QStringList parentList = QStringList::split(",", classre.cap(3)); - QStringList::ConstIterator it; + TQStringList parentList = TQStringList::split(",", classre.cap(3)); + TQStringList::ConstIterator it; for (it = parentList.begin(); it != parentList.end(); ++it) { - QString baseName = (*it).stripWhiteSpace(); + TQString baseName = (*it).stripWhiteSpace(); kdDebug(9014) << "Add parent" << baseName << endl; lastClass->addBaseClass( baseName ); } @@ -296,7 +296,7 @@ void PythonSupportPart::parse(const QString &fileName) if (lastClass && rawline.left(3) != "def") { if( !lastClass->hasFunction(method->name()) ) lastClass->addFunction( method ); - QStringList scope; + TQStringList scope; scope << lastClass->name(); method->setScope( scope ); @@ -314,9 +314,9 @@ void PythonSupportPart::parse(const QString &fileName) } -QString PythonSupportPart::interpreter() +TQString PythonSupportPart::interpreter() { - QString prog = DomUtil::readEntry(*projectDom(), "/kdevpythonsupport/run/interpreter"); + TQString prog = DomUtil::readEntry(*projectDom(), "/kdevpythonsupport/run/interpreter"); if (prog.isEmpty()) prog = "python"; @@ -324,18 +324,18 @@ QString PythonSupportPart::interpreter() } -void PythonSupportPart::startApplication(const QString &program) +void PythonSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevpythonsupport/run/terminal"); if (KDevAppFrontend *appFrontend = extension("KDevelop/AppFrontend")) - appFrontend->startAppCommand(QString::QString(), program, inTerminal); + appFrontend->startAppCommand(TQString::TQString(), program, inTerminal); } void PythonSupportPart::slotExecute() { - QString program = project()->mainProgram(); - QString cmd = interpreter() + " " + program; + TQString program = project()->mainProgram(); + TQString cmd = interpreter() + " " + program; startApplication(cmd); } @@ -349,7 +349,7 @@ void PythonSupportPart::slotStartInterpreter() void PythonSupportPart::slotExecuteString() { bool ok; - QString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), QString::null, &ok, 0); + TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString::null, &ok, 0); if (ok) { cmd.prepend("'"); cmd.append("'"); @@ -361,9 +361,9 @@ void PythonSupportPart::slotExecuteString() void PythonSupportPart::slotPydoc() { bool ok; - QString key = KInputDialog::getText(i18n("Show Python Documentation"), i18n("Show Python documentation on keyword:"), "", &ok, 0); + TQString key = KInputDialog::getText(i18n("Show Python Documentation"), i18n("Show Python documentation on keyword:"), "", &ok, 0); if (ok && !key.isEmpty()) { - QString url = "pydoc:"; + TQString url = "pydoc:"; url += key; partController()->showDocument(KURL(url)); } @@ -394,7 +394,7 @@ KDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::Designe void PythonSupportPart::slotCreateSubclass() { - QFileInfo fi(m_contextFileName); + TQFileInfo fi(m_contextFileName); kdDebug(9014) << k_funcinfo << " file: " << m_contextFileName << " ext: " << fi.extension(false) << endl; if (fi.extension(false) != "ui") return; diff --git a/languages/python/pythonsupportpart.h b/languages/python/pythonsupportpart.h index ad2085e5..efa6f51c 100644 --- a/languages/python/pythonsupportpart.h +++ b/languages/python/pythonsupportpart.h @@ -25,13 +25,13 @@ class PythonSupportPart : public KDevLanguageSupport Q_OBJECT public: - PythonSupportPart( QObject *parent, const char *name, const QStringList & ); + PythonSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~PythonSupportPart(); virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); public slots: - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void slotCreateSubclass(); protected: @@ -43,8 +43,8 @@ private slots: void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void slotExecute(); void slotExecuteString(); void slotStartInterpreter(); @@ -54,13 +54,13 @@ private slots: void slotPydoc(); private: - QString interpreter(); - void startApplication(const QString &program); - void maybeParse(const QString fileName); - void parse(const QString &fileName); + TQString interpreter(); + void startApplication(const TQString &program); + void maybeParse(const TQString fileName); + void parse(const TQString &fileName); - QMap m_designers; - QString m_contextFileName; + TQMap m_designers; + TQString m_contextFileName; }; #endif diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp index a4e324ed..53950f65 100644 --- a/languages/python/qtdesignerpythonintegration.cpp +++ b/languages/python/qtdesignerpythonintegration.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "qtdesignerpythonintegration.h" -#include -#include +#include +#include #include #include @@ -55,7 +55,7 @@ void QtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Functio KTextEditor::EditInterface* editIface = dynamic_cast( m_part->partController()->activePart() ); if( !editIface ){ /// @todo show messagebox -// QDialog::accept(); +// TQDialog::accept(); return; } @@ -77,9 +77,9 @@ void QtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Functio point.second = funEndColumn; } - QString func = function.function; + TQString func = function.function; func.replace("()", ""); - QString str = " def " + func + "(self):\n\n"; + TQString str = " def " + func + "(self):\n\n"; kdDebug(9014) << "insert " << str << " into " << point.first << endl; diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp index 8d6af02d..46086a9e 100644 --- a/languages/ruby/app_templates/dcopservice/app.cpp +++ b/languages/ruby/app_templates/dcopservice/app.cpp @@ -1,24 +1,24 @@ #include -#include -#include +#include +#include #include #include int main(int argc, char **argv) { KInstance * instance = new KInstance("%{APPNAMELC}"); - QString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); + TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n"); } - QFileInfo program(appdir); + TQFileInfo program(appdir); char ** rubyargs = (char **) calloc(argc+4, sizeof(char *)); rubyargs[0] = strdup(argv[0]); rubyargs[1] = strdup("-KU"); - rubyargs[2] = strdup(QString("-C%1").arg(program.dirPath()).latin1()); - rubyargs[3] = strdup(QString("-I%1").arg(program.dirPath()).latin1()); + rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1()); + rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1()); rubyargs[4] = strdup(program.fileName().latin1()); for (int i = 1; i < argc; i++) { rubyargs[i+4] = argv[i]; diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp index 8d6af02d..46086a9e 100644 --- a/languages/ruby/app_templates/kapp/app.cpp +++ b/languages/ruby/app_templates/kapp/app.cpp @@ -1,24 +1,24 @@ #include -#include -#include +#include +#include #include #include int main(int argc, char **argv) { KInstance * instance = new KInstance("%{APPNAMELC}"); - QString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); + TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n"); } - QFileInfo program(appdir); + TQFileInfo program(appdir); char ** rubyargs = (char **) calloc(argc+4, sizeof(char *)); rubyargs[0] = strdup(argv[0]); rubyargs[1] = strdup("-KU"); - rubyargs[2] = strdup(QString("-C%1").arg(program.dirPath()).latin1()); - rubyargs[3] = strdup(QString("-I%1").arg(program.dirPath()).latin1()); + rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1()); + rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1()); rubyargs[4] = strdup(program.fileName().latin1()); for (int i = 1; i < argc; i++) { rubyargs[i+4] = argv[i]; diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp index 8d6af02d..46086a9e 100644 --- a/languages/ruby/app_templates/kxt/app.cpp +++ b/languages/ruby/app_templates/kxt/app.cpp @@ -1,24 +1,24 @@ #include -#include -#include +#include +#include #include #include int main(int argc, char **argv) { KInstance * instance = new KInstance("%{APPNAMELC}"); - QString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); + TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n"); } - QFileInfo program(appdir); + TQFileInfo program(appdir); char ** rubyargs = (char **) calloc(argc+4, sizeof(char *)); rubyargs[0] = strdup(argv[0]); rubyargs[1] = strdup("-KU"); - rubyargs[2] = strdup(QString("-C%1").arg(program.dirPath()).latin1()); - rubyargs[3] = strdup(QString("-I%1").arg(program.dirPath()).latin1()); + rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1()); + rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1()); rubyargs[4] = strdup(program.fileName().latin1()); for (int i = 1; i < argc; i++) { rubyargs[i+4] = argv[i]; diff --git a/languages/ruby/debugger/breakpoint.cpp b/languages/ruby/debugger/breakpoint.cpp index f210e359..c9a91ec4 100644 --- a/languages/ruby/debugger/breakpoint.cpp +++ b/languages/ruby/debugger/breakpoint.cpp @@ -23,11 +23,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -67,12 +67,12 @@ Breakpoint::~Breakpoint() /***************************************************************************/ -QString Breakpoint::dbgRemoveCommand() const +TQString Breakpoint::dbgRemoveCommand() const { // if (dbgId_>0) -// return QString("delete %1").arg(dbgId_); // gdb command - not translatable +// return TQString("delete %1").arg(dbgId_); // gdb command - not translatable - return QString(); + return TQString(); } /***************************************************************************/ @@ -115,9 +115,9 @@ void Breakpoint::setActive(int active, int id) /***************************************************************************/ -QString Breakpoint::statusDisplay(int activeFlag) const +TQString Breakpoint::statusDisplay(int activeFlag) const { - QString status=""; + TQString status=""; if (!s_enabled_) status = i18n("Disabled"); else @@ -141,7 +141,7 @@ QString Breakpoint::statusDisplay(int activeFlag) const /***************************************************************************/ /***************************************************************************/ -FilePosBreakpoint::FilePosBreakpoint(const QString &fileName, int lineNum, +FilePosBreakpoint::FilePosBreakpoint(const TQString &fileName, int lineNum, bool temporary, bool enabled) : Breakpoint(temporary, enabled), fileName_(fileName), @@ -157,13 +157,13 @@ FilePosBreakpoint::~FilePosBreakpoint() /***************************************************************************/ -QString FilePosBreakpoint::dbgSetCommand() const +TQString FilePosBreakpoint::dbgSetCommand() const { - QString cmdStr; + TQString cmdStr; if (fileName_.isEmpty()) - cmdStr = QString("break %1").arg(lineNo_); // gdb command - not translatable + cmdStr = TQString("break %1").arg(lineNo_); // gdb command - not translatable else { - cmdStr = QString("break %1:%2").arg(fileName_).arg(lineNo_); + cmdStr = TQString("break %1:%2").arg(fileName_).arg(lineNo_); } if (isTemporary()) @@ -192,26 +192,26 @@ bool FilePosBreakpoint::match(const Breakpoint *brkpt) const /***************************************************************************/ -QString FilePosBreakpoint::location(bool compact) +TQString FilePosBreakpoint::location(bool compact) { if (compact) - return QFileInfo(fileName_).fileName()+":"+QString::number(lineNo_); + return TQFileInfo(fileName_).fileName()+":"+TQString::number(lineNo_); - return fileName_+":"+QString::number(lineNo_); + return fileName_+":"+TQString::number(lineNo_); } /***************************************************************************/ -void FilePosBreakpoint::setLocation(const QString& location) +void FilePosBreakpoint::setLocation(const TQString& location) { - QRegExp regExp1("(.*):(\\d+)$"); + TQRegExp regExp1("(.*):(\\d+)$"); regExp1.setMinimal(true); if ( regExp1.search(location, 0) >= 0 ) { - QString t = regExp1.cap(1); - QString dirPath = QFileInfo(t).dirPath(); + TQString t = regExp1.cap(1); + TQString dirPath = TQFileInfo(t).dirPath(); if ( dirPath == "." ) - fileName_ = QFileInfo(fileName_).dirPath()+"/"+regExp1.cap(1); + fileName_ = TQFileInfo(fileName_).dirPath()+"/"+regExp1.cap(1); else fileName_ = regExp1.cap(1); @@ -223,7 +223,7 @@ void FilePosBreakpoint::setLocation(const QString& location) /***************************************************************************/ /***************************************************************************/ -Watchpoint::Watchpoint(const QString& varName, bool temporary, bool enabled) +Watchpoint::Watchpoint(const TQString& varName, bool temporary, bool enabled) : Breakpoint(temporary, enabled), varName_(varName) { @@ -237,9 +237,9 @@ Watchpoint::~Watchpoint() /***************************************************************************/ -QString Watchpoint::dbgSetCommand() const +TQString Watchpoint::dbgSetCommand() const { - return QString("watch ")+varName_; // gdb command - not translatable + return TQString("watch ")+varName_; // gdb command - not translatable } /***************************************************************************/ @@ -263,7 +263,7 @@ bool Watchpoint::match(const Breakpoint* brkpt) const /***************************************************************************/ /***************************************************************************/ -Catchpoint::Catchpoint(const QString& varName, bool temporary, bool enabled) +Catchpoint::Catchpoint(const TQString& varName, bool temporary, bool enabled) : Breakpoint(temporary, enabled), varName_(varName) { @@ -277,9 +277,9 @@ Catchpoint::~Catchpoint() /***************************************************************************/ -QString Catchpoint::dbgSetCommand() const +TQString Catchpoint::dbgSetCommand() const { - return QString("catch ")+varName_; // gdb command - not translatable + return TQString("catch ")+varName_; // gdb command - not translatable } /***************************************************************************/ @@ -303,7 +303,7 @@ bool Catchpoint::match(const Breakpoint* brkpt) const /***************************************************************************/ /***************************************************************************/ -FunctionBreakpoint::FunctionBreakpoint(const QString& functionName, bool temporary, bool enabled) +FunctionBreakpoint::FunctionBreakpoint(const TQString& functionName, bool temporary, bool enabled) : Breakpoint(temporary, enabled), m_functionName(functionName) { @@ -317,9 +317,9 @@ FunctionBreakpoint::~FunctionBreakpoint() /***************************************************************************/ -QString FunctionBreakpoint::dbgSetCommand() const +TQString FunctionBreakpoint::dbgSetCommand() const { - return QString("break ")+m_functionName; // gdb command - not translatable + return TQString("break ")+m_functionName; // gdb command - not translatable } /***************************************************************************/ diff --git a/languages/ruby/debugger/breakpoint.h b/languages/ruby/debugger/breakpoint.h index e45e3856..91f1c8db 100644 --- a/languages/ruby/debugger/breakpoint.h +++ b/languages/ruby/debugger/breakpoint.h @@ -24,7 +24,7 @@ #include -#include +#include /***************************************************************************/ /***************************************************************************/ @@ -48,8 +48,8 @@ public: Breakpoint(bool temporary=false, bool enabled=true); virtual ~Breakpoint(); - virtual QString dbgSetCommand() const = 0; - virtual QString dbgRemoveCommand() const; + virtual TQString dbgSetCommand() const = 0; + virtual TQString dbgRemoveCommand() const; virtual bool match(const Breakpoint* brkpt) const = 0; virtual void reset(); @@ -84,12 +84,12 @@ public: void setDbgId(int dbgId) { dbgId_ = dbgId; } int dbgId() const { return dbgId_; } - virtual QString statusDisplay(int activeFlag) const; + virtual TQString statusDisplay(int activeFlag) const; virtual BP_TYPES type() const { return BP_TYPE_Invalid; } - virtual QString displayType() const { return i18n( "Invalid" ); } + virtual TQString displayType() const { return i18n( "Invalid" ); } - virtual QString location(bool compact=true) = 0; - virtual void setLocation(const QString& ) = 0; + virtual TQString location(bool compact=true) = 0; + virtual void setLocation(const TQString& ) = 0; virtual bool isValid() const = 0; private: @@ -109,8 +109,8 @@ private: int active_; // counter incremented on receipt of all BP's int ignoreCount_; - QString condition_; -// QString type_; + TQString condition_; +// TQString type_; }; /***************************************************************************/ @@ -119,24 +119,24 @@ private: class FilePosBreakpoint : public Breakpoint { public: - FilePosBreakpoint(const QString &fileName, int lineNum, + FilePosBreakpoint(const TQString &fileName, int lineNum, bool temporary=false, bool enabled=true); virtual ~FilePosBreakpoint(); - virtual QString dbgSetCommand() const; + virtual TQString dbgSetCommand() const; virtual bool match(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_FilePos; } - QString displayType() const { return i18n( "File:line" ); } - void setFileName(const QString& fileName) { fileName_ = fileName; } - QString fileName() const { return fileName_; } + TQString displayType() const { return i18n( "File:line" ); } + void setFileName(const TQString& fileName) { fileName_ = fileName; } + TQString fileName() const { return fileName_; } void setLineNum(int lineNum) { lineNo_ = lineNum; } int lineNum() const { return lineNo_; } - QString location(bool compact=true); - void setLocation(const QString& location); + TQString location(bool compact=true); + void setLocation(const TQString& location); bool isValid() const { return lineNo_>0 && !fileName_.isEmpty(); } private: - QString fileName_; + TQString fileName_; int lineNo_; }; @@ -146,21 +146,21 @@ private: class Watchpoint : public Breakpoint { public: - Watchpoint(const QString &varName, bool temporary=false, bool enabled=true); + Watchpoint(const TQString &varName, bool temporary=false, bool enabled=true); virtual ~Watchpoint(); - virtual QString dbgSetCommand() const; + virtual TQString dbgSetCommand() const; bool match(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_Watchpoint; } - QString displayType() const { return i18n("Watchpoint"); } - void setVarName(const QString& varName) { varName_ = varName; } - QString varName() const { return varName_; } - QString location(bool) { return varName_; } - void setLocation(const QString& location) { varName_ = location; } + TQString displayType() const { return i18n("Watchpoint"); } + void setVarName(const TQString& varName) { varName_ = varName; } + TQString varName() const { return varName_; } + TQString location(bool) { return varName_; } + void setLocation(const TQString& location) { varName_ = location; } bool isValid() const { return !varName_.isEmpty(); } private: - QString varName_; + TQString varName_; }; /***************************************************************************/ @@ -169,21 +169,21 @@ private: class Catchpoint : public Breakpoint { public: - Catchpoint(const QString &varName, bool temporary=false, bool enabled=true); + Catchpoint(const TQString &varName, bool temporary=false, bool enabled=true); virtual ~Catchpoint(); - virtual QString dbgSetCommand() const; + virtual TQString dbgSetCommand() const; bool match(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_Catchpoint; } - QString displayType() const { return i18n("Catchpoint"); } - void setVarName(const QString& varName) { varName_ = varName; } - QString varName() const { return varName_; } - QString location(bool) { return varName_; } - void setLocation(const QString& location) { varName_ = location; } + TQString displayType() const { return i18n("Catchpoint"); } + void setVarName(const TQString& varName) { varName_ = varName; } + TQString varName() const { return varName_; } + TQString location(bool) { return varName_; } + void setLocation(const TQString& location) { varName_ = location; } bool isValid() const { return !varName_.isEmpty(); } private: - QString varName_; + TQString varName_; }; /***************************************************************************/ @@ -192,21 +192,21 @@ private: class FunctionBreakpoint : public Breakpoint { public: - FunctionBreakpoint(const QString &functionName, bool temporary=false, bool enabled=true); + FunctionBreakpoint(const TQString &functionName, bool temporary=false, bool enabled=true); virtual ~FunctionBreakpoint(); - virtual QString dbgSetCommand() const; + virtual TQString dbgSetCommand() const; bool match(const Breakpoint *brkpt) const; BP_TYPES type () const { return BP_TYPE_Function; } - QString displayType() const { return i18n("Method()"); } - void setfunctionName(const QString& functionName) { m_functionName = functionName; } - QString functionName() const { return m_functionName; } - QString location(bool) { return m_functionName; }; - void setLocation(const QString& location) { m_functionName = location; } + TQString displayType() const { return i18n("Method()"); } + void setfunctionName(const TQString& functionName) { m_functionName = functionName; } + TQString functionName() const { return m_functionName; } + TQString location(bool) { return m_functionName; }; + void setLocation(const TQString& location) { m_functionName = location; } bool isValid() const { return !m_functionName.isEmpty(); } private: - QString m_functionName; + TQString m_functionName; }; } diff --git a/languages/ruby/debugger/dbgcommand.cpp b/languages/ruby/debugger/dbgcommand.cpp index 6c6a24ec..7d958091 100644 --- a/languages/ruby/debugger/dbgcommand.cpp +++ b/languages/ruby/debugger/dbgcommand.cpp @@ -21,7 +21,7 @@ #include "dbgcommand.h" -#include +#include /***************************************************************************/ /***************************************************************************/ @@ -30,7 +30,7 @@ namespace RDBDebugger { -DbgCommand::DbgCommand(const QCString& command, bool isRunCmd, bool isInfoCmd) : +DbgCommand::DbgCommand(const TQCString& command, bool isRunCmd, bool isInfoCmd) : command_(command), isRunCmd_(isRunCmd), isInfoCmd_(isInfoCmd), diff --git a/languages/ruby/debugger/dbgcommand.h b/languages/ruby/debugger/dbgcommand.h index 32ec7f7a..6cea2afb 100644 --- a/languages/ruby/debugger/dbgcommand.h +++ b/languages/ruby/debugger/dbgcommand.h @@ -22,7 +22,7 @@ #ifndef DBGCOMMAND_H #define DBGCOMMAND_H -#include +#include /** * @author John Birch @@ -34,21 +34,21 @@ namespace RDBDebugger class DbgCommand { public: - DbgCommand(const QCString& command, bool isRunCmd, bool isInfoCmd); + DbgCommand(const TQCString& command, bool isRunCmd, bool isInfoCmd); virtual ~DbgCommand() {}; - virtual QCString& cmdToSend() { sent_ = true; return cmdBuffer_; } + virtual TQCString& cmdToSend() { sent_ = true; return cmdBuffer_; } virtual int cmdLength() { return cmdBuffer_.length(); } - QCString rawDbgCommand() const { return command_; } + TQCString rawDbgCommand() const { return command_; } bool isARunCmd() const { return isRunCmd_;} bool isAnInfoCmd() const { return isInfoCmd_; } bool moreToSend() const { return !sent_; } bool expectReply() const { return waitForReply_; } protected: - QCString cmdBuffer_; - QCString command_; + TQCString cmdBuffer_; + TQCString command_; bool isRunCmd_; bool isInfoCmd_; bool sent_; diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h index 13ee4382..f0b08981 100644 --- a/languages/ruby/debugger/dbgcontroller.h +++ b/languages/ruby/debugger/dbgcontroller.h @@ -22,7 +22,7 @@ #ifndef _DBGCONTROLLER_H_ #define _DBGCONTROLLER_H_ -#include +#include #include class KProcess; @@ -105,19 +105,19 @@ public slots: * \param run_arguments Command line arguments to be passed to the application * \param show_constants Show ruby constants in the variables view */ - virtual void slotStart(const QString& ruby_interpreter, - const QString& character_coding, - const QString& run_directory, - const QString& debuggee_path, - const QString& application, - const QString& run_arguments, + virtual void slotStart(const TQString& ruby_interpreter, + const TQString& character_coding, + const TQString& run_directory, + const TQString& debuggee_path, + const TQString& application, + const TQString& run_arguments, bool show_constants, bool trace_into_ruby) = 0; virtual void slotStopDebugger() = 0; virtual void slotRun() = 0; - virtual void slotRunUntil(const QString &fileName, int lineNum) = 0; + virtual void slotRunUntil(const TQString &fileName, int lineNum) = 0; virtual void slotStepInto() = 0; virtual void slotStepOver() = 0; virtual void slotStepOutOff() = 0; @@ -127,9 +127,9 @@ public slots: virtual void slotExpandItem(VarItem *parent, - const QCString &userRequest) = 0; + const TQCString &userRequest) = 0; virtual void slotSelectFrame(int frame, int thread, - const QString& frameName) = 0; + const TQString& frameName) = 0; virtual void slotFetchGlobals(bool fetch) = 0; protected slots: @@ -142,15 +142,15 @@ protected slots: virtual void slotReadFromSocket(int socket) = 0; signals: - void gotoSourcePosition (const QString &fileName, int lineNum); + void gotoSourcePosition (const TQString &fileName, int lineNum); void rawRDBBreakpointList (char *buf); void rawRDBBreakpointSet (char *buf, int key); void ttyStdout (const char *output); void ttyStderr (const char *output); void rdbStdout (const char *output); void rdbStderr (const char *output); - void showStepInSource (const QString &fileName, int lineNum, const QString &address); - void dbgStatus (const QString &status, int statusFlag); + void showStepInSource (const TQString &fileName, int lineNum, const TQString &address); + 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 83dd1666..d5458c28 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -29,12 +29,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -51,19 +51,19 @@ namespace RDBDebugger // For use with the internal debugger, but this dialog doesn't know anything // about why it's doing it. -Dbg_PS_Dialog::Dbg_PS_Dialog(QWidget *parent, const char *name) +Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) : KDialog(parent, name, true), // modal psProc_(0), - pids_(new QListBox(this)), - heading_(new QLabel(" ", this)), - pidLines_(QString()) + pids_(new TQListBox(this)), + heading_(new TQLabel(" ", this)), + pidLines_(TQString()) { setCaption(i18n("Attach to Process")); - QBoxLayout *topLayout = new QVBoxLayout(this, 5); + TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); heading_->setFont(KGlobalSettings::fixedFont()); - heading_->setFrameStyle(QFrame::Panel|QFrame::Sunken); + heading_->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); heading_->setMaximumHeight(heading_->sizeHint().height()); // heading_->setMinimumSize(heading_->sizeHint()); topLayout->addWidget(heading_, 5); @@ -72,14 +72,14 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(QWidget *parent, const char *name) pids_->setFont(KGlobalSettings::fixedFont()); KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal, 5); - QPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); + TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); buttonbox->addStretch(); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); buttonbox->layout(); topLayout->addWidget(buttonbox); - connect(ok, SIGNAL(clicked()), SLOT(accept())); - connect(cancel, SIGNAL(clicked()), SLOT(reject())); + connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); psProc_ = new KShellProcess("/bin/sh"); #ifdef USE_SOLARIS @@ -106,8 +106,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(QWidget *parent, const char *name) } #endif - connect( psProc_, SIGNAL(processExited(KProcess *)), SLOT(slotProcessExited()) ); - connect( psProc_, SIGNAL(receivedStdout(KProcess *, char *, int)), SLOT(slotReceivedOutput(KProcess *, char *, int)) ); + connect( psProc_, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotProcessExited()) ); + connect( psProc_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(KProcess *, char *, int)) ); psProc_->start(KProcess::NotifyOnExit, KProcess::Stdout); // Default display to 40 chars wide, default height is okay @@ -126,7 +126,7 @@ Dbg_PS_Dialog::~Dbg_PS_Dialog() int Dbg_PS_Dialog::pidSelected() { - QString pidText = pids_->text(pids_->currentItem()); + TQString pidText = pids_->text(pids_->currentItem()); if (!pidText.isEmpty()) return atoi(pidText.latin1()); @@ -137,7 +137,7 @@ int Dbg_PS_Dialog::pidSelected() void Dbg_PS_Dialog::slotReceivedOutput(KProcess */*proc*/, char *buffer, int buflen) { - pidLines_ += QString::fromLocal8Bit(buffer, buflen+1); + pidLines_ += TQString::fromLocal8Bit(buffer, buflen+1); } /***************************************************************************/ @@ -154,7 +154,7 @@ void Dbg_PS_Dialog::slotProcessExited() if (start != -1) heading_->setText(pidLines_.left(start)); while ( (pos = pidLines_.find('\n', start)) != -1) { - QString item = pidLines_.mid(start, pos-start); + TQString item = pidLines_.mid(start, pos-start); if (!item.isEmpty()) { if (item.find(pidCmd_) == -1) pids_->insertItem(item); diff --git a/languages/ruby/debugger/dbgpsdlg.h b/languages/ruby/debugger/dbgpsdlg.h index 641f7aa5..e210c92b 100644 --- a/languages/ruby/debugger/dbgpsdlg.h +++ b/languages/ruby/debugger/dbgpsdlg.h @@ -38,7 +38,7 @@ class Dbg_PS_Dialog : public KDialog Q_OBJECT public: - Dbg_PS_Dialog( QWidget *parent=0, const char *name=0 ); + Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 ); ~Dbg_PS_Dialog(); int pidSelected(); @@ -49,10 +49,10 @@ private slots: private: KProcess* psProc_; - QListBox* pids_; - QLabel* heading_; - QString pidLines_; - QString pidCmd_; + TQListBox* pids_; + TQLabel* heading_; + TQString pidLines_; + TQString pidCmd_; }; } diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 702c8e83..36b42f07 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -31,14 +31,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // ************************************************************************** // ************************************************************************** @@ -77,25 +77,25 @@ public: DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0); virtual ~DbgMoveHandle(); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); private: DbgToolBar* toolBar_; - QPoint offset_; + TQPoint offset_; bool moving_; }; // ************************************************************************** DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f) - : QFrame(parent, name, f), + : TQFrame(parent, name, f), toolBar_(parent), - offset_(QPoint(0,0)), + offset_(TQPoint(0,0)), moving_(false) { - setFrameStyle(QFrame::Panel|QFrame::Raised); + setFrameStyle(TQFrame::Panel|TQFrame::Raised); setFixedHeight(12); } @@ -107,9 +107,9 @@ DbgMoveHandle::~DbgMoveHandle() // ************************************************************************** -void DbgMoveHandle::mousePressEvent(QMouseEvent *e) +void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) { - QFrame::mousePressEvent(e); + TQFrame::mousePressEvent(e); if (moving_) return; @@ -117,38 +117,38 @@ void DbgMoveHandle::mousePressEvent(QMouseEvent *e) KPopupMenu *menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), SLOT(slotDock())); + parent(), TQT_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"), - parent(), SLOT(slotIconifyAndDock())); + parent(), TQT_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; offset_ = parentWidget()->pos() - e->globalPos(); - setFrameStyle(QFrame::Panel|QFrame::Sunken); - QApplication::setOverrideCursor(QCursor(sizeAllCursor)); - setPalette(QPalette(colorGroup().background())); + setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); + setPalette(TQPalette(colorGroup().background())); repaint(); } } // ************************************************************************** -void DbgMoveHandle::mouseReleaseEvent(QMouseEvent *e) +void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e) { - QFrame::mouseReleaseEvent(e); + TQFrame::mouseReleaseEvent(e); moving_ = false; - offset_ = QPoint(0,0); - setFrameStyle(QFrame::Panel|QFrame::Raised); - QApplication::restoreOverrideCursor(); - setPalette(QPalette(colorGroup().background())); + offset_ = TQPoint(0,0); + setFrameStyle(TQFrame::Panel|TQFrame::Raised); + TQApplication::restoreOverrideCursor(); + setPalette(TQPalette(colorGroup().background())); repaint(); } // ************************************************************************** -void DbgMoveHandle::mouseMoveEvent(QMouseEvent *e) +void DbgMoveHandle::mouseMoveEvent(TQMouseEvent *e) { - QFrame::mouseMoveEvent(e); + TQFrame::mouseMoveEvent(e); if (!moving_) return; @@ -164,21 +164,21 @@ void DbgMoveHandle::mouseMoveEvent(QMouseEvent *e) class DbgButton : public QPushButton { public: - DbgButton(const QPixmap &pixmap, const QString &text, + DbgButton(const TQPixmap &pixmap, const TQString &text, DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; - void drawButtonLabel(QPainter *painter); - QSize sizeHint() const; + void drawButtonLabel(TQPainter *painter); + TQSize sizeHint() const; private: - QPixmap pixmap_; + TQPixmap pixmap_; }; // ************************************************************************** -DbgButton::DbgButton(const QPixmap& pixmap, const QString& text, +DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text, DbgToolBar* parent, const char* name) - : QPushButton(parent, name), + : TQPushButton(parent, name), pixmap_(pixmap) { setText(text); @@ -186,7 +186,7 @@ DbgButton::DbgButton(const QPixmap& pixmap, const QString& text, // ************************************************************************** -void DbgButton::drawButtonLabel(QPainter *painter) +void DbgButton::drawButtonLabel(TQPainter *painter) { // We always have a pixmap (today...) // Centre it if there's no text @@ -204,29 +204,29 @@ void DbgButton::drawButtonLabel(QPainter *painter) // ************************************************************************** -QSize DbgButton::sizeHint() const +TQSize DbgButton::sizeHint() const { if (text().isEmpty()) return pixmap_.size(); else - return QPushButton::sizeHint(); + return TQPushButton::sizeHint(); } // ************************************************************************** // ************************************************************************** // ************************************************************************** -DbgDocker::DbgDocker(QWidget* parent, DbgToolBar* toolBar, const QPixmap& pixmap) : +DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) : KSystemTray(parent, "DbgDocker"), toolBar_(toolBar) { setPixmap(pixmap); - QToolTip::add( this, i18n("KDevelop ruby debugger: Click to execute one line of code (\"step\")") ); + TQToolTip::add( this, i18n("KDevelop ruby debugger: Click to execute one line of code (\"step\")") ); } // ************************************************************************** -void DbgDocker::mousePressEvent(QMouseEvent *e) +void DbgDocker::mousePressEvent(TQMouseEvent *e) { if (!rect().contains( e->pos())) return; @@ -242,8 +242,8 @@ void DbgDocker::mousePressEvent(QMouseEvent *e) { KPopupMenu* menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); - menu->insertItem(i18n("Activate"), toolBar_, SLOT(slotUndock())); - menu->insertItem(i18n("Activate (KDevelop gets focus)"), toolBar_, SLOT(slotActivateAndUndock())); + menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); + menu->insertItem(i18n("Activate (KDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); menu->popup(e->globalPos()); break; } @@ -257,8 +257,8 @@ void DbgDocker::mousePressEvent(QMouseEvent *e) // ************************************************************************** DbgToolBar::DbgToolBar(RubyDebuggerPart* part, - QWidget* parent, const char* name) - : QFrame(0, name), + TQWidget* parent, const char* name) + : TQFrame(0, name), part_(part), activeWindow_(0), winModule_(0), @@ -271,7 +271,7 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, { winModule_ = new KWinModule(this); docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); - connect(docker_, SIGNAL(clicked()), part_, SLOT(slotStepOver())); + connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. // see slotDbgKdevFocus() for more comments @@ -285,55 +285,55 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, KWin::setType(winId(), NET::Dock); setFocusPolicy(NoFocus); - setFrameStyle( QFrame::Box | QFrame::Plain ); + setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth(4); setMidLineWidth(0); - QBoxLayout* topLayout = new QVBoxLayout(this); + TQBoxLayout* topLayout = new TQVBoxLayout(this); - QBoxLayout* nextLayout = new QHBoxLayout(); - QBoxLayout* stepLayout = new QHBoxLayout(); - QBoxLayout* focusLayout = new QHBoxLayout(); + TQBoxLayout* nextLayout = new TQHBoxLayout(); + TQBoxLayout* stepLayout = new TQHBoxLayout(); + TQBoxLayout* focusLayout = new TQHBoxLayout(); DbgMoveHandle* moveHandle= new DbgMoveHandle(this); - QPushButton* bRun = new DbgButton(BarIcon("dbgrun"), i18n("Run"), this); - QPushButton* bInterrupt = new DbgButton(BarIcon("player_pause"), i18n("Interrupt"), this); - QPushButton* bNext = new DbgButton(BarIcon("dbgnext"), i18n("Step Over"), this); - QPushButton* bStep = new DbgButton(BarIcon("dbgstep"), i18n("Step Into"), this); - QPushButton* bFinish = new DbgButton(BarIcon("dbgstepout"), i18n("Step Out"), this); - QPushButton* bRunTo = new DbgButton(BarIcon("dbgrunto"), i18n("Run to Cursor"), this); - bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), QString::null, this); - bKDevFocus_ = new DbgButton(BarIcon("kdevelop"), QString::null, this); - - connect(bRun, SIGNAL(clicked()), part_, SLOT(slotRun())); - connect(bInterrupt, SIGNAL(clicked()), part_, SLOT(slotPause())); - connect(bNext, SIGNAL(clicked()), part_, SLOT(slotStepOver())); - connect(bStep, SIGNAL(clicked()), part_, SLOT(slotStepInto())); - connect(bFinish, SIGNAL(clicked()), part_, SLOT(slotStepOut())); - connect(bRunTo, SIGNAL(clicked()), part_, SLOT(slotRunToCursor())); - connect(bKDevFocus_, SIGNAL(clicked()), this, SLOT(slotKdevFocus())); - connect(bPrevFocus_, SIGNAL(clicked()), this, SLOT(slotPrevFocus())); - - QToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); - QToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); - QToolTip::add( bNext, i18n("Execute one line of code, but run through methods") ); - QToolTip::add( bStep, i18n("Execute one line of code, stepping into methods if appropriate") ); - QToolTip::add( bFinish, i18n("Execute to end of current stack frame") ); - QToolTip::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); - QToolTip::add( bKDevFocus_, i18n("Set focus on KDevelop") ); - QToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus") ); - - QWhatsThis::add( bRun, i18n("Continue with application execution. May start the application.") ); - QWhatsThis::add( bInterrupt, i18n("Interrupt the application execution.") ); - QWhatsThis::add( bNext, i18n("Execute one line of code, but run through methods.") ); - - QWhatsThis::add( bStep, i18n("Execute one line of code, stepping into methods if appropriate.") ); + TQPushButton* bRun = new DbgButton(BarIcon("dbgrun"), i18n("Run"), this); + TQPushButton* bInterrupt = new DbgButton(BarIcon("player_pause"), i18n("Interrupt"), this); + TQPushButton* bNext = new DbgButton(BarIcon("dbgnext"), i18n("Step Over"), this); + TQPushButton* bStep = new DbgButton(BarIcon("dbgstep"), i18n("Step Into"), this); + TQPushButton* bFinish = new DbgButton(BarIcon("dbgstepout"), i18n("Step Out"), this); + TQPushButton* bRunTo = new DbgButton(BarIcon("dbgrunto"), i18n("Run to Cursor"), this); + bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString::null, this); + bKDevFocus_ = new DbgButton(BarIcon("kdevelop"), TQString::null, this); + + connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); + connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); + connect(bNext, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); + connect(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); + connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); + connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); + connect(bKDevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKdevFocus())); + connect(bPrevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevFocus())); + + TQToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); + TQToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); + TQToolTip::add( bNext, i18n("Execute one line of code, but run through methods") ); + TQToolTip::add( bStep, i18n("Execute one line of code, stepping into methods if appropriate") ); + TQToolTip::add( bFinish, i18n("Execute to end of current stack frame") ); + TQToolTip::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); + TQToolTip::add( bKDevFocus_, i18n("Set focus on KDevelop") ); + TQToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus") ); + + TQWhatsThis::add( bRun, i18n("Continue with application execution. May start the application.") ); + TQWhatsThis::add( bInterrupt, i18n("Interrupt the application execution.") ); + TQWhatsThis::add( bNext, i18n("Execute one line of code, but run through methods.") ); + + TQWhatsThis::add( bStep, i18n("Execute one line of code, stepping into methods if appropriate.") ); - QWhatsThis::add( bFinish, i18n("Execute to end of current stack frame.") ); - QWhatsThis::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); - QWhatsThis::add( bKDevFocus_, i18n("Set focus on KDevelop.") ); - QWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus.") ); + TQWhatsThis::add( bFinish, i18n("Execute to end of current stack frame.") ); + TQWhatsThis::add( bRunTo, i18n("Continues execution until the cursor position is reached.") ); + TQWhatsThis::add( bKDevFocus_, i18n("Set focus on KDevelop.") ); + TQWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus.") ); topLayout->addWidget(moveHandle); topLayout->addWidget(bRun); @@ -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::slotDbgStatus(const QString&, int state) +void DbgToolBar::slotDbgStatus(const TQString&, int state) { bool appIndicator = state & s_appBusy; if (appIndicator != appIsActive_) { @@ -421,11 +421,11 @@ void DbgToolBar::slotDbgStatus(const QString&, int state) void DbgToolBar::setAppIndicator(bool appIndicator) { if (appIndicator) { - bPrevFocus_->setPalette(QPalette(colorGroup().mid())); - bKDevFocus_->setPalette(QPalette(colorGroup().background())); + bPrevFocus_->setPalette(TQPalette(colorGroup().mid())); + bKDevFocus_->setPalette(TQPalette(colorGroup().background())); } else { - bPrevFocus_->setPalette(QPalette(colorGroup().background())); - bKDevFocus_->setPalette(QPalette(colorGroup().mid())); + bPrevFocus_->setPalette(TQPalette(colorGroup().background())); + bKDevFocus_->setPalette(TQPalette(colorGroup().mid())); } } diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h index a19b2eae..a83c120a 100644 --- a/languages/ruby/debugger/dbgtoolbar.h +++ b/languages/ruby/debugger/dbgtoolbar.h @@ -27,7 +27,7 @@ class KWinModule; #include #include // needed for WId :( -#include +#include namespace RDBDebugger { @@ -41,9 +41,9 @@ class DbgDocker : public KSystemTray Q_OBJECT public: - DbgDocker(QWidget *parent, DbgToolBar *toolBar, const QPixmap &pixmap); + DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap); virtual ~DbgDocker() {}; - virtual void mousePressEvent(QMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); signals: void clicked(); @@ -58,11 +58,11 @@ class DbgToolBar : public QFrame Q_OBJECT public: - DbgToolBar(RubyDebuggerPart *part, QWidget* parent, const char* name=0); + DbgToolBar(RubyDebuggerPart *part, TQWidget* parent, const char* name=0); virtual ~DbgToolBar(); private slots: - void slotDbgStatus(const QString&, 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 95b4dd09..3e46a3d4 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -18,10 +18,10 @@ ***************************************************************************/ #include "debuggerpart.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -72,7 +72,7 @@ static const KDevPluginInfo data("kdevrbdebugger"); typedef KDevGenericFactory RubyDebuggerFactory; K_EXPORT_COMPONENT_FACTORY( libkdevrbdebugger, RubyDebuggerFactory( data ) ) -RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QStringList & ) : +RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : KDevPlugin( &data, parent, name ? name : "RubyDebuggerPart" ), controller(0) { @@ -83,7 +83,7 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt m_debugger = new Debugger( partController() ); - statusBarIndicator = new QLabel(" ", mainWindow()->statusBar()); + statusBarIndicator = new TQLabel(" ", mainWindow()->statusBar()); statusBarIndicator->setFixedWidth(15); mainWindow()->statusBar()->addWidget(statusBarIndicator, 0, true); statusBarIndicator->show(); @@ -93,7 +93,7 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt // /*variableWidget*/->setEnabled(false); variableWidget->setIcon(SmallIcon("math_brace")); variableWidget->setCaption(i18n("Variable Tree")); - QWhatsThis::add + TQWhatsThis::add (variableWidget, i18n("Variable tree

    " "The variable tree allows you to see " "the variable values as you step " @@ -108,7 +108,7 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt rdbBreakpointWidget = new RDBBreakpointWidget( 0, "rdbBreakpointWidget" ); rdbBreakpointWidget->setCaption(i18n("Breakpoint List")); - QWhatsThis::add + TQWhatsThis::add (rdbBreakpointWidget, i18n("Breakpoint list

    " "Displays a list of breakpoints with " "their current status. Clicking on a " @@ -121,7 +121,7 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt framestackWidget = new FramestackWidget( 0, "rdbFramestackWidget" ); framestackWidget->setEnabled(false); framestackWidget->setCaption(i18n("Frame Stack")); - QWhatsThis::add + TQWhatsThis::add (framestackWidget, i18n("Frame stack

    " "Often referred to as the \"call stack\", " "this is a list showing what method is " @@ -139,7 +139,7 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt rdbOutputWidget->setEnabled(false); rdbOutputWidget->setIcon( SmallIcon("inline_image") ); rdbOutputWidget->setCaption(i18n("RDB Output")); - QWhatsThis::add + TQWhatsThis::add (rdbOutputWidget, i18n("RDB output

    " "Shows all rdb commands being executed. " "You can also issue any other rdb command while debugging.")); @@ -148,19 +148,19 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt mainWindow()->setViewAvailable(rdbOutputWidget, false); // rdbBreakpointWidget -> this - connect( rdbBreakpointWidget, SIGNAL(refreshBPState(const Breakpoint&)), - this, SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, SIGNAL(publishBPState(const Breakpoint&)), - this, SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, SIGNAL(gotoSourcePosition(const QString&, int)), - this, SLOT(slotGotoSource(const QString&, int)) ); + connect( rdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), + this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); // Now setup the actions KAction *action; // action = new KAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new KAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9, - this, SLOT(slotRun()), + this, TQT_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("Start in debugger

    " @@ -171,26 +171,26 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt "about variables, frame stack, and so on.") ); action = new KAction(i18n("Sto&p"), "stop", 0, - this, SLOT(slotStop()), + this, TQT_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("Stop debugger

    Kills the executable and exits the debugger.")); action = new KAction(i18n("Interrupt"), "player_pause", 0, - this, SLOT(slotPause()), + this, TQT_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("Interrupt application

    Interrupts the debugged process or current RDB command.")); action = new KAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, SLOT(slotRunToCursor()), + this, TQT_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("Run to cursor

    Continues execution until the cursor position is reached.")); action = new KAction(i18n("Step &Over"), "dbgnext", 0, - this, SLOT(slotStepOver()), + this, TQT_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("Step over

    " @@ -201,7 +201,7 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt action = new KAction(i18n("Step &Into"), "dbgstep", 0, - this, SLOT(slotStepInto()), + this, TQT_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("Step into

    " @@ -212,7 +212,7 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt action = new KAction(i18n("Step O&ut"), "dbgstepout", 0, - this, SLOT(slotStepOut()), + this, TQT_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current method") ); action->setWhatsThis( i18n("Step out

    " @@ -224,48 +224,48 @@ RubyDebuggerPart::RubyDebuggerPart( QObject *parent, const char *name, const QSt action = new KAction(i18n("Toggle Breakpoint"), 0, 0, - this, SLOT(toggleBreakpoint()), + this, TQT_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("Toggle breakpoint

    Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), SIGNAL(clientAdded(KXMLGUIClient*)), - this, SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( partController(), SIGNAL(loadedFile(const KURL &)), - rdbBreakpointWidget, SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), SIGNAL(toggledBreakpoint(const QString &, int)), - rdbBreakpointWidget, SLOT(slotToggleBreakpoint(const QString &, int)) ); - connect( debugger(), SIGNAL(editedBreakpoint(const QString &, int)), - rdbBreakpointWidget, SLOT(slotEditBreakpoint(const QString &, int)) ); - connect( debugger(), SIGNAL(toggledBreakpointEnabled(const QString &, int)), - rdbBreakpointWidget, SLOT(slotToggleBreakpointEnabled(const QString &, int)) ); + connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), + rdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), - this, SLOT(slotStop(KDevPlugin*)) ); - connect( core(), SIGNAL(projectClosed()), - this, SLOT(projectClosed()) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQT_SIGNAL(projectClosed()), + this, TQT_SLOT(projectClosed()) ); - connect( partController(), SIGNAL(activePartChanged(KParts::Part*)), - this, SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, SIGNAL(receivedStdoutLine(const QCString&)), - appFrontend(), SLOT(insertStdoutLine(const QCString&)) ); - connect( procLineMaker, SIGNAL(receivedStderrLine(const QCString&)), - appFrontend(), SLOT(insertStderrLine(const QCString&)) ); - connect( procLineMaker, SIGNAL(receivedPartialStdoutLine(const QCString&)), - appFrontend(), SLOT(addPartialStdoutLine(const QCString&)) ); - connect( procLineMaker, SIGNAL(receivedPartialStderrLine(const QCString&)), - appFrontend(), SLOT(addPartialStderrLine(const QCString&)) ); + connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&)) ); setupController(); - QTimer::singleShot(0, this, SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); } RubyDebuggerPart::~RubyDebuggerPart() @@ -297,10 +297,10 @@ void RubyDebuggerPart::guiClientAdded( KXMLGUIClient* client ) // Can't change state until after XMLGUI has been loaded... // Anyone know of a better way of doing this? if( client == this ) - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); } -void RubyDebuggerPart::contextMenu(QPopupMenu *popup, const Context *context) +void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) { if (!context->hasType( Context::EditorContext )) return; @@ -311,16 +311,16 @@ void RubyDebuggerPart::contextMenu(QPopupMenu *popup, const Context *context) popup->insertSeparator(); if (econtext->url().isLocalFile()) { - int id = popup->insertItem( i18n("Toggle Breakpoint"), this, SLOT(toggleBreakpoint()) ); + int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQT_SLOT(toggleBreakpoint()) ); popup->setWhatsThis(id, i18n("Toggle breakpoint

    Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { - QString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); - int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, SLOT(contextWatch()) ); + TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); + int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()) ); popup->setWhatsThis(id, i18n("Watch

    Adds an expression under the cursor to the Variables/Watch list.")); - id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, SLOT(contextRubyInspect()) ); + id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) ); popup->setWhatsThis(id, i18n("Inspect

    Evaluates an expression under the cursor.")); } } @@ -362,86 +362,86 @@ void RubyDebuggerPart::setupController() controller = new RDBController(variableTree, framestackWidget, *projectDom()); // this -> controller - connect( this, SIGNAL(rubyInspect(const QString&)), - controller, SLOT(slotRubyInspect(const QString&))); + connect( this, TQT_SIGNAL(rubyInspect(const TQString&)), + controller, TQT_SLOT(slotRubyInspect(const TQString&))); // variableTree -> framestackWidget - connect( variableTree, SIGNAL(selectFrame(int, int)), - framestackWidget, SLOT(slotSelectFrame(int, int))); + connect( variableTree, TQT_SIGNAL(selectFrame(int, int)), + framestackWidget, TQT_SLOT(slotSelectFrame(int, int))); // framestackWidget -> variableTree - connect( framestackWidget, SIGNAL(frameActive(int, int, const QString&)), - variableTree, SLOT(slotFrameActive(int, int, const QString&))); + connect( framestackWidget, TQT_SIGNAL(frameActive(int, int, const TQString&)), + variableTree, TQT_SLOT(slotFrameActive(int, int, const TQString&))); // variableTree -> controller - connect( variableTree, SIGNAL(expandItem(VarItem*, const QCString&)), - controller, SLOT(slotExpandItem(VarItem*, const QCString&))); - connect( variableTree, SIGNAL(fetchGlobals(bool)), - controller, SLOT(slotFetchGlobals(bool))); - connect( variableTree, SIGNAL(addWatchExpression(const QString&, bool)), - controller, SLOT(slotAddWatchExpression(const QString&, bool))); - connect( variableTree, SIGNAL(removeWatchExpression(int)), - controller, SLOT(slotRemoveWatchExpression(int))); + connect( variableTree, TQT_SIGNAL(expandItem(VarItem*, const TQCString&)), + controller, TQT_SLOT(slotExpandItem(VarItem*, const TQCString&))); + connect( variableTree, TQT_SIGNAL(fetchGlobals(bool)), + controller, TQT_SLOT(slotFetchGlobals(bool))); + connect( variableTree, TQT_SIGNAL(addWatchExpression(const TQString&, bool)), + controller, TQT_SLOT(slotAddWatchExpression(const TQString&, bool))); + connect( variableTree, TQT_SIGNAL(removeWatchExpression(int)), + controller, TQT_SLOT(slotRemoveWatchExpression(int))); // framestackWidget -> controller - connect( framestackWidget, SIGNAL(selectFrame(int,int,const QString&)), - controller, SLOT(slotSelectFrame(int,int,const QString&))); + connect( framestackWidget, TQT_SIGNAL(selectFrame(int,int,const TQString&)), + controller, TQT_SLOT(slotSelectFrame(int,int,const TQString&))); // rdbBreakpointWidget -> controller - connect( rdbBreakpointWidget, SIGNAL(clearAllBreakpoints()), - controller, SLOT(slotClearAllBreakpoints())); - connect( rdbBreakpointWidget, SIGNAL(publishBPState(const Breakpoint&)), - controller, SLOT(slotBPState(const Breakpoint &))); + connect( rdbBreakpointWidget, TQT_SIGNAL(clearAllBreakpoints()), + controller, TQT_SLOT(slotClearAllBreakpoints())); + connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), + controller, TQT_SLOT(slotBPState(const Breakpoint &))); // rdbOutputWidget -> controller - connect( rdbOutputWidget, SIGNAL(userRDBCmd(const QString &)), - controller, SLOT(slotUserRDBCmd(const QString&))); - connect( rdbOutputWidget, SIGNAL(breakInto()), - controller, SLOT(slotBreakInto())); + connect( rdbOutputWidget, TQT_SIGNAL(userRDBCmd(const TQString &)), + controller, TQT_SLOT(slotUserRDBCmd(const TQString&))); + connect( rdbOutputWidget, TQT_SIGNAL(breakInto()), + controller, TQT_SLOT(slotBreakInto())); // controller -> rdbBreakpointWidget - connect( controller, SIGNAL(acceptPendingBPs()), - rdbBreakpointWidget, SLOT(slotSetPendingBPs())); - connect( controller, SIGNAL(unableToSetBPNow(int)), - rdbBreakpointWidget, SLOT(slotUnableToSetBPNow(int))); - connect( controller, SIGNAL(rawRDBBreakpointList (char*)), - rdbBreakpointWidget, SLOT(slotParseRDBBrkptList(char*))); - connect( controller, SIGNAL(rawRDBBreakpointSet(char*, int)), - rdbBreakpointWidget, SLOT(slotParseRDBBreakpointSet(char*, int))); + connect( controller, TQT_SIGNAL(acceptPendingBPs()), + rdbBreakpointWidget, TQT_SLOT(slotSetPendingBPs())); + connect( controller, TQT_SIGNAL(unableToSetBPNow(int)), + rdbBreakpointWidget, TQT_SLOT(slotUnableToSetBPNow(int))); + connect( controller, TQT_SIGNAL(rawRDBBreakpointList (char*)), + rdbBreakpointWidget, TQT_SLOT(slotParseRDBBrkptList(char*))); + connect( controller, TQT_SIGNAL(rawRDBBreakpointSet(char*, int)), + rdbBreakpointWidget, TQT_SLOT(slotParseRDBBreakpointSet(char*, int))); // controller -> this - connect( controller, SIGNAL(dbgStatus(const QString&, int)), - this, SLOT(slotStatus(const QString&, int))); - connect( controller, SIGNAL(showStepInSource(const QString&, int, const QString&)), - this, SLOT(slotShowStep(const QString&, 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))); // controller -> procLineMaker - connect( controller, SIGNAL(ttyStdout(const char*)), - procLineMaker, SLOT(slotReceivedStdout(const char*))); - connect( controller, SIGNAL(ttyStderr(const char*)), - procLineMaker, SLOT(slotReceivedStderr(const char*))); + connect( controller, TQT_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQT_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); // controller -> rdbOutputWidget - connect( controller, SIGNAL(rdbStdout(const char*)), - rdbOutputWidget, SLOT(slotReceivedStdout(const char*)) ); - connect( controller, SIGNAL(rdbStderr(const char*)), - rdbOutputWidget, SLOT(slotReceivedStderr(const char*)) ); - connect( controller, SIGNAL(dbgStatus(const QString&, int)), - rdbOutputWidget, SLOT(slotDbgStatus(const QString&, int))); + connect( controller, TQT_SIGNAL(rdbStdout(const char*)), + rdbOutputWidget, TQT_SLOT(slotReceivedStdout(const char*)) ); + connect( controller, TQT_SIGNAL(rdbStderr(const char*)), + rdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + rdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); } bool RubyDebuggerPart::startDebugger() { - QString build_dir; // Currently selected build directory - QString run_directory; // Directory from where the program should be run - QString program; // Absolute path to application - QString run_arguments; // Command line arguments to be passed to the application - QString ruby_interpreter; // Absolute path to the ruby interpreter - QString debuggee_path; // Absolute path to debuggee.rb debugger script + TQString build_dir; // Currently selected build directory + TQString run_directory; // Directory from where the program should be run + TQString program; // Absolute path to application + TQString run_arguments; // Command line arguments to be passed to the application + TQString ruby_interpreter; // Absolute path to the ruby interpreter + TQString debuggee_path; // Absolute path to debuggee.rb debugger script bool show_constants; // Show constants in the debugger bool trace_into_ruby; // Trace into the ruby code installed under sitedir @@ -465,10 +465,10 @@ bool RubyDebuggerPart::startDebugger() run_arguments = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/programargs"); - QString shell = DomUtil::readEntry(*projectDom(), "/kdevrbdebugger/general/dbgshell"); + TQString shell = DomUtil::readEntry(*projectDom(), "/kdevrbdebugger/general/dbgshell"); if( !shell.isEmpty() ) { - QFileInfo info( shell ); + TQFileInfo info( shell ); if( info.isRelative() ) { shell = build_dir + "/" + shell; @@ -486,7 +486,7 @@ bool RubyDebuggerPart::startDebugger() core()->running(this, true); - stateChanged( QString("active") ); + stateChanged( TQString("active") ); KActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Continue") ); @@ -518,7 +518,7 @@ bool RubyDebuggerPart::startDebugger() ruby_interpreter = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/interpreter"); int coding = DomUtil::readIntEntry(*projectDom(), "/kdevrubysupport/run/charactercoding"); - QString character_coding("-K"); + TQString character_coding("-K"); switch (coding) { case 0: @@ -535,7 +535,7 @@ bool RubyDebuggerPart::startDebugger() break; } -// ruby_interpreter.append(QString(" -K") + code); +// ruby_interpreter.append(TQString(" -K") + code); debuggee_path = ::locate("data", "kdevrbdebugger/debuggee.rb", instance()); @@ -577,7 +577,7 @@ void RubyDebuggerPart::slotStopDebugger() "while it is running, in order to get information " "about variables, frame stack, and so on.") ); - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); core()->running(this, false); } @@ -683,9 +683,9 @@ void RubyDebuggerPart::slotRefreshBPState( const Breakpoint& BP) } -void RubyDebuggerPart::slotStatus(const QString &msg, int state) +void RubyDebuggerPart::slotStatus(const TQString &msg, int state) { - QString stateIndicator; + TQString stateIndicator; if (state & s_dbgNotStarted) { @@ -695,12 +695,12 @@ void RubyDebuggerPart::slotStatus(const QString &msg, int state) { stateIndicator = "A"; debugger()->clearExecutionPoint(); - stateChanged( QString("active") ); + stateChanged( TQString("active") ); } else if (state & s_programExited) { stateIndicator = "E"; - stateChanged( QString("stopped") ); + stateChanged( TQString("stopped") ); KActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("Restart") ); // ac->action("debug_run")->setIcon( "1rightarrow" ); @@ -712,7 +712,7 @@ void RubyDebuggerPart::slotStatus(const QString &msg, int state) else { stateIndicator = "P"; - stateChanged( QString("paused") ); + stateChanged( TQString("paused") ); } // And now? :-) @@ -725,7 +725,7 @@ void RubyDebuggerPart::slotStatus(const QString &msg, int state) } -void RubyDebuggerPart::slotShowStep(const QString &fileName, int lineNum) +void RubyDebuggerPart::slotShowStep(const TQString &fileName, int lineNum) { if ( ! fileName.isEmpty() ) { @@ -735,7 +735,7 @@ void RubyDebuggerPart::slotShowStep(const QString &fileName, int lineNum) } -void RubyDebuggerPart::slotGotoSource(const QString &fileName, int lineNum) +void RubyDebuggerPart::slotGotoSource(const TQString &fileName, int lineNum) { if ( ! fileName.isEmpty() ) partController()->editDocument(KURL( fileName ), lineNum); @@ -758,13 +758,13 @@ void RubyDebuggerPart::slotActivePartChanged( KParts::Part* part ) action->setEnabled( iface != 0 ); } -void RubyDebuggerPart::restorePartialProjectSession(const QDomElement* el) +void RubyDebuggerPart::restorePartialProjectSession(const TQDomElement* el) { rdbBreakpointWidget->restorePartialProjectSession(el); variableWidget->restorePartialProjectSession(el); } -void RubyDebuggerPart::savePartialProjectSession(QDomElement* el) +void RubyDebuggerPart::savePartialProjectSession(TQDomElement* el) { rdbBreakpointWidget->savePartialProjectSession(el); variableWidget->savePartialProjectSession(el); diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h index 2f35df9a..637c2431 100644 --- a/languages/ruby/debugger/debuggerpart.h +++ b/languages/ruby/debugger/debuggerpart.h @@ -20,7 +20,7 @@ #ifndef _DEBUGGERPART_H_ #define _DEBUGGERPART_H_ -#include +#include #include "kdevplugin.h" #include "kdevcore.h" @@ -50,14 +50,14 @@ class RubyDebuggerPart : public KDevPlugin Q_OBJECT public: - RubyDebuggerPart( QObject *parent, const char *name, const QStringList & ); + RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & ); ~RubyDebuggerPart(); - virtual void restorePartialProjectSession(const QDomElement* el); - virtual void savePartialProjectSession(QDomElement* el); + virtual void restorePartialProjectSession(const TQDomElement* el); + virtual void savePartialProjectSession(TQDomElement* el); private slots: void guiClientAdded(KXMLGUIClient*); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void toggleBreakpoint(); void contextWatch(); void contextRubyInspect(); @@ -75,12 +75,12 @@ private slots: void slotStepOut(); void slotRefreshBPState(const Breakpoint&); - void slotStatus(const QString &msg, int state); - void slotShowStep(const QString &fileName, int lineNum); - void slotGotoSource(const QString &fileName, int lineNum); + void slotStatus(const TQString &msg, int state); + void slotShowStep(const TQString &fileName, int lineNum); + void slotGotoSource(const TQString &fileName, int lineNum); signals: - void rubyInspect(const QString&); + void rubyInspect(const TQString&); private: KDevAppFrontend *appFrontend(); @@ -89,18 +89,18 @@ private: bool startDebugger(); void setupController(); - QGuardedPtr variableWidget; - QGuardedPtr rdbBreakpointWidget; - QGuardedPtr framestackWidget; - QGuardedPtr rdbOutputWidget; + TQGuardedPtr variableWidget; + TQGuardedPtr rdbBreakpointWidget; + TQGuardedPtr framestackWidget; + TQGuardedPtr rdbOutputWidget; DbgController *controller; - QGuardedPtr statusBarIndicator; - QGuardedPtr floatingToolBar; + TQGuardedPtr statusBarIndicator; + TQGuardedPtr floatingToolBar; ProcessLineMaker* procLineMaker; ProcessLineMaker* rdbLineMaker; - QString m_contextIdent; - QCString m_drkonqi; + TQString m_contextIdent; + TQCString m_drkonqi; KDevDebugger *m_debugger; }; diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp index 836350b2..c8083dc8 100644 --- a/languages/ruby/debugger/framestackwidget.cpp +++ b/languages/ruby/debugger/framestackwidget.cpp @@ -25,11 +25,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -41,18 +41,18 @@ namespace RDBDebugger { -FramestackWidget::FramestackWidget(QWidget *parent, const char *name, WFlags f) - : QListView(parent, name, f), +FramestackWidget::FramestackWidget(TQWidget *parent, const char *name, WFlags f) + : TQListView(parent, name, f), viewedThread_(0) { setRootIsDecorated(true); setSelectionMode(Single); - addColumn(QString()); + addColumn(TQString()); setSorting(0); header()->hide(); - connect( this, SIGNAL(clicked(QListViewItem*)), - this, SLOT(slotSelectionChanged(QListViewItem*)) ); + connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), + this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); } @@ -68,12 +68,12 @@ FramestackWidget::~FramestackWidget() void FramestackWidget::clear() { viewedThread_ = 0; - QListView::clear(); + TQListView::clear(); } /***************************************************************************/ -void FramestackWidget::slotSelectionChanged(QListViewItem * item) +void FramestackWidget::slotSelectionChanged(TQListViewItem * item) { if (item == 0) { return; @@ -100,7 +100,7 @@ void FramestackWidget::slotSelectFrame(int frameNo, int threadNo) setSelected(frame, true); emit selectFrame(frameNo, threadNo, frame->frameName()); } else { - emit selectFrame(frameNo, threadNo, QString()); + emit selectFrame(frameNo, threadNo, TQString()); } } @@ -111,7 +111,7 @@ void FramestackWidget::parseRDBThreadList(char *str) // on receipt of a thread list we must always clear the list. clear(); - QRegExp thread_re("(\\+)?\\s*(\\d+)\\s*(#<[^>]+>\\s*[^:]+:\\d+)"); + TQRegExp thread_re("(\\+)?\\s*(\\d+)\\s*(#<[^>]+>\\s*[^:]+:\\d+)"); int pos = thread_re.search(str); viewedThread_ = 0; @@ -119,7 +119,7 @@ void FramestackWidget::parseRDBThreadList(char *str) ThreadStackItem* thread; thread = new ThreadStackItem( this, thread_re.cap(2).toInt(), - QString("%1 %2").arg(thread_re.cap(2)).arg(thread_re.cap(3)) ); + TQString("%1 %2").arg(thread_re.cap(2)).arg(thread_re.cap(3)) ); // The thread with a '+' is always the viewedthread if (thread_re.cap(1) == "+") { viewedThread_ = thread; @@ -148,8 +148,8 @@ void FramestackWidget::parseRDBBacktraceList(char *str) } int frameNo = frame_re.cap(1).toInt(); - QString frameName = QString("T%1#%2 %3").arg(viewedThread_->threadNo()).arg(frame_re.cap(1)).arg(method); - new FrameStackItem(viewedThread_, frameNo, QString(frame_re.cap(0)), frameName); + TQString frameName = TQString("T%1#%2 %3").arg(viewedThread_->threadNo()).arg(frame_re.cap(1)).arg(method); + new FrameStackItem(viewedThread_, frameNo, TQString(frame_re.cap(0)), frameName); // Tell the Variable Tree that this frame is active emit frameActive(frameNo, viewedThread_->threadNo(), frameName); @@ -169,7 +169,7 @@ void FramestackWidget::parseRDBBacktraceList(char *str) ThreadStackItem *FramestackWidget::findThread(int threadNo) { - QListViewItem *sibling = firstChild(); + TQListViewItem *sibling = firstChild(); while (sibling != 0) { ThreadStackItem *thread = (ThreadStackItem*) sibling; if (thread->threadNo() == threadNo) { @@ -192,7 +192,7 @@ FrameStackItem *FramestackWidget::findFrame(int frameNo, int threadNo) return 0; // no matching thread? } - QListViewItem * frameItem = thread->firstChild(); + TQListViewItem * frameItem = thread->firstChild(); while (frameItem != 0) { if (((FrameStackItem *) frameItem)->frameNo() == frameNo) { @@ -211,8 +211,8 @@ FrameStackItem *FramestackWidget::findFrame(int frameNo, int threadNo) // ************************************************************************** -FrameStackItem::FrameStackItem(ThreadStackItem *parent, int frameNo, const QString &frameDesc, const QString& frameName) - : QListViewItem(parent), +FrameStackItem::FrameStackItem(ThreadStackItem *parent, int frameNo, const TQString &frameDesc, const TQString& frameName) + : TQListViewItem(parent), frameNo_(frameNo), threadNo_(parent->threadNo()), frameName_(frameName) @@ -229,7 +229,7 @@ FrameStackItem::~FrameStackItem() // ************************************************************************** -QString FrameStackItem::key(int /*column*/, bool /*ascending*/) const +TQString FrameStackItem::key(int /*column*/, bool /*ascending*/) const { return key_; @@ -239,8 +239,8 @@ QString FrameStackItem::key(int /*column*/, bool /*ascending*/) const // ************************************************************************** // ************************************************************************** -ThreadStackItem::ThreadStackItem(FramestackWidget *parent, int threadNo, const QString &threadDesc) - : QListViewItem(parent), +ThreadStackItem::ThreadStackItem(FramestackWidget *parent, int threadNo, const TQString &threadDesc) + : TQListViewItem(parent), threadNo_(threadNo) { setText(0, threadDesc); @@ -260,7 +260,7 @@ void ThreadStackItem::setOpen(bool open) if (open) ((FramestackWidget*)listView())->slotSelectFrame(1, threadNo()); - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); } } diff --git a/languages/ruby/debugger/framestackwidget.h b/languages/ruby/debugger/framestackwidget.h index 373d0690..b000f042 100644 --- a/languages/ruby/debugger/framestackwidget.h +++ b/languages/ruby/debugger/framestackwidget.h @@ -22,8 +22,8 @@ #ifndef _FRAMESTACKWIDGET_H_ #define _FRAMESTACKWIDGET_H_ -#include -#include +#include +#include #include "rdbcontroller.h" @@ -36,7 +36,7 @@ class FramestackWidget; class ThreadStackItem : public QListViewItem { public: - ThreadStackItem(FramestackWidget *parent, int threadNo, const QString &threadDesc); + ThreadStackItem(FramestackWidget *parent, int threadNo, const TQString &threadDesc); virtual ~ThreadStackItem(); virtual int rtti() const { return RTTI_THREAD_STACK_ITEM; } @@ -55,21 +55,21 @@ private: class FrameStackItem : public QListViewItem { public: - FrameStackItem(ThreadStackItem * parent, int frameNo, const QString & frameDesc, const QString & frameName); + FrameStackItem(ThreadStackItem * parent, int frameNo, const TQString & frameDesc, const TQString & frameName); virtual ~FrameStackItem(); virtual int rtti() const { return RTTI_FRAME_STACK_ITEM; } - virtual QString key(int column, bool ascending) const; + virtual TQString key(int column, bool ascending) const; int frameNo() { return frameNo_; } int threadNo() { return threadNo_; } - QString frameName() { return frameName_; } + TQString frameName() { return frameName_; } private: int frameNo_; int threadNo_; - QString frameName_; - QString key_; + TQString frameName_; + TQString key_; }; /***************************************************************************/ @@ -84,7 +84,7 @@ class FramestackWidget : public QListView Q_OBJECT public: - FramestackWidget( QWidget *parent=0, const char *name=0, WFlags f=0 ); + FramestackWidget( TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~FramestackWidget(); void clear(); @@ -100,11 +100,11 @@ public: public slots: void slotSelectFrame(int frameNo, int threadNo); - void slotSelectionChanged(QListViewItem *thisItem); + void slotSelectionChanged(TQListViewItem *thisItem); signals: - void selectFrame(int frameNo, int threadNo, const QString& frameName); - void frameActive(int frameNo, int threadNo, const QString& frameName); + void selectFrame(int frameNo, int threadNo, const TQString& frameName); + void frameActive(int frameNo, int threadNo, const TQString& frameName); private: ThreadStackItem *viewedThread_; diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index e31831de..b9ead060 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -31,16 +31,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -73,7 +73,7 @@ class BreakpointTableRow : public QTableItem { public: - BreakpointTableRow(QTable* table, EditType editType, Breakpoint* bp); + BreakpointTableRow(TQTable* table, EditType editType, Breakpoint* bp); ~BreakpointTableRow(); bool match (Breakpoint* bp) const; @@ -93,9 +93,9 @@ private: /***************************************************************************/ /***************************************************************************/ -BreakpointTableRow::BreakpointTableRow(QTable* parent, EditType editType, +BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType, Breakpoint* bp) : - QTableItem(parent, editType, ""), + TQTableItem(parent, editType, ""), m_breakpoint(bp) { appendEmptyRow(); @@ -133,7 +133,7 @@ void BreakpointTableRow::appendEmptyRow() table()->setItem(row, Control, this); - QCheckTableItem* cti = new QCheckTableItem( table(), ""); + TQCheckTableItem* cti = new TQCheckTableItem( table(), ""); table()->setItem(row, Enable, cti); } @@ -143,15 +143,15 @@ void BreakpointTableRow::setRow() { if ( m_breakpoint ) { - QTableItem *item = table()->item ( row(), Enable ); + TQTableItem *item = table()->item ( row(), Enable ); Q_ASSERT(item->rtti() == 2); - ((QCheckTableItem*)item)->setChecked(m_breakpoint->isEnabled()); + ((TQCheckTableItem*)item)->setChecked(m_breakpoint->isEnabled()); - QString status=m_breakpoint->statusDisplay(m_activeFlag); + TQString status=m_breakpoint->statusDisplay(m_activeFlag); table()->setText(row(), Status, status); - QString displayType = m_breakpoint->displayType(); + TQString displayType = m_breakpoint->displayType(); table()->setText(row(), Location, m_breakpoint->location()); if (m_breakpoint->isTemporary()) @@ -168,44 +168,44 @@ void BreakpointTableRow::setRow() /***************************************************************************/ /***************************************************************************/ -RDBBreakpointWidget::RDBBreakpointWidget(QWidget *parent, const char *name) : - QHBox(parent, name) +RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) : + TQHBox(parent, name) { - QFrame* toolbar = new QFrame( this ); - QVBoxLayout *l = new QVBoxLayout(toolbar, 0, 0); + TQFrame* toolbar = new TQFrame( this ); + TQVBoxLayout *l = new TQVBoxLayout(toolbar, 0, 0); - toolbar->setFrameStyle( QFrame::ToolBarPanel | QFrame::Plain ); + toolbar->setFrameStyle( TQFrame::ToolBarPanel | TQFrame::Plain ); toolbar->setLineWidth( 0 ); - m_add = new QToolButton( toolbar, "add breakpoint" ); + m_add = new TQToolButton( toolbar, "add breakpoint" ); m_add->setPixmap ( SmallIcon ( "breakpoint_add" ) ); - QToolTip::add ( m_add, i18n ( "Add empty breakpoint" ) + I18N_NOOP(" ")); - QWhatsThis::add( m_add, i18n("Add empty breakpoint

    Shows a popup menu that allows you to choose " + TQToolTip::add ( m_add, i18n ( "Add empty breakpoint" ) + I18N_NOOP(" ")); + TQWhatsThis::add( m_add, i18n("Add empty breakpoint

    Shows a popup menu that allows you to choose " "the type of breakpoint, then adds a breakpoint of the selected type to the breakpoints list.")); - m_delete = new QToolButton( toolbar, "delete breakpoint" ); + m_delete = new TQToolButton( toolbar, "delete breakpoint" ); m_delete->setPixmap ( SmallIcon ( "breakpoint_delete" ) ); - QToolTip::add ( m_delete, i18n ( "Delete selected breakpoint" ) + I18N_NOOP(" ") ); - QWhatsThis::add( m_delete, i18n("Delete selected breakpoint

    Deletes the selected breakpoint in the breakpoints list.")); + TQToolTip::add ( m_delete, i18n ( "Delete selected breakpoint" ) + I18N_NOOP(" ") ); + TQWhatsThis::add( m_delete, i18n("Delete selected breakpoint

    Deletes the selected breakpoint in the breakpoints list.")); - m_edit = new QToolButton( toolbar, "edit breakpoint" ); + m_edit = new TQToolButton( toolbar, "edit breakpoint" ); m_edit->setPixmap ( SmallIcon ( "breakpoint_edit" ) ); - QToolTip::add ( m_edit, i18n ( "Edit selected breakpoint" ) + I18N_NOOP(" ") ); - QWhatsThis::add( m_edit, i18n("Edit selected breakpoint

    Allows to edit location, condition and ignore count properties of the selected breakpoint in the breakpoints list.")); + TQToolTip::add ( m_edit, i18n ( "Edit selected breakpoint" ) + I18N_NOOP(" ") ); + TQWhatsThis::add( m_edit, i18n("Edit selected breakpoint

    Allows to edit location, condition and ignore count properties of the selected breakpoint in the breakpoints list.")); - m_removeAll = new QToolButton( toolbar, "Delete all breakppoints" ); + m_removeAll = new TQToolButton( toolbar, "Delete all breakppoints" ); m_removeAll->setPixmap ( SmallIcon ( "breakpoint_delete_all" ) ); - QToolTip::add ( m_removeAll, i18n ( "Remove all breakpoints" ) ); - QWhatsThis::add( m_removeAll, i18n("Remove all breakpoints

    Removes all breakpoints in the project.")); + TQToolTip::add ( m_removeAll, i18n ( "Remove all breakpoints" ) ); + TQWhatsThis::add( m_removeAll, i18n("Remove all breakpoints

    Removes all breakpoints in the project.")); l->addWidget(m_add); l->addWidget(m_edit); l->addWidget(m_delete); l->addWidget(m_removeAll); - QSpacerItem* spacer = new QSpacerItem( 5, 5, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); l->addItem(spacer); - QPopupMenu *addMenu = new QPopupMenu( this ); + TQPopupMenu *addMenu = new TQPopupMenu( this ); addMenu->insertItem( i18n( "File:line" ), BP_TYPE_FilePos ); addMenu->insertItem( i18n( "Watchpoint" ), BP_TYPE_Watchpoint ); addMenu->insertItem( i18n( "Catchpoint" ), BP_TYPE_Catchpoint ); @@ -214,17 +214,17 @@ RDBBreakpointWidget::RDBBreakpointWidget(QWidget *parent, const char *name) : m_add->setPopupDelay(1); m_table = new RDBTable(0, numCols, this, name); - m_table->setSelectionMode(QTable::SingleRow); + m_table->setSelectionMode(TQTable::SingleRow); m_table->setShowGrid (false); m_table->setLeftMargin(0); - m_table->setFocusStyle(QTable::FollowStyle); + m_table->setFocusStyle(TQTable::FollowStyle); m_table->hideColumn(Control); m_table->setColumnReadOnly(Type, true); m_table->setColumnReadOnly(Status, true); m_table->setColumnWidth( Enable, 20); - QHeader *header = m_table->horizontalHeader(); + TQHeader *header = m_table->horizontalHeader(); header->setLabel( Enable, "" ); header->setLabel( Type, i18n("Type") ); @@ -233,40 +233,40 @@ RDBBreakpointWidget::RDBBreakpointWidget(QWidget *parent, const char *name) : m_table->show(); - m_ctxMenu = new QPopupMenu( this ); + m_ctxMenu = new TQPopupMenu( this ); m_ctxMenu->insertItem( i18n( "Show" ), BW_ITEM_Show ); m_ctxMenu->insertItem( i18n( "Edit" ), BW_ITEM_Edit ); m_ctxMenu->insertItem( i18n( "Disable" ), BW_ITEM_Disable ); m_ctxMenu->insertItem( i18n( "Delete" ), BW_ITEM_Delete ); - connect( addMenu, SIGNAL(activated(int)), - this, SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_delete, SIGNAL(clicked()), - this, SLOT(slotRemoveBreakpoint()) ); - connect( m_edit, SIGNAL(clicked()), - this, SLOT(slotEditBreakpoint()) ); - connect( m_removeAll, SIGNAL(clicked()), - this, SLOT(slotRemoveAllBreakpoints()) ); + connect( addMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); + connect( m_delete, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRemoveBreakpoint()) ); + connect( m_edit, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotEditBreakpoint()) ); + connect( m_removeAll, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRemoveAllBreakpoints()) ); - connect( m_table, SIGNAL(contextMenuRequested(int, int, const QPoint &)), - this, SLOT(slotContextMenuShow(int, int, const QPoint & )) ); - connect( m_ctxMenu, SIGNAL(activated(int)), - this, SLOT(slotContextMenuSelect(int)) ); + connect( m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), + this, TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); + connect( m_ctxMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotContextMenuSelect(int)) ); - connect( m_table, SIGNAL(doubleClicked(int, int, int, const QPoint &)), - this, SLOT(slotRowDoubleClicked(int, int, int, const QPoint &))); + connect( m_table, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - connect( m_table, SIGNAL(valueChanged(int, int)), - this, SLOT(slotNewValue(int, int))); + connect( m_table, TQT_SIGNAL(valueChanged(int, int)), + this, TQT_SLOT(slotNewValue(int, int))); - connect( m_table, SIGNAL(returnPressed()), - this, SLOT(slotEditBreakpoint())); -// connect( m_table, SIGNAL(f2Pressed()), -// this, SLOT(slotEditBreakpoint())); - connect( m_table, SIGNAL(deletePressed()), - this, SLOT(slotRemoveBreakpoint())); - connect( m_table, SIGNAL(insertPressed()), - this, SLOT(slotAddBreakpoint())); + connect( m_table, TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(slotEditBreakpoint())); +// connect( m_table, TQT_SIGNAL(f2Pressed()), +// this, TQT_SLOT(slotEditBreakpoint())); + connect( m_table, TQT_SIGNAL(deletePressed()), + this, TQT_SLOT(slotRemoveBreakpoint())); + connect( m_table, TQT_SIGNAL(insertPressed()), + this, TQT_SLOT(slotAddBreakpoint())); } /***************************************************************************/ @@ -362,7 +362,7 @@ BreakpointTableRow* RDBBreakpointWidget::findKey(int BPKey) BreakpointTableRow* RDBBreakpointWidget::addBreakpoint(Breakpoint *bp) { BreakpointTableRow* btr = - new BreakpointTableRow( m_table, QTableItem::WhenCurrent, bp ); + new BreakpointTableRow( m_table, TQTableItem::WhenCurrent, bp ); emit publishBPState(*bp); return btr; } @@ -394,7 +394,7 @@ void RDBBreakpointWidget::removeBreakpoint(BreakpointTableRow* btr) /***************************************************************************/ -void RDBBreakpointWidget::slotToggleBreakpoint(const QString &fileName, int lineNum) +void RDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lineNum) { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); @@ -410,7 +410,7 @@ void RDBBreakpointWidget::slotToggleBreakpoint(const QString &fileName, int line /***************************************************************************/ -void RDBBreakpointWidget::slotToggleBreakpointEnabled(const QString &fileName, int lineNum) +void RDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, int lineNum) { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); @@ -426,7 +426,7 @@ void RDBBreakpointWidget::slotToggleBreakpointEnabled(const QString &fileName, i /***************************************************************************/ -void RDBBreakpointWidget::slotToggleWatchpoint(const QString &varName) +void RDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName) { Watchpoint *watchpoint = new Watchpoint(varName, false, true); BreakpointTableRow* btr = find(watchpoint); @@ -482,7 +482,7 @@ void RDBBreakpointWidget::slotParseRDBBrkptList(char *str) // breakpoint list we can trim the breakpoints that have been // removed (temporary breakpoints do this) m_activeFlag++; - QRegExp breakpoint_re("(\\d+) [^:]+:\\d+"); + TQRegExp breakpoint_re("(\\d+) [^:]+:\\d+"); int pos = 0; pos = breakpoint_re.search(str, pos); @@ -504,7 +504,7 @@ void RDBBreakpointWidget::slotParseRDBBrkptList(char *str) str = strstr(str, "Watchpoints:"); if (str != 0) { - QRegExp watchpoint_re("(\\d+) [^\n]+\n"); + TQRegExp watchpoint_re("(\\d+) [^\n]+\n"); int pos = 0; pos = watchpoint_re.search(str, pos); @@ -549,8 +549,8 @@ void RDBBreakpointWidget::slotParseRDBBreakpointSet(char *str, int BPKey) Breakpoint *bp = btr->breakpoint(); bp->setDbgProcessing(false); - QRegExp breakpoint_re("Set breakpoint (\\d+) at [^:]+:\\d+"); - QRegExp watchpoint_re("Set watchpoint (\\d+)"); + TQRegExp breakpoint_re("Set breakpoint (\\d+) at [^:]+:\\d+"); + TQRegExp watchpoint_re("Set watchpoint (\\d+)"); int id = 0; if (breakpoint_re.search(str, 0) != -1) { @@ -596,7 +596,7 @@ void RDBBreakpointWidget::slotAddBlankBreakpoint(int idx) if (btr) { - QTableSelection ts; + TQTableSelection ts; ts.init(btr->row(), 0); ts.expandTo(btr->row(), numCols ); m_table->addSelection(ts); @@ -632,7 +632,7 @@ void RDBBreakpointWidget::slotRemoveAllBreakpoints() /***************************************************************************/ -void RDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const QPoint &) +void RDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const TQPoint &) { if ( btn == Qt::LeftButton ) { @@ -651,7 +651,7 @@ void RDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const } } -void RDBBreakpointWidget::slotContextMenuShow( int row, int /*col*/, const QPoint &mousePos ) +void RDBBreakpointWidget::slotContextMenuShow( int row, int /*col*/, const TQPoint &mousePos ) { BreakpointTableRow *btr = (BreakpointTableRow *)m_table->item( row, Control ); @@ -718,7 +718,7 @@ void RDBBreakpointWidget::slotContextMenuSelect( int item ) /***************************************************************************/ -void RDBBreakpointWidget::slotEditRow(int row, int col, const QPoint &) +void RDBBreakpointWidget::slotEditRow(int row, int col, const TQPoint &) { // kdDebug(9012) << "in slotEditRow row=" << row << endl; BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); @@ -745,7 +745,7 @@ void RDBBreakpointWidget::slotNewValue(int row, int col) case Enable: { - QCheckTableItem *item = (QCheckTableItem*)m_table->item ( row, Enable ); + TQCheckTableItem *item = (TQCheckTableItem*)m_table->item ( row, Enable ); if ( item->isChecked() != bp->isEnabled() ) { bp->setEnabled(item->isChecked()); @@ -788,7 +788,7 @@ void RDBBreakpointWidget::slotNewValue(int row, int col) /***************************************************************************/ -void RDBBreakpointWidget::slotEditBreakpoint(const QString &fileName, int lineNum) +void RDBBreakpointWidget::slotEditBreakpoint(const TQString &fileName, int lineNum) { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); @@ -797,7 +797,7 @@ void RDBBreakpointWidget::slotEditBreakpoint(const QString &fileName, int lineNu if (btr) { - QTableSelection ts; + TQTableSelection ts; ts.init(btr->row(), 0); ts.expandTo(btr->row(), numCols); m_table->addSelection(ts); @@ -815,21 +815,21 @@ void RDBBreakpointWidget::slotEditBreakpoint() /***************************************************************************/ -void RDBBreakpointWidget::savePartialProjectSession(QDomElement* el) +void RDBBreakpointWidget::savePartialProjectSession(TQDomElement* el) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); if (domDoc.isNull()) return; - QDomElement breakpointListEl = domDoc.createElement("breakpointList"); + TQDomElement breakpointListEl = domDoc.createElement("breakpointList"); for ( int row = 0; row < m_table->numRows(); row++ ) { BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); Breakpoint* bp = btr->breakpoint(); - QDomElement breakpointEl = - domDoc.createElement("breakpoint"+QString::number(row)); + TQDomElement breakpointEl = + domDoc.createElement("breakpoint"+TQString::number(row)); breakpointEl.setAttribute("type", bp->type()); breakpointEl.setAttribute("location", bp->location(false)); @@ -844,12 +844,12 @@ void RDBBreakpointWidget::savePartialProjectSession(QDomElement* el) /***************************************************************************/ -void RDBBreakpointWidget::restorePartialProjectSession(const QDomElement* el) +void RDBBreakpointWidget::restorePartialProjectSession(const TQDomElement* el) { - QDomElement breakpointListEl = el->namedItem("breakpointList").toElement(); + TQDomElement breakpointListEl = el->namedItem("breakpointList").toElement(); if (!breakpointListEl.isNull()) { - QDomElement breakpointEl; + TQDomElement breakpointEl; for (breakpointEl = breakpointListEl.firstChild().toElement(); !breakpointEl.isNull(); breakpointEl = breakpointEl.nextSibling().toElement()) @@ -910,7 +910,7 @@ void RDBBreakpointWidget::slotAddBreakpoint( ) /***************************************************************************/ -void RDBBreakpointWidget::focusInEvent( QFocusEvent */* e*/ ) +void RDBBreakpointWidget::focusInEvent( TQFocusEvent */* e*/ ) { m_table->setFocus(); } diff --git a/languages/ruby/debugger/rdbbreakpointwidget.h b/languages/ruby/debugger/rdbbreakpointwidget.h index 65e6e15b..22922010 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.h +++ b/languages/ruby/debugger/rdbbreakpointwidget.h @@ -22,8 +22,8 @@ #ifndef _RDBBreakpointWidget_H_ #define _RDBBreakpointWidget_H_ -#include -#include +#include +#include class QDomElement; class QToolButton; @@ -44,22 +44,22 @@ class RDBBreakpointWidget : public QHBox Q_OBJECT public: - RDBBreakpointWidget( QWidget* parent=0, const char* name=0 ); + RDBBreakpointWidget( TQWidget* parent=0, const char* name=0 ); virtual ~RDBBreakpointWidget(); void reset(); - void savePartialProjectSession(QDomElement* el); - void restorePartialProjectSession(const QDomElement* el); + void savePartialProjectSession(TQDomElement* el); + void restorePartialProjectSession(const TQDomElement* el); public slots: // Connected to from the editor widget: - void slotToggleBreakpoint(const QString &filename, int lineNum); - void slotToggleBreakpointEnabled(const QString &fileName, int lineNum); + void slotToggleBreakpoint(const TQString &filename, int lineNum); + void slotToggleBreakpointEnabled(const TQString &fileName, int lineNum); // Connected to from the variable widget: - void slotToggleWatchpoint(const QString &varName); + void slotToggleWatchpoint(const TQString &varName); // Connected to from the dbgcontroller: void slotSetPendingBPs(); @@ -71,25 +71,25 @@ public slots: protected: enum BW_ITEMS { BW_ITEM_Show, BW_ITEM_Edit, BW_ITEM_Disable, BW_ITEM_Delete }; - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); private slots: void slotRemoveBreakpoint(); void slotRemoveAllBreakpoints(); - void slotEditBreakpoint(const QString &fileName, int lineNum); + void slotEditBreakpoint(const TQString &fileName, int lineNum); void slotEditBreakpoint(); void slotAddBreakpoint(); void slotAddBlankBreakpoint(int idx); - void slotRowDoubleClicked(int row, int col, int button, const QPoint & mousePos); - void slotContextMenuShow( int row, int col, const QPoint &mousePos ); + void slotRowDoubleClicked(int row, int col, int button, const TQPoint & mousePos); + void slotContextMenuShow( int row, int col, const TQPoint &mousePos ); void slotContextMenuSelect( int item ); - void slotEditRow(int row, int col, const QPoint & mousePos); + void slotEditRow(int row, int col, const TQPoint & mousePos); void slotNewValue(int row, int col); signals: void publishBPState(const Breakpoint& brkpt); void refreshBPState(const Breakpoint& brkpt); - void gotoSourcePosition(const QString &fileName, int lineNum); + void gotoSourcePosition(const TQString &fileName, int lineNum); void clearAllBreakpoints(); private: @@ -104,11 +104,11 @@ private: private: RDBTable* m_table; - QToolButton* m_add; - QToolButton* m_delete; - QToolButton* m_edit; - QToolButton* m_removeAll; - QPopupMenu* m_ctxMenu; + TQToolButton* m_add; + TQToolButton* m_delete; + TQToolButton* m_edit; + TQToolButton* m_removeAll; + TQPopupMenu* m_ctxMenu; }; /***************************************************************************/ diff --git a/languages/ruby/debugger/rdbcommand.cpp b/languages/ruby/debugger/rdbcommand.cpp index 98dc3a80..bfc630cc 100644 --- a/languages/ruby/debugger/rdbcommand.cpp +++ b/languages/ruby/debugger/rdbcommand.cpp @@ -27,11 +27,11 @@ namespace RDBDebugger { -RDBCommand::RDBCommand(const QCString &setCommand, bool isRunCmd, bool isInfoCmd) +RDBCommand::RDBCommand(const TQCString &setCommand, bool isRunCmd, bool isInfoCmd) : DbgCommand(setCommand, isRunCmd, isInfoCmd) { // if (prompt_) { -// cmdBuffer_ = QCString().sprintf("set prompt %c%c\n", BLOCK_START, prompt_) + +// cmdBuffer_ = TQCString().sprintf("set prompt %c%c\n", BLOCK_START, prompt_) + // command_ + // idlePrompt_; // } @@ -48,7 +48,7 @@ RDBCommand::~RDBCommand() /***************************************************************************/ RDBItemCommand::RDBItemCommand( VarItem *item, - const QCString &command, + const TQCString &command, bool isRunCmd) : RDBCommand(command, isRunCmd, true), item_(item) @@ -62,7 +62,7 @@ RDBItemCommand::~RDBItemCommand() } -RDBSetBreakpointCommand::RDBSetBreakpointCommand(const QCString &command, int key) +RDBSetBreakpointCommand::RDBSetBreakpointCommand(const TQCString &command, int key) : RDBCommand(command, false, false), key_(key) { diff --git a/languages/ruby/debugger/rdbcommand.h b/languages/ruby/debugger/rdbcommand.h index 663c8119..0d46a5fc 100644 --- a/languages/ruby/debugger/rdbcommand.h +++ b/languages/ruby/debugger/rdbcommand.h @@ -51,11 +51,11 @@ enum RDBCmd class RDBCommand : public DbgCommand { public: - RDBCommand(const QCString& command, bool isRunCmd=false, bool isInfoCmd=true); + RDBCommand(const TQCString& command, bool isRunCmd=false, bool isInfoCmd=true); virtual ~RDBCommand(); private: - static QCString idlePrompt_; + static TQCString idlePrompt_; }; /***************************************************************************/ @@ -64,7 +64,7 @@ private: class RDBItemCommand : public RDBCommand { public: - RDBItemCommand(VarItem *item, const QCString &command, + RDBItemCommand(VarItem *item, const TQCString &command, bool isRunCmd=false); virtual ~RDBItemCommand(); @@ -81,7 +81,7 @@ private: class RDBSetBreakpointCommand : public RDBCommand { public: - RDBSetBreakpointCommand(const QCString& setCommand, int key); + RDBSetBreakpointCommand(const TQCString& setCommand, int key); virtual ~RDBSetBreakpointCommand(); int getKey() const { return key_; } diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 160754a0..f0b6ea40 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -45,11 +45,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -89,10 +89,10 @@ int debug_controllerExists = false; // At the moment a Unix domain socket is used. It might be better to // change to tcp/ip and listen on a port instead -QCString RDBController::unixSocketPath_; +TQCString RDBController::unixSocketPath_; -RDBController::RDBController(VariableTree *varTree, FramestackWidget *frameStack, QDomDocument &projectDom) +RDBController::RDBController(VariableTree *varTree, FramestackWidget *frameStack, TQDomDocument &projectDom) : DbgController(), frameStack_(frameStack), varTree_(varTree), @@ -129,9 +129,9 @@ RDBController::RDBController(VariableTree *varTree, FramestackWidget *frameStack strcpy(sockaddr.sun_path, unixSocketPath_); bind(masterSocket_, (const struct sockaddr*) &sockaddr, sizeof(sockaddr)); listen(masterSocket_, 1); - acceptNotifier_ = new QSocketNotifier(masterSocket_, QSocketNotifier::Read, this); - QObject::connect( acceptNotifier_, SIGNAL(activated(int)), - this, SLOT(slotAcceptConnection(int)) ); + acceptNotifier_ = new TQSocketNotifier(masterSocket_, TQSocketNotifier::Read, this); + TQObject::connect( acceptNotifier_, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotAcceptConnection(int)) ); configure(); cmdList_.setAutoDelete(true); @@ -153,7 +153,7 @@ RDBController::~RDBController() delete[] rdbOutput_; debug_controllerExists = false; - QFileInfo unixSocket(unixSocketPath_); + TQFileInfo unixSocket(unixSocketPath_); if (unixSocket.exists()) { unlink(unixSocketPath_); } @@ -231,7 +231,7 @@ void RDBController::executeCmd() setStateOff(s_appNotStarted|s_programExited|s_silent); } - QString prettyCmd = currentCmd_->cmdToSend(); + TQString prettyCmd = currentCmd_->cmdToSend(); prettyCmd = currentPrompt_ + prettyCmd; emit rdbStdout( prettyCmd.latin1() ); @@ -291,7 +291,7 @@ void RDBController::pauseApp() // Whenever the program pauses we need to refresh the data visible to // the user. The reason we've stopped may be passed in to be emitted. -void RDBController::actOnProgramPause(const QString &msg) +void RDBController::actOnProgramPause(const TQString &msg) { // We're only stopping if we were running, of course. if (stateIsOn(s_appBusy)) @@ -326,7 +326,7 @@ void RDBController::actOnProgramPause(const QString &msg) // an invalid program specified or ... // rdb is still running though, but only the run command (may) make sense // all other commands are disabled. -void RDBController::programNoApp(const QString &msg, bool msgBox) +void RDBController::programNoApp(const TQString &msg, bool msgBox) { state_ = (s_appNotStarted|s_programExited|(state_&(s_shuttingDown))); destroyCmds(); @@ -358,17 +358,17 @@ void RDBController::programNoApp(const QString &msg, bool msgBox) // The data gets parsed here and emitted in its component parts. void RDBController::parseProgramLocation(char *buf) { - QString buffer(buf); - QString line; - QTextStream input(&buffer, IO_ReadOnly); - QString sourceFile; + TQString buffer(buf); + TQString line; + TQTextStream input(&buffer, IO_ReadOnly); + TQString sourceFile; int sourceLine = 0; // "1: a = 1" - QRegExp display_re("^(\\d+):\\s(.*)$"); + TQRegExp display_re("^(\\d+):\\s(.*)$"); // "/opt/qt/src/widgets/qlistview.rb:1558:puts 'hello world'" - QRegExp sourcepos_re("^([^:]+):(\\d+):"); + TQRegExp sourcepos_re("^([^:]+):(\\d+):"); line = input.readLine(); while (! line.isNull()) { @@ -388,7 +388,7 @@ void RDBController::parseProgramLocation(char *buf) && !sourceFile.endsWith("/korundum.rb") ) ) && !sourceFile.endsWith("/debuggee.rb") ) { - actOnProgramPause(QString()); + actOnProgramPause(TQString()); emit showStepInSource(sourceFile, sourceLine, ""); return; } @@ -422,7 +422,7 @@ void RDBController::parseSwitchThread(char *buf) { // Look for the thread number // 2 # /home/duke/play/testit/trykorundum/src/bar.rb:13 - QRegExp thread_re("(\\d+)"); + TQRegExp thread_re("(\\d+)"); if (thread_re.search(buf) != -1) { viewedThread_ = thread_re.cap(1).toInt(); currentFrame_ = 1; @@ -434,7 +434,7 @@ void RDBController::parseSwitchThread(char *buf) // After an 'up nnn' or 'down nnn' command, get the new source file and line no. void RDBController::parseFrameMove(char *buf) { - QString sourceFile; + TQString sourceFile; int sourceLine = 0; if (stateIsOn(s_fetchLocals)) { @@ -442,7 +442,7 @@ void RDBController::parseFrameMove(char *buf) } // "#2 /home/duke/play/testit/trykorundum/src/main.rb:11" - QRegExp sourcepos_re("#\\d+\\s([^:]+):(\\d+)"); + TQRegExp sourcepos_re("#\\d+\\s([^:]+):(\\d+)"); if (sourcepos_re.search(buf) != -1) { sourceFile = sourcepos_re.cap(1); sourceLine = sourcepos_re.cap(2).toInt(); @@ -505,7 +505,7 @@ void RDBController::parseFrameSelected(char *buf) { if (!stateIsOn(s_silent)) { emit showStepInSource("", -1, ""); - emit dbgStatus (i18n("No source: %1").arg(QString(buf)), state_); + emit dbgStatus (i18n("No source: %1").arg(TQString(buf)), state_); } } @@ -527,7 +527,7 @@ void RDBController::parseUpdateDisplay(char *buf) { varTree_->viewport()->setUpdatesEnabled(false); - QRegExp display_re("(\\d+):\\s([^\n]*)\n"); + TQRegExp display_re("(\\d+):\\s([^\n]*)\n"); int pos = display_re.search(buf); while (pos != -1) { @@ -644,14 +644,14 @@ void RDBController::parse(char *buf) // ************************************************************************** -void RDBController::setBreakpoint(const QCString &BPSetCmd, int key) +void RDBController::setBreakpoint(const TQCString &BPSetCmd, int key) { queueCmd(new RDBSetBreakpointCommand(BPSetCmd, key)); } // ************************************************************************** -void RDBController::clearBreakpoint(const QCString &BPClearCmd) +void RDBController::clearBreakpoint(const TQCString &BPClearCmd) { queueCmd(new RDBCommand(BPClearCmd, NOTRUNCMD, NOTINFOCMD)); // Note: this is NOT an info command, because rdb doesn't explictly tell @@ -668,7 +668,7 @@ void RDBController::modifyBreakpoint( const Breakpoint& BP ) if (BP.dbgId() > 0) { if (BP.changedEnable()) - queueCmd(new RDBCommand(QCString().sprintf("%s %d", + queueCmd(new RDBCommand(TQCString().sprintf("%s %d", BP.isEnabled() ? "enable" : "disable", BP.dbgId()), NOTRUNCMD, NOTINFOCMD)); @@ -688,7 +688,7 @@ void RDBController::modifyBreakpoint( const Breakpoint& BP ) // ************************************************************************** -void RDBController::slotStart(const QString& ruby_interpreter, const QString& character_coding, const QString& run_directory, const QString& debuggee_path, const QString &application, const QString& run_arguments, bool show_constants, bool trace_into_ruby) +void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& character_coding, const TQString& run_directory, const TQString& debuggee_path, const TQString &application, const TQString& run_arguments, bool show_constants, bool trace_into_ruby) { Q_ASSERT (!dbgProcess_ && !tty_); @@ -696,11 +696,11 @@ void RDBController::slotStart(const QString& ruby_interpreter, const QString& ch tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); if (!config_dbgTerminal_) { - connect( tty_, SIGNAL(OutOutput(const char*)), SIGNAL(ttyStdout(const char*)) ); - connect( tty_, SIGNAL(ErrOutput(const char*)), SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); } - QString tty(tty_->getSlave()); + TQString tty(tty_->getSlave()); if (tty.isEmpty()) { KMessageBox::error(0, i18n("The ruby debugger cannot use the tty* or pty* devices.\n" @@ -716,17 +716,17 @@ void RDBController::slotStart(const QString& ruby_interpreter, const QString& ch dbgProcess_ = new KProcess; - connect( dbgProcess_, SIGNAL(receivedStdout(KProcess *, char *, int)), - this, SLOT(slotDbgStdout(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + this, TQT_SLOT(slotDbgStdout(KProcess *, char *, int)) ); - connect( dbgProcess_, SIGNAL(receivedStderr(KProcess *, char *, int)), - this, SLOT(slotDbgStderr(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + this, TQT_SLOT(slotDbgStderr(KProcess *, char *, int)) ); - connect( dbgProcess_, SIGNAL(wroteStdin(KProcess *)), - this, SLOT(slotDbgWroteStdin(KProcess *)) ); + connect( dbgProcess_, TQT_SIGNAL(wroteStdin(KProcess *)), + this, TQT_SLOT(slotDbgWroteStdin(KProcess *)) ); - connect( dbgProcess_, SIGNAL(processExited(KProcess*)), - this, SLOT(slotDbgProcessExited(KProcess*)) ); + connect( dbgProcess_, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotDbgProcessExited(KProcess*)) ); rubyInterpreter_ = ruby_interpreter; characterCoding_ = character_coding; @@ -739,7 +739,7 @@ void RDBController::slotStart(const QString& ruby_interpreter, const QString& ch *dbgProcess_ << ruby_interpreter; *dbgProcess_ << character_coding; - *dbgProcess_ << "-C" << QString(QFile::encodeName( run_directory )); + *dbgProcess_ << "-C" << TQString(TQFile::encodeName( run_directory )); *dbgProcess_ << "-r" << debuggee_path; *dbgProcess_ << application; @@ -747,8 +747,8 @@ void RDBController::slotStart(const QString& ruby_interpreter, const QString& ch *dbgProcess_ << run_arguments; } - emit rdbStdout(QString( ruby_interpreter + " " + character_coding - + " -C " + QString(QFile::encodeName( run_directory )) + emit rdbStdout(TQString( ruby_interpreter + " " + character_coding + + " -C " + TQString(TQFile::encodeName( run_directory )) + " -r " + debuggee_path + " " + application + " " + run_arguments ).latin1() ); @@ -766,9 +766,9 @@ void RDBController::slotStart(const QString& ruby_interpreter, const QString& ch // BUT the app hasn't been started yet! A run command is about to be issued // by whoever is controlling us. - if (!dbgProcess_->writeStdin(QString("%1\n").arg(unixSocketPath_).latin1(), strlen(unixSocketPath_) + 1)) { + if (!dbgProcess_->writeStdin(TQString("%1\n").arg(unixSocketPath_).latin1(), strlen(unixSocketPath_) + 1)) { kdDebug(9012) << "failed to write Unix domain socket path to rdb " - << QString("%1\n").arg(unixSocketPath_).latin1() << endl; + << TQString("%1\n").arg(unixSocketPath_).latin1() << endl; } setStateOff(s_programExited); @@ -785,8 +785,8 @@ void RDBController::slotStopDebugger() setStateOn(s_shuttingDown|s_silent); destroyCmds(); - QTime start; - QTime now; + TQTime start; + TQTime now; // Get rdb's attention if it's busy. We need rdb to be at the // command line so we can stop it. @@ -794,11 +794,11 @@ void RDBController::slotStopDebugger() { kdDebug(9012) << "ruby debugger busy on shutdown - stopping rdb (SIGINT)" << endl; dbgProcess_->kill(SIGINT); - start = QTime::currentTime(); + start = TQTime::currentTime(); while (-1) { kapp->processEvents(20); - now = QTime::currentTime(); + now = TQTime::currentTime(); if (!stateIsOn(s_appBusy) || start.msecsTo( now ) > 2000) break; } @@ -813,11 +813,11 @@ void RDBController::slotStopDebugger() kdDebug(9012) << "failed to write 'quit' to ruby debugger" << endl; emit rdbStdout("(rdb:1) quit"); - start = QTime::currentTime(); + start = TQTime::currentTime(); while (-1) { kapp->processEvents(20); - now = QTime::currentTime(); + now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; } @@ -858,17 +858,17 @@ void RDBController::slotRun() // ************************************************************************** -void RDBController::slotRunUntil(const QString &fileName, int lineNum) +void RDBController::slotRunUntil(const TQString &fileName, int lineNum) { if (stateIsOn(s_appBusy|s_dbgNotStarted|s_shuttingDown)) return; if (fileName.isEmpty()) - queueCmd(new RDBCommand( QCString().sprintf("break %d", lineNum), + queueCmd(new RDBCommand( TQCString().sprintf("break %d", lineNum), RUNCMD, NOTINFOCMD)); else queueCmd(new RDBCommand( - QCString().sprintf("break %s:%d", fileName.latin1(), lineNum), + TQCString().sprintf("break %s:%d", fileName.latin1(), lineNum), RUNCMD, NOTINFOCMD)); queueCmd(new RDBCommand("cont", RUNCMD, NOTINFOCMD)); @@ -1014,7 +1014,7 @@ void RDBController::slotClearAllBreakpoints() // ************************************************************************** -void RDBController::slotSelectFrame(int frameNo, int threadNo, const QString& frameName) +void RDBController::slotSelectFrame(int frameNo, int threadNo, const TQString& frameName) { if (stateIsOn(s_appBusy|s_dbgNotStarted|s_shuttingDown)) { kdDebug(9012) << "RDBController::slotSelectFrame wrong state" << endl; @@ -1023,19 +1023,19 @@ void RDBController::slotSelectFrame(int frameNo, int threadNo, const QString& fr if (viewedThread_ != threadNo) { // Note that 'thread switch nnn' is a run command - queueCmd(new RDBCommand(QCString().sprintf("thread switch %d", + queueCmd(new RDBCommand(TQCString().sprintf("thread switch %d", threadNo), RUNCMD, INFOCMD)); executeCmd(); return; } if (frameNo > currentFrame_) { - queueCmd(new RDBCommand(QCString().sprintf("up %d", frameNo - currentFrame_), NOTRUNCMD, INFOCMD)); + queueCmd(new RDBCommand(TQCString().sprintf("up %d", frameNo - currentFrame_), NOTRUNCMD, INFOCMD)); if (!stateIsOn(s_fetchLocals)) { queueCmd(new RDBCommand("display", NOTRUNCMD, INFOCMD)); } } else if (frameNo < currentFrame_) { - queueCmd(new RDBCommand(QCString().sprintf("down %d", currentFrame_ - frameNo), NOTRUNCMD, INFOCMD)); + queueCmd(new RDBCommand(TQCString().sprintf("down %d", currentFrame_ - frameNo), NOTRUNCMD, INFOCMD)); if (!stateIsOn(s_fetchLocals)) { queueCmd(new RDBCommand("display", NOTRUNCMD, INFOCMD)); } @@ -1080,7 +1080,7 @@ void RDBController::slotSelectFrame(int frameNo, int threadNo, const QString& fr // ************************************************************************** // This is called when an item needs special processing to show a value. -void RDBController::slotExpandItem(VarItem *item, const QCString &userRequest) +void RDBController::slotExpandItem(VarItem *item, const TQCString &userRequest) { if (stateIsOn(s_appBusy|s_dbgNotStarted|s_shuttingDown)) return; @@ -1091,7 +1091,7 @@ void RDBController::slotExpandItem(VarItem *item, const QCString &userRequest) if (userRequest.isEmpty()) return; - queueCmd(new RDBItemCommand(item, QCString("pp ") + userRequest.data(), false)); + queueCmd(new RDBItemCommand(item, TQCString("pp ") + userRequest.data(), false)); if (currentCmd_ == 0) { executeCmd(); @@ -1101,9 +1101,9 @@ void RDBController::slotExpandItem(VarItem *item, const QCString &userRequest) // ************************************************************************** // This method evaluates text selected with the 'Inspect:' context menu -void RDBController::slotRubyInspect(const QString &inspectText) +void RDBController::slotRubyInspect(const TQString &inspectText) { - queueCmd(new RDBCommand( QCString().sprintf("p %s", inspectText.latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("p %s", inspectText.latin1()), NOTRUNCMD, INFOCMD ), true ); executeCmd(); @@ -1113,9 +1113,9 @@ void RDBController::slotRubyInspect(const QString &inspectText) // ************************************************************************** // Add a new expression to be displayed in the Watch variable tree -void RDBController::slotAddWatchExpression(const QString& expr, bool execute) +void RDBController::slotAddWatchExpression(const TQString& expr, bool execute) { - queueCmd(new RDBCommand( QCString().sprintf("display %s", expr.latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("display %s", expr.latin1()), NOTRUNCMD, NOTINFOCMD ) ); if (execute) { @@ -1128,7 +1128,7 @@ void RDBController::slotAddWatchExpression(const QString& expr, bool execute) // Add a new expression to be displayed in the Watch variable tree void RDBController::slotRemoveWatchExpression(int displayId) { - queueCmd(new RDBCommand( QCString().sprintf("undisplay %d", displayId), + queueCmd(new RDBCommand( TQCString().sprintf("undisplay %d", displayId), NOTRUNCMD, INFOCMD ) ); executeCmd(); @@ -1156,7 +1156,7 @@ void RDBController::slotFetchGlobals(bool fetch) // Data from the ruby program's stdout gets processed here. void RDBController::slotDbgStdout(KProcess *, char *buf, int buflen) { - QCString msg(buf, buflen+1); + TQCString msg(buf, buflen+1); emit ttyStdout(msg); } @@ -1165,7 +1165,7 @@ void RDBController::slotDbgStdout(KProcess *, char *buf, int buflen) // Data from the ruby program's stderr gets processed here. void RDBController::slotDbgStderr(KProcess *, char *buf, int buflen) { - QCString msg(buf, buflen+1); + TQCString msg(buf, buflen+1); emit ttyStderr(msg); } @@ -1198,9 +1198,9 @@ void RDBController::slotAcceptConnection(int masterSocket) kdDebug(9012) << "RDBController::slotAcceptConnection can't set nonblocking socket " << errno << endl; } - socketNotifier_ = new QSocketNotifier(socket_, QSocketNotifier::Read, 0); - QObject::connect( socketNotifier_, SIGNAL(activated(int)), - this, SLOT(slotReadFromSocket(int)) ); + socketNotifier_ = new TQSocketNotifier(socket_, TQSocketNotifier::Read, 0); + TQObject::connect( socketNotifier_, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotReadFromSocket(int)) ); setStateOff(s_dbgNotStarted); emit dbgStatus ("", state_); @@ -1245,7 +1245,7 @@ void RDBController::slotReadFromSocket(int socket) // kdDebug(9012) << "RDBController::slotReadFromSocket length: " << rdbOutputLen_ << " input: " << rdbOutput_ << endl; - QRegExp prompt_re("(\\(rdb:(\\d+)\\) )$"); + TQRegExp prompt_re("(\\(rdb:(\\d+)\\) )$"); int promptPos = prompt_re.search(rdbOutput_, 0); // Keep appending output to the rbdOutput_ buffer until the @@ -1303,54 +1303,54 @@ void RDBController::slotDbgProcessExited(KProcess*) // Takes abbreviated commands and expands them, before passing them on to rdb // -void RDBController::slotUserRDBCmd(const QString& cmd) +void RDBController::slotUserRDBCmd(const TQString& cmd) { kdDebug(9012) << "Requested user cmd: " << cmd << endl; - QRegExp break_re("^b(reak)?(\\s.*)?"); - QRegExp watch_re("^wat(ch)?\\s+(.*)"); - QRegExp delete_re("^del(ete)?(\\s.*)?"); - QRegExp display_re("^disp(lay)?(\\s.*)?"); - QRegExp undisplay_re("^undisp(lay)?(\\s.*)?"); - QRegExp step_re("^s(tep)?(\\s[\\d]+)?$"); - QRegExp next_re("^n(ext)?(\\s[\\d]+)?$"); - QRegExp varlocal_re("^v(ar)?\\s+l(ocal)?"); - QRegExp varglobal_re("^v(ar)?\\s+g(lobal)?"); - QRegExp varinstance_re("^v(ar)?\\s+i(nstance)?\\s(.*)"); - QRegExp varconst_re("^v(ar)?\\s+c(onst)?\\s(.*)"); - QRegExp threadlist_re("^th(read)?\\s+l(ist)?"); - QRegExp threadcurrent_re("^th(read)?(\\sc(ur(rent)?)?)?$"); - QRegExp threadswitch_re("^th(read)?(\\ssw(itch)?)?(\\s.*)"); - QRegExp thread_re("^th(read)?(\\s+.*)?"); - QRegExp methodinstance_re("^m(ethod)?\\s+i(nstance)?\\s+(.*)"); - QRegExp method_re("^m(ethod)?\\s+(.*)"); - QRegExp list_re("^l(ist)?(\\s+\\d+-\\d+)?$"); + TQRegExp break_re("^b(reak)?(\\s.*)?"); + TQRegExp watch_re("^wat(ch)?\\s+(.*)"); + TQRegExp delete_re("^del(ete)?(\\s.*)?"); + TQRegExp display_re("^disp(lay)?(\\s.*)?"); + TQRegExp undisplay_re("^undisp(lay)?(\\s.*)?"); + TQRegExp step_re("^s(tep)?(\\s[\\d]+)?$"); + TQRegExp next_re("^n(ext)?(\\s[\\d]+)?$"); + TQRegExp varlocal_re("^v(ar)?\\s+l(ocal)?"); + TQRegExp varglobal_re("^v(ar)?\\s+g(lobal)?"); + TQRegExp varinstance_re("^v(ar)?\\s+i(nstance)?\\s(.*)"); + TQRegExp varconst_re("^v(ar)?\\s+c(onst)?\\s(.*)"); + TQRegExp threadlist_re("^th(read)?\\s+l(ist)?"); + TQRegExp threadcurrent_re("^th(read)?(\\sc(ur(rent)?)?)?$"); + TQRegExp threadswitch_re("^th(read)?(\\ssw(itch)?)?(\\s.*)"); + TQRegExp thread_re("^th(read)?(\\s+.*)?"); + TQRegExp methodinstance_re("^m(ethod)?\\s+i(nstance)?\\s+(.*)"); + TQRegExp method_re("^m(ethod)?\\s+(.*)"); + TQRegExp list_re("^l(ist)?(\\s+\\d+-\\d+)?$"); if ( break_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("break%s", break_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("break%s", break_re.cap(2).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if ( watch_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("watch %s", watch_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("watch %s", watch_re.cap(2).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if ( delete_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("delete%s", delete_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("delete%s", delete_re.cap(2).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if ( display_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("display%s", display_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("display%s", display_re.cap(2).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if ( undisplay_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("undisplay%s", undisplay_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("undisplay%s", undisplay_re.cap(2).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if ( step_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("step%s", step_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("step%s", step_re.cap(2).latin1()), RUNCMD, INFOCMD ), true ); } else if ( next_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("next%s", next_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("next%s", next_re.cap(2).latin1()), RUNCMD, INFOCMD ), true ); } else if ( varlocal_re.search(cmd) >= 0 ) { @@ -1358,23 +1358,23 @@ void RDBController::slotUserRDBCmd(const QString& cmd) } else if ( varglobal_re.search(cmd) >= 0 ) { queueCmd(new RDBCommand("var global", NOTRUNCMD, INFOCMD)); } else if ( varinstance_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("var instance %s", varinstance_re.cap(3).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("var instance %s", varinstance_re.cap(3).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if ( varconst_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("var const %s", varconst_re.cap(3).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("var const %s", varconst_re.cap(3).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if ( methodinstance_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("method instance %s", methodinstance_re.cap(3).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("method instance %s", methodinstance_re.cap(3).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if ( method_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("method %s", method_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("method %s", method_re.cap(2).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if ( list_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("list%s", list_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("list%s", list_re.cap(2).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if (cmd == "c" || cmd == "cont") { @@ -1386,11 +1386,11 @@ void RDBController::slotUserRDBCmd(const QString& cmd) } else if ( threadcurrent_re.search(cmd) >= 0 ) { queueCmd(new RDBCommand("thread current", NOTRUNCMD, INFOCMD), true ); } else if ( threadswitch_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("thread switch%s", threadswitch_re.cap(4).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("thread switch%s", threadswitch_re.cap(4).latin1()), RUNCMD, INFOCMD ), true ); } else if ( thread_re.search(cmd) >= 0 ) { - queueCmd(new RDBCommand( QCString().sprintf("thread%s", thread_re.cap(2).latin1()), + queueCmd(new RDBCommand( TQCString().sprintf("thread%s", thread_re.cap(2).latin1()), NOTRUNCMD, INFOCMD ), true ); } else if (cmd == "frame" || cmd == "f" || cmd == "where" || cmd == "w") { diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h index 2d303218..e2ed0746 100644 --- a/languages/ruby/debugger/rdbcontroller.h +++ b/languages/ruby/debugger/rdbcontroller.h @@ -29,12 +29,12 @@ #include "dbgcontroller.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include class KProcess; @@ -58,7 +58,7 @@ class RDBController : public DbgController Q_OBJECT public: - RDBController(VariableTree *varTree, FramestackWidget *frameStack, QDomDocument &projectDom); + RDBController(VariableTree *varTree, FramestackWidget *frameStack, TQDomDocument &projectDom); ~RDBController(); protected: @@ -84,11 +84,11 @@ private: void executeCmd (); void destroyCmds(); void removeInfoRequests(); - void actOnProgramPause(const QString &msg); - void programNoApp(const QString &msg, bool msgBox); + void actOnProgramPause(const TQString &msg); + void programNoApp(const TQString &msg, bool msgBox); - void setBreakpoint(const QCString &BPSetCmd, int key); - void clearBreakpoint(const QCString &BPClearCmd); + void setBreakpoint(const TQCString &BPSetCmd, int key); + void clearBreakpoint(const TQCString &BPClearCmd); void modifyBreakpoint(const Breakpoint&); void setStateOn(int stateOn) { state_ |= stateOn; } @@ -98,16 +98,16 @@ private: public slots: void configure(); - void slotStart( const QString& shell, const QString& characterCoding, - const QString& run_directory, const QString& debuggee_path, - const QString &application, const QString& run_arguments, + void slotStart( const TQString& shell, const TQString& characterCoding, + const TQString& run_directory, const TQString& debuggee_path, + const TQString &application, const TQString& run_arguments, bool show_constants, bool trace_into_ruby ); - //void slotStart(const QString& shell, const QString &application); + //void slotStart(const TQString& shell, const TQString &application); void slotStopDebugger(); void slotRun(); - void slotRunUntil(const QString &filename, int lineNum); + void slotRunUntil(const TQString &filename, int lineNum); void slotStepInto(); void slotStepOver(); void slotStepOutOff(); @@ -116,14 +116,14 @@ public slots: void slotBPState( const Breakpoint& ); void slotClearAllBreakpoints(); - void slotExpandItem(VarItem *parent, const QCString &userRequest); - void slotRubyInspect(const QString &inspectText); - void slotSelectFrame(int frameNo, int threadNo, const QString& frameName); + void slotExpandItem(VarItem *parent, const TQCString &userRequest); + void slotRubyInspect(const TQString &inspectText); + void slotSelectFrame(int frameNo, int threadNo, const TQString& frameName); void slotFetchGlobals(bool fetch); - void slotAddWatchExpression(const QString& expr, bool execute); + void slotAddWatchExpression(const TQString& expr, bool execute); void slotRemoveWatchExpression(int displayId); - void slotUserRDBCmd(const QString&); + void slotUserRDBCmd(const TQString&); protected slots: void slotDbgStdout(KProcess *proc, char *buf, int buflen); @@ -137,7 +137,7 @@ protected slots: signals: void acceptPendingBPs (); void unableToSetBPNow (int BPNo); - void addWatchExpression (const QString&); + void addWatchExpression (const TQString&); private: FramestackWidget* frameStack_; @@ -149,31 +149,31 @@ private: // from the ruby program int stdoutOutputLen_; // amount of data in the output buffer char* stdoutOutput_; // buffer for the output from kprocess - QCString holdingZone_; + TQCString holdingZone_; int rdbSizeofBuf_; // size of the output buffer from rdb int rdbOutputLen_; // amount of data in the rdb buffer char* rdbOutput_; // buffer for the output from rdb via the Unix socket int masterSocket_; // The socket to accept connections - QSocketNotifier* acceptNotifier_; - static QCString unixSocketPath_; // The name of the Unix Domain socket + TQSocketNotifier* acceptNotifier_; + static TQCString unixSocketPath_; // The name of the Unix Domain socket int socket_; // The socket to read and write to the debuggee - QSocketNotifier* socketNotifier_; + TQSocketNotifier* socketNotifier_; - QPtrList cmdList_; + TQPtrList cmdList_; DbgCommand* currentCmd_; - QString currentPrompt_; + TQString currentPrompt_; STTY* tty_; // Details for starting the ruby debugger process - QString rubyInterpreter_; - QString characterCoding_; - QString runDirectory_; - QString debuggeePath_; - QString application_; - QString runArguments_; + TQString rubyInterpreter_; + TQString characterCoding_; + TQString runDirectory_; + TQString debuggeePath_; + TQString application_; + TQString runArguments_; bool showConstants_; bool traceIntoRuby_; @@ -182,7 +182,7 @@ private: bool programHasExited_; // Configuration values - QDomDocument &dom; + TQDomDocument &dom; bool config_forceBPSet_; bool config_dbgTerminal_; }; diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp index 5e08e116..6eef01c7 100644 --- a/languages/ruby/debugger/rdboutputwidget.cpp +++ b/languages/ruby/debugger/rdboutputwidget.cpp @@ -29,11 +29,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /***************************************************************************/ /***************************************************************************/ @@ -44,45 +44,45 @@ namespace RDBDebugger /***************************************************************************/ -RDBOutputWidget::RDBOutputWidget( QWidget *parent, const char *name) : - QWidget(parent, name), +RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : + TQWidget(parent, name), m_userRDBCmdEditor(0), m_Interrupt(0), m_rdbView(0) { - m_rdbView = new QTextEdit (this, name); + m_rdbView = new TQTextEdit (this, name); m_rdbView->setReadOnly(true); - QBoxLayout *userRDBCmdEntry = new QHBoxLayout(); + TQBoxLayout *userRDBCmdEntry = new TQHBoxLayout(); m_userRDBCmdEditor = new KHistoryCombo (this, "rdb-user-cmd-editor"); - QLabel *label = new QLabel(i18n("&RDB cmd:"), this); + TQLabel *label = new TQLabel(i18n("&RDB cmd:"), this); label->setBuddy(m_userRDBCmdEditor); userRDBCmdEntry->addWidget(label); userRDBCmdEntry->addWidget(m_userRDBCmdEditor); userRDBCmdEntry->setStretchFactor(m_userRDBCmdEditor, 1); - m_Interrupt = new QToolButton( this, "add breakpoint" ); - m_Interrupt->setSizePolicy ( QSizePolicy ( (QSizePolicy::SizeType)0, - ( QSizePolicy::SizeType)0, + m_Interrupt = new TQToolButton( this, "add breakpoint" ); + m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, + ( TQSizePolicy::SizeType)0, 0, 0, m_Interrupt->sizePolicy().hasHeightForWidth()) ); m_Interrupt->setPixmap ( SmallIcon ( "player_pause" ) ); userRDBCmdEntry->addWidget(m_Interrupt); - QToolTip::add ( m_Interrupt, i18n ( "Pause execution of the app to enter rdb commands" ) ); + TQToolTip::add ( m_Interrupt, i18n ( "Pause execution of the app to enter rdb commands" ) ); - QVBoxLayout *topLayout = new QVBoxLayout(this, 2); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 2); topLayout->addWidget(m_rdbView, 10); topLayout->addLayout(userRDBCmdEntry); slotDbgStatus( "", s_dbgNotStarted); - connect( m_userRDBCmdEditor, SIGNAL(returnPressed()), SLOT(slotRDBCmd()) ); - connect( m_Interrupt, SIGNAL(clicked()), SIGNAL(breakInto())); + connect( m_userRDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotRDBCmd()) ); + connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); } /***************************************************************************/ @@ -106,7 +106,7 @@ void RDBOutputWidget::clear() void RDBOutputWidget::slotReceivedStdout(const char* line) { if (strncmp(line, "(rdb:", 5) == 0) - m_rdbView->append(QString("").append( line ).append("") ); + m_rdbView->append(TQString("").append( line ).append("") ); else m_rdbView->append(line); } @@ -115,14 +115,14 @@ void RDBOutputWidget::slotReceivedStdout(const char* line) void RDBOutputWidget::slotReceivedStderr(const char* line) { - m_rdbView->append(QString("").append( line ).append("") ); + m_rdbView->append(TQString("").append( line ).append("") ); } /***************************************************************************/ void RDBOutputWidget::slotRDBCmd() { - QString RDBCmd(m_userRDBCmdEditor->currentText()); + TQString RDBCmd(m_userRDBCmdEditor->currentText()); if (!RDBCmd.isEmpty()) { m_userRDBCmdEditor->addToHistory(RDBCmd); @@ -133,7 +133,7 @@ void RDBOutputWidget::slotRDBCmd() /***************************************************************************/ -void RDBOutputWidget::slotDbgStatus(const QString &, int statusFlag) +void RDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag) { if (statusFlag & s_dbgNotStarted) { @@ -156,7 +156,7 @@ void RDBOutputWidget::slotDbgStatus(const QString &, int statusFlag) /***************************************************************************/ -void RDBOutputWidget::focusInEvent(QFocusEvent */*e*/) +void RDBOutputWidget::focusInEvent(TQFocusEvent */*e*/) { m_userRDBCmdEditor->setFocus(); } diff --git a/languages/ruby/debugger/rdboutputwidget.h b/languages/ruby/debugger/rdboutputwidget.h index ef466757..051c65bb 100644 --- a/languages/ruby/debugger/rdboutputwidget.h +++ b/languages/ruby/debugger/rdboutputwidget.h @@ -24,7 +24,7 @@ #ifndef _RDBOUTPUTWIDGET_H_ #define _RDBOUTPUTWIDGET_H_ -#include +#include class KHistoryCombo; @@ -39,7 +39,7 @@ class RDBOutputWidget : public QWidget Q_OBJECT public: - RDBOutputWidget( QWidget *parent=0, const char *name=0 ); + RDBOutputWidget( TQWidget *parent=0, const char *name=0 ); ~RDBOutputWidget(); void clear(); @@ -47,21 +47,21 @@ public: public slots: void slotReceivedStdout(const char* line); void slotReceivedStderr(const char* line); - void slotDbgStatus (const QString &status, int statusFlag); + void slotDbgStatus (const TQString &status, int statusFlag); void slotRDBCmd(); protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); signals: - void userRDBCmd(const QString &cmd); + void userRDBCmd(const TQString &cmd); void breakInto(); private: KHistoryCombo* m_userRDBCmdEditor; - QToolButton* m_Interrupt; - QTextEdit* m_rdbView; + TQToolButton* m_Interrupt; + TQTextEdit* m_rdbView; }; } diff --git a/languages/ruby/debugger/rdbparser.cpp b/languages/ruby/debugger/rdbparser.cpp index 7792acc5..c1cd7717 100644 --- a/languages/ruby/debugger/rdbparser.cpp +++ b/languages/ruby/debugger/rdbparser.cpp @@ -22,7 +22,7 @@ #include "rdbparser.h" #include "variablewidget.h" -#include +#include #include #include @@ -51,9 +51,9 @@ void RDBParser::parseVariables(LazyFetchItem *parent, char *buf) buf = (char*)unknown; } - QRegExp var_re("\\s*([^\\n\\s]+) => ([^\\n]+)"); - QRegExp ref_re("(#<([^:]|::)+:0x[\\da-f]+)\\s*([^=]*)>?"); - QRegExp struct_re("# ([^\\n]+)"); + TQRegExp ref_re("(#<([^:]|::)+:0x[\\da-f]+)\\s*([^=]*)>?"); + TQRegExp struct_re("# value' pairs. For example: // a => 1 @@ -71,7 +71,7 @@ void RDBParser::parseVariables(LazyFetchItem *parent, char *buf) value = var_re.cap(2).latin1(); } } else if (struct_re.search(var_re.cap(2)) != -1) { - value = (QString("#").latin1(); + value = (TQString("#").latin1(); } else { value = var_re.cap(2).latin1(); } @@ -100,7 +100,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf) int pos; QString varName; QCString value; - QRegExp ppref_re("(#<([^:]|::)+:0x[\\da-f]+)([^\\n>]*)(>?)"); + TQRegExp ppref_re("(#<([^:]|::)+:0x[\\da-f]+)([^\\n>]*)(>?)"); switch (parent->dataType()) { case REFERENCE_TYPE: @@ -112,14 +112,14 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf) // @sleeper=#, // @temp={"z"=>"zed", "p"=>"pee"}> // - QRegExp ppvalue_re("\\s*([^\\n\\s=]+)=([^\\n]+)[,>]"); + TQRegExp ppvalue_re("\\s*([^\\n\\s=]+)=([^\\n]+)[,>]"); pos = ppref_re.search(buf); if (pos != -1) { if (ppref_re.cap(4) != "") { // The value is all on one line, so match against name=value // pairs which can't have commas in their values - ppvalue_re = QRegExp("\\s*([^\\s=]+)=([^,>]+)([,>])"); + ppvalue_re = TQRegExp("\\s*([^\\s=]+)=([^,>]+)([,>])"); } pos = ppvalue_re.search(buf, pos); @@ -156,7 +156,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf) // [0]="hello" // [1]=#"goodbye" // - QRegExp pparray_re("\\s*([^=]+)=([^\\n]+)\\n"); + TQRegExp pparray_re("\\s*([^=]+)=([^\\n]+)\\n"); pos = pparray_re.search(buf); @@ -186,7 +186,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf) // ["greeting"]="hello" // ["farewell"]="goodbye" // - QRegExp pphash_re("\\s*(\\[[^\\]]+\\])=([^\\n]+)\\n"); + TQRegExp pphash_re("\\s*(\\[[^\\]]+\\])=([^\\n]+)\\n"); pos = pphash_re.search(buf); while (pos != -1) { @@ -211,8 +211,8 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf) // @sleeper=#, // @temp={"z"=>"zed", "p"=>"pee"}> // - QRegExp ppstruct_re("(#]*)(>?)"); - QRegExp ppvalue_re("\\s*([^\\n\\s=]+)=([^\\n]+)[,>]"); + TQRegExp ppstruct_re("(#]*)(>?)"); + TQRegExp ppvalue_re("\\s*([^\\n\\s=]+)=([^\\n]+)[,>]"); pos = ppstruct_re.search(buf); if (pos != -1) { @@ -252,7 +252,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf) // [0..11]=0x89504e470d0a1a0a0000000d // [12..23]=0x494844520000001600000016 // - QRegExp ppstring_re("\\s*(\\[[^\\]]+\\])=([^\\n]+)\\n"); + TQRegExp ppstring_re("\\s*(\\[[^\\]]+\\])=([^\\n]+)\\n"); pos = ppstring_re.search(buf); while (pos != -1) { @@ -278,8 +278,8 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf) // ************************************************************************** -void RDBParser::setItem(LazyFetchItem *parent, const QString &varName, - DataType dataType, const QCString &value) +void RDBParser::setItem(LazyFetchItem *parent, const TQString &varName, + DataType dataType, const TQCString &value) { VarItem *item = parent->findItem(varName); if (item == 0) { @@ -315,9 +315,9 @@ void RDBParser::setItem(LazyFetchItem *parent, const QString &varName, DataType RDBParser::determineType(char *buf) { - QRegExp array_re("(Array \\(\\d+ element\\(s\\)\\))"); - QRegExp hash_re("(Hash \\(\\d+ element\\(s\\)\\))"); - QRegExp string_re("(String \\(length \\d+\\))"); + TQRegExp array_re("(Array \\(\\d+ element\\(s\\)\\))"); + TQRegExp hash_re("(Hash \\(\\d+ element\\(s\\)\\))"); + TQRegExp string_re("(String \\(length \\d+\\))"); if (qstrncmp(buf, "#key()); @@ -40,12 +40,12 @@ void RDBTable::keyPressEvent( QKeyEvent * e ) emit returnPressed(); else if (e->key() == Key_F2) emit f2Pressed(); - else if ((e->text() == QString("a")) && (e->state() == AltButton)) + else if ((e->text() == TQString("a")) && (e->state() == AltButton)) { emit insertPressed(); return; } - else if ((e->text() == QString("A")) && (e->state() == AltButton)) + else if ((e->text() == TQString("A")) && (e->state() == AltButton)) { emit insertPressed(); return; @@ -53,7 +53,7 @@ void RDBTable::keyPressEvent( QKeyEvent * e ) else if (e->key() == Key_Delete) emit deletePressed(); - QTable::keyPressEvent(e); + TQTable::keyPressEvent(e); } } diff --git a/languages/ruby/debugger/rdbtable.h b/languages/ruby/debugger/rdbtable.h index 04f47c2b..714605d0 100644 --- a/languages/ruby/debugger/rdbtable.h +++ b/languages/ruby/debugger/rdbtable.h @@ -16,7 +16,7 @@ #ifndef RDBDEBUGGERRDBTABLE_H #define RDBDEBUGGERRDBTABLE_H -#include +#include namespace RDBDebugger { @@ -24,11 +24,11 @@ class RDBTable : public QTable { Q_OBJECT public: - RDBTable(QWidget *parent = 0, const char *name = 0); - RDBTable( int numRows, int numCols, QWidget * parent = 0, const char * name = 0 ); + RDBTable(TQWidget *parent = 0, const char *name = 0); + RDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 ); ~RDBTable(); - virtual void keyPressEvent ( QKeyEvent * e ); + virtual void keyPressEvent ( TQKeyEvent * e ); signals: void keyPressed(int key); diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 44cb3795..4316da50 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -58,10 +58,10 @@ #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -91,8 +91,8 @@ static int chownpty(int fd, int grant) if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ::exit(1); - QString path = locate("exe", BASE_CHOWN); - execle(QFile::encodeName(path), BASE_CHOWN, grant?"--grant":"--revoke", (void *)0, NULL); + TQString path = locate("exe", BASE_CHOWN); + execle(TQFile::encodeName(path), BASE_CHOWN, grant?"--grant":"--revoke", (void *)0, NULL); ::exit(1); // should not be reached } if (pid > 0) { @@ -117,8 +117,8 @@ static int chownpty(int fd, int grant) // ************************************************************************** -STTY::STTY(bool ext, const QString &termAppName) - : QObject(), +STTY::STTY(bool ext, const TQString &termAppName) + : TQObject(), out(0), err(0), ttySlave(""), @@ -129,9 +129,9 @@ STTY::STTY(bool ext, const QString &termAppName) } else { fout = findTTY(); if (fout >= 0) { - ttySlave = QString(tty_slave); - out = new QSocketNotifier(fout, QSocketNotifier::Read, this); - connect( out, SIGNAL(activated(int)), this, SLOT(OutReceived(int)) ); + ttySlave = TQString(tty_slave); + out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); + connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); } } } @@ -270,9 +270,9 @@ void STTY::OutReceived(int f) #define FIFO_FILE "/tmp/debug_tty.XXXXXX" -bool STTY::findExternalTTY(const QString &termApp) +bool STTY::findExternalTTY(const TQString &termApp) { - QString appName(termApp.isEmpty() ? QString("xterm") : termApp); + TQString appName(termApp.isEmpty() ? TQString("xterm") : termApp); char fifo[] = FIFO_FILE; int fifo_fd; @@ -303,8 +303,8 @@ bool STTY::findExternalTTY(const QString &termApp) */ const char* prog = appName.latin1(); - QString script = QString("tty>") + QString(fifo) + - QString(";" // fifo name + TQString script = TQString("tty>") + TQString(fifo) + + TQString(";" // fifo name "trap \"\" INT QUIT TSTP;" // ignore various signals "exec<&-;exec>&-;" // close stdin and stdout "while :;do sleep 3600;done"); diff --git a/languages/ruby/debugger/stty.h b/languages/ruby/debugger/stty.h index 31c8fbfe..4f42e650 100644 --- a/languages/ruby/debugger/stty.h +++ b/languages/ruby/debugger/stty.h @@ -27,8 +27,8 @@ class QSocketNotifier; -#include -#include +#include +#include namespace RDBDebugger { @@ -38,10 +38,10 @@ class STTY : public QObject Q_OBJECT public: - STTY(bool ext=false, const QString &termAppName=QString()); + STTY(bool ext=false, const TQString &termAppName=TQString()); ~STTY(); - QString getSlave() { return ttySlave; }; + TQString getSlave() { return ttySlave; }; private slots: void OutReceived(int); @@ -52,14 +52,14 @@ signals: private: int findTTY(); - bool findExternalTTY(const QString &termApp); + bool findExternalTTY(const TQString &termApp); private: int fout; int ferr; - QSocketNotifier *out; - QSocketNotifier *err; - QString ttySlave; + TQSocketNotifier *out; + TQSocketNotifier *err; + TQString ttySlave; int pid_; char pty_master[50]; // "/dev/ptyxx" | "/dev/ptmx" diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 0dbdce9a..fd323fd5 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -28,18 +28,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include // ************************************************************************** @@ -49,30 +49,30 @@ namespace RDBDebugger { -VariableWidget::VariableWidget(QWidget *parent, const char *name) - : QWidget(parent, name) +VariableWidget::VariableWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { varTree_ = new VariableTree(this); - QLabel *label = new QLabel(i18n("E&xpression to watch:"), this); + TQLabel *label = new TQLabel(i18n("E&xpression to watch:"), this); - QHBox *watchEntry = new QHBox( this ); + TQHBox *watchEntry = new TQHBox( this ); watchVarEditor_ = new KHistoryCombo( watchEntry, "var-to-watch editor"); label->setBuddy(watchVarEditor_); - QPushButton *addButton = new QPushButton(i18n("&Add"), watchEntry ); + TQPushButton *addButton = new TQPushButton(i18n("&Add"), watchEntry ); addButton->adjustSize(); addButton->setFixedWidth(addButton->width()); - QBoxLayout * vbox = new QVBoxLayout(); + TQBoxLayout * vbox = new TQVBoxLayout(); vbox->addWidget( label ); vbox->addWidget( watchEntry ); - QVBoxLayout *topLayout = new QVBoxLayout(this, 2); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 2); topLayout->addWidget(varTree_, 10); topLayout->addLayout( vbox ); - connect( addButton, SIGNAL(clicked()), SLOT(slotAddWatchExpression()) ); - connect( watchVarEditor_, SIGNAL(returnPressed()), SLOT(slotAddWatchExpression()) ); + connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchExpression()) ); + connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotAddWatchExpression()) ); } @@ -80,7 +80,7 @@ VariableWidget::VariableWidget(QWidget *parent, const char *name) void VariableWidget::setEnabled(bool bEnabled) { - QWidget::setEnabled(bEnabled); + TQWidget::setEnabled(bEnabled); if (bEnabled && parentWidget() != 0) { varTree_->setColumnWidth(0, parentWidget()->width()/2); } @@ -89,7 +89,7 @@ void VariableWidget::setEnabled(bool bEnabled) void VariableWidget::slotAddWatchExpression() { - QString watchVar(watchVarEditor_->currentText()); + TQString watchVar(watchVarEditor_->currentText()); if (!watchVar.isEmpty()) { slotAddWatchExpression(watchVar); } @@ -97,7 +97,7 @@ void VariableWidget::slotAddWatchExpression() // ************************************************************************** -void VariableWidget::slotAddWatchExpression(const QString &ident) +void VariableWidget::slotAddWatchExpression(const TQString &ident) { if (!ident.isEmpty()) { watchVarEditor_->addToHistory(ident); @@ -108,17 +108,17 @@ void VariableWidget::slotAddWatchExpression(const QString &ident) // ************************************************************************** -void VariableWidget::focusInEvent(QFocusEvent */*e*/) +void VariableWidget::focusInEvent(TQFocusEvent */*e*/) { varTree_->setFocus(); } -void VariableWidget::restorePartialProjectSession(const QDomElement* el) +void VariableWidget::restorePartialProjectSession(const TQDomElement* el) { varTree_->watchRoot()->restorePartialProjectSession(el); } -void VariableWidget::savePartialProjectSession(QDomElement* el) +void VariableWidget::savePartialProjectSession(TQDomElement* el) { varTree_->watchRoot()->savePartialProjectSession(el); } @@ -129,7 +129,7 @@ void VariableWidget::savePartialProjectSession(QDomElement* el) VariableTree::VariableTree(VariableWidget *parent, const char *name) : KListView(parent, name), - QToolTip( viewport() ), + TQToolTip( viewport() ), activationId_(0), currentThread_(-1), selectedFrame_(0), @@ -140,16 +140,16 @@ VariableTree::VariableTree(VariableWidget *parent, const char *name) setAllColumnsShowFocus(true); setColumnWidthMode(0, Manual); setSorting(VAR_NAME_COLUMN); - QListView::setSelectionMode(QListView::Single); + TQListView::setSelectionMode(TQListView::Single); addColumn(i18n("Variable"), 100 ); addColumn(i18n("Value"), 100 ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - SLOT(slotContextMenu(KListView*, QListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*)) ); - connect( this, SIGNAL(pressed(QListViewItem*)), - this, SLOT(slotPressed(QListViewItem*)) ); + connect( this, TQT_SIGNAL(pressed(TQListViewItem*)), + this, TQT_SLOT(slotPressed(TQListViewItem*)) ); watchRoot_ = new WatchRoot(this); } @@ -164,9 +164,9 @@ VariableTree::~VariableTree() void VariableTree::clear() { - QListViewItem *sibling = firstChild(); + TQListViewItem *sibling = firstChild(); while (sibling != 0) { - QListViewItem * current = sibling; + TQListViewItem * current = sibling; sibling = sibling->nextSibling(); if (current->rtti() != RTTI_WATCH_ROOT) { delete current; @@ -180,7 +180,7 @@ void VariableTree::clear() // ************************************************************************** -void VariableTree::slotContextMenu(KListView *, QListViewItem *item) +void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (item == 0) return; @@ -196,14 +196,14 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) } int idCopyToClipboard = popup.insertItem( i18n("Copy to Clipboard") ); - int res = popup.exec(QCursor::pos()); + int res = popup.exec(TQCursor::pos()); if (res == idRemoveWatch) { emit removeWatchExpression(((WatchVarItem*)item)->displayId()); delete item; } else if (res == idCopyToClipboard) { QClipboard *qb = KApplication::clipboard(); - QString text = "{ \"" + item->text( VAR_NAME_COLUMN ) + "\", " + + TQString text = "{ \"" + item->text( VAR_NAME_COLUMN ) + "\", " + "\"" + item->text( VALUE_COLUMN ) + "\" }"; qb->setText( text, QClipboard::Clipboard ); @@ -213,20 +213,20 @@ void VariableTree::slotContextMenu(KListView *, QListViewItem *item) /***************************************************************************/ -void VariableTree::setSelected(QListViewItem * item, bool selected) +void VariableTree::setSelected(TQListViewItem * item, bool selected) { // Save the last selected VarFrameRoot for slotPressed() to restore if (item->rtti() == RTTI_VAR_FRAME_ROOT && selected) { selectedFrame_ = (VarFrameRoot *) item; } - QListView::setSelected(item, selected); + TQListView::setSelected(item, selected); } /***************************************************************************/ // Makes sure that only VarFrameRoot items can be selected -void VariableTree::slotPressed(QListViewItem * item) +void VariableTree::slotPressed(TQListViewItem * item) { if (item == 0) { return; @@ -258,10 +258,10 @@ void VariableTree::slotPressed(QListViewItem * item) void VariableTree::prune() { - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); while (child != 0) { - QListViewItem *nextChild = child->nextSibling(); + TQListViewItem *nextChild = child->nextSibling(); // Only prune var frames, not the watch or global root if (child->rtti() == RTTI_VAR_FRAME_ROOT) { @@ -298,7 +298,7 @@ void VariableTree::nextActivationId() // // After that, any frames which aren't marked as active must have gone // out of scope and will end up pruned. -void VariableTree::slotFrameActive(int frameNo, int threadNo, const QString& frameName) +void VariableTree::slotFrameActive(int frameNo, int threadNo, const TQString& frameName) { VarFrameRoot * frame = findFrame(frameNo, threadNo); if (frameNo == 1) { @@ -319,7 +319,7 @@ void VariableTree::slotFrameActive(int frameNo, int threadNo, const QString& fra bool VariableTree::schedule() { - QListViewItem * child = firstChild(); + TQListViewItem * child = firstChild(); VarFrameRoot * frame = 0; while (child != 0) { @@ -328,8 +328,8 @@ bool VariableTree::schedule() Q_ASSERT( !frame->isWaitingForData() ); if (frame->needsVariables()) { - if (QApplication::overrideCursor() == 0) { - QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + if (TQApplication::overrideCursor() == 0) { + TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor)); } // Tell the controller to fetch the variable values @@ -348,7 +348,7 @@ bool VariableTree::schedule() // All over, nothing left to fetch. // Return to frame 1, and prune the inactive items // from the variable tree.. - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); emit selectFrame(1, currentThread_); prune(); @@ -357,7 +357,7 @@ bool VariableTree::schedule() // ************************************************************************** -void VariableTree::slotAddWatchExpression(const QString &watchVar) +void VariableTree::slotAddWatchExpression(const TQString &watchVar) { new WatchVarItem(watchRoot(), watchVar, UNKNOWN_TYPE); emit addWatchExpression(watchVar, true); @@ -377,7 +377,7 @@ VarFrameRoot *VariableTree::findFrame(int frameNo, int threadNo) const { // frames only exist on the top level so we only need to // check the siblings - QListViewItem *sibling = firstChild(); + TQListViewItem *sibling = firstChild(); while (sibling != 0) { if ( sibling->rtti() == RTTI_VAR_FRAME_ROOT && ((VarFrameRoot*) sibling)->frameNo() == frameNo @@ -416,7 +416,7 @@ GlobalRoot *VariableTree::globalRoot() // so tell the controller about any already in the tree at start. void VariableTree::resetWatchVars() { - for (QListViewItem *child = watchRoot()->firstChild(); child != 0; child = child->nextSibling()) { + for (TQListViewItem *child = watchRoot()->firstChild(); child != 0; child = child->nextSibling()) { ((WatchVarItem*) child)->setDisplayId(-1); emit addWatchExpression(child->text(VAR_NAME_COLUMN), false); } @@ -424,11 +424,11 @@ void VariableTree::resetWatchVars() // ************************************************************************** -void VariableTree::maybeTip(const QPoint &p) +void VariableTree::maybeTip(const TQPoint &p) { VarItem * item = dynamic_cast( itemAt(p) ); if (item != 0) { - QRect r = itemRect(item); + TQRect r = itemRect(item); if (r.isValid()) { tip(r, item->tipText()); } @@ -466,7 +466,7 @@ LazyFetchItem::~LazyFetchItem() // ************************************************************************** -void LazyFetchItem::paintCell(QPainter *p, const QColorGroup &cg, +void LazyFetchItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if (p == 0) { @@ -475,19 +475,19 @@ void LazyFetchItem::paintCell(QPainter *p, const QColorGroup &cg, // make toplevel item (watch and frame items) names bold if (column == VAR_NAME_COLUMN && parent() == 0) { - QFont f = p->font(); + TQFont f = p->font(); f.setBold(true); p->setFont(f); } - QListViewItem::paintCell( p, cg, column, width, align ); + TQListViewItem::paintCell( p, cg, column, width, align ); } // ************************************************************************** -VarItem *LazyFetchItem::findItem(const QString &name) const +VarItem *LazyFetchItem::findItem(const TQString &name) const { - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); // Check the siblings on this branch while (child != 0) { @@ -505,7 +505,7 @@ VarItem *LazyFetchItem::findItem(const QString &name) const void LazyFetchItem::prune() { - QListViewItem *child = firstChild(); + TQListViewItem *child = firstChild(); while (child != 0) { LazyFetchItem *item = (LazyFetchItem*) child; @@ -526,9 +526,9 @@ void LazyFetchItem::prune() // ************************************************************************** // ************************************************************************** -VarItem::VarItem(LazyFetchItem *parent, const QString &varName, DataType dataType) +VarItem::VarItem(LazyFetchItem *parent, const TQString &varName, DataType dataType) : LazyFetchItem (parent), - cache_(QCString()), + cache_(TQCString()), dataType_(dataType), highlight_(false) { @@ -542,14 +542,14 @@ VarItem::VarItem(LazyFetchItem *parent, const QString &varName, DataType dataTyp // Matches either an array element or a string slice, // Order on the array index or the first number in the // range specifying the slice. - QRegExp arrayelement_re("\\[(\\d+)(\\.\\.\\d+)?\\]"); + TQRegExp arrayelement_re("\\[(\\d+)(\\.\\.\\d+)?\\]"); key_ = varName; if (arrayelement_re.search(varName) != -1) { key_.sprintf("%.6d", arrayelement_re.cap(1).toInt()); } else if (key_.startsWith("$")) { key_.prepend("1001"); // Global variable - } else if (QRegExp("^[A-Z]").search(varName) != -1) { + } else if (TQRegExp("^[A-Z]").search(varName) != -1) { key_.prepend("1002"); // Constant } else if (key_.startsWith("@@")) { key_.prepend("1003"); // Class variable @@ -568,7 +568,7 @@ VarItem::~VarItem() { } -QString VarItem::key(int /*column*/, bool /*ascending*/) const +TQString VarItem::key(int /*column*/, bool /*ascending*/) const { return key_; } @@ -580,10 +580,10 @@ QString VarItem::key(int /*column*/, bool /*ascending*/) const // For example, @foobar within instance obj is accessed as obj.foobar. // But don't strip off the @ for an instance variable with no path, // and leave a plain '@foobar' as it is. -QString VarItem::fullName() const +TQString VarItem::fullName() const { - QString itemName = text(VAR_NAME_COLUMN); - QString vPath(""); + TQString itemName = text(VAR_NAME_COLUMN); + TQString vPath(""); const VarItem *item = this; if (item->parent()->rtti() != RTTI_VAR_ITEM) { @@ -592,7 +592,7 @@ QString VarItem::fullName() const // This stops at the root item (FrameRoot or GlobalRoot) while (item->rtti() == RTTI_VAR_ITEM) { - QString itemName = item->text(VAR_NAME_COLUMN); + TQString itemName = item->text(VAR_NAME_COLUMN); if (vPath.startsWith("[")) { // If it's a Hash or an Array, then just insert the value. As @@ -609,15 +609,15 @@ QString VarItem::fullName() const } // Change 'self.@foobar' to '@foobar' - vPath.replace(QRegExp("^self\\.@"), "@"); + vPath.replace(TQRegExp("^self\\.@"), "@"); // Use instance_variable_get() to access any '@var's in the middle of a path - QRegExp re_instance_var("\\.(@[^\\[.]+)"); + TQRegExp re_instance_var("\\.(@[^\\[.]+)"); int pos = re_instance_var.search(vPath); while (pos != -1) { vPath.replace( pos, re_instance_var.matchedLength(), - QString(".instance_variable_get(:") + re_instance_var.cap(1) + ")" ); + TQString(".instance_variable_get(:") + re_instance_var.cap(1) + ")" ); pos = re_instance_var.search(vPath, pos); } @@ -626,7 +626,7 @@ QString VarItem::fullName() const // ************************************************************************** -void VarItem::setText(int column, const QString &data) +void VarItem::setText(int column, const TQString &data) { setActivationId(); @@ -634,7 +634,7 @@ void VarItem::setText(int column, const QString &data) highlight_ = (!text(VALUE_COLUMN).isEmpty() && text(VALUE_COLUMN) != data); } - QListViewItem::setText(column, data); + TQListViewItem::setText(column, data); repaint(); } @@ -650,7 +650,7 @@ void VarItem::expandValue(char *buf) void VarItem::setOpen(bool open) { - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); Q_ASSERT( dataType_ == REFERENCE_TYPE || dataType_ == ARRAY_TYPE @@ -692,7 +692,7 @@ void VarItem::setDataType(DataType dataType) // ************************************************************************** // Overridden to highlight the changed items -void VarItem::paintCell(QPainter *p, const QColorGroup &cg, +void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if (p == 0) { @@ -703,37 +703,37 @@ void VarItem::paintCell(QPainter *p, const QColorGroup &cg, // Show color values as colors, and make the text color the same // as the base color if (dataType_ == COLOR_TYPE) { - QRegExp color_re("\\s(#.*)>"); + TQRegExp color_re("\\s(#.*)>"); if (color_re.search(text(column)) != -1) { - QColorGroup color_cg( cg.foreground(), cg.background(), + TQColorGroup color_cg( cg.foreground(), cg.background(), cg.light(), cg.dark(), cg.mid(), - QColor(color_re.cap(1)), QColor(color_re.cap(1)) ); - QListViewItem::paintCell(p, color_cg, column, width, align); + TQColor(color_re.cap(1)), TQColor(color_re.cap(1)) ); + TQListViewItem::paintCell(p, color_cg, column, width, align); return; } } // Highlight recently changed items in red if (highlight_) { - QColorGroup hl_cg( cg.foreground(), cg.background(), + TQColorGroup hl_cg( cg.foreground(), cg.background(), cg.light(), cg.dark(), cg.mid(), red, cg.base() ); - QListViewItem::paintCell(p, hl_cg, column, width, align); + TQListViewItem::paintCell(p, hl_cg, column, width, align); return; } } - QListViewItem::paintCell(p, cg, column, width, align); + TQListViewItem::paintCell(p, cg, column, width, align); return; } // ************************************************************************** -QString VarItem::tipText() const +TQString VarItem::tipText() const { const unsigned int MAX_TOOLTIP_SIZE = 70; - QString tip = text(VALUE_COLUMN); + TQString tip = text(VALUE_COLUMN); if (tip.length() < MAX_TOOLTIP_SIZE) { return tip; @@ -789,7 +789,7 @@ void VarFrameRoot::setLocals() void VarFrameRoot::setOpen(bool open) { bool localsViewChanged = (isOpen() != open); - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); if (localsViewChanged) { ((VariableTree*)listView())->selectFrame(frameNo_, threadNo_); @@ -798,7 +798,7 @@ void VarFrameRoot::setOpen(bool open) return; } -void VarFrameRoot::setFrameName(const QString &frameName) +void VarFrameRoot::setFrameName(const TQString &frameName) { setText(VAR_NAME_COLUMN, frameName); setText(VALUE_COLUMN, ""); @@ -858,7 +858,7 @@ void GlobalRoot::setGlobals(char * globals) void GlobalRoot::setOpen(bool open) { bool globalsViewChanged = (isOpen() != open); - QListViewItem::setOpen(open); + TQListViewItem::setOpen(open); if (globalsViewChanged) { ((VariableTree*)listView())->setFetchGlobals(isOpen()); @@ -872,7 +872,7 @@ void GlobalRoot::setOpen(bool open) // ************************************************************************** // ************************************************************************** -WatchVarItem::WatchVarItem( LazyFetchItem *parent, const QString &varName, DataType dataType, int displayId ) +WatchVarItem::WatchVarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType, int displayId ) : VarItem(parent, varName, dataType), displayId_(displayId) { @@ -923,10 +923,10 @@ WatchRoot::~WatchRoot() // display id void WatchRoot::setWatchExpression(char * buf, char * expression) { - QString expr(expression); - QRegExp display_re("^(\\d+):\\s([^\n]+)\n"); + TQString expr(expression); + TQRegExp display_re("^(\\d+):\\s([^\n]+)\n"); - for ( QListViewItem *child = firstChild(); + for ( TQListViewItem *child = firstChild(); child != 0; child = child->nextSibling() ) { @@ -946,9 +946,9 @@ void WatchRoot::setWatchExpression(char * buf, char * expression) // After a program pause, this updates the new value of a Watch item // expr is the thing = value part of "1: a = 1", id is the display number -void WatchRoot::updateWatchExpression(int id, const QString& expr) +void WatchRoot::updateWatchExpression(int id, const TQString& expr) { - for ( QListViewItem *child = firstChild(); + for ( TQListViewItem *child = firstChild(); child != 0; child = child->nextSibling() ) { @@ -963,20 +963,20 @@ void WatchRoot::updateWatchExpression(int id, const QString& expr) } } -void WatchRoot::savePartialProjectSession(QDomElement* el) +void WatchRoot::savePartialProjectSession(TQDomElement* el) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); if (domDoc.isNull()) { return; } - QDomElement watchEl = domDoc.createElement("watchExpressions"); + TQDomElement watchEl = domDoc.createElement("watchExpressions"); - for ( QListViewItem *child = firstChild(); + for ( TQListViewItem *child = firstChild(); child != 0; child = child->nextSibling() ) { - QDomElement subEl = domDoc.createElement("el"); + TQDomElement subEl = domDoc.createElement("el"); subEl.appendChild(domDoc.createTextNode(child->text(VAR_NAME_COLUMN))); watchEl.appendChild(subEl); } @@ -988,15 +988,15 @@ void WatchRoot::savePartialProjectSession(QDomElement* el) return; } -void WatchRoot::restorePartialProjectSession(const QDomElement* el) +void WatchRoot::restorePartialProjectSession(const TQDomElement* el) { - QDomDocument domDoc = el->ownerDocument(); + TQDomDocument domDoc = el->ownerDocument(); if (domDoc.isNull()) { return; } - QDomElement watchEl = el->namedItem("watchExpressions").toElement(); - QDomElement subEl = watchEl.firstChild().toElement(); + TQDomElement watchEl = el->namedItem("watchExpressions").toElement(); + TQDomElement subEl = watchEl.firstChild().toElement(); while (!subEl.isNull()) { new WatchVarItem(this, subEl.firstChild().toText().data(), UNKNOWN_TYPE); diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h index c608ec45..4104ae93 100644 --- a/languages/ruby/debugger/variablewidget.h +++ b/languages/ruby/debugger/variablewidget.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include class KLineEdit; @@ -65,22 +65,22 @@ class VariableWidget : public QWidget Q_OBJECT public: - VariableWidget( QWidget *parent=0, const char *name=0 ); + VariableWidget( TQWidget *parent=0, const char *name=0 ); VariableTree *varTree() const { return varTree_; } virtual void setEnabled(bool b); - void restorePartialProjectSession(const QDomElement* el); - void savePartialProjectSession(QDomElement* el); + void restorePartialProjectSession(const TQDomElement* el); + void savePartialProjectSession(TQDomElement* el); protected: - virtual void focusInEvent(QFocusEvent *e); + virtual void focusInEvent(TQFocusEvent *e); public slots: void slotAddWatchExpression(); - void slotAddWatchExpression(const QString &expr); + void slotAddWatchExpression(const TQString &expr); private: VariableTree *varTree_; @@ -129,26 +129,26 @@ public: // values of the global variables void setFetchGlobals(bool fetch); - // (from QToolTip) Display a tooltip when the cursor is over an item - virtual void maybeTip(const QPoint &); + // (from TQToolTip) Display a tooltip when the cursor is over an item + virtual void maybeTip(const TQPoint &); - virtual void setSelected(QListViewItem * item, bool selected); + virtual void setSelected(TQListViewItem * item, bool selected); signals: - void toggleWatchpoint(const QString &varName); + void toggleWatchpoint(const TQString &varName); void selectFrame(int frame, int thread); - void expandItem(VarItem *item, const QCString &request); + void expandItem(VarItem *item, const TQCString &request); void fetchGlobals(bool fetch); - void addWatchExpression(const QString& expr, bool execute); + void addWatchExpression(const TQString& expr, bool execute); void removeWatchExpression(int displayId); public slots: - void slotAddWatchExpression(const QString& watchVar); - void slotFrameActive(int frameNo, int threadNo, const QString& frameName); - void slotPressed(QListViewItem * item); + void slotAddWatchExpression(const TQString& watchVar); + void slotFrameActive(int frameNo, int threadNo, const TQString& frameName); + void slotPressed(TQListViewItem * item); private slots: - void slotContextMenu(KListView *, QListViewItem *item); + void slotContextMenu(KListView *, TQListViewItem *item); private: int activationId_; @@ -178,7 +178,7 @@ public: virtual int rtti() const { return RTTI_LAZY_FETCH_ITEM; } virtual void prune(); - virtual VarItem *findItem(const QString& name) const; + virtual VarItem *findItem(const TQString& name) const; int currentActivationId() const { return ((VariableTree*) listView())->activationId(); } virtual void setActivationId() { activationId_ = currentActivationId(); } @@ -189,7 +189,7 @@ public: bool isWaitingForData() const { return waitingForData_; } protected: - void paintCell( QPainter *p, const QColorGroup &cg, + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); private: @@ -204,23 +204,23 @@ private: class VarItem : public LazyFetchItem { public: - VarItem( LazyFetchItem *parent, const QString &varName, DataType dataType ); + VarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType ); virtual ~VarItem(); virtual int rtti() const { return RTTI_VAR_ITEM; } - virtual QString key(int column, bool ascending) const; + virtual TQString key(int column, bool ascending) const; - QString fullName() const; + TQString fullName() const; DataType dataType() const; void setDataType(DataType dataType); void setOpen(bool open); - void setText (int column, const QString& text); + void setText (int column, const TQString& text); // Returns the text to be displayed as tooltip (the value) - QString tipText() const; + TQString tipText() const; // If the item is open, fetch details via a pp command void update(); @@ -230,12 +230,12 @@ public: void expandValue(char *data); private: - void paintCell( QPainter *p, const QColorGroup &cg, + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); private: - QString key_; - QCString cache_; + TQString key_; + TQCString cache_; DataType dataType_; bool highlight_; }; @@ -247,7 +247,7 @@ private: class WatchVarItem : public VarItem { public: - WatchVarItem( LazyFetchItem *parent, const QString &varName, DataType dataType, int displayId = -1); + WatchVarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType, int displayId = -1); virtual ~WatchVarItem(); @@ -273,15 +273,15 @@ public: virtual int rtti() const { return RTTI_VAR_FRAME_ROOT; } - virtual QString key(int column, bool /*ascending*/) const { - return QString("%1%2").arg(RTTI_VAR_FRAME_ROOT).arg(text(column)); + virtual TQString key(int column, bool /*ascending*/) const { + return TQString("%1%2").arg(RTTI_VAR_FRAME_ROOT).arg(text(column)); } void addLocals(char *variables); void setLocals(); void setOpen(bool open); - void setFrameName(const QString &frameName); + void setFrameName(const TQString &frameName); virtual void setActivationId(); bool needsVariables() const; @@ -293,7 +293,7 @@ private: bool needsVariables_; int frameNo_; int threadNo_; - QCString cache_; + TQCString cache_; }; /***************************************************************************/ @@ -308,15 +308,15 @@ public: virtual int rtti() const { return RTTI_WATCH_ROOT; } - virtual QString key(int column, bool /*ascending*/) const { - return QString("%1%2").arg(RTTI_WATCH_ROOT).arg(text(column)); + virtual TQString key(int column, bool /*ascending*/) const { + return TQString("%1%2").arg(RTTI_WATCH_ROOT).arg(text(column)); } void setWatchExpression(char * buf, char * expr); - void updateWatchExpression(int id, const QString& expr); + void updateWatchExpression(int id, const TQString& expr); - void restorePartialProjectSession(const QDomElement* el); - void savePartialProjectSession(QDomElement* el); + void restorePartialProjectSession(const TQDomElement* el); + void savePartialProjectSession(TQDomElement* el); }; /***************************************************************************/ @@ -331,8 +331,8 @@ public: virtual int rtti() const { return RTTI_GLOBAL_ROOT; } - virtual QString key(int column, bool /*ascending*/) const { - return QString("%1%2").arg(RTTI_GLOBAL_ROOT).arg(text(column)); + virtual TQString key(int column, bool /*ascending*/) const { + return TQString("%1%2").arg(RTTI_GLOBAL_ROOT).arg(text(column)); } void setOpen(bool open); diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp index d9896881..11244f8f 100644 --- a/languages/ruby/qtdesignerrubyintegration.cpp +++ b/languages/ruby/qtdesignerrubyintegration.cpp @@ -20,8 +20,8 @@ ***************************************************************************/ #include "qtdesignerrubyintegration.h" -#include -#include +#include +#include #include #include @@ -51,7 +51,7 @@ void QtDesignerRubyIntegration::addFunctionToClass(KInterfaceDesigner::Function KTextEditor::EditInterface* editIface = dynamic_cast( m_part->partController()->activePart() ); if( !editIface ){ /// @todo show messagebox -// QDialog::accept(); +// TQDialog::accept(); return; } @@ -73,7 +73,7 @@ void QtDesignerRubyIntegration::addFunctionToClass(KInterfaceDesigner::Function point.second = funEndColumn; } - QString str = function.function; + TQString str = function.function; str += "\n \n end\n\n"; str = " def " + str; diff --git a/languages/ruby/rubyconfigwidget.cpp b/languages/ruby/rubyconfigwidget.cpp index d0ffc5b4..a7ec7a7a 100644 --- a/languages/ruby/rubyconfigwidget.cpp +++ b/languages/ruby/rubyconfigwidget.cpp @@ -5,13 +5,13 @@ #include #include -#include -#include +#include +#include #include #include #include -RubyConfigWidget::RubyConfigWidget(QDomDocument &projectDom, QWidget* parent, const char* name) +RubyConfigWidget::RubyConfigWidget(TQDomDocument &projectDom, TQWidget* parent, const char* name) : RubyConfigWidgetBase(parent,name), dom (projectDom) { kdDebug (9019) << "Creating RubyConfigWidget" << endl; interpreterEdit->setText(DomUtil::readEntry(dom, "/kdevrubysupport/run/interpreter")); diff --git a/languages/ruby/rubyconfigwidget.h b/languages/ruby/rubyconfigwidget.h index a4efa6f9..ba602059 100644 --- a/languages/ruby/rubyconfigwidget.h +++ b/languages/ruby/rubyconfigwidget.h @@ -10,7 +10,7 @@ class RubyConfigWidget : public RubyConfigWidgetBase { Q_OBJECT public: - RubyConfigWidget(QDomDocument &projectDom, QWidget* parent = 0, const char* name = 0); + RubyConfigWidget(TQDomDocument &projectDom, TQWidget* parent = 0, const char* name = 0); public slots: void accept(); @@ -20,7 +20,7 @@ protected: protected slots: private: - QDomDocument &dom; + TQDomDocument &dom; }; #endif diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp index 95055076..b1371a24 100644 --- a/languages/ruby/rubyimplementationwidget.cpp +++ b/languages/ruby/rubyimplementationwidget.cpp @@ -19,11 +19,11 @@ ***************************************************************************/ #include "rubyimplementationwidget.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -34,35 +34,35 @@ #include RubyImplementationWidget::RubyImplementationWidget(KDevLanguageSupport* part, - QWidget* parent, const char* name, bool modal) + TQWidget* parent, const char* name, bool modal) :ImplementationWidget(part, parent, name, modal) { } -QStringList RubyImplementationWidget::createClassFiles() +TQStringList RubyImplementationWidget::createClassFiles() { - QString template_rb = "require '$BASEFILENAME$'\n\nclass $CLASSNAME$ < $BASECLASSNAME$\n\n def initialize(*k)\n super(*k)\n end\n\nend\n"; + TQString template_rb = "require '$BASEFILENAME$'\n\nclass $CLASSNAME$ < $BASECLASSNAME$\n\n def initialize(*k)\n super(*k)\n end\n\nend\n"; - QFileInfo formInfo(m_formName); - template_rb.replace(QRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".rb"); - template_rb.replace(QRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); - template_rb.replace(QRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); + TQFileInfo formInfo(m_formName); + template_rb.replace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".rb"); + template_rb.replace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); + template_rb.replace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); template_rb = FileTemplate::read(m_part, "rb") + template_rb; - QString file_rb = fileNameEdit->text() + ".rb"; + TQString file_rb = fileNameEdit->text() + ".rb"; if (!m_part->project()->activeDirectory().isEmpty()) file_rb = m_part->project()->activeDirectory() + "/" + file_rb; - QFile file(QDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + file_rb)); + TQFile file(TQDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + file_rb)); if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("Cannot write to file")); - return QStringList(); + return TQStringList(); } - QTextStream stream(&file); + TQTextStream stream(&file); stream << template_rb; file.close(); - QStringList files; + TQStringList files; files.append(file_rb); return files; } diff --git a/languages/ruby/rubyimplementationwidget.h b/languages/ruby/rubyimplementationwidget.h index 9e594cca..4393b94b 100644 --- a/languages/ruby/rubyimplementationwidget.h +++ b/languages/ruby/rubyimplementationwidget.h @@ -25,10 +25,10 @@ class RubyImplementationWidget : public ImplementationWidget { Q_OBJECT public: - RubyImplementationWidget(KDevLanguageSupport* part, QWidget* parent = 0, + RubyImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true); - virtual QStringList createClassFiles(); + virtual TQStringList createClassFiles(); }; diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index c116c05d..a8728c77 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -15,12 +15,12 @@ #include "kdevshellwidget.h" #include "kdevquickopen.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -41,7 +41,7 @@ typedef KDevGenericFactory RubySupportFactory; static const KDevPluginInfo data("kdevrubysupport"); K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) ) -RubySupportPart::RubySupportPart(QObject *parent, const char *name, const QStringList& ) +RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& ) : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" ) { setInstance(RubySupportFactory::instance()); @@ -49,26 +49,26 @@ RubySupportPart::RubySupportPart(QObject *parent, const char *name, const QStrin KAction *action; action = new KAction( i18n("&Run"), "exec", SHIFT + Key_F9, - this, SLOT(slotRun()), + this, TQT_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("Run

    Starts an application.")); action->setIcon("ruby_run.png"); action = new KAction( i18n("Run Test Under Cursor"), "exec", ALT + Key_F9, - this, SLOT(slotRunTestUnderCursor()), + this, TQT_SLOT(slotRunTestUnderCursor()), actionCollection(), "build_execute_test_function" ); action->setToolTip(i18n("Run Test Under Cursor")); action->setWhatsThis(i18n("Run Test Under Cursor

    Runs the function under the cursor as test.")); - action = new KAction( i18n("Launch Browser"), "network", 0, this, SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); + action = new KAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); action->setToolTip(i18n("Launch Browser")); action->setWhatsThis(i18n("Launch Browser

    Opens a web browser pointing to the Ruby Rails server") ); - action = new KAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); - action = new KAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); - action = new KAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); - action = new KAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); + action = new KAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); + action = new KAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); + action = new KAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); + action = new KAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); kdDebug() << "Creating RubySupportPart" << endl; @@ -78,14 +78,14 @@ RubySupportPart::RubySupportPart(QObject *parent, const char *name, const QStrin mainWindow()->embedOutputView( m_shellWidget, i18n("Ruby Shell"), i18n("Ruby Shell")); mainWindow()->raiseView( m_shellWidget ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); - connect( partController(), SIGNAL(savedFile(const KURL&)), - this, SLOT(savedFile(const KURL&)) ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), + this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -99,32 +99,32 @@ RubySupportPart::~RubySupportPart() void RubySupportPart::projectConfigWidget(KDialogBase *dlg) { - QVBox *vbox = dlg->addVBoxPage(i18n("Ruby"), i18n("Ruby"), BarIcon("ruby_config.png", KIcon::SizeMedium, KIcon::DefaultState, RubySupportPart::instance())); - RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (QWidget *)vbox, "ruby config widget"); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + TQVBox *vbox = dlg->addVBoxPage(i18n("Ruby"), i18n("Ruby"), BarIcon("ruby_config.png", KIcon::SizeMedium, KIcon::DefaultState, RubySupportPart::instance())); + RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "ruby config widget"); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } void RubySupportPart::projectOpened() { kdDebug() << "projectOpened()" << endl; - QStrList l; + TQStrList l; l.append( shell().latin1() ) ; m_shellWidget->setShell( shell().latin1(), l ); m_shellWidget->activate(); m_shellWidget->setAutoReactivateOnClose( true ); - connect( project(), SIGNAL(addedFilesToProject(const QStringList &)), - this, SLOT(addedFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList &)), - this, SLOT(removedFilesFromProject(const QStringList &)) ); + connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); - QFileInfo program(mainProgram()); + TQFileInfo program(mainProgram()); // If it's a Rails project, create the project files if they're missing if (mainProgram().endsWith("script/server")) { - QString cmd; - QFileInfo server(project()->projectDirectory() + "/script/server"); + TQString cmd; + TQFileInfo server(project()->projectDirectory() + "/script/server"); if (! server.exists()) { cmd += "rails " + project()->projectDirectory(); if (KDevAppFrontend *appFrontend = extension("KDevelop/AppFrontend")) @@ -134,12 +134,12 @@ void RubySupportPart::projectOpened() // We want to parse only after all components have been // properly initialized - QTimer::singleShot(0, this, SLOT(initialParse())); + TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); } -void RubySupportPart::maybeParse(const QString fileName) +void RubySupportPart::maybeParse(const TQString fileName) { - QFileInfo fi(fileName); + TQFileInfo fi(fileName); if (fi.extension() == "rb") { if (codeModel()->hasFile(fileName)) { @@ -158,8 +158,8 @@ void RubySupportPart::initialParse() if (project()) { kapp->setOverrideCursor(waitCursor); - QStringList files = project()->allFiles(); - for (QStringList::Iterator it = files.begin(); it != files.end() ;++it) { + TQStringList files = project()->allFiles(); + for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug() << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; maybeParse(project()->projectDirectory() + "/" + *it); } @@ -171,28 +171,28 @@ void RubySupportPart::initialParse() } } -void RubySupportPart::addedFilesToProject(const QStringList &fileList) +void RubySupportPart::addedFilesToProject(const TQStringList &fileList) { kdDebug() << "addedFilesToProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); maybeParse( fileName ); } } -void RubySupportPart::removedFilesFromProject(const QStringList &fileList) +void RubySupportPart::removedFilesFromProject(const TQStringList &fileList) { kdDebug() << "removedFilesFromProject()" << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { - QString fileName = project()->projectDirectory() + "/" + ( *it ); + TQString fileName = project()->projectDirectory() + "/" + ( *it ); if( codeModel()->hasFile(fileName) ){ emit aboutToRemoveSourceInfo( fileName ); @@ -216,35 +216,35 @@ KDevLanguageSupport::Features RubySupportPart::features() return Features(Classes | Functions | Variables | Declarations | Signals | Slots); } -void RubySupportPart::parse(const QString &fileName) +void RubySupportPart::parse(const TQString &fileName) { - QFile f(QFile::encodeName(fileName)); + TQFile f(TQFile::encodeName(fileName)); if (!f.open(IO_ReadOnly)) return; - QTextStream stream(&f); - - QRegExp classre("^\\s*(class|module)\\s+([A-Z][A-Za-z0-9_]+::)*([A-Z][A-Za-z0-9_]+)\\s*(<\\s*([A-Z][A-Za-z0-9_:]+))?$"); - QRegExp methodre("^(\\s*)def\\s+(([A-Z][A-Za-z0-9_:]+|self)\\.)?([A-Za-z0-9_]+[!?=]?|\\[\\]=?|\\*\\*||\\-|[!~+*/%&|><^]|>>|<<||<=>|<=|>=|==|===|!=|=~|!~).*$"); - QRegExp accessre("^\\s*(private|protected|public)\\s*((:([A-Za-z0-9_]+[!?=]?|\\[\\]=?|\\*\\*||\\-|[!~+*/%&|><^]|>>|<<||<=>|<=|>=|==|===|!=|=~|!~),?\\s*)*)$"); - QRegExp attr_accessorre("^\\s*(attr_accessor|attr_reader|attr_writer)\\s*((:([A-Za-z0-9_]+),?\\s*)*)$"); - QRegExp symbolre(":([^,]+),?"); - QRegExp line_contre(",\\s*$"); - QRegExp slot_signalre("^\\s*(slots|signals|k_dcop|k_dcop_signals)\\s*(('[^)]+\\)',?\\s*)*)$"); - QRegExp memberre("'([A-Za-z0-9_ &*]+\\s)?([A-Za-z0-9_]+)\\([^)]*\\)',?"); - QRegExp begin_commentre("^*=begin"); - QRegExp end_commentre("^*=end"); - QRegExp variablere("(@@?[A-Za-z0-9_]+)\\s*=\\s*((?:([A-Za-z0-9_:.]+)\\.new)|[\\[\"'%:/\\?\\{]|%r|<<|true|false|^\\?|0[0-7]+|[-+]?0b[01]+|[-+]?0x[1-9a-fA-F]+|[-+]?[0-9_\\.e]+|nil)?"); - QRegExp endre("^(\\s*)end\\s*$"); + TQTextStream stream(&f); + + TQRegExp classre("^\\s*(class|module)\\s+([A-Z][A-Za-z0-9_]+::)*([A-Z][A-Za-z0-9_]+)\\s*(<\\s*([A-Z][A-Za-z0-9_:]+))?$"); + TQRegExp methodre("^(\\s*)def\\s+(([A-Z][A-Za-z0-9_:]+|self)\\.)?([A-Za-z0-9_]+[!?=]?|\\[\\]=?|\\*\\*||\\-|[!~+*/%&|><^]|>>|<<||<=>|<=|>=|==|===|!=|=~|!~).*$"); + TQRegExp accessre("^\\s*(private|protected|public)\\s*((:([A-Za-z0-9_]+[!?=]?|\\[\\]=?|\\*\\*||\\-|[!~+*/%&|><^]|>>|<<||<=>|<=|>=|==|===|!=|=~|!~),?\\s*)*)$"); + TQRegExp attr_accessorre("^\\s*(attr_accessor|attr_reader|attr_writer)\\s*((:([A-Za-z0-9_]+),?\\s*)*)$"); + TQRegExp symbolre(":([^,]+),?"); + TQRegExp line_contre(",\\s*$"); + TQRegExp slot_signalre("^\\s*(slots|signals|k_dcop|k_dcop_signals)\\s*(('[^)]+\\)',?\\s*)*)$"); + TQRegExp memberre("'([A-Za-z0-9_ &*]+\\s)?([A-Za-z0-9_]+)\\([^)]*\\)',?"); + TQRegExp begin_commentre("^*=begin"); + TQRegExp end_commentre("^*=end"); + TQRegExp variablere("(@@?[A-Za-z0-9_]+)\\s*=\\s*((?:([A-Za-z0-9_:.]+)\\.new)|[\\[\"'%:/\\?\\{]|%r|<<|true|false|^\\?|0[0-7]+|[-+]?0b[01]+|[-+]?0x[1-9a-fA-F]+|[-+]?[0-9_\\.e]+|nil)?"); + TQRegExp endre("^(\\s*)end\\s*$"); FileDom m_file = codeModel()->create(); m_file->setName(fileName); ClassDom lastClass; FunctionDom lastMethod; - QString lastMethodIndentation; + TQString lastMethodIndentation; int lastAccess = CodeModelItem::Public; - QString rawline; - QCString line; + TQString rawline; + TQCString line; int lineNo = 0; while (!stream.atEnd()) { @@ -261,7 +261,7 @@ void RubySupportPart::parse(const QString &fileName) m_file->addClass( lastClass ); } - QString parent = classre.cap(5); + TQString parent = classre.cap(5); if (!parent.isEmpty()) { kdDebug() << "Add parent " << parent << endl; @@ -301,7 +301,7 @@ void RubySupportPart::parse(const QString &fileName) lastMethod = method; if (lastClass != 0) { - QStringList scope( lastClass->name() ); + TQStringList scope( lastClass->name() ); method->setScope( scope ); methodDecl->setScope( scope ); if( !lastClass->hasFunction(methodDecl->name()) ) { @@ -339,7 +339,7 @@ void RubySupportPart::parse(const QString &fileName) if (accessre.cap(2) == "") { lastAccess = currentAccess; } else { - QString symbolList( accessre.cap(2) ); + TQString symbolList( accessre.cap(2) ); int pos = 0; while ( pos >= 0 ) { @@ -364,7 +364,7 @@ void RubySupportPart::parse(const QString &fileName) } } } else if (slot_signalre.search(line) != -1 && lastClass != 0) { - QString memberList( slot_signalre.cap(2) ); + TQString memberList( slot_signalre.cap(2) ); int pos = 0; while ( pos >= 0 ) { @@ -387,7 +387,7 @@ void RubySupportPart::parse(const QString &fileName) } else { method = codeModel()->create(); } - QStringList scope( lastClass->name() ); + TQStringList scope( lastClass->name() ); method->setScope( scope ); method->setName(memberre.cap(2)); method->setFileName( fileName ); @@ -405,8 +405,8 @@ void RubySupportPart::parse(const QString &fileName) } } } else if (attr_accessorre.search(line) != -1 && lastClass != 0) { - QString attr( attr_accessorre.cap(1) ); - QString symbolList( attr_accessorre.cap(2) ); + TQString attr( attr_accessorre.cap(1) ); + TQString symbolList( attr_accessorre.cap(2) ); int pos = 0; while ( pos >= 0 ) { @@ -422,7 +422,7 @@ void RubySupportPart::parse(const QString &fileName) } } } else { - QStringList scope( lastClass->name() ); + TQStringList scope( lastClass->name() ); if ( !lastClass->hasFunction(symbolre.cap(1)) && (attr == "attr_accessor" || attr == "attr_reader") ) { @@ -462,7 +462,7 @@ void RubySupportPart::parse(const QString &fileName) attr->setFileName( fileName ); attr->setStartPosition( lineNo, 0 ); attr->setAccess( CodeModelItem::Private ); - if (QRegExp("^@@").search(attr->name()) != -1) { + if (TQRegExp("^@@").search(attr->name()) != -1) { attr->setStatic( true ); } lastClass->addVariable( attr ); @@ -475,25 +475,25 @@ void RubySupportPart::parse(const QString &fileName) attr->setStartPosition( lineNo, 0 ); } - if (QRegExp("^(/|%r)").search(variablere.cap(2)) != -1) { + if (TQRegExp("^(/|%r)").search(variablere.cap(2)) != -1) { attr->setType( "Regexp" ); - } else if (QRegExp("^[\"'%<]").search(variablere.cap(2)) != -1) { + } else if (TQRegExp("^[\"'%<]").search(variablere.cap(2)) != -1) { attr->setType( "String" ); - } else if (QRegExp("^\\[").search(variablere.cap(2)) != -1) { + } else if (TQRegExp("^\\[").search(variablere.cap(2)) != -1) { attr->setType( "Array" ); - } else if (QRegExp("^\\{").search(variablere.cap(2)) != -1) { + } else if (TQRegExp("^\\{").search(variablere.cap(2)) != -1) { attr->setType( "Hash" ); - } else if (QRegExp("^:").search(variablere.cap(2)) != -1) { + } else if (TQRegExp("^:").search(variablere.cap(2)) != -1) { attr->setType( "Symbol" ); - } else if (QRegExp("\\.\\.").search(variablere.cap(2)) != -1) { + } else if (TQRegExp("\\.\\.").search(variablere.cap(2)) != -1) { attr->setType( "Range" ); } else if (variablere.cap(2) == "true" || variablere.cap(2) == "false") { attr->setType( "Boolean" ); - } else if ( QRegExp("^[-+]?[0-9_]+").exactMatch(variablere.cap(2)) - || QRegExp("^[-+]?(0x|0|0b|\\?)").search(variablere.cap(2)) != -1 ) + } else if ( TQRegExp("^[-+]?[0-9_]+").exactMatch(variablere.cap(2)) + || TQRegExp("^[-+]?(0x|0|0b|\\?)").search(variablere.cap(2)) != -1 ) { attr->setType( "Integer" ); - } else if (QRegExp("[0-9._]+(e[-+0-9]+)?").exactMatch(variablere.cap(2))) { + } else if (TQRegExp("[0-9._]+(e[-+0-9]+)?").exactMatch(variablere.cap(2))) { attr->setType( "Float" ); } else if (variablere.cap(2) != "nil" && variablere.cap(3) != "") { attr->setType( variablere.cap(3) ); @@ -520,10 +520,10 @@ void RubySupportPart::slotRun () // if we can't save all parts, then the user canceled if ( partController()->saveAllFiles() == false ) return; - QFileInfo program(mainProgram()); + TQFileInfo program(mainProgram()); if (mainProgram().endsWith("script/server")) { - QString cmd; - QFileInfo server(project()->projectDirectory() + "/script/server"); + TQString cmd; + TQFileInfo server(project()->projectDirectory() + "/script/server"); // Starting WEBrick for a Rails app. Translate a SIGTERM signal sent by KDevelop // to a SIGINT expected by WEBrick (ie control&c) to terminate it. @@ -531,7 +531,7 @@ void RubySupportPart::slotRun () if (KDevAppFrontend *appFrontend = extension("KDevelop/AppFrontend")) appFrontend->startAppCommand(project()->projectDirectory(), cmd, false); } else { - QString cmd = QString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") + TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") .arg(interpreter()) .arg(characterCoding()) .arg(runDirectory()) @@ -542,20 +542,20 @@ void RubySupportPart::slotRun () } } -QString RubySupportPart::interpreter() { - QString prog = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/interpreter"); +TQString RubySupportPart::interpreter() { + TQString prog = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/interpreter"); if (prog.isEmpty()) prog = "ruby"; return prog; } -QString RubySupportPart::shell() { - QString shell = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/shell"); +TQString RubySupportPart::shell() { + TQString shell = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/shell"); if (shell.isEmpty()) shell = "irb"; return shell; } -QString RubySupportPart::mainProgram() { - QString prog; +TQString RubySupportPart::mainProgram() { + TQString prog; int runMainProgram = DomUtil::readIntEntry(*projectDom(), "/kdevrubysupport/run/runmainprogram"); if (runMainProgram == 0) { @@ -570,11 +570,11 @@ QString RubySupportPart::mainProgram() { return prog; } -QString RubySupportPart::runDirectory() { - QString cwd = DomUtil::readEntry(*projectDom(), "/kdevscriptproject/run/globalcwd"); +TQString RubySupportPart::runDirectory() { + TQString cwd = DomUtil::readEntry(*projectDom(), "/kdevscriptproject/run/globalcwd"); if (cwd.isEmpty()) { - QString mainProg = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/mainprogram"); + TQString mainProg = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/mainprogram"); KParts::ReadOnlyPart *ro_part = dynamic_cast(partController()->activePart()); if (mainProg.isEmpty() && ro_part) cwd = ro_part->url().directory(); @@ -584,14 +584,14 @@ QString RubySupportPart::runDirectory() { return cwd; } -QString RubySupportPart::programArgs() { - QString args = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/programargs"); +TQString RubySupportPart::programArgs() { + TQString args = DomUtil::readEntry(*projectDom(), "/kdevrubysupport/run/programargs"); return args; } -QString RubySupportPart::characterCoding() { +TQString RubySupportPart::characterCoding() { int coding = DomUtil::readIntEntry(*projectDom(), "/kdevrubysupport/run/charactercoding"); - QString code("A"); + TQString code("A"); switch (coding) { case 0: @@ -611,10 +611,10 @@ QString RubySupportPart::characterCoding() { } -void RubySupportPart::startApplication(const QString &program) { +void RubySupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevrubysupport/run/terminal"); if (KDevAppFrontend *appFrontend = extension("KDevelop/AppFrontend")) - appFrontend->startAppCommand(QString::QString(), program, inTerminal); + appFrontend->startAppCommand(TQString::TQString(), program, inTerminal); } @@ -651,7 +651,7 @@ KDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerT void RubySupportPart::projectClosed( ) { - for (QMap::const_iterator it = m_designers.begin(); + for (TQMap::const_iterator it = m_designers.begin(); it != m_designers.end(); ++it) { kdDebug() << "calling save settings fro designer integration" << endl; @@ -659,7 +659,7 @@ void RubySupportPart::projectClosed( ) } } -void RubySupportPart::contextMenu( QPopupMenu * popup, const Context * context ) +void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context ) { if (context->hasType(Context::FileContext)){ const FileContext *fc = static_cast(context); @@ -668,7 +668,7 @@ void RubySupportPart::contextMenu( QPopupMenu * popup, const Context * context ) if (url.fileName().endsWith(".ui")) { m_contextFileName = url.fileName(); - int id = popup->insertItem(i18n("Create or Select Implementation..."), this, SLOT(slotCreateSubclass())); + int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); popup->setWhatsThis(id, i18n("Create or select implementation

    Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } @@ -676,7 +676,7 @@ void RubySupportPart::contextMenu( QPopupMenu * popup, const Context * context ) void RubySupportPart::slotCreateSubclass() { - QFileInfo fi(m_contextFileName); + TQFileInfo fi(m_contextFileName); if (fi.extension(false) != "ui") return; QtDesignerRubyIntegration *des = dynamic_cast(designer(KInterfaceDesigner::QtDesigner)); @@ -697,18 +697,18 @@ void RubySupportPart::slotSwitchToController() KParts::ReadOnlyPart *ropart = dynamic_cast(activePart); if (!ropart) return; - QFileInfo file(ropart->url().path()); + TQFileInfo file(ropart->url().path()); if (!file.exists()) return; - QString ext = file.extension(); - QString name = file.baseName(); - QString switchTo = ""; + TQString ext = file.extension(); + TQString name = file.baseName(); + TQString switchTo = ""; if ((ext == "rb") && !name.endsWith("_controller")) { if (name.endsWith("_test")) { - switchTo = name.remove(QRegExp("_test$")); //the file is the test - switchTo = name.remove(QRegExp("_controller$")); //remove functional test name parts + switchTo = name.remove(TQRegExp("_test$")); //the file is the test + switchTo = name.remove(TQRegExp("_controller$")); //remove functional test name parts } else switchTo = name; @@ -719,14 +719,14 @@ void RubySupportPart::slotSwitchToController() //the controller basing on the directory information switchTo = file.dir().dirName(); } - QString controllersDir = project()->projectDirectory() + "/app/controllers/"; + TQString controllersDir = project()->projectDirectory() + "/app/controllers/"; if (!switchTo.isEmpty()) { if (switchTo.endsWith("s")) switchTo = switchTo.mid(0, switchTo.length()-1); - QString singular = controllersDir + switchTo + "_controller.rb"; - QString plural = controllersDir + switchTo + "s_controller.rb"; - KURL url = KURL::fromPathOrURL(QFile::exists(singular) ? singular : plural); + TQString singular = controllersDir + switchTo + "_controller.rb"; + TQString plural = controllersDir + switchTo + "s_controller.rb"; + KURL url = KURL::fromPathOrURL(TQFile::exists(singular) ? singular : plural); partController()->editDocument(url); } } @@ -739,12 +739,12 @@ void RubySupportPart::slotSwitchToTest() KParts::ReadOnlyPart *ropart = dynamic_cast(activePart); if (!ropart) return; - QFileInfo file(ropart->url().path()); + TQFileInfo file(ropart->url().path()); if (!file.exists()) return; - QString ext = file.extension(); - QString name = file.baseName(); - QString switchTo = ""; + TQString ext = file.extension(); + TQString name = file.baseName(); + TQString switchTo = ""; if (ext == "rjs" || ext == "rxml" || ext == "rhtml" || ext == "js.rjs" || ext == "xml.builder" || ext == "html.erb") { @@ -752,7 +752,7 @@ void RubySupportPart::slotSwitchToTest() switchTo = file.dir().dirName(); } else if (ext == "rb") - switchTo = name.remove(QRegExp("_controller$")).remove(QRegExp("_controller_test$")).remove(QRegExp("_test$")); + switchTo = name.remove(TQRegExp("_controller$")).remove(TQRegExp("_controller_test$")).remove(TQRegExp("_test$")); if (switchTo.isEmpty()) return; @@ -761,19 +761,19 @@ void RubySupportPart::slotSwitchToTest() switchTo = switchTo.mid(0, switchTo.length() - 1); KURL::List urls; - QString testDir = project()->projectDirectory() + "/test/"; - QString functionalTestS = testDir + "functional/" + switchTo + "_controller_test.rb"; - QString functionalTestP = testDir + "functional/" + switchTo + "s_controller_test.rb"; - QString integrationTestS = testDir + "integration/" + switchTo + "_test.rb"; - QString integrationTestP = testDir + "integration/" + switchTo + "s_test.rb"; - QString unitTestS = testDir + "unit/" + switchTo + "_test.rb"; - QString unitTestP = testDir + "unit/" + switchTo + "s_test.rb"; - if (QFile::exists(functionalTestP)) urls << KURL::fromPathOrURL(functionalTestP); - if (QFile::exists(integrationTestP)) urls << KURL::fromPathOrURL(integrationTestP); - if (QFile::exists(unitTestP)) urls << KURL::fromPathOrURL(unitTestP); - if (QFile::exists(functionalTestS)) urls << KURL::fromPathOrURL(functionalTestS); - if (QFile::exists(integrationTestS)) urls << KURL::fromPathOrURL(integrationTestS); - if (QFile::exists(unitTestS)) urls << KURL::fromPathOrURL(unitTestS); + TQString testDir = project()->projectDirectory() + "/test/"; + TQString functionalTestS = testDir + "functional/" + switchTo + "_controller_test.rb"; + TQString functionalTestP = testDir + "functional/" + switchTo + "s_controller_test.rb"; + TQString integrationTestS = testDir + "integration/" + switchTo + "_test.rb"; + TQString integrationTestP = testDir + "integration/" + switchTo + "s_test.rb"; + TQString unitTestS = testDir + "unit/" + switchTo + "_test.rb"; + TQString unitTestP = testDir + "unit/" + switchTo + "s_test.rb"; + if (TQFile::exists(functionalTestP)) urls << KURL::fromPathOrURL(functionalTestP); + if (TQFile::exists(integrationTestP)) urls << KURL::fromPathOrURL(integrationTestP); + if (TQFile::exists(unitTestP)) urls << KURL::fromPathOrURL(unitTestP); + if (TQFile::exists(functionalTestS)) urls << KURL::fromPathOrURL(functionalTestS); + if (TQFile::exists(integrationTestS)) urls << KURL::fromPathOrURL(integrationTestS); + if (TQFile::exists(unitTestS)) urls << KURL::fromPathOrURL(unitTestS); KDevQuickOpen *qo = extension("KDevelop/QuickOpen"); if (qo && !urls.isEmpty()) @@ -788,12 +788,12 @@ void RubySupportPart::slotSwitchToModel() KParts::ReadOnlyPart *ropart = dynamic_cast(activePart); if (!ropart) return; - QFileInfo file(ropart->url().path()); + TQFileInfo file(ropart->url().path()); if (!file.exists()) return; - QString ext = file.extension(); - QString name = file.baseName(); - QString switchTo = ""; + TQString ext = file.extension(); + TQString name = file.baseName(); + TQString switchTo = ""; if (ext == "rjs" || ext == "rxml" || ext == "rhtml" || ext == "js.rjs" || ext == "xml.builder" || ext == "html.erb") { @@ -802,7 +802,7 @@ void RubySupportPart::slotSwitchToModel() } else if (ext == "rb" && (name.endsWith("_controller") || name.endsWith("_test"))) { - switchTo = name.remove(QRegExp("_controller$")).remove(QRegExp("_controller_test$")).remove(QRegExp("_test$")); + switchTo = name.remove(TQRegExp("_controller$")).remove(TQRegExp("_controller_test$")).remove(TQRegExp("_test$")); } if (switchTo.isEmpty()) @@ -811,10 +811,10 @@ void RubySupportPart::slotSwitchToModel() if (switchTo.endsWith("s")) switchTo = switchTo.mid(0, switchTo.length() - 1); - QString modelsDir = project()->projectDirectory() + "/app/models/"; - QString singular = modelsDir + switchTo + "_controller.rb"; - QString plural = modelsDir + switchTo + "s_controller.rb"; - KURL url = KURL::fromPathOrURL(QFile::exists(singular) ? singular : plural); + TQString modelsDir = project()->projectDirectory() + "/app/models/"; + TQString singular = modelsDir + switchTo + "_controller.rb"; + TQString plural = modelsDir + switchTo + "s_controller.rb"; + KURL url = KURL::fromPathOrURL(TQFile::exists(singular) ? singular : plural); partController()->editDocument(KURL::fromPathOrURL(modelsDir + switchTo + ".rb")); } @@ -827,12 +827,12 @@ void RubySupportPart::slotSwitchToView() KParts::ReadOnlyPart *ropart = dynamic_cast(activePart); if (!ropart) return; - QFileInfo file(ropart->url().path()); + TQFileInfo file(ropart->url().path()); if (!file.exists()) return; - QString ext = file.extension(); - QString name = file.baseName(); - QString switchTo = ""; + TQString ext = file.extension(); + TQString name = file.baseName(); + TQString switchTo = ""; if (ext == "rjs" || ext == "rxml" || ext == "rhtml" || ext == "js.rjs" || ext == "xml.builder" || ext == "html.erb") { @@ -840,7 +840,7 @@ void RubySupportPart::slotSwitchToView() switchTo = file.dir().dirName(); } else if (ext == "rb") - switchTo = name.remove(QRegExp("_controller$")).remove(QRegExp("_controller_test$")).remove(QRegExp("_test$")); + switchTo = name.remove(TQRegExp("_controller$")).remove(TQRegExp("_controller_test$")).remove(TQRegExp("_test$")); if (switchTo.isEmpty()) return; @@ -849,9 +849,9 @@ void RubySupportPart::slotSwitchToView() switchTo = switchTo.mid(0, switchTo.length() - 1); KURL::List urls; - QDir viewsDir; - QDir viewsDirS = QDir(project()->projectDirectory() + "/app/views/" + switchTo); - QDir viewsDirP = QDir(project()->projectDirectory() + "/app/views/" + switchTo + "s"); + TQDir viewsDir; + TQDir viewsDirS = TQDir(project()->projectDirectory() + "/app/views/" + switchTo); + TQDir viewsDirP = TQDir(project()->projectDirectory() + "/app/views/" + switchTo + "s"); if (viewsDirS.exists()) viewsDir = viewsDirS; else if (viewsDirP.exists()) @@ -859,11 +859,11 @@ void RubySupportPart::slotSwitchToView() else return; - QStringList views = viewsDir.entryList(); + TQStringList views = viewsDir.entryList(); - for (QStringList::const_iterator it = views.begin(); it != views.end(); ++it) + for (TQStringList::const_iterator it = views.begin(); it != views.end(); ++it) { - QString viewName = *it; + TQString viewName = *it; if ( !(viewName.endsWith("~") || viewName == "." || viewName == "..") ) urls << KURL::fromPathOrURL(viewsDir.absPath() + "/" + viewName); } @@ -879,7 +879,7 @@ void RubySupportPart::slotRunTestUnderCursor() return; KParts::ReadOnlyPart *ro_part = dynamic_cast(partController()->activePart()); - QString prog; + TQString prog; if (ro_part != 0) { prog = ro_part->url().path(); } else @@ -894,8 +894,8 @@ void RubySupportPart::slotRunTestUnderCursor() FunctionDom fun = hlp.functionAt(line, column); if (fun == 0) return; - QFileInfo program(prog); - QString cmd = QString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") + TQFileInfo program(prog); + TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") .arg(interpreter()) .arg(characterCoding()) .arg(runDirectory()) diff --git a/languages/ruby/rubysupport_part.h b/languages/ruby/rubysupport_part.h index 0d420cff..bc5e2552 100644 --- a/languages/ruby/rubysupport_part.h +++ b/languages/ruby/rubysupport_part.h @@ -6,7 +6,7 @@ #ifndef __KDEVPART_RUBYSUPPORT_H__ #define __KDEVPART_RUBYSUPPORT_H__ -#include +#include #include "kdevlanguagesupport.h" @@ -21,7 +21,7 @@ class RubySupportPart : public KDevLanguageSupport public: - RubySupportPart(QObject *parent, const char *name, const QStringList &); + RubySupportPart(TQObject *parent, const char *name, const TQStringList &); virtual ~RubySupportPart(); virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); @@ -35,12 +35,12 @@ private slots: void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void slotRun(); void slotRunTestUnderCursor(); void slotCreateSubclass(); - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void slotBrowse(); void initialParse(); @@ -51,23 +51,23 @@ private slots: void slotSwitchToTest(); private: - void startApplication(const QString &program); - QString interpreter(); - QString shell(); - QString mainProgram(); - QString runDirectory(); - QString programArgs(); - QString characterCoding(); + void startApplication(const TQString &program); + TQString interpreter(); + TQString shell(); + TQString mainProgram(); + TQString runDirectory(); + TQString programArgs(); + TQString characterCoding(); - void maybeParse(const QString fileName); - void parse(const QString &fileName); + void maybeParse(const TQString fileName); + void parse(const TQString &fileName); - QMap m_designers; + TQMap m_designers; - QString m_contextFileName; - QCString m_shell; + TQString m_contextFileName; + TQCString m_shell; - QGuardedPtr m_shellWidget; + TQGuardedPtr m_shellWidget; }; diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index 8cfac095..df8ba309 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -11,9 +11,9 @@ #include "sqlactions.h" -#include -#include -#include +#include +#include +#include #include #include @@ -25,9 +25,9 @@ #include "kdevlanguagesupport.h" #include "sqlsupport_part.h" -SqlListAction::SqlListAction(SQLSupportPart *part, const QString &text, +SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, const KShortcut& cut, - const QObject *receiver, const char *slot, + const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name) : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, parent, name), m_part(part) { @@ -39,8 +39,8 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const QString &text, m_combo->setMinimumWidth( 200 ); m_combo->setMaximumWidth( 400 ); - connect( m_combo, SIGNAL(activated(const QString&)), receiver, slot ); - connect( m_combo, SIGNAL(activated(int)), this, SLOT(activated(int)) ); + connect( m_combo, TQT_SIGNAL(activated(const TQString&)), receiver, slot ); + connect( m_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(activated(int)) ); setShortcutConfigurable( false ); setAutoSized( true ); @@ -49,7 +49,7 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const QString &text, } -void SqlListAction::setCurrentConnectionName(const QString &name) +void SqlListAction::setCurrentConnectionName(const TQString &name) { int idx = m_part->connections().findIndex( name ); if ( idx < 0 ) @@ -59,10 +59,10 @@ void SqlListAction::setCurrentConnectionName(const QString &name) } -QString SqlListAction::currentConnectionName() const +TQString SqlListAction::currentConnectionName() const { if ( m_combo->currentItem() <= 0 ) - return QString::null; + return TQString::null; return m_part->connections()[ m_combo->currentItem() - 1 ]; } @@ -70,22 +70,22 @@ void SqlListAction::activated(int idx) { if (idx < 1 || (int)m_part->connections().count() <= idx) return; - const QSqlDatabase *db = QSqlDatabase::database(m_part->connections()[idx], true); + const TQSqlDatabase *db = TQSqlDatabase::database(m_part->connections()[idx], true); m_combo->changeItem( db->isOpen() ? SmallIcon( "ok" ) : SmallIcon( "no" ), m_combo->text(idx), idx ); } void SqlListAction::refresh() { - const QStringList& dbc = m_part->connections(); + const TQStringList& dbc = m_part->connections(); m_combo->clear(); m_combo->insertItem( i18n("") ); - QString cName; - for ( QStringList::ConstIterator it = dbc.begin(); it != dbc.end(); ++it ) { + TQString cName; + for ( TQStringList::ConstIterator it = dbc.begin(); it != dbc.end(); ++it ) { - QSqlDatabase* db = QSqlDatabase::database( (*it), false ); + TQSqlDatabase* db = TQSqlDatabase::database( (*it), false ); if ( !db ) { kdDebug( 9000 ) << "Could not find database connection " << (*it) << endl; m_combo->insertItem( SmallIcon( "no" ), i18n("").arg( *it ) ); diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h index e49794e5..8cc7b5df 100644 --- a/languages/sql/sqlactions.h +++ b/languages/sql/sqlactions.h @@ -23,11 +23,11 @@ class SqlListAction : public KWidgetAction { Q_OBJECT public: - SqlListAction( SQLSupportPart *part, const QString &text, const KShortcut& cut, - const QObject *receiver, const char *slot, + SqlListAction( SQLSupportPart *part, const TQString &text, const KShortcut& cut, + const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name ); - void setCurrentConnectionName(const QString &name); - QString currentConnectionName() const; + void setCurrentConnectionName(const TQString &name); + TQString currentConnectionName() const; void refresh(); private slots: diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h index c99d8722..26a9fb0b 100644 --- a/languages/sql/sqlconfigwidget.ui.h +++ b/languages/sql/sqlconfigwidget.ui.h @@ -7,11 +7,11 @@ ** place of a destructor. *****************************************************************************/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -25,23 +25,23 @@ class PluginTableItem: public QTableItem { public: - PluginTableItem( QTable* table, const QString& text = QString::null ): QTableItem( table, QTableItem::OnTyping, text ) {} + PluginTableItem( TQTable* table, const TQString& text = TQString::null ): TQTableItem( table, TQTableItem::OnTyping, text ) {} - virtual QWidget* createEditor() const + virtual TQWidget* createEditor() const { - QComboBox* combo = new QComboBox( true, table() ); - combo->insertStringList( QSqlDatabase::drivers() ); + TQComboBox* combo = new TQComboBox( true, table() ); + combo->insertStringList( TQSqlDatabase::drivers() ); if ( !text().isEmpty() ) combo->setCurrentText( text() ); return combo; } - virtual void setContentFromEditor( QWidget* w ) + virtual void setContentFromEditor( TQWidget* w ) { - if ( w->inherits( "QComboBox" ) ) - setText( ( (QComboBox*)w )->currentText() ); + if ( w->inherits( "TQComboBox" ) ) + setText( ( (TQComboBox*)w )->currentText() ); else - QTableItem::setContentFromEditor( w ); + TQTableItem::setContentFromEditor( w ); } }; @@ -49,23 +49,23 @@ public: class PortTableItem: public QTableItem { public: - PortTableItem( QTable* table, const QString& text = QString::null ): QTableItem( table, QTableItem::OnTyping, text ) {} + PortTableItem( TQTable* table, const TQString& text = TQString::null ): TQTableItem( table, TQTableItem::OnTyping, text ) {} - virtual QWidget* createEditor() const + virtual TQWidget* createEditor() const { - QSpinBox* sb = new QSpinBox( -1, 65535, 1, table() ); + TQSpinBox* sb = new TQSpinBox( -1, 65535, 1, table() ); sb->setSpecialValueText( i18n("Default") ); if ( !text().isEmpty() ) sb->setValue( text().toInt() ); return sb; } - virtual void setContentFromEditor( QWidget* w ) + virtual void setContentFromEditor( TQWidget* w ) { - if ( w->inherits( "QSpinBox" ) ) - setText( ( (QSpinBox*)w )->text() ); + if ( w->inherits( "TQSpinBox" ) ) + setText( ( (TQSpinBox*)w )->text() ); else - QTableItem::setContentFromEditor( w ); + TQTableItem::setContentFromEditor( w ); } }; @@ -73,33 +73,33 @@ public: class PasswordTableItem: public QTableItem { public: - PasswordTableItem( QTable* table, const QString& text = QString::null ): QTableItem( table, QTableItem::OnTyping, text ) {} + PasswordTableItem( TQTable* table, const TQString& text = TQString::null ): TQTableItem( table, TQTableItem::OnTyping, text ) {} - virtual QWidget* createEditor() const + virtual TQWidget* createEditor() const { KLineEdit* le = new KLineEdit( table() ); - le->setEchoMode( QLineEdit::Password ); + le->setEchoMode( TQLineEdit::Password ); return le; } - virtual void setContentFromEditor( QWidget* w ) + virtual void setContentFromEditor( TQWidget* w ) { if ( w->inherits( "KLineEdit" ) ) { password = ( (KLineEdit*)w )->text(); - setText( QString().fill( '*', password.length() ) ); + setText( TQString().fill( '*', password.length() ) ); } else { - QTableItem::setContentFromEditor( w ); + TQTableItem::setContentFromEditor( w ); } } - virtual void setText(const QString& bogus) + virtual void setText(const TQString& bogus) { - QTableItem::setText(QString().fill('*', bogus.length())); + TQTableItem::setText(TQString().fill('*', bogus.length())); } - QString password; + TQString password; }; -static bool isEmptyRow( QTable* tbl, int row ) +static bool isEmptyRow( TQTable* tbl, int row ) { for ( int i = 0; i < tbl->numCols(); i++ ) { if ( !tbl->text( row, i ).isEmpty() ) @@ -119,7 +119,7 @@ void SqlConfigWidget::init() changed = false; } -static void addRow( QTable* dbTable ) +static void addRow( TQTable* dbTable ) { dbTable->insertRows( dbTable->numRows() ); dbTable->setItem( dbTable->numRows() - 1, 0, @@ -163,19 +163,19 @@ void SqlConfigWidget::updateButtons() void SqlConfigWidget::testDb() { - static const QString cName( "SqlConfigWidgetTest" ); + static const TQString cName( "SqlConfigWidgetTest" ); int cr = dbTable->currentRow(); if (cr < 0) return; - QSqlDatabase* db = QSqlDatabase::addDatabase( dbTable->text( cr, 0 ), cName ); + TQSqlDatabase* db = TQSqlDatabase::addDatabase( dbTable->text( cr, 0 ), cName ); db->setDatabaseName( dbTable->text( cr, 1 ) ); db->setHostName( dbTable->text( cr, 2 ) ); bool ok; int port = dbTable->text( cr, 3 ).toInt( &ok ); if (ok && port >= 0) db->setPort( port ); - QString pass = ((PasswordTableItem*)dbTable->item( cr, 5 ))->password; + TQString pass = ((PasswordTableItem*)dbTable->item( cr, 5 ))->password; if ( db->open( dbTable->text( cr, 4 ), pass ) ) { KMessageBox::information( this, i18n("Connection successful") ); @@ -187,7 +187,7 @@ void SqlConfigWidget::testDb() } db = 0; - QSqlDatabase::removeDatabase( cName ); + TQSqlDatabase::removeDatabase( cName ); } @@ -195,18 +195,18 @@ void SqlConfigWidget::accept() { Q_ASSERT( doc ); - QDomElement dbElem = DomUtil::createElementByPath( *doc, "/kdevsqlsupport/servers" ); + TQDomElement dbElem = DomUtil::createElementByPath( *doc, "/kdevsqlsupport/servers" ); DomUtil::makeEmpty( dbElem ); for ( int i = 0; i < dbTable->numRows() - 1; i++ ) { - QStringList db; + TQStringList db; db << dbTable->text( i, 0 ) << dbTable->text( i, 1 ) << dbTable->text( i, 2 ) << dbTable->text( i, 3 ) << dbTable->text( i, 4 ) << SQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password ); DomUtil::writeListEntry( *doc, - "/kdevsqlsupport/servers/server" + QString::number( i ), + "/kdevsqlsupport/servers/server" + TQString::number( i ), "el", db ); } if ( changed ) @@ -214,7 +214,7 @@ void SqlConfigWidget::accept() } -void SqlConfigWidget::setProjectDom( QDomDocument * doc ) +void SqlConfigWidget::setProjectDom( TQDomDocument * doc ) { this->doc = doc; } @@ -224,10 +224,10 @@ void SqlConfigWidget::loadConfig() { Q_ASSERT( doc ); - QStringList db; + TQStringList db; int i = 0; while ( true ) { - QStringList db = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + QString::number( i ), "el" ); + TQStringList db = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" ); if ( db.isEmpty() ) return; diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp index a0d7368d..f7d84fde 100644 --- a/languages/sql/sqloutputwidget.cpp +++ b/languages/sql/sqloutputwidget.cpp @@ -9,16 +9,16 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -27,56 +27,56 @@ class QCustomSqlCursor: public QSqlCursor { public: - QCustomSqlCursor( const QString & query = QString::null, bool autopopulate = TRUE, QSqlDatabase* db = 0 ) : - QSqlCursor( QString::null, autopopulate, db ) + QCustomSqlCursor( const TQString & query = TQString::null, bool autopopulate = TRUE, TQSqlDatabase* db = 0 ) : + TQSqlCursor( TQString::null, autopopulate, db ) { exec( query ); if ( isSelect() && autopopulate ) { - QSqlRecordInfo inf = ((QSqlQuery*)this)->driver()->recordInfo( *(QSqlQuery*)this ); - for ( QSqlRecordInfo::iterator it = inf.begin(); it != inf.end(); ++it ) { + TQSqlRecordInfo inf = ((TQSqlQuery*)this)->driver()->recordInfo( *(TQSqlQuery*)this ); + for ( TQSqlRecordInfo::iterator it = inf.begin(); it != inf.end(); ++it ) { append( *it ); } } - setMode( QSqlCursor::ReadOnly ); + setMode( TQSqlCursor::ReadOnly ); } - QCustomSqlCursor( const QCustomSqlCursor & other ): QSqlCursor( other ) {} - bool select( const QString & /*filter*/, const QSqlIndex & /*sort*/ = QSqlIndex() ) + QCustomSqlCursor( const QCustomSqlCursor & other ): TQSqlCursor( other ) {} + bool select( const TQString & /*filter*/, const TQSqlIndex & /*sort*/ = TQSqlIndex() ) { return exec( lastQuery() ); } - QSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const - { return QSqlIndex(); } + TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const + { return TQSqlIndex(); } int insert( bool /*invalidate*/ = TRUE ) { return FALSE; } int update( bool /*invalidate*/ = TRUE ) { return FALSE; } int del( bool /*invalidate*/ = TRUE ) { return FALSE; } - void setName( const QString& /*name*/, bool /*autopopulate*/ = TRUE ) {} + void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} }; -SqlOutputWidget::SqlOutputWidget ( QWidget* parent, const char* name ) : - QWidget( parent, name ) +SqlOutputWidget::SqlOutputWidget ( TQWidget* parent, const char* name ) : + TQWidget( parent, name ) { - m_stack = new QWidgetStack( this ); - m_table = new QDataTable( this ); - m_textEdit = new QTextEdit( this ); + m_stack = new TQWidgetStack( this ); + m_table = new TQDataTable( this ); + m_textEdit = new TQTextEdit( this ); - m_textEdit->setTextFormat( QTextEdit::RichText ); + m_textEdit->setTextFormat( TQTextEdit::RichText ); m_textEdit->setReadOnly( true ); m_stack->addWidget( m_textEdit ); m_stack->addWidget( m_table ); - QVBoxLayout* layout = new QVBoxLayout( this ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( m_stack ); } SqlOutputWidget::~SqlOutputWidget() {} -void SqlOutputWidget::showQuery( const QString& connectionName, const QString& query ) +void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString& query ) { - QSqlDatabase* db = QSqlDatabase::database( connectionName, true ); + TQSqlDatabase* db = TQSqlDatabase::database( connectionName, true ); if ( !db ) { showError( i18n("No such connection: %1").arg( connectionName ) ); return; @@ -86,12 +86,12 @@ void SqlOutputWidget::showQuery( const QString& connectionName, const QString& q return; } - QSqlCursor* cur = new QCustomSqlCursor( query, true, db ); + TQSqlCursor* cur = new QCustomSqlCursor( query, true, db ); if ( !cur->isActive() ) { showError( cur->lastError() ); } else if ( cur->isSelect() ) { m_table->setSqlCursor( cur, true, true ); - m_table->refresh( QDataTable::RefreshAll ); + m_table->refresh( TQDataTable::RefreshAll ); m_stack->raiseWidget( m_table ); } else { showSuccess( cur->numRowsAffected() ); @@ -105,21 +105,21 @@ void SqlOutputWidget::showSuccess( int rowsAffected ) m_stack->raiseWidget( m_textEdit ); } -void SqlOutputWidget::showError( const QString& message ) +void SqlOutputWidget::showError( const TQString& message ) { m_textEdit->clear(); m_textEdit->setText( "

    " + i18n("An error occurred:") + "

    \n" + message ); m_stack->raiseWidget( m_textEdit ); } -void SqlOutputWidget::showError( const QSqlError& message ) +void SqlOutputWidget::showError( const TQSqlError& message ) { m_textEdit->clear(); m_textEdit->setText( "

    " + i18n("An error occurred:") + "

    \n

    " + i18n("Driver") + ": " + - QStyleSheet::escape( message.driverText() ) + + TQStyleSheet::escape( message.driverText() ) + "
    " + i18n("Database") + ":: " + - QStyleSheet::escape( message.databaseText() ) ); + TQStyleSheet::escape( message.databaseText() ) ); m_stack->raiseWidget( m_textEdit ); } diff --git a/languages/sql/sqloutputwidget.h b/languages/sql/sqloutputwidget.h index 40c8612a..c7393bb6 100644 --- a/languages/sql/sqloutputwidget.h +++ b/languages/sql/sqloutputwidget.h @@ -12,7 +12,7 @@ #ifndef _SQLOUTPUTWIDGET_H_ #define _SQLOUTPUTWIDGET_H_ -#include +#include class QWidgetStack; class QDataTable; @@ -24,20 +24,20 @@ class SqlOutputWidget : public QWidget Q_OBJECT public: - SqlOutputWidget( QWidget* parent = 0, const char* name = 0 ); + SqlOutputWidget( TQWidget* parent = 0, const char* name = 0 ); virtual ~SqlOutputWidget(); public: - void showQuery( const QString& connectionName, const QString& query ); - void showError( const QSqlError& error ); + void showQuery( const TQString& connectionName, const TQString& query ); + void showError( const TQSqlError& error ); private: - void showError( const QString& msg ); + void showError( const TQString& msg ); void showSuccess( int rowsAffected ); - QWidgetStack* m_stack; - QDataTable* m_table; - QTextEdit* m_textEdit; + TQWidgetStack* m_stack; + TQDataTable* m_table; + TQTextEdit* m_textEdit; }; #endif diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index c1e13ac0..78c1c1f2 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -1,9 +1,9 @@ #include "sqlsupport_part.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -33,31 +33,31 @@ typedef KDevGenericFactory SQLSupportFactory; static const KDevPluginInfo data("kdevsqlsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) ) -SQLSupportPart::SQLSupportPart( QObject *parent, const char *name, const QStringList& ) +SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& ) : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) { setInstance( SQLSupportFactory::instance() ); setXMLFile( "kdevsqlsupport.rc" ); KAction *action; - action = new KAction( i18n( "&Run" ), "exec", Key_F9, this, SLOT( slotRun() ), actionCollection(), "build_execute" ); + action = new KAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("Run

    Executes a SQL script.")); - dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); + dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); kdDebug( 9000 ) << "Creating SQLSupportPart" << endl; - connect( core(), SIGNAL( projectConfigWidget( KDialogBase* ) ), - this, SLOT( projectConfigWidget( KDialogBase* ) ) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) ); - connect( core(), SIGNAL(languageChanged()), this, SLOT(projectOpened()) ); - connect( partController(), SIGNAL( savedFile( const KURL& ) ), this, SLOT( savedFile( const KURL& ) ) ); + connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), + this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); + connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(projectOpened()) ); + connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), this, TQT_SLOT( savedFile( const KURL& ) ) ); m_widget = new SqlOutputWidget(); mainWindow()->embedOutputView( m_widget, i18n( "SQL" ), i18n( "Output of SQL commands" ) ); - QWhatsThis::add(m_widget, i18n("Output of SQL commands

    This window shows the output of SQL commands being executed. It can display results of SQL \"select\" commands in a table.")); + TQWhatsThis::add(m_widget, i18n("Output of SQL commands

    This window shows the output of SQL commands being executed. It can display results of SQL \"select\" commands in a table.")); } @@ -67,12 +67,12 @@ SQLSupportPart::~SQLSupportPart() delete m_widget; } -QString SQLSupportPart::cryptStr(const QString& aStr) +TQString SQLSupportPart::cryptStr(const TQString& aStr) { - QString result; + TQString result; for (unsigned int i = 0; i < aStr.length(); i++) result += (aStr[i].unicode() < 0x20) ? aStr[i] : - QChar(0x1001F - aStr[i].unicode()); + TQChar(0x1001F - aStr[i].unicode()); return result; } @@ -83,10 +83,10 @@ void SQLSupportPart::activeConnectionChanged() void SQLSupportPart::clearConfig() { - for ( QStringList::Iterator it = conNames.begin(); it != conNames.end(); ++it ) { - if ( QSqlDatabase::contains( *it ) ) { - QSqlDatabase::database( *it, false )->close(); - QSqlDatabase::removeDatabase( *it ); + for ( TQStringList::Iterator it = conNames.begin(); it != conNames.end(); ++it ) { + if ( TQSqlDatabase::contains( *it ) ) { + TQSqlDatabase::database( *it, false )->close(); + TQSqlDatabase::removeDatabase( *it ); } else { kdDebug( 9000 ) << "Could not find connection named " << (*it) << endl; } @@ -100,20 +100,20 @@ void SQLSupportPart::loadConfig() { clearConfig(); - QDomDocument* doc = projectDom(); + TQDomDocument* doc = projectDom(); - QStringList db; + TQStringList db; int i = 0; - QString conName; + TQString conName; while ( true ) { - QStringList sdb = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + QString::number( i ), "el" ); + TQStringList sdb = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" ); if ( (int)sdb.size() < 6 ) break; conName = "KDEVSQLSUPPORT_"; - conName += QString::number( i ); + conName += TQString::number( i ); conNames << conName; - QSqlDatabase* db = QSqlDatabase::addDatabase( sdb[0], QString( "KDEVSQLSUPPORT_%1" ).arg( i ) ); + TQSqlDatabase* db = TQSqlDatabase::addDatabase( sdb[0], TQString( "KDEVSQLSUPPORT_%1" ).arg( i ) ); db->setDatabaseName( sdb[1] ); db->setHostName( sdb[2] ); bool ok; @@ -132,26 +132,26 @@ void SQLSupportPart::loadConfig() void SQLSupportPart::projectConfigWidget( KDialogBase *dlg ) { - QVBox *vbox = dlg->addVBoxPage( QString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("source", KIcon::SizeMedium) ); - SqlConfigWidget *w = new SqlConfigWidget( (QWidget*)vbox, "SQL config widget" ); + TQVBox *vbox = dlg->addVBoxPage( TQString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("source", KIcon::SizeMedium) ); + SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" ); w->setProjectDom( projectDom() ); w->loadConfig(); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); - connect( w, SIGNAL(newConfigSaved()), this, SLOT(loadConfig()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) ); } void SQLSupportPart::projectOpened() { - connect( project(), SIGNAL( addedFilesToProject( const QStringList & ) ), - this, SLOT( addedFilesToProject( const QStringList & ) ) ); - connect( project(), SIGNAL( removedFilesFromProject( const QStringList & ) ), - this, SLOT( removedFilesFromProject( const QStringList & ) ) ); + connect( project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); loadConfig(); // We want to parse only after all components have been // properly initialized - QTimer::singleShot( 0, this, SLOT( parse() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( parse() ) ); } @@ -162,7 +162,7 @@ void SQLSupportPart::projectClosed() void SQLSupportPart::slotRun () { - QString cName = dbAction->currentConnectionName(); + TQString cName = dbAction->currentConnectionName(); if ( cName.isEmpty() ) { KMessageBox::sorry( 0, i18n("Please select a valid database connection.") ); return; @@ -177,16 +177,16 @@ void SQLSupportPart::slotRun () } #if 0 -static QString dbCaption(const QSqlDatabase* db) +static TQString dbCaption(const TQSqlDatabase* db) { - QString res; + TQString res; if (!db) return res; res = db->driverName(); - res += QString::fromLatin1("@"); + res += TQString::fromLatin1("@"); res += db->hostName(); if (db->port() >= 0) - res += QString::fromLatin1(":") + QString::number(db->port()); + res += TQString::fromLatin1(":") + TQString::number(db->port()); return res; } #endif @@ -203,7 +203,7 @@ void SQLSupportPart::updateCatalog() codeModel()->wipeout(); - QString curConnection = dbAction->currentConnectionName(); + TQString curConnection = dbAction->currentConnectionName(); if (curConnection.isEmpty()) { emit updatedSourceInfo(); return; @@ -211,20 +211,20 @@ void SQLSupportPart::updateCatalog() FileDom dbf = codeModel()->create(); dbf->setName(dbAction->currentConnectionName()); - QSqlDatabase *db = QSqlDatabase::database(dbAction->currentConnectionName(), true); + TQSqlDatabase *db = TQSqlDatabase::database(dbAction->currentConnectionName(), true); // tables are classes and fields are methods if (db->isOpen()) { - QSqlRecord inf; - QStringList tables = db->tables(); - for (QStringList::Iterator it = tables.begin(); it != tables.end(); ++it) { + TQSqlRecord inf; + TQStringList tables = db->tables(); + for (TQStringList::Iterator it = tables.begin(); it != tables.end(); ++it) { ClassDom dbc = codeModel()->create(); dbc->setName(*it); inf = db->record(*it); for (int i = 0; i < (int)inf.count(); ++i) { FunctionDom dbv = codeModel()->create(); dbv->setName(inf.fieldName(i)); - dbv->setResultType(QVariant::typeToName(inf.field(i)->type())); + dbv->setResultType(TQVariant::typeToName(inf.field(i)->type())); dbc->addFunction(dbv); } dbf->addClass(dbc); @@ -236,9 +236,9 @@ void SQLSupportPart::updateCatalog() emit updatedSourceInfo(); } -void SQLSupportPart::addedFilesToProject( const QStringList &fileList ) +void SQLSupportPart::addedFilesToProject( const TQStringList &fileList ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { // parse( project() ->projectDirectory() + "/" + ( *it ) ); @@ -248,9 +248,9 @@ void SQLSupportPart::addedFilesToProject( const QStringList &fileList ) } -void SQLSupportPart::removedFilesFromProject( const QStringList &fileList ) +void SQLSupportPart::removedFilesFromProject( const TQStringList &fileList ) { - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for ( it = fileList.begin(); it != fileList.end(); ++it ) { // classStore() ->removeWithReferences( project() ->projectDirectory() + "/" + ( *it ) ); diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h index e9ad6dbd..187a4bbd 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -1,8 +1,8 @@ #ifndef __KDEVPART_SQLSUPPORT_H__ #define __KDEVPART_SQLSUPPORT_H__ -#include -#include +#include +#include #include #include @@ -20,11 +20,11 @@ class SQLSupportPart : public KDevLanguageSupport public: - SQLSupportPart(QObject *parent, const char *name, const QStringList &); + SQLSupportPart(TQObject *parent, const char *name, const TQStringList &); virtual ~SQLSupportPart(); - static QString cryptStr(const QString& aStr); - const QStringList& connections() const { return conNames; } + static TQString cryptStr(const TQString& aStr); + const TQStringList& connections() const { return conNames; } protected: @@ -37,8 +37,8 @@ private slots: void projectOpened(); void projectClosed(); void savedFile(const KURL &fileName); - void addedFilesToProject(const QStringList &fileList); - void removedFilesFromProject(const QStringList &fileList); + void addedFilesToProject(const TQStringList &fileList); + void removedFilesFromProject(const TQStringList &fileList); void parse(); void loadConfig(); void activeConnectionChanged(); @@ -48,7 +48,7 @@ private: void updateCatalog(); SqlListAction* dbAction; SqlOutputWidget* m_widget; - QStringList conNames; + TQStringList conNames; CodeModel *m_store; }; diff --git a/lib/catalog/catalog.cpp b/lib/catalog/catalog.cpp index 96853ff1..c58bbe7d 100644 --- a/lib/catalog/catalog.cpp +++ b/lib/catalog/catalog.cpp @@ -17,10 +17,10 @@ Boston, MA 02110-1301, USA. */ #include "catalog.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -34,10 +34,10 @@ struct _Catalog_Private { - QString dbName; + TQString dbName; DB* dbp; - QMap indexList; + TQMap indexList; KRandomSequence rnd; bool enabled; @@ -46,17 +46,17 @@ struct _Catalog_Private { } - bool hasIndex( const QCString& name ) const + bool hasIndex( const TQCString& name ) const { return indexList.contains( name ); } - DB* index( const QCString& name ) + DB* index( const TQCString& name ) { return indexList[ name ]; } - bool addItem( DB* dbp, const QCString& id, const Tag& tag ) + bool addItem( DB* dbp, const TQCString& id, const Tag& tag ) { Q_ASSERT( dbp != 0 ); @@ -66,17 +66,17 @@ struct _Catalog_Private std::memset( &key, 0, sizeof(key) ); std::memset( &data, 0, sizeof(data) ); - QByteArray a1; + TQByteArray a1; { - QDataStream stream( a1, IO_WriteOnly ); + TQDataStream stream( a1, IO_WriteOnly ); stream << id; key.data = a1.data(); key.size = a1.size(); } - QByteArray a2; + TQByteArray a2; { - QDataStream stream( a2, IO_WriteOnly ); + TQDataStream stream( a2, IO_WriteOnly ); tag.store( stream ); data.data = a2.data(); data.size = a2.size(); @@ -87,7 +87,7 @@ struct _Catalog_Private return ret == 0; } - bool addItem( DB* dbp, const QVariant& id, const QCString& v ) + bool addItem( DB* dbp, const TQVariant& id, const TQCString& v ) { Q_ASSERT( dbp != 0 ); @@ -97,17 +97,17 @@ struct _Catalog_Private std::memset( &key, 0, sizeof(key) ); std::memset( &data, 0, sizeof(data) ); - QByteArray a1; + TQByteArray a1; { - QDataStream stream( a1, IO_WriteOnly ); + TQDataStream stream( a1, IO_WriteOnly ); stream << id; key.data = a1.data(); key.size = a1.size(); } - QByteArray a2; + TQByteArray a2; { - QDataStream stream( a2, IO_WriteOnly ); + TQDataStream stream( a2, IO_WriteOnly ); stream << v; data.data = a2.data(); data.size = a2.size(); @@ -142,10 +142,10 @@ struct _Catalog_Private /*! \fn Catalog::indexList() const */ - QValueList Catalog::indexList() const + TQValueList Catalog::indexList() const { - QValueList l; - QMap::Iterator it = d->indexList.begin(); + TQValueList l; + TQMap::Iterator it = d->indexList.begin(); while( it != d->indexList.end() ){ l << it.key(); ++it; @@ -165,14 +165,14 @@ void Catalog::setEnabled( bool isEnabled ) } /*! - \fn Catalog::addIndex( const QString& name ) + \fn Catalog::addIndex( const TQString& name ) @todo document these functions */ - void Catalog::addIndex( const QCString& name ) + void Catalog::addIndex( const TQCString& name ) { Q_ASSERT( d->dbp != 0 ); - QMap::Iterator it = d->indexList.find( name ); + TQMap::Iterator it = d->indexList.find( name ); if( it == d->indexList.end() ){ DB* dbp = 0; @@ -189,15 +189,15 @@ void Catalog::setEnabled( bool isEnabled ) return; } - QFileInfo fileInfo( d->dbName ); - QString indexName = fileInfo.dirPath(true) + "/" + fileInfo.baseName(true) + "." + QString(name) + ".idx"; + TQFileInfo fileInfo( d->dbName ); + TQString indexName = fileInfo.dirPath(true) + "/" + fileInfo.baseName(true) + "." + TQString(name) + ".idx"; if( (ret = dbp->set_cachesize( dbp, 0, 2 * 1024 * 1024, 0 )) != 0 ){ kdDebug() << "set_cachesize: " << db_strerror(ret) << endl; } if ((ret = dbp->open( - dbp, NULL, QFile::encodeName( indexName ).data(), 0, DB_BTREE, DB_CREATE, 0664)) != 0) { + dbp, NULL, TQFile::encodeName( indexName ).data(), 0, DB_BTREE, DB_CREATE, 0664)) != 0) { kdDebug() << "db_open: " << db_strerror(ret) << endl; dbp->close( dbp, 0 ); return; @@ -213,9 +213,9 @@ void Catalog::setEnabled( bool isEnabled ) void Catalog::close() { - d->dbName = QString::null; + d->dbName = TQString::null; - QMap::Iterator it = d->indexList.begin(); + TQMap::Iterator it = d->indexList.begin(); while( it != d->indexList.end() ){ if( it.data() ){ it.data()->close( it.data(), 0 ); @@ -231,10 +231,10 @@ void Catalog::setEnabled( bool isEnabled ) } /*! - \fn Catalog::open( const QString& dbName ) + \fn Catalog::open( const TQString& dbName ) */ - void Catalog::open( const QString& dbName ) + void Catalog::open( const TQString& dbName ) { Q_ASSERT( d->dbp == 0 ); @@ -269,7 +269,7 @@ void Catalog::setEnabled( bool isEnabled ) \fn Catalog::dbName() const */ - QString Catalog::dbName() const + TQString Catalog::dbName() const { return d->dbName; } @@ -292,11 +292,11 @@ void Catalog::setEnabled( bool isEnabled ) if( tag.name().isEmpty() ) return; - QCString id = generateId(); + TQCString id = generateId(); tag.setId( id ); if( d->addItem(d->dbp, id, tag) ){ - QMap::Iterator it = d->indexList.begin(); + TQMap::Iterator it = d->indexList.begin(); while( it != d->indexList.end() ){ if( tag.hasAttribute(it.key()) ) d->addItem( it.data(), tag.attribute(it.key()), id ); @@ -306,10 +306,10 @@ void Catalog::setEnabled( bool isEnabled ) } /*! - \fn Catalog::getItemById( const QString& id ) + \fn Catalog::getItemById( const TQString& id ) */ - Tag Catalog::getItemById( const QCString& id ) + Tag Catalog::getItemById( const TQCString& id ) { Q_ASSERT( d->dbp != 0 ); @@ -317,9 +317,9 @@ void Catalog::setEnabled( bool isEnabled ) std::memset( &key, 0, sizeof(key) ); std::memset( &data, 0, sizeof(data) ); - QByteArray a1; + TQByteArray a1; { - QDataStream stream( a1, IO_WriteOnly ); + TQDataStream stream( a1, IO_WriteOnly ); stream << id; key.data = a1.data(); key.size = a1.size(); @@ -331,9 +331,9 @@ void Catalog::setEnabled( bool isEnabled ) Tag tag; if( ret == 0 ){ - QByteArray a; + TQByteArray a; a.setRawData( (const char*) data.data, data.size ); - QDataStream stream( a, IO_ReadOnly ); + TQDataStream stream( a, IO_ReadOnly ); tag.load( stream ); a.resetRawData( (const char*) data.data, data.size ); } @@ -350,7 +350,7 @@ void Catalog::setEnabled( bool isEnabled ) Q_ASSERT( d->dbp != 0 ); d->dbp->sync( d->dbp, 0 ); - QMap::Iterator it = d->indexList.begin(); + TQMap::Iterator it = d->indexList.begin(); while( it != d->indexList.end() ){ it.data()->sync( it.data(), 0 ); ++it; @@ -358,22 +358,22 @@ void Catalog::setEnabled( bool isEnabled ) } /*! - \fn Catalog::query( const QValueList& args ) + \fn Catalog::query( const TQValueList& args ) */ - QValueList Catalog::query( const QValueList& args ) + TQValueList Catalog::query( const TQValueList& args ) { - QValueList tags; + TQValueList tags; DBT key, data; DBC** cursors = new DBC* [ args.size() + 1 ]; - QValueList< QPair >::ConstIterator it = args.begin(); + TQValueList< QPair >::ConstIterator it = args.begin(); int current = 0; while( it != args.end() ){ - QCString indexName = (*it).first; - QVariant value = (*it).second; + TQCString indexName = (*it).first; + TQVariant value = (*it).second; if( d->hasIndex(indexName) ) { DB* dbp = d->index( indexName ); @@ -382,9 +382,9 @@ void Catalog::setEnabled( bool isEnabled ) std::memset( &key, 0, sizeof(key) ); std::memset( &data, 0, sizeof(data) ); - QByteArray a1; + TQByteArray a1; { - QDataStream stream( a1, IO_WriteOnly ); + TQDataStream stream( a1, IO_WriteOnly ); stream << value; key.data = a1.data(); key.size = a1.size(); @@ -426,9 +426,9 @@ void Catalog::setEnabled( bool isEnabled ) while( join_curs->c_get(join_curs, &key, &data, 0) == 0 ) { - QByteArray a2; + TQByteArray a2; a2.setRawData( (const char*) data.data, data.size ); - QDataStream s( a2, IO_ReadOnly ); + TQDataStream s( a2, IO_ReadOnly ); Tag tag; tag.load( s ); a2.resetRawData( (const char*) data.data, data.size ); @@ -452,10 +452,10 @@ void Catalog::setEnabled( bool isEnabled ) return tags; } - QCString Catalog::generateId() + TQCString Catalog::generateId() { static int n = 1; - QCString asStr; + TQCString asStr; asStr.sprintf( "%05d", n++ ); return asStr; } diff --git a/lib/catalog/catalog.h b/lib/catalog/catalog.h index 6ab985a9..00eb5b2b 100644 --- a/lib/catalog/catalog.h +++ b/lib/catalog/catalog.h @@ -20,9 +20,9 @@ #ifndef CATALOG_H #define CATALOG_H -#include -#include -#include +#include +#include +#include #include "tag.h" @@ -42,31 +42,31 @@ never or rarely changes. System libraries are perfect examples of such code. class Catalog { public: - typedef QPair QueryArgument; + typedef QPair QueryArgument; public: Catalog(); virtual ~Catalog(); bool isValid() const; - QString dbName() const; + TQString dbName() const; bool enabled() const; void setEnabled( bool en ); - virtual void open( const QString& dbName ); + virtual void open( const TQString& dbName ); virtual void close(); virtual void sync(); - QValueList indexList() const; - void addIndex( const QCString& name ); + TQValueList indexList() const; + void addIndex( const TQCString& name ); void addItem( Tag& tag ); - Tag getItemById( const QCString& id ); - QValueList query( const QValueList& args ); + Tag getItemById( const TQCString& id ); + TQValueList query( const TQValueList& args ); - QCString generateId(); + TQCString generateId(); private: class _Catalog_Private* d; diff --git a/lib/catalog/tag.cpp b/lib/catalog/tag.cpp index 748ca994..966e9713 100644 --- a/lib/catalog/tag.cpp +++ b/lib/catalog/tag.cpp @@ -18,7 +18,7 @@ */ #include "tag.h" -#include +#include Tag::Tag() { @@ -81,7 +81,7 @@ Tag& Tag::operator = ( const Tag& source ) return( *this ); } -void Tag::load( QDataStream& stream ) +void Tag::load( TQDataStream& stream ) { stream >> data->id @@ -97,7 +97,7 @@ void Tag::load( QDataStream& stream ) >> data->attributes; } -void Tag::store( QDataStream& stream ) const +void Tag::store( TQDataStream& stream ) const { stream << data->id @@ -113,13 +113,13 @@ void Tag::store( QDataStream& stream ) const << data->attributes; } -QDataStream& operator << ( QDataStream& s, const Tag& t) +TQDataStream& operator << ( TQDataStream& s, const Tag& t) { t.store( s ); return s; } -QDataStream& operator >> ( QDataStream& s, Tag& t ) +TQDataStream& operator >> ( TQDataStream& s, Tag& t ) { t.load( s ); return s; diff --git a/lib/catalog/tag.h b/lib/catalog/tag.h index da67b083..5c1fac41 100644 --- a/lib/catalog/tag.h +++ b/lib/catalog/tag.h @@ -20,9 +20,9 @@ #ifndef TAG_H #define TAG_H -#include -#include -#include +#include +#include +#include class QDataStream; @@ -78,12 +78,12 @@ public: Tag& operator = ( const Tag& source ); - QCString id() const + TQCString id() const { return data->id; } - void setId( const QCString& id ) + void setId( const TQCString& id ) { detach(); data->id = id; @@ -111,31 +111,31 @@ public: data->flags = flags; } - QString fileName() const + TQString fileName() const { return data->fileName; } - void setFileName( const QString& fileName ) + void setFileName( const TQString& fileName ) { detach(); data->fileName = fileName; } - QString path( const QString& sep = QString::fromLatin1("::") ) const + TQString path( const TQString& sep = TQString::fromLatin1("::") ) const { - QString s = scope().join( sep ); + TQString s = scope().join( sep ); if( s.isNull() ) return name(); return s + sep + name(); } - QString name() const + TQString name() const { return data->name; } - QString comment() const { + TQString comment() const { if( hasAttribute( "cmt" ) ) { return attribute( "cmt" ).asString(); } else { @@ -143,22 +143,22 @@ public: } } - void setComment( const QString& comment ) { + void setComment( const TQString& comment ) { setAttribute( "cmt", comment ); } - void setName( const QString& name ) + void setName( const TQString& name ) { detach(); data->name = name; } - QStringList scope() const + TQStringList scope() const { return data->scope; } - void setScope( const QStringList& scope ) + void setScope( const TQStringList& scope ) { detach(); data->scope = scope; @@ -190,22 +190,22 @@ public: data->endColumn = column; } - QString getSpecializationDeclaration() const { + TQString getSpecializationDeclaration() const { if( hasAttribute( "spc" ) ) return data->attributes["spc"].asString(); else - return QString::null; + return TQString::null; } bool hasSpecializationDeclaration() const { return data->attributes.contains( "spc" ); } - void setSpecializationDeclaration( const QString& str ) { + void setSpecializationDeclaration( const TQString& str ) { data->attributes["spc"] = str; } - bool hasAttribute( const QCString& name ) const + bool hasAttribute( const TQCString& name ) const { if( name == "kind" || name == "name" || @@ -219,7 +219,7 @@ public: return data->attributes.contains( name ); } - QVariant attribute( const QCString& name ) const + TQVariant attribute( const TQCString& name ) const { if( name == "id" ) return data->id; @@ -244,7 +244,7 @@ public: return data->attributes[ name ]; } - void setAttribute( const QCString& name, const QVariant& value ) + void setAttribute( const TQCString& name, const TQVariant& value ) { detach(); if( name == "id" ) @@ -269,20 +269,20 @@ public: data->attributes[ name ] = value; } - void addTemplateParam( const QString& param , const QString& def = "" ) { - QMap::iterator it = data->attributes.find( "tpl" ); - if( it != data->attributes.end() && (*it).type() == QVariant::StringList ) { + void addTemplateParam( const TQString& param , const TQString& def = "" ) { + TQMap::iterator it = data->attributes.find( "tpl" ); + if( it != data->attributes.end() && (*it).type() == TQVariant::StringList ) { }else{ - it = data->attributes.insert( "tpl", QVariant( QStringList() ) ); + it = data->attributes.insert( "tpl", TQVariant( TQStringList() ) ); } - QStringList& l( (*it).asStringList() ); + TQStringList& l( (*it).asStringList() ); l << param; l << def; } - void load( QDataStream& stream ); - void store( QDataStream& stream ) const; + void load( TQDataStream& stream ); + void store( TQDataStream& stream ) const; private: Tag copy(); @@ -291,19 +291,19 @@ private: private: struct TagData: public QShared { - QCString id; + TQCString id; int kind; unsigned long flags; - QString name; - QStringList scope; - QString fileName; + TQString name; + TQStringList scope; + TQString fileName; int startLine, startColumn; int endLine, endColumn; - QMap attributes; + TQMap attributes; } *data; }; -QDataStream& operator << ( QDataStream&, const Tag& ); -QDataStream& operator >> ( QDataStream&, Tag& ); +TQDataStream& operator << ( TQDataStream&, const Tag& ); +TQDataStream& operator >> ( TQDataStream&, Tag& ); #endif diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index 978d9408..209a8a99 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -18,10 +18,10 @@ */ #include "ast.h" -#include +#include #include -QString nodeTypeToString( int type ) +TQString nodeTypeToString( int type ) { switch( type ) { @@ -125,7 +125,7 @@ QString nodeTypeToString( int type ) return "Custom"; } - return QString::null; + return TQString::null; } @@ -232,18 +232,18 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam m_classOrNamespaceNameList.append( classOrNamespaceName.release() ); } -QString NameAST::text() const +TQString NameAST::text() const { if( !m_unqualifiedName.get() ) - return QString::null; + return TQString::null; - QString str; + TQString str; if( m_global ) str += "::"; - QStringList l; - QPtrListIterator it( m_classOrNamespaceNameList ); + TQStringList l; + TQPtrListIterator it( m_classOrNamespaceNameList ); while( it.current() ){ str += it.current()->text() + "::"; ++it; @@ -414,11 +414,11 @@ void TemplateArgumentListAST::addArgument( AST::Node& arg ) m_argumentList.append( arg.release() ); } -QString TemplateArgumentListAST::text() const +TQString TemplateArgumentListAST::text() const { - QStringList l; + TQStringList l; - QPtrListIterator it( m_argumentList ); + TQPtrListIterator it( m_argumentList ); while( it.current() ){ l.append( it.current()->text() ); ++it; @@ -467,14 +467,14 @@ void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST:: if( m_templateArgumentList.get() ) m_templateArgumentList->setParent( this ); } -QString ClassOrNamespaceNameAST::text() const +TQString ClassOrNamespaceNameAST::text() const { if( !m_name.get() ) - return QString::null; + return TQString::null; - QString str = m_name->text(); + TQString str = m_name->text(); if( m_templateArgumentList.get() ) - str += QString::fromLatin1("< ") + m_templateArgumentList->text() + QString::fromLatin1(" >"); + str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); return str; } @@ -496,9 +496,9 @@ void TypeSpecifierAST::setCv2Qualify( GroupAST::Node& cv2Qualify ) if( m_cv2Qualify.get() ) m_cv2Qualify->setParent( this ); } -QString TypeSpecifierAST::text() const +TQString TypeSpecifierAST::text() const { - QString str; + TQString str; if( m_cvQualify.get() ) str += m_cvQualify->text() + " "; @@ -507,7 +507,7 @@ QString TypeSpecifierAST::text() const str += m_name->text(); if( m_cv2Qualify.get() ) - str += QString(" ") + m_cv2Qualify->text(); + str += TQString(" ") + m_cv2Qualify->text(); return str; } @@ -566,7 +566,7 @@ void ElaboratedTypeSpecifierAST::setKind( AST::Node& kind ) if( m_kind.get() ) m_kind->setParent( this ); } -QString ElaboratedTypeSpecifierAST::text() const +TQString ElaboratedTypeSpecifierAST::text() const { if( m_kind.get() ) return m_kind->text() + " " + TypeSpecifierAST::text(); @@ -1040,9 +1040,9 @@ void ParameterDeclarationAST::setExpression( AST::Node& expression ) if( m_expression.get() ) m_expression->setParent( this ); } -QString ParameterDeclarationAST::text() const +TQString ParameterDeclarationAST::text() const { - QString str; + TQString str; if( m_typeSpec.get() ) str += m_typeSpec->text() + " "; @@ -1050,7 +1050,7 @@ QString ParameterDeclarationAST::text() const str += m_declarator->text(); if( m_expression.get() ) - str += QString( " = " ) + m_expression->text(); + str += TQString( " = " ) + m_expression->text(); return str; } @@ -1070,11 +1070,11 @@ void ParameterDeclarationListAST::addParameter( ParameterDeclarationAST::Node& p m_parameterList.append( parameter.release() ); } -QString ParameterDeclarationListAST::text() const +TQString ParameterDeclarationListAST::text() const { - QStringList l; + TQStringList l; - QPtrListIterator it( m_parameterList ); + TQPtrListIterator it( m_parameterList ); while( it.current() ){ l.append( it.current()->text() ); ++it; @@ -1101,9 +1101,9 @@ void ParameterDeclarationClauseAST::setEllipsis( AST::Node& ellipsis ) if( m_ellipsis.get() ) m_ellipsis->setParent( this ); } -QString ParameterDeclarationClauseAST::text() const +TQString ParameterDeclarationClauseAST::text() const { - QString str; + TQString str; if( m_parameterDeclarationList.get() ) str += m_parameterDeclarationList->text(); @@ -1130,11 +1130,11 @@ void GroupAST::addNode( AST::Node& node ) m_nodeList.append( node.release() ); } -QString GroupAST::text() const +TQString GroupAST::text() const { - QStringList l; + TQStringList l; - QPtrListIterator it( m_nodeList ); + TQPtrListIterator it( m_nodeList ); while( it.current() ){ l.append( it.current()->text() ); ++it; @@ -1158,11 +1158,11 @@ void AccessDeclarationAST::addAccess( AST::Node& access ) m_accessList.append( access.release() ); } -QString AccessDeclarationAST::text() const +TQString AccessDeclarationAST::text() const { - QStringList l; + TQStringList l; - QPtrListIterator it( m_accessList ); + TQPtrListIterator it( m_accessList ); while( it.current() ){ l.append( it.current()->text() ); ++it; diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index b8756bf3..c9750faf 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -21,9 +21,9 @@ #define __ast_h #include -#include -#include -#include +#include +#include +#include #include #if defined( Q_OS_WIN32 ) || defined( Q_CC_SUN ) @@ -180,7 +180,7 @@ enum NodeType NodeType_Custom = 2000 }; -QString nodeTypeToString( int type ); +TQString nodeTypeToString( int type ); #if defined(CPPPARSER_QUICK_ALLOCATOR) @@ -205,7 +205,7 @@ QString nodeTypeToString( int type ); struct Slice { - QString source; + TQString source; int position; int length; @@ -215,13 +215,13 @@ struct Slice class CommentAST { - QString m_comment; + TQString m_comment; public: - void setComment( const QString& comment ) { + void setComment( const TQString& comment ) { m_comment = comment; } - void addComment( const QString& comment ) { + void addComment( const TQString& comment ) { if( !m_comment.isEmpty() ) { m_comment += "\n(" + comment + ")"; } else { @@ -229,7 +229,7 @@ class CommentAST { } } - QString comment() const { + TQString comment() const { return m_comment; } @@ -263,18 +263,18 @@ public: void getEndPosition( int* line, int* col ) const; #ifndef CPPPARSER_NO_CHILDREN - QPtrList children() { return m_children; } + TQPtrList children() { return m_children; } void appendChild( AST* child ); void removeChild( AST* child ); #endif - virtual inline QString text() const + virtual inline TQString text() const { return m_slice.source.mid(m_slice.position, m_slice.length); } inline void setSlice( const Slice& slice ) { m_slice = slice; } - inline void setSlice( const QString &text, int position, int length ) + inline void setSlice( const TQString &text, int position, int length ) { CommentAST a; m_slice.source = text; @@ -282,7 +282,7 @@ public: m_slice.length = length; } - inline void setText(const QString &text) + inline void setText(const TQString &text) { setSlice(text, 0, text.length()); } private: @@ -292,7 +292,7 @@ private: int m_endLine, m_endColumn; Slice m_slice; #ifndef CPPPARSER_NO_CHILDREN - QPtrList m_children; + TQPtrList m_children; #endif private: @@ -311,13 +311,13 @@ public: public: GroupAST(); - QPtrList nodeList() { return m_nodeList; } + TQPtrList nodeList() { return m_nodeList; } void addNode( AST::Node& node ); - virtual QString text() const; + virtual TQString text() const; private: - QPtrList m_nodeList; + TQPtrList m_nodeList; private: GroupAST( const GroupAST& source ); @@ -337,12 +337,12 @@ public: TemplateArgumentListAST(); void addArgument( AST::Node& arg ); - QPtrList argumentList() { return m_argumentList; } + TQPtrList argumentList() { return m_argumentList; } - virtual QString text() const; + virtual TQString text() const; private: - QPtrList m_argumentList; + TQPtrList m_argumentList; private: TemplateArgumentListAST( const TemplateArgumentListAST& source ); @@ -366,7 +366,7 @@ public: TemplateArgumentListAST* templateArgumentList() { return m_templateArgumentList.get(); } void setTemplateArgumentList( TemplateArgumentListAST::Node& templateArgumentList ); - virtual QString text() const; + virtual TQString text() const; private: AST::Node m_name; @@ -392,17 +392,17 @@ public: void setGlobal( bool b ); void addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNamespaceName ); - QPtrList classOrNamespaceNameList() { return m_classOrNamespaceNameList; } + TQPtrList classOrNamespaceNameList() { return m_classOrNamespaceNameList; } ClassOrNamespaceNameAST* unqualifiedName() { return m_unqualifiedName.get(); } void setUnqualifiedName( ClassOrNamespaceNameAST::Node& unqualifiedName ); - virtual QString text() const; + virtual TQString text() const; private: bool m_global; ClassOrNamespaceNameAST::Node m_unqualifiedName; - QPtrList m_classOrNamespaceNameList; + TQPtrList m_classOrNamespaceNameList; private: NameAST( const NameAST& source ); @@ -470,13 +470,13 @@ public: public: AccessDeclarationAST(); - QPtrList accessList() { return m_accessList; } + TQPtrList accessList() { return m_accessList; } void addAccess( AST::Node& access ); - virtual QString text() const; + virtual TQString text() const; private: - QPtrList m_accessList; + TQPtrList m_accessList; private: AccessDeclarationAST( const AccessDeclarationAST& source ); @@ -503,7 +503,7 @@ public: GroupAST* cv2Qualify() { return m_cv2Qualify.get(); } void setCv2Qualify( GroupAST::Node& cv2Qualify ); - virtual QString text() const; + virtual TQString text() const; private: NameAST::Node m_name; @@ -557,10 +557,10 @@ public: BaseClauseAST(); void addBaseSpecifier( BaseSpecifierAST::Node& baseSpecifier ); - QPtrList baseSpecifierList() { return m_baseSpecifierList; } + TQPtrList baseSpecifierList() { return m_baseSpecifierList; } private: - QPtrList m_baseSpecifierList; + TQPtrList m_baseSpecifierList; private: BaseClauseAST( const BaseClauseAST& source ); @@ -587,14 +587,14 @@ public: BaseClauseAST* baseClause() { return m_baseClause.get(); } void setBaseClause( BaseClauseAST::Node& baseClause ); - QPtrList declarationList() { return m_declarationList; } + TQPtrList declarationList() { return m_declarationList; } void addDeclaration( DeclarationAST::Node& declaration ); private: GroupAST::Node m_winDeclSpec; AST::Node m_classKey; BaseClauseAST::Node m_baseClause; - QPtrList m_declarationList; + TQPtrList m_declarationList; private: ClassSpecifierAST( const ClassSpecifierAST& source ); void operator = ( const ClassSpecifierAST& source ); @@ -638,10 +638,10 @@ public: EnumSpecifierAST(); void addEnumerator( EnumeratorAST::Node& enumerator ); - QPtrList enumeratorList() { return m_enumeratorList; } + TQPtrList enumeratorList() { return m_enumeratorList; } private: - QPtrList m_enumeratorList; + TQPtrList m_enumeratorList; private: EnumSpecifierAST( const EnumSpecifierAST& source ); @@ -662,7 +662,7 @@ public: AST* kind() { return m_kind.get(); } void setKind( AST::Node& kind ); - virtual QString text() const; + virtual TQString text() const; private: AST::Node m_kind; @@ -685,10 +685,10 @@ public: LinkageBodyAST(); void addDeclaration( DeclarationAST::Node& ast ); - QPtrList declarationList() { return m_declarationList; } + TQPtrList declarationList() { return m_declarationList; } private: - QPtrList m_declarationList; + TQPtrList m_declarationList; private: LinkageBodyAST( const LinkageBodyAST& source ); @@ -836,7 +836,7 @@ public: public: DeclaratorAST(); - QPtrList ptrOpList() { return m_ptrOpList; } + TQPtrList ptrOpList() { return m_ptrOpList; } void addPtrOp( AST::Node& ptrOp ); DeclaratorAST* subDeclarator() { return m_subDeclarator.get(); } @@ -848,7 +848,7 @@ public: AST* bitfieldInitialization() { return m_bitfieldInitialization.get(); } void setBitfieldInitialization( AST::Node& bitfieldInitialization ); - QPtrList arrayDimensionList() { return m_arrayDimensionList; } + TQPtrList arrayDimensionList() { return m_arrayDimensionList; } void addArrayDimension( AST::Node& arrayDimension ); class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); } @@ -862,11 +862,11 @@ public: void setExceptionSpecification( GroupAST::Node& exceptionSpecification ); private: - QPtrList m_ptrOpList; + TQPtrList m_ptrOpList; AUTO_PTR m_subDeclarator; NameAST::Node m_declaratorId; AST::Node m_bitfieldInitialization; - QPtrList m_arrayDimensionList; + TQPtrList m_arrayDimensionList; AUTO_PTR m_parameterDeclarationClause; AST::Node m_constant; GroupAST::Node m_exceptionSpecification; @@ -896,7 +896,7 @@ public: AST* expression() { return m_expression.get(); } void setExpression( AST::Node& expression ); - virtual QString text() const; + virtual TQString text() const; private: TypeSpecifierAST::Node m_typeSpec; @@ -919,13 +919,13 @@ public: public: ParameterDeclarationListAST(); - QPtrList parameterList() { return m_parameterList; } + TQPtrList parameterList() { return m_parameterList; } void addParameter( ParameterDeclarationAST::Node& parameter ); - virtual QString text() const; + virtual TQString text() const; private: - QPtrList m_parameterList; + TQPtrList m_parameterList; private: ParameterDeclarationListAST( const ParameterDeclarationListAST& source ); @@ -949,7 +949,7 @@ public: AST* ellipsis() { return m_ellipsis.get(); } void setEllipsis( AST::Node& ellipsis ); - virtual QString text() const; + virtual TQString text() const; private: ParameterDeclarationListAST::Node m_parameterDeclarationList; @@ -998,11 +998,11 @@ public: public: InitDeclaratorListAST(); - QPtrList initDeclaratorList() { return m_initDeclaratorList; } + TQPtrList initDeclaratorList() { return m_initDeclaratorList; } void addInitDeclarator( InitDeclaratorAST::Node& decl ); private: - QPtrList m_initDeclaratorList; + TQPtrList m_initDeclaratorList; private: InitDeclaratorListAST( const InitDeclaratorListAST& source ); @@ -1072,11 +1072,11 @@ public: public: TemplateParameterListAST(); - QPtrList templateParameterList() { return m_templateParameterList; } + TQPtrList templateParameterList() { return m_templateParameterList; } void addTemplateParameter( TemplateParameterAST::Node& templateParameter ); private: - QPtrList m_templateParameterList; + TQPtrList m_templateParameterList; private: TemplateParameterListAST( const TemplateParameterListAST& source ); @@ -1403,11 +1403,11 @@ public: public: StatementListAST(); - QPtrList statementList() { return m_statementList; } + TQPtrList statementList() { return m_statementList; } void addStatement( StatementAST::Node& statement ); private: - QPtrList m_statementList; + TQPtrList m_statementList; private: StatementListAST( const StatementListAST& source ); @@ -1451,11 +1451,11 @@ public: public: CatchStatementListAST(); - QPtrList statementList() { return m_statementList; } + TQPtrList statementList() { return m_statementList; } void addStatement( CatchStatementAST::Node& statement ); private: - QPtrList m_statementList; + TQPtrList m_statementList; private: CatchStatementListAST( const CatchStatementListAST& source ); @@ -1565,10 +1565,10 @@ public: TranslationUnitAST(); void addDeclaration( DeclarationAST::Node& ast ); - QPtrList declarationList() { return m_declarationList; } + TQPtrList declarationList() { return m_declarationList; } private: - QPtrList m_declarationList; + TQPtrList m_declarationList; private: TranslationUnitAST( const TranslationUnitAST& source ); diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index a7592b97..80667a9e 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -26,17 +26,17 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -// void Macro::read( QDataStream& stream ) { +// void Macro::read( TQDataStream& stream ) { // stream >> m_idHashValid; // stream >> m_valueHashValid; // stream >> m_idHash; @@ -48,7 +48,7 @@ // stream >> m_argumentList; // } // -// void Macro::write( QDataStream& stream ) const { +// void Macro::write( TQDataStream& stream ) const { // stream << m_idHashValid; // stream << m_valueHashValid; // stream << m_idHash; @@ -77,19 +77,19 @@ class DefaultSourceProvider: public SourceProvider { public: DefaultSourceProvider() {} - virtual QString contents( const QString& fileName ) { - QString source; + virtual TQString contents( const TQString& fileName ) { + TQString source; - QFile f( fileName ); + TQFile f( fileName ); if ( f.open( IO_ReadOnly ) ) { - QTextStream s( &f ); + TQTextStream s( &f ); source = s.read(); f.close(); } return source; } - virtual bool isModified( const QString& fileName ) { + virtual bool isModified( const TQString& fileName ) { Q_UNUSED( fileName ); return true; } @@ -137,18 +137,18 @@ void Driver::reset( ) { } } -QStringList Driver::getCustomIncludePath( const QString& ) { +TQStringList Driver::getCustomIncludePath( const TQString& ) { return includePaths(); } void Driver::remove - ( const QString & fileName ) { + ( const TQString & fileName ) { m_dependences.remove( fileName ); m_problems.remove( fileName ); if( !isResolveDependencesEnabled() ) removeAllMacrosInFile( fileName ); - QMap::Iterator it = m_parsedUnits.find( fileName ); + TQMap::Iterator it = m_parsedUnits.find( fileName ); if ( it != m_parsedUnits.end() ) { //TranslationUnitAST * unit = **it; m_parsedUnits.remove( it ); @@ -156,7 +156,7 @@ void Driver::remove } } -void Driver::removeAllMacrosInFile( const QString& fileName ) { +void Driver::removeAllMacrosInFile( const TQString& fileName ) { MacroMap::iterator it = m_macros.begin(); while ( it != m_macros.end() ) { Macro m = ( *it ).second; @@ -190,7 +190,7 @@ bool Driver::hasMacro( const HashedString& name ) { return false; } -QString deepCopy( const QString& str ) { +TQString deepCopy( const TQString& str ) { return str; //return str.ascii(); } @@ -237,8 +237,8 @@ void Driver::removeMacro( const HashedString& macroName ) { } } -ParsedFilePointer Driver::takeTranslationUnit( const QString& fileName ) { - QMap::Iterator it = m_parsedUnits.find( fileName ); +ParsedFilePointer Driver::takeTranslationUnit( const TQString& fileName ) { + TQMap::Iterator it = m_parsedUnits.find( fileName ); ParsedFilePointer unit( *it ); //m_parsedUnits.remove( it ); m_parsedUnits[ fileName ] = 0; @@ -246,19 +246,19 @@ ParsedFilePointer Driver::takeTranslationUnit( const QString& fileName ) { } void Driver::takeTranslationUnit( const ParsedFile& file ) { - QMap::Iterator it = m_parsedUnits.find( file.fileName() ); + TQMap::Iterator it = m_parsedUnits.find( file.fileName() ); m_parsedUnits[ file.fileName() ] = 0; } -ParsedFilePointer Driver::translationUnit( const QString& fileName ) const { - QMap::ConstIterator it = m_parsedUnits.find( fileName ); +ParsedFilePointer Driver::translationUnit( const TQString& fileName ) const { + TQMap::ConstIterator it = m_parsedUnits.find( fileName ); return it != m_parsedUnits.end() ? *it : 0; } class Driver::ParseHelper { public: - ParseHelper( const QString& fileName, bool force, Driver* driver, bool reportMessages = true, QString includedFrom = QString() ) : m_wasReset( false ), m_fileName( fileName ), m_previousFileName( driver->m_currentFileName ), m_previousLexer( driver->lexer ), m_previousParsedFile( driver->m_currentParsedFile ), m_previousCachedLexedFile( driver->m_currentLexerCache ), m_force( force ), m_driver( driver ), m_lex( m_driver ) { - QFileInfo fileInfo( fileName ); + ParseHelper( const TQString& fileName, bool force, Driver* driver, bool reportMessages = true, TQString includedFrom = TQString() ) : m_wasReset( false ), m_fileName( fileName ), m_previousFileName( driver->m_currentFileName ), m_previousLexer( driver->lexer ), m_previousParsedFile( driver->m_currentParsedFile ), m_previousCachedLexedFile( driver->m_currentLexerCache ), m_force( force ), m_driver( driver ), m_lex( m_driver ) { + TQFileInfo fileInfo( fileName ); m_driver->m_currentParsedFile = new ParsedFile( fileName, fileInfo.lastModified() ); if( !includedFrom.isEmpty() ) m_driver->m_currentParsedFile->setIncludedFrom( includedFrom ); @@ -267,7 +267,7 @@ class Driver::ParseHelper { #endif m_absFilePath = fileInfo.absFilePath(); - QMap::Iterator it = m_driver->m_parsedUnits.find( m_absFilePath ); + TQMap::Iterator it = m_driver->m_parsedUnits.find( m_absFilePath ); if ( force && it != m_driver->m_parsedUnits.end() ) { m_driver->takeTranslationUnit( m_absFilePath ); @@ -304,7 +304,7 @@ class Driver::ParseHelper { } void parse() { - QString oldMasterFileName = m_driver->m_currentMasterFileName; //Change the master-file so problems will be reported correctly + TQString oldMasterFileName = m_driver->m_currentMasterFileName; //Change the master-file so problems will be reported correctly m_driver->m_currentMasterFileName = m_absFilePath; CachedLexedFilePointer lf = m_driver->m_currentLexerCache; //Set the lexer-cache to zero, so the problems registered through addProblem go directly into the file @@ -349,9 +349,9 @@ class Driver::ParseHelper { private: bool m_wasReset; - QString m_fileName; - QString m_absFilePath; - QString m_previousFileName; + TQString m_fileName; + TQString m_absFilePath; + TQString m_previousFileName; Lexer* m_previousLexer; ParsedFilePointer m_previousParsedFile; CachedLexedFilePointer m_previousCachedLexedFile; @@ -361,15 +361,15 @@ class Driver::ParseHelper { }; -void Driver::addDependence( const QString & fileName, const Dependence & dep ) { +void Driver::addDependence( const TQString & fileName, const Dependence & dep ) { // this can happen if the parser was invoked on a snippet of text and not a file if ( fileName.isEmpty() || !m_currentParsedFile ) return; //@todo prevent cyclic dependency-loops - QFileInfo fileInfo( dep.first ); - QString fn = fileInfo.absFilePath(); + TQFileInfo fileInfo( dep.first ); + TQString fn = fileInfo.absFilePath(); if ( !depresolv ) { findOrInsertDependenceList( fileName ).insert( fn, dep ); @@ -377,12 +377,12 @@ void Driver::addDependence( const QString & fileName, const Dependence & dep ) { return ; } - QString file = findIncludeFile( dep ); + TQString file = findIncludeFile( dep ); findOrInsertDependenceList( fileName ).insert( file, dep ); m_currentParsedFile->addIncludeFile( file, 0, dep.second == Dep_Local ); - if ( !QFile::exists( file ) ) { + if ( !TQFile::exists( file ) ) { Problem p( i18n( "Could not find include file %1" ).arg( dep.first ), lexer ? lexer->currentLine() : -1, lexer ? lexer->currentColumn() : -1, Problem::Level_Warning ); @@ -391,7 +391,7 @@ void Driver::addDependence( const QString & fileName, const Dependence & dep ) { } if( m_currentLexerCache ) - m_currentLexerCache->addIncludeFile( file, QDateTime() ); ///The time will be overwritten in CachedLexedFile::merge(...) + m_currentLexerCache->addIncludeFile( file, TQDateTime() ); ///The time will be overwritten in CachedLexedFile::merge(...) /**What should be done: * 1. Lex the file to get all the macros etc. @@ -428,7 +428,7 @@ void Driver::addDependence( const QString & fileName, const Dependence & dep ) { h.parse(); } -void Driver::addProblem( const QString & fileName, const Problem & problem ) { +void Driver::addProblem( const TQString & fileName, const Problem & problem ) { Problem p( problem ); p.setFileName( fileName ); @@ -438,31 +438,31 @@ void Driver::addProblem( const QString & fileName, const Problem & problem ) { findOrInsertProblemList( m_currentMasterFileName ).append( problem ); } -QMap< QString, Dependence >& Driver::findOrInsertDependenceList( const QString & fileName ) { - QMap >::Iterator it = m_dependences.find( fileName ); +TQMap< TQString, Dependence >& Driver::findOrInsertDependenceList( const TQString & fileName ) { + TQMap >::Iterator it = m_dependences.find( fileName ); if ( it != m_dependences.end() ) return it.data(); - QMap l; + TQMap l; m_dependences.insert( deepCopy( fileName ), l ); return m_dependences[ fileName ]; } -QValueList < Problem >& Driver::findOrInsertProblemList( const QString & fileName ) { - QMap >::Iterator it = m_problems.find( fileName ); +TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName ) { + TQMap >::Iterator it = m_problems.find( fileName ); if ( it != m_problems.end() ) return it.data(); - QValueList l; + TQValueList l; m_problems.insert( fileName, l ); return m_problems[ fileName ]; } -QMap< QString, Dependence > Driver::dependences( const QString & fileName ) const { - QMap >::ConstIterator it = m_dependences.find( fileName ); +TQMap< TQString, Dependence > Driver::dependences( const TQString & fileName ) const { + TQMap >::ConstIterator it = m_dependences.find( fileName ); if ( it != m_dependences.end() ) return it.data(); - return QMap(); + return TQMap(); } const Driver::MacroMap& Driver::macros() const { @@ -475,11 +475,11 @@ void Driver::insertMacros( const MacroSet& macros ) { } } -QValueList < Problem > Driver::problems( const QString & fileName ) const { - QMap >::ConstIterator it = m_problems.find( fileName ); +TQValueList < Problem > Driver::problems( const TQString & fileName ) const { + TQMap >::ConstIterator it = m_problems.find( fileName ); if ( it != m_problems.end() ) return it.data(); - return QValueList(); + return TQValueList(); } void Driver::clearMacros() { @@ -497,9 +497,9 @@ void Driver::clearParsedMacros() { } } -void Driver::parseFile( const QString& fileName, bool onlyPreProcess, bool force , bool macrosGlobal ) +void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool force , bool macrosGlobal ) { - QString oldMasterFileName = m_currentMasterFileName; + TQString oldMasterFileName = m_currentMasterFileName; m_currentMasterFileName = fileName; //if( isResolveDependencesEnabled() ) @@ -510,7 +510,7 @@ void Driver::parseFile( const QString& fileName, bool onlyPreProcess, bool force //Remove the problems now instead of in ParseHelper, because this way the problems reported by getCustomIncludePath(...) will not be discarded m_problems.remove( fileName ); - QStringList oldIncludePaths = m_includePaths; + TQStringList oldIncludePaths = m_includePaths; m_includePaths = getCustomIncludePath( fileName ); ParseHelper p( fileName, force, this ); @@ -520,7 +520,7 @@ void Driver::parseFile( const QString& fileName, bool onlyPreProcess, bool force if( macrosGlobal ) { for( MacroMap::iterator it = m_macros.begin(); it != m_macros.end(); ++it) { if( (*it).second.fileName() == fileName ) { - (*it).second.setFileName( QString::null ); + (*it).second.setFileName( TQString::null ); } } } @@ -665,49 +665,49 @@ void Driver::clearIncludePaths() { m_includePaths.clear(); } -void Driver::addIncludePath( const QString &path ) { +void Driver::addIncludePath( const TQString &path ) { if ( !path.stripWhiteSpace().isEmpty() ) m_includePaths << path; } -QString Driver::findIncludeFile( const Dependence& dep, const QString& fromFile ) { - QString fileName = dep.first; +TQString Driver::findIncludeFile( const Dependence& dep, const TQString& fromFile ) { + TQString fileName = dep.first; if ( dep.second == Dep_Local ) { - QString path = QFileInfo( fromFile ).dirPath( true ); - QFileInfo fileInfo( QFileInfo( path, fileName ) ); + TQString path = TQFileInfo( fromFile ).dirPath( true ); + TQFileInfo fileInfo( TQFileInfo( path, fileName ) ); if ( fileInfo.exists() && fileInfo.isFile() ) return fileInfo.absFilePath(); } - QStringList includePaths = getCustomIncludePath( fromFile ); + TQStringList includePaths = getCustomIncludePath( fromFile ); - for ( QStringList::ConstIterator it = includePaths.begin(); it != includePaths.end(); ++it ) { - QFileInfo fileInfo( *it, fileName ); + for ( TQStringList::ConstIterator it = includePaths.begin(); it != includePaths.end(); ++it ) { + TQFileInfo fileInfo( *it, fileName ); if ( fileInfo.exists() && fileInfo.isFile() ) return fileInfo.absFilePath(); } - return QString::null; + return TQString::null; } -QString Driver::findIncludeFile( const Dependence& dep ) const { - QString fileName = dep.first; +TQString Driver::findIncludeFile( const Dependence& dep ) const { + TQString fileName = dep.first; if ( dep.second == Dep_Local ) { - QString path = QFileInfo( currentFileName() ).dirPath( true ); - QFileInfo fileInfo( QFileInfo( path, fileName ) ); + TQString path = TQFileInfo( currentFileName() ).dirPath( true ); + TQFileInfo fileInfo( TQFileInfo( path, fileName ) ); if ( fileInfo.exists() && fileInfo.isFile() ) return fileInfo.absFilePath(); } - for ( QStringList::ConstIterator it = m_includePaths.begin(); it != m_includePaths.end(); ++it ) { - QFileInfo fileInfo( *it, fileName ); + for ( TQStringList::ConstIterator it = m_includePaths.begin(); it != m_includePaths.end(); ++it ) { + TQFileInfo fileInfo( *it, fileName ); if ( fileInfo.exists() && fileInfo.isFile() ) return fileInfo.absFilePath(); } - return QString::null; + return TQString::null; } void Driver::setResolveDependencesEnabled( bool enabled ) { @@ -742,7 +742,7 @@ void Driver::usingMacro( const Macro& macro ) { // // m_valueHash = 27 * ( HashedString::hashString( m_body ) + (m_isUndefMacro ? 1 : 0 ) ); // -// for( QValueList::const_iterator it = m_argumentList.begin(); it != m_argumentList.end(); ++it ) { +// for( TQValueList::const_iterator it = m_argumentList.begin(); it != m_argumentList.end(); ++it ) { // a *= 19; // m_valueHash += a * HashedString::hashString( *it ); // } @@ -793,7 +793,7 @@ void MacroSet::computeHash() const { } } -// void MacroSet::read( QDataStream& stream ) { +// void MacroSet::read( TQDataStream& stream ) { // stream >> m_idHashValid >> m_idHash >> m_valueHashValid >> m_valueHash; // int cnt; // stream >> cnt; @@ -805,7 +805,7 @@ void MacroSet::computeHash() const { // } // } // -// void MacroSet::write( QDataStream& stream ) const { +// void MacroSet::write( TQDataStream& stream ) const { // stream << m_idHashValid << m_idHash << m_valueHashValid << m_valueHash; // stream << m_usedMacros.size(); // for( Macros::const_iterator it = m_usedMacros.begin(); it != m_usedMacros.end(); ++it ) { @@ -824,33 +824,33 @@ const MacroSet& ParsedFile::usedMacros() const { return m_usedMacros; } -ParsedFile::ParsedFile( const QString& fileName, const QDateTime& timeStamp ) : m_translationUnit( 0 ), m_fileName( fileName ), m_timeStamp( timeStamp ) { +ParsedFile::ParsedFile( const TQString& fileName, const TQDateTime& timeStamp ) : m_translationUnit( 0 ), m_fileName( fileName ), m_timeStamp( timeStamp ) { m_includeFiles.insert( fileName ); } -ParsedFile::ParsedFile( const QByteArray& array ) { - QBuffer b( array ); - QDataStream d( &b ); +ParsedFile::ParsedFile( const TQByteArray& array ) { + TQBuffer b( array ); + TQDataStream d( &b ); read( d ); } -QString ParsedFile::includedFrom() const { +TQString ParsedFile::includedFrom() const { return m_includedFrom; } -void ParsedFile::setIncludedFrom( const QString& str ) { +void ParsedFile::setIncludedFrom( const TQString& str ) { m_includedFrom = str; } -QByteArray ParsedFile::serialize() const { - QByteArray array; - QBuffer b( array ); - QDataStream d( &b ); +TQByteArray ParsedFile::serialize() const { + TQByteArray array; + TQBuffer b( array ); + TQDataStream d( &b ); write( d ); return array; } -// void ParsedFile::read( QDataStream& stream ) { +// void ParsedFile::read( TQDataStream& stream ) { // int directIncludeFilesCount; // stream >> directIncludeFilesCount; // m_directIncludeFiles.clear(); @@ -868,8 +868,8 @@ QByteArray ParsedFile::serialize() const { // m_includeFiles.read( stream ); // } // -// void ParsedFile::write( QDataStream& stream ) const { -// for( QValueList::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) { +// void ParsedFile::write( TQDataStream& stream ) const { +// for( TQValueList::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) { // stream << (*it).local; // stream << (*it).includePath; // } @@ -904,11 +904,11 @@ const HashedStringSet& ParsedFile::includeFiles() const { return m_includeFiles; } -QString ParsedFile::fileName() const { +TQString ParsedFile::fileName() const { return m_fileName; } -QDateTime ParsedFile::timeStamp() const { +TQDateTime ParsedFile::timeStamp() const { return m_timeStamp; } @@ -916,7 +916,7 @@ void ParsedFile::addIncludeFiles( const HashedStringSet& includeFiles ) { m_includeFiles += includeFiles; } -void ParsedFile::addIncludeFile( const QString& includePath, const ParsedFilePointer& parsed, bool localInclude ) { +void ParsedFile::addIncludeFile( const TQString& includePath, const ParsedFilePointer& parsed, bool localInclude ) { m_includeFiles.insert( includePath ); if( parsed ) m_includeFiles += parsed->includeFiles(); @@ -927,11 +927,11 @@ void ParsedFile::addIncludeFile( const QString& includePath, const ParsedFilePoi m_directIncludeFiles << d; } -const QValueList& ParsedFile::directIncludeFiles() const { +const TQValueList& ParsedFile::directIncludeFiles() const { return m_directIncludeFiles; } -bool MacroSet::hasMacro( const QString& name ) const { +bool MacroSet::hasMacro( const TQString& name ) const { Macros::const_iterator it = m_usedMacros.find( Macro( name, "" ) ); if( it != m_usedMacros.end() ) { return true; @@ -949,7 +949,7 @@ bool MacroSet::hasMacro( const HashedString& name ) const { } } -Macro MacroSet::macro( const QString& name ) const { +Macro MacroSet::macro( const TQString& name ) const { Macros::const_iterator it = m_usedMacros.find( Macro( name, "" ) ); if( it != m_usedMacros.end() ) { diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h index 826375e3..3c12d34c 100644 --- a/lib/cppparser/driver.h +++ b/lib/cppparser/driver.h @@ -23,14 +23,14 @@ #include "ast.h" #include "macro.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -49,7 +49,7 @@ enum Dep_Local }; -typedef QPair Dependence; +typedef QPair Dependence; class ParsedFile; typedef KSharedPtr< ParsedFile > ParsedFilePointer; @@ -58,19 +58,19 @@ class ParsedFile : public AbstractParseResult { public: struct IncludeDesc { bool local; //Whether it is a local include(#include "local.h", not #include ) - QString includePath; + TQString includePath; ParsedFilePointer parsed; //May be zero! }; // ParsedFile() { // } - ParsedFile( QDataStream& s ) { + ParsedFile( TQDataStream& s ) { read( s ); } - ParsedFile( const QString& fileName, const QDateTime& timeStamp ); + ParsedFile( const TQString& fileName, const TQDateTime& timeStamp ); ///Deserializes the ParsedFile from a previous call to serialize(). AST will always be zero after a call to this. - ParsedFile( const QByteArray& array ); + ParsedFile( const TQByteArray& array ); /** * @return All Macros that were used while processing this translation-unit. May be modified. @@ -93,16 +93,16 @@ class ParsedFile : public AbstractParseResult { void addIncludeFiles( const HashedStringSet& includeFiles ); - void addIncludeFile( const QString& includePath, const ParsedFilePointer& parsed, bool localInclude ); + void addIncludeFile( const TQString& includePath, const ParsedFilePointer& parsed, bool localInclude ); ///If this file was parsed while resolving the dependencies of another file, this returns the file this one was included from. Else returns an empty string. - QString includedFrom() const; + TQString includedFrom() const; - void setIncludedFrom( const QString& str ); + void setIncludedFrom( const TQString& str ); /** * @return Reference to the internal list of all directly included files(without those included indirectly) */ - const QValueList& directIncludeFiles() const; + const TQValueList& directIncludeFiles() const; operator TranslationUnitAST* () const; //May be zero! @@ -113,17 +113,17 @@ class ParsedFile : public AbstractParseResult { void setTranslationUnit( const TranslationUnitAST::Node& trans ); - QString fileName() const; + TQString fileName() const; - QDateTime timeStamp() const; + TQDateTime timeStamp() const; ///Serializes the content of this class into a byte-array. Note that this does not serialize the AST. - QByteArray serialize() const; + TQByteArray serialize() const; - /*void read( QDataStream& stream ); - void write( QDataStream& stream ) const;*/ + /*void read( TQDataStream& stream ); + void write( TQDataStream& stream ) const;*/ - virtual void read( QDataStream& stream ) { + virtual void read( TQDataStream& stream ) { int directIncludeFilesCount; stream >> directIncludeFilesCount; m_directIncludeFiles.clear(); @@ -145,10 +145,10 @@ class ParsedFile : public AbstractParseResult { m_includeFiles.read( stream ); } - virtual void write( QDataStream& stream ) const { + virtual void write( TQDataStream& stream ) const { int i = m_directIncludeFiles.size(); stream << i; - for( QValueList::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) { + for( TQValueList::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) { Q_INT8 i = (*it).local; stream << i; stream << (*it).includePath; @@ -166,14 +166,14 @@ class ParsedFile : public AbstractParseResult { } private: - QValueList m_directIncludeFiles; + TQValueList m_directIncludeFiles; MacroSet m_usedMacros; TranslationUnitAST::Node m_translationUnit; HashedStringSet m_includeFiles; int m_skippedLines; - QString m_fileName; - QDateTime m_timeStamp; - QString m_includedFrom; + TQString m_fileName; + TQDateTime m_timeStamp; + TQString m_includedFrom; }; /** @@ -188,9 +188,9 @@ class SourceProvider { * Get the contents of a file * \param fileName The name of the file to get the contents for. An absolute * path should be used. - * \return A QString that contains the contents of the file + * \return A TQString that contains the contents of the file */ - virtual QString contents( const QString& fileName ) = 0; + virtual TQString contents( const TQString& fileName ) = 0; /** * Check to see if a file has been modified @@ -199,7 +199,7 @@ class SourceProvider { * \return true if the file has been modified * \return false if the file has not been modified */ - virtual bool isModified( const QString& fileName ) = 0; + virtual bool isModified( const TQString& fileName ) = 0; private: SourceProvider( const SourceProvider& source ); @@ -239,7 +239,7 @@ class Driver { * @param force Force the parsing of the file. Defaults to false * @param macrosGlobal Should the macros be global? (Global macros are not deleted once a new translation-unit is parsed) */ - virtual void parseFile( const QString& fileName, bool onlyPreProcesss = false, bool force = false, bool macrosGlobal = false ); + virtual void parseFile( const TQString& fileName, bool onlyPreProcesss = false, bool force = false, bool macrosGlobal = false ); /** * Indicates that the file has been parsed @@ -252,14 +252,14 @@ class Driver { * @param fileName The name of the file to remove */ virtual void remove - ( const QString& fileName ); + ( const TQString& fileName ); /** * Add a dependency on another header file for @p fileName * @param fileName The file name to add the dependency for * @param dep The dependency to add */ - virtual void addDependence( const QString& fileName, const Dependence& dep ); + virtual void addDependence( const TQString& fileName, const Dependence& dep ); /** * Add a macro to the driver @@ -272,15 +272,15 @@ class Driver { * @param fileName The file name to add the problem for * @param problem The problem to add */ - virtual void addProblem( const QString& fileName, const Problem& problem ); + virtual void addProblem( const TQString& fileName, const Problem& problem ); /** * The current file name the driver is working with */ - QString currentFileName() const { + TQString currentFileName() const { return m_currentFileName; } - ParsedFilePointer takeTranslationUnit( const QString& fileName ); + ParsedFilePointer takeTranslationUnit( const TQString& fileName ); void takeTranslationUnit( const ParsedFile& file ); /** @@ -289,13 +289,13 @@ class Driver { * @return The TranslationUnitAST pointer that represents the translation unit * @return 0 if no translation unit exists for the file */ - ParsedFilePointer translationUnit( const QString& fileName ) const; + ParsedFilePointer translationUnit( const TQString& fileName ) const; /** * Get the dependencies for a file * @param fileName The file name to get dependencies for * @return The dependencies for the file */ - QMap dependences( const QString& fileName ) const; + TQMap dependences( const TQString& fileName ) const; /** * Get all the macros the driver contains * @return The macros @@ -310,7 +310,7 @@ class Driver { * @param fileName The filename to get problems for * @return The list of problems for @p fileName */ - QValueList problems( const QString& fileName ) const; + TQValueList problems( const TQString& fileName ) const; void usingString( const HashedString& str ); /** @@ -346,21 +346,21 @@ class Driver { * Remove all macros from the driver for a certain file * @param fileName The file name */ - virtual void removeAllMacrosInFile( const QString& fileName ); ///Check when this is called. It may be wrong. + virtual void removeAllMacrosInFile( const TQString& fileName ); ///Check when this is called. It may be wrong. - QStringList includePaths() const { + TQStringList includePaths() const { return m_includePaths; } - virtual QStringList getCustomIncludePath( const QString& ); + virtual TQStringList getCustomIncludePath( const TQString& ); - virtual void addIncludePath( const QString &path ); + virtual void addIncludePath( const TQString &path ); virtual void clearIncludePaths(); /// @todo remove - const QMap &parsedUnits() const { + const TQMap &parsedUnits() const { return m_parsedUnits; } @@ -391,11 +391,11 @@ class Driver { LexerCache* lexerCache(); ///This uses getCustomIncludePath(..) to resolve the include-path internally - QString findIncludeFile( const Dependence& dep, const QString& fromFile ); + TQString findIncludeFile( const Dependence& dep, const TQString& fromFile ); protected: ///This uses the state of the parser to find the include-file - QString findIncludeFile( const Dependence& dep ) const; + TQString findIncludeFile( const Dependence& dep ) const; /** * Set up the lexer. @@ -423,20 +423,20 @@ class Driver { void clearParsedMacros(); private: - QMap& findOrInsertDependenceList( const QString& fileName ); - QValueList& findOrInsertProblemList( const QString& fileName ); + TQMap& findOrInsertDependenceList( const TQString& fileName ); + TQValueList& findOrInsertProblemList( const TQString& fileName ); private: - QString m_currentFileName; - QString m_currentMasterFileName; - typedef QMap DependenceMap; - typedef QMap< QString, DependenceMap> DependencesMap; + TQString m_currentFileName; + TQString m_currentMasterFileName; + typedef TQMap DependenceMap; + typedef TQMap< TQString, DependenceMap> DependencesMap; DependencesMap m_dependences; MacroMap m_macros; - QMap< QString, QValueList > m_problems; - QMap m_parsedUnits; - QStringList m_includePaths; + TQMap< TQString, TQValueList > m_problems; + TQMap m_parsedUnits; + TQStringList m_includePaths; uint depresolv : 1; Lexer *lexer; diff --git a/lib/cppparser/errors.h b/lib/cppparser/errors.h index 813d3a3f..6751475e 100644 --- a/lib/cppparser/errors.h +++ b/lib/cppparser/errors.h @@ -20,15 +20,15 @@ #ifndef ERRORS_H #define ERRORS_H -#include +#include struct Error{ int code; int level; - QString text; + TQString text; - Error( int c, int l, const QString& s ) + Error( int c, int l, const TQString& s ) : code( c ), level( l ), text( s ) {} }; diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index 3f2ec712..97fe0dc0 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -23,12 +23,12 @@ #include #include -#include -#include -#include +#include +#include +#include #if defined( KDEVELOP_BGPARSER ) -#include +#include class KDevTread: public QThread { @@ -53,8 +53,8 @@ using namespace std; struct LexerData { - typedef QMap Scope; - typedef QValueList StaticChain; + typedef TQMap Scope; + typedef TQValueList StaticChain; StaticChain staticChain; @@ -69,13 +69,13 @@ struct LexerData staticChain.pop_front(); } - void bind( const QString& name, const QString& value ) + void bind( const TQString& name, const TQString& value ) { Q_ASSERT( staticChain.size() > 0 ); staticChain.front().insert( name, value ); } - bool hasBind( const QString& name ) const + bool hasBind( const TQString& name ) const { StaticChain::ConstIterator it = staticChain.begin(); while( it != staticChain.end() ){ @@ -89,7 +89,7 @@ struct LexerData return false; } - QString apply( const QString& name ) const + TQString apply( const TQString& name ) const { StaticChain::ConstIterator it = staticChain.begin(); while( it != staticChain.end() ){ @@ -100,7 +100,7 @@ struct LexerData return scope[ name ]; } - return QString::null; + return TQString::null; } }; @@ -126,7 +126,7 @@ Lexer::~Lexer() delete( d ); } -void Lexer::setSource( const QString& source ) +void Lexer::setSource( const TQString& source ) { reset(); m_source = source; @@ -136,7 +136,7 @@ void Lexer::setSource( const QString& source ) if( !source.isEmpty() ) { m_currentChar = m_source[0]; } else { - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } tokenize(); @@ -152,7 +152,7 @@ void Lexer::reset() m_index = 0; m_size = 0; m_tokens.clear(); - m_source = QString::null; + m_source = TQString::null; m_ptr = 0; m_endPtr = 0; m_startLine = false; @@ -169,12 +169,12 @@ void Lexer::reset() // ### should all be done with a "long" type IMO int Lexer::toInt( const Token& token ) { - QString s = token.text(); + TQString s = token.text(); if( token.type() == Token_number_literal ){ // hex literal ? if( s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) return s.mid( 2 ).toInt( 0, 16 ); - QString n; + TQString n; int i = 0; while( i < int(s.length()) && s[i].isDigit() ) n += s[i++]; @@ -220,8 +220,8 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) int startLine = m_currentLine; int startColumn = m_currentColumn; - QChar ch = currentChar(); - QChar ch1 = peekChar(); + TQChar ch = currentChar(); + TQChar ch1 = peekChar(); if( ch.isNull() || ch.isSpace() ){ /* skip */ @@ -233,7 +233,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) int start = currentPosition(); readIdentifier(); // read the directive - QString directive = m_source.mid( start, currentPosition() - start ); + TQString directive = m_source.mid( start, currentPosition() - start ); handleDirective( directive ); } else if( m_startLine && m_skipping[ m_ifLevel ] ){ @@ -301,7 +301,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) Macro m = m_driver->macro( ide ); m_driver->usingMacro( m ); - QString ellipsisArg; + TQString ellipsisArg; if( m.hasArguments() ){ int endIde = currentPosition(); @@ -314,11 +314,11 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) while( currentChar() && argIdxbind( argName, arg ); @@ -363,7 +363,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) // tokenize the macro body - QString textToInsert; + TQString textToInsert; setEndPtr( offset( currentPosition() + m.body().length() ) ); @@ -383,24 +383,24 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) if( tok == Token_eof ) break; - QString tokText = tok.text(); + TQString tokText = tok.text(); HashedString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText; if( str == ide ){ //Problem p( i18n("unsafe use of macro '%1', macro is ignored").arg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); - // str = QString::null; + // str = TQString::null; } if( stringify ) { - textToInsert.append( QString::fromLatin1("\"") + str.str() + QString::fromLatin1("\" ") ); + textToInsert.append( TQString::fromLatin1("\"") + str.str() + TQString::fromLatin1("\" ") ); } else if( merge ){ textToInsert.truncate( textToInsert.length() - 1 ); - textToInsert.append( str.str() + QString::fromLatin1(" ") ); + textToInsert.append( str.str() + TQString::fromLatin1(" ") ); } else if( tok == Token_ellipsis && d->hasBind("...") ){ textToInsert.append( ellipsisArg ); } else { - textToInsert.append( str.str() + QString::fromLatin1(" ") ); + textToInsert.append( str.str() + TQString::fromLatin1(" ") ); } } @@ -419,7 +419,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); } else if( m_skipWordsEnabled ){ - __gnu_cxx::hash_map< HashedString, QPair >::iterator pos = m_words.find( ide ); + __gnu_cxx::hash_map< HashedString, QPair >::iterator pos = m_words.find( ide ); if( pos != m_words.end() ){ if( (*pos).second.first == SkipWordAndArguments ){ readWhiteSpaces(); @@ -430,7 +430,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) #if defined( KDEVELOP_BGPARSER ) qthread_yield(); #endif - insertCurrent( QString(" ") + (*pos).second.second + QString(" ") ); + insertCurrent( TQString(" ") + (*pos).second.second + TQString(" ") ); } } else if( /*qt_rx.exactMatch(ide) ||*/ ide.str().endsWith("EXPORT") || @@ -512,7 +512,7 @@ void Lexer::resetSkipWords() m_words.clear(); } -void Lexer::addSkipWord( const QString& word, SkipType skipType, const QString& str ) +void Lexer::addSkipWord( const TQString& word, SkipType skipType, const TQString& str ) { m_words[ word ] = qMakePair( skipType, str ); } @@ -541,17 +541,17 @@ void Lexer::skip( int l, int r ) m_currentColumn = svCurrentColumn; } -QString Lexer::readArgument() +TQString Lexer::readArgument() { int count = 0; - QString arg; + TQString arg; readWhiteSpaces(); while( currentChar() ){ readWhiteSpaces(); - QChar ch = currentChar(); + TQChar ch = currentChar(); if( ch.isNull() || (!count && (ch == ',' || ch == ')')) ) break; @@ -572,7 +572,7 @@ QString Lexer::readArgument() return arg.stripWhiteSpace(); } -void Lexer::handleDirective( const QString& directive ) +void Lexer::handleDirective( const TQString& directive ) { m_inPreproc = true; @@ -651,7 +651,7 @@ void Lexer::processDefine( Macro& m ) int startMacroName = currentPosition(); readIdentifier(); - QString macroName = m_source.mid( startMacroName, int(currentPosition()-startMacroName) ); + TQString macroName = m_source.mid( startMacroName, int(currentPosition()-startMacroName) ); m.setName( macroName ); if( currentChar() == '(' ){ @@ -670,7 +670,7 @@ void Lexer::processDefine( Macro& m ) else readIdentifier(); - QString arg = m_source.mid( startArg, int(currentPosition()-startArg) ); + TQString arg = m_source.mid( startArg, int(currentPosition()-startArg) ); m.addArgument( Macro::Argument(arg) ); @@ -687,7 +687,7 @@ void Lexer::processDefine( Macro& m ) setPreprocessorEnabled( true ); - QString body; + TQString body; while( currentChar() && currentChar() != '\n' ){ if( currentChar().isSpace() ){ @@ -700,7 +700,7 @@ void Lexer::processDefine( Macro& m ) //Do not ignore c-style comments, those may be useful in the body, and ignoring them using this check causes problems if( tk.type() != -1 && (tk.type() != Token_comment || ( tk.text().length() >= 2 && tk.text()[1] == '*') ) ){ - QString s = tk.text(); + TQString s = tk.text(); body += s; } } @@ -792,16 +792,16 @@ void Lexer::processInclude() readWhiteSpaces( false ); if( currentChar() ){ - QChar ch = currentChar(); + TQChar ch = currentChar(); if( ch == '"' || ch == '<' ){ nextChar(); - QChar ch2 = ch == QChar('"') ? QChar('"') : QChar('>'); + TQChar ch2 = ch == TQChar('"') ? TQChar('"') : TQChar('>'); int startWord = currentPosition(); while( currentChar() && currentChar() != ch2 ) nextChar(); if( currentChar() ){ - QString word = m_source.mid( startWord, int(currentPosition()-startWord) ); + TQString word = m_source.mid( startWord, int(currentPosition()-startWord) ); m_driver->addDependence( m_driver->currentFileName(), Dependence(word, ch == '"' ? Dep_Local : Dep_Global) ); nextChar(); @@ -815,7 +815,7 @@ void Lexer::processUndef() readWhiteSpaces(); int startWord = currentPosition(); readIdentifier(); - QString word = m_source.mid( startWord, currentPosition() - startWord ); + TQString word = m_source.mid( startWord, currentPosition() - startWord ); Macro m( word, "" ); m.setFileName( m_driver->currentFileName() ); @@ -845,7 +845,7 @@ int Lexer::macroPrimary() case '!': case '~': { - QChar tk = currentChar(); + TQChar tk = currentChar(); nextChar(); int result = macroPrimary(); if( tk == '-' ) return -result; @@ -1003,7 +1003,7 @@ int Lexer::macroLogicalAnd() nextChar( 2 ); int start = currentPosition(); result = macroBoolOr() && result; - QString s = m_source.mid( start, currentPosition() - start ); + TQString s = m_source.mid( start, currentPosition() - start ); } return result; } @@ -1026,7 +1026,7 @@ int Lexer::macroExpression() } // *IMPORTANT* -// please, don't include lexer.moc here, because Lexer isn't a QObject class!! +// please, don't include lexer.moc here, because Lexer isn't a TQObject class!! // if you have problem while recompiling try to remove cppsupport/.deps, // cppsupport/Makefile.in and rerun automake/autoconf diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index 08681a4d..a94e5c5e 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -22,11 +22,11 @@ #include "driver.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -151,8 +151,8 @@ struct LexerData; class Token { - Token(const QString &); - Token( int type, int position, int length, const QString& text ); + Token(const TQString &); + Token( int type, int position, int length, const TQString& text ); Token( const Token& source ); Token& operator = ( const Token& source ); @@ -176,7 +176,7 @@ public: int position() const; void setPosition( int position ); - QString text() const; + TQString text() const; private: int m_type; @@ -186,7 +186,7 @@ private: int m_startColumn; int m_endLine; int m_endColumn; - const QString & m_text; + const TQString & m_text; friend class Lexer; friend class Parser; @@ -217,10 +217,10 @@ public: void setPreprocessorEnabled( bool enabled ); void resetSkipWords(); - void addSkipWord( const QString& word, SkipType skipType=SkipWord, const QString& str = QString::null ); + void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString::null ); - QString source() const; - void setSource( const QString& source ); + TQString source() const; + void setSource( const TQString& source ); int index() const; void setIndex( int index ); @@ -246,23 +246,23 @@ public: return m_source.unicode() + offset; } - inline int getOffset( const QChar* p ) const { + inline int getOffset( const TQChar* p ) const { return int(p - (m_source.unicode())); } private: - void setEndPtr( const QChar* c ) { + void setEndPtr( const TQChar* c ) { m_endPtr = c; if( m_ptr < m_endPtr ) m_currentChar = *m_ptr; else - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } - const QChar currentChar() const; - QChar peekChar( int n=1 ) const; + const TQChar currentChar() const; + TQChar peekChar( int n=1 ) const; int currentPosition() const; - void insertCurrent( const QString& str ); + void insertCurrent( const TQString& str ); void tokenize(); void nextToken( Token& token, bool stopOnNewline=false ); @@ -284,7 +284,7 @@ private: // preprocessor (based on an article of Al Stevens on Dr.Dobb's journal) int testIfLevel(); int macroDefined(); - QString readArgument(); + TQString readArgument(); int macroPrimary(); int macroMultiplyDivide(); @@ -298,7 +298,7 @@ private: int macroLogicalOr(); int macroExpression(); - void handleDirective( const QString& directive ); + void handleDirective( const TQString& directive ); void processDefine( Macro& macro ); void processElse(); void processElif(); @@ -312,17 +312,17 @@ private: private: LexerData* d; Driver* m_driver; - QPtrVector< Token > m_tokens; + TQPtrVector< Token > m_tokens; int m_size; int m_index; - QString m_source; - const QChar* m_ptr; - const QChar* m_endPtr; - QChar m_currentChar; + TQString m_source; + const TQChar* m_ptr; + const TQChar* m_endPtr; + TQChar m_currentChar; bool m_recordComments; bool m_recordWhiteSpaces; bool m_startLine; - __gnu_cxx::hash_map< HashedString, QPair > m_words; + __gnu_cxx::hash_map< HashedString, QPair > m_words; int m_skippedLines; @@ -331,8 +331,8 @@ private: bool m_skipWordsEnabled; // preprocessor - QMemArray m_skipping; - QMemArray m_trueTest; + TQMemArray m_skipping; + TQMemArray m_trueTest; int m_ifLevel; bool m_preprocessorEnabled; bool m_inPreproc; @@ -346,7 +346,7 @@ private: }; -inline Token::Token(const QString & text = "") +inline Token::Token(const TQString & text = "") : m_type( -1 ), m_position( 0 ), m_length( 0 ), @@ -354,7 +354,7 @@ inline Token::Token(const QString & text = "") { } -inline Token::Token( int type, int position, int length, const QString& text ) +inline Token::Token( int type, int position, int length, const TQString& text ) : m_type( type ), m_position( position ), m_length( length ), @@ -424,7 +424,7 @@ inline int Token::position() const return m_position; } -inline QString Token::text() const +inline TQString Token::text() const { return m_text.mid(m_position, m_length); } @@ -488,7 +488,7 @@ inline void Lexer::setRecordWhiteSpaces( bool record ) m_recordWhiteSpaces = record; } -inline QString Lexer::source() const +inline TQString Lexer::source() const { return m_source; } @@ -540,7 +540,7 @@ inline void Lexer::nextChar() if( m_ptr < m_endPtr ) m_currentChar = *m_ptr; else - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } inline void Lexer::nextChar( int n ) @@ -551,7 +551,7 @@ inline void Lexer::nextChar( int n ) if( m_ptr < m_endPtr ) m_currentChar = *m_ptr; else - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } inline void Lexer::readIdentifier() @@ -563,7 +563,7 @@ inline void Lexer::readIdentifier() inline void Lexer::readWhiteSpaces( bool skipNewLine, bool skipOnlyOnce ) { while( !currentChar().isNull() ){ - QChar ch = currentChar(); + TQChar ch = currentChar(); if( ch == '\n' && !skipNewLine ){ break; @@ -582,7 +582,7 @@ inline void Lexer::readWhiteSpaces( bool skipNewLine, bool skipOnlyOnce ) } //little hack for better performance -inline bool isTodo( const QString& txt, int position ) { +inline bool isTodo( const TQString& txt, int position ) { if( txt.length() < position + 4 ) return false; return (txt[ position ] == 't' || txt[ position ] == 'T') && (txt[ position+1 ] == 'o' || txt[ position+1 ] == 'O') @@ -590,7 +590,7 @@ inline bool isTodo( const QString& txt, int position ) { && (txt[ position+3 ] == 'o' || txt[ position+3 ] == 'O'); } -inline bool isFixme( const QString& txt, int position ) { +inline bool isFixme( const TQString& txt, int position ) { if( txt.length() < position + 5 ) return false; return (txt[ position ] == 'f' || txt[ position ] == 'F') && (txt[ position+1 ] == 'i' || txt[ position+1 ] == 'I') @@ -604,7 +604,7 @@ inline void Lexer::readLineComment() while( !currentChar().isNull() && currentChar() != '\n' ){ if( m_reportMessages && isTodo( m_source, currentPosition() ) ){ nextChar( 4 ); - QString msg; + TQString msg; int line = m_currentLine; int col = m_currentColumn; @@ -621,7 +621,7 @@ inline void Lexer::readLineComment() } else if( m_reportMessages && isFixme( m_source, currentPosition() ) ){ nextChar( 5 ); - QString msg; + TQString msg; int line = m_currentLine; int col = m_currentColumn; @@ -648,7 +648,7 @@ inline void Lexer::readMultiLineComment() return; } else if( m_reportMessages && isTodo( m_source, currentPosition() ) ){ nextChar( 4 ); - QString msg; + TQString msg; int line = m_currentLine; int col = m_currentColumn; @@ -664,7 +664,7 @@ inline void Lexer::readMultiLineComment() } else if( m_reportMessages && isFixme( m_source, currentPosition() ) ) { nextChar( 5 ); - QString msg; + TQString msg; int line = m_currentLine; int col = m_currentColumn; @@ -742,7 +742,7 @@ inline int Lexer::findOperator3() const int n = getOffset( m_endPtr ) - currentPosition(); if( n >= 3){ - QChar ch = currentChar(), ch1=peekChar(), ch2=peekChar(2); + TQChar ch = currentChar(), ch1=peekChar(), ch2=peekChar(2); if( ch == '<' && ch1 == '<' && ch2 == '=' ) return Token_assign; else if( ch == '>' && ch1 == '>' && ch2 == '=' ) return Token_assign; @@ -758,7 +758,7 @@ inline int Lexer::findOperator2() const int n = getOffset( m_endPtr ) - currentPosition(); if( n>=2 ){ - QChar ch = currentChar(), ch1=peekChar(); + TQChar ch = currentChar(), ch1=peekChar(); if( ch == ':' && ch1 == ':' ) return Token_scope; else if( ch == '.' && ch1 == '*' ) return Token_ptrmem; @@ -812,19 +812,19 @@ inline int Lexer::currentPosition() const return getOffset( m_ptr ); } -inline const QChar Lexer::currentChar() const +inline const TQChar Lexer::currentChar() const { return m_currentChar; } -inline QChar Lexer::peekChar( int n ) const +inline TQChar Lexer::peekChar( int n ) const { - const QChar* p = m_ptr + n; + const TQChar* p = m_ptr + n; if( p < m_endPtr ) return *p; else - return QChar::null; + return TQChar::null; } inline bool Lexer::eof() const @@ -852,7 +852,7 @@ inline void Lexer::setReportMessages( bool enable ) m_reportMessages = enable; } -inline void Lexer::insertCurrent( const QString& str ) { +inline void Lexer::insertCurrent( const TQString& str ) { int posi = currentPosition(); m_source.insert( posi, str ); @@ -861,7 +861,7 @@ inline void Lexer::insertCurrent( const QString& str ) { if( m_ptr < m_endPtr ) m_currentChar = *m_ptr; else - m_currentChar = QChar::null; + m_currentChar = TQChar::null; } #endif diff --git a/lib/cppparser/lexercache.cpp b/lib/cppparser/lexercache.cpp index a7e40dd6..230a7de1 100644 --- a/lib/cppparser/lexercache.cpp +++ b/lib/cppparser/lexercache.cpp @@ -108,7 +108,7 @@ CachedLexedFilePointer LexerCache::lexedFile( const HashedString& fileName ) { return CachedLexedFilePointer(); } -QDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName ) { +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 @@ -117,8 +117,8 @@ QDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName ) } } - QFileInfo fileInfo( fileName.str() ); - m_fileModificationCache[fileName].m_readTime = QDateTime::currentDateTime(); + TQFileInfo fileInfo( fileName.str() ); + m_fileModificationCache[fileName].m_readTime = TQDateTime::currentDateTime(); m_fileModificationCache[fileName].m_modificationTime = fileInfo.lastModified(); return fileInfo.lastModified(); @@ -128,13 +128,13 @@ QDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName ) bool LexerCache::sourceChanged( const CachedLexedFile& file ) { //@todo Check if any of the dependencies changed - QDateTime modTime = fileModificationTimeCached( file.fileName() ); + TQDateTime modTime = fileModificationTimeCached( file.fileName() ); if ( modTime != file.modificationTime() ) return true; - for( QMap::const_iterator it = file.allModificationTimes().begin(); it != file.allModificationTimes().end(); ++it ) { - QDateTime modTime = fileModificationTimeCached( it.key() ); + for( TQMap::const_iterator it = file.allModificationTimes().begin(); it != file.allModificationTimes().end(); ++it ) { + TQDateTime modTime = fileModificationTimeCached( it.key() ); if( modTime != *it ) return true; } @@ -162,7 +162,7 @@ void LexerCache::erase( const CacheNode* node ) { } CachedLexedFile::CachedLexedFile( const HashedString& fileName, LexerCache* manager ) : CacheNode( manager ), m_fileName( fileName ) { - QFileInfo fileInfo( fileName.str() ); + TQFileInfo fileInfo( fileName.str() ); m_modificationTime = fileInfo.lastModified(); m_allModificationTimes[ fileName ] = m_modificationTime; } @@ -184,13 +184,13 @@ void CachedLexedFile::addUsedMacro( const Macro& macro ) { } } -void CachedLexedFile::addIncludeFile( const HashedString& file, const QDateTime& modificationTime ) { +void CachedLexedFile::addIncludeFile( const HashedString& file, const TQDateTime& modificationTime ) { m_includeFiles.insert( file ); m_allModificationTimes[file] = modificationTime; } -QDateTime CachedLexedFile::modificationTime() const { +TQDateTime CachedLexedFile::modificationTime() const { return m_modificationTime; } @@ -198,7 +198,7 @@ void CachedLexedFile::addProblem( const Problem& p ) { m_problems << p; } -QValueList CachedLexedFile::problems() const { +TQValueList CachedLexedFile::problems() const { return m_problems; } @@ -224,7 +224,7 @@ void CachedLexedFile::merge( const CachedLexedFile& file ) { m_definedMacros.merge( file.m_definedMacros ); m_definedMacroNames += file.m_definedMacroNames; - for( QMap::const_iterator it = file.m_allModificationTimes.begin(); it != file.m_allModificationTimes.end(); ++it ) + for( TQMap::const_iterator it = file.m_allModificationTimes.begin(); it != file.m_allModificationTimes.end(); ++it ) m_allModificationTimes[it.key()] = *it; @@ -239,7 +239,7 @@ size_t CachedLexedFile::hash() const { } void LexerCache::initFileModificationCache() { - m_currentDateTime = QDateTime::currentDateTime(); + m_currentDateTime = TQDateTime::currentDateTime(); } void LexerCache::saveMemory() { diff --git a/lib/cppparser/lexercache.h b/lib/cppparser/lexercache.h index c32d5406..662e0270 100644 --- a/lib/cppparser/lexercache.h +++ b/lib/cppparser/lexercache.h @@ -19,8 +19,8 @@ #include #include "macro.h" #include -#include -#include +#include +#include #include #include "cachemanager.h" @@ -43,17 +43,17 @@ class CachedLexedFile : public KShared, public CacheNode { void addUsedMacro( const Macro& macro ); - void addIncludeFile( const HashedString& file, const QDateTime& modificationTime ); + void addIncludeFile( const HashedString& file, const TQDateTime& modificationTime ); inline bool hasString( const HashedString& string ) const { return m_strings[string]; } - QDateTime modificationTime() const; + TQDateTime modificationTime() const; void addProblem( const Problem& p ); - QValueList problems() const; + TQValueList problems() const; //The parameter should be a CachedLexedFile that was lexed AFTER the content of this file void merge( const CachedLexedFile& file ); @@ -81,21 +81,21 @@ class CachedLexedFile : public KShared, public CacheNode { } ///Should contain a modification-time for each include-file - const QMap& allModificationTimes() const { + const TQMap& allModificationTimes() const { return m_allModificationTimes; } private: friend class LexerCache; HashedString m_fileName; - QDateTime m_modificationTime; + TQDateTime m_modificationTime; HashedStringSet m_strings; //Set of all strings that can be affected by macros from outside HashedStringSet m_includeFiles; //Set of all files MacroSet m_usedMacros; //Set of all macros that were used, and were defined outside of this file MacroSet m_definedMacros; //Set of all macros that were defined while lexing this file HashedStringSet m_definedMacroNames; - QValueList m_problems; - QMap m_allModificationTimes; + TQValueList m_problems; + TQMap m_allModificationTimes; /* Needed data: 1. Set of all strings that appear in this file(For memory-reasons they should be taken from a global string-repository, because many will be the same) @@ -140,22 +140,22 @@ class LexerCache : public CacheManager { virtual void saveMemory(); private: ///before this can be called, initFileModificationCache should be called once - QDateTime fileModificationTimeCached( const HashedString& fileName ); + TQDateTime fileModificationTimeCached( const HashedString& fileName ); void initFileModificationCache(); virtual void erase( const CacheNode* node ); bool sourceChanged( const CachedLexedFile& file );///Returns true if the file itself, or any of its dependencies was modified. //typedef __gnu_cxx::hash_multimap CachedLexedFileMap; typedef std::multimap CachedLexedFileMap; CachedLexedFileMap m_files; - __gnu_cxx::hash_set m_totalStringSet; ///This is used to reduce memory-usage: Most strings appear again and again. Because QString is reference-counted, this set contains a unique copy of each string to used for each appearance of the string + __gnu_cxx::hash_set m_totalStringSet; ///This is used to reduce memory-usage: Most strings appear again and again. Because TQString is reference-counted, this set contains a unique copy of each string to used for each appearance of the string struct FileModificationCache { - QDateTime m_readTime; - QDateTime m_modificationTime; + TQDateTime m_readTime; + TQDateTime m_modificationTime; }; typedef __gnu_cxx::hash_map FileModificationMap; FileModificationMap m_fileModificationCache; Driver* m_driver; - QDateTime m_currentDateTime; + TQDateTime m_currentDateTime; }; diff --git a/lib/cppparser/lookup.h b/lib/cppparser/lookup.h index 0fabd010..54bbfeff 100644 --- a/lib/cppparser/lookup.h +++ b/lib/cppparser/lookup.h @@ -21,8 +21,8 @@ #ifndef _LOOKUP_H_ #define _LOOKUP_H_ -#include -#include +#include +#include #include "lexer.h" #include diff --git a/lib/cppparser/macro.h b/lib/cppparser/macro.h index 03e76984..e8fe0b9c 100644 --- a/lib/cppparser/macro.h +++ b/lib/cppparser/macro.h @@ -15,14 +15,14 @@ #ifndef MACRO_H #define MACRO_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -50,12 +50,12 @@ class Problem { Problem( const Problem& source ) : m_text( source.m_text ), m_line( source.m_line ), m_column( source.m_column ), m_level( source.m_level ), m_file( source.m_file ) {} - Problem( const QString& text, int line, int column, int level = Level_Error ) + Problem( const TQString& text, int line, int column, int level = Level_Error ) : m_text( text ), m_line( line ), m_column( column ), m_level( level ) {} Problem( const Problem& source, bool /*threadSafeClone*/ ) - : m_text( QString::fromUtf8( source.m_text.utf8().data() ) ), m_line( source.m_line ), - m_column( source.m_column ), m_level( source.m_level ), m_file( QString::fromUtf8( source.m_file.utf8().data() ) ) {} + : m_text( TQString::fromUtf8( source.m_text.utf8().data() ) ), m_line( source.m_line ), + m_column( source.m_column ), m_level( source.m_level ), m_file( TQString::fromUtf8( source.m_file.utf8().data() ) ) {} Problem& operator = ( const Problem& source ) { m_text = source.m_text; @@ -66,7 +66,7 @@ class Problem { return ( *this ); } - void setFileName( const QString& fileName ) { + void setFileName( const TQString& fileName ) { m_file = fileName; } @@ -75,12 +75,12 @@ class Problem { } /** Get the filename in which the problem was encountered */ - QString fileName() const { + TQString fileName() const { return m_file; } /** Get the text for the problem */ - QString text() const { + TQString text() const { return m_text; } /** Get the line number of the problem */ @@ -103,11 +103,11 @@ class Problem { } private: - QString m_text; + TQString m_text; int m_line; int m_column; int m_level; - QString m_file; + TQString m_file; }; @@ -117,11 +117,11 @@ class Problem { */ class Macro { public: - typedef QString Argument; + typedef TQString Argument; public: Macro( bool hasArguments = false ) : m_idHashValid( false ), m_valueHashValid( false ), m_line( 0 ), m_column( 0 ), m_hasArguments( hasArguments ), m_isUndefMacro( false ) {} - Macro( const QString &n, const QString &b ) : m_idHashValid( false ), m_valueHashValid( false ), m_name( n ), m_line( 0 ), m_column( 0 ), m_body( b ), m_hasArguments( false ), m_isUndefMacro( false ) {} + Macro( const TQString &n, const TQString &b ) : m_idHashValid( false ), m_valueHashValid( false ), m_name( n ), m_line( 0 ), m_column( 0 ), m_body( b ), m_hasArguments( false ), m_isUndefMacro( false ) {} //Sorts the macros by their hash-value, then by their name. struct NameArgCompare { @@ -173,8 +173,8 @@ class Macro { return false; } else { if( lhs.m_argumentList.count() != rhs.m_argumentList.count() ) return false; - /*QStringList::const_iterator it2 = rhs.m_argumentList.begin(); - for( QStringList::const_iterator it = lhs.m_argumentList.begin(); it != lhs.m_argumentList.end(); ) { + /*TQStringList::const_iterator it2 = rhs.m_argumentList.begin(); + for( TQStringList::const_iterator it = lhs.m_argumentList.begin(); it != lhs.m_argumentList.end(); ) { if( *it != *it2 ) return false; ++it; @@ -227,7 +227,7 @@ class Macro { m_argumentList == source.m_argumentList && m_isUndefMacro == source.m_isUndefMacro; } - void read( QDataStream& stream ) { + void read( TQDataStream& stream ) { Q_INT8 i; stream >> i; m_idHashValid = i; stream >> i; m_valueHashValid = i; @@ -243,7 +243,7 @@ class Macro { stream >> m_argumentList; } - void write( QDataStream& stream ) const { + void write( TQDataStream& stream ) const { Q_INT8 i; i = m_idHashValid; stream << i; i = m_valueHashValid; stream << i; @@ -260,21 +260,21 @@ class Macro { } /** Get the name for this macro */ - QString name() const { + TQString name() const { return m_name; } /** Set the name for this macro */ - void setName( const QString& name ) { + void setName( const TQString& name ) { m_name = name; invalidateHash(); } /** Get the file name that contains this macro */ - QString fileName() const { + TQString fileName() const { return m_fileName; } /** Set the file name that contains this macro */ - void setFileName( const QString& fileName ) { + void setFileName( const TQString& fileName ) { m_fileName = fileName; invalidateHash(); } @@ -298,11 +298,11 @@ class Macro { } /** Get the body of the macro */ - QString body() const { + TQString body() const { return m_body; } /** Set the body of the macro */ - void setBody( const QString& body ) { + void setBody( const TQString& body ) { m_body = body; invalidateHash(); } @@ -326,7 +326,7 @@ class Macro { invalidateHash(); } /** Get a list of arguments passed to this macro */ - QValueList argumentList() const { + TQValueList argumentList() const { return m_argumentList; } @@ -341,7 +341,7 @@ class Macro { m_argumentList << argument; } /** Add a list of arguments to this macro */ - void addArgumentList( const QValueList& arguments ) { + void addArgumentList( const TQValueList& arguments ) { m_argumentList += arguments; invalidateHash(); } @@ -370,7 +370,7 @@ class Macro { m_valueHash = 27 * ( HashedString::hashString( m_body ) + (m_isUndefMacro ? 1 : 0 ) ); - for( QValueList::const_iterator it = m_argumentList.begin(); it != m_argumentList.end(); ++it ) { + for( TQValueList::const_iterator it = m_argumentList.begin(); it != m_argumentList.end(); ++it ) { a *= 19; m_valueHash += a * HashedString::hashString( *it ); } @@ -383,13 +383,13 @@ class Macro { mutable size_t m_idHash; //Hash that represents the ids of all macros mutable size_t m_valueHash; //Hash that represents the values of all macros - QString m_name; - QString m_fileName; + TQString m_name; + TQString m_fileName; int m_line; int m_column; - QString m_body; + TQString m_body; bool m_hasArguments; - QStringList m_argumentList; //While identification, only the count plays a role, not the values. + TQStringList m_argumentList; //While identification, only the count plays a role, not the values. bool m_isUndefMacro; friend class NameCompare; friend class NameArgEqual; @@ -404,7 +404,7 @@ class MacroSet { void addMacro( const Macro& macro ); - void read( QDataStream& stream ) { + void read( TQDataStream& stream ) { //stream >> m_idHashValid >> m_idHash >> m_valueHashValid >> m_valueHash; m_idHashValid = false; m_valueHashValid = false; @@ -418,7 +418,7 @@ class MacroSet { } } - void write( QDataStream& stream ) const { + void write( TQDataStream& stream ) const { //stream << m_idHashValid << m_idHash << m_valueHashValid << m_valueHash; stream << int( m_usedMacros.size() ); for( Macros::const_iterator it = m_usedMacros.begin(); it != m_usedMacros.end(); ++it ) { @@ -426,9 +426,9 @@ class MacroSet { } } - bool hasMacro( const QString& name ) const; + bool hasMacro( const TQString& name ) const; bool hasMacro( const HashedString& name ) const; - Macro macro( const QString& name ) const; + Macro macro( const TQString& name ) const; size_t idHash() const; size_t valueHash() const; diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index bed7cbd8..31c14385 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -24,9 +24,9 @@ #include "errors.h" // qt -#include -#include -#include +#include +#include +#include #include #include @@ -134,7 +134,7 @@ bool Parser::reportError( const Error& err ) const Token& token = lex->lookAhead( 0 ); lex->getTokenPosition( token, &line, &col ); - QString s = lex->lookAhead(0).text(); + TQString s = lex->lookAhead(0).text(); s = s.left( 30 ).stripWhiteSpace(); if( s.isEmpty() ) s = i18n( "" ); @@ -145,7 +145,7 @@ bool Parser::reportError( const Error& err ) return true; } -bool Parser::reportError( const QString& msg ) +bool Parser::reportError( const TQString& msg ) { ////kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- " << "Parser::reportError()" << endl; if( m_problems < m_maxProblems ){ @@ -947,7 +947,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) bool Parser::parseOperator( AST::Node& /*node*/ ) { ////kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- " << "Parser::parseOperator()" << endl; - QString text = lex->lookAhead(0).text(); + TQString text = lex->lookAhead(0).text(); switch( lex->lookAhead(0) ){ case Token_new: @@ -3297,9 +3297,9 @@ bool Parser::parseFunctionBody( StatementListAST::Node& node ) return true; } -QString Parser::toString( int start, int end, const QString& sep ) const +TQString Parser::toString( int start, int end, const TQString& sep ) const { - QStringList l; + TQStringList l; for( int i=start; itokenAt(i); diff --git a/lib/cppparser/parser.h b/lib/cppparser/parser.h index d675c3da..771df635 100644 --- a/lib/cppparser/parser.h +++ b/lib/cppparser/parser.h @@ -22,10 +22,10 @@ #include "ast.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -38,11 +38,11 @@ struct Error; class CommentFormatter { - static inline bool isWhite( QChar c ) { + static inline bool isWhite( TQChar c ) { return c.isSpace(); } - static void rStrip( QString str, QString& from ) { + static void rStrip( TQString str, TQString& from ) { if( str.isEmpty() ) return; int i = 0; @@ -66,7 +66,7 @@ class CommentFormatter { if( ip != (int)from.length() ) from = from.left( ip ); } - static void strip( QString str, QString& from ) { + static void strip( TQString str, TQString& from ) { if( str.isEmpty() ) return; int i = 0; @@ -92,8 +92,8 @@ class CommentFormatter { public: - static QString formatComment( QString comment ) { - QString ret; + static TQString formatComment( TQString comment ) { + TQString ret; int i = 0; int s = comment.length(); while( i < s && comment[i] == '/' ) { @@ -104,16 +104,16 @@ class CommentFormatter { ret = comment.mid( i ); } else { ///remove the star in each line - QStringList lines = QStringList::split( "\n", comment ); + TQStringList lines = TQStringList::split( "\n", comment ); if( lines.isEmpty() ) return ret; strip( "/**", lines.front() ); rStrip( "/**", lines.back() ); - QStringList::iterator it = lines.begin(); + TQStringList::iterator it = lines.begin(); ++it; - QStringList::iterator eit = lines.end(); + TQStringList::iterator eit = lines.end(); if( it != lines.end() ) { --eit; @@ -137,7 +137,7 @@ class CommentFormatter { }; class Comment { - QString m_text; + TQString m_text; int m_line; bool m_formatted; @@ -149,7 +149,7 @@ class Comment { } public: - Comment( QString text = "", int line = -1 ) : m_text( text ), m_line( line ), m_formatted(false) { + Comment( TQString text = "", int line = -1 ) : m_text( text ), m_line( line ), m_formatted(false) { } Comment( int line ) : m_line( line ) { @@ -165,7 +165,7 @@ class Comment { return !m_text.isEmpty(); } - operator QString() { + operator TQString() { format(); return m_text; } @@ -264,7 +264,7 @@ public: private: virtual bool reportError( const Error& err ); - /** @todo remove*/ virtual bool reportError( const QString& msg ); + /** @todo remove*/ virtual bool reportError( const TQString& msg ); /** @todo remove*/ virtual void syntaxError(); public /*rules*/ : @@ -431,7 +431,7 @@ public /*rules*/ : bool skipUntilDeclaration(); bool skipUntilStatement(); bool skip( int l, int r ); - QString toString( int start, int end, const QString& sep=" " ) const; + TQString toString( int start, int end, const TQString& sep=" " ) const; private: int currentLine(); diff --git a/lib/cppparser/tree_parser.cpp b/lib/cppparser/tree_parser.cpp index 21f451f3..508c5229 100644 --- a/lib/cppparser/tree_parser.cpp +++ b/lib/cppparser/tree_parser.cpp @@ -33,8 +33,8 @@ void TreeParser::parseTranslationUnit( const ParsedFile& translationUnit ) { ////kdDebug(9007) << "TreeParser::parseTranslationUnit()" << endl; - QPtrList declarations = translationUnit->declarationList(); - QPtrListIterator it( declarations ); + TQPtrList declarations = translationUnit->declarationList(); + TQPtrListIterator it( declarations ); while( it.current() ){ if( (it.current() == 0 ) ) { //kdDebug( 9007 ) << "declaration is zero" << endl; @@ -158,8 +158,8 @@ void TreeParser::parseFunctionDefinition( FunctionDefinitionAST* def ) void TreeParser::parseLinkageBody( LinkageBodyAST* linkageBody ) { ////kdDebug(9007) << "TreeParser::parseLinkageBody()" << endl; - QPtrList declarations = linkageBody->declarationList(); - for( QPtrListIterator it(declarations); it.current(); ++it ){ + TQPtrList declarations = linkageBody->declarationList(); + for( TQPtrListIterator it(declarations); it.current(); ++it ){ parseDeclaration( it.current() ); } } @@ -186,8 +186,8 @@ void TreeParser::parseTypeSpecifier( TypeSpecifierAST* typeSpec ) void TreeParser::parseClassSpecifier( ClassSpecifierAST* classSpec ) { ////kdDebug(9007) << "TreeParser::parseClassSpecifier()" << endl; - QPtrList declarations = classSpec->declarationList(); - for( QPtrListIterator it(declarations); it.current(); ++it ){ + TQPtrList declarations = classSpec->declarationList(); + for( TQPtrListIterator it(declarations); it.current(); ++it ){ parseDeclaration( it.current() ); } } diff --git a/lib/interfaces/KDevCoreIface.cpp b/lib/interfaces/KDevCoreIface.cpp index f99afc53..aa70e01b 100644 --- a/lib/interfaces/KDevCoreIface.cpp +++ b/lib/interfaces/KDevCoreIface.cpp @@ -27,10 +27,10 @@ KDevCoreIface::KDevCoreIface(KDevCore *core) - : QObject(core), DCOPObject("KDevCore"), m_core(core) + : TQObject(core), DCOPObject("KDevCore"), m_core(core) { - connect( m_core, SIGNAL(projectOpened()), this, SLOT(forwardProjectOpened()) ); - connect( m_core, SIGNAL(projectClosed()), this, SLOT(forwardProjectClosed()) ); + connect( m_core, TQT_SIGNAL(projectOpened()), this, TQT_SLOT(forwardProjectOpened()) ); + connect( m_core, TQT_SIGNAL(projectClosed()), this, TQT_SLOT(forwardProjectClosed()) ); } @@ -41,17 +41,17 @@ KDevCoreIface::~KDevCoreIface() void KDevCoreIface::forwardProjectOpened() { kdDebug(9000) << "dcop emitting project opened" << endl; - emitDCOPSignal("projectOpened()", QByteArray()); + emitDCOPSignal("projectOpened()", TQByteArray()); } void KDevCoreIface::forwardProjectClosed() { kdDebug(9000) << "dcop emitting project closed" << endl; - emitDCOPSignal("projectClosed()", QByteArray()); + emitDCOPSignal("projectClosed()", TQByteArray()); } -void KDevCoreIface::openProject( const QString & projectFileName ) +void KDevCoreIface::openProject( const TQString & projectFileName ) { m_core->openProject(projectFileName); } diff --git a/lib/interfaces/KDevCoreIface.h b/lib/interfaces/KDevCoreIface.h index e37db975..5603e0f5 100644 --- a/lib/interfaces/KDevCoreIface.h +++ b/lib/interfaces/KDevCoreIface.h @@ -27,7 +27,7 @@ class KDevCore; -class KDevCoreIface : public QObject, public DCOPObject +class KDevCoreIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -38,7 +38,7 @@ public: ~KDevCoreIface(); k_dcop: - void openProject(const QString& projectFileName); + void openProject(const TQString& projectFileName); private slots: void forwardProjectOpened(); diff --git a/lib/interfaces/KDevPartControllerIface.cpp b/lib/interfaces/KDevPartControllerIface.cpp index a352d1df..1b184453 100644 --- a/lib/interfaces/KDevPartControllerIface.cpp +++ b/lib/interfaces/KDevPartControllerIface.cpp @@ -26,11 +26,11 @@ KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc) - : QObject(pc), DCOPObject("KDevPartController"), m_controller(pc) + : TQObject(pc), DCOPObject("KDevPartController"), m_controller(pc) { - connect(pc, SIGNAL(loadedFile(const KURL &)), this, SLOT(forwardLoadedFile(const KURL &))); - connect(pc, SIGNAL(savedFile(const KURL &)), this, SLOT(forwardSavedFile(const KURL &))); - connect(pc, SIGNAL(closedFile(const KURL &)), this, SLOT(forwardClosedFile(const KURL &))); + connect(pc, TQT_SIGNAL(loadedFile(const KURL &)), this, TQT_SLOT(forwardLoadedFile(const KURL &))); + connect(pc, TQT_SIGNAL(savedFile(const KURL &)), this, TQT_SLOT(forwardSavedFile(const KURL &))); + connect(pc, TQT_SIGNAL(closedFile(const KURL &)), this, TQT_SLOT(forwardClosedFile(const KURL &))); } @@ -39,13 +39,13 @@ KDevPartControllerIface::~KDevPartControllerIface() } -void KDevPartControllerIface::editDocument(const QString &url, int lineNum) +void KDevPartControllerIface::editDocument(const TQString &url, int lineNum) { m_controller->editDocument(KURL(url), lineNum); } -void KDevPartControllerIface::showDocument(const QString &url, bool newWin) +void KDevPartControllerIface::showDocument(const TQString &url, bool newWin) { m_controller->showDocument(KURL(url), newWin); } @@ -66,20 +66,20 @@ void KDevPartControllerIface::revertAllFiles() void KDevPartControllerIface::forwardLoadedFile(const KURL &fileName) { kdDebug(9000) << "dcop emitting loadedFile " << fileName << endl; - emitDCOPSignal("projectOpened()", QByteArray()); + emitDCOPSignal("projectOpened()", TQByteArray()); } void KDevPartControllerIface::forwardSavedFile(const KURL &fileName) { kdDebug(9000) << "dcop emitting savedFile " << fileName << endl; - emitDCOPSignal("projectClosed()", QByteArray()); + emitDCOPSignal("projectClosed()", TQByteArray()); } void KDevPartControllerIface::forwardClosedFile(const KURL &fileName) { kdDebug(9000) << "dcop emitting closedFile " << fileName << endl; - emitDCOPSignal("projectClosed()", QByteArray()); + emitDCOPSignal("projectClosed()", TQByteArray()); } bool KDevPartControllerIface::closeAllFiles( ) diff --git a/lib/interfaces/KDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h index e55c37a5..3f519159 100644 --- a/lib/interfaces/KDevPartControllerIface.h +++ b/lib/interfaces/KDevPartControllerIface.h @@ -25,7 +25,7 @@ class KDevPartController; -class KDevPartControllerIface : public QObject, public DCOPObject +class KDevPartControllerIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -38,8 +38,8 @@ public: k_dcop: - void editDocument(const QString &url, int lineNum); - void showDocument(const QString &url, bool newWin); + void editDocument(const TQString &url, int lineNum); + void showDocument(const TQString &url, bool newWin); void saveAllFiles(); void revertAllFiles(); diff --git a/lib/interfaces/codemodel.cpp b/lib/interfaces/codemodel.cpp index 050abb55..e2e211ad 100644 --- a/lib/interfaces/codemodel.cpp +++ b/lib/interfaces/codemodel.cpp @@ -111,9 +111,9 @@ inline bool isSingleGroup( const int group ) { return (group % 2) == 0; } -QStringList CodeModel::getGroupStrings(int gid) const { - QStringList ret; - for(QMap::ConstIterator it = m_files.begin(); it != m_files.end(); ++it) { +TQStringList CodeModel::getGroupStrings(int gid) const { + TQStringList ret; + for(TQMap::ConstIterator it = m_files.begin(); it != m_files.end(); ++it) { if((*it)->groupId() == gid) ret.append( (*it)-> name() ); } return ret; @@ -122,7 +122,7 @@ QStringList CodeModel::getGroupStrings(int gid) const { FileList CodeModel::getGroup(int gid) const { FileList ret; - for(QMap::ConstIterator it = m_files.begin(); it != m_files.end(); ++it) { + for(TQMap::ConstIterator it = m_files.begin(); it != m_files.end(); ++it) { if((*it)->groupId() == gid) ret.append(*it); } return ret; @@ -139,14 +139,14 @@ int CodeModel::mergeGroups( int g1, int g2) { if( isSingleGroup( ng ) ) ng = newGroupId() + 1; - for( QMap::iterator it = m_files.begin(); it != m_files.end(); ++it ) { + for( TQMap::iterator it = m_files.begin(); it != m_files.end(); ++it ) { if( (*it)->groupId() == g2 || (*it)->groupId() == g1 ) (*it)->setGroupId( ng ); } return ng; } -template static void dumpMap( std::ostream& file, QMap& map ) { - typename QMap::Iterator it = map.begin(); +template static void dumpMap( std::ostream& file, TQMap& map ) { + typename TQMap::Iterator it = map.begin(); for( ; it != map.end(); ++it) { typename Type::Iterator it2 = (*it).begin(); for( ; it2 != (*it).end(); ++it2) { @@ -155,14 +155,14 @@ template static void dumpMap( std::ostream& file, QMap static void dumpMapDirect( std::ostream& file, QMap& map ) { - typename QMap::Iterator it = map.begin(); +template static void dumpMapDirect( std::ostream& file, TQMap& map ) { + typename TQMap::Iterator it = map.begin(); for( ; it != map.end(); ++it) { (*it) -> dump( file, true ); } } -void CodeModelItem::dump( std::ostream& file, bool recurse, QString Info ) +void CodeModelItem::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -195,7 +195,7 @@ void CodeModelItem::dump( std::ostream& file, bool recurse, QString Info ) if(recurse) {} ///just to get rid of the warning } -void ClassModel::dump( std::ostream& file, bool recurse, QString Info ) +void ClassModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -212,27 +212,27 @@ void ClassModel::dump( std::ostream& file, bool recurse, QString Info ) } } -void NamespaceAliasModel::read( QDataStream& stream ) { - QString tempFileName; +void NamespaceAliasModel::read( TQDataStream& stream ) { + TQString tempFileName; stream >> m_name >> m_aliasName >> tempFileName; m_fileName = HashedString( tempFileName ); } -void NamespaceAliasModel::write( QDataStream& stream ) const { +void NamespaceAliasModel::write( TQDataStream& stream ) const { stream << m_name << m_aliasName << m_fileName.str(); } -void NamespaceImportModel::read( QDataStream& stream ) { - QString tempFileName; +void NamespaceImportModel::read( TQDataStream& stream ) { + TQString tempFileName; stream >> m_name >> tempFileName; m_fileName = HashedString( tempFileName ); } -void NamespaceImportModel::write( QDataStream& stream ) const { +void NamespaceImportModel::write( TQDataStream& stream ) const { stream << m_name << m_fileName.str(); } -void NamespaceModel::dump( std::ostream& file, bool recurse, QString Info ) +void NamespaceModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -245,7 +245,7 @@ void NamespaceModel::dump( std::ostream& file, bool recurse, QString Info ) } } -void ArgumentModel::dump( std::ostream& file, bool recurse, QString Info ) +void ArgumentModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -258,7 +258,7 @@ void ArgumentModel::dump( std::ostream& file, bool recurse, QString Info ) if(recurse) {} ///just to get rid of the warning } -void FunctionModel::dump( std::ostream& file, bool recurse, QString Info ) +void FunctionModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -289,7 +289,7 @@ void FunctionModel::dump( std::ostream& file, bool recurse, QString Info ) } } -void VariableModel::dump( std::ostream& file, bool recurse, QString Info ) +void VariableModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -306,20 +306,20 @@ void VariableModel::dump( std::ostream& file, bool recurse, QString Info ) if(recurse) {} ///just to get rid of the warning } -void CodeModel::dump( std::ostream& file, QString Info ) { +void CodeModel::dump( std::ostream& file, TQString Info ) { ostringstream str(ostringstream::out); Info.prepend( str.str().c_str() ); file << Info.ascii() << "\n"; - QMap::iterator it = m_files.begin(); + TQMap::iterator it = m_files.begin(); for(; it != m_files.end(); ++it) { (*it) -> dump( file, true ); } } -void EnumModel::dump( std::ostream& file, bool recurse, QString Info ) +void EnumModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -334,7 +334,7 @@ void EnumModel::dump( std::ostream& file, bool recurse, QString Info ) } } -void EnumeratorModel::dump( std::ostream& file, bool recurse, QString Info ) +void EnumeratorModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); @@ -347,7 +347,7 @@ void EnumeratorModel::dump( std::ostream& file, bool recurse, QString Info ) if(recurse) {} ///just to get rid of the warning } -void TypeAliasModel::dump( std::ostream& file, bool recurse, QString Info ) { +void TypeAliasModel::dump( std::ostream& file, bool recurse, TQString Info ) { ostringstream str( ostringstream::out ); str << "type: " << m_type.ascii() << "\n"; @@ -378,14 +378,14 @@ const FileList CodeModel::fileList( ) const return m_files.values(); } -bool CodeModel::hasFile( const QString & name ) const +bool CodeModel::hasFile( const TQString & name ) const { return m_files.contains( name ); } -FileDom CodeModel::fileByName( const QString & name ) +FileDom CodeModel::fileByName( const TQString & name ) { - QMap::const_iterator it = m_files.find( name ); + TQMap::const_iterator it = m_files.find( name ); if( it != m_files.end() ) { return *it; } else { @@ -393,9 +393,9 @@ FileDom CodeModel::fileByName( const QString & name ) } } -const FileDom CodeModel::fileByName( const QString & name ) const +const FileDom CodeModel::fileByName( const TQString & name ) const { - QMap::const_iterator it = m_files.find( name ); + TQMap::const_iterator it = m_files.find( name ); if( it != m_files.end() ) { return *it; } else { @@ -592,12 +592,12 @@ CodeModelItem::~ CodeModelItem( ) { } -QString CodeModelItem::name( ) const +TQString CodeModelItem::name( ) const { return m_name; } -void CodeModelItem::setName( const QString & name ) +void CodeModelItem::setName( const TQString & name ) { m_name = name; } @@ -612,12 +612,12 @@ FileDom CodeModelItem::file( ) return m_model->fileByName( m_fileName ); } -QString CodeModelItem::fileName() const +TQString CodeModelItem::fileName() const { return m_fileName; } -void CodeModelItem::setFileName( const QString& fileName ) +void CodeModelItem::setFileName( const TQString& fileName ) { m_fileName = fileName; } @@ -677,17 +677,17 @@ const NamespaceList NamespaceModel::namespaceList( ) const return m_namespaces.values(); } -NamespaceDom NamespaceModel::namespaceByName( const QString & name ) +NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) { return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom(); } -const NamespaceDom NamespaceModel::namespaceByName( const QString & name ) const +const NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) const { return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom(); } -bool NamespaceModel::hasNamespace( const QString & name ) const +bool NamespaceModel::hasNamespace( const TQString & name ) const { return m_namespaces.contains( name ); } @@ -718,18 +718,18 @@ ClassModel::ClassModel( CodeModel* model ) { } -QStringList ClassModel::baseClassList( ) const +TQStringList ClassModel::baseClassList( ) const { return m_baseClassList; } -bool ClassModel::addBaseClass( const QString & baseClass ) +bool ClassModel::addBaseClass( const TQString & baseClass ) { m_baseClassList.push_back( baseClass ); return true; } -void ClassModel::removeBaseClass( const QString & baseClass ) +void ClassModel::removeBaseClass( const TQString & baseClass ) { m_baseClassList.remove( baseClass ); } @@ -737,7 +737,7 @@ void ClassModel::removeBaseClass( const QString & baseClass ) ClassList ClassModel::classList( ) { ClassList l; - QMap::Iterator it = m_classes.begin(); + TQMap::Iterator it = m_classes.begin(); while( it != m_classes.end() ){ l += *it; ++it; @@ -749,7 +749,7 @@ ClassList ClassModel::classList( ) const ClassList ClassModel::classList( ) const { ClassList l; - QMap::ConstIterator it = m_classes.begin(); + TQMap::ConstIterator it = m_classes.begin(); while( it != m_classes.end() ){ l += *it; ++it; @@ -758,17 +758,17 @@ const ClassList ClassModel::classList( ) const return l; } -bool ClassModel::hasClass( const QString & name ) const +bool ClassModel::hasClass( const TQString & name ) const { return m_classes.contains( name ); } -ClassList ClassModel::classByName( const QString & name ) +ClassList ClassModel::classByName( const TQString & name ) { return m_classes.contains( name ) ? m_classes[ name ] : ClassList(); } -const ClassList ClassModel::classByName( const QString & name ) const +const ClassList ClassModel::classByName( const TQString & name ) const { return m_classes.contains( name ) ? m_classes[ name ] : ClassList(); } @@ -793,7 +793,7 @@ void ClassModel::removeClass( ClassDom klass ) FunctionList ClassModel::functionList( ) { FunctionList l; - QMap::Iterator it = m_functions.begin(); + TQMap::Iterator it = m_functions.begin(); while( it != m_functions.end() ){ l += *it; ++it; @@ -805,7 +805,7 @@ FunctionList ClassModel::functionList( ) const FunctionList ClassModel::functionList( ) const { FunctionList l; - QMap::ConstIterator it = m_functions.begin(); + TQMap::ConstIterator it = m_functions.begin(); while( it != m_functions.end() ){ l += *it; ++it; @@ -814,17 +814,17 @@ const FunctionList ClassModel::functionList( ) const return l; } -bool ClassModel::hasFunction( const QString & name ) const +bool ClassModel::hasFunction( const TQString & name ) const { return m_functions.contains( name ); } -FunctionList ClassModel::functionByName( const QString & name ) +FunctionList ClassModel::functionByName( const TQString & name ) { return m_functions.contains( name ) ? m_functions[ name ] : FunctionList(); } -const FunctionList ClassModel::functionByName( const QString & name ) const +const FunctionList ClassModel::functionByName( const TQString & name ) const { return m_functions.contains( name ) ? m_functions[ name ] : FunctionList(); } @@ -849,7 +849,7 @@ void ClassModel::removeFunction( FunctionDom fun ) FunctionDefinitionList ClassModel::functionDefinitionList( ) { FunctionDefinitionList l; - QMap::Iterator it = m_functionDefinitions.begin(); + TQMap::Iterator it = m_functionDefinitions.begin(); while( it != m_functionDefinitions.end() ){ l += *it; ++it; @@ -861,7 +861,7 @@ FunctionDefinitionList ClassModel::functionDefinitionList( ) const FunctionDefinitionList ClassModel::functionDefinitionList( ) const { FunctionDefinitionList l; - QMap::ConstIterator it = m_functionDefinitions.begin(); + TQMap::ConstIterator it = m_functionDefinitions.begin(); while( it != m_functionDefinitions.end() ){ l += *it; ++it; @@ -870,17 +870,17 @@ const FunctionDefinitionList ClassModel::functionDefinitionList( ) const return l; } -bool ClassModel::hasFunctionDefinition( const QString & name ) const +bool ClassModel::hasFunctionDefinition( const TQString & name ) const { return m_functionDefinitions.contains( name ); } -FunctionDefinitionList ClassModel::functionDefinitionByName( const QString & name ) +FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) { return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); } -const FunctionDefinitionList ClassModel::functionDefinitionByName( const QString & name ) const +const FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) const { return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); } @@ -912,17 +912,17 @@ const VariableList ClassModel::variableList( ) const return m_variables.values(); } -VariableDom ClassModel::variableByName( const QString & name ) +VariableDom ClassModel::variableByName( const TQString & name ) { return m_variables.contains( name ) ? m_variables[ name ] : VariableDom(); } -const VariableDom ClassModel::variableByName( const QString & name ) const +const VariableDom ClassModel::variableByName( const TQString & name ) const { return m_variables.contains( name ) ? m_variables[ name ] : VariableDom(); } -bool ClassModel::hasVariable( const QString & name ) const +bool ClassModel::hasVariable( const TQString & name ) const { return m_variables.contains( name ); } @@ -951,17 +951,17 @@ const EnumList ClassModel::enumList( ) const return m_enumerators.values(); } -EnumDom ClassModel::enumByName( const QString & name ) +EnumDom ClassModel::enumByName( const TQString & name ) { return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom(); } -const EnumDom ClassModel::enumByName( const QString & name ) const +const EnumDom ClassModel::enumByName( const TQString & name ) const { return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom(); } -bool ClassModel::hasEnum( const QString & name ) const +bool ClassModel::hasEnum( const TQString & name ) const { return m_enumerators.contains( name ); } @@ -1005,7 +1005,7 @@ void ClassModel::removeEnum( EnumDom e ) TypeAliasList ClassModel::typeAliasList( ) { TypeAliasList l; - QMap::Iterator it = m_typeAliases.begin(); + TQMap::Iterator it = m_typeAliases.begin(); while( it != m_typeAliases.end() ){ l += *it; ++it; @@ -1017,7 +1017,7 @@ TypeAliasList ClassModel::typeAliasList( ) const TypeAliasList ClassModel::typeAliasList( ) const { TypeAliasList l; - QMap::ConstIterator it = m_typeAliases.begin(); + TQMap::ConstIterator it = m_typeAliases.begin(); while( it != m_typeAliases.end() ){ l += *it; ++it; @@ -1026,17 +1026,17 @@ const TypeAliasList ClassModel::typeAliasList( ) const return l; } -bool ClassModel::hasTypeAlias( const QString & name ) const +bool ClassModel::hasTypeAlias( const TQString & name ) const { return m_typeAliases.contains( name ); } -TypeAliasList ClassModel::typeAliasByName( const QString & name ) +TypeAliasList ClassModel::typeAliasByName( const TQString & name ) { return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList(); } -const TypeAliasList ClassModel::typeAliasByName( const QString & name ) const +const TypeAliasList ClassModel::typeAliasByName( const TQString & name ) const { return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList(); } @@ -1066,22 +1066,22 @@ ArgumentModel::ArgumentModel( CodeModel* model ) { } -QString ArgumentModel::type( ) const +TQString ArgumentModel::type( ) const { return m_type; } -void ArgumentModel::setType( const QString& type ) +void ArgumentModel::setType( const TQString& type ) { m_type = type; } -QString ArgumentModel::defaultValue( ) const +TQString ArgumentModel::defaultValue( ) const { return m_defaultValue; } -void ArgumentModel::setDefaultValue( const QString & defaultValue ) +void ArgumentModel::setDefaultValue( const TQString & defaultValue ) { m_defaultValue = defaultValue; } @@ -1150,12 +1150,12 @@ void FunctionModel::setAbstract( bool isAbstract ) d.v.m_abstract = isAbstract; } -QString FunctionModel::resultType( ) const +TQString FunctionModel::resultType( ) const { return m_resultType; } -void FunctionModel::setResultType( const QString& type ) +void FunctionModel::setResultType( const TQString& type ) { m_resultType = type; } @@ -1214,12 +1214,12 @@ void VariableModel::setStatic( bool isStatic ) m_static = isStatic; } -QString VariableModel::type( ) const +TQString VariableModel::type( ) const { return m_type; } -void VariableModel::setType( const QString& type ) +void VariableModel::setType( const TQString& type ) { m_type = type; } @@ -1282,7 +1282,7 @@ const NamespaceDom CodeModel::globalNamespace( ) const return m_globalNamespace; } -void CodeModelItem::read( QDataStream & stream ) +void CodeModelItem::read( TQDataStream & stream ) { stream >> m_kind @@ -1301,7 +1301,7 @@ void CodeModelItem::read( QDataStream & stream ) } } -void CodeModelItem::write( QDataStream & stream ) const +void CodeModelItem::write( TQDataStream & stream ) const { stream << m_kind @@ -1319,7 +1319,7 @@ void CodeModelItem::write( QDataStream & stream ) const } } -void ClassModel::read( QDataStream & stream ) +void ClassModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); @@ -1378,7 +1378,7 @@ void ClassModel::read( QDataStream & stream ) } } -void ClassModel::write( QDataStream & stream ) const +void ClassModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); @@ -1418,7 +1418,7 @@ void ClassModel::write( QDataStream & stream ) const } -void NamespaceModel::read( QDataStream & stream ) +void NamespaceModel::read( TQDataStream & stream ) { ClassModel::read( stream ); @@ -1462,7 +1462,7 @@ void NamespaceModel::removeNamespaceAlias( const NamespaceAliasModel& alias ) { m_namespaceAliases.erase( alias ); } -void NamespaceModel::write( QDataStream & stream ) const +void NamespaceModel::write( TQDataStream & stream ) const { ClassModel::write( stream ); @@ -1523,7 +1523,7 @@ void NamespaceModel::update( const NamespaceModel* ns ) eachUpdateSingle( m_namespaces, ns->m_namespaces ); } -void FileModel::read( QDataStream & stream ) +void FileModel::read( TQDataStream & stream ) { stream >> m_groupId; bool b; @@ -1542,7 +1542,7 @@ void FileModel::read( QDataStream & stream ) NamespaceModel::read( stream ); } -void FileModel::write( QDataStream & stream ) const +void FileModel::write( TQDataStream & stream ) const { stream << m_groupId; bool b = m_parseResult; @@ -1556,7 +1556,7 @@ void FileModel::write( QDataStream & stream ) const NamespaceModel::write( stream ); } -void ArgumentModel::read( QDataStream & stream ) +void ArgumentModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); @@ -1564,14 +1564,14 @@ void ArgumentModel::read( QDataStream & stream ) stream >> m_type >> m_defaultValue; } -void ArgumentModel::write( QDataStream & stream ) const +void ArgumentModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); stream << m_type << m_defaultValue; } -void FunctionModel::read( QDataStream & stream ) +void FunctionModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); TemplateModelItem::read( stream ); @@ -1593,7 +1593,7 @@ void FunctionModel::read( QDataStream & stream ) >> m_resultType; } -void FunctionModel::write( QDataStream & stream ) const +void FunctionModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); TemplateModelItem::write( stream ); @@ -1610,7 +1610,7 @@ void FunctionModel::write( QDataStream & stream ) const << m_resultType; } -void CodeModel::read( QDataStream & stream ) +void CodeModel::read( TQDataStream & stream ) { int n; @@ -1624,7 +1624,7 @@ void CodeModel::read( QDataStream & stream ) } } -void CodeModel::write( QDataStream & stream ) const +void CodeModel::write( TQDataStream & stream ) const { const FileList file_list = fileList(); stream << int( file_list.size() ); @@ -1632,13 +1632,13 @@ void CodeModel::write( QDataStream & stream ) const (*it)->write( stream ); } -void VariableModel::read( QDataStream & stream ) +void VariableModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); stream >> m_access >> m_static >> m_type >> m_isEnumeratorVariable; } -void VariableModel::write( QDataStream & stream ) const +void VariableModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); stream << m_access << m_static << m_type << m_isEnumeratorVariable; @@ -1688,7 +1688,7 @@ void EnumModel::addEnumerator( EnumeratorDom enumerator ) m_enumerators.insert( enumerator->name(), enumerator ); } -void EnumModel::read( QDataStream & stream ) +void EnumModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); stream >> m_access; @@ -1702,7 +1702,7 @@ void EnumModel::read( QDataStream & stream ) } } -void EnumModel::write( QDataStream & stream ) const +void EnumModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); @@ -1718,23 +1718,23 @@ EnumeratorModel::EnumeratorModel( CodeModel * model ) { } -QString EnumeratorModel::value( ) const +TQString EnumeratorModel::value( ) const { return m_value; } -void EnumeratorModel::setValue( const QString & value ) +void EnumeratorModel::setValue( const TQString & value ) { m_value = value; } -void EnumeratorModel::read( QDataStream & stream ) +void EnumeratorModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); stream >> m_value; } -void EnumeratorModel::write( QDataStream & stream ) const +void EnumeratorModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); stream << m_value; @@ -1765,26 +1765,26 @@ TypeAliasModel::TypeAliasModel( CodeModel * model ) { } -void TypeAliasModel::read( QDataStream & stream ) +void TypeAliasModel::read( TQDataStream & stream ) { CodeModelItem::read( stream ); stream >> m_type; } -void TypeAliasModel::write( QDataStream & stream ) const +void TypeAliasModel::write( TQDataStream & stream ) const { CodeModelItem::write( stream ); stream << m_type; } -QString TypeAliasModel::type( ) const +TQString TypeAliasModel::type( ) const { return m_type; } -void TypeAliasModel::setType( const QString & type ) +void TypeAliasModel::setType( const TQString & type ) { m_type = type; } @@ -1809,8 +1809,8 @@ FileList FileModel::wholeGroup() { return codeModel()->getGroup( m_groupId ); } -QStringList FileModel::wholeGroupStrings() const { - if( isSingleGroup( m_groupId ) ) return (QStringList() << name() ); +TQStringList FileModel::wholeGroupStrings() const { + if( isSingleGroup( m_groupId ) ) return (TQStringList() << name() ); return codeModel()->getGroupStrings( m_groupId ); } diff --git a/lib/interfaces/codemodel.h b/lib/interfaces/codemodel.h index 5fb42c44..882420b8 100644 --- a/lib/interfaces/codemodel.h +++ b/lib/interfaces/codemodel.h @@ -27,10 +27,10 @@ Code Model - a memory symbol store. */ -#include -#include +#include +#include #include -#include +#include #include "hashedstring.h" #include @@ -45,9 +45,9 @@ enum ParsedFileType { class AbstractParseResult : public KShared { public: - virtual void read( QDataStream& stream ) = 0; + virtual void read( TQDataStream& stream ) = 0; - virtual void write( QDataStream& stream ) const = 0; + virtual void write( TQDataStream& stream ) const = 0; virtual ParsedFileType type() const = 0; }; @@ -160,104 +160,104 @@ typedef KSharedPtr EnumeratorDom; /** @class ItemList The list of code model items. -This is a type definition: @code typedef QValueList ItemList; @endcode +This is a type definition: @code typedef TQValueList ItemList; @endcode @sa QValueList */ -typedef QValueList ItemList; +typedef TQValueList ItemList; /** @class FileList The list of code model files. -This is a type definition: @code typedef QValueList FileList; @endcode +This is a type definition: @code typedef TQValueList FileList; @endcode @sa QValueList */ -typedef QValueList FileList; +typedef TQValueList FileList; /** @class NamespaceList The list of code model namespaces. -This is a type definition: @code typedef QValueList NamespaceList; @endcode +This is a type definition: @code typedef TQValueList NamespaceList; @endcode @sa QValueList */ -typedef QValueList NamespaceList; +typedef TQValueList NamespaceList; /** @class ClassList The list of code model classes. -This is a type definition: @code typedef QValueList ClassList; @endcode +This is a type definition: @code typedef TQValueList ClassList; @endcode @sa QValueList */ -typedef QValueList ClassList; +typedef TQValueList ClassList; /** @class FunctionList The list of code model functions. -This is a type definition: @code typedef QValueList FunctionList; @endcode +This is a type definition: @code typedef TQValueList FunctionList; @endcode @sa QValueList */ -typedef QValueList FunctionList; +typedef TQValueList FunctionList; /** @class FunctionDefinitionList The list of code model function definitions. -This is a type definition: @code typedef QValueList FunctionDefinitionList; @endcode +This is a type definition: @code typedef TQValueList FunctionDefinitionList; @endcode @sa QValueList */ -typedef QValueList FunctionDefinitionList; +typedef TQValueList FunctionDefinitionList; /** @class VariableList The list of code model variables. -This is a type definition: @code typedef QValueList VariableList; @endcode +This is a type definition: @code typedef TQValueList VariableList; @endcode @sa QValueList */ -typedef QValueList VariableList; +typedef TQValueList VariableList; /** @class ArgumentList The list of code model arguments. -This is a type definition: @code typedef QValueList ArgumentList; @endcode +This is a type definition: @code typedef TQValueList ArgumentList; @endcode @sa QValueList */ -typedef QValueList ArgumentList; +typedef TQValueList ArgumentList; /** @class EnumList The list of code model enums. -This is a type definition: @code typedef QValueList EnumList; @endcode +This is a type definition: @code typedef TQValueList EnumList; @endcode @sa QValueList */ -typedef QValueList EnumList; +typedef TQValueList EnumList; /** @class TypeAliasList The list of code model type aliases. -This is a type definition: @code typedef QValueList TypeAliasList; @endcode +This is a type definition: @code typedef TQValueList TypeAliasList; @endcode @sa QValueList */ -typedef QValueList TypeAliasList; +typedef TQValueList TypeAliasList; /** @class EnumeratorList The list of code model enumerators. -This is a type definition: @code typedef QValueList EnumeratorList; @endcode +This is a type definition: @code typedef TQValueList EnumeratorList; @endcode @sa QValueList */ -typedef QValueList EnumeratorList; +typedef TQValueList EnumeratorList; /** Iterates through @p lst and creates sorted list of code model item names. Can be used, for example, to get the list of classes in the store: @code -QStringList classList = sortedNameList(codeModel()->globalNamespace()->classList()); +TQStringList classList = sortedNameList(codeModel()->globalNamespace()->classList()); @endcode @param lst The list to iterate. @return Sorted list of code model item names. */ template -QStringList sortedNameList( const ItemList& lst ) +TQStringList sortedNameList( const ItemList& lst ) { - QStringList nameList; + TQStringList nameList; typename ItemList::ConstIterator it = lst.begin(); while( it != lst.end() ){ @@ -360,16 +360,16 @@ public: /**Checks to see if a file is in the store. @return true if @p name is in the file list.*/ - bool hasFile( const QString& name ) const; + bool hasFile( const TQString& name ) const; /**Gets the FileDom object for a file. @param name The name of the file to get the FileDom object for.*/ - FileDom fileByName( const QString& name ); + FileDom fileByName( const TQString& name ); /**Gets the FileDom object for a file. This is a const version provided for convenience. @param name the name of the file to get the FileDom object for.*/ - const FileDom fileByName( const QString& name ) const; + const FileDom fileByName( const TQString& name ) const; /**Adds a file to the store. @param file The FileDom object to add to the store. @@ -391,17 +391,17 @@ public: closed to avoid reparsing when the project is opened next time. @param stream Stream to read from. @return whether the read succeeded(may fail when the store-format is deprecated).*/ - virtual void read( QDataStream& stream ); + virtual void read( TQDataStream& stream ); /**Writes the model to a stream. Use this to restore the memory symbol store to a file. Language support plugins usually save symbols from projects before the project is closed to avoid reparsing when the project is opened next time. @param stream Stream to write to.*/ - virtual void write( QDataStream& stream ) const; + virtual void write( TQDataStream& stream ) const; /** this will dump the whole tree into dot-file-format so it can be inspected, not ready yet*/ - virtual void dump( std::ostream& file, QString Info="" ); + virtual void dump( std::ostream& file, TQString Info="" ); /** Merges two groups, by changing the group-ids of the files. Returns the id of the new group, or 0 on fail. @@ -418,7 +418,7 @@ public: FileList getGroup( const FileDom& file) const; /** Same as above, but returns the names instead of the objects */ - virtual QStringList getGroupStrings( int gid ) const; + virtual TQStringList getGroupStrings( int gid ) const; private: /**Adds a namespace to the store. @@ -432,7 +432,7 @@ private: void removeNamespace( NamespaceDom target, NamespaceDom source ); private: - QMap m_files; + TQMap m_files; NamespaceDom m_globalNamespace; virtual int newGroupId(); @@ -510,19 +510,19 @@ public: void setKind( int kind ) { m_kind = kind; } /**@return The name of the item.*/ - QString name() const; + TQString name() const; - QString comment() const { + TQString comment() const { return m_comment; } - void setComment( QString comment ) { + void setComment( TQString comment ) { m_comment = comment; } /**Sets the name of the item. @param name The name.*/ - void setName( const QString& name ); + void setName( const TQString& name ); /**Gets the file of the item. @return The FileDom object for the item.*/ @@ -534,11 +534,11 @@ public: const FileDom file() const; /**@return The filename of the item.*/ - QString fileName() const; + TQString fileName() const; /**Sets the filename of the item. @param fileName The file name.*/ - void setFileName( const QString& fileName ); + void setFileName( const TQString& fileName ); /**Gets the start position of the item. @param line Will be set to the line number of the items start position. Pass 0 if line number is not necessary. @@ -587,12 +587,12 @@ public: /**Reads an item from the stream. @param stream The stream to read from.*/ - virtual void read( QDataStream& stream ); + virtual void read( TQDataStream& stream ); /**Writes an item to the stream. @param stream The stream to write to.*/ - virtual void write( QDataStream& stream ) const; + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); /**@return The code model for this item.*/ CodeModel* codeModel() { return m_model; } @@ -604,9 +604,9 @@ public: private: int m_kind; CodeModel* m_model; - QString m_name; - QString m_fileName; - QString m_comment; ///not stored yet + TQString m_name; + TQString m_fileName; + TQString m_comment; ///not stored yet int m_startLine, m_startColumn; int m_endLine, m_endColumn; @@ -619,14 +619,14 @@ private: class TemplateModelItem { public: - typedef QPair< QString, QString > ParamPair; - typedef QValueVector< ParamPair > ParamMap; ///The first is the name, and the second the default-parameter, or "" if there is none. + typedef QPair< TQString, TQString > ParamPair; + typedef TQValueVector< ParamPair > ParamMap; ///The first is the name, and the second the default-parameter, or "" if there is none. virtual const ParamMap& getTemplateParams() { return m_params; } - virtual void addTemplateParam( QString name, QString def = "" ) { + virtual void addTemplateParam( TQString name, TQString def = "" ) { m_params.push_back( ParamPair( name, def ) ); } @@ -638,16 +638,16 @@ class TemplateModelItem { return !m_specialization.isEmpty(); } - virtual QString getSpecializationDeclaration() const { + virtual TQString getSpecializationDeclaration() const { return m_specialization; } - void setSpecializationDeclaration( const QString& str ) { + void setSpecializationDeclaration( const TQString& str ) { m_specialization = str; } ///returns -1 if the parameter does not exist - virtual int findTemplateParam( const QString& name ) const { + virtual int findTemplateParam( const TQString& name ) const { for( unsigned int a = 0; a< m_params.size(); a++) if( m_params[a].first == name ) return a; return -1; @@ -659,7 +659,7 @@ class TemplateModelItem { virtual bool isTemplateable() const { return true; } - void write( QDataStream & stream ) const { + void write( TQDataStream & stream ) const { stream << m_specialization; stream << (int)m_params.size(); for( ParamMap::const_iterator it = m_params.begin(); it != m_params.end(); ++it ) { @@ -668,7 +668,7 @@ class TemplateModelItem { } } - void read( QDataStream & stream ) { + void read( TQDataStream & stream ) { int count; stream >> m_specialization; stream >> count; @@ -682,7 +682,7 @@ class TemplateModelItem { protected: ParamMap m_params; - QString m_specialization; + TQString m_specialization; }; @@ -707,21 +707,21 @@ public: virtual bool isClass() const { return true; } /**@return The scope of the class. Scope is a string list composed from names of parent classes and namespaces.*/ - QStringList scope() const { return m_scope; } + TQStringList scope() const { return m_scope; } /**Sets the scope of this class. @param scope The scope - a list of parent classes and namespaces.*/ - void setScope( const QStringList& scope ) { m_scope = scope; } + void setScope( const TQStringList& scope ) { m_scope = scope; } /**@return The list of base class names.*/ - QStringList baseClassList() const; + TQStringList baseClassList() const; /**Adds a base class to the list of base classes. @param baseClass The base class name.*/ - bool addBaseClass( const QString& baseClass ); + bool addBaseClass( const TQString& baseClass ); /**Removes a base class from the list of base classes. @param baseClass The base class name.*/ - void removeBaseClass( const QString& baseClass ); + void removeBaseClass( const TQString& baseClass ); /**@return The list of (sub)classes in this model.*/ ClassList classList(); @@ -733,16 +733,16 @@ public: /**Checks if the class specified by @p name is in this model. @param name The name of a class to look for. @return true if the model has a class.*/ - bool hasClass( const QString& name ) const; + bool hasClass( const TQString& name ) const; /**@param name The name of a class. @return A list of classes that match the name given by @p name.*/ - ClassList classByName( const QString& name ); + ClassList classByName( const TQString& name ); /**@param name The name of a class. @return A list of classes that match the name given by @p name. @note This is a const version provided for convenience.*/ - const ClassList classByName( const QString& name ) const; + const ClassList classByName( const TQString& name ) const; /**Adds a class to the model. @param klass The class model to add. @@ -763,16 +763,16 @@ public: /**Check if the function specified by @p name is in the model. @param name The name of a function to look for. @return true if the model has a class.*/ - bool hasFunction( const QString& name ) const; + bool hasFunction( const TQString& name ) const; /**@param name The name of a function to look for. @return A list of functions that match the name given by @p name.*/ - FunctionList functionByName( const QString& name ); + FunctionList functionByName( const TQString& name ); /**@param name The name of a function to look for. @return A list of functions that match the name given by @p name. @note This is a const version provided for convenience.*/ - const FunctionList functionByName( const QString& name ) const; + const FunctionList functionByName( const TQString& name ) const; /**Adds a function to the class model. @param fun The function model to add. @@ -793,20 +793,20 @@ public: /**Checks if the function definition specified by \p name is in the model. @param name The name of a function definition to look for. @return true if the function definition was found.*/ - bool hasFunctionDefinition( const QString& name ) const; + bool hasFunctionDefinition( const TQString& name ) const; /**Gets the list of functions that match the name given by \p name. If there are no matches, then the list returned is empty. @param name The name of a function definition to look for. @return The FunctionDefinitionList object containing the definitions that match.*/ - FunctionDefinitionList functionDefinitionByName( const QString& name ); + FunctionDefinitionList functionDefinitionByName( const TQString& name ); /**Gets the list of functions that match the name given by \p name. If there are no matches, then the list returned is empty. @param name The name of a function definition to look for. @return The FunctionDefinitionList object containing the definitions that match. @note This is a const version provided for convenience.*/ - const FunctionDefinitionList functionDefinitionByName( const QString& name ) const; + const FunctionDefinitionList functionDefinitionByName( const TQString& name ) const; /**Adds a function definition to the model. @param fun The function fefinition model to add to the model. @@ -827,20 +827,20 @@ public: /**Checks if the variable specified by @p name is in the model. @param name The name of a variable. @return true if the variable was found.*/ - bool hasVariable( const QString& name ) const; + bool hasVariable( const TQString& name ) const; /**Gets the variable specified by @p name. If there are no matches, then the VariableDom object returned is empty. @param name The name of a variable. @return A VariableDom object that matches the name specified.*/ - VariableDom variableByName( const QString& name ); + VariableDom variableByName( const TQString& name ); /**Gets the variable specified by @p name. If there are no matches, then the VariableDom object returned is empty. @param name The name of a variable. @return A VariableDom object that matches the name specified. @note This is a const version provided for convenience.*/ - const VariableDom variableByName( const QString& name ) const; + const VariableDom variableByName( const TQString& name ) const; /**Adds a variable to the model. @param var The variable model to add to the model. @@ -861,20 +861,20 @@ public: /**Checks if the type alias specified by @p name is in the model. @param name The name of a type alias. @return true if the type alias was found.*/ - bool hasTypeAlias( const QString& name ) const; + bool hasTypeAlias( const TQString& name ) const; /**Gets the list of type aliases that match @p name. If there are no matches, the TypeAliasList object is empty. @param name The name of a type alias. @return A TypeAliasList object that contains the matches.*/ - TypeAliasList typeAliasByName( const QString& name ); + TypeAliasList typeAliasByName( const TQString& name ); /**Gets the list of type aliases that match @p name. If there are no matches, the TypeAliasList object is empty. @param name The name of a type alias. @return A TypeAliasList object that contains the matches. @note This is a const version provided for convenience.*/ - const TypeAliasList typeAliasByName( const QString& name ) const; + const TypeAliasList typeAliasByName( const TQString& name ) const; /**Adds a type alias to the model. @param typeAlias The type alias model to add to the model. @@ -895,19 +895,19 @@ public: /**Checks if the enum specified by @p name is in the model. @param name The name of an enum. @return true if the enum was found.*/ - bool hasEnum( const QString& name ) const; + bool hasEnum( const TQString& name ) const; /**Gets the enum specified by @p name. The EnumDom object returned will be empty if no match is found. @param name The name of an enum. @return The EnumDom object that contains the match.*/ - EnumDom enumByName( const QString& name ); + EnumDom enumByName( const TQString& name ); /**Gets the enum specified by @p name. The EnumDom object returned will be empty if no match is found. @param name The name of an enum. @return The EnumDom object that contains the match.*/ - const EnumDom enumByName( const QString& name ) const; + const EnumDom enumByName( const TQString& name ) const; /**Adds an enum to the model. @param e The enum model to add to the model. @@ -921,20 +921,20 @@ public: void update( const ClassModel* i ); bool canUpdate( const ClassModel* i ) const; - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); private: - QStringList m_scope; - QStringList m_baseClassList; - QMap m_classes; - QMap m_functions; - QMap m_functionDefinitions; - QMap m_variables; - QMap m_typeAliases; - QMap m_enumerators; + TQStringList m_scope; + TQStringList m_baseClassList; + TQMap m_classes; + TQMap m_functions; + TQMap m_functionDefinitions; + TQMap m_variables; + TQMap m_typeAliases; + TQMap m_enumerators; private: ClassModel( const ClassModel& source ); @@ -944,22 +944,22 @@ private: class NamespaceAliasModel { public: - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - QString name() const { + TQString name() const { return m_name; } - void setName( const QString& name ) { + void setName( const TQString& name ) { m_name = name; } - void setAliasName( const QString& theValue ) { + void setAliasName( const TQString& theValue ) { m_aliasName = theValue; } - QString aliasName() const { + TQString aliasName() const { return m_aliasName; } @@ -985,17 +985,17 @@ public: } private: - QString m_name; - QString m_aliasName; + TQString m_name; + TQString m_aliasName; HashedString m_fileName; }; class NamespaceImportModel { public: - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - QString name() const { + TQString name() const { return m_name; } @@ -1003,7 +1003,7 @@ public: return m_fileName; } - void setName( const QString& name ) { + void setName( const TQString& name ) { m_name = name; } @@ -1024,7 +1024,7 @@ public: } private: - QString m_name; + TQString m_name; HashedString m_fileName; }; @@ -1063,20 +1063,20 @@ public: /**Checks if the namespace referenced by @p name is in the model. @param name The name of a namespace. @return true if the namespace was found.*/ - bool hasNamespace( const QString& name ) const; + bool hasNamespace( const TQString& name ) const; /**Gets the namespace specified by @p name. If there are no matches, then the NamespaceDom object returned is empty. @param name The name of a namespace. @return The NamespaceDom object that contains the match.*/ - NamespaceDom namespaceByName( const QString& name ); + NamespaceDom namespaceByName( const TQString& name ); /**Gets the namespace specified by @p name. If there are no matches, then the NamespaceDom object returned is empty. @param name The name of a namespace. @return The NamespaceDom object that contains the match. @note This is a const version provided for convenience.*/ - const NamespaceDom namespaceByName( const QString& name ) const; + const NamespaceDom namespaceByName( const TQString& name ) const; /**Adds a namespace to the model. @param ns The namespace model to add to the model. @@ -1093,10 +1093,10 @@ public: void update( const NamespaceModel* ns ); bool canUpdate( const NamespaceModel* ns ) const; - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void addNamespaceImport( const NamespaceImportModel& import ); void addNamespaceAlias( const NamespaceAliasModel& alias ); @@ -1113,7 +1113,7 @@ public: return m_namespaceImports; } private: - QMap m_namespaces; + TQMap m_namespaces; NamespaceAliasModelList m_namespaceAliases; NamespaceImportModelList m_namespaceImports; @@ -1161,13 +1161,13 @@ public: from outside. @return whether the read was successful */ - virtual void write( QDataStream& stream ) const; + virtual void write( TQDataStream& stream ) const; FileList wholeGroup() ; - QStringList wholeGroupStrings() const; + TQStringList wholeGroupStrings() const; - virtual void read( QDataStream& stream ); + virtual void read( TQDataStream& stream ); ParseResultPointer parseResult() const; void setParseResult( const ParseResultPointer& result ); @@ -1200,27 +1200,27 @@ public: virtual bool isArgument() const { return true; } /**@return The type of this argument.*/ - QString type() const; + TQString type() const; /**Sets the type of this argument. @param type The type to set.*/ - void setType( const QString& type ); + void setType( const TQString& type ); /**@return The default value of this argument.*/ - QString defaultValue() const; + TQString defaultValue() const; /**Sets the default value of this argument. @param defaultValue The default value to set.*/ - void setDefaultValue( const QString& defaultValue ); + void setDefaultValue( const TQString& defaultValue ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); private: - QString m_type; - QString m_defaultValue; + TQString m_type; + TQString m_defaultValue; private: ArgumentModel( const ArgumentModel& source ); @@ -1257,11 +1257,11 @@ public: /**@return The scope of the function. Scope is a string list composed from names of parent functions, classes and namespaces.*/ - QStringList scope() const { return m_scope; } + TQStringList scope() const { return m_scope; } /**Sets the scope of the function. @param scope The scope to set.*/ - void setScope( const QStringList& scope ) { m_scope = scope; } + void setScope( const TQStringList& scope ) { m_scope = scope; } /**@return The access level of the function. Can return either values of type @ref CodeModelItem::Access or other integers if the function has other access level (for example pascal methods can have "published" @@ -1315,10 +1315,10 @@ public: void setAbstract( bool isAbstract ); /**@return The result type of a function.*/ - QString resultType() const; + TQString resultType() const; /**Sets the result type of a function. @param type The type of a function result.*/ - void setResultType( const QString& type ); + void setResultType( const TQString& type ); /**Gets the list of arguments being passed to the function. If there are no arguments, then the list is empty. @@ -1340,16 +1340,16 @@ public: @param arg The argument model to remove from the function.*/ void removeArgument( ArgumentDom arg ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void update( const FunctionModel* i ); bool canUpdate( const FunctionModel* i ) const; private: - QStringList m_scope; + TQStringList m_scope; int m_access; union { @@ -1365,7 +1365,7 @@ private: int flags; } d; - QString m_resultType; + TQString m_resultType; ArgumentList m_arguments; private: @@ -1434,20 +1434,20 @@ public: void setStatic( bool isStatic ); /**@return A type of the variable.*/ - QString type() const; + TQString type() const; /**Sets the type of the variable. @param type The type name.*/ - void setType( const QString& type ); + void setType( const TQString& type ); /**@return If this is an enumerator, the enum it is part of, else an empty string. This is just a hack, necessary because EnumeratorModel is not used at all by the cpp-code-model. */ bool isEnumeratorVariable() const; void setEnumeratorVariable( bool b ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void update( const VariableModel* i ); bool canUpdate( const VariableModel* i ) const; @@ -1455,7 +1455,7 @@ public: private: int m_access; int m_static; - QString m_type; + TQString m_type; int m_isEnumeratorVariable; private: @@ -1503,18 +1503,18 @@ public: @param e The enumerator model to remove.*/ void removeEnumerator( EnumeratorDom e ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; ///The dump-function is not ready yet - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void update( const EnumModel* i ); bool canUpdate( const EnumModel* i ) const; private: int m_access; - QMap m_enumerators; + TQMap m_enumerators; private: EnumModel( const EnumModel& source ); @@ -1548,18 +1548,18 @@ public: virtual bool isEnumerator() const { return true; } /**@return The value of an enumerator.*/ - QString value() const; + TQString value() const; /**Sets the value of an enumerator. @param value The value.*/ - void setValue( const QString& value ); + void setValue( const TQString& value ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); private: - QString m_value; + TQString m_value; private: EnumeratorModel( const EnumeratorModel& source ); @@ -1586,22 +1586,22 @@ public: virtual bool isTypeAlias() const { return true; } /**@return The actual type of an alias.*/ - QString type() const; + TQString type() const; /**Sets the type of an alias. @param type The type name.*/ - void setType( const QString& type ); + void setType( const TQString& type ); - virtual void read( QDataStream& stream ); - virtual void write( QDataStream& stream ) const; + virtual void read( TQDataStream& stream ); + virtual void write( TQDataStream& stream ) const; - virtual void dump( std::ostream& file, bool recurse=false, QString Info="" ); + virtual void dump( std::ostream& file, bool recurse=false, TQString Info="" ); void update( const TypeAliasModel* i ); bool canUpdate( const TypeAliasModel* i ) const; private: - QString m_type; + TQString m_type; private: TypeAliasModel( const TypeAliasModel& source ); diff --git a/lib/interfaces/codemodel_utils.cpp b/lib/interfaces/codemodel_utils.cpp index 2bdffd53..afb946bd 100644 --- a/lib/interfaces/codemodel_utils.cpp +++ b/lib/interfaces/codemodel_utils.cpp @@ -62,7 +62,7 @@ void processNamespaces(FunctionList &list, const NamespaceDom dom) } } -void processNamespaces( FunctionList & list, const NamespaceDom dom, QMap< FunctionDom, Scope > & relations ) +void processNamespaces( FunctionList & list, const NamespaceDom dom, TQMap< FunctionDom, Scope > & relations ) { const NamespaceList nslist = dom->namespaceList(); for (NamespaceList::ConstIterator it = nslist.begin(); it != nslist.end(); ++it) @@ -83,7 +83,7 @@ void processNamespaces( FunctionList & list, const NamespaceDom dom, QMap< Funct } } -void processClasses( FunctionList & list, const ClassDom dom, QMap< FunctionDom, Scope > & relations ) +void processClasses( FunctionList & list, const ClassDom dom, TQMap< FunctionDom, Scope > & relations ) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) @@ -99,7 +99,7 @@ void processClasses( FunctionList & list, const ClassDom dom, QMap< FunctionDom, } } -void processClasses( FunctionList & list, const ClassDom dom, QMap< FunctionDom, Scope > & relations, const NamespaceDom & nsdom ) +void processClasses( FunctionList & list, const ClassDom dom, TQMap< FunctionDom, Scope > & relations, const NamespaceDom & nsdom ) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) @@ -158,7 +158,7 @@ void processNamespaces(FunctionDefinitionList &list, const NamespaceDom dom) } } -void processNamespaces( FunctionDefinitionList & list, const NamespaceDom dom, QMap< FunctionDefinitionDom, Scope > & relations ) +void processNamespaces( FunctionDefinitionList & list, const NamespaceDom dom, TQMap< FunctionDefinitionDom, Scope > & relations ) { const NamespaceList nslist = dom->namespaceList(); for (NamespaceList::ConstIterator it = nslist.begin(); it != nslist.end(); ++it) @@ -179,7 +179,7 @@ void processNamespaces( FunctionDefinitionList & list, const NamespaceDom dom, Q } } -void processClasses( FunctionDefinitionList & list, const ClassDom dom, QMap< FunctionDefinitionDom, Scope > & relations ) +void processClasses( FunctionDefinitionList & list, const ClassDom dom, TQMap< FunctionDefinitionDom, Scope > & relations ) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) @@ -195,7 +195,7 @@ void processClasses( FunctionDefinitionList & list, const ClassDom dom, QMap< Fu } } -void processClasses( FunctionDefinitionList & list, const ClassDom dom, QMap< FunctionDefinitionDom, Scope > & relations, const NamespaceDom & nsdom ) +void processClasses( FunctionDefinitionList & list, const ClassDom dom, TQMap< FunctionDefinitionDom, Scope > & relations, const NamespaceDom & nsdom ) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) @@ -297,8 +297,8 @@ AllFunctionDefinitions allFunctionDefinitionsDetailed( const FileDom & dom ) bool resultTypesFit( const FunctionDom & dec, const FunctionDefinitionDom & def ) { if( !def->resultType().contains("::") ) return dec->resultType() == def->resultType(); - QStringList l1 = dec->scope() + QStringList::split("::", dec->resultType() ); - QStringList l2 = QStringList::split("::", def->resultType() ); + TQStringList l1 = dec->scope() + TQStringList::split("::", dec->resultType() ); + TQStringList l2 = TQStringList::split("::", def->resultType() ); if( l1.isEmpty() || l2.isEmpty() || l1.back() != l2.back() ) return false; @@ -349,7 +349,7 @@ bool compareDeclarationToDefinition( const FunctionDom & dec, const FunctionDefi if (defList[i]->type() != decList[i]->type()) return false; - const QStringList &defScope = def->scope(), &decScope = dec->scope(); + const TQStringList &defScope = def->scope(), &decScope = dec->scope(); if (defScope != decScope) { if (defScope.size() >= decScope.size()) @@ -486,7 +486,7 @@ int findLastVariableLine( ClassDom aClass, CodeModelItem::Access access ) return point; } -QString accessSpecifierToString( CodeModelItem::Access access ) +TQString accessSpecifierToString( CodeModelItem::Access access ) { switch(access) { diff --git a/lib/interfaces/codemodel_utils.h b/lib/interfaces/codemodel_utils.h index 8836e058..2879a424 100644 --- a/lib/interfaces/codemodel_utils.h +++ b/lib/interfaces/codemodel_utils.h @@ -45,7 +45,7 @@ This can be done with following code: @code class MyPred{ public: - MyPred(const QString &name): m_name(name) {} + MyPred(const TQString &name): m_name(name) {} bool operator() (const FunctionDefinitionDom &def) const { @@ -53,7 +53,7 @@ public: } private: - QString m_name; + TQString m_name; }; @endcode */ @@ -333,14 +333,14 @@ struct Scope{ /**Information about functions.*/ struct AllFunctions{ /**Scope of functions.*/ - QMap relations; + TQMap relations; /**List of functions.*/ FunctionList functionList; }; /**Information about function definitions.*/ struct AllFunctionDefinitions{ /**Scope of function definitions.*/ - QMap relations; + TQMap relations; /**List of function definitions.*/ FunctionDefinitionList functionList; }; @@ -361,7 +361,7 @@ void processNamespaces(FunctionList &list, const NamespaceDom dom); @param list The list of functions found by this routine. @param dom The class to look for functions. @param relations The scope information.*/ -void processClasses(FunctionList &list, const ClassDom dom, QMap &relations); +void processClasses(FunctionList &list, const ClassDom dom, TQMap &relations); /**Looks for functions in the class and also saves their scope. Used for classes withing a namespace. @@ -369,13 +369,13 @@ Used for classes withing a namespace. @param dom The class to look for functions. @param relations The scope information. @param nsdom The namespace which contains a class.*/ -void processClasses(FunctionList &list, const ClassDom dom, QMap &relations, const NamespaceDom &nsdom); +void processClasses(FunctionList &list, const ClassDom dom, TQMap &relations, const NamespaceDom &nsdom); /**Looks for functions in the namespace and also saves their scope. @param list The list of functions found by this routine. @param dom The namespace to look for functions. @param relations The scope information.*/ -void processNamespaces(FunctionList &list, const NamespaceDom dom, QMap &relations); +void processNamespaces(FunctionList &list, const NamespaceDom dom, TQMap &relations); } /**Namespace with utilities to find function definitions in the @ref CodeModel.*/ @@ -394,7 +394,7 @@ void processNamespaces(FunctionDefinitionList &list, const NamespaceDom dom); @param list The list of function definitions found by this routine. @param dom The class to look for function definitions. @param relations The scope information.*/ -void processClasses(FunctionDefinitionList &list, const ClassDom dom, QMap &relations); +void processClasses(FunctionDefinitionList &list, const ClassDom dom, TQMap &relations); /**Looks for function definitions in the class and also saves their scope. Used for classes withing a namespace. @@ -402,13 +402,13 @@ Used for classes withing a namespace. @param dom The class to look for function definitions . @param relations The scope information. @param nsdom The namespace which contains a class.*/ -void processClasses(FunctionDefinitionList &list, const ClassDom dom, QMap &relations, const NamespaceDom &nsdom); +void processClasses(FunctionDefinitionList &list, const ClassDom dom, TQMap &relations, const NamespaceDom &nsdom); /**Looks for function definitions in the namespace and also saves their scope. @param list The list of function definitions found by this routine. @param dom The namespace to look for function definitions. @param relations The scope information.*/ -void processNamespaces(FunctionDefinitionList &list, const NamespaceDom dom, QMap &relations); +void processNamespaces(FunctionDefinitionList &list, const NamespaceDom dom, TQMap &relations); } /** @@ -527,14 +527,14 @@ int findLastVariableLine( ClassDom aClass, CodeModelItem::Access access ); * @return string The representation of an access (e.g. "public"). * @author Jonas Jacobi */ -QString accessSpecifierToString( CodeModelItem::Access access ); +TQString accessSpecifierToString( CodeModelItem::Access access ); class CodeModelHelper { private: CodeModel* m_model; FileList m_files; - QString m_fileName; + TQString m_fileName; FunctionDefinitionDom functionDefinitionAt(NamespaceDom ns, int line, int column); diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h index 9a1d6e0d..52dd5a1e 100644 --- a/lib/interfaces/extensions/codebrowserfrontend.h +++ b/lib/interfaces/extensions/codebrowserfrontend.h @@ -29,7 +29,7 @@ class KDevCodeBrowserFrontend : public KDevPlugin { Q_OBJECT public: - KDevCodeBrowserFrontend(const KDevPluginInfo *info, QObject *parent=0, const char *name=0 ) + KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) :KDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {} ///Used by the quickopen-plugin to notify extensions that it jumped to a searched item diff --git a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp index dd71b2d9..1eca4bfc 100644 --- a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp +++ b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp @@ -35,7 +35,7 @@ KDevAppFrontendIface::~KDevAppFrontendIface() {} -void KDevAppFrontendIface::startAppCommand(const QString &directory, const QString &command, bool inTerminal) +void KDevAppFrontendIface::startAppCommand(const TQString &directory, const TQString &command, bool inTerminal) { m_appFrontend->startAppCommand(directory, command, inTerminal); } @@ -55,22 +55,22 @@ void KDevAppFrontendIface::clearView( ) m_appFrontend->clearView(); } -void KDevAppFrontendIface::insertStderrLine( const QCString & line ) +void KDevAppFrontendIface::insertStderrLine( const TQCString & line ) { m_appFrontend->insertStderrLine(line); } -void KDevAppFrontendIface::insertStdoutLine( const QCString & line ) +void KDevAppFrontendIface::insertStdoutLine( const TQCString & line ) { m_appFrontend->insertStdoutLine(line); } -void KDevAppFrontendIface::addPartialStderrLine( const QCString& line ) +void KDevAppFrontendIface::addPartialStderrLine( const TQCString& line ) { m_appFrontend->addPartialStderrLine(line); } -void KDevAppFrontendIface::addPartialStdoutLine( const QCString& line ) +void KDevAppFrontendIface::addPartialStdoutLine( const TQCString& line ) { m_appFrontend->addPartialStdoutLine(line); } diff --git a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h index 636fc140..3903e897 100644 --- a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h +++ b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h @@ -36,14 +36,14 @@ public: ~KDevAppFrontendIface(); k_dcop: - void startAppCommand(const QString &directory, const QString &command, bool inTerminal); + void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal); void stopApplication(); bool isRunning(); void clearView(); - void insertStderrLine(const QCString &line); - void insertStdoutLine(const QCString &line); - void addPartialStderrLine(const QCString &line); - void addPartialStdoutLine(const QCString &line); + void insertStderrLine(const TQCString &line); + void insertStdoutLine(const TQCString &line); + void addPartialStderrLine(const TQCString &line); + void addPartialStdoutLine(const TQCString &line); private: KDevAppFrontend *m_appFrontend; diff --git a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp index a0e0f32c..73305e4a 100644 --- a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp +++ b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp @@ -35,7 +35,7 @@ KDevMakeFrontendIface::~KDevMakeFrontendIface() {} -void KDevMakeFrontendIface::queueCommand(const QString &dir, const QString &command) +void KDevMakeFrontendIface::queueCommand(const TQString &dir, const TQString &command) { m_makeFrontend->queueCommand(dir, command); } diff --git a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h index cde64454..53217359 100644 --- a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h +++ b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h @@ -35,7 +35,7 @@ public: ~KDevMakeFrontendIface(); k_dcop: - void queueCommand(const QString &dir, const QString &command); + void queueCommand(const TQString &dir, const TQString &command); bool isRunning(); private: diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h index 2a762266..4f17154d 100644 --- a/lib/interfaces/extensions/kdevappfrontend.h +++ b/lib/interfaces/extensions/kdevappfrontend.h @@ -26,7 +26,7 @@ #ifndef KDEVAPPFRONTEND_H #define KDEVAPPFRONTEND_H -#include +#include #include /** @@ -68,7 +68,7 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevAppFrontend(const KDevPluginInfo *info, QObject *parent=0, const char *name=0 ) + KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {} /**@return Whether the application is currently running.*/ @@ -83,7 +83,7 @@ public slots: * @param program A program to start. * @param inTerminal If true then the program is started in an external konsole. */ - virtual void startAppCommand(const QString &directory, const QString &program, bool inTerminal) = 0; + virtual void startAppCommand(const TQString &directory, const TQString &program, bool inTerminal) = 0; /** * Stops the currently running application. @@ -94,17 +94,17 @@ public slots: * Inserts a string into the application output view. * @param line A string to insert. */ - virtual void insertStdoutLine(const QCString &line) = 0; + virtual void insertStdoutLine(const TQCString &line) = 0; /** * Inserts a string into the application output view marked as stderr output * (usually colored). * @param line An error string to insert. */ - virtual void insertStderrLine(const QCString &line) = 0; + virtual void insertStderrLine(const TQCString &line) = 0; - virtual void addPartialStderrLine( const QCString& line ) = 0; - virtual void addPartialStdoutLine( const QCString& line ) = 0; + virtual void addPartialStderrLine( const TQCString& line ) = 0; + virtual void addPartialStdoutLine( const TQCString& line ) = 0; /** * Clears the output view. diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h index 4a84410c..b3f5e080 100644 --- a/lib/interfaces/extensions/kdevcreatefile.h +++ b/lib/interfaces/extensions/kdevcreatefile.h @@ -20,7 +20,7 @@ #ifndef KDEVCREATEFILE_H #define KDEVCREATEFILE_H -#include +#include #include @@ -95,15 +95,15 @@ public: // this should be private /**The directory.*/ - QString dir; + TQString dir; /**The name (without directory path).*/ - QString filename; + TQString filename; /**The extension of a file. Extension defines a "type" of the file template to use during file creation.*/ - QString ext; + TQString ext; /**The subtype of a file. "Subtype" defines a file template to use when there are several file templates for each extension.*/ - QString subtype; + TQString subtype; /**Current status.*/ Status status; /**true if the file should be added to a project.*/ @@ -122,11 +122,11 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevCreateFile(const KDevPluginInfo *info, QObject * parent = 0, const char * name = 0) + KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0) :KDevPlugin(info, parent, name) {} /**Creates a new file, within or without the project. - Supply as much information as you know. Leave what you don't know as QString::null. + Supply as much information as you know. Leave what you don't know as TQString::null. The user will be prompted as necessary for the missing information, and the file created, and added to the project as necessary. @param ext File extension (type). @@ -135,10 +135,10 @@ public: @param subtype The subtype, pass this only if an extension is not enough to find the file template. @return @ref CreatedFile instance with information about file and file creation process.*/ - virtual CreatedFile createNewFile(QString ext = QString::null, - QString dir = QString::null, - QString name = QString::null, - QString subtype = QString::null) = 0; + virtual CreatedFile createNewFile(TQString ext = TQString::null, + TQString dir = TQString::null, + TQString name = TQString::null, + TQString subtype = TQString::null) = 0; }; diff --git a/lib/interfaces/extensions/kdevdifffrontend.cpp b/lib/interfaces/extensions/kdevdifffrontend.cpp index 148c8f8c..745703e4 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.cpp +++ b/lib/interfaces/extensions/kdevdifffrontend.cpp @@ -21,7 +21,7 @@ #include "kdevdifffrontend.h" -KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, QObject *parent, const char *name) +KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name) : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") { } diff --git a/lib/interfaces/extensions/kdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h index 34dfd50e..ecf360ad 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.h +++ b/lib/interfaces/extensions/kdevdifffrontend.h @@ -58,12 +58,12 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevDiffFrontend( const KDevPluginInfo *info, QObject *parent=0, const char *name=0 ) + KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {} /**Displays the patch. @param diff A string which contains a patch in unified format.*/ - virtual void showDiff( const QString& diff ) = 0; + virtual void showDiff( const TQString& diff ) = 0; /**Displays a patch file. @param url An url of the patch file.*/ diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h index 3279cfc6..96749bd2 100644 --- a/lib/interfaces/extensions/kdevmakefrontend.h +++ b/lib/interfaces/extensions/kdevmakefrontend.h @@ -26,7 +26,7 @@ #ifndef KDEVMAKEFRONTEND_H #define KDEVMAKEFRONTEND_H -#include +#include #include /** @@ -65,11 +65,11 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevMakeFrontend(const KDevPluginInfo *info, QObject *parent=0, const char *name=0 ) + KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {} /**@return The widget where the make output is shown.*/ - virtual QWidget* widget() { return 0L; } + virtual TQWidget* widget() { return 0L; } /**The component shall start to execute a make-like command. * Commands are always asynchronous. You can submit several jobs @@ -83,7 +83,7 @@ public: * messages. * @param command A shell command to execute. */ - virtual void queueCommand(const QString &dir, const QString &command) = 0; + virtual void queueCommand(const TQString &dir, const TQString &command) = 0; /**@return Whether the application is currently running.*/ virtual bool isRunning() = 0; @@ -95,12 +95,12 @@ signals: /** * Only emitted if the command was succesfully finished. */ - void commandFinished(const QString &command); + void commandFinished(const TQString &command); /** * Emitted if a command failed. */ - void commandFailed(const QString &command); + void commandFailed(const TQString &command); }; #endif diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h index 63fdd34b..09c7bb1b 100644 --- a/lib/interfaces/extensions/kdevquickopen.h +++ b/lib/interfaces/extensions/kdevquickopen.h @@ -54,7 +54,7 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const KDevPluginInfo *info, QObject* parent, const char* name) + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. @@ -119,7 +119,7 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const KDevPluginInfo *info, QObject* parent, const char* name) + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. diff --git a/lib/interfaces/extensions/kdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h index d15dfbae..5ca33079 100644 --- a/lib/interfaces/extensions/kdevsourceformatter.h +++ b/lib/interfaces/extensions/kdevsourceformatter.h @@ -54,16 +54,16 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevSourceFormatter(const KDevPluginInfo *info, QObject* parent, const char* name) + KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name) :KDevPlugin(info, parent, name) {} /**Formats the source. @param text A string with a code. @return The formatted string.*/ - virtual QString formatSource(const QString text) = 0; + virtual TQString formatSource(const TQString text) = 0; /**@return The indentation string. For example, tab or four spaces can be returned.*/ - virtual QString indentString() const = 0; + virtual TQString indentString() const = 0; }; #endif diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index 697b5167..9b0571b8 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -23,11 +23,11 @@ #ifndef KDEVVERSIONCONTROL_H #define KDEVVERSIONCONTROL_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -65,26 +65,26 @@ struct VCSFileInfo @param workRev The current working revision of a file. @param repoRev The last revision of a file in the repository. @param aState The state of a file.*/ - VCSFileInfo( QString fn, QString workRev, QString repoRev, FileState aState ) + VCSFileInfo( TQString fn, TQString workRev, TQString repoRev, FileState aState ) : fileName(fn), workRevision(workRev), repoRevision(repoRev), state(aState) {} /**The file name.*/ - QString fileName; // Yeah, _just_ the file name ;-) + TQString fileName; // Yeah, _just_ the file name ;-) /**The working revision number.*/ - QString workRevision; + TQString workRevision; /**The repository revision number.*/ - QString repoRevision; + TQString repoRevision; /**The state of a file.*/ FileState state; /**@return A descriptive string with all VCS related info about the file.*/ - QString toString() const + TQString toString() const { return "(" + fileName + ", " + workRevision + ", " + repoRevision + ", " + state2String( state ) + ")"; } /**@return A textual VCS state description.*/ - static QString state2String( FileState state ) + static TQString state2String( FileState state ) { switch (state) { @@ -108,9 +108,9 @@ struct VCSFileInfo /**@class FileDom Info for a bunch of files that got modified. -This is a type definition: @code QMap VCSFileInfoMap; @endcode +This is a type definition: @code TQMap VCSFileInfoMap; @endcode */ -typedef QMap VCSFileInfoMap; +typedef TQMap VCSFileInfoMap; class KDevVCSFileInfoProvider; @@ -146,14 +146,14 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevVersionControl(const KDevPluginInfo *info, QObject *parent, const char *name ) + KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name ) :KDevPlugin(info, parent, name ) {} /**Creates a new project in the passed path @p dir. This should instantiate VCS infrastructure and import a project into the VCS in that directory. @param dir The absolute path to the directory where VCS infrastructure should be created.*/ - virtual void createNewProject(const QString& dir) = 0; + virtual void createNewProject(const TQString& dir) = 0; /**Fetches a module from remote repository, so it can be used for importing. @return true in case of success.*/ @@ -167,14 +167,14 @@ public: @param dirPath The absolute path of the directory. @return true if the directory is valid for this version control warning: this returns false by default.*/ - virtual bool isValidDirectory(const QString &dirPath) const = 0; + virtual bool isValidDirectory(const TQString &dirPath) const = 0; signals: /**Emitted when the Version Control has finished importing a module from remote repository @param destinationDir The directory where the module has been fetched.*/ - void finishedFetching(QString destinationDir); + void finishedFetching(TQString destinationDir); }; @@ -189,7 +189,7 @@ public: @param parent The parent VCS plugin. @param name The name of a provider object.*/ KDevVCSFileInfoProvider(KDevVersionControl *parent, const char *name) - : QObject( parent, name ), m_owner(parent) {} + : TQObject( parent, name ), m_owner(parent) {} /**Gets the status for local files in the specified directory: the info are collected locally so they are necessarily in sync with the repository @@ -197,7 +197,7 @@ public: This is a synchronous operation (blocking). @param dirPath The relative (to project dir) directory path to stat. @return Status for all registered files.*/ - virtual const VCSFileInfoMap *status(const QString &dirPath) = 0; + virtual const VCSFileInfoMap *status(const TQString &dirPath) = 0; /**Starts a request for directory status to the remote repository. Requests and answers are asynchronous. @@ -212,7 +212,7 @@ 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 requestStatus( const QString &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. diff --git a/lib/interfaces/external/designer.cpp b/lib/interfaces/external/designer.cpp index c66fbe31..606fd2b4 100644 --- a/lib/interfaces/external/designer.cpp +++ b/lib/interfaces/external/designer.cpp @@ -20,7 +20,7 @@ namespace KInterfaceDesigner{ -Designer::Designer(QObject *parent, const char *name) +Designer::Designer(TQObject *parent, const char *name) :KParts::ReadWritePart(parent, name) { } diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index d0fdebd6..c254ab07 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -39,13 +39,13 @@ enum FunctionType { /**Function.*/ struct Function{ /**Return type.*/ - QString returnType; + TQString returnType; /**Function name.*/ - QString function; + TQString function; /**Specifier, e.g. virtual, static, etc.*/ - QString specifier; + TQString specifier; /**Access, e.g. private, protected, public, etc.*/ - QString access; + TQString access; /**Function type.*/ FunctionType type; }; @@ -66,31 +66,31 @@ mimetype then it becomes automatically integrated into KDevelop IDE. class Designer: public KParts::ReadWritePart{ Q_OBJECT public: - Designer(QObject *parent, const char *name); + Designer(TQObject *parent, const char *name); /**Reimplement this to be able to open projects.*/ - virtual void openProject(const QString &projectFile) = 0; + virtual void openProject(const TQString &projectFile) = 0; /**Reimplement this return the type of this designer.*/ virtual DesignerType designerType() = 0; signals: /**Emit this signal when a function was added by a designer. For example, when a slot or a callback function was defined.*/ - void addedFunction(DesignerType type, const QString &formName, Function function); + void addedFunction(DesignerType type, const TQString &formName, Function function); /**Emit this signal when a function was removed by a designer.*/ - void removedFunction(DesignerType type, const QString &formName, Function function); + void removedFunction(DesignerType type, const TQString &formName, Function function); /**Emit this signal when a function signature was edited by a designer.*/ - void editedFunction(DesignerType type, const QString &formName, Function oldFunction, Function function); + void editedFunction(DesignerType type, const TQString &formName, Function oldFunction, Function function); /**Emit this signal when a designer wants to open the editor with function definition.*/ - void editFunction(DesignerType type, const QString &formName, const QString &functionName); + void editFunction(DesignerType type, const TQString &formName, const TQString &functionName); /**Emit this signal when a designer wants to open the editor for a form sources.*/ - void editSource(DesignerType type, const QString &formName); + void editSource(DesignerType type, const TQString &formName); /**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 newStatus(const QString &formName, int status); + void newStatus(const TQString &formName, int status); }; } diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp index 5d87eec7..d62130f9 100644 --- a/lib/interfaces/extras/kdevcompileroptions.cpp +++ b/lib/interfaces/extras/kdevcompileroptions.cpp @@ -1,6 +1,6 @@ #include "kdevcompileroptions.h" -KDevCompilerOptions::KDevCompilerOptions( QObject * parent, const char * name ) - :QObject(parent, name) +KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name ) + :TQObject(parent, name) { } diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h index 18e0fd2e..bac7e16e 100644 --- a/lib/interfaces/extras/kdevcompileroptions.h +++ b/lib/interfaces/extras/kdevcompileroptions.h @@ -26,7 +26,7 @@ The interface to compiler options configuration. #ifndef _KDEVCOMPILEROPTIONS_H_ #define _KDEVCOMPILEROPTIONS_H_ -#include +#include /** The interface to compiler options configuration. @@ -34,22 +34,22 @@ Used by build systems to give users a compiler options configuration dialog. Common use case: @code -static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject *parent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) return 0; - KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library())); + KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library())); if (!factory) return 0; - QStringList args; - QVariant prop = service->property("X-KDevelop-Args"); + TQStringList args; + TQVariant prop = service->property("X-KDevelop-Args"); if (prop.isValid()) - args = QStringList::split(" ", prop.toString()); + args = TQStringList::split(" ", prop.toString()); - QObject *obj = factory->create(parent, service->name().latin1(), + TQObject *obj = factory->create(parent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) @@ -61,7 +61,7 @@ static KDevCompilerOptions *createCompilerOptions( const QString &name, QObject ... KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent); -QString flags = ""; //old compiler flags +TQString flags = ""; //old compiler flags if ( plugin ) { flags = plugin->exec( parent, flags ); //new compiler flags are returned @@ -74,7 +74,7 @@ class KDevCompilerOptions : public QObject Q_OBJECT public: - KDevCompilerOptions( QObject *parent=0, const char *name=0 ); + KDevCompilerOptions( TQObject *parent=0, const char *name=0 ); /** * Opens a dialog which allows the user to configure the @@ -82,9 +82,9 @@ public: * will be set from the flags argument of this method. * After the dialog is accepted, the new settings will * be returned as a string. If the dialog was cancelled, - * QString::null is returned. + * TQString::null is returned. */ - virtual QString exec(QWidget *parent, const QString &flags) = 0; + virtual TQString exec(TQWidget *parent, const TQString &flags) = 0; }; #endif diff --git a/lib/interfaces/extras/kdevvcsintegrator.cpp b/lib/interfaces/extras/kdevvcsintegrator.cpp index 88dce474..5a6ab429 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.cpp +++ b/lib/interfaces/extras/kdevvcsintegrator.cpp @@ -18,8 +18,8 @@ */ #include "kdevvcsintegrator.h" -KDevVCSIntegrator::KDevVCSIntegrator(QObject *parent, const char *name) - :QObject(parent, name) +KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name) + :TQObject(parent, name) { } diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h index 62928cae..0efc71b5 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.h +++ b/lib/interfaces/extras/kdevvcsintegrator.h @@ -19,7 +19,7 @@ #ifndef KDEVVCSINTEGRATOR_H #define KDEVVCSINTEGRATOR_H -#include +#include /** @file kdevvcsintegrator.h @@ -34,11 +34,11 @@ VCS Integration Dialog. Usually it is created as: @code -class MyVCSDialog: public QWidget, public VCSDialog { - MyVCSDialog(QWidget *parent = 0, const char *name = 0); +class MyVCSDialog: public TQWidget, public VCSDialog { + MyVCSDialog(TQWidget *parent = 0, const char *name = 0); virtual void accept() { ... } - virtual void init(const QString &projectName, const QString &projectLocation) { ... } - virtual QWidget *self() { + virtual void init(const TQString &projectName, const TQString &projectLocation) { ... } + virtual TQWidget *self() { return const_cast(this); } } @@ -47,14 +47,14 @@ class MyVCSDialog: public QWidget, public VCSDialog { class VCSDialog { public: VCSDialog() { } - /**Implement all integration actions here. Do not use QDialog::accept method + /**Implement all integration actions here. Do not use TQDialog::accept method to perform integration actions.*/ virtual void accept() = 0; /**Init integration dialog with the project name and location.*/ - virtual void init(const QString &projectName, const QString &projectLocation) = 0; + virtual void init(const TQString &projectName, const TQString &projectLocation) = 0; /**Reimplement to return an actual integration widget. Use QWidgets for that, not QDialogs because integrator dialogs are usually have parent containers.*/ - virtual QWidget *self() = 0; + virtual TQWidget *self() = 0; }; /** @@ -62,15 +62,15 @@ The interface to VCS integrators. VCS integrator takes care about setting up VCS for new and existing projects. It can, for example, perform checkout or import operations. */ -class KDevVCSIntegrator: public QObject { +class KDevVCSIntegrator: public TQObject { Q_OBJECT public: - KDevVCSIntegrator(QObject *parent = 0, const char *name = 0); + KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); /**Reimplement to return a dialog to fetch the project from VCS.*/ - virtual VCSDialog *fetcher(QWidget *parent) = 0; + virtual VCSDialog *fetcher(TQWidget *parent) = 0; /**Reimplement to return a dialog to integrate the project into VCS.*/ - virtual VCSDialog *integrator(QWidget *parent) = 0; + virtual VCSDialog *integrator(TQWidget *parent) = 0; }; #endif diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp index 38fdf4a9..aae068a3 100644 --- a/lib/interfaces/hashedstring.cpp +++ b/lib/interfaces/hashedstring.cpp @@ -24,9 +24,9 @@ //It needs to be measured whether this flag should be turned on or off. It seems just to move the complexity from one position to the other, without any variant being really better. #define USE_HASHMAP -size_t fastHashString( const QString& str ); +size_t fastHashString( const TQString& str ); -size_t hashStringSafe( const QString& str ) { +size_t hashStringSafe( const TQString& str ) { size_t hash = 0; int len = str.length(); for( int a = 0; a < len; a++ ) { @@ -35,17 +35,17 @@ size_t hashStringSafe( const QString& str ) { return hash; } -size_t HashedString::hashString( const QString& str ) +size_t HashedString::hashString( const TQString& str ) { return fastHashString( str ); } -size_t fastHashString( const QString& str ) { +size_t fastHashString( const TQString& str ) { size_t hash = 0; if( !str.isEmpty() ) { - const QChar* curr = str.unicode(); - const QChar* end = curr + str.length(); - QChar c; + const TQChar* curr = str.unicode(); + const TQChar* end = curr + str.length(); + TQChar c; for(; curr < end ;) { c = *curr; hash = c.unicode() + ( hash * 17 ); @@ -233,7 +233,7 @@ size_t HashedStringSet::hash() const { return m_data->m_hash; } -void HashedStringSet::read( QDataStream& stream ) { +void HashedStringSet::read( TQDataStream& stream ) { bool b; stream >> b; if( b ) { @@ -250,7 +250,7 @@ void HashedStringSet::read( QDataStream& stream ) { } } -void HashedStringSet::write( QDataStream& stream ) const { +void HashedStringSet::write( TQDataStream& stream ) const { bool b = m_data; stream << b; if( b ) { @@ -272,13 +272,13 @@ std::string HashedStringSet::print() const { return s.str(); } -QDataStream& operator << ( QDataStream& stream, const HashedString& str ) { +TQDataStream& operator << ( TQDataStream& stream, const HashedString& str ) { stream << str.m_str; stream << str.m_hash; return stream; } -QDataStream& operator >> ( QDataStream& stream, HashedString& str ) { +TQDataStream& operator >> ( TQDataStream& stream, HashedString& str ) { stream >> str.m_str; stream >> str.m_hash; return stream; diff --git a/lib/interfaces/hashedstring.h b/lib/interfaces/hashedstring.h index e62ab2e3..ac0d2e67 100644 --- a/lib/interfaces/hashedstring.h +++ b/lib/interfaces/hashedstring.h @@ -15,8 +15,8 @@ #ifndef HASHED_STRING_H #define HASHED_STRING_H -#include -#include +#include +#include #include #include #include @@ -27,7 +27,7 @@ class HashedString { public: HashedString() : m_hash( 0 ) {} - HashedString( const QString& str ) : m_str( str ) { + HashedString( const TQString& str ) : m_str( str ) { initHash(); } @@ -39,7 +39,7 @@ class HashedString { return m_hash; } - QString str() const { + TQString str() const { return m_str; } @@ -58,21 +58,21 @@ class HashedString { return false; } - static size_t hashString( const QString& str ); + static size_t hashString( const TQString& str ); private: void initHash(); - QString m_str; + TQString m_str; size_t m_hash; - friend QDataStream& operator << ( QDataStream& stream, const HashedString& str ); - friend QDataStream& operator >> ( QDataStream& stream, HashedString& str ); + friend TQDataStream& operator << ( TQDataStream& stream, const HashedString& str ); + friend TQDataStream& operator >> ( TQDataStream& stream, HashedString& str ); }; -QDataStream& operator << ( QDataStream& stream, const HashedString& str ); +TQDataStream& operator << ( TQDataStream& stream, const HashedString& str ); -QDataStream& operator >> ( QDataStream& stream, HashedString& str ); +TQDataStream& operator >> ( TQDataStream& stream, HashedString& str ); class HashedStringSetData; class HashedStringSetGroup; @@ -107,8 +107,8 @@ class HashedStringSet { bool operator == ( const HashedStringSet& rhs ) const; - void read( QDataStream& stream ); - void write( QDataStream& stream ) const; + void read( TQDataStream& stream ); + void write( TQDataStream& stream ) const; std::string print() const; diff --git a/lib/interfaces/katedocumentmanagerinterface.cpp b/lib/interfaces/katedocumentmanagerinterface.cpp index b39fdb4f..fa2b0c3d 100644 --- a/lib/interfaces/katedocumentmanagerinterface.cpp +++ b/lib/interfaces/katedocumentmanagerinterface.cpp @@ -27,7 +27,7 @@ #include KateDocumentManagerInterface::KateDocumentManagerInterface( KDevPartController *pc) - : QObject(pc), DCOPObject("KateDocumentManager"), m_controller(pc) + : TQObject(pc), DCOPObject("KateDocumentManager"), m_controller(pc) { } @@ -49,11 +49,11 @@ DCOPRef KateDocumentManagerInterface::document( uint n ) DCOPRef KateDocumentManagerInterface::documentWithID( uint id ) { - QString dcopobj = "KateDocument#" + QString::number(id); + TQString dcopobj = "KateDocument#" + TQString::number(id); return DCOPRef(kapp->dcopClient()->appId(), dcopobj.latin1() ); } -DCOPRef KateDocumentManagerInterface::openURL( const KURL &url, const QString &encoding ) +DCOPRef KateDocumentManagerInterface::openURL( const KURL &url, const TQString &encoding ) { m_controller->editDocument(url); m_controller->setEncoding(encoding); diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h index 41c1bd60..f4264d2e 100644 --- a/lib/interfaces/katedocumentmanagerinterface.h +++ b/lib/interfaces/katedocumentmanagerinterface.h @@ -19,7 +19,7 @@ #ifndef KATEDOCUMENTMANAGERINTERFACE_H #define KATEDOCUMENTMANAGERINTERFACE_H -#include +#include #include #include #include @@ -30,7 +30,7 @@ This is an emulated interface to provide compatibility with Kate scripts. @author KDevelop Authors */ -class KateDocumentManagerInterface : public QObject, public DCOPObject { +class KateDocumentManagerInterface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -43,7 +43,7 @@ k_dcop: DCOPRef activeDocument(); DCOPRef document( uint n ); DCOPRef documentWithID( uint id ); - DCOPRef openURL( const KURL &url, const QString &encoding ); + DCOPRef openURL( const KURL &url, const TQString &encoding ); bool closeAllDocuments(); bool closeDocument( uint n ); bool isOpen( const KURL &url ); diff --git a/lib/interfaces/kdevapi.cpp b/lib/interfaces/kdevapi.cpp index d4dd1749..04cf078d 100644 --- a/lib/interfaces/kdevapi.cpp +++ b/lib/interfaces/kdevapi.cpp @@ -33,7 +33,7 @@ public: m_codeRepository(0) {} - QDomDocument *m_projectDom; + TQDomDocument *m_projectDom; KDevProject *m_project; KDevLanguageSupport *m_languageSupport; KDevCodeRepository* m_codeRepository; @@ -75,12 +75,12 @@ void KDevApi::setLanguageSupport(KDevLanguageSupport *languageSupport) d->m_languageSupport = languageSupport; } -QDomDocument *KDevApi::projectDom() const +TQDomDocument *KDevApi::projectDom() const { return d->m_projectDom; } -void KDevApi::setProjectDom(QDomDocument *dom) +void KDevApi::setProjectDom(TQDomDocument *dom) { d->m_projectDom = dom; } diff --git a/lib/interfaces/kdevapi.h b/lib/interfaces/kdevapi.h index c1101b17..84337183 100644 --- a/lib/interfaces/kdevapi.h +++ b/lib/interfaces/kdevapi.h @@ -20,7 +20,7 @@ #ifndef KDEVAPI_H #define KDEVAPI_H -#include +#include class QStringList; class QDomDocument; @@ -71,11 +71,11 @@ public: virtual CodeModel *codeModel() const = 0; /**@return A reference to the DOM tree that represents the project file or 0 if no project is loaded.*/ - QDomDocument *projectDom() const; + TQDomDocument *projectDom() const; /**Sets the Document Object Model for the current project. @param dom The project DOM.*/ - void setProjectDom(QDomDocument *dom); + void setProjectDom(TQDomDocument *dom); /**@return A reference to the current project component or 0 if no project is loaded.*/ KDevProject *project() const; diff --git a/lib/interfaces/kdevcoderepository.cpp b/lib/interfaces/kdevcoderepository.cpp index 76f7d0e7..26249544 100644 --- a/lib/interfaces/kdevcoderepository.cpp +++ b/lib/interfaces/kdevcoderepository.cpp @@ -21,7 +21,7 @@ struct KDevCodeRepositoryData { Catalog* mainCatalog; - QValueList catalogs; + TQValueList catalogs; KDevCodeRepositoryData(): mainCatalog( 0 ) {} }; @@ -63,7 +63,7 @@ void KDevCodeRepository::touchCatalog( Catalog * catalog ) emit catalogChanged( catalog ); } -QValueList< Catalog * > KDevCodeRepository::registeredCatalogs( ) +TQValueList< Catalog * > KDevCodeRepository::registeredCatalogs( ) { return d->catalogs; } diff --git a/lib/interfaces/kdevcoderepository.h b/lib/interfaces/kdevcoderepository.h index 8513e00e..8b862f6b 100644 --- a/lib/interfaces/kdevcoderepository.h +++ b/lib/interfaces/kdevcoderepository.h @@ -19,8 +19,8 @@ #ifndef KDEVCODEREPOSITORY_H #define KDEVCODEREPOSITORY_H -#include -#include +#include +#include /** @file kdevcoderepository.h @@ -62,7 +62,7 @@ public: void setMainCatalog( Catalog* mainCatalog ); /**@return The list of registered catalogs.*/ - QValueList registeredCatalogs(); + TQValueList registeredCatalogs(); /**Registers catalog in the repository. @param catalog The catalog to register.*/ diff --git a/lib/interfaces/kdevcore.cpp b/lib/interfaces/kdevcore.cpp index 6a7e5c01..dda66cbf 100644 --- a/lib/interfaces/kdevcore.cpp +++ b/lib/interfaces/kdevcore.cpp @@ -50,8 +50,8 @@ bool Context::hasType( int aType ) const class EditorContext::Private { public: - Private( const KURL &url, int line, int col, const QString &linestr, - const QString &wordstr ) + Private( const KURL &url, int line, int col, const TQString &linestr, + const TQString &wordstr ) : m_url(url), m_line(line), m_col(col), m_linestr(linestr), m_wordstr(wordstr) { @@ -59,11 +59,11 @@ public: KURL m_url; int m_line, m_col; - QString m_linestr, m_wordstr; + TQString m_linestr, m_wordstr; }; EditorContext::EditorContext( const KURL &url, int line, int col, - const QString &linestr, const QString &wordstr ) + const TQString &linestr, const TQString &wordstr ) : Context(), d( new Private(url, line, col, linestr, wordstr) ) { } @@ -94,12 +94,12 @@ int EditorContext::col() const return d->m_col; } -QString EditorContext::currentLine() const +TQString EditorContext::currentLine() const { return d->m_linestr; } -QString EditorContext::currentWord() const +TQString EditorContext::currentWord() const { return d->m_wordstr; } @@ -124,7 +124,7 @@ public: m_isDirectory = URLUtil::isDirectory( m_urls[0] ); } } - Private( const QString &fileName, bool isDirectory ) + Private( const TQString &fileName, bool isDirectory ) : m_fileName(fileName), m_isDirectory(isDirectory) { } @@ -132,7 +132,7 @@ public: KURL::List m_urls; /// \FIXME the following data members should be removed, but first other // parts should be modified to comply with this change. - QString m_fileName; + TQString m_fileName; bool m_isDirectory; }; @@ -164,16 +164,16 @@ const KURL::List &FileContext::urls() const class DocumentationContext::Private { public: - Private( const QString &url, const QString &selection ) + Private( const TQString &url, const TQString &selection ) : m_url(url), m_selection(selection) { } - QString m_url; - QString m_selection; + TQString m_url; + TQString m_selection; }; -DocumentationContext::DocumentationContext( const QString &url, const QString &selection ) +DocumentationContext::DocumentationContext( const TQString &url, const TQString &selection ) : Context(), d( new Private(url, selection) ) { } @@ -204,12 +204,12 @@ int DocumentationContext::type() const return Context::DocumentationContext; } -QString DocumentationContext::url() const +TQString DocumentationContext::url() const { return d->m_url; } -QString DocumentationContext::selection() const +TQString DocumentationContext::selection() const { return d->m_selection; } @@ -285,8 +285,8 @@ const ProjectModelItem* ProjectModelItemContext::item() const // class KDevCore /////////////////////////////////////////////////////////////////////////////// -KDevCore::KDevCore( QObject *parent, const char *name ) - : QObject( parent, name ) +KDevCore::KDevCore( TQObject *parent, const char *name ) + : TQObject( parent, name ) { new KDevCoreIface(this); } diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index a196392f..456e5e39 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -33,9 +33,9 @@ The interface to the application core and context menu classes. */ -#include -#include -#include +#include +#include +#include #include @@ -70,23 +70,23 @@ add "commit" and "update" menu items to the context menu of a file. -# Fill a context menu: @code core()->fillContextMenu(&menu, &context); @endcode -# Show the popup menu: @code menu.exec(event->globalPos()); @endcode . -In this example @em event is an object of QContextMenuEvent class which you have access -to if you reimplement QWidget::contextMenuEvent method. +In this example @em event is an object of TQContextMenuEvent class which you have access +to if you reimplement TQWidget::contextMenuEvent method. How to fill context menu from a plugin: --# Create a @code contextMenu(QPopupMenu *, const Context *) @endcode slot in your plugin class. --# Connect KDevCore::contextMenu(QPopupMenu *, const Context *) signal to that slot in +-# Create a @code contextMenu(TQPopupMenu *, const Context *) @endcode slot in your plugin class. +-# Connect KDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in the constructor of your plugin:\n @code -connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *))); +connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); @endcode -# Fill the menu in the slot you created, for example:\n @code if (context->hasType(Context::EditorContext)) { const EditorContext *econtext = static_cast(context); - int id = popup->insertItem(i18n("My Menu Item 1"), this, SLOT(myMenuAction1())); + int id = popup->insertItem(i18n("My Menu Item 1"), this, TQT_SLOT(myMenuAction1())); popup->setWhatsThis(id, i18n("What's this for my menu item 1")); } else if context->hasType(MyContext)) @@ -138,7 +138,7 @@ public: @param linestr The content of the line where the cursor is. @param wordstr The current word under the cursor.*/ EditorContext(const KURL &url, int line, int col, - const QString &linestr, const QString &wordstr); + const TQString &linestr, const TQString &wordstr); /**Destructor.*/ virtual ~EditorContext(); @@ -154,13 +154,13 @@ public: /**@return The column number for the cursor position.*/ int col() const; - /**@return A QString with the content of the line which this context was + /**@return A TQString with the content of the line which this context was invoked for.*/ - QString currentLine() const; + TQString currentLine() const; - /**@return A QString containing the word near to the cursor when this + /**@return A TQString containing the word near to the cursor when this context object was created.*/ - QString currentWord() const; + TQString currentWord() const; private: class Private; @@ -181,7 +181,7 @@ public: /**Builds a DocumentationContext. @param url The URL that the context will be for. @param selection Selected text.*/ - DocumentationContext(const QString &url, const QString &selection ); + DocumentationContext(const TQString &url, const TQString &selection ); /**Copy constructor.*/ DocumentationContext(const DocumentationContext &); @@ -193,10 +193,10 @@ public: virtual int type() const; /**@return The url of the document this context was invoked for.*/ - QString url() const; + TQString url() const; /**@return The selected text in the document.*/ - QString selection() const; + TQString selection() const; private: class Private; @@ -302,9 +302,9 @@ class KDevCore: public QObject Q_OBJECT public: /**Constructor - @param parent The QObject that's the parent of this class. + @param parent The TQObject that's the parent of this class. @param name The name of the class.*/ - KDevCore(QObject *parent=0, const char *name=0); + KDevCore(TQObject *parent=0, const char *name=0); /**Destructor.*/ virtual ~KDevCore(); @@ -319,7 +319,7 @@ public: @sa Context for a detailed explanation of context menu initializations and usage. @param popup The popup menu to fill. @param context The pointer to a Context object of this popup menu.*/ - virtual void fillContextMenu(QPopupMenu *popup, const Context *context) = 0; + virtual void fillContextMenu(TQPopupMenu *popup, const Context *context) = 0; /**Closes the current project and open the new one. You cannot use the @ref KDevPlugin::project() * method right after opening a new project, as it will return a null pointer. @@ -327,7 +327,7 @@ public: *to do the job needed after the project is opened or connect a slot to the *@ref projectOpened signal. * @param projectFileName The file name of the project to open.*/ - virtual void openProject(const QString& projectFileName) = 0; + virtual void openProject(const TQString& projectFileName) = 0; /**Marks the component as running (or not running). As long as at least one component is running, the stop button is enabled. When it is pressed, @@ -365,7 +365,7 @@ signals: @sa Context for a detailed explanation of context menu initializations and usage. @param popupMenu The popup menu to fill. @param context The Context of this popup menu.*/ - void contextMenu(QPopupMenu *popupMenu, const Context *context); + void contextMenu(TQPopupMenu *popupMenu, const Context *context); /**Expects that a configuration page for use in the KDevelop settings dialog is created by the component. diff --git a/lib/interfaces/kdevdesignerintegration.cpp b/lib/interfaces/kdevdesignerintegration.cpp index 365e6848..0ba325ab 100644 --- a/lib/interfaces/kdevdesignerintegration.cpp +++ b/lib/interfaces/kdevdesignerintegration.cpp @@ -24,8 +24,8 @@ public: KDevDesignerIntegrationIface *m_iface; }; -KDevDesignerIntegration::KDevDesignerIntegration(QObject *parent, const char *name) - : QObject(parent, name) +KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name) + : TQObject(parent, name) { dptr = new KDevDesignerIntegrationPrivate(); diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h index cb20fc04..c1604a4a 100644 --- a/lib/interfaces/kdevdesignerintegration.h +++ b/lib/interfaces/kdevdesignerintegration.h @@ -20,8 +20,8 @@ #define KDEVDESIGNERINTEGRATION_H #include -#include -#include +#include +#include /** @file kdevdesignerintegration.h @@ -55,40 +55,40 @@ public: /**Constructor. @param parent Parent object. @param name Internal name.*/ - KDevDesignerIntegration(QObject *parent = 0, const char *name = 0); + KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0); /**Destructor.*/ ~KDevDesignerIntegration(); /**Saves designer integration settings.*/ - virtual void saveSettings(QDomDocument dom, QString path) = 0; + virtual void saveSettings(TQDomDocument dom, TQString path) = 0; /**Loads designer integration settings.*/ - virtual void loadSettings(QDomDocument dom, QString path) = 0; + virtual void loadSettings(TQDomDocument dom, TQString path) = 0; public slots: /**Adds the implementation for a function. @param formName The name of a GUI form. @param function The function which needs to be implemented in the source.*/ - virtual void addFunction(const QString &formName, KInterfaceDesigner::Function function) = 0; + virtual void addFunction(const TQString &formName, KInterfaceDesigner::Function function) = 0; /**Removes the implementation of a function. @param formName The name of a GUI form. @param function The function which needs to be removed from the source.*/ - virtual void removeFunction(const QString &formName, KInterfaceDesigner::Function function) = 0; + virtual void removeFunction(const TQString &formName, KInterfaceDesigner::Function function) = 0; /**Edites the implementation of a function. @param formName The name of a GUI form. @param oldFunction The function which needs to be edited from the source. @param function The new function declaration.*/ - virtual void editFunction(const QString &formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function) = 0; + virtual void editFunction(const TQString &formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function) = 0; /**Opens the function and jumps to the line number of its definition (declaration). @param formName The name of a GUI form. @param functionName The name of a function to find in the source.*/ - virtual void openFunction(const QString &formName, const QString &functionName) = 0; + virtual void openFunction(const TQString &formName, const TQString &functionName) = 0; /**Opens the form source. @param formName The name of a GUI form.*/ - virtual void openSource(const QString &formName) = 0; + virtual void openSource(const TQString &formName) = 0; private: class KDevDesignerIntegrationPrivate; KDevDesignerIntegrationPrivate *dptr; diff --git a/lib/interfaces/kdevdesignerintegrationiface.cpp b/lib/interfaces/kdevdesignerintegrationiface.cpp index 3ffc0c27..964ca340 100644 --- a/lib/interfaces/kdevdesignerintegrationiface.cpp +++ b/lib/interfaces/kdevdesignerintegrationiface.cpp @@ -31,31 +31,31 @@ KDevDesignerIntegrationIface::~KDevDesignerIntegrationIface() { } -void KDevDesignerIntegrationIface::addFunction( const QString & formName, QString returnType, QString function, QString specifier, QString access, uint type ) +void KDevDesignerIntegrationIface::addFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) { KInterfaceDesigner::Function f = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type }; m_designer->addFunction(formName, f); } -void KDevDesignerIntegrationIface::removeFunction( const QString & formName, QString returnType, QString function, QString specifier, QString access, uint type ) +void KDevDesignerIntegrationIface::removeFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) { KInterfaceDesigner::Function f = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type }; m_designer->addFunction(formName, f); } -void KDevDesignerIntegrationIface::editFunction( const QString & formName, QString oldReturnType, QString oldFunction, QString oldSpecifier, QString oldAccess, uint oldType, QString returnType, QString function, QString specifier, QString access, uint type ) +void KDevDesignerIntegrationIface::editFunction( const TQString & formName, TQString oldReturnType, TQString oldFunction, TQString oldSpecifier, TQString oldAccess, uint oldType, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) { KInterfaceDesigner::Function fold = {oldReturnType, oldFunction, oldSpecifier, oldAccess, (KInterfaceDesigner::FunctionType)oldType }; KInterfaceDesigner::Function fnew = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type }; m_designer->editFunction(formName,fold,fnew); } -void KDevDesignerIntegrationIface::openFunction( const QString & formName, const QString & functionName ) +void KDevDesignerIntegrationIface::openFunction( const TQString & formName, const TQString & functionName ) { m_designer->openFunction(formName,functionName); } -void KDevDesignerIntegrationIface::openSource( const QString & formName ) +void KDevDesignerIntegrationIface::openSource( const TQString & formName ) { m_designer->openSource(formName); } diff --git a/lib/interfaces/kdevdesignerintegrationiface.h b/lib/interfaces/kdevdesignerintegrationiface.h index f6de264e..c6c8988a 100644 --- a/lib/interfaces/kdevdesignerintegrationiface.h +++ b/lib/interfaces/kdevdesignerintegrationiface.h @@ -34,13 +34,13 @@ public: ~KDevDesignerIntegrationIface(); k_dcop: - void addFunction(const QString &formName, QString returnType, QString function,QString specifier,QString access,uint type); - void removeFunction(const QString &formName, QString returnType, QString function,QString specifier,QString access,uint type); - void editFunction(const QString &formName, QString oldReturnType, QString oldFunction, - QString oldSpecifier,QString oldAccess,uint oldType, - QString returnType, QString function,QString specifier,QString access,uint type); - void openFunction(const QString &formName, const QString &functionName); - void openSource(const QString &formName); + void addFunction(const TQString &formName, TQString returnType, TQString function,TQString specifier,TQString access,uint type); + void removeFunction(const TQString &formName, TQString returnType, TQString function,TQString specifier,TQString access,uint type); + void editFunction(const TQString &formName, TQString oldReturnType, TQString oldFunction, + TQString oldSpecifier,TQString oldAccess,uint oldType, + TQString returnType, TQString function,TQString specifier,TQString access,uint type); + void openFunction(const TQString &formName, const TQString &functionName); + void openSource(const TQString &formName); private: KDevDesignerIntegration *m_designer; diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h index e5dfa25a..f928d815 100644 --- a/lib/interfaces/kdevgenericfactory.h +++ b/lib/interfaces/kdevgenericfactory.h @@ -51,7 +51,7 @@ static const KDevPluginInfo data("KDevDummyPlugin"); typedef KDevGenericFactory DummyPluginFactory; K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) -DummyPlugin::DummyPlugin(QObject *parent, const char *name, const QStringList & ) +DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & ) :KDevPlugin(&data, parent, name) { } @@ -61,7 +61,7 @@ In the example above the duplication of information is avoided as same @ref KDev objects are used for plugin and for plugin factory. This is possible because @ref KDevPluginInfo class has an operator to cast @ref KDevPluginInfo to @ref KAboutData. */ -template +template class KDevGenericFactory: public KGenericFactory { public: diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp index ab171bb1..9b3cc40b 100644 --- a/lib/interfaces/kdevlanguagesupport.cpp +++ b/lib/interfaces/kdevlanguagesupport.cpp @@ -29,7 +29,7 @@ #include "kdevdesignerintegration.h" #include "kdevlanguagesupport.h" -KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, QObject *parent, const char *name) +KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name) : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" ) { } @@ -48,17 +48,17 @@ KMimeType::List KDevLanguageSupport::mimeTypes() return KMimeType::List(); } -QString KDevLanguageSupport::formatTag( const Tag& /*tag*/ ) +TQString KDevLanguageSupport::formatTag( const Tag& /*tag*/ ) { - return QString::null; + return TQString::null; } -QString KDevLanguageSupport::formatClassName(const QString &name) +TQString KDevLanguageSupport::formatClassName(const TQString &name) { return name; } -QString KDevLanguageSupport::unformatClassName(const QString &name) +TQString KDevLanguageSupport::unformatClassName(const TQString &name) { return name; } @@ -89,22 +89,22 @@ void KDevLanguageSupport::addAttribute( ClassDom /*klass*/ ) { } -QStringList KDevLanguageSupport::subclassWidget(const QString& /*formName*/) +TQStringList KDevLanguageSupport::subclassWidget(const TQString& /*formName*/) { - return QStringList(); + return TQStringList(); } -QStringList KDevLanguageSupport::updateWidget(const QString& /*formName*/, const QString& /*fileName*/) +TQStringList KDevLanguageSupport::updateWidget(const TQString& /*formName*/, const TQString& /*fileName*/) { - return QStringList(); + return TQStringList(); } -QString KDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ ) +TQString KDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ ) { return item->name(); } -void KDevLanguageSupport::addFunction( DesignerType type, const QString & formName, Function function ) +void KDevLanguageSupport::addFunction( DesignerType type, const TQString & formName, Function function ) { // kdDebug() << "KDevLanguageSupport::addFunction: 1" << endl; KDevDesignerIntegration *designerIntegration = designer(type); @@ -119,7 +119,7 @@ void KDevLanguageSupport::addFunction( DesignerType type, const QString & formNa // kdDebug() << "KDevLanguageSupport::addFunction: 4" << endl; } -void KDevLanguageSupport::editFunction( DesignerType type, const QString & formName, Function oldFunction, Function function ) +void KDevLanguageSupport::editFunction( DesignerType type, const TQString & formName, Function oldFunction, Function function ) { KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) @@ -127,7 +127,7 @@ void KDevLanguageSupport::editFunction( DesignerType type, const QString & formN designerIntegration->editFunction(formName, oldFunction, function); } -void KDevLanguageSupport::removeFunction( DesignerType type, const QString & formName, Function function ) +void KDevLanguageSupport::removeFunction( DesignerType type, const TQString & formName, Function function ) { KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) @@ -141,7 +141,7 @@ KDevDesignerIntegration * KDevLanguageSupport::designer( DesignerType // type return 0; } -void KDevLanguageSupport::openFunction( DesignerType type, const QString & formName, const QString & functionName ) +void KDevLanguageSupport::openFunction( DesignerType type, const TQString & formName, const TQString & functionName ) { KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) @@ -155,7 +155,7 @@ void KDevLanguageSupport::createAccessMethods( ClassDom // theClass { } -void KDevLanguageSupport::openSource( DesignerType type, const QString & formName) +void KDevLanguageSupport::openSource( DesignerType type, const TQString & formName) { KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h index d0de80e2..78694193 100644 --- a/lib/interfaces/kdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -25,8 +25,8 @@ #ifndef KDEVLANGUAGESUPPORT_H #define KDEVLANGUAGESUPPORT_H -#include -#include +#include +#include #include #include "kdevplugin.h" #include "codemodel.h" @@ -93,7 +93,7 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevLanguageSupport(const KDevPluginInfo *info, QObject *parent, const char *name); + KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name); /**Destructor.*/ ~KDevLanguageSupport(); @@ -107,24 +107,24 @@ public: /**Formats a Tag as used by the persistent symbol store to the human-readable convention. @param tag Tag to format.*/ - virtual QString formatTag(const Tag& tag); + virtual TQString formatTag(const Tag& tag); /**Formats a CodeModelItem as used by the CodeModel to the human-readable convention. @param item Symbol to format. @param shortDescription Show short description of a symbol. For example, when formatting functions short description could be a function signature without the return type and argument default values.*/ - virtual QString formatModelItem(const CodeModelItem *item, bool shortDescription=false); + virtual TQString formatModelItem(const CodeModelItem *item, bool shortDescription=false); /**Formats a canonicalized class path as used by the symbol store to the human-readable convention. For example, the C++ support part formats the string "KParts.Part" into "KParts::Part". @param name Class name.*/ - virtual QString formatClassName(const QString &name); + virtual TQString formatClassName(const TQString &name); /**The opposite of @ref formatClassName. Reverts formatting. @param name Class name.*/ - virtual QString unformatClassName(const QString &name); + virtual TQString unformatClassName(const TQString &name); /**Determines whether the document should be opened in a split view. The language part can determine this internally and then set the active document @@ -168,7 +168,7 @@ public: and propmts to implement it's slots. @param formName The name of a form to subclass. @return A list of newly created files.*/ - virtual QStringList subclassWidget(const QString& formName); + virtual TQStringList subclassWidget(const TQString& formName); /**Opens an "Update Widget" dialog for given Qt .ui file (formName) and prompts to add missing slot implementations @@ -177,7 +177,7 @@ public: @param fileName The name of a file with a subclass. @return A list of updated files. Can be empty because usually no additional actions are required on updated files.*/ - virtual QStringList updateWidget(const QString& formName, const QString& fileName); + virtual TQStringList updateWidget(const TQString& formName, const TQString& fileName); /**Reimplement this method if you want to use integrated GUI designer for the language. Implementation could look like (in pseudo code): @@ -210,14 +210,14 @@ public slots: @param type The type of integrated designer. @param formName The name of a GUI form. @param function The function to implement (add).*/ - void addFunction(DesignerType type, const QString &formName, Function function); + void addFunction(DesignerType type, const TQString &formName, Function function); /**Removes a function requested by a GUI designer. No need to reimplement this slot unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form. @param function The function to remove.*/ - void removeFunction(DesignerType type, const QString &formName, Function function); + void removeFunction(DesignerType type, const TQString &formName, Function function); /**Edits a function requested by a GUI designer. No need to reimplement this slot unless you want to use specific implementation of KDevDesignerIntegration interface. @@ -225,33 +225,33 @@ public slots: @param formName The name of a GUI form. @param oldFunction The old function signature before editing. @param function The new function signature after editing.*/ - void editFunction(DesignerType type, const QString &formName, Function oldFunction, Function function); + void editFunction(DesignerType type, const TQString &formName, Function oldFunction, Function function); /**Opens a function requested by a GUI designer. No need to reimplement this slot unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form. @param functionName The name of a function to seek in the code for.*/ - void openFunction(DesignerType type, const QString &formName, const QString &functionName); + void openFunction(DesignerType type, const TQString &formName, const TQString &functionName); /**Opens a form source requested by a GUI designer. No need to reimplement this slot unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form.*/ - void openSource(DesignerType type, const QString &formName); + void openSource(DesignerType type, const TQString &formName); signals: /**Emitted when the content of the memory symbol store has been modified.*/ void updatedSourceInfo(); /**Emitted before removing the file from the memory symbol store.*/ - void aboutToRemoveSourceInfo(const QString& fileName); + void aboutToRemoveSourceInfo(const TQString& fileName); /**Emitted when a file has been removed from the memory symbol store.*/ - void removedSourceInfo(const QString& fileName); + void removedSourceInfo(const TQString& fileName); /**Emitted when a file has been added to the memory symbol store.*/ - void addedSourceInfo( const QString& fileName ); + void addedSourceInfo( const TQString& fileName ); /**Emitted when the language part changes the Split View orientation.*/ void splitOrientationChanged( Qt::Orientation orientation ); diff --git a/lib/interfaces/kdevmainwindow.h b/lib/interfaces/kdevmainwindow.h index 95200f16..7e3e8344 100644 --- a/lib/interfaces/kdevmainwindow.h +++ b/lib/interfaces/kdevmainwindow.h @@ -22,7 +22,7 @@ #ifndef KDEV_MAINWINDOW_H #define KDEV_MAINWINDOW_H -#include +#include class QWidget; class KStatusBar; @@ -47,49 +47,49 @@ public: @param view The view to embed. Must be a KPart. @param title The title of a view. @param toolTip The tooltip of a view.*/ - virtual void embedPartView(QWidget *view, const QString &title, const QString& toolTip = QString::null) = 0; + virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString::null) = 0; /**Embeds a toolview at the left of the main window. @param view The view to embed. Must be a KPart. @param title The title of a view. @param toolTip The tooltip of a view.*/ - virtual void embedSelectView(QWidget *view, const QString &title, const QString &toolTip) = 0; + virtual void embedSelectView(TQWidget *view, const TQString &title, const TQString &toolTip) = 0; /**Embeds a toolview at the bottom of the main window. @param view The view to embed. Must be a KPart. @param title The title of a view. @param toolTip The tooltip of a view.*/ - virtual void embedOutputView(QWidget *view, const QString &title, const QString &toolTip) = 0; + virtual void embedOutputView(TQWidget *view, const TQString &title, const TQString &toolTip) = 0; /**Embeds a toolview at the right of the main window. @param view The view to embed. Must be a KPart. @param title The title of a view. @param toolTip The tooltip of a view.*/ - virtual void embedSelectViewRight(QWidget* view, const QString& title, const QString &toolTip) = 0; + virtual void embedSelectViewRight(TQWidget* view, const TQString& title, const TQString &toolTip) = 0; /**Removes a view from the main window. @param view The view to remove.*/ - virtual void removeView(QWidget *view) = 0; + virtual void removeView(TQWidget *view) = 0; /**Shows or hides a view. @param pView The view to show or hide. @param bEnabled true if view should be shown, false it it is not.*/ - virtual void setViewAvailable(QWidget *pView, bool bEnabled) = 0; + virtual void setViewAvailable(TQWidget *pView, bool bEnabled) = 0; /**Raises a view (shows it if it was minimized). @param view The view to be raised.*/ - virtual void raiseView(QWidget *view) = 0; + virtual void raiseView(TQWidget *view) = 0; /**Minimize a view. @param view The view to be lowered.*/ - virtual void lowerView(QWidget *view) = 0; + virtual void lowerView(TQWidget *view) = 0; /**Loads main window settings.*/ virtual void loadSettings() = 0; /**Sets the current document's caption, if applicable. @param caption the caption to set.*/ - virtual void setCurrentDocumentCaption( const QString &caption ) = 0; + virtual void setCurrentDocumentCaption( const TQString &caption ) = 0; /**@return KMainWindow object which actually represents the main window.*/ virtual KMainWindow *main() = 0; diff --git a/lib/interfaces/kdevpartcontroller.cpp b/lib/interfaces/kdevpartcontroller.cpp index 8ea95dae..58f1dc2a 100644 --- a/lib/interfaces/kdevpartcontroller.cpp +++ b/lib/interfaces/kdevpartcontroller.cpp @@ -20,7 +20,7 @@ #include "kdevpartcontroller.h" #include "katedocumentmanagerinterface.h" -KDevPartController::KDevPartController(QWidget *parent) +KDevPartController::KDevPartController(TQWidget *parent) : KParts::PartManager(parent) { new KDevPartControllerIface(this); diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h index 3b024b45..be7084b9 100644 --- a/lib/interfaces/kdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -60,12 +60,12 @@ class KDevPartController: public KParts::PartManager public: /**Constructor. @param parent The parent object.*/ - KDevPartController(QWidget *parent); + KDevPartController(TQWidget *parent); /**Call this before a call to @ref editDocument to set the encoding of the document to be opened. @param encoding The encoding to open as.*/ - virtual void setEncoding(const QString &encoding) = 0; + virtual void setEncoding(const TQString &encoding) = 0; /**Opens a new or existing document. @param url The URL of the document to open. @@ -96,7 +96,7 @@ public: @param part The part to embed. @param name The name of the part. @param shortDescription Currently not used.*/ - virtual void showPart(KParts::Part* part, const QString& name, const QString& shortDescription ) = 0; + virtual void showPart(KParts::Part* part, const TQString& name, const TQString& shortDescription ) = 0; /**Finds the embedded part corresponding to a given URL. @param url The URL of the document. @@ -106,7 +106,7 @@ public: /**Finds the embedded part corresponding to a given main widget @param widget The parts main widget. @return The corresponding part, 0 if not found.*/ - virtual KParts::Part *partForWidget(const QWidget *widget) = 0; + virtual KParts::Part *partForWidget(const TQWidget *widget) = 0; /**@return The list of open documents*/ virtual KURL::List openURLs() = 0; diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp index d110049f..5b4de199 100644 --- a/lib/interfaces/kdevplugin.cpp +++ b/lib/interfaces/kdevplugin.cpp @@ -36,8 +36,8 @@ #include #include -#include -#include +#include +#include #include @@ -54,8 +54,8 @@ struct KDevPlugin::Private // class KDevPlugin /////////////////////////////////////////////////////////////////////////////// -KDevPlugin::KDevPlugin(const KDevPluginInfo *info, QObject *parent, const char *name) - :QObject(parent, name), d(new Private) +KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name) + :TQObject(parent, name), d(new Private) { assert(parent->inherits( "KDevApi" )); m_api = static_cast( parent ); @@ -91,7 +91,7 @@ CodeModel *KDevPlugin::codeModel() const return m_api->codeModel(); } -QDomDocument *KDevPlugin::projectDom() const +TQDomDocument *KDevPlugin::projectDom() const { return m_api->projectDom(); } @@ -111,12 +111,12 @@ KDevPluginController *KDevPlugin::pluginController() const return m_api->pluginController(); } -void KDevPlugin::restorePartialProjectSession(const QDomElement* /*el*/) +void KDevPlugin::restorePartialProjectSession(const TQDomElement* /*el*/) { // there's still nothing to do in the base class } -void KDevPlugin::savePartialProjectSession(QDomElement* /*el*/) +void KDevPlugin::savePartialProjectSession(TQDomElement* /*el*/) { // there's still nothing to do in the base class } @@ -126,7 +126,7 @@ KDevCodeRepository * KDevPlugin::codeRepository() const return m_api->codeRepository(); } -KDevPlugin * KDevPlugin::extension_internal(const QString &serviceType, const QString &constraint) +KDevPlugin * KDevPlugin::extension_internal(const TQString &serviceType, const TQString &constraint) { return m_api->pluginController()->extension(serviceType, constraint); } diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index 6e172358..609ac858 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -20,7 +20,7 @@ #ifndef KDEVPLUGIN_H #define KDEVPLUGIN_H -#include +#include #include #include "kdevapi.h" @@ -104,7 +104,7 @@ and writing factories for plugins. @sa KDevCore class documentation for an information about features which are available to plugins from shell applications. */ -class KDevPlugin: public QObject, public KXMLGUIClient +class KDevPlugin: public TQObject, public KXMLGUIClient { Q_OBJECT @@ -118,7 +118,7 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevPlugin(const KDevPluginInfo *info, QObject *parent, const char *name = 0); + KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0); /**Destructs a plugin.*/ virtual ~KDevPlugin(); @@ -144,7 +144,7 @@ public: CodeModel *codeModel() const; /**@return A reference to the DOM tree that represents the project file or 0 if no project is loaded.*/ - QDomDocument *projectDom() const; + TQDomDocument *projectDom() const; /**@return A reference to the part controller which is used to manipulate loaded KParts.*/ KDevPartController *partController() const; @@ -167,7 +167,7 @@ public: constraint is a usual KTrader constraint statement (like "[X-KDevelop-Foo]=='MyFoo'"). @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/ template - Extension *extension(const QString &serviceType, const QString &constraint = "") + Extension *extension(const TQString &serviceType, const TQString &constraint = "") { return static_cast(extension_internal(serviceType, constraint)); } @@ -183,14 +183,14 @@ public: @note Project session file is useful for settings which cannot be shared between developers. If a setting should be shared, modify projectDom instead. @param el The parent DOM element for plugins session settings.*/ - virtual void restorePartialProjectSession(const QDomElement* el); + virtual void restorePartialProjectSession(const TQDomElement* el); /**Saves session settings. @sa restorePartialProjectSession - this is the other way round, the same just for saving.*/ - virtual void savePartialProjectSession(QDomElement* el); + virtual void savePartialProjectSession(TQDomElement* el); private: - KDevPlugin *extension_internal(const QString &serviceType, const QString &constraint = ""); + KDevPlugin *extension_internal(const TQString &serviceType, const TQString &constraint = ""); KDevApi *m_api; class Private; diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp index 84e8fdf6..686fd1ce 100644 --- a/lib/interfaces/kdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -24,24 +24,24 @@ KDevPluginController::KDevPluginController() { } -KTrader::OfferList KDevPluginController::query(const QString &serviceType, - const QString &constraint) +KTrader::OfferList KDevPluginController::query(const TQString &serviceType, + const TQString &constraint) { return KTrader::self()->query(serviceType, - QString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION)); + TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION)); } -KTrader::OfferList KDevPluginController::queryPlugins(const QString &constraint) +KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) { return query("KDevelop/Plugin", constraint); } -KURL::List KDevPluginController::profileResources(const QString &/*nameFilter*/) +KURL::List KDevPluginController::profileResources(const TQString &/*nameFilter*/) { return KURL::List(); } -KURL::List KDevPluginController::profileResourcesRecursive(const QString &/*nameFilter*/) +KURL::List KDevPluginController::profileResourcesRecursive(const TQString &/*nameFilter*/) { return KURL::List(); } diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h index e4579ab3..2ffba0ba 100644 --- a/lib/interfaces/kdevplugincontroller.h +++ b/lib/interfaces/kdevplugincontroller.h @@ -19,7 +19,7 @@ #ifndef KDEVPLUGINCONTROLLER_H #define KDEVPLUGINCONTROLLER_H -#include +#include #include #include @@ -45,21 +45,21 @@ public: * Returns a uniquely specified plugin. If it isn't already loaded, it will be. * Use with caution! See extension for parameter details. */ - virtual KDevPlugin * loadPlugin( const QString & serviceType, const QString & constraint ) = 0; + virtual KDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint ) = 0; /** * Unloads the plugin specified by @p plugin * @param plugin The plugin desktopEntryName of the plugin to unload */ - virtual void unloadPlugin( const QString & plugin ) = 0; + virtual void unloadPlugin( const TQString & plugin ) = 0; /**Unloads plugins specified by @p list. @param list The list of plugin names to unload. plugin name corresponds to the "Name" property in plugin .desktop file.*/ - virtual void unloadPlugins(QStringList const &list) = 0; + virtual void unloadPlugins(TQStringList const &list) = 0; /**@return The list of currently loaded plugins.*/ - virtual const QValueList loadedPlugins() = 0; + virtual const TQValueList loadedPlugins() = 0; /**Queries for the plugin which supports given service type. All already loaded plugins will be queried and the first one to support the service type @@ -69,7 +69,7 @@ public: @param constraint The constraint which is applied when quering for the service. This constraint is a usual KTrader constraint statement (like "[X-KDevelop-Foo]=='MyFoo'"). @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/ - virtual KDevPlugin *extension(const QString &serviceType, const QString &constraint = "") = 0; + virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "") = 0; /**Queries KDevelop services. Version is checked automatically by adding proper X-KDevelop-Version=N statement into the query. @@ -78,28 +78,28 @@ public: @param constraint A constraint for the service. Do not include plugin version number - it is done automatically. @return The list of plugin offers.*/ - static KTrader::OfferList query(const QString &serviceType, const QString &constraint); + static KTrader::OfferList query(const TQString &serviceType, const TQString &constraint); /**Queries KDevelop plugins. Works like KDevPluginController::query with serviceType set to "KDevelop/Plugin". @param constraint A constraint for the service. Do not include plugin version number - it is done automatically. @return The list of plugin offers.*/ - static KTrader::OfferList queryPlugins(const QString &constraint); + static KTrader::OfferList queryPlugins(const TQString &constraint); /**Reimplement this function only if your shell supports plugin profiles. @return The list of URLs to the profile resources (files) with given @p extension. - @param nameFilter Name filter for files. @see QDir::setNameFilter documentation + @param nameFilter Name filter for files. @see TQDir::setNameFilter documentation for name filters syntax.*/ - virtual KURL::List profileResources(const QString &nameFilter); + virtual KURL::List profileResources(const TQString &nameFilter); /**Reimplement this function only if your shell supports plugin profiles. @return The list of URLs to the resources (files) with given @p extension. This list is obtained by a recursive search that process given profile and all it's subprofiles. - @param nameFilter Name filter for files. @see QDir::setNameFilter documentation + @param nameFilter Name filter for files. @see TQDir::setNameFilter documentation for name filters syntax.*/ - virtual KURL::List profileResourcesRecursive(const QString &nameFilter); + virtual KURL::List profileResourcesRecursive(const TQString &nameFilter); /** @return The current Profile Engine */ virtual ProfileEngine &engine() = 0; diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp index c5572ccd..daa64c2b 100644 --- a/lib/interfaces/kdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -18,7 +18,7 @@ */ #include "kdevplugininfo.h" -#include +#include #include #include @@ -26,27 +26,27 @@ #include "kdevplugincontroller.h" struct KDevPluginInfo::Private { - QString m_pluginName; - QString m_rawGenericName; + TQString m_pluginName; + TQString m_rawGenericName; - QString m_genericName; - QString m_description; - QString m_icon; + TQString m_genericName; + TQString m_description; + TQString m_icon; - QString m_version; + TQString m_version; int m_licenseType; - QString m_copyrightStatement; - QString m_homePageAddress; - QString m_bugsEmailAddress; + TQString m_copyrightStatement; + TQString m_homePageAddress; + TQString m_bugsEmailAddress; - QValueList m_authors; - QValueList m_credits; + TQValueList m_authors; + TQValueList m_credits; KAboutData *m_data; }; -KDevPluginInfo::KDevPluginInfo(const QString &pluginName) +KDevPluginInfo::KDevPluginInfo(const TQString &pluginName) :d(new Private()) { d->m_pluginName = pluginName; @@ -65,7 +65,7 @@ KDevPluginInfo::KDevPluginInfo(const QString &pluginName) d->m_bugsEmailAddress = offer->property("X-KDevelop-Plugin-BugsEmailAddress").toString(); d->m_copyrightStatement = offer->property("X-KDevelop-Plugin-Copyright").toString(); - QString lic = offer->property("X-KDevelop-Plugin-License").toString(); + TQString lic = offer->property("X-KDevelop-Plugin-License").toString(); if (lic == "GPL") d->m_licenseType = KAboutData::License_GPL; else if (lic == "LGPL") @@ -94,27 +94,27 @@ KDevPluginInfo::operator KAboutData *() const return d->m_data; } -QString KDevPluginInfo::pluginName() const +TQString KDevPluginInfo::pluginName() const { return d->m_pluginName; } -QString KDevPluginInfo::genericName() const +TQString KDevPluginInfo::genericName() const { return d->m_genericName; } -QString KDevPluginInfo::icon() const +TQString KDevPluginInfo::icon() const { return d->m_icon; } -QString KDevPluginInfo::description() const +TQString KDevPluginInfo::description() const { return d->m_description; } -QString KDevPluginInfo::version() const +TQString KDevPluginInfo::version() const { return d->m_version; } @@ -124,7 +124,7 @@ int KDevPluginInfo::licenseType() const return d->m_licenseType; } -QString KDevPluginInfo::license() const +TQString KDevPluginInfo::license() const { KDevPluginInfo &info = *const_cast(this); // return KAboutData(info).license(); @@ -132,40 +132,40 @@ QString KDevPluginInfo::license() const return data->license(); } -QString KDevPluginInfo::copyrightStatement() const +TQString KDevPluginInfo::copyrightStatement() const { return d->m_copyrightStatement; } -QString KDevPluginInfo::homePageAddress() const +TQString KDevPluginInfo::homePageAddress() const { return d->m_homePageAddress; } -QString KDevPluginInfo::bugsEmailAddress() const +TQString KDevPluginInfo::bugsEmailAddress() const { return d->m_bugsEmailAddress; } -QVariant KDevPluginInfo::property(const QString &name) const +TQVariant KDevPluginInfo::property(const TQString &name) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(QString("Name='%1'").arg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->property(name); - return QVariant(); + return TQVariant(); } -QVariant KDevPluginInfo::operator [](const QString &name) const +TQVariant KDevPluginInfo::operator [](const TQString &name) const { return property(name); } -QStringList KDevPluginInfo::propertyNames( ) const +TQStringList KDevPluginInfo::propertyNames( ) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(QString("Name='%1'").arg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->propertyNames(); - return QStringList(); + return TQStringList(); } void KDevPluginInfo::addAuthor(const char *name, const char *task, diff --git a/lib/interfaces/kdevplugininfo.h b/lib/interfaces/kdevplugininfo.h index 9e133912..50fe4601 100644 --- a/lib/interfaces/kdevplugininfo.h +++ b/lib/interfaces/kdevplugininfo.h @@ -19,7 +19,7 @@ #ifndef KDEVPLUGININFO_H #define KDEVPLUGININFO_H -#include +#include #include @@ -42,46 +42,46 @@ public: /**Constructor. @param pluginName A name of a plugin. Must be the same as the name of a .desktop file and the same as the location of plugin resource files.*/ - KDevPluginInfo(const QString &pluginName); + KDevPluginInfo(const TQString &pluginName); /**Casts KDevPluginInfo to KAboutData. Uses KDevPluginInfo::pluginName as KAboutData::appName, KDevPluginInfo::rawGenericName as KAboutData::programName KDevPluginInfo::licenseType as KAboutData::licenseType. Other parameters are ignored.*/ operator KAboutData*() const; /**@return A name of a plugin (always untranslated).*/ - QString pluginName() const; + TQString pluginName() const; /**@return A generic name of a plugin (translated). Use this in GUI. Information is taken from .desktop file.*/ - QString genericName() const; + TQString genericName() const; /**@return An icon name of a plugin. Information is taken from .desktop file.*/ - QString icon() const; + TQString icon() const; /**@return A description of a plugin. Information is taken from .desktop file.*/ - QString description() const; + TQString description() const; /**@return A version of a plugin. Information is taken from .desktop file.*/ - QString version() const; + TQString version() const; /**@return A license type of a plugin. Information is taken from .desktop file.*/ int licenseType() const; /**@return A license text for known license types (GPL, LGPL, BSD, Artistic, QPL).*/ - QString license() const; + TQString license() const; /**@return A copyright statement of a plugin. Information is taken from .desktop file.*/ - QString copyrightStatement() const; + TQString copyrightStatement() const; /**@return A home page of a plugin. Information is taken from .desktop file.*/ - QString homePageAddress() const; + TQString homePageAddress() const; /**@return A email address for bugs of a plugin. Information is taken from .desktop file.*/ - QString bugsEmailAddress() const; + TQString bugsEmailAddress() const; /**@param name The name of a property. @return Any property value which exists in .desktop file.*/ - QVariant property(const QString &name) const; + TQVariant property(const TQString &name) const; /**@param name The name of a property. @return Any property value which exists in .desktop file.*/ - QVariant operator [] (const QString &name) const; + TQVariant operator [] (const TQString &name) const; /**@return A list of property names set in .desktop file.*/ - QStringList propertyNames() const; + TQStringList propertyNames() const; /**@return A list of plugin authors.*/ - const QValueList authors() const; + const TQValueList authors() const; /**@return A list of other plugin contributors.*/ - const QValueList credits() const; + const TQValueList credits() const; /**Adds an author to the list of authors. You can call this function as many times you need. Each entry is appended to a list. diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp index b98ecffb..f558cc48 100644 --- a/lib/interfaces/kdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -26,28 +26,28 @@ #include "kdevproject.h" #include -#include -#include +#include +#include #include "kdevprojectiface.h" struct KDevProject::Private { - QMap m_absToRel; - QStringList m_symlinkList; - QTimer *m_timer; + TQMap m_absToRel; + TQStringList m_symlinkList; + TQTimer *m_timer; KDevProjectIface *m_iface; }; -KDevProject::KDevProject(const KDevPluginInfo *info, QObject *parent, const char *name) +KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name) : KDevPlugin(info, parent, name), d(new KDevProject::Private()) { - connect( this, SIGNAL(addedFilesToProject(const QStringList& )), this, SLOT(buildFileMap()) ); - connect( this, SIGNAL(removedFilesFromProject(const QStringList& )), this, SLOT(buildFileMap()) ); + connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); + connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); - connect( this, SIGNAL(addedFilesToProject(const QStringList& )), this, SLOT(slotAddFilesToFileMap(const QStringList& )) ); - connect( this, SIGNAL(removedFilesFromProject(const QStringList& )), this, SLOT(slotRemoveFilesFromFileMap(const QStringList& )) ); + connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(slotAddFilesToFileMap(const TQStringList& )) ); + connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) ); - d->m_timer = new QTimer(this); - connect(d->m_timer, SIGNAL(timeout()), this, SLOT(slotBuildFileMap())); + d->m_timer = new TQTimer(this); + connect(d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBuildFileMap())); d->m_iface = new KDevProjectIface(this); } @@ -59,16 +59,16 @@ KDevProject::~KDevProject() delete d; } -void KDevProject::changedFile( const QString & fileName ) +void KDevProject::changedFile( const TQString & fileName ) { - QStringList fileList; + TQStringList fileList; fileList.append ( fileName ); emit changedFilesInProject( fileList ); } -void KDevProject::changedFiles( const QStringList & fileList ) +void KDevProject::changedFiles( const TQStringList & fileList ) { emit changedFilesInProject( fileList ); } @@ -78,16 +78,16 @@ KDevProject::Options KDevProject::options() const return (KDevProject::Options)0; } -bool KDevProject::isProjectFile( const QString & absFileName ) +bool KDevProject::isProjectFile( const TQString & absFileName ) { return d->m_absToRel.contains( absFileName ); } -QString KDevProject::relativeProjectFile( const QString & absFileName ) +TQString KDevProject::relativeProjectFile( const TQString & absFileName ) { if( isProjectFile(absFileName) ) return d->m_absToRel[ absFileName ]; - return QString::null; + return TQString::null; } void KDevProject::buildFileMap() @@ -102,10 +102,10 @@ void KDevProject::slotBuildFileMap() d->m_absToRel.clear(); d->m_symlinkList.clear(); - const QStringList fileList = allFiles(); - for( QStringList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ) + const TQStringList fileList = allFiles(); + for( TQStringList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ) { - QFileInfo fileInfo( projectDirectory() + "/" + *it ); + TQFileInfo fileInfo( projectDirectory() + "/" + *it ); d->m_absToRel[ URLUtil::canonicalPath(fileInfo.absFilePath()) ] = *it; if ( URLUtil::canonicalPath( fileInfo.absFilePath() ) != fileInfo.absFilePath() ) @@ -115,27 +115,27 @@ void KDevProject::slotBuildFileMap() } } -void KDevProject::openProject( const QString & /*dirName*/, const QString & /*projectName*/ ) +void KDevProject::openProject( const TQString & /*dirName*/, const TQString & /*projectName*/ ) { buildFileMap(); } -QStringList KDevProject::symlinkProjectFiles( ) +TQStringList KDevProject::symlinkProjectFiles( ) { return d->m_symlinkList; } -QString KDevProject::defaultRunDirectory(const QString& projectPluginName) const +TQString KDevProject::defaultRunDirectory(const TQString& projectPluginName) const { return DomUtil::readEntry(*projectDom(), "/" + projectPluginName + "/run/globalcwd"); } -void KDevProject::slotAddFilesToFileMap( const QStringList & fileList ) +void KDevProject::slotAddFilesToFileMap( const TQStringList & fileList ) { - QStringList::ConstIterator it = fileList.begin(); + TQStringList::ConstIterator it = fileList.begin(); while( it != fileList.end() ) { - QFileInfo fileInfo( projectDirectory() + "/" + *it ); + TQFileInfo fileInfo( projectDirectory() + "/" + *it ); d->m_absToRel[ URLUtil::canonicalPath(fileInfo.absFilePath()) ] = *it; if ( URLUtil::canonicalPath( fileInfo.absFilePath() ) != fileInfo.absFilePath() ) @@ -147,12 +147,12 @@ void KDevProject::slotAddFilesToFileMap( const QStringList & fileList ) } } -void KDevProject::slotRemoveFilesFromFileMap( const QStringList & fileList ) +void KDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList ) { - QStringList::ConstIterator it = fileList.begin(); + TQStringList::ConstIterator it = fileList.begin(); while( it != fileList.end() ) { - QFileInfo fileInfo( projectDirectory() + "/" + *it ); + TQFileInfo fileInfo( projectDirectory() + "/" + *it ); d->m_absToRel.remove( URLUtil::canonicalPath(fileInfo.absFilePath()) ); d->m_symlinkList.remove( *it ); diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h index 1827a1d0..a14c04b0 100644 --- a/lib/interfaces/kdevproject.h +++ b/lib/interfaces/kdevproject.h @@ -28,8 +28,8 @@ #include "kdevplugin.h" #include "domutil.h" -#include -#include +#include +#include /** @file kdevproject.h @@ -58,7 +58,7 @@ public: @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevProject(const KDevPluginInfo *info, QObject *parent=0, const char *name=0); + KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0); /**Destructor.*/ virtual ~KDevProject(); @@ -76,7 +76,7 @@ public: the projectDirectory() method. @param projectName The project name, which is equivalent to the project file name without the suffix.*/ - virtual void openProject(const QString &dirName, const QString &projectName); + virtual void openProject(const TQString &dirName, const TQString &projectName); /**This method is invoked when the project is about to be closed.*/ virtual void closeProject() = 0; @@ -87,81 +87,81 @@ public: /**@return The canonical absolute directory of the project. Canonical means that a path does not contain symbolic links or redundant "." or ".." elements.*/ - virtual QString projectDirectory() const = 0; + virtual TQString projectDirectory() const = 0; /**Returns the name of the project.*/ - virtual QString projectName() const = 0; + virtual TQString projectName() const = 0; /**@return The environment variables that sould be set before running mainProgram().*/ virtual DomUtil::PairList runEnvironmentVars() const = 0; /**@return The path to main binary program of the project. @param relative if true then the path returned is relative to the project directory.*/ - virtual QString mainProgram() const = 0; + virtual TQString mainProgram() const = 0; /**Absolute path (directory) from where the mainProgram() should be run.*/ - virtual QString runDirectory() const = 0; + virtual TQString runDirectory() const = 0; /**The command line arguments that the mainProgram() should be run with.*/ - virtual QString runArguments() const = 0; + virtual TQString runArguments() const = 0; /**The command line arguments that the mainProgram() should be debugged with.*/ - virtual QString debugArguments() const = 0; + virtual TQString debugArguments() const = 0; /**Returns the path (relative to the project directory) of the active directory. All newly automatically generated classes and files are usually added here.*/ - virtual QString activeDirectory() const = 0; + virtual TQString activeDirectory() const = 0; /**@return The canonical build directory of the project. If the separate build directory is not supported, this should return the same as projectDiretory(). Canonical means that a path does not contain symbolic links or redundant "." or ".." elements.*/ - virtual QString buildDirectory() const = 0; + virtual TQString buildDirectory() const = 0; /**@return The list of all files in the project. The names are relative to the project directory.*/ - virtual QStringList allFiles() const = 0; + virtual TQStringList allFiles() const = 0; /**@return The list of files that are part of the distribution but not under project control. Used mainly to package and publish extra files among with the project.*/ - virtual QStringList distFiles() const = 0; + virtual TQStringList distFiles() const = 0; /**Adds a list of files to the project. Provided for convenience when adding many files. @param fileList The list of file names relative to the project directory.*/ - virtual void addFiles(const QStringList &fileList) = 0; + virtual void addFiles(const TQStringList &fileList) = 0; /**Adds a file to the project. @param fileName The file name relative to the project directory.*/ - virtual void addFile(const QString &fileName)= 0; + virtual void addFile(const TQString &fileName)= 0; /**Removes a list of files from the project. Provided for convenience when removing many files. @param fileList The list of file names relative to the project directory.*/ - virtual void removeFiles(const QStringList& fileList)= 0; + virtual void removeFiles(const TQStringList& fileList)= 0; /**Removes a file from the project. @param fileName The file name relative to the project directory.*/ - virtual void removeFile(const QString &fileName) = 0; + virtual void removeFile(const TQString &fileName) = 0; /**Notifies the project about changes to the files. Provided for convenience when changing many files. @param fileList The list of file names relative to the project directory..*/ - virtual void changedFiles(const QStringList &fileList); + virtual void changedFiles(const TQStringList &fileList); /**Notifies the project of a change to one of the files. @param fileName The file name relative to the project directory.*/ - virtual void changedFile(const QString &fileName); + virtual void changedFile(const TQString &fileName); /**@return true if the file @p absFileName is a part of the project. @param absFileName Absolute name of a file to check.*/ - virtual bool isProjectFile(const QString &absFileName); + virtual bool isProjectFile(const TQString &absFileName); /**@return The path (relative to the project directory) of the file @p absFileName. @param absFileName Absolute name of a file.*/ - virtual QString relativeProjectFile(const QString &absFileName); + virtual TQString relativeProjectFile(const TQString &absFileName); /**@return The list of files known to the project through symlinks.*/ - virtual QStringList symlinkProjectFiles(); + virtual TQStringList symlinkProjectFiles(); protected: @@ -177,28 +177,28 @@ protected: * The custom directory absolute path. * Derived classes are supposed to explicitly call this implementation */ - QString defaultRunDirectory(const QString& projectPluginName) const; + TQString defaultRunDirectory(const TQString& projectPluginName) const; private slots: void buildFileMap(); void slotBuildFileMap(); - void slotAddFilesToFileMap(const QStringList & fileList ); - void slotRemoveFilesFromFileMap(const QStringList & fileList ); + void slotAddFilesToFileMap(const TQStringList & fileList ); + void slotRemoveFilesFromFileMap(const TQStringList & fileList ); signals: /**Emitted when a new list of files has been added to the project. Provided for convenience when many files were added. @param fileList The file names relative to the project directory.*/ - void addedFilesToProject(const QStringList& fileList); + void addedFilesToProject(const TQStringList& fileList); /**Emitted when a list of files has been removed from the project. Provided for convenience when many files were removed. @param fileList The file names relative to the project directory.*/ - void removedFilesFromProject(const QStringList& fileList); + void removedFilesFromProject(const TQStringList& fileList); /**Emitted when a list of files has changed in the project. @param fileList The file names relative to the project directory.*/ - void changedFilesInProject(const QStringList& fileList); + void changedFilesInProject(const TQStringList& fileList); /**Emitted when one compile related command (make, make install, make ...) ends sucessfuly. Used to reparse the files after a sucessful compilation.*/ @@ -208,7 +208,7 @@ signals: * @param olddir The old active directory * @param newdir The new active directory */ - void activeDirectoryChanged( const QString& olddir, const QString& newdir ); + void activeDirectoryChanged( const TQString& olddir, const TQString& newdir ); private: class Private; diff --git a/lib/interfaces/kdevprojectiface.cpp b/lib/interfaces/kdevprojectiface.cpp index 5fbd2261..28d4501c 100644 --- a/lib/interfaces/kdevprojectiface.cpp +++ b/lib/interfaces/kdevprojectiface.cpp @@ -24,7 +24,7 @@ #include "domutil.h" KDevProjectIface::KDevProjectIface(KDevProject *prj) - : QObject(prj), DCOPObject("KDevProject"), m_prj(prj) + : TQObject(prj), DCOPObject("KDevProject"), m_prj(prj) { } @@ -33,7 +33,7 @@ KDevProjectIface::~KDevProjectIface() { } -void KDevProjectIface::openProject( const QString & dirName, const QString & projectName ) +void KDevProjectIface::openProject( const TQString & dirName, const TQString & projectName ) { m_prj->openProject(dirName,projectName); } @@ -48,137 +48,137 @@ uint KDevProjectIface::options( ) const return (uint)m_prj->options(); } -QString KDevProjectIface::projectDirectory( ) const +TQString KDevProjectIface::projectDirectory( ) const { return m_prj->projectDirectory(); } -QString KDevProjectIface::projectName( ) const +TQString KDevProjectIface::projectName( ) const { return m_prj->projectName(); } -QString KDevProjectIface::mainProgram() const +TQString KDevProjectIface::mainProgram() const { return m_prj->mainProgram(); } -QString KDevProjectIface::runDirectory( ) const +TQString KDevProjectIface::runDirectory( ) const { return m_prj->runDirectory(); } -QString KDevProjectIface::activeDirectory( ) const +TQString KDevProjectIface::activeDirectory( ) const { return m_prj->activeDirectory(); } -QString KDevProjectIface::buildDirectory( ) const +TQString KDevProjectIface::buildDirectory( ) const { return m_prj->buildDirectory(); } -QStringList KDevProjectIface::allFiles( ) const +TQStringList KDevProjectIface::allFiles( ) const { return m_prj->allFiles(); } -QStringList KDevProjectIface::distFiles( ) const +TQStringList KDevProjectIface::distFiles( ) const { return m_prj->distFiles(); } -void KDevProjectIface::addFiles( const QStringList & fileList ) +void KDevProjectIface::addFiles( const TQStringList & fileList ) { m_prj->addFiles(fileList); } -void KDevProjectIface::addFile( const QString & fileName ) +void KDevProjectIface::addFile( const TQString & fileName ) { m_prj->addFile(fileName); } -void KDevProjectIface::removeFiles( const QStringList & fileList ) +void KDevProjectIface::removeFiles( const TQStringList & fileList ) { m_prj->removeFiles(fileList); } -void KDevProjectIface::removeFile( const QString & fileName ) +void KDevProjectIface::removeFile( const TQString & fileName ) { m_prj->removeFile(fileName); } -void KDevProjectIface::changedFiles( const QStringList & fileList ) +void KDevProjectIface::changedFiles( const TQStringList & fileList ) { m_prj->changedFiles(fileList); } -void KDevProjectIface::changedFile( const QString & fileName ) +void KDevProjectIface::changedFile( const TQString & fileName ) { m_prj->changedFile(fileName); } -bool KDevProjectIface::isProjectFile( const QString & absFileName ) +bool KDevProjectIface::isProjectFile( const TQString & absFileName ) { return m_prj->isProjectFile(absFileName); } -QString KDevProjectIface::relativeProjectFile( const QString & absFileName ) +TQString KDevProjectIface::relativeProjectFile( const TQString & absFileName ) { return m_prj->relativeProjectFile(absFileName); } -QStringList KDevProjectIface::symlinkProjectFiles( ) +TQStringList KDevProjectIface::symlinkProjectFiles( ) { return m_prj->symlinkProjectFiles(); } -QString KDevProjectIface::readEntry( const QString & path, const QString & defaultEntry ) +TQString KDevProjectIface::readEntry( const TQString & path, const TQString & defaultEntry ) { return DomUtil::readEntry( *m_prj->projectDom(), path, defaultEntry); } -int KDevProjectIface::readIntEntry( const QString & path, int defaultEntry ) +int KDevProjectIface::readIntEntry( const TQString & path, int defaultEntry ) { return DomUtil::readIntEntry(*m_prj->projectDom(), path,defaultEntry); } -bool KDevProjectIface::readBoolEntry( const QString & path, bool defaultEntry ) +bool KDevProjectIface::readBoolEntry( const TQString & path, bool defaultEntry ) { return DomUtil::readBoolEntry(*m_prj->projectDom(), path, defaultEntry); } -QStringList KDevProjectIface::readListEntry( const QString & path, const QString & tag ) +TQStringList KDevProjectIface::readListEntry( const TQString & path, const TQString & tag ) { return DomUtil::readListEntry(*m_prj->projectDom(), path, tag); } -QMap< QString, QString > KDevProjectIface::readMapEntry( const QString & path ) +TQMap< TQString, TQString > KDevProjectIface::readMapEntry( const TQString & path ) { return DomUtil::readMapEntry(*m_prj->projectDom(), path); } -void KDevProjectIface::writeEntry( const QString & path, const QString & value ) +void KDevProjectIface::writeEntry( const TQString & path, const TQString & value ) { DomUtil::writeEntry(*m_prj->projectDom(), path, value); } -void KDevProjectIface::writeIntEntry( const QString & path, int value ) +void KDevProjectIface::writeIntEntry( const TQString & path, int value ) { DomUtil::writeIntEntry(*m_prj->projectDom(), path, value); } -void KDevProjectIface::writeBoolEntry( const QString & path, bool value ) +void KDevProjectIface::writeBoolEntry( const TQString & path, bool value ) { DomUtil::writeBoolEntry(*m_prj->projectDom(), path, value); } -void KDevProjectIface::writeListEntry( const QString & path, const QString & tag, const QStringList & value ) +void KDevProjectIface::writeListEntry( const TQString & path, const TQString & tag, const TQStringList & value ) { DomUtil::writeListEntry(*m_prj->projectDom(), path, tag, value); } -void KDevProjectIface::writeMapEntry( const QString & path, const QMap< QString, QString > & map ) +void KDevProjectIface::writeMapEntry( const TQString & path, const TQMap< TQString, TQString > & map ) { DomUtil::writeMapEntry(*m_prj->projectDom(), path, map); } diff --git a/lib/interfaces/kdevprojectiface.h b/lib/interfaces/kdevprojectiface.h index c6d92e27..eb2a0f32 100644 --- a/lib/interfaces/kdevprojectiface.h +++ b/lib/interfaces/kdevprojectiface.h @@ -21,8 +21,8 @@ #define KDEVPROJECTIFACE_H #include -#include -#include +#include +#include class KDevProject; @@ -31,7 +31,7 @@ DCOP Interface for the @ref KDevProject object. @author KDevelop Authors */ -class KDevProjectIface : public QObject, public DCOPObject +class KDevProjectIface : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -40,39 +40,39 @@ public: ~KDevProjectIface(); k_dcop: - void openProject(const QString &dirName, const QString &projectName); + void openProject(const TQString &dirName, const TQString &projectName); void closeProject(); uint options() const; - QString projectDirectory() const; - QString projectName() const; - QString mainProgram() const; - QString runDirectory() const; - QString activeDirectory() const; - QString buildDirectory() const; - QStringList allFiles() const; - QStringList distFiles() const; - void addFiles(const QStringList &fileList); - void addFile(const QString &fileName); - void removeFiles(const QStringList& fileList); - void removeFile(const QString &fileName); - void changedFiles(const QStringList &fileList); - void changedFile(const QString &fileName); - bool isProjectFile(const QString &absFileName); - QString relativeProjectFile(const QString &absFileName); - QStringList symlinkProjectFiles(); + TQString projectDirectory() const; + TQString projectName() const; + TQString mainProgram() const; + TQString runDirectory() const; + TQString activeDirectory() const; + TQString buildDirectory() const; + TQStringList allFiles() const; + TQStringList distFiles() const; + void addFiles(const TQStringList &fileList); + void addFile(const TQString &fileName); + void removeFiles(const TQStringList& fileList); + void removeFile(const TQString &fileName); + void changedFiles(const TQStringList &fileList); + void changedFile(const TQString &fileName); + bool isProjectFile(const TQString &absFileName); + TQString relativeProjectFile(const TQString &absFileName); + TQStringList symlinkProjectFiles(); // Project DOM access - QString readEntry(const QString &path, const QString &defaultEntry = QString::null); - int readIntEntry(const QString &path, int defaultEntry = 0); - bool readBoolEntry(const QString &path, bool defaultEntry = false); - QStringList readListEntry(const QString &path, const QString &tag); - QMap readMapEntry(const QString &path); + TQString readEntry(const TQString &path, const TQString &defaultEntry = TQString::null); + int readIntEntry(const TQString &path, int defaultEntry = 0); + bool readBoolEntry(const TQString &path, bool defaultEntry = false); + TQStringList readListEntry(const TQString &path, const TQString &tag); + TQMap readMapEntry(const TQString &path); - void writeEntry(const QString &path, const QString &value); - void writeIntEntry(const QString &path, int value); - void writeBoolEntry( const QString &path, bool value); - void writeListEntry(const QString &path, const QString &tag, const QStringList &value); - void writeMapEntry(const QString& path, const QMap &map); + void writeEntry(const TQString &path, const TQString &value); + void writeIntEntry(const TQString &path, int value); + void writeBoolEntry( const TQString &path, bool value); + void writeListEntry(const TQString &path, const TQString &tag, const TQStringList &value); + void writeMapEntry(const TQString& path, const TQMap &map); private: KDevProject *m_prj; diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index f0d6e6c3..9c9d9130 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -11,10 +11,10 @@ #include "blockingkprocess.h" -#include -#include +#include +#include -BlockingKProcess::BlockingKProcess(QObject *parent, const char *name) +BlockingKProcess::BlockingKProcess(TQObject *parent, const char *name) : KProcess(parent, name) { m_stdOut = ""; @@ -22,12 +22,12 @@ BlockingKProcess::BlockingKProcess(QObject *parent, const char *name) m_timeoutValue = 60; m_timer = 0L; - connect(this, SIGNAL(receivedStdout(KProcess *, char *, int)), - this, SLOT(slotReceivedStdOut(KProcess *, char *, int))); - connect(this, SIGNAL(receivedStderr(KProcess *, char *, int)), - this, SLOT(slotReceivedStdErr(KProcess *, char *, int))); - connect(this, SIGNAL(processExited(KProcess *)), - this, SLOT(slotProcessExited(KProcess *))); + connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdOut(KProcess *, char *, int))); + connect(this, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdErr(KProcess *, char *, int))); + connect(this, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotProcessExited(KProcess *))); } BlockingKProcess::BlockingKProcess() @@ -37,12 +37,12 @@ BlockingKProcess::BlockingKProcess() m_stdErr = ""; m_timeoutValue = 60; m_timer = 0L; - connect(this, SIGNAL(receivedStdout(KProcess *, char *, int)), - this, SLOT(slotReceivedStdOut(KProcess *, char *, int))); - connect(this, SIGNAL(receivedStderr(KProcess *, char *, int)), - this, SLOT(slotReceivedStdErr(KProcess *, char *, int))); - connect(this, SIGNAL(processExited(KProcess *)), - this, SLOT(slotProcessExited(KProcess *))); + connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdOut(KProcess *, char *, int))); + connect(this, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdErr(KProcess *, char *, int))); + connect(this, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotProcessExited(KProcess *))); } @@ -54,8 +54,8 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm) if (KProcess::start(runmode, comm)) { m_timeout = false; - m_timer = new QTimer(); - connect(m_timer, SIGNAL(timeout()), this, SLOT(slotTimeOut())); + m_timer = new TQTimer(); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOut())); m_timer->start(m_timeoutValue*1000, true); enter_loop(); delete m_timer; @@ -68,12 +68,12 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm) void BlockingKProcess::slotReceivedStdOut(KProcess *, char *buffer, int buflen) { - m_stdOut += QString::fromLatin1(buffer, buflen); + m_stdOut += TQString::fromLatin1(buffer, buflen); } void BlockingKProcess::slotReceivedStdErr(KProcess *, char *buffer, int buflen) { - m_stdErr += QString::fromLatin1(buffer, buflen); + m_stdErr += TQString::fromLatin1(buffer, buflen); } void BlockingKProcess::slotProcessExited(KProcess *) @@ -89,13 +89,13 @@ void BlockingKProcess::slotTimeOut() } -void qt_enter_modal( QWidget *widget ); -void qt_leave_modal( QWidget *widget ); +void qt_enter_modal( TQWidget *widget ); +void qt_leave_modal( TQWidget *widget ); void BlockingKProcess::enter_loop() { - QWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( QWidget::NoFocus ); + TQWidget dummy(0,0,WType_Dialog | WShowModal); + dummy.setFocusPolicy( TQWidget::NoFocus ); qt_enter_modal(&dummy); qApp->enter_loop(); qt_leave_modal(&dummy); diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h index c5c8f5d9..b280b81b 100644 --- a/lib/util/blockingkprocess.h +++ b/lib/util/blockingkprocess.h @@ -33,7 +33,7 @@ class BlockingKProcess : public KProcess Q_OBJECT public: - BlockingKProcess(QObject *parent, const char *name=0); + BlockingKProcess(TQObject *parent, const char *name=0); BlockingKProcess(); virtual ~BlockingKProcess(); @@ -52,7 +52,7 @@ public: * Get the output of the run process * @return the output */ - QString stdOut() { return m_stdOut;} + TQString stdOut() { return m_stdOut;} /** * Clear the internal stdout buffer. Useful in case the class is reused. */ @@ -61,7 +61,7 @@ public: * Get the error output of the run process * @return the output */ - QString stdErr() { return m_stdErr;} + TQString stdErr() { return m_stdErr;} /** * Clear the internal stderr buffer. Useful in case the class is reused. */ @@ -82,11 +82,11 @@ private slots: private: void enter_loop(); - QString m_stdOut; - QString m_stdErr; + TQString m_stdOut; + TQString m_stdErr; bool m_timeout; int m_timeoutValue; - QTimer *m_timer; + TQTimer *m_timer; }; #endif diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp index 70c79fb4..66f267b7 100644 --- a/lib/util/configwidgetproxy.cpp +++ b/lib/util/configwidgetproxy.cpp @@ -19,8 +19,8 @@ -#include -#include +#include +#include #include #include @@ -34,19 +34,19 @@ ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core ) { - connect( core, SIGNAL(configWidget(KDialogBase*)), this, SLOT(slotConfigWidget( KDialogBase*)) ); - connect( core, SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(slotProjectConfigWidget( KDialogBase*)) ); + connect( core, TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget( KDialogBase*)) ); + connect( core, TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(slotProjectConfigWidget( KDialogBase*)) ); } ConfigWidgetProxy::~ConfigWidgetProxy() {} -void ConfigWidgetProxy::createGlobalConfigPage( QString const & title, unsigned int pagenumber, QString const & icon ) +void ConfigWidgetProxy::createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon ) { _globalTitleMap.insert( pagenumber, qMakePair( title, icon ) ); } -void ConfigWidgetProxy::createProjectConfigPage( QString const & title, unsigned int pagenumber, QString const & icon ) +void ConfigWidgetProxy::createProjectConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon ) { _projectTitleMap.insert( pagenumber, qMakePair( title, icon ) ); } @@ -66,8 +66,8 @@ void ConfigWidgetProxy::slotConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT( slotAboutToShowPage(QWidget*)) ); - connect( dlg, SIGNAL(destroyed()), this, SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) @@ -79,8 +79,8 @@ void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT( slotAboutToShowPage(QWidget*)) ); - connect( dlg, SIGNAL(destroyed()), this, SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotConfigWidgetDestroyed( ) @@ -88,14 +88,14 @@ void ConfigWidgetProxy::slotConfigWidgetDestroyed( ) _pageMap.clear(); } -void ConfigWidgetProxy::slotAboutToShowPage( QWidget * page ) +void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page ) { if ( !page ) return; PageMap::Iterator it = _pageMap.find( page ); if ( it != _pageMap.end() ) { - emit insertConfigWidget( static_cast(const_cast(sender())), page, it.data() ); + emit insertConfigWidget( static_cast(const_cast(sender())), page, it.data() ); _pageMap.remove( it ); } } diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index 84e1d18c..1ba7e5c5 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -20,9 +20,9 @@ #ifndef _CONFIGWIDGETPROXY_H #define _CONFIGWIDGETPROXY_H -#include -#include -#include +#include +#include +#include class KDevCore; class KDialogBase; @@ -47,20 +47,20 @@ A typical case looks like this: _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createGlobalConfigPage( i18n("My Part"), GLOBALDOC_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("My Part"), PROJECTDOC_OPTIONS, info()->icon() ); -connect( _configProxy, SIGNAL(insertConfigWidget(const QObject*, QWidget*, unsigned int )), - this, SLOT(insertConfigWidget(const QObject*, QWidget*, unsigned int )) ); +connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )), + this, TQT_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) ); ... ... -void MyPart::insertConfigWidget( QObject const * dlg, QWidget * page, unsigned int pagenumber ) +void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned int pagenumber ) { if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartGlobalSettings * w = new MyPartGlobalSettings( this, page ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); } else if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartProjectSettings * w = new MyPartProjectSettings( this, page ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); } } @endcode @@ -84,7 +84,7 @@ public: * @param pagenumber A per-proxy unique identifier, used when responding to insertConfigWidget() signal. * @param icon The name of the icon to use. */ - void createGlobalConfigPage( QString const & title, unsigned int pagenumber, QString const & icon = "kdevelop" ); + void createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon = "kdevelop" ); /** * Tells the proxy you want a page in the Project Settings. @@ -92,7 +92,7 @@ public: * @param pagenumber A per-proxy unique identifier, used when responding to insertConfigWidget() signal. * @param icon The name of the icon to use. */ - void createProjectConfigPage( QString const & title, unsigned int pagenumber, QString const & icon = "kdevelop" ); + void createProjectConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon = "kdevelop" ); /** * Removes a config page from the proxy. Next time the settings dialog opens, this page will not be available. @@ -107,17 +107,17 @@ signals: * @param page The setting page. The client should use this as parent to the config widget. * @param pagenumber The identifier set in createGlobalConfigPage() or createProjectConfigPage(). Identifies the requested config page. */ - void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber ); + void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ); private slots: void slotConfigWidget( KDialogBase * ); void slotProjectConfigWidget( KDialogBase * ); void slotConfigWidgetDestroyed(); - void slotAboutToShowPage( QWidget * page ); + void slotAboutToShowPage( TQWidget * page ); private: - typedef QMap > TitleMap; - typedef QMap PageMap; + typedef TQMap > TitleMap; + typedef TQMap PageMap; TitleMap _globalTitleMap; TitleMap _projectTitleMap; diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp index b183717f..9f5d40c9 100644 --- a/lib/util/domutil.cpp +++ b/lib/util/domutil.cpp @@ -15,23 +15,23 @@ #include "domutil.h" #include -#include -#include +#include +#include -void DomUtil::makeEmpty( QDomElement& e ) +void DomUtil::makeEmpty( TQDomElement& e ) { while( !e.firstChild().isNull() ) e.removeChild( e.firstChild() ); } -QDomElement DomUtil::elementByPath(const QDomDocument &doc, const QString &path) +TQDomElement DomUtil::elementByPath(const TQDomDocument &doc, const TQString &path) { - QStringList l = QStringList::split('/', path); + TQStringList l = TQStringList::split('/', path); - QDomElement el; + TQDomElement el; if(&doc) el = doc.documentElement(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) { el = el.namedItem(*it).toElement(); } @@ -40,9 +40,9 @@ QDomElement DomUtil::elementByPath(const QDomDocument &doc, const QString &path) } -QString DomUtil::readEntry(const QDomDocument &doc, const QString &path, const QString &defaultEntry) +TQString DomUtil::readEntry(const TQDomDocument &doc, const TQString &path, const TQString &defaultEntry) { - QDomElement el = elementByPath(doc, path); + TQDomElement el = elementByPath(doc, path); if (el.isNull()) return defaultEntry; else @@ -51,20 +51,20 @@ QString DomUtil::readEntry(const QDomDocument &doc, const QString &path, const Q /// @todo consider whether it's okay to accept empty string == default value /// if not use the below type -///typedef pair EltInfo; +///typedef pair EltInfo; -QString DomUtil::readEntryAux(const QDomDocument &doc, const QString &path) +TQString DomUtil::readEntryAux(const TQDomDocument &doc, const TQString &path) { - QDomElement el = elementByPath(doc, path); + TQDomElement el = elementByPath(doc, path); if (el.isNull()) - return QString::null; + return TQString::null; else return el.firstChild().toText().data(); } -int DomUtil::readIntEntry(const QDomDocument &doc, const QString &path, int defaultEntry) +int DomUtil::readIntEntry(const TQDomDocument &doc, const TQString &path, int defaultEntry) { - QString entry = readEntryAux(doc, path); + TQString entry = readEntryAux(doc, path); if (entry.isNull()) return defaultEntry; else @@ -72,9 +72,9 @@ int DomUtil::readIntEntry(const QDomDocument &doc, const QString &path, int defa } -bool DomUtil::readBoolEntry(const QDomDocument &doc, const QString &path, bool defaultEntry) +bool DomUtil::readBoolEntry(const TQDomDocument &doc, const TQString &path, bool defaultEntry) { - QString entry = readEntryAux(doc, path); + TQString entry = readEntryAux(doc, path); if (entry.isNull()) return defaultEntry; else @@ -82,12 +82,12 @@ bool DomUtil::readBoolEntry(const QDomDocument &doc, const QString &path, bool d } -QStringList DomUtil::readListEntry(const QDomDocument &doc, const QString &path, const QString &tag) +TQStringList DomUtil::readListEntry(const TQDomDocument &doc, const TQString &path, const TQString &tag) { - QStringList list; + TQStringList list; - QDomElement el = elementByPath(doc, path); - QDomElement subEl = el.firstChild().toElement(); + TQDomElement el = elementByPath(doc, path); + TQDomElement subEl = el.firstChild().toElement(); while (!subEl.isNull()) { if (subEl.tagName() == tag) list << subEl.firstChild().toText().data(); @@ -98,17 +98,17 @@ QStringList DomUtil::readListEntry(const QDomDocument &doc, const QString &path, } -DomUtil::PairList DomUtil::readPairListEntry(const QDomDocument &doc, const QString &path, const QString &tag, - const QString &firstAttr, const QString &secondAttr) +DomUtil::PairList DomUtil::readPairListEntry(const TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQString &firstAttr, const TQString &secondAttr) { PairList list; - QDomElement el = elementByPath(doc, path); - QDomElement subEl = el.firstChild().toElement(); + TQDomElement el = elementByPath(doc, path); + TQDomElement subEl = el.firstChild().toElement(); while (!subEl.isNull()) { if (subEl.tagName() == tag) { - QString first = subEl.attribute(firstAttr); - QString second = subEl.attribute(secondAttr); + TQString first = subEl.attribute(firstAttr); + TQString second = subEl.attribute(secondAttr); list << Pair(first, second); } subEl = subEl.nextSibling().toElement(); @@ -117,12 +117,12 @@ DomUtil::PairList DomUtil::readPairListEntry(const QDomDocument &doc, const QStr return list; } -QMap DomUtil::readMapEntry(const QDomDocument &doc, const QString& path) +TQMap DomUtil::readMapEntry(const TQDomDocument &doc, const TQString& path) { - QMap map; + TQMap map; - QDomElement el = elementByPath(doc, path); - QDomElement subEl = el.firstChild().toElement(); + TQDomElement el = elementByPath(doc, path); + TQDomElement subEl = el.firstChild().toElement(); while (!subEl.isNull()) { map[subEl.tagName()] = subEl.firstChild().toText().data(); subEl = subEl.nextSibling().toElement(); @@ -131,9 +131,9 @@ QMap DomUtil::readMapEntry(const QDomDocument &doc, const QStr return map; } -QDomElement DomUtil::namedChildElement( QDomElement& el, const QString& name ) +TQDomElement DomUtil::namedChildElement( TQDomElement& el, const TQString& name ) { - QDomElement child = el.namedItem( name ).toElement(); + TQDomElement child = el.namedItem( name ).toElement(); if (child.isNull()) { child = el.ownerDocument().createElement( name ); el.appendChild(child); @@ -142,13 +142,13 @@ QDomElement DomUtil::namedChildElement( QDomElement& el, const QString& name ) } -QDomElement DomUtil::createElementByPath(QDomDocument &doc, const QString &path) +TQDomElement DomUtil::createElementByPath(TQDomDocument &doc, const TQString &path) { - QStringList l = QStringList::split('/', path); + TQStringList l = TQStringList::split('/', path); - QDomElement el; + TQDomElement el; if(&doc) el = doc.documentElement(); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) el = DomUtil::namedChildElement( el, *it ); @@ -159,16 +159,16 @@ QDomElement DomUtil::createElementByPath(QDomDocument &doc, const QString &path) } -void DomUtil::writeEntry(QDomDocument &doc, const QString &path, const QString &value) +void DomUtil::writeEntry(TQDomDocument &doc, const TQString &path, const TQString &value) { - QDomElement el = createElementByPath(doc, path); + TQDomElement el = createElementByPath(doc, path); el.appendChild(doc.createTextNode(value)); } -void DomUtil::writeMapEntry(QDomDocument &doc, const QString &path, const QMap &map) +void DomUtil::writeMapEntry(TQDomDocument &doc, const TQString &path, const TQMap &map) { - QString basePath( path + "/" ); - QMap::ConstIterator it; + TQString basePath( path + "/" ); + TQMap::ConstIterator it; for (it = map.begin(); it != map.end(); ++it) { kdDebug( 9010 ) << "writing " << basePath << ";" << it.key() << ";" << it.data() << endl; @@ -177,65 +177,65 @@ void DomUtil::writeMapEntry(QDomDocument &doc, const QString &path, const QMap1) { // handle attributes - QStringList attrParts = QStringList::split(';',pathElemParts[1]); + TQStringList attrParts = TQStringList::split(';',pathElemParts[1]); for (unsigned int j=0; j -#include -#include -#include -#include +#include +#include +#include +#include +#include /** @file domutil.h @@ -26,18 +26,18 @@ Utility functions to operate on %DOM. struct DomAttribute { - QString name; - QString value; + TQString name; + TQString value; }; struct DomPathElement { - QString tagName; - QValueList attribute; + TQString tagName; + TQValueList attribute; int matchNumber; // for use when more than one element matches the path }; -typedef QValueList DomPath; +typedef TQValueList DomPath; /** * Utility class for conveniently accessing data in a %DOM tree. @@ -45,52 +45,52 @@ typedef QValueList DomPath; class DomUtil { public: - typedef QPair Pair; - typedef QValueList PairList; + typedef QPair Pair; + typedef TQValueList PairList; /** * Remove all child elements from a given element. */ - static void makeEmpty( QDomElement& ); + static void makeEmpty( TQDomElement& ); /** * Reads a string entry. */ - static QString readEntry(const QDomDocument &doc, const QString &path, const QString &defaultEntry = QString::null); + static TQString readEntry(const TQDomDocument &doc, const TQString &path, const TQString &defaultEntry = TQString::null); /** * Reads a number entry. */ - static int readIntEntry(const QDomDocument &doc, const QString &path, int defaultEntry = 0); + static int readIntEntry(const TQDomDocument &doc, const TQString &path, int defaultEntry = 0); /** * Reads a boolean entry. The strings "true" and "TRUE" are interpreted * as true, all other as false. */ - static bool readBoolEntry(const QDomDocument &doc, const QString &path, bool defaultEntry = false); + static bool readBoolEntry(const TQDomDocument &doc, const TQString &path, bool defaultEntry = false); /** * Reads a list entry. See writeListEntry(). */ - static QStringList readListEntry(const QDomDocument &doc, const QString &path, const QString &tag); + static TQStringList readListEntry(const TQDomDocument &doc, const TQString &path, const TQString &tag); /** * Reads a list of string pairs. See writePairListEntry(). */ - static PairList readPairListEntry(const QDomDocument &doc, const QString &path, const QString &tag, - const QString &firstAttr, const QString &secondAttr); + static PairList readPairListEntry(const TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQString &firstAttr, const TQString &secondAttr); /** * Reads a string to string map. See writeMapEntry() */ - static QMap readMapEntry(const QDomDocument &doc, const QString &path); + static TQMap readMapEntry(const TQDomDocument &doc, const TQString &path); /** * Retrieves an element by path, return null if any item along * the path does not exist. */ - static QDomElement elementByPath( const QDomDocument& doc, const QString& path ); + static TQDomElement elementByPath( const TQDomDocument& doc, const TQString& path ); /** * Retrieves an element by path, creating the necessary nodes. */ - static QDomElement createElementByPath( QDomDocument& doc, const QString& path ); + static TQDomElement createElementByPath( TQDomDocument& doc, const TQString& path ); /** * Retrieves a child element, creating it if it does not exist. * The return value is guaranteed to be non isNull() */ - static QDomElement namedChildElement( QDomElement& el, const QString& name ); + static TQDomElement namedChildElement( TQDomElement& el, const TQString& name ); /** Writes a string entry. For example, \verbatim @@ -103,20 +103,20 @@ public: \endverbatim */ - static void writeEntry(QDomDocument &doc, const QString &path, const QString &value); + static void writeEntry(TQDomDocument &doc, const TQString &path, const TQString &value); /** * Writes a number entry. */ - static void writeIntEntry(QDomDocument &doc, const QString &path, int value); + static void writeIntEntry(TQDomDocument &doc, const TQString &path, int value); /** * Writes a boolean entry. Booleans are stored as "true", "false" resp. */ - static void writeBoolEntry(QDomDocument &doc, const QString &path, bool value); + static void writeBoolEntry(TQDomDocument &doc, const TQString &path, bool value); /** Writes a string list element. The list elements are separated by tag. For example, \verbatim - QStringList l; l << "one" << "two"; + TQStringList l; l << "one" << "two"; writeListEntry(doc, "/general/special", "el", l); \endverbatim creates the %DOM fragment: \verbatim @@ -125,8 +125,8 @@ public: \endverbatim */ - static void writeListEntry(QDomDocument &doc, const QString &path, const QString &tag, - const QStringList &value); + static void writeListEntry(TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQStringList &value); /** Writes a list of string pairs. The list elements are stored in the attributes firstAttr and secondAttr of elements named tag. For example, @@ -146,14 +146,14 @@ public: \endverbatim */ - static void writePairListEntry(QDomDocument &doc, const QString &path, const QString &tag, - const QString &firstAttr, const QString &secondAttr, + static void writePairListEntry(TQDomDocument &doc, const TQString &path, const TQString &tag, + const TQString &firstAttr, const TQString &secondAttr, const PairList &value); /** * Writes a string to string map. This map is stored in a way, that it can be read with * readMapEntry() and readEntry() */ - static void writeMapEntry(QDomDocument &doc, const QString& path, const QMap &map); + static void writeMapEntry(TQDomDocument &doc, const TQString& path, const TQMap &map); /** * Resolves an extended path @@ -162,7 +162,7 @@ public: * where matchNumber is zero-based * path: pathpart[/pathpart/..] */ - static DomPath resolvPathStringExt(const QString pathstring); + static DomPath resolvPathStringExt(const TQString pathstring); /** Retrieve an element specified with extended path @@ -174,7 +174,7 @@ public: or "widget/property||2/string" . \verbatim - + KdevFormName @@ -192,35 +192,35 @@ public: \endverbatim */ - static QDomElement elementByPathExt(QDomDocument &doc, const QString &pathstring); + static TQDomElement elementByPathExt(TQDomDocument &doc, const TQString &pathstring); /** * Open file - filename - and set setContents of doc */ - static bool openDOMFile(QDomDocument &doc, QString filename); + static bool openDOMFile(TQDomDocument &doc, TQString filename); /** * Store contents of doc in file - filename. Existing file will be truncated! */ - static bool saveDOMFile(QDomDocument &doc, QString filename); + static bool saveDOMFile(TQDomDocument &doc, TQString filename); /** * Remove all child text nodes of parent described in pathExt */ - static bool removeTextNodes(QDomDocument doc,QString pathExt); + static bool removeTextNodes(TQDomDocument doc,TQString pathExt); /** * Add child text node to parent described in pathExt */ - static bool appendText(QDomDocument doc, QString pathExt, QString text); + static bool appendText(TQDomDocument doc, TQString pathExt, TQString text); /** * Replace all chilt text nodes of parent described in pathExt with one new. */ - static bool replaceText(QDomDocument doc, QString pathExt, QString text); + static bool replaceText(TQDomDocument doc, TQString pathExt, TQString text); private: - static QString readEntryAux(const QDomDocument &doc, const QString &path); + static TQString readEntryAux(const TQDomDocument &doc, const TQString &path); }; #endif diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 7618bd6e..7c4fea89 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -24,27 +24,27 @@ #include #include -ExecCommand::ExecCommand( const QString& executable, const QStringList& args, - const QString& workingDir, const QStringList& env, - QObject* parent, const char* name ): - QObject( parent, name ), out( "" ) /* make sure out is not QString::null since that would mean "error" */ +ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, + const TQString& workingDir, const TQStringList& env, + TQObject* parent, const char* name ): + TQObject( parent, name ), out( "" ) /* make sure out is not TQString::null since that would mean "error" */ { progressDlg = 0; proc = new KProcess(); proc->setWorkingDirectory( workingDir ); - for ( QStringList::ConstIterator it = env.begin(); it != env.end(); ++it ) + for ( TQStringList::ConstIterator it = env.begin(); it != env.end(); ++it ) proc->setEnvironment( (*it).section( '=', 0, 0 ), (*it).section( '=', 1, 1 ) ); *proc << executable; *proc << args; - connect( proc, SIGNAL(processExited(KProcess*)), - this, SLOT(processExited()) ); - connect( proc, SIGNAL(receivedStdout(KProcess*,char*,int)), - this, SLOT(receivedStdout(KProcess*,char*,int)) ); - connect( proc, SIGNAL(receivedStderr(KProcess*,char*,int)), - this, SLOT(receivedStderr(KProcess*,char*,int)) ); + connect( proc, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(processExited()) ); + connect( proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), + this, TQT_SLOT(receivedStdout(KProcess*,char*,int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), + this, TQT_SLOT(receivedStderr(KProcess*,char*,int)) ); bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); @@ -52,25 +52,25 @@ ExecCommand::ExecCommand( const QString& executable, const QStringList& args, KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ), i18n("Error Invoking Command") ); - emit finished( QString::null, QString::null ); + emit finished( TQString::null, TQString::null ); deleteLater(); } else { progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false ); - connect( progressDlg, SIGNAL(cancelClicked()), - this, SLOT(cancelClicked()) ); + connect( progressDlg, TQT_SIGNAL(cancelClicked()), + this, TQT_SLOT(cancelClicked()) ); } } void ExecCommand::receivedStdout (KProcess*, char *buffer, int buflen) { - out += QString::fromUtf8( buffer, buflen ); + out += TQString::fromUtf8( buffer, buflen ); } void ExecCommand::receivedStderr (KProcess*, char *buffer, int buflen) { - err += QString::fromUtf8( buffer, buflen ); + err += TQString::fromUtf8( buffer, buflen ); } void ExecCommand::processExited() @@ -88,7 +88,7 @@ void ExecCommand::cancelClicked() progressDlg = 0; proc->kill(); - emit finished( QString::null, QString::null ); + emit finished( TQString::null, TQString::null ); deleteLater(); } diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h index c00085c6..c3e20d47 100644 --- a/lib/util/execcommand.h +++ b/lib/util/execcommand.h @@ -20,8 +20,8 @@ #ifndef _EXECCOMMAND_H_ #define _EXECCOMMAND_H_ -#include -#include +#include +#include class KProcess; class KProgressDialog; @@ -37,22 +37,22 @@ Command execution facilities. * a progress dialog with the possibility to cancel the command. * * If there was an error or the user pressed cancel, finished () - * will emit a QString::null, otherwise QStrings containing the stdout/stderr. + * will emit a TQString::null, otherwise QStrings containing the stdout/stderr. * * The object will delete itself after the finished signal has been emitted. - * Additional environment can be set in the QStringList env via QStrings with the format "foo=blah" + * Additional environment can be set in the TQStringList env via QStrings with the format "foo=blah" */ class ExecCommand : public QObject { Q_OBJECT public: - ExecCommand( const QString& executable, const QStringList& args, - const QString& workingDir = QString::null, - const QStringList& env = QStringList(), QObject* parent = 0, const char* name = 0 ); + ExecCommand( const TQString& executable, const TQStringList& args, + const TQString& workingDir = TQString::null, + const TQStringList& env = TQStringList(), TQObject* parent = 0, const char* name = 0 ); ~ExecCommand(); signals: - void finished( const QString& output, const QString& errorOutput ); + void finished( const TQString& output, const TQString& errorOutput ); private slots: void receivedStdout (KProcess *, char *buffer, int buflen); @@ -63,8 +63,8 @@ private slots: private: KProcess* proc; KProgressDialog* progressDlg; - QString out; - QString err; + TQString out; + TQString err; }; #endif diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp index 78abf384..cbf4f8bb 100644 --- a/lib/util/filetemplate.cpp +++ b/lib/util/filetemplate.cpp @@ -19,11 +19,11 @@ #include "filetemplate.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -32,97 +32,97 @@ #include "domutil.h" -bool FileTemplate::exists(KDevPlugin *part, const QString &name, Policy p) +bool FileTemplate::exists(KDevPlugin *part, const TQString &name, Policy p) { - //QString fileName = (p == Default) ? + //TQString fileName = (p == Default) ? // (part->project()->projectDirectory() + "/templates/" + name) : name; - return QFile::exists( fullPathForName(part,name,p) ); + return TQFile::exists( fullPathForName(part,name,p) ); } -QString FileTemplate::read(KDevPlugin *part, const QString &name, Policy p) +TQString FileTemplate::read(KDevPlugin *part, const TQString &name, Policy p) { //KDevProject *project = part->project(); - //QString fileName = (p == Default) ? (project->projectDirectory() + + //TQString fileName = (p == Default) ? (project->projectDirectory() + // "/templates/" + name) : name; return readFile(part, fullPathForName(part, name, p) ); } -QString FileTemplate::readFile(KDevPlugin *part, const QString &fileName) +TQString FileTemplate::readFile(KDevPlugin *part, const TQString &fileName) { - QDomDocument &dom = *part->projectDom(); + TQDomDocument &dom = *part->projectDom(); - QFile f(fileName); + TQFile f(fileName); if (!f.open(IO_ReadOnly)) - return QString::null; - QTextStream stream(&f); - QString str = stream.read(); + return TQString::null; + TQTextStream stream(&f); + TQString str = stream.read(); return makeSubstitutions( dom, str ); } -QString FileTemplate::makeSubstitutions( QDomDocument & dom, const QString & text ) +TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString & text ) { - QString author = DomUtil::readEntry(dom, "/general/author"); - QString email = DomUtil::readEntry(dom, "/general/email"); - QString version = DomUtil::readEntry(dom, "/general/version"); - QString appname = DomUtil::readEntry(dom, "/general/projectname"); - QString date = QDate::currentDate().toString(); - QString year = QString::number(QDate::currentDate().year()); - - QString str = text; - str.replace(QRegExp("\\$EMAIL\\$"),email); - str.replace(QRegExp("\\$AUTHOR\\$"),author); - str.replace(QRegExp("\\$VERSION\\$"),version); - str.replace(QRegExp("\\$DATE\\$"),date); - str.replace(QRegExp("\\$YEAR\\$"),year); - str.replace(QRegExp("\\$APPNAME\\$"),appname); - str.replace(QRegExp("\\$APPNAME\\$"),appname); - str.replace(QRegExp("\\$APPNAMEUC\\$"),appname.upper()); - str.replace(QRegExp("\\$APPNAMELC\\$"),appname.lower()); + TQString author = DomUtil::readEntry(dom, "/general/author"); + TQString email = DomUtil::readEntry(dom, "/general/email"); + TQString version = DomUtil::readEntry(dom, "/general/version"); + TQString appname = DomUtil::readEntry(dom, "/general/projectname"); + TQString date = TQDate::currentDate().toString(); + TQString year = TQString::number(TQDate::currentDate().year()); + + TQString str = text; + str.replace(TQRegExp("\\$EMAIL\\$"),email); + str.replace(TQRegExp("\\$AUTHOR\\$"),author); + str.replace(TQRegExp("\\$VERSION\\$"),version); + str.replace(TQRegExp("\\$DATE\\$"),date); + str.replace(TQRegExp("\\$YEAR\\$"),year); + str.replace(TQRegExp("\\$APPNAME\\$"),appname); + str.replace(TQRegExp("\\$APPNAME\\$"),appname); + str.replace(TQRegExp("\\$APPNAMEUC\\$"),appname.upper()); + str.replace(TQRegExp("\\$APPNAMELC\\$"),appname.lower()); return str; } -bool FileTemplate::copy(KDevPlugin *part, const QString &name, - const QString &dest, Policy p) +bool FileTemplate::copy(KDevPlugin *part, const TQString &name, + const TQString &dest, Policy p) { - QString text = read(part, name, p); + TQString text = read(part, name, p); - QFile f(dest); + TQFile f(dest); if (!f.open(IO_WriteOnly)) return false; - QFileInfo fi(f); - QString module = fi.baseName(); - QString basefilename = fi.baseName(true); - text.replace(QRegExp("\\$MODULE\\$"),module); - text.replace(QRegExp("\\$FILENAME\\$"),basefilename); + TQFileInfo fi(f); + TQString module = fi.baseName(); + TQString basefilename = fi.baseName(true); + text.replace(TQRegExp("\\$MODULE\\$"),module); + text.replace(TQRegExp("\\$FILENAME\\$"),basefilename); - QTextStream stream(&f); + TQTextStream stream(&f); stream << text; f.close(); return true; } -QString FileTemplate::fullPathForName(KDevPlugin *part, const QString &name, +TQString FileTemplate::fullPathForName(KDevPlugin *part, const TQString &name, Policy p) { // if Policy is not default, full path is just the name if (p!=Default) return name; - QString fileName; + TQString fileName; // first try project-specific if (part->project()) { fileName = (part->project()->projectDirectory() + "/templates/" + name); - if (QFile::exists(fileName)) return fileName; + if (TQFile::exists(fileName)) return fileName; } // next try global - QString globalName = ::locate("data", "kdevfilecreate/file-templates/" + name); + TQString globalName = ::locate("data", "kdevfilecreate/file-templates/" + name); return globalName.isNull() ? fileName : globalName; } diff --git a/lib/util/filetemplate.h b/lib/util/filetemplate.h index f179f5be..b1ba2cdc 100644 --- a/lib/util/filetemplate.h +++ b/lib/util/filetemplate.h @@ -20,7 +20,7 @@ #ifndef _FILETEMPLATE_H_ #define _FILETEMPLATE_H_ -#include +#include class KDevPlugin; class QDomDocument; @@ -49,40 +49,40 @@ public: * exists in the current project. File templates * are stored in the "templates" subdirectory of a project or in application shared dirs. */ - static bool exists(KDevPlugin *part, const QString &name, Policy p = Default); + static bool exists(KDevPlugin *part, const TQString &name, Policy p = Default); /** * Reads a template with the given name (e.g. "cpp") * and makes variable substitutions (like $AUTHOR$ etc.) * in it. The resulting string is returned. */ - static QString read(KDevPlugin *part, const QString &name, Policy p = Default); + static TQString read(KDevPlugin *part, const TQString &name, Policy p = Default); /** * Reads a template with the given URL * and makes variable substitutions (like $AUTHOR$ etc.) * in it. The resulting string is returned. */ - static QString readFile(KDevPlugin *part, const QString &fileName); + static TQString readFile(KDevPlugin *part, const TQString &fileName); /** - * Makes variable substitutions on a text, based on a specified QDomDocument + * Makes variable substitutions on a text, based on a specified TQDomDocument * describing a KDevelop project file. The resulting string is returned. */ - static QString makeSubstitutions(QDomDocument &dom, const QString &text); + static TQString makeSubstitutions(TQDomDocument &dom, const TQString &text); /** * Copies a file template with the given name to the * file with the name dest and - while copying - * performs variable substitutions. */ - static bool copy(KDevPlugin *part, const QString &name, - const QString &dest, Policy p = Default); + static bool copy(KDevPlugin *part, const TQString &name, + const TQString &dest, Policy p = Default); /** * Translates a template name into a full path, or suggests a full path * for the template in the project directory if it doesn't exist. */ - static QString fullPathForName(KDevPlugin *part, const QString &name, Policy p = Default); + static TQString fullPathForName(KDevPlugin *part, const TQString &name, Policy p = Default); }; #endif diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp index fdf044d5..ca946ce6 100644 --- a/lib/util/kdeveditorutil.cpp +++ b/lib/util/kdeveditorutil.cpp @@ -33,15 +33,15 @@ bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * co return true; } -QString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view ) +TQString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view ) { KTextEditor::EditInterface * editIface = dynamic_cast( doc ); - if ( !editIface ) return QString(); + if ( !editIface ) return TQString(); view = view ? view : dynamic_cast( doc->widget() ); KTextEditor::ViewCursorInterface * cursorIface = dynamic_cast( view ); - if ( !cursorIface ) return QString(); + if ( !cursorIface ) return TQString(); uint line = 0; uint col = 0; @@ -50,21 +50,21 @@ QString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::V return editIface->textLine(line); } -QString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view ) +TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view ) { KTextEditor::EditInterface * editIface = dynamic_cast( doc ); - if ( !editIface ) return QString(); + if ( !editIface ) return TQString(); view = view ? view : dynamic_cast( doc->widget() ); KTextEditor::ViewCursorInterface * cursorIface = dynamic_cast( view ); - if ( !cursorIface ) return QString(); + if ( !cursorIface ) return TQString(); uint line = 0; uint col = 0; cursorIface->cursorPositionReal(&line, &col); - QString linestr = editIface->textLine(line); + TQString linestr = editIface->textLine(line); int startPos = QMAX( QMIN( (int)col, (int)linestr.length()-1 ), 0 ); int endPos = startPos; @@ -74,14 +74,14 @@ QString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::V while (endPos < (int)linestr.length() && ( linestr[endPos].isLetterOrNumber() || linestr[endPos] == '_' ) ) endPos++; - return ( ( startPos == endPos ) ? QString::null : linestr.mid( startPos+1, endPos-startPos-1 ) ); + return ( ( startPos == endPos ) ? TQString::null : linestr.mid( startPos+1, endPos-startPos-1 ) ); } -QString KDevEditorUtil::currentSelection( KTextEditor::Document * doc ) +TQString KDevEditorUtil::currentSelection( KTextEditor::Document * doc ) { KTextEditor::SelectionInterface * selectIface = dynamic_cast( doc ); - return selectIface ? selectIface->selection() : QString(); + return selectIface ? selectIface->selection() : TQString(); } diff --git a/lib/util/kdeveditorutil.h b/lib/util/kdeveditorutil.h index 7b788fc3..79a64fe1 100644 --- a/lib/util/kdeveditorutil.h +++ b/lib/util/kdeveditorutil.h @@ -18,7 +18,7 @@ class Document; class View; } -#include +#include /** Class with some common utility operations not currently supported by KTE @@ -46,19 +46,19 @@ public: * @param view * @return */ - static QString currentLine( KTextEditor::Document * doc, KTextEditor::View * view = 0 ); + static TQString currentLine( KTextEditor::Document * doc, KTextEditor::View * view = 0 ); /** * Call to get the text under the cursor of the currently active view. * @return the text under the cursor of the currently active view */ - static QString currentWord( KTextEditor::Document * doc, KTextEditor::View * view = 0 ); + static TQString currentWord( KTextEditor::Document * doc, KTextEditor::View * view = 0 ); /** * Call to get the selection in the currently active view * @return the selection in the currently active view */ - static QString currentSelection( KTextEditor::Document * doc ); + static TQString currentSelection( KTextEditor::Document * doc ); }; #endif diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp index b7f9e2ae..b0b78250 100644 --- a/lib/util/kdevjobtimer.cpp +++ b/lib/util/kdevjobtimer.cpp @@ -11,22 +11,22 @@ #include "kdevjobtimer.h" -KDevJobTimer::KDevJobTimer( void * payload, QObject *parent, const char *name) - : QTimer(parent, name) +KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name) + : TQTimer(parent, name) { m_payload = payload; - connect( this, SIGNAL(timeout()), this, SLOT(slotTimeout()) ); + connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); } KDevJobTimer::~KDevJobTimer() { } -void KDevJobTimer::singleShot(int msec, QObject * receiver, const char * member, void * payload) +void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload) { KDevJobTimer * p = new KDevJobTimer( payload ); p->start( msec, true ); - connect( p, SIGNAL(timeout(void*)), receiver, member ); + connect( p, TQT_SIGNAL(timeout(void*)), receiver, member ); } void KDevJobTimer::slotTimeout() diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h index 972a654a..19915d06 100644 --- a/lib/util/kdevjobtimer.h +++ b/lib/util/kdevjobtimer.h @@ -12,19 +12,19 @@ #ifndef KDEVJOBTIMER_H #define KDEVJOBTIMER_H -#include +#include class KDevJobTimer : public QTimer { Q_OBJECT public: - static void singleShot( int msec, QObject * receiver, const char * member, void * payload ); + static void singleShot( int msec, TQObject * receiver, const char * member, void * payload ); signals: void timeout(void*); private: - KDevJobTimer( void * payload, QObject *parent = 0, const char *name = 0); + KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0); ~KDevJobTimer(); private slots: diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index f9a61fea..546360c6 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include -#include +#include +#include #include #include @@ -20,8 +20,8 @@ #include "kdevshellwidget.h" -KDevShellWidget::KDevShellWidget(QWidget *parent, const char *name) - : QVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false ) +KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name) + : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false ) { } @@ -30,7 +30,7 @@ KDevShellWidget::~KDevShellWidget() { } -void KDevShellWidget::setShell( const QString & shell, const QStrList & arguments ) +void KDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments ) { m_shellName = shell; m_shellArguments = arguments; @@ -44,16 +44,16 @@ void KDevShellWidget::activate( ) m_konsolePart = (KParts::ReadOnlyPart *) factory->create( this, "libkonsolepart", "KParts::ReadOnlyPart" ); if ( !m_konsolePart ) return; - connect( m_konsolePart, SIGNAL( processExited(KProcess *) ), this, SLOT( processExited(KProcess *) ) ); - connect( m_konsolePart, SIGNAL( receivedData( const QString& ) ), this, SIGNAL( receivedData( const QString& ) ) ); - connect( m_konsolePart, SIGNAL(destroyed()), this, SLOT(partDestroyed()) ); + connect( m_konsolePart, TQT_SIGNAL( processExited(KProcess *) ), this, TQT_SLOT( processExited(KProcess *) ) ); + connect( m_konsolePart, TQT_SIGNAL( receivedData( const TQString& ) ), this, TQT_SIGNAL( receivedData( const TQString& ) ) ); + connect( m_konsolePart, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()) ); - m_konsolePart->widget()->setFocusPolicy( QWidget::WheelFocus ); + m_konsolePart->widget()->setFocusPolicy( TQWidget::WheelFocus ); setFocusProxy( m_konsolePart->widget() ); m_konsolePart->widget()->setFocus(); - if ( m_konsolePart->widget()->inherits("QFrame") ) - ((QFrame*)m_konsolePart->widget())->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + if ( m_konsolePart->widget()->inherits("TQFrame") ) + ((TQFrame*)m_konsolePart->widget())->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); m_konsolePart->widget()->show(); @@ -89,7 +89,7 @@ void KDevShellWidget::processExited( KProcess * proc ) emit shellSignalled( proc->exitSignal() ); } -void KDevShellWidget::sendInput( const QString & text ) +void KDevShellWidget::sendInput( const TQString & text ) { if ( !m_konsolePart ) return; TerminalInterface* ti = static_cast( m_konsolePart->qt_cast( "TerminalInterface" ) ); @@ -109,7 +109,7 @@ void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate ) // reactivating with a non-working setting (the partDestroyed() // slot will have ran before m_doAutoActivate is set) if ( doAutoActivate ) - QTimer::singleShot( 3000, this, SLOT(setAutoReactivateOnCloseDelayed()) ); + TQTimer::singleShot( 3000, this, TQT_SLOT(setAutoReactivateOnCloseDelayed()) ); else m_doAutoActivate = false; } diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h index 3f1500aa..69198a7a 100644 --- a/lib/util/kdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -13,9 +13,9 @@ #ifndef KDEVSHELLWIDGET_H #define KDEVSHELLWIDGET_H -#include -#include -#include +#include +#include +#include class KProcess; namespace KParts @@ -29,7 +29,7 @@ class KDevShellWidget : public QVBox Q_OBJECT public: - KDevShellWidget(QWidget *parent = 0, const char *name = 0); + KDevShellWidget(TQWidget *parent = 0, const char *name = 0); virtual ~KDevShellWidget(); /** @@ -37,7 +37,7 @@ public: * @param shell The shell name, for example 'irb' or '/bin/bash' * @param arguments Any optional arguments */ - void setShell( const QString & shell, const QStrList & arguments = QStrList() ); + void setShell( const TQString & shell, const TQStrList & arguments = TQStrList() ); /** * Executes the previously set shell. If @ref setShell wasn't called before @@ -55,7 +55,7 @@ public: * Send text to the running shell * @param text The text to send to the shell */ - void sendInput( const QString & text ); + void sendInput( const TQString & text ); /** * Call to check if the shell is currently running @@ -80,7 +80,7 @@ signals: * This signal will be emitted when the process receives data * @param text received data */ - void receivedData( const QString & ); + void receivedData( const TQString & ); private slots: void partDestroyed(); @@ -88,9 +88,9 @@ private slots: void setAutoReactivateOnCloseDelayed( ); private: - QGuardedPtr m_konsolePart; - QString m_shellName; - QStrList m_shellArguments; + TQGuardedPtr m_konsolePart; + TQString m_shellName; + TQStrList m_shellArguments; bool m_doAutoActivate; bool m_isRunning; }; diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp index b06a9edf..ffc3a536 100644 --- a/lib/util/kscriptactionmanager.cpp +++ b/lib/util/kscriptactionmanager.cpp @@ -29,11 +29,11 @@ #include #include #include -#include -#include +#include +#include -KScriptAction::KScriptAction( const QString &scriptDesktopFile, QObject *interface, KActionCollection *ac ) - : QObject(interface), KScriptClientInterface( ) +KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ) + : TQObject(interface), KScriptClientInterface( ) { m_interface = 0L; m_action = 0L; @@ -43,24 +43,24 @@ KScriptAction::KScriptAction( const QString &scriptDesktopFile, QObject *interfa if(KDesktopFile::isDesktopFile(scriptDesktopFile)) { KDesktopFile desktop(scriptDesktopFile, true); - QFileInfo scriptPath(scriptDesktopFile); + TQFileInfo scriptPath(scriptDesktopFile); m_scriptFile = scriptPath.dirPath(true) + "/" + desktop.readEntry("X-KDE-ScriptName", ""); m_scriptName = desktop.readName(); m_scriptType = desktop.readType(); - QString scriptTypeQuery = "([X-KDE-Script-Runner] == '" + m_scriptType + "')"; + TQString scriptTypeQuery = "([X-KDE-Script-Runner] == '" + m_scriptType + "')"; KTrader::OfferList offers = KTrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); if ( !offers.isEmpty() ) { - m_action = new KAction(m_scriptName, KShortcut(), this, SLOT(activate()), ac, "script"); + m_action = new KAction(m_scriptName, KShortcut(), this, TQT_SLOT(activate()), ac, "script"); m_isValid = true; - m_timeout = new QTimer(this); - QString icon = desktop.readIcon(); + m_timeout = new TQTimer(this); + TQString icon = desktop.readIcon(); m_action->setStatusText(desktop.readComment()); if( !icon.isEmpty() ) m_action->setIcon(icon); m_action->setShortcutConfigurable(true); - connect( m_timeout, SIGNAL(timeout()), SLOT(cleanup()) ); + connect( m_timeout, TQT_SIGNAL(timeout()), TQT_SLOT(cleanup()) ); } } } @@ -82,7 +82,7 @@ void KScriptAction::activate( ) { if( m_interface == 0L) { - QString scriptTypeQuery = "([X-KDE-Script-Runner] == '" + m_scriptType + "')"; + TQString scriptTypeQuery = "([X-KDE-Script-Runner] == '" + m_scriptType + "')"; m_interface= KParts::ComponentFactory::createInstanceFromQuery( "KScriptRunner/KScriptRunner", scriptTypeQuery, this ); if ( m_interface != 0L) { @@ -91,7 +91,7 @@ void KScriptAction::activate( ) m_interface->setScript(m_scriptFile); else m_interface->setScript(m_scriptFile, m_scriptMethod); - connect(this, SIGNAL(done(KScriptClientInterface::Result, const QVariant &)), this, SLOT(scriptFinished())); + connect(this, TQT_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQT_SLOT(scriptFinished())); } else { @@ -100,7 +100,7 @@ void KScriptAction::activate( ) return; } } - m_interface->run(parent(), QVariant()); + m_interface->run(parent(), TQVariant()); m_timeout->start(60000,FALSE); // after 1 minute unload m_refs++; } @@ -119,7 +119,7 @@ void KScriptAction::scriptFinished() m_refs--; } -KScriptActionManager::KScriptActionManager( QObject *parent, KActionCollection * ac ) : QObject(parent), m_ac(ac) +KScriptActionManager::KScriptActionManager( TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac) { m_actions.setAutoDelete(true); } @@ -129,22 +129,22 @@ KScriptActionManager::~ KScriptActionManager( ) m_actions.clear(); } -QPtrList< KAction > KScriptActionManager::scripts( QObject * interface , const QStringList &dirs) const +TQPtrList< KAction > KScriptActionManager::scripts( TQObject * interface , const TQStringList &dirs) const { m_actions.clear(); - QPtrList actions; - QStringList scripts; + TQPtrList actions; + TQStringList scripts; scripts += KGlobal::dirs()->findAllResources("data", - QString(kapp->name())+"/scripts/*.desktop", false, true ); + TQString(kapp->name())+"/scripts/*.desktop", false, true ); - for( QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) + for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { scripts += KGlobal::dirs()->findAllResources("data", (*it)+"/*.desktop", false, true ); } - for (QStringList::Iterator it = scripts.begin(); it != scripts.end(); ++it ) + for (TQStringList::Iterator it = scripts.begin(); it != scripts.end(); ++it ) { kdDebug() << "Loading " << *it << endl; KScriptAction *script = new KScriptAction(*it, interface, m_ac); @@ -152,16 +152,16 @@ QPtrList< KAction > KScriptActionManager::scripts( QObject * interface , const Q { actions.append(script->action()); m_actions.append(script); - connect(script, SIGNAL(error( const QString&)), this, - SIGNAL(scriptError( const QString&))); - connect(script, SIGNAL(warning( const QString&)), this, - SIGNAL(scriptWarning( const QString&))); - connect(script, SIGNAL(output( const QString&)), this, - SIGNAL(scriptOutput( const QString&))); - connect(script, SIGNAL(progress( int )), this, - SIGNAL(scriptProgress(int))); - connect(script, SIGNAL(done( KScriptClientInterface::Result, const QVariant &)),this, - SIGNAL(scriptDone( KScriptClientInterface::Result, const QVariant &))); + connect(script, TQT_SIGNAL(error( const TQString&)), this, + TQT_SIGNAL(scriptError( const TQString&))); + connect(script, TQT_SIGNAL(warning( const TQString&)), this, + TQT_SIGNAL(scriptWarning( const TQString&))); + connect(script, TQT_SIGNAL(output( const TQString&)), this, + TQT_SIGNAL(scriptOutput( const TQString&))); + connect(script, TQT_SIGNAL(progress( int )), this, + TQT_SIGNAL(scriptProgress(int))); + connect(script, TQT_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, + TQT_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); } else delete script; diff --git a/lib/util/kscriptactionmanager.h b/lib/util/kscriptactionmanager.h index 78833d2b..47d1a04e 100644 --- a/lib/util/kscriptactionmanager.h +++ b/lib/util/kscriptactionmanager.h @@ -21,8 +21,8 @@ #define KScriptAction_H #include -#include -#include +#include +#include class KAction; class KActionCollection; @@ -35,11 +35,11 @@ class QTimer; * * @author ian geiser geiseri@sourcextreme.com */ -class KScriptAction : public QObject, public KScriptClientInterface { +class KScriptAction : public TQObject, public KScriptClientInterface { Q_OBJECT public: - KScriptAction( const QString &scriptDesktopFile, QObject *interface, KActionCollection *ac ); + KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ); virtual ~KScriptAction(); @@ -55,18 +55,18 @@ public: signals: // Reimplemented from KScript - void error ( const QString &msg ); - void warning ( const QString &msg ); - void output ( const QString &msg ); + void error ( const TQString &msg ); + void warning ( const TQString &msg ); + void output ( const TQString &msg ); void progress ( int percent ); - void done ( KScriptClientInterface::Result result, const QVariant &returned ); + void done ( KScriptClientInterface::Result result, const TQVariant &returned ); signals: - void scriptError ( const QString &msg ); - void scriptWarning ( const QString &msg ); - void scriptOutput ( const QString &msg ); + void scriptError ( const TQString &msg ); + void scriptWarning ( const TQString &msg ); + void scriptOutput ( const TQString &msg ); void scriptProgress ( int percent ); - void scriptDone ( KScriptClientInterface::Result result, const QVariant &returned ); + void scriptDone ( KScriptClientInterface::Result result, const TQVariant &returned ); private slots: void activate(); @@ -75,13 +75,13 @@ private slots: private: KAction *m_action; - QString m_scriptName; - QString m_scriptType; - QString m_scriptFile; - QString m_scriptMethod; + TQString m_scriptName; + TQString m_scriptType; + TQString m_scriptFile; + TQString m_scriptMethod; KScriptInterface *m_interface; bool m_isValid; - QTimer *m_timeout; + TQTimer *m_timeout; uint m_refs; }; @@ -90,39 +90,39 @@ private: * Scripts are not actually loaded until they are actually executed. * @author ian geiser */ -class KScriptActionManager : public QObject { +class KScriptActionManager : public TQObject { Q_OBJECT public: /** * Create a script manager that is attached to an action collection. */ - KScriptActionManager( QObject *parent, KActionCollection *ac ); + KScriptActionManager( TQObject *parent, KActionCollection *ac ); ~KScriptActionManager(); /** * Return all currently loaded scripts in a direcotry and attaches them - * to a QObject interface. If the dirs are empty the current applications + * to a TQObject interface. If the dirs are empty the current applications * scripts directory is used. The dirs are actual directories to search * in the $KDEPATH/data/ direcories. So if you add "coolapp/data" then * the manager will search in $KDEPATH/data/coolapp/data for all desktop * files that are scripts. */ - QPtrList scripts( QObject *interface, const QStringList &dirs = QStringList() ) const; + TQPtrList scripts( TQObject *interface, const TQStringList &dirs = TQStringList() ) const; signals: /** * Returns an error message from a script. */ - void scriptError ( const QString &msg ); + void scriptError ( const TQString &msg ); /** * Returns a warning message from a script. */ - void scriptWarning ( const QString &msg ); + void scriptWarning ( const TQString &msg ); /** * Returns a standard out message from a script. */ - void scriptOutput ( const QString &msg ); + void scriptOutput ( const TQString &msg ); /** * Returns the percentage complete of an operation in the script. */ @@ -130,10 +130,10 @@ signals: /** * Notifies that the script has finished. */ - void scriptDone( KScriptClientInterface::Result result, const QVariant &returned ); + void scriptDone( KScriptClientInterface::Result result, const TQVariant &returned ); private: - mutable QPtrList m_actions; + mutable TQPtrList m_actions; KActionCollection *m_ac; }; #endif diff --git a/lib/util/rurl.cpp b/lib/util/rurl.cpp index 1ec23434..0d631bda 100644 --- a/lib/util/rurl.cpp +++ b/lib/util/rurl.cpp @@ -1,4 +1,4 @@ -#include +#include #include "rurl.h" @@ -7,7 +7,7 @@ namespace Relative{ //class Name -Name::Name( const QString & rurl, const Type type ) +Name::Name( const TQString & rurl, const Type type ) :m_rurl(rurl), m_type(type) { correct(); @@ -43,9 +43,9 @@ void Name::correct() } } -QString Name::correctName( const QString & rurl, const Type type ) +TQString Name::correctName( const TQString & rurl, const Type type ) { - QString temp = rurl; + TQString temp = rurl; temp = Name::cleanName(temp); if (temp[0] == '/') temp = temp.mid(1); @@ -65,21 +65,21 @@ QString Name::correctName( const QString & rurl, const Type type ) return temp; } -void Name::setRURL( const QString & rurl, const Type type ) +void Name::setRURL( const TQString & rurl, const Type type ) { m_rurl = rurl; m_type = type; correct(); } -QString Name::rurl( ) const +TQString Name::rurl( ) const { return m_rurl; } -void Name::addPath( const QString & addendum ) +void Name::addPath( const TQString & addendum ) { - QString temp = correctName(addendum, Directory); + TQString temp = correctName(addendum, Directory); m_rurl = directory() + temp + fileName(); } @@ -88,9 +88,9 @@ void Name::cleanRURL( ) m_rurl = cleanName(m_rurl); } -QString Name::cleanName( const QString & rurl ) +TQString Name::cleanName( const TQString & rurl ) { - QString temp; + TQString temp; bool wasSlash = false; for (unsigned int i = 0; i < rurl.length(); ++i) { @@ -107,30 +107,30 @@ QString Name::cleanName( const QString & rurl ) return temp; } -QString Name::extension( bool complete ) const +TQString Name::extension( bool complete ) const { if (m_type == File) { - QString temp = fileName(); + TQString temp = fileName(); if (complete) return temp.mid(temp.find('.')+1); else return temp.mid(temp.findRev('.')+1); } - return QString::null; + return TQString::null; } -QString Name::fileName( ) const +TQString Name::fileName( ) const { if (m_type == File) return m_rurl.section('/', -1); - return QString::null; + return TQString::null; } -QString Name::directory( ) const +TQString Name::directory( ) const { if ( (m_type == File) && (m_rurl.findRev('/') == -1) ) - return QString::null; + return TQString::null; return m_rurl.mid(0, m_rurl.findRev('/')+1); } @@ -181,18 +181,18 @@ void Name::setType( const Type type ) m_type = type; } -Name Name::relativeName( const QString &base, const QString &url ) +Name Name::relativeName( const TQString &base, const TQString &url ) { - QString dirUrl = base; - QString fileUrl = url; + TQString dirUrl = base; + TQString fileUrl = url; if (dirUrl.isEmpty() || (dirUrl == "/")) return Name(fileUrl); - QStringList dir = QStringList::split("/", dirUrl, false); - QStringList file = QStringList::split("/", fileUrl, false); + TQStringList dir = TQStringList::split("/", dirUrl, false); + TQStringList file = TQStringList::split("/", fileUrl, false); - QString resFileName = file.last(); + TQString resFileName = file.last(); if (url.endsWith("/")) resFileName += "/"; file.remove(file.last()); @@ -201,10 +201,10 @@ Name Name::relativeName( const QString &base, const QString &url ) while ( (i < dir.count()) && (i < (file.count())) && (dir[i] == file[i]) ) i++; - QString result_up; - QString result_down; - QString currDir; - QString currFile; + TQString result_up; + TQString result_down; + TQString currDir; + TQString currFile; do { i >= dir.count() ? currDir = "" : currDir = dir[i]; @@ -237,7 +237,7 @@ URL::URL( KURL base, KURL url, Type type ) { } -URL::URL( KURL base, QString url, bool isUrlRelative, Type type ) +URL::URL( KURL base, TQString url, bool isUrlRelative, Type type ) :Name(isUrlRelative ? url : Name::relativeName(base.path(), url).rurl(), type), m_base(base) { } @@ -247,7 +247,7 @@ void URL::setBase( const KURL & base ) m_base = base; } -void URL::setBase( const QString & base ) +void URL::setBase( const TQString & base ) { KURL url; url.setPath(base); @@ -259,7 +259,7 @@ KURL URL::base( ) const return m_base; } -QString URL::basePath( ) const +TQString URL::basePath( ) const { return m_base.path(1); } @@ -272,7 +272,7 @@ KURL URL::url( ) const return url; } -QString URL::urlPath( ) const +TQString URL::urlPath( ) const { KURL url = m_base; url.addPath(rurl()); @@ -285,7 +285,7 @@ QString URL::urlPath( ) const return url.path(mod); } -QString URL::urlDirectory( ) const +TQString URL::urlDirectory( ) const { KURL url = m_base; url.addPath(rurl()); @@ -303,7 +303,7 @@ URL URL::relativeURL( KURL base, KURL url ) return URL(base, url); } -URL URL::relativeURL( KURL base, QString url, bool isUrlRelative ) +URL URL::relativeURL( KURL base, TQString url, bool isUrlRelative ) { return URL(base, url, isUrlRelative); } @@ -327,17 +327,17 @@ Directory::Directory( KURL base, KURL url ) { } -Directory::Directory( KURL base, QString url, bool isRelativeUrl ) +Directory::Directory( KURL base, TQString url, bool isRelativeUrl ) :URL(base, url, isRelativeUrl, Name::Directory) { } -void Directory::setRURL( QString rurl ) +void Directory::setRURL( TQString rurl ) { URL::setRURL(rurl, Name::Directory); } -void Directory::setRURL( QString rurl, Type type ) +void Directory::setRURL( TQString rurl, Type type ) { URL::setRURL(rurl, type); } @@ -351,17 +351,17 @@ File::File( KURL base, KURL url ) { } -File::File( KURL base, QString url, bool isRelativeUrl ) +File::File( KURL base, TQString url, bool isRelativeUrl ) :URL(base, url, isRelativeUrl, Name::File) { } -void File::setRURL( QString rurl, Type type ) +void File::setRURL( TQString rurl, Type type ) { URL::setRURL(rurl, type); } -void File::setRURL( QString rurl ) +void File::setRURL( TQString rurl ) { URL::setRURL(rurl, Name::File); } diff --git a/lib/util/rurl.h b/lib/util/rurl.h index 342b3e3d..5ab2ec73 100644 --- a/lib/util/rurl.h +++ b/lib/util/rurl.h @@ -23,33 +23,33 @@ public: name/name/ are directories name/name are files. Trailing slash will be deleted for files (type == File).*/ - Name(const QString &rurl, const Type type = Auto); + Name(const TQString &rurl, const Type type = Auto); Name(const char *rurl, const Type type = Auto); /**Sets the relative name.*/ - void setRURL(const QString &rurl, const Type type); + void setRURL(const TQString &rurl, const Type type); /**Gets the relative name in form dir/dir/ -> directory or dir/dir/file -> file.*/ - QString rurl() const; + TQString rurl() const; /**Adds addendum to the directory path. This honors file names so if RName represents /dir1/dir2/fname.ext addPath(dir3) will change RName to /dir1/dir2/dir3/fname.ext*/ - void addPath(const QString &addendum); + void addPath(const TQString &addendum); /**Removes "//" from the name.*/ void cleanRURL(); - /**Returns the extension of a file or QString::null for directories. + /**Returns the extension of a file or TQString::null for directories. If complete is true then returns extensions like "tar.gz". Else returns "gz".*/ - QString extension(bool complete = true) const; - /**Returns the name of the file without the path or QString::null + TQString extension(bool complete = true) const; + /**Returns the name of the file without the path or TQString::null for directories.*/ - QString fileName() const; - /**Returns the name of the directory or QString::null if there are no dirs in path.*/ - QString directory() const; + TQString fileName() const; + /**Returns the name of the directory or TQString::null if there are no dirs in path.*/ + TQString directory() const; /**Returns true if the type of RName is file.*/ bool isFile() const; @@ -66,12 +66,12 @@ public: /**Creates and returns relative name between base and url. Base and url should be absolute. Base is considered to be a directory.*/ - static Name relativeName(const QString &base, const QString &url); + static Name relativeName(const TQString &base, const TQString &url); /**Cleans rurl by removing extra slashes.*/ - static QString cleanName(const QString &rurl); + static TQString cleanName(const TQString &rurl); /**Corrects rurl according to the given type and returns corrected url. Also cleans url (see @ref cleanRURL).*/ - static QString correctName(const QString &rurl, const Type type = Auto); + static TQString correctName(const TQString &rurl, const Type type = Auto); bool operator == (const Name &rname); bool operator != (const Name &rname); @@ -83,7 +83,7 @@ protected: void correct(); private: - QString m_rurl; + TQString m_rurl; Type m_type; }; @@ -97,17 +97,17 @@ public: URL(KURL base, KURL url, Type type = Auto); /**Creates RURL object with given base and relative or full url (according to the isUrlRelative value).*/ - URL(KURL base, QString url, bool isUrlRelative, Type type = Auto); + URL(KURL base, TQString url, bool isUrlRelative, Type type = Auto); /**Sets a new base for a RURL.*/ void setBase(const KURL &base); /**Sets a new base for a RURL. Base is is considered to be a directory and converted to KURL using KURL::setPath().*/ - void setBase(const QString &base); + void setBase(const TQString &base); /**Returns RURL base.*/ KURL base() const; /**Returns a path of a base KURL (using KURL::path()). Trailing slash is guaranteed.*/ - QString basePath() const; + TQString basePath() const; /**Returns a complete url to the RURL location. This is basically base + rurl. This also resolves ".." components in path. @@ -120,13 +120,13 @@ public: This method only returns a path part of the KURL (using KURL::path()). Trailing slash is guaranteed for directories and no trailing slash - for files. This also resolves ".." components in path.*/ - QString urlPath() const; + TQString urlPath() const; /**Returns a directory of a complete url to the location. The url is constructed as base + rurl. Returns the same as urlPath() for directories. This method uses KURL::directory to determine the directory. Trailing slash is guaranteed. This also resolves ".." components in path.*/ - QString urlDirectory() const; + TQString urlDirectory() const; /**Returns a new URL that is relative to given base. Relative part is taken from current URL object.*/ @@ -136,7 +136,7 @@ public: static URL relativeURL(KURL base, KURL url); /**Returns a new relative URL constructed from base and given url. url parameter is either relative or full (depends on isUrlRelative value).*/ - static URL relativeURL(KURL base, QString url, bool isUrlRelative); + static URL relativeURL(KURL base, TQString url, bool isUrlRelative); bool operator == (const URL &url); bool operator != (const URL &url); @@ -150,14 +150,14 @@ class Directory: public URL{ public: /**Works as URL::URL(KURL, KURL), only implies Name::Directory mode.*/ Directory(KURL base, KURL url); - /**Works as URL::URL(KURL, QString, bool), only implies Name::Directory mode.*/ - Directory(KURL base, QString url, bool isRelativeUrl); + /**Works as URL::URL(KURL, TQString, bool), only implies Name::Directory mode.*/ + Directory(KURL base, TQString url, bool isRelativeUrl); - /**Works as URL::setRURL(QString), only implies Name::Directory mode.*/ - void setRURL(QString rurl); + /**Works as URL::setRURL(TQString), only implies Name::Directory mode.*/ + void setRURL(TQString rurl); private: - void setRURL(QString rurl, Type type); + void setRURL(TQString rurl, Type type); }; @@ -167,13 +167,13 @@ public: /**Works as URL::URL(KURL, KURL), only implies Name::File mode.*/ File(KURL base, KURL url); /**Works as URL::URL(KURL, KURL), only implies Name::File mode.*/ - File(KURL base, QString url, bool isRelativeUrl); + File(KURL base, TQString url, bool isRelativeUrl); - /**Works as URL::setRURL(QString), only implies Name::File mode.*/ - void setRURL(QString rurl); + /**Works as URL::setRURL(TQString), only implies Name::File mode.*/ + void setRURL(TQString rurl); private: - void setRURL(QString rurl, Type type); + void setRURL(TQString rurl, Type type); }; diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index 4e246e5b..129cdd66 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -15,35 +15,35 @@ #include "settings.h" -QString Settings::terminalEmulatorName( KConfig & config ) +TQString Settings::terminalEmulatorName( KConfig & config ) { config.setGroup("TerminalEmulator"); bool useKDESetting = config.readBoolEntry( "UseKDESetting", true ); - QString terminal; + TQString terminal; if ( useKDESetting ) { - KConfigGroup confGroup( KGlobal::config(), QString::fromLatin1("General") ); - terminal = confGroup.readEntry("TerminalApplication", QString::fromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole")); } else { - terminal = config.readEntry( "TerminalApplication", QString::fromLatin1("konsole")); + terminal = config.readEntry( "TerminalApplication", TQString::fromLatin1("konsole")); } return terminal; } -QString Settings::profileByAttributes(const QString &language, const QStringList &keywords) +TQString Settings::profileByAttributes(const TQString &language, const TQStringList &keywords) { KConfig config(locate("data", "kdevelop/profiles/projectprofiles")); config.setGroup(language); - QStringList profileKeywords = QStringList::split("/", "Empty"); + TQStringList profileKeywords = TQStringList::split("/", "Empty"); if (config.hasKey("Keywords")) profileKeywords = config.readListEntry("Keywords"); int idx = 0; - for (QStringList::const_iterator it = profileKeywords.constBegin(); + for (TQStringList::const_iterator it = profileKeywords.constBegin(); it != profileKeywords.constEnd(); ++it) { if (keywords.contains(*it)) @@ -53,7 +53,7 @@ QString Settings::profileByAttributes(const QString &language, const QStringList } } - QStringList profiles; + TQStringList profiles; if (config.hasKey("Profiles")) { profiles = config.readListEntry("Profiles"); diff --git a/lib/util/settings.h b/lib/util/settings.h index cd241cad..ad92805d 100644 --- a/lib/util/settings.h +++ b/lib/util/settings.h @@ -18,8 +18,8 @@ class KConfig; class Settings { public: - static QString terminalEmulatorName( KConfig & config ); - static QString profileByAttributes(const QString &language, const QStringList &keywords); + static TQString terminalEmulatorName( KConfig & config ); + static TQString profileByAttributes(const TQString &language, const TQStringList &keywords); }; diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp index fb451769..849cc555 100644 --- a/lib/util/urlutil.cpp +++ b/lib/util/urlutil.cpp @@ -18,10 +18,10 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include -#include -#include +#include +#include #include #include @@ -36,28 +36,28 @@ // Namespace URLUtil /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::filename(const QString & name) { +TQString URLUtil::filename(const TQString & name) { int slashPos = name.findRev("/"); return slashPos<0 ? name : name.mid(slashPos+1); } /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::directory(const QString & name) { +TQString URLUtil::directory(const TQString & name) { int slashPos = name.findRev("/"); - return slashPos<0 ? QString("") : name.left(slashPos); + return slashPos<0 ? TQString("") : name.left(slashPos); } /////////////////////////////////////////////////////////////////////////////// -QString URLUtil::getRelativePath(const QString& basepath, const QString& destpath) +TQString URLUtil::getRelativePath(const TQString& basepath, const TQString& destpath) { - QString relpath = "."; - if (!QFile::exists(basepath) || - !QFile::exists(destpath)) + TQString relpath = "."; + if (!TQFile::exists(basepath) || + !TQFile::exists(destpath)) return ""; - QStringList basedirs = QStringList::split(QString( QChar( QDir::separator() ) ),basepath); - QStringList destdirs = QStringList::split(QString( QChar( QDir::separator() ) ),destpath); + TQStringList basedirs = TQStringList::split(TQString( TQChar( TQDir::separator() ) ),basepath); + TQStringList destdirs = TQStringList::split(TQString( TQChar( TQDir::separator() ) ),destpath); int maxCompare=0; if (basedirs.count()>=destdirs.count()) @@ -72,23 +72,23 @@ QString URLUtil::getRelativePath(const QString& basepath, const QString& destpat lastCommonDir=i; } for (uint i=0;i= dir.count() ? currDir = "" : currDir = dir[i]; @@ -282,9 +282,9 @@ QString URLUtil::relativePathToFile( const QString & dirUrl, const QString & fil /////////////////////////////////////////////////////////////////////////////// //TODO: remove for KDE4 -QString URLUtil::canonicalPath( const QString & path ) +TQString URLUtil::canonicalPath( const TQString & path ) { - QDir dir(path); + TQDir dir(path); return dir.canonicalPath(); } @@ -292,7 +292,7 @@ QString URLUtil::canonicalPath( const QString & path ) //written by "Dawit A." //borrowed from his patch to KShell -QString URLUtil::envExpand ( const QString& str ) +TQString URLUtil::envExpand ( const TQString& str ) { uint len = str.length(); @@ -303,11 +303,11 @@ QString URLUtil::envExpand ( const QString& str ) if (pos < 0) pos = len; - char* ret = getenv( QConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); + char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); if (ret) { - QString expandedStr ( QFile::decodeName( ret ) ); + TQString expandedStr ( TQFile::decodeName( ret ) ); if (pos < (int)len) expandedStr += str.mid(pos); return expandedStr; diff --git a/lib/util/urlutil.h b/lib/util/urlutil.h index 65e96a56..e8c84607 100644 --- a/lib/util/urlutil.h +++ b/lib/util/urlutil.h @@ -21,8 +21,8 @@ #ifndef _URLUTIL_H_ #define _URLUTIL_H_ -#include -#include +#include +#include #include /** @@ -43,12 +43,12 @@ namespace URLUtil * @return The filename part of a pathname (i.e. everything past the last slash). * @param pathName The absolute path to a file. */ - QString filename(const QString & pathName); + TQString filename(const TQString & pathName); /** * @return The directory part of a path (i.e. everything up to but not including the last slash) * @param pathName The absolute path to a directory. */ - QString directory(const QString & pathName); + TQString directory(const TQString & pathName); /** * @return The relative path between a parent and child URL, or blank if the specified * child is not a child of parent. @@ -59,7 +59,7 @@ namespace URLUtil * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - QString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX); /** * @return The relative path between a parent and child URL, or blank if the specified * child is not a child of parent. @@ -70,13 +70,13 @@ namespace URLUtil * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - QString relativePath(const QString & parent, const QString & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX); /** * @return The relative path between a base path and destination path or. * @param base The base Path. * @param dest The destination path. */ - QString getRelativePath( const QString& base, const QString& dest ); + TQString getRelativePath( const TQString& base, const TQString& dest ); /** * @param dirUrl An URL of a directory. * @param fileUrl An URL of a file. @@ -86,13 +86,13 @@ namespace URLUtil * fileUrl: /home/test/lib/mylib.cpp * returns: ../lib/mylib.cpp */ - QString relativePathToFile( const QString & dirUrl, const QString & fileUrl ); + TQString relativePathToFile( const TQString & dirUrl, const TQString & fileUrl ); /** *@param path A path (absolute or relative). *@param slashSuffix if true then "/" is appended to a path. *@returns The path 'up one level' - the opposite of what filename returns. */ - QString upDir(const QString & path, bool slashSuffix = false); + TQString upDir(const TQString & path, bool slashSuffix = false); /** * 'Merges' URLs - changes a URL that starts with dest to start with source instead.\n * 

    Example:
@@ -110,7 +110,7 @@ namespace URLUtil
    * @return The file extension for a filename or path.
    * @param path Absolute or relative path.
    */
-  QString getExtension(const QString & path);
+  TQString getExtension(const TQString & path);
 
   /**
   * Given a base directory url in @p baseDirUrl and the url referring to the
@@ -120,8 +120,8 @@ namespace URLUtil
   * KURL baseUrl, dirUrl;
   * baseUrl.setPath( "/home/mario/src/kdevelop/" );
   * dirUrl.setPath( "/home/mario/src/kdevelop/parts/cvs/" );
-  * QString relPathName = extractDirPathRelative( baseUrl, url ); // == "parts/cvs/"
-  * QString absPathName = extractDirPathAbsolute( url ); // == "/home/mario/src/kdevelop/parts/cvs/"
+  * TQString relPathName = extractDirPathRelative( baseUrl, url ); // == "parts/cvs/"
+  * TQString absPathName = extractDirPathAbsolute( url ); // == "/home/mario/src/kdevelop/parts/cvs/"
   * @endcode
   * Note that if you pass a file name in @p url (instead of a directory) or the 
   * @p baseUrl is not contained in @p url then the function will return "" (void string).
@@ -130,25 +130,25 @@ namespace URLUtil
   * @param url Base directory URL.
   * @return The relative path between @p url and @p baseDirUrl.
   */
-  QString extractPathNameRelative(const KURL &baseDirUrl, const KURL &url );
-  /**Same as above. @p basePath is QString.*/
-  QString extractPathNameRelative(const QString &basePath, const KURL &url );
+  TQString extractPathNameRelative(const KURL &baseDirUrl, const KURL &url );
+  /**Same as above. @p basePath is TQString.*/
+  TQString extractPathNameRelative(const TQString &basePath, const KURL &url );
   /**Same as above. Both @p basePath and @p absFilePath are QStrings.*/
-  QString extractPathNameRelative(const QString &basePath, const QString &absFilePath );
+  TQString extractPathNameRelative(const TQString &basePath, const TQString &absFilePath );
 
   /**
   * @param url The url to extract the absolute path from.
   * @return The absolute path name referred in @p url.
   * Look at @ref extractPathNameRelative documentation for an example.
   */
-  QString extractPathNameAbsolute( const KURL &url );
+  TQString extractPathNameAbsolute( const KURL &url );
 
   /**
   * @param baseDir Base directory for relative URLs.
   * @param urls The list of urls to extract the relative paths from.
-  * @return A QStringList of relative (to @p baseDir) paths from a list of KURLs in @p urls.
+  * @return A TQStringList of relative (to @p baseDir) paths from a list of KURLs in @p urls.
   */
-  QStringList toRelativePaths( const QString &baseDir, const KURL::List &urls);
+  TQStringList toRelativePaths( const TQString &baseDir, const KURL::List &urls);
 
   /**
   * @param url The absolute URL.
@@ -159,7 +159,7 @@ namespace URLUtil
   * @param absFilePath The absolute path.
   * @return true if @p url is a directory, false otherwise.
   */
-  bool isDirectory( const QString &absFilePath );
+  bool isDirectory( const TQString &absFilePath );
 
   /**
   * Dumps the list of KURL @p urls on standard output, eventually printing @p aMessage if it
@@ -167,14 +167,14 @@ namespace URLUtil
   * @param urls URLs to dump.
   * @param aMessage Message to be written onto a stdout.
   */
-  void dump( const KURL::List &urls, const QString &aMessage = QString::null );
+  void dump( const KURL::List &urls, const TQString &aMessage = TQString::null );
 
   /**
-   * Same as QDir::canonicalPath in later versions of Qt. Earlier versions of Qt
+   * Same as TQDir::canonicalPath in later versions of Qt. Earlier versions of Qt
    * had this broken, so it's reproduced here.
-   * Deprecated, use QDir::canonicalPath instead.    
+   * Deprecated, use TQDir::canonicalPath instead.    
    */
-  QString canonicalPath( const QString & path );
+  TQString canonicalPath( const TQString & path );
 
     /**
      * Performs environment variable expansion on @p variable.
@@ -183,7 +183,7 @@ namespace URLUtil
      * @return The expanded environment variable value. if the variable
      *         cannot be expanded, @p variable itself is returned.
      */
-    QString envExpand ( const QString &variable );
+    TQString envExpand ( const TQString &variable );
 
 }
 
diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp
index a327ac04..6e60f1a4 100644
--- a/lib/widgets/fancylistviewitem.cpp
+++ b/lib/widgets/fancylistviewitem.cpp
@@ -17,15 +17,15 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
 #include "fancylistviewitem.h"
 
 
-void FancyListViewItem::init(const QString& label1, const QString& /*label2*/) {
+void FancyListViewItem::init(const TQString& label1, const TQString& /*label2*/) {
     if( !label1.isEmpty() ) {
         setText(0, label1);
     }
@@ -41,7 +41,7 @@ void FancyListViewItem::setItem(int column, TextPaintItem item) {
 }
 
 
-void FancyListViewItem::setText ( int column, const QString & text ) {
+void FancyListViewItem::setText ( int column, const TQString & text ) {
     if( column >= int(m_items.size()) ) {
         m_items.append( TextPaintItem(text) );
     }else{
@@ -50,60 +50,60 @@ void FancyListViewItem::setText ( int column, const QString & text ) {
 }
 
 
-QString FancyListViewItem::text(int column) const {
+TQString FancyListViewItem::text(int column) const {
     if( m_items.isEmpty() ) return "";
-    return (QString)m_items[column];
+    return (TQString)m_items[column];
 }
 
 
-QColor FancyListViewItem::backgroundColor(int col) {
+TQColor FancyListViewItem::backgroundColor(int col) {
 
     return KListViewItem::backgroundColor(col);
 }
 
 
-///this is a modified version of the original QListViewItem::paintCell from the qt source
+///this is a modified version of the original TQListViewItem::paintCell from the qt source
 ///multiline is not supported!
 
-void FancyListViewItem::paintCell( QPainter *painter, const QColorGroup &cg,
+void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg,
                                                 int column, int width, int align)
 {
     if(column < 0 || column >= int(m_items.size()) || m_items[column].items().isEmpty()) {
-        QListViewItem::paintCell(painter, cg, column, width, align);
+        TQListViewItem::paintCell(painter, cg, column, width, align);
         return;
     }
     
     painter->save();
-    QColorGroup grp(cg);
+    TQColorGroup grp(cg);
     
     int styleNum = m_items[column].items()[0].style;
     TextPaintStyleStore::Item& style = m_styles.getStyle( styleNum );
     ///currently only the first background-color is used
     if( style.bgValid() ) {
-        grp.setColor( QColorGroup::Base, style.background );
+        grp.setColor( TQColorGroup::Base, style.background );
     }else{
         if(backgroundColor(column).isValid())
-            grp.setColor( QColorGroup::Base, backgroundColor(column) ); ///use the nice kde background-color
+            grp.setColor( TQColorGroup::Base, backgroundColor(column) ); ///use the nice kde background-color
     }
 
-    QListView *lv = listView();
+    TQListView *lv = listView();
     if ( !lv )
         return;
-    QPainter* p = painter;
-    QFontMetrics fm( p->fontMetrics() );
+    TQPainter* p = painter;
+    TQFontMetrics fm( p->fontMetrics() );
 
-    QString t = text( column );
+    TQString t = text( column );
 
     int marg = lv->itemMargin();
     int r = marg;
-    const QPixmap * icon = pixmap( column );
+    const TQPixmap * icon = pixmap( column );
 
     const BackgroundMode bgmode = lv->viewport()->backgroundMode();
-    const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode( bgmode );
+    const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
     p->fillRect( 0, 0, width, height(), grp.brush( crole ) );
     
     if ( isSelected() && (column == 0 || lv->allColumnsShowFocus()) ) {
-        p->fillRect( r - marg, 0, width - r + marg, height(), cg.brush( QColorGroup::Highlight ) );
+        p->fillRect( r - marg, 0, width - r + marg, height(), cg.brush( TQColorGroup::Highlight ) );
          
         if ( isEnabled() || !lv ) 
             p->setPen( cg.highlightedText() );
@@ -164,9 +164,9 @@ void FancyListViewItem::paintCell( QPainter *painter, const QColorGroup &cg,
 }
 
 
-int FancyListViewItem::textWidth(const QFont& font, const QString& text) 
+int FancyListViewItem::textWidth(const TQFont& font, const TQString& text) 
 {
-    QFontMetrics fm( font );
+    TQFontMetrics fm( font );
     if ( multiLinesEnabled() )
         return fm.size( AlignVCenter, text ).width();
     else
@@ -175,7 +175,7 @@ int FancyListViewItem::textWidth(const QFont& font, const QString& text)
 }
 
 
-int FancyListViewItem::width(const QFontMetrics &fm, const QListView *lv, int column)
+int FancyListViewItem::width(const TQFontMetrics &fm, const TQListView *lv, int column)
 {
     int width = 0;
     if (column >= 0 && column < (int)m_items.size() && !multiLinesEnabled()) {
@@ -189,14 +189,14 @@ int FancyListViewItem::width(const QFontMetrics &fm, const QListView *lv, int co
         }
         width += lv->itemMargin() * 2;// - lv->d->minLeftBearing - lv->d->minRightBearing;
         
-        const QPixmap * pm = pixmap( column );
+        const TQPixmap * pm = pixmap( column );
         if ( pm )
             width += pm->width() + lv->itemMargin();
         
-        width =  QMAX( width, QApplication::globalStrut().width() );
+        width =  QMAX( width, TQApplication::globalStrut().width() );
     }
     else
-        width = QListViewItem::width(fm, lv, column);
+        width = TQListViewItem::width(fm, lv, column);
     return width;
 }
 
diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h
index 55ac11e4..ab8b3310 100644
--- a/lib/widgets/fancylistviewitem.h
+++ b/lib/widgets/fancylistviewitem.h
@@ -20,21 +20,21 @@
 #ifndef FANCYLISTVIEWITEM
 #define FANCYLISTVIEWITEM
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 class TextPaintStyleStore {
     public:
         class Item {
             public:
-            QFont font;
-            QColor color;
-            QColor background;
+            TQFont font;
+            TQColor color;
+            TQColor background;
             
-            Item(const QFont& f = QFont(), const QColor& c = QColor(), const QColor b = QColor() ) : font(f), color(c), background(b) {
+            Item(const TQFont& f = TQFont(), const TQColor& c = TQColor(), const TQColor b = TQColor() ) : font(f), color(c), background(b) {
             }
             
             bool bgValid() {
@@ -46,9 +46,9 @@ class TextPaintStyleStore {
             }
         };
         
-        typedef QMap Store ;
+        typedef TQMap Store ;
     
-        TextPaintStyleStore( QFont defaultFont=QFont() ) {
+        TextPaintStyleStore( TQFont defaultFont=TQFont() ) {
             m_styles.insert( 0, Item( defaultFont ) );
         }
         
@@ -62,7 +62,7 @@ class TextPaintStyleStore {
             m_styles[num] = style;
         }
         
-        void addStyle( int num, const QFont& font ) {
+        void addStyle( int num, const TQFont& font ) {
             m_styles[num] = Item( font );
         }
         
@@ -78,24 +78,24 @@ class TextPaintStyleStore {
 class TextPaintItem {
     public:
         struct Item {
-            QString text;
+            TQString text;
             int style;
             
-            Item( const QString& t = "", int st = 0 ) : text(t), style(st) {
+            Item( const TQString& t = "", int st = 0 ) : text(t), style(st) {
             }
             
         };
-        typedef QValueList Chain;
+        typedef TQValueList Chain;
         
         Chain& items() {
             return m_chain;
         }
         
-        TextPaintItem(const QString& text="") {
+        TextPaintItem(const TQString& text="") {
             addItem( text );
         }
         
-        Item& addItem(const QString& item, int style = 0) {
+        Item& addItem(const TQString& item, int style = 0) {
             m_chain.append( Item(item, style) );
             return m_chain.back();
         }
@@ -104,8 +104,8 @@ class TextPaintItem {
             m_chain.clear();
         }
         
-        operator QString () const {
-            QString ret;
+        operator TQString () const {
+            TQString ret;
             Chain::const_iterator it = m_chain.begin();
             while(it != m_chain.end()) {
                 ret += (*it).text;
@@ -124,18 +124,18 @@ class TextPaintItem {
 class FancyListViewItem : public KListViewItem
 {
     public:
-        FancyListViewItem(TextPaintStyleStore& styles, QListView *parent, const QString &label1, const QString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) {
+        FancyListViewItem(TextPaintStyleStore& styles, TQListView *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) {
             init(label1, label2);
         }
         
-        FancyListViewItem(TextPaintStyleStore& styles, QListViewItem *parent, const QString &label1, const QString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) {
+        FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) {
             init(label1, label2);
         }
         
-        virtual void paintCell(QPainter *painter, const QColorGroup &cg, int column, int width, int align);
-        virtual int width(const QFontMetrics &fm, const QListView *lv, int column);
-        virtual void setText ( int column, const QString & text );
-        virtual QString text(int column) const;
+        virtual void paintCell(TQPainter *painter, const TQColorGroup &cg, int column, int width, int align);
+        virtual int width(const TQFontMetrics &fm, const TQListView *lv, int column);
+        virtual void setText ( int column, const TQString & text );
+        virtual TQString text(int column) const;
         
         inline void clear() {
             m_items.clear();
@@ -151,10 +151,10 @@ class FancyListViewItem : public KListViewItem
         
         void setItem(int column, TextPaintItem item);
     private:
-        virtual QColor backgroundColor(int col);
-        void init(const QString& label1, const QString& label2);
-        int textWidth(const QFont& font, const QString& text);
-        QValueVector m_items;
+        virtual TQColor backgroundColor(int col);
+        void init(const TQString& label1, const TQString& label2);
+        int textWidth(const TQFont& font, const TQString& text);
+        TQValueVector m_items;
     protected:
         TextPaintStyleStore& m_styles;
 };
diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp
index 92303b3f..e109a36d 100644
--- a/lib/widgets/flagboxes.cpp
+++ b/lib/widgets/flagboxes.cpp
@@ -24,22 +24,22 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "flagboxes.h"
 
 // partial copy of Qt-3.1 for back-compatibility to KDE-3.0
-QString QRegExp_escape( const QString& str )
+TQString QRegExp_escape( const TQString& str )
 {
     static const char meta[] = "$()*+.?[\\]^{|}";
-    QString quoted = str;
+    TQString quoted = str;
     int i = 0;
 
     while ( i < (int) quoted.length() ) {
@@ -54,21 +54,21 @@ QString QRegExp_escape( const QString& str )
 class FlagListToolTip : public QToolTip
 {
 public:
-    FlagListToolTip(QWidget *parent);
+    FlagListToolTip(TQWidget *parent);
 protected:
-    void maybeTip(const QPoint &p);
+    void maybeTip(const TQPoint &p);
 };
 
 
-FlagListToolTip::FlagListToolTip(QWidget *parent)
-    : QToolTip(parent)
+FlagListToolTip::FlagListToolTip(TQWidget *parent)
+    : TQToolTip(parent)
 {}
 
 
-void FlagListToolTip::maybeTip(const QPoint &pos)
+void FlagListToolTip::maybeTip(const TQPoint &pos)
 {
     FlagListBox *listbox = static_cast(parentWidget());
-    QListViewItem *item = listbox->itemAt(pos);
+    TQListViewItem *item = listbox->itemAt(pos);
     FlagListItem *flitem = static_cast(item);
 
     if (item)
@@ -76,22 +76,22 @@ void FlagListToolTip::maybeTip(const QPoint &pos)
 }
 
 
-FlagListItem::FlagListItem(FlagListBox *parent, const QString &flagstr,
-                           const QString &description)
-    : QCheckListItem(parent, flagstr, QCheckListItem::CheckBox),
+FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr,
+                           const TQString &description)
+    : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox),
       flag(flagstr), desc(description)
 {}
 
 
-FlagListItem::FlagListItem(FlagListBox *parent, const QString &flagstr,
-                           const QString &description, const QString &offstr)
-    : QCheckListItem(parent, flagstr, QCheckListItem::CheckBox),
+FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr,
+                           const TQString &description, const TQString &offstr)
+    : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox),
       flag(flagstr), off(offstr), desc(description)
 {}
 
 
-FlagListBox::FlagListBox(QWidget *parent, const char *name)
-    : QListView(parent, name)
+FlagListBox::FlagListBox(TQWidget *parent, const char *name)
+    : TQListView(parent, name)
 {
     setResizeMode(LastColumn);
     header()->hide();
@@ -100,12 +100,12 @@ FlagListBox::FlagListBox(QWidget *parent, const char *name)
 }
 
 
-void FlagListBox::readFlags(QStringList *list)
+void FlagListBox::readFlags(TQStringList *list)
 {
-    QListViewItem *item = firstChild();
+    TQListViewItem *item = firstChild();
     for (; item; item = item->nextSibling()) {
         FlagListItem *flitem = static_cast(item);
-        QStringList::Iterator sli = list->find(flitem->flag);
+        TQStringList::Iterator sli = list->find(flitem->flag);
         if (sli != list->end()) {
             flitem->setOn(true);
             list->remove(sli);
@@ -119,9 +119,9 @@ void FlagListBox::readFlags(QStringList *list)
 }
 
 
-void FlagListBox::writeFlags(QStringList *list)
+void FlagListBox::writeFlags(TQStringList *list)
 {
-    QListViewItem *item = firstChild();
+    TQListViewItem *item = firstChild();
     for (; item; item = item->nextSibling()) {
         FlagListItem *flitem = static_cast(item);
         if (flitem->isOn())
@@ -130,34 +130,34 @@ void FlagListBox::writeFlags(QStringList *list)
 }
 
 
-FlagCheckBox::FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller,
-                           const QString &flagstr, const QString &description)
-    : QCheckBox(description, parent), flag(flagstr), includeOff(false), useDef(false), defSet(false)
+FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+                           const TQString &flagstr, const TQString &description)
+    : TQCheckBox(description, parent), flag(flagstr), includeOff(false), useDef(false), defSet(false)
 {
-    QToolTip::add(this, flagstr);
+    TQToolTip::add(this, flagstr);
     controller->addCheckBox(this);
 }
 
 
-FlagCheckBox::FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller,
-                           const QString &flagstr, const QString &description,
-                           const QString &offstr)
-    : QCheckBox(description, parent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false)
+FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+                           const TQString &flagstr, const TQString &description,
+                           const TQString &offstr)
+    : TQCheckBox(description, parent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false)
 {
-    QToolTip::add(this, flagstr);
+    TQToolTip::add(this, flagstr);
     controller->addCheckBox(this);
 }
 
-FlagCheckBox::FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller,
-                           const QString &flagstr, const QString &description,
-                           const QString &offstr, const QString &defstr)
-    : QCheckBox(description, parent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false)
+FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+                           const TQString &flagstr, const TQString &description,
+                           const TQString &offstr, const TQString &defstr)
+    : TQCheckBox(description, parent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false)
 {
-    QToolTip::add(this, flagstr);
+    TQToolTip::add(this, flagstr);
     controller->addCheckBox(this);
 }
 
-FlagCheckBoxController::FlagCheckBoxController(QStringList multiKeys)
+FlagCheckBoxController::FlagCheckBoxController(TQStringList multiKeys)
     :m_multiKeys(multiKeys)
 {
 }
@@ -169,17 +169,17 @@ void FlagCheckBoxController::addCheckBox(FlagCheckBox *item)
 }
 
 
-void FlagCheckBoxController::readFlags(QStringList *list)
+void FlagCheckBoxController::readFlags(TQStringList *list)
 {
     //handle keys like -vxyz -> transform they into -vx -vy -vz
     //very "effective" algo :(
-/*    QStringList addons;
-    for (QStringList::Iterator mk = m_multiKeys.begin(); mk != m_multiKeys.end(); ++ mk)
+/*    TQStringList addons;
+    for (TQStringList::Iterator mk = m_multiKeys.begin(); mk != m_multiKeys.end(); ++ mk)
     {
         kdDebug() << "multikey " << *mk << endl;
-        for (QStringList::Iterator sli = list->begin(); sli != list->end(); ++sli)
+        for (TQStringList::Iterator sli = list->begin(); sli != list->end(); ++sli)
         {
-            QString key = *sli;
+            TQString key = *sli;
             kdDebug() << "current key: " << key << endl;
             if ( (key.length() > 3) && (key.startsWith(*mk)) )
             {
@@ -197,15 +197,15 @@ void FlagCheckBoxController::readFlags(QStringList *list)
     kdDebug() << "good" << endl;
     *list += addons;
 
-    for (QStringList::Iterator sli = list->begin(); sli != list->end(); ++sli)
+    for (TQStringList::Iterator sli = list->begin(); sli != list->end(); ++sli)
     {
         kdDebug() << "KEYS: " << *sli << endl;
     }
 */
-    QPtrListIterator it(cblist);
+    TQPtrListIterator it(cblist);
     for (; it.current(); ++it) {
         FlagCheckBox *fitem = it.current();
-        QStringList::Iterator sli = list->find(fitem->flag);
+        TQStringList::Iterator sli = list->find(fitem->flag);
         if (sli != list->end()) {
             fitem->setChecked(true);
             fitem->useDef = false;
@@ -230,9 +230,9 @@ void FlagCheckBoxController::readFlags(QStringList *list)
 }
 
 
-void FlagCheckBoxController::writeFlags(QStringList *list)
+void FlagCheckBoxController::writeFlags(TQStringList *list)
 {
-    QPtrListIterator it(cblist);
+    TQPtrListIterator it(cblist);
     for (; it.current(); ++it) {
         FlagCheckBox *fitem = it.current();
         if (fitem->isChecked() && (!fitem->useDef))
@@ -256,27 +256,27 @@ void FlagCheckBoxController::writeFlags(QStringList *list)
 {
 }
 
-void FlagPathEditController::readFlags( QStringList * list )
+void FlagPathEditController::readFlags( TQStringList * list )
 {
 //    kdDebug() << "read path flags" << endl;
-    QPtrListIterator it(plist);
+    TQPtrListIterator it(plist);
     for (; it.current(); ++it) {
         FlagPathEdit *peitem = it.current();
 
-        QStringList::Iterator sli = list->begin();
+        TQStringList::Iterator sli = list->begin();
         while ( sli != list->end() )
         {
   //          kdDebug() << "option: " << (*sli) << " flag is: " << peitem->flag << endl;
             if ((*sli).startsWith(peitem->flag))
             {
 //                kdDebug() << "Processing.." << endl;
-                peitem->setText((*sli).replace(QRegExp(QRegExp_escape(peitem->flag)),""));
+                peitem->setText((*sli).replace(TQRegExp(QRegExp_escape(peitem->flag)),""));
                 sli = list->remove(sli);
                 continue;
             }
              ++sli;
         }
-/*        QStringList::Iterator sli = list->find(peitem->flag);
+/*        TQStringList::Iterator sli = list->find(peitem->flag);
         if (sli != list->end()) {
             peitem->setText((*sli).remove(peitem->flag));
             list->remove(sli);
@@ -284,9 +284,9 @@ void FlagPathEditController::readFlags( QStringList * list )
     }
 }
 
-void FlagPathEditController::writeFlags( QStringList * list )
+void FlagPathEditController::writeFlags( TQStringList * list )
 {
-    QPtrListIterator it(plist);
+    TQPtrListIterator it(plist);
     for (; it.current(); ++it) {
         FlagPathEdit *pitem = it.current();
         if (!pitem->isEmpty())
@@ -299,14 +299,14 @@ void FlagPathEditController::addPathEdit( FlagPathEdit * item )
     plist.append(item);
 }
 
-FlagPathEdit::FlagPathEdit( QWidget * parent, QString pathDelimiter,
-    FlagPathEditController * controller, const QString & flagstr, const QString & description,
+FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter,
+    FlagPathEditController * controller, const TQString & flagstr, const TQString & description,
     KFile::Mode mode )
-    : QWidget(parent), delimiter(pathDelimiter), flag(flagstr), m_description(description)
+    : TQWidget(parent), delimiter(pathDelimiter), flag(flagstr), m_description(description)
 {
-    QBoxLayout *topLayout = new QVBoxLayout(this, 0, 1);
-    topLayout->addWidget(new QLabel(description, this));
-    QBoxLayout *layout = new QHBoxLayout(topLayout, KDialog::spacingHint());
+    TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1);
+    topLayout->addWidget(new TQLabel(description, this));
+    TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
 
     if (delimiter.isEmpty())
     {
@@ -318,15 +318,15 @@ FlagPathEdit::FlagPathEdit( QWidget * parent, QString pathDelimiter,
     {
         edit = new KLineEdit(this);
         layout->addWidget(edit);
-        details = new QPushButton("...", this);
+        details = new TQPushButton("...", this);
         details->setMaximumWidth(30);
-        connect(details, SIGNAL(clicked()), this, SLOT(showPathDetails()));
+        connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails()));
         layout->addWidget(details);
     }
 
-    QApplication::sendPostedEvents(this, QEvent::ChildInserted);
+    TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    QToolTip::add(this, flagstr);
+    TQToolTip::add(this, flagstr);
     controller->addPathEdit(this);
 }
 
@@ -335,7 +335,7 @@ void FlagPathEdit::showPathDetails( )
     KDialogBase *dia = new KDialogBase(0, "flag_path_edit_dia", true, m_description,
         KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true);
 
-    QBoxLayout *diaLayout = new QVBoxLayout(dia, KDialog::marginHint(), KDialog::spacingHint());
+    TQBoxLayout *diaLayout = new TQVBoxLayout(dia, KDialog::marginHint(), KDialog::spacingHint());
     diaLayout->setAutoAdd(true);
 
     KURLRequester *req = new KURLRequester( dia );
@@ -345,9 +345,9 @@ void FlagPathEdit::showPathDetails( )
     KEditListBox *elb = new KEditListBox( "", pCustomEditor, dia );
     dia->setMainWidget(elb);
 
-    elb->insertStringList(QStringList::split(delimiter, text()));
+    elb->insertStringList(TQStringList::split(delimiter, text()));
 
-    if (dia->exec() == QDialog::Accepted)
+    if (dia->exec() == TQDialog::Accepted)
     {
         setText(elb->items().join(delimiter));
     }
@@ -355,7 +355,7 @@ void FlagPathEdit::showPathDetails( )
     delete dia;
 }
 
-void FlagPathEdit::setText( const QString text )
+void FlagPathEdit::setText( const TQString text )
 {
     if (delimiter.isEmpty())
         url->setURL(text);
@@ -363,7 +363,7 @@ void FlagPathEdit::setText( const QString text )
         edit->setText(text);
 }
 
-QString FlagPathEdit::text( )
+TQString FlagPathEdit::text( )
 {
     if (delimiter.isEmpty())
         return url->url();
@@ -379,14 +379,14 @@ bool FlagPathEdit::isEmpty( )
         return edit->text().isEmpty();
 }
 
-FlagRadioButton::FlagRadioButton( QWidget * parent, FlagRadioButtonController * controller, const QString & flagstr, const QString & description )
-    : QRadioButton(description, parent), flag(flagstr)
+FlagRadioButton::FlagRadioButton( TQWidget * parent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description )
+    : TQRadioButton(description, parent), flag(flagstr)
 {
-    QToolTip::add(this, flagstr);
+    TQToolTip::add(this, flagstr);
     controller->addRadioButton(this);
 }
 
-FlagRadioButtonController::FlagRadioButtonController(QStringList multiKeys)
+FlagRadioButtonController::FlagRadioButtonController(TQStringList multiKeys)
     :m_multiKeys(multiKeys)
 {
 }
@@ -397,17 +397,17 @@ void FlagRadioButtonController::addRadioButton(FlagRadioButton *item)
 }
 
 
-void FlagRadioButtonController::readFlags(QStringList *list)
+void FlagRadioButtonController::readFlags(TQStringList *list)
 {
     //handle keys like -vxyz -> transform they into -vx -vy -vz
     //very "effective" algo :(
-/*    QStringList addons;
-    for (QStringList::Iterator mk = m_multiKeys.begin(); mk != m_multiKeys.end(); ++ mk)
+/*    TQStringList addons;
+    for (TQStringList::Iterator mk = m_multiKeys.begin(); mk != m_multiKeys.end(); ++ mk)
     {
         kdDebug() << "multikey " << *mk << endl;
-        for (QStringList::Iterator sli = list->begin(); sli != list->end(); ++sli)
+        for (TQStringList::Iterator sli = list->begin(); sli != list->end(); ++sli)
         {
-            QString key = *sli;
+            TQString key = *sli;
             kdDebug() << "current key: " << key << endl;
             if ( (key.length() > 3) && (key.startsWith(*mk)) )
             {
@@ -425,15 +425,15 @@ void FlagRadioButtonController::readFlags(QStringList *list)
     kdDebug() << "good" << endl;
     *list += addons;
 
-    for (QStringList::Iterator sli = list->begin(); sli != list->end(); ++sli)
+    for (TQStringList::Iterator sli = list->begin(); sli != list->end(); ++sli)
     {
         kdDebug() << "KEYS: " << *sli << endl;
     }
 */
-    QPtrListIterator it(cblist);
+    TQPtrListIterator it(cblist);
     for (; it.current(); ++it) {
         FlagRadioButton *fitem = it.current();
-        QStringList::Iterator sli = list->find(fitem->flag);
+        TQStringList::Iterator sli = list->find(fitem->flag);
         if (sli != list->end()) {
             fitem->setChecked(true);
             list->remove(sli);
@@ -442,9 +442,9 @@ void FlagRadioButtonController::readFlags(QStringList *list)
 }
 
 
-void FlagRadioButtonController::writeFlags(QStringList *list)
+void FlagRadioButtonController::writeFlags(TQStringList *list)
 {
-    QPtrListIterator it(cblist);
+    TQPtrListIterator it(cblist);
     for (; it.current(); ++it) {
         FlagRadioButton *fitem = it.current();
         if (fitem->isChecked())
@@ -460,18 +460,18 @@ void FlagRadioButtonController::writeFlags(QStringList *list)
 {
 }
 
-void FlagEditController::readFlags( QStringList * list )
+void FlagEditController::readFlags( TQStringList * list )
 {
-    QPtrListIterator it(plist);
+    TQPtrListIterator it(plist);
     for (; it.current(); ++it) {
         FlagListEdit *peitem = it.current();
 
-        QStringList::Iterator sli = list->begin();
+        TQStringList::Iterator sli = list->begin();
         while (sli != list->end())
         {
             if ((*sli).startsWith(peitem->flag))
             {
-                peitem->appendText((*sli).replace(QRegExp(QRegExp_escape(peitem->flag)),""));
+                peitem->appendText((*sli).replace(TQRegExp(QRegExp_escape(peitem->flag)),""));
                 sli = list->remove(sli);
                 continue;
             }
@@ -480,16 +480,16 @@ void FlagEditController::readFlags( QStringList * list )
     }
 
 
-    QPtrListIterator it2(slist);
+    TQPtrListIterator it2(slist);
     for (; it2.current(); ++it2) {
         FlagSpinEdit *sitem = it2.current();
 
-        QStringList::Iterator sli = list->begin();
+        TQStringList::Iterator sli = list->begin();
         while ( sli != list->end() )
         {
             if ((*sli).startsWith(sitem->flag))
             {
-                sitem->setText((*sli).replace(QRegExp(QRegExp_escape(sitem->flag)),""));
+                sitem->setText((*sli).replace(TQRegExp(QRegExp_escape(sitem->flag)),""));
                 sli = list->remove(sli);
                 continue;
             }
@@ -498,16 +498,16 @@ void FlagEditController::readFlags( QStringList * list )
     }
 }
 
-void FlagEditController::writeFlags( QStringList * list )
+void FlagEditController::writeFlags( TQStringList * list )
 {
-    QPtrListIterator it(plist);
+    TQPtrListIterator it(plist);
     for (; it.current(); ++it) {
         FlagListEdit *pitem = it.current();
         if (!pitem->isEmpty())
             (*list) += pitem->flags();
     }
 
-    QPtrListIterator it2(slist);
+    TQPtrListIterator it2(slist);
     for (; it2.current(); ++it2) {
         FlagSpinEdit *sitem = it2.current();
         if (!sitem->isDefault())
@@ -526,31 +526,31 @@ void FlagEditController::addSpinBox(FlagSpinEdit *item)
 }
 
 
-FlagListEdit::FlagListEdit( QWidget * parent, QString listDelimiter, FlagEditController * controller,
-    const QString & flagstr, const QString & description)
-    : QWidget(parent), delimiter(listDelimiter), flag(flagstr), m_description(description)
+FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditController * controller,
+    const TQString & flagstr, const TQString & description)
+    : TQWidget(parent), delimiter(listDelimiter), flag(flagstr), m_description(description)
 {
-    QBoxLayout *topLayout = new QVBoxLayout(this, 0, 1);
-    topLayout->addWidget(new QLabel(description, this));
-    QBoxLayout *layout = new QHBoxLayout(topLayout, KDialog::spacingHint());
+    TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1);
+    topLayout->addWidget(new TQLabel(description, this));
+    TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
 
     edit = new KLineEdit(this);
     layout->addWidget(edit);
     if (! listDelimiter.isEmpty())
     {
-        details = new QPushButton("...", this);
+        details = new TQPushButton("...", this);
         details->setMaximumWidth(30);
-        connect(details, SIGNAL(clicked()), this, SLOT(showListDetails()));
+        connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails()));
         layout->addWidget(details);
     }
 
-    QApplication::sendPostedEvents(this, QEvent::ChildInserted);
+    TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    QToolTip::add(this, flagstr);
+    TQToolTip::add(this, flagstr);
     controller->addListEdit(this);
 }
 
-void FlagListEdit::setText( const QString text )
+void FlagListEdit::setText( const TQString text )
 {
     edit->setText(text);
 }
@@ -560,7 +560,7 @@ bool FlagListEdit::isEmpty( )
     return edit->text().isEmpty();
 }
 
-QString FlagListEdit::text( )
+TQString FlagListEdit::text( )
 {
     return edit->text();
 }
@@ -570,15 +570,15 @@ void FlagListEdit::showListDetails( )
     KDialogBase *dia = new KDialogBase(0, "flag_list_edit_dia", true, m_description,
         KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true);
 
-    QBoxLayout *diaLayout = new QVBoxLayout(dia, KDialog::marginHint(), KDialog::spacingHint());
+    TQBoxLayout *diaLayout = new TQVBoxLayout(dia, KDialog::marginHint(), KDialog::spacingHint());
     diaLayout->setAutoAdd(true);
 
     KEditListBox *elb = new KEditListBox( "", dia );
     dia->setMainWidget(elb);
 
-    elb->insertStringList(QStringList::split(delimiter, text()));
+    elb->insertStringList(TQStringList::split(delimiter, text()));
 
-    if (dia->exec() == QDialog::Accepted)
+    if (dia->exec() == TQDialog::Accepted)
     {
         setText(elb->items().join(delimiter));
     }
@@ -586,48 +586,48 @@ void FlagListEdit::showListDetails( )
     delete dia;
 }
 
-void FlagListEdit::appendText( const QString text )
+void FlagListEdit::appendText( const TQString text )
 {
-    edit->setText(edit->text() + (edit->text().isEmpty()?QString(""):delimiter) + text);
+    edit->setText(edit->text() + (edit->text().isEmpty()?TQString(""):delimiter) + text);
 }
 
-QStringList FlagListEdit::flags( )
+TQStringList FlagListEdit::flags( )
 {
-    QStringList fl = QStringList::split(delimiter, text());
-    for (QStringList::iterator it = fl.begin(); it != fl.end(); ++it)
+    TQStringList fl = TQStringList::split(delimiter, text());
+    for (TQStringList::iterator it = fl.begin(); it != fl.end(); ++it)
     {
         (*it).prepend(flag);
     }
     return fl;
 }
 
-FlagSpinEdit::FlagSpinEdit( QWidget * parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const QString & flagstr, const QString & description )
-    :QWidget(parent), m_defaultVal(defaultVal), flag(flagstr)
+FlagSpinEdit::FlagSpinEdit( TQWidget * parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const TQString & flagstr, const TQString & description )
+    :TQWidget(parent), m_defaultVal(defaultVal), flag(flagstr)
 {
-    QBoxLayout *topLayout = new QVBoxLayout(this, 0, 1);
-    topLayout->addWidget(new QLabel(description, this));
+    TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1);
+    topLayout->addWidget(new TQLabel(description, this));
 
-    spb = new QSpinBox(minVal, maxVal, incr, this);
+    spb = new TQSpinBox(minVal, maxVal, incr, this);
     spb->setValue(defaultVal);
     topLayout->addWidget(spb);
 
-    QApplication::sendPostedEvents(this, QEvent::ChildInserted);
+    TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    QToolTip::add(this, flagstr);
+    TQToolTip::add(this, flagstr);
     controller->addSpinBox(this);
 }
 
-void FlagSpinEdit::setText( const QString text )
+void FlagSpinEdit::setText( const TQString text )
 {
     spb->setValue(text.toInt());
 }
 
-QString FlagSpinEdit::text( )
+TQString FlagSpinEdit::text( )
 {
-    return QString("%1").arg(spb->value());
+    return TQString("%1").arg(spb->value());
 }
 
-QString FlagSpinEdit::flags( )
+TQString FlagSpinEdit::flags( )
 {
     return flag + text();
 }
diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h
index dc64f296..234cf3a5 100644
--- a/lib/widgets/flagboxes.h
+++ b/lib/widgets/flagboxes.h
@@ -28,11 +28,11 @@
 Support classes for compiler plugins.
 */
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 class QSpinBox;
 class FlagListBox;
@@ -49,16 +49,16 @@ class KURLRequester;
 class FlagListItem : public QCheckListItem
 {
 public:
-    FlagListItem(FlagListBox *parent, const QString &flagstr,
-                 const QString &description);
-    FlagListItem(FlagListBox *parent, const QString &flagstr,
-                 const QString &description, const QString &offstr);
+    FlagListItem(FlagListBox *parent, const TQString &flagstr,
+                 const TQString &description);
+    FlagListItem(FlagListBox *parent, const TQString &flagstr,
+                 const TQString &description, const TQString &offstr);
     ~FlagListItem()
         {}
 private:
-    QString flag;
-    QString off;
-    QString desc;
+    TQString flag;
+    TQString off;
+    TQString desc;
     friend class FlagListToolTip;
     friend class FlagListBox;
 };
@@ -69,12 +69,12 @@ class FlagListBox : public QListView
 {
     Q_OBJECT
 public:
-    FlagListBox( QWidget *parent=0, const char *name=0 );
+    FlagListBox( TQWidget *parent=0, const char *name=0 );
     ~FlagListBox()
         {}
 
-    void readFlags(QStringList *list);
-    void writeFlags(QStringList *list);
+    void readFlags(TQStringList *list);
+    void writeFlags(TQStringList *list);
 };
 
 
@@ -83,21 +83,21 @@ class FlagCheckBox : public QCheckBox
 {
     Q_OBJECT
 public:
-    FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller,
-                 const QString &flagstr, const QString &description);
-    FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller,
-                 const QString &flagstr, const QString &description,
-                 const QString &offstr);
-    FlagCheckBox(QWidget *parent, FlagCheckBoxController *controller,
-                 const QString &flagstr, const QString &description,
-                 const QString &offstr, const QString &defstr);
+    FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+                 const TQString &flagstr, const TQString &description);
+    FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+                 const TQString &flagstr, const TQString &description,
+                 const TQString &offstr);
+    FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+                 const TQString &flagstr, const TQString &description,
+                 const TQString &offstr, const TQString &defstr);
     ~FlagCheckBox()
         {}
 
 private:
-    QString flag;
-    QString off;
-    QString def;
+    TQString flag;
+    TQString off;
+    TQString def;
     bool includeOff;
     bool useDef;
     bool defSet;
@@ -109,13 +109,13 @@ class FlagRadioButton : public QRadioButton
 {
     Q_OBJECT
 public:
-    FlagRadioButton(QWidget *parent, FlagRadioButtonController *controller,
-                 const QString &flagstr, const QString &description);
+    FlagRadioButton(TQWidget *parent, FlagRadioButtonController *controller,
+                 const TQString &flagstr, const TQString &description);
     ~FlagRadioButton()
         {}
 
 private:
-    QString flag;
+    TQString flag;
     friend class FlagRadioButtonController;
 };
 
@@ -125,26 +125,26 @@ class FlagPathEdit: public QWidget
     Q_OBJECT
 public:
     /**If the pathDelimiter is not empty then path edit can contain a list of paths*/
-    FlagPathEdit(QWidget *parent, QString pathDelimiter, FlagPathEditController *controller,
-                 const QString &flagstr, const QString &description, KFile::Mode mode = KFile::Directory);
+    FlagPathEdit(TQWidget *parent, TQString pathDelimiter, FlagPathEditController *controller,
+                 const TQString &flagstr, const TQString &description, KFile::Mode mode = KFile::Directory);
 
     ~FlagPathEdit() {}
 
-    void setText(const QString text);
+    void setText(const TQString text);
     bool isEmpty();
-    QString text();
+    TQString text();
 
 private slots:
     void showPathDetails();
 
 private:
     KLineEdit *edit;
-    QPushButton *details;
+    TQPushButton *details;
     KURLRequester *url;
 
-    QString delimiter;
-    QString flag;
-    QString m_description;
+    TQString delimiter;
+    TQString flag;
+    TQString m_description;
     friend class FlagPathEditController;
 };
 
@@ -154,27 +154,27 @@ class FlagListEdit: public QWidget
     Q_OBJECT
 public:
     /**If the listDelimiter is not empty then list edit can contain a list of entries*/
-    FlagListEdit(QWidget *parent, QString listDelimiter, FlagEditController *controller,
-                 const QString &flagstr, const QString &description);
+    FlagListEdit(TQWidget *parent, TQString listDelimiter, FlagEditController *controller,
+                 const TQString &flagstr, const TQString &description);
 
     ~FlagListEdit() {}
 
-    void setText(const QString text);
-    void appendText(const QString text);
+    void setText(const TQString text);
+    void appendText(const TQString text);
     bool isEmpty();
-    QString text();
-    QStringList flags();
+    TQString text();
+    TQStringList flags();
 
 private slots:
     void showListDetails();
 
 private:
     KLineEdit *edit;
-    QPushButton *details;
+    TQPushButton *details;
 
-    QString delimiter;
-    QString flag;
-    QString m_description;
+    TQString delimiter;
+    TQString flag;
+    TQString m_description;
     friend class FlagEditController;
 };
 
@@ -182,21 +182,21 @@ private:
 class FlagSpinEdit: public QWidget
 {
 public:
-    FlagSpinEdit(QWidget *parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller,
-                 const QString &flagstr, const QString &description);
+    FlagSpinEdit(TQWidget *parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller,
+                 const TQString &flagstr, const TQString &description);
     ~FlagSpinEdit() {}
 
-    void setText(const QString text);
-    QString text();
+    void setText(const TQString text);
+    TQString text();
     bool isDefault();
 
-    QString flags();
+    TQString flags();
 
 private:
     int m_defaultVal;
-    QString flag;
+    TQString flag;
 
-    QSpinBox *spb;
+    TQSpinBox *spb;
 
     friend class FlagEditController;
 };
@@ -208,12 +208,12 @@ public:
     FlagPathEditController();
     ~FlagPathEditController();
 
-    void readFlags(QStringList *list);
-    void writeFlags(QStringList *list);
+    void readFlags(TQStringList *list);
+    void writeFlags(TQStringList *list);
 
 private:
     void addPathEdit(FlagPathEdit *item);
-    QPtrList plist;
+    TQPtrList plist;
     friend class FlagPathEdit;
 };
 
@@ -224,14 +224,14 @@ public:
     FlagEditController();
     ~FlagEditController();
 
-    void readFlags(QStringList *list);
-    void writeFlags(QStringList *list);
+    void readFlags(TQStringList *list);
+    void writeFlags(TQStringList *list);
 
 private:
     void addListEdit(FlagListEdit *item);
     void addSpinBox(FlagSpinEdit *item);
-    QPtrList plist;
-    QPtrList  slist;
+    TQPtrList plist;
+    TQPtrList  slist;
     friend class FlagListEdit;
     friend class FlagSpinEdit;
 };
@@ -244,18 +244,18 @@ public:
        multiKeys must contain a list of option names like {-v}
        in the above example.
     */
-    FlagCheckBoxController(QStringList multiKeys = QStringList());
+    FlagCheckBoxController(TQStringList multiKeys = TQStringList());
     ~FlagCheckBoxController()
         {}
 
-    void readFlags(QStringList *list);
-    void writeFlags(QStringList *list);
+    void readFlags(TQStringList *list);
+    void writeFlags(TQStringList *list);
 
     void addCheckBox(FlagCheckBox *item);
 private:
-    QPtrList cblist;
+    TQPtrList cblist;
 
-    QStringList m_multiKeys;
+    TQStringList m_multiKeys;
 };
 
 /**Controller for radiobutton editors.*/
@@ -266,18 +266,18 @@ public:
        multiKeys must contain a list of option names like {-v}
        in the above example.
     */
-    FlagRadioButtonController(QStringList multiKeys = QStringList());
+    FlagRadioButtonController(TQStringList multiKeys = TQStringList());
     ~FlagRadioButtonController()
         {}
 
-    void readFlags(QStringList *list);
-    void writeFlags(QStringList *list);
+    void readFlags(TQStringList *list);
+    void writeFlags(TQStringList *list);
 
     void addRadioButton(FlagRadioButton *item);
 private:
-    QPtrList cblist;
+    TQPtrList cblist;
 
-    QStringList m_multiKeys;
+    TQStringList m_multiKeys;
 };
 
 #endif
diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp
index ddb3123c..2576ed0c 100644
--- a/lib/widgets/kcomboview.cpp
+++ b/lib/widgets/kcomboview.cpp
@@ -19,13 +19,13 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include "kcomboview.h"
 
 
-KComboView::KComboView( bool rw, int defaultWidth, QWidget* parent, const char* name , CustomCompleter* comp)
+KComboView::KComboView( bool rw, int defaultWidth, TQWidget* parent, const char* name , CustomCompleter* comp)
     :QComboView(rw, parent, name),  m_comp( comp ), m_defaultWidth(defaultWidth)
 {
     if (rw)
@@ -33,7 +33,7 @@ KComboView::KComboView( bool rw, int defaultWidth, QWidget* parent, const char*
         KLineEdit *ed = new KLineEdit(this, "combo edit");
         ed->setCompletionMode(KGlobalSettings::CompletionPopup);
         ed->setCompletionObject(m_comp);
-        ed->completionBox()->setHScrollBarMode(QListBox::Auto);
+        ed->completionBox()->setHScrollBarMode(TQListBox::Auto);
         setLineEdit(ed);
     }
     setMinimumWidth(defaultWidth);
@@ -43,12 +43,12 @@ KComboView::~KComboView() {
     delete m_comp;
 }
 
-void KComboView::addItem(QListViewItem *it)
+void KComboView::addItem(TQListViewItem *it)
 {
     m_comp->addItem(it->text(0));
 }
 
-void KComboView::removeItem(QListViewItem *it)
+void KComboView::removeItem(TQListViewItem *it)
 {
     if (it == currentItem())
     {
@@ -59,7 +59,7 @@ void KComboView::removeItem(QListViewItem *it)
     delete it;
 }
 
-void KComboView::renameItem(QListViewItem *it, const QString &newName)
+void KComboView::renameItem(TQListViewItem *it, const TQString &newName)
 {
     m_comp->removeItem(it->text(0));
     it->setText(0, newName);
@@ -79,7 +79,7 @@ int KComboView::defaultWidth( )
     return m_defaultWidth;
 }
 
-void KComboView::setDefaultText( const QString & text )
+void KComboView::setDefaultText( const TQString & text )
 {
     m_defaultText = text;
 }
@@ -90,7 +90,7 @@ void KComboView::setUpListView()
     listView->setRootIsDecorated( false );
     listView->setAllColumnsShowFocus(true);
     listView->addColumn("");
-    listView->setResizeMode(QListView::LastColumn);
+    listView->setResizeMode(TQListView::LastColumn);
 
     listView->header()->hide();
 
diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h
index cb08e158..e0230b52 100644
--- a/lib/widgets/kcomboview.h
+++ b/lib/widgets/kcomboview.h
@@ -29,7 +29,7 @@ KComboView class.
 */
 
 /**
-KComboView - a combo with a QListView as a popup widget.
+KComboView - a combo with a TQListView as a popup widget.
 KComboView provides text completion.
 @sa QComboView for a description.
 */
@@ -38,11 +38,11 @@ KComboView provides text completion.
 ///This can be used to insert own KCompletion-implementations
 class CustomCompleter : public KCompletion {
     public:
-    virtual void addItem (const QString &item) {
+    virtual void addItem (const TQString &item) {
         KCompletion::addItem( item );
     }
     
-    virtual void removeItem (const QString &item) {
+    virtual void removeItem (const TQString &item) {
         KCompletion::removeItem( item );
     }
     
@@ -57,14 +57,14 @@ class KComboView: public QComboView
     Q_OBJECT
 public:
     ///The combo-view takes the ownership of the completer and deletes it on destruction
-    KComboView( bool rw, int defaultWidth = 100, QWidget* parent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() );
+    KComboView( bool rw, int defaultWidth = 100, TQWidget* parent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() );
     virtual ~KComboView();
 
-    virtual void addItem(QListViewItem *it);
-    virtual void removeItem(QListViewItem *it);
-    virtual void renameItem(QListViewItem *it, const QString &newName);
+    virtual void addItem(TQListViewItem *it);
+    virtual void removeItem(TQListViewItem *it);
+    virtual void renameItem(TQListViewItem *it, const TQString &newName);
 
-    virtual void setDefaultText(const QString &text);
+    virtual void setDefaultText(const TQString &text);
 
     virtual void clear();
 
@@ -74,7 +74,7 @@ private:
 
     CustomCompleter* m_comp;
     int m_defaultWidth;
-    QString m_defaultText;
+    TQString m_defaultText;
 };
 
 #endif
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 688e373a..c99dcf36 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -1,6 +1,6 @@
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -24,54 +24,54 @@ KDevHTMLPart::KDevHTMLPart()
 {
   setXMLFile(locate("data", "kdevelop/kdevhtml_partui.rc"), true);
   
-  connect(browserExtension(), SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)),
-          this, SLOT(openURLRequest(const KURL &)) );
+  connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)),
+          this, TQT_SLOT(openURLRequest(const KURL &)) );
 
-  connect(this, SIGNAL(started(KIO::Job *)), this, SLOT(slotStarted(KIO::Job* )));
-  connect(this, SIGNAL(completed()), this, SLOT(slotCompleted()));
-  connect(this, SIGNAL(canceled(const QString &)), this, SLOT(slotCancelled(const QString &)));
+  connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* )));
+  connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
+  connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &)));
 
   KActionCollection * actions = actionCollection();// new KActionCollection( this );
   reloadAction = new KAction( i18n( "Reload" ), "reload", 0,
-    this, SLOT( slotReload() ), actions, "doc_reload" );
+    this, TQT_SLOT( slotReload() ), actions, "doc_reload" );
   reloadAction->setWhatsThis(i18n("Reload
    Reloads the current document."));
   stopAction = new KAction( i18n( "Stop" ), "stop", 0,
-    this, SLOT( slotStop() ), actions, "doc_stop" );
+    this, TQT_SLOT( slotStop() ), actions, "doc_stop" );
   stopAction->setWhatsThis(i18n("Stop
    Stops the loading of current document."));
   duplicateAction = new KAction( i18n( "Duplicate Tab" ), "window_new", 0,
-    this, SLOT( slotDuplicate() ), actions, "doc_dup" );
+    this, TQT_SLOT( slotDuplicate() ), actions, "doc_dup" );
   duplicateAction->setWhatsThis(i18n("Duplicate window
    Opens current document in a new window."));
-  printAction = KStdAction::print(this, SLOT(slotPrint()), actions, "print_doc");
-  copyAction = KStdAction::copy(this, SLOT(slotCopy()), actions, "copy_doc_selection");
+  printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actions, "print_doc");
+  copyAction = KStdAction::copy(this, TQT_SLOT(slotCopy()), actions, "copy_doc_selection");
 
-  connect( this, SIGNAL(popupMenu(const QString &, const QPoint &)), this, SLOT(popup(const QString &, const QPoint &)));
-  connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()));
+  connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(popup(const TQString &, const TQPoint &)));
+  connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
 
 //BEGIN documentation history stuff  
     
   m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0,
-    this, SLOT(slotBack()),
+    this, TQT_SLOT(slotBack()),
     actions, "browser_back");
   m_backAction->setEnabled( false );
   m_backAction->setToolTip(i18n("Back"));
   m_backAction->setWhatsThis(i18n("Back
    Moves backwards one step in the documentation browsing history."));
 
-  connect(m_backAction->popupMenu(), SIGNAL(aboutToShow()),
-         this, SLOT(slotBackAboutToShow()));
-  connect(m_backAction->popupMenu(), SIGNAL(activated(int)),
-         this, SLOT(slotPopupActivated(int)));
+  connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
+         this, TQT_SLOT(slotBackAboutToShow()));
+  connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)),
+         this, TQT_SLOT(slotPopupActivated(int)));
 
   m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0,
-    this, SLOT(slotForward()),
+    this, TQT_SLOT(slotForward()),
     actions, "browser_forward");
   m_forwardAction->setEnabled( false );
   m_forwardAction->setToolTip(i18n("Forward"));
   m_forwardAction->setWhatsThis(i18n("Forward
    Moves forward one step in the documentation browsing history."));
 
-  connect(m_forwardAction->popupMenu(), SIGNAL(aboutToShow()),
-         this, SLOT(slotForwardAboutToShow()));
-  connect(m_forwardAction->popupMenu(), SIGNAL(activated(int)),
-         this, SLOT(slotPopupActivated(int)));
+  connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
+         this, TQT_SLOT(slotForwardAboutToShow()));
+  connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)),
+         this, TQT_SLOT(slotPopupActivated(int)));
   
   m_restoring = false;
   m_Current = m_history.end();
@@ -87,7 +87,7 @@ KDevHTMLPart::KDevHTMLPart()
   setZoomFactor(appConfig->readEntry("Zoom", "100").toInt());
 }
 
-void KDevHTMLPart::popup( const QString & url, const QPoint & p )
+void KDevHTMLPart::popup( const TQString & url, const TQPoint & p )
 {
 //  KPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() );
   KPopupMenu popup(this->widget());
@@ -157,13 +157,13 @@ void KDevHTMLPart::popup( const QString & url, const QPoint & p )
   }
 }
 
-void KDevHTMLPart::setContext(const QString &context)
+void KDevHTMLPart::setContext(const TQString &context)
 {
   m_context = context;
 }
 
 
-QString KDevHTMLPart::context() const
+TQString KDevHTMLPart::context() const
 {
   return m_context;
 }
@@ -250,10 +250,10 @@ done:
 #undef I
 #undef X
 
-QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url)
+TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
 {
   // check for environment variables and make necessary translations
-  QString path = url;
+  TQString path = url;
   int nDollarPos = path.find( '$' );
 
   // Note: the while loop below is a copy of code in kdecore/kconfigbase.cpp ;)
@@ -265,13 +265,13 @@ QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url)
       while ( (nEndPos <= path.length()) && (path[nEndPos]!=')') )
           nEndPos++;
       nEndPos++;
-      QString cmd = path.mid( nDollarPos+2, nEndPos-nDollarPos-3 );
+      TQString cmd = path.mid( nDollarPos+2, nEndPos-nDollarPos-3 );
 
-      QString result;
-      FILE *fs = popen(QFile::encodeName(cmd).data(), "r");
+      TQString result;
+      FILE *fs = popen(TQFile::encodeName(cmd).data(), "r");
       if (fs)
       {
-         QTextStream ts(fs, IO_ReadOnly);
+         TQTextStream ts(fs, IO_ReadOnly);
          result = ts.read().stripWhiteSpace();
          pclose(fs);
       }
@@ -279,7 +279,7 @@ QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url)
     } else if( (path)[nDollarPos+1] != '$' ) {
       uint nEndPos = nDollarPos+1;
       // the next character is no $
-      QString aVarName;
+      TQString aVarName;
       if (path[nEndPos]=='{')
       {
         while ( (nEndPos <= path.length()) && (path[nEndPos]!='}') )
@@ -302,9 +302,9 @@ QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url)
         // A environment variables may contain values in 8bit
         // locale cpecified encoding or in UTF8 encoding.
         if (isUtf8( pEnv ))
-            path.replace( nDollarPos, nEndPos-nDollarPos, QString::fromUtf8(pEnv) );
+            path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) );
         else
-            path.replace( nDollarPos, nEndPos-nDollarPos, QString::fromLocal8Bit(pEnv) );
+            path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) );
       } else
       path.remove( nDollarPos, nEndPos-nDollarPos );
     } else {
@@ -320,7 +320,7 @@ QString KDevHTMLPart::resolveEnvVarsInURL(const QString& url)
 
 bool KDevHTMLPart::openURL(const KURL &url)
 {
-  QString path = resolveEnvVarsInURL(url.url());
+  TQString path = resolveEnvVarsInURL(url.url());
   KURL newUrl(path);
   
   bool retval = KHTMLPart::openURL(newUrl);
@@ -364,7 +364,7 @@ void KDevHTMLPart::slotCompleted( )
     stopAction->setEnabled(false);
 }
 
-void KDevHTMLPart::slotCancelled( const QString & /*errMsg*/ )
+void KDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ )
 {
     stopAction->setEnabled(false);
 }
@@ -408,7 +408,7 @@ void KDevHTMLPart::slotBackAboutToShow()
 
 	if ( m_Current == m_history.begin() ) return;
 
-	QValueList::Iterator it = m_Current;
+	TQValueList::Iterator it = m_Current;
 	--it;
 	
 	int i = 0;
@@ -433,7 +433,7 @@ void KDevHTMLPart::slotForwardAboutToShow()
 
 	if ( m_Current == m_history.fromLast() ) return;
 
-	QValueList::Iterator it = m_Current;
+	TQValueList::Iterator it = m_Current;
 	++it;
 	
 	int i = 0;
@@ -455,7 +455,7 @@ void KDevHTMLPart::slotPopupActivated( int id )
 {
 	kdDebug(9000) << "id: " << id << endl;
 
-	QValueList::Iterator it = m_history.begin();
+	TQValueList::Iterator it = m_history.begin();
 	while( it != m_history.end() )
 	{
 		kdDebug(9000) << "(*it).id: " << (*it).id << endl;
@@ -473,7 +473,7 @@ void KDevHTMLPart::slotPopupActivated( int id )
 
 void KDevHTMLPart::addHistoryEntry()
 {
-	QValueList::Iterator it = m_Current;
+	TQValueList::Iterator it = m_Current;
 	
 	// if We're not already the last entry, we truncate the list here before adding an entry
 	if ( it != m_history.end() && it != m_history.fromLast() )
@@ -493,12 +493,12 @@ void KDevHTMLPart::addHistoryEntry()
 
 void KDevHTMLPart::slotCopy( )
 {
-    QString text = selectedText();
-    text.replace( QChar( 0xa0 ), ' ' );
-    QClipboard *cb = QApplication::clipboard();
-    disconnect( cb, SIGNAL( selectionChanged() ), this, SLOT( slotClearSelection() ) );
+    TQString text = selectedText();
+    text.replace( TQChar( 0xa0 ), ' ' );
+    QClipboard *cb = TQApplication::clipboard();
+    disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);
-    connect( cb, SIGNAL( selectionChanged() ), this, SLOT( slotClearSelection() ) );
+    connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
 }
 
 void KDevHTMLPart::slotSelectionChanged( )
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index 944f1e9b..465fb0a3 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -3,7 +3,7 @@
 
 #include 
 
-#include 
+#include 
 
 #include 
 
@@ -23,7 +23,7 @@ struct DocumentationHistoryEntry {
     DocumentationHistoryEntry() {}
     DocumentationHistoryEntry( const KURL& u ): url( u ) 
     {
-        id = abs( QTime::currentTime().msecsTo( QTime() ) );	// nasty, but should provide a reasonably unique number
+        id = abs( TQTime::currentTime().msecsTo( TQTime() ) );	// nasty, but should provide a reasonably unique number
     }
 };
 
@@ -52,10 +52,10 @@ public:
 
     KDevHTMLPart();
     
-    void setContext(const QString &context);
-    QString context() const;
+    void setContext(const TQString &context);
+    TQString context() const;
     virtual bool openURL(const KURL &url);
-    static QString resolveEnvVarsInURL(const QString& url);
+    static TQString resolveEnvVarsInURL(const TQString& url);
     
     void setOptions(int options) { m_options = options; }
 
@@ -66,10 +66,10 @@ protected slots:
 
     void slotStarted(KIO::Job *);
     void slotCompleted();
-    void slotCancelled(const QString &errMsg);
+    void slotCancelled(const TQString &errMsg);
     
     void openURLRequest(const KURL &url);
-    void popup( const QString & url, const QPoint & p );
+    void popup( const TQString & url, const TQPoint & p );
     
     void slotReload();
     void slotStop();
@@ -90,15 +90,15 @@ protected slots:
   
 private:
 
-    QValueList< DocumentationHistoryEntry > m_history;
-    QValueList< DocumentationHistoryEntry >::Iterator m_Current;
+    TQValueList< DocumentationHistoryEntry > m_history;
+    TQValueList< DocumentationHistoryEntry >::Iterator m_Current;
 
     KToolBarPopupAction* m_backAction;
     KToolBarPopupAction* m_forwardAction;
     
     bool m_restoring;
 
-    QString m_context;
+    TQString m_context;
     KAction *stopAction;
     KAction *reloadAction;
     KAction *duplicateAction;
diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp
index 49925115..a7d12348 100644
--- a/lib/widgets/kdevtabwidget.cpp
+++ b/lib/widgets/kdevtabwidget.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
+#include 
 
 #include 
 #include 
@@ -18,24 +18,24 @@
 
 #include "kdevtabwidget.h"
 
-KDevTabWidget::KDevTabWidget(QWidget *parent, const char *name) : QTabWidget(parent,name)
+KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name)
 {
   m_pTabBar = new KTabBar(this, "tabbar");
   setTabBar(m_pTabBar);
-  connect(m_pTabBar, SIGNAL(closeWindow(const QWidget*)), this, SIGNAL(closeWindow(const QWidget*)));
-  connect(m_pTabBar, SIGNAL(closeOthers(QWidget*)), this, SIGNAL(closeOthers(QWidget*)));
+  connect(m_pTabBar, TQT_SIGNAL(closeWindow(const TQWidget*)), this, TQT_SIGNAL(closeWindow(const TQWidget*)));
+  connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*)));
 }
 
-KTabBar::KTabBar(QWidget *parent, const char *name) : QTabBar(parent,name)
+KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name)
 {
-  m_pPopupMenu = new QPopupMenu(this);
+  m_pPopupMenu = new TQPopupMenu(this);
 
-  QPixmap closePixmap = KGlobal::instance()->iconLoader()->loadIcon( "tab_remove", KIcon::Small, 0, KIcon::DefaultState, 0, true ); 
+  TQPixmap closePixmap = KGlobal::instance()->iconLoader()->loadIcon( "tab_remove", KIcon::Small, 0, KIcon::DefaultState, 0, true ); 
   if (closePixmap.isNull())
     closePixmap = SmallIcon("fileclose");
 
-  m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, SLOT(closeWindowSlot()));
-  m_pPopupMenu->insertItem(i18n("Close &Others"), this, SLOT(closeOthersSlot()));
+  m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQT_SLOT(closeWindowSlot()));
+  m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQT_SLOT(closeOthersSlot()));
 }
 
 void KTabBar::closeWindowSlot()
@@ -48,11 +48,11 @@ void KTabBar::closeOthersSlot()
 	emit closeOthers(m_pPage);
 }
 
-void KTabBar::mousePressEvent(QMouseEvent *e)
+void KTabBar::mousePressEvent(TQMouseEvent *e)
 {
   if(e->button() == Qt::RightButton) {
 
-    QTab *tab = selectTab(e->pos() );
+    TQTab *tab = selectTab(e->pos() );
     if( tab == 0L ) return;
     
     m_pPage = ((KDevTabWidget*)parent())->page(indexOf(tab->identifier() ) );
@@ -60,7 +60,7 @@ void KTabBar::mousePressEvent(QMouseEvent *e)
 
     m_pPopupMenu->exec(mapToGlobal(e->pos()));
   }
-  QTabBar::mousePressEvent(e);
+  TQTabBar::mousePressEvent(e);
 }
 
 #include "kdevtabwidget.moc"
diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp
index 23bc653b..0a219da5 100644
--- a/lib/widgets/klistviewaction.cpp
+++ b/lib/widgets/klistviewaction.cpp
@@ -20,8 +20,8 @@
 #include "kcomboview.h"
 #include "resizablecombo.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -37,8 +37,8 @@ KListViewAction::~KListViewAction()
     delete m_view;
 }
 
-KListViewAction::KListViewAction(KComboView *view, const QString & text, const KShortcut & cut,
-    const QObject * receiver, const char * slot, KActionCollection * parent, const char * name ):
+KListViewAction::KListViewAction(KComboView *view, const TQString & text, const KShortcut & cut,
+    const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name ):
     KWidgetAction(view, text, cut, receiver, slot, parent, name), m_view(view)
 {
     m_view->setDuplicatesEnabled(false);
@@ -47,8 +47,8 @@ KListViewAction::KListViewAction(KComboView *view, const QString & text, const K
     loadComboWidth();
 }
 
-KListViewAction::KListViewAction( KComboView * view, const QString & text, const KShortcut & cut,
-    const QObject * receiver, const char * slot, KActionCollection * parent, const char * name, const bool /*dummy*/ ):
+KListViewAction::KListViewAction( KComboView * view, const TQString & text, const KShortcut & cut,
+    const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name, const bool /*dummy*/ ):
     KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, parent, name), m_view(view)
 {
     m_view->setDuplicatesEnabled(false);
@@ -62,16 +62,16 @@ KComboView * KListViewAction::view( ) const
     return m_view;
 }
 
-void KListViewAction::setToolTip( const QString & str )
+void KListViewAction::setToolTip( const TQString & str )
 {
-    QToolTip::remove(m_view);
-    QToolTip::add(m_view, str);
+    TQToolTip::remove(m_view);
+    TQToolTip::add(m_view, str);
 }
 
-void KListViewAction::setWhatsThis( const QString & str )
+void KListViewAction::setWhatsThis( const TQString & str )
 {
-    QWhatsThis::remove(m_view);
-    QWhatsThis::add(m_view, str);
+    TQWhatsThis::remove(m_view);
+    TQWhatsThis::add(m_view, str);
 }
 
 void KListViewAction::loadComboWidth( )
diff --git a/lib/widgets/klistviewaction.h b/lib/widgets/klistviewaction.h
index 72a78dd0..d8f53eb8 100644
--- a/lib/widgets/klistviewaction.h
+++ b/lib/widgets/klistviewaction.h
@@ -38,14 +38,14 @@ Can be used on toolbars. It appears as @ref ResizableCombo.
 class KListViewAction: public KWidgetAction
 {
 public:
-    KListViewAction(KComboView *view, const QString &text, const KShortcut &cut, const QObject *receiver, const char *slot, KActionCollection *parent, const char *name);
-    KListViewAction(KComboView *view, const QString &text, const KShortcut &cut, const QObject *receiver, const char *slot, KActionCollection *parent, const char *name, const bool);
+    KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name);
+    KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name, const bool);
 
     ~KListViewAction();
 
     KComboView *view() const;
-    void setToolTip(const QString & str);
-    void setWhatsThis(const QString &str);
+    void setToolTip(const TQString & str);
+    void setWhatsThis(const TQString &str);
 
 private:
     void loadComboWidth();
diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp
index 81d9ed38..8ddb5c89 100644
--- a/lib/widgets/ksavealldialog.cpp
+++ b/lib/widgets/ksavealldialog.cpp
@@ -17,9 +17,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -35,8 +35,8 @@ namespace
 class CheckURL : public QCheckListItem
 {
 public:
-	CheckURL( QListView * lv, KURL const & url )
-		: QCheckListItem( lv, url.path(), QCheckListItem::CheckBox),
+	CheckURL( TQListView * lv, KURL const & url )
+		: TQCheckListItem( lv, url.path(), TQCheckListItem::CheckBox),
 		_url( url )
 	{}
 
@@ -49,20 +49,20 @@ private:
 }
 
 
-KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, QWidget * parent ) :
+KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ) :
   KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"),
 	       Ok | User1 | Close )
 {
-  QVBox *top = makeVBoxMainWidget();
+  TQVBox *top = makeVBoxMainWidget();
 
-  (void)new QLabel( i18n("The following files have been modified. Save them?"), top );
+  (void)new TQLabel( i18n("The following files have been modified. Save them?"), top );
 
 	_listview = new KListView( top );
 	_listview->addColumn( "" );
 	_listview->header()->hide();
-	_listview->setResizeMode( QListView::LastColumn );
+	_listview->setResizeMode( TQListView::LastColumn );
 
-	setButtonOK( KGuiItem(i18n("Save &Selected"), QString::null, i18n("Saves all selected files")) );
+	setButtonOK( KGuiItem(i18n("Save &Selected"), TQString::null, i18n("Saves all selected files")) );
 	setButtonText( User1, i18n("Save &None") );
 	setButtonText( Close, KStdGuiItem::cancel().text() );
 	setButtonTip( User1, i18n("Lose all modifications") );
@@ -73,15 +73,15 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co
 	{
 		if ( !ignorelist.contains( *it ) )
 		{
-			QCheckListItem * x = new CheckURL( _listview, *it );
+			TQCheckListItem * x = new CheckURL( _listview, *it );
 			x->setOn( true );
 		}
 		++it;
 	}
 
-	connect( this, SIGNAL(closeClicked()), this, SLOT(cancel()) );
-	connect( this, SIGNAL(okClicked()), this, SLOT(save()) );
-	connect( this, SIGNAL(user1Clicked()), this, SLOT(saveNone()) );
+	connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) );
+	connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(save()) );
+	connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(saveNone()) );
 }
 
 KSaveSelectDialog::~KSaveSelectDialog() {}
@@ -96,17 +96,17 @@ void KSaveSelectDialog::saveNone( )
 		item = static_cast( item->nextSibling() );
 	}
 
-	QDialog::accept();
+	TQDialog::accept();
 }
 
 void KSaveSelectDialog::save( )
 {
-	QDialog::accept();
+	TQDialog::accept();
 }
 
 void KSaveSelectDialog::cancel( )
 {
-	QDialog::reject();
+	TQDialog::reject();
 }
 
 KURL::List KSaveSelectDialog::filesToSave( )
@@ -140,28 +140,28 @@ KURL::List KSaveSelectDialog::filesNotToSave( )
 }
 
 
-KSaveAllDialog::KSaveAllDialog( const QStringList& filenames, QWidget* parent ) :
+KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ) :
   KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"),
 	       Ok | User1 | Close )
 {
   m_result = Cancel;
 
-  QVBox *top = makeVBoxMainWidget();
+  TQVBox *top = makeVBoxMainWidget();
 
-  (void)new QLabel( i18n("The following files have been modified. Save them?"), top );
+  (void)new TQLabel( i18n("The following files have been modified. Save them?"), top );
   KListBox* lb = new KListBox( top );
   lb->setMinimumHeight( lb->fontMetrics().height() * 5 );
   lb->insertStringList( filenames );
 
-  setButtonOK( KGuiItem(i18n("Save &All"), QString::null, i18n("Saves all modified files")) );
+  setButtonOK( KGuiItem(i18n("Save &All"), TQString::null, i18n("Saves all modified files")) );
   setButtonText( User1, i18n("Save &None") );
   setButtonText( Close, KStdGuiItem::cancel().text() );
   setButtonTip( User1, i18n("Lose all modifications") );
   setButtonTip( Close, i18n("Cancels the action") );
 
-  connect( this, SIGNAL(closeClicked()), this, SLOT(cancel()) );
-  connect( this, SIGNAL(okClicked()), this, SLOT(saveAll()) );
-  connect( this, SIGNAL(user1Clicked()), this, SLOT(revert()) );
+  connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) );
+  connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveAll()) );
+  connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(revert()) );
 }
 
 KSaveAllDialog::~KSaveAllDialog()
@@ -171,19 +171,19 @@ KSaveAllDialog::~KSaveAllDialog()
 void KSaveAllDialog::revert()
 {
   m_result = Revert;
-  QDialog::accept();
+  TQDialog::accept();
 }
 
 void KSaveAllDialog::saveAll()
 {
   m_result = SaveAll;
-  QDialog::accept();
+  TQDialog::accept();
 }
 
 void KSaveAllDialog::cancel()
 {
   m_result = Cancel;
-  QDialog::reject();
+  TQDialog::reject();
 }
 
 #include "ksavealldialog.moc"
diff --git a/lib/widgets/ksavealldialog.h b/lib/widgets/ksavealldialog.h
index 9d7860cf..c6592b4a 100644
--- a/lib/widgets/ksavealldialog.h
+++ b/lib/widgets/ksavealldialog.h
@@ -20,7 +20,7 @@
 #ifndef SAVEALLDIALOG_H
 #define SAVEALLDIALOG_H
 
-#include 
+#include 
 #include 
 #include 
 
@@ -38,7 +38,7 @@ class KSaveSelectDialog : public KDialogBase
 	Q_OBJECT
 	
 public:
-	KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, QWidget * parent );
+	KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent );
 	virtual ~KSaveSelectDialog();
 	
 	KURL::List filesToSave();
@@ -65,7 +65,7 @@ class KSaveAllDialog : public KDialogBase
 public:
   enum SaveAllResult{ SaveAll, Cancel, Revert };
 
-  KSaveAllDialog( const QStringList& filenames, QWidget* parent );
+  KSaveAllDialog( const TQStringList& filenames, TQWidget* parent );
   virtual ~KSaveAllDialog();
 
   SaveAllResult result() const { return m_result; }
diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp
index e4f7e08d..8fdbc5d2 100644
--- a/lib/widgets/processlinemaker.cpp
+++ b/lib/widgets/processlinemaker.cpp
@@ -28,11 +28,11 @@ ProcessLineMaker::ProcessLineMaker()
 
 ProcessLineMaker::ProcessLineMaker( const KProcess* proc )
 {
-    connect(proc, SIGNAL(receivedStdout(KProcess*,char*,int)),
-            this, SLOT(slotReceivedStdout(KProcess*,char*,int)) );
+    connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
+            this, TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)) );
 
-    connect(proc, SIGNAL(receivedStderr(KProcess*,char*,int)),
-            this, SLOT(slotReceivedStderr(KProcess*,char*,int)) );
+    connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
+            this, TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)) );
 }
 
 void ProcessLineMaker::slotReceivedStdout( const char *buffer )
@@ -40,7 +40,7 @@ void ProcessLineMaker::slotReceivedStdout( const char *buffer )
     stdoutbuf += buffer;
     int pos;
     while ( (pos = stdoutbuf.find('\n')) != -1) {
-        QCString line = stdoutbuf.left( pos );
+        TQCString line = stdoutbuf.left( pos );
         emit receivedStdoutLine(line);
         stdoutbuf.remove(0, pos+1);
     }
@@ -61,7 +61,7 @@ void ProcessLineMaker::slotReceivedStderr( const char *buffer )
     stderrbuf += buffer;
     int pos;
     while ( (pos = stderrbuf.find('\n')) != -1) {
-        QCString line = stderrbuf.left( pos );
+        TQCString line = stderrbuf.left( pos );
         emit receivedStderrLine(line);
         stderrbuf.remove(0, pos+1);
     }
diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h
index 7efa508a..d124e2ed 100644
--- a/lib/widgets/processlinemaker.h
+++ b/lib/widgets/processlinemaker.h
@@ -20,7 +20,7 @@
 #ifndef _PROCESSLINEMAKER_H_
 #define _PROCESSLINEMAKER_H_
 
-#include 
+#include 
 
 /**
 @file processlinemaker.h
@@ -52,14 +52,14 @@ protected slots:
 	void slotReceivedStderr(KProcess *, char *buffer, int buflen);
 
 signals:
-	void receivedStdoutLine( const QCString& line );
-        void receivedStderrLine( const QCString& line );
-        void receivedPartialStdoutLine( const QCString& line );
-        void receivedPartialStderrLine( const QCString& line );
+	void receivedStdoutLine( const TQCString& line );
+        void receivedStderrLine( const TQCString& line );
+        void receivedPartialStdoutLine( const TQCString& line );
+        void receivedPartialStderrLine( const TQCString& line );
 
 private:
-	QCString stdoutbuf;
-	QCString stderrbuf;
+	TQCString stdoutbuf;
+	TQCString stderrbuf;
 };
 
 #endif
diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp
index 3edbf161..a49a1078 100644
--- a/lib/widgets/processwidget.cpp
+++ b/lib/widgets/processwidget.cpp
@@ -21,21 +21,21 @@
 #include "processlinemaker.h"
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 
-ProcessListBoxItem::ProcessListBoxItem(const QString &s, Type type)
-    : QListBoxText(s), t(type)
+ProcessListBoxItem::ProcessListBoxItem(const TQString &s, Type type)
+    : TQListBoxText(s), t(type)
 {
-    QString clean = s;
-    clean.replace( QChar('\t'), QString("  ") );
-    clean.replace( QChar('\n'), QString() );
-    clean.replace( QChar('\r'), QString() );
+    TQString clean = s;
+    clean.replace( TQChar('\t'), TQString("  ") );
+    clean.replace( TQChar('\n'), TQString() );
+    clean.replace( TQChar('\r'), TQString() );
     setText( clean );
 
     setCustomHighlighting(true);
@@ -57,7 +57,7 @@ static inline double blend1(double a, double b, double k)
     return a + (b - a) * k;
 }
 
-QColor ProcessListBoxItem::blend(const QColor &c1, const QColor &c2, double k) const
+TQColor ProcessListBoxItem::blend(const TQColor &c1, const TQColor &c2, double k) const
 {
     if (k < 0.0) return c1;
     if (k > 1.0) return c2;
@@ -66,14 +66,14 @@ QColor ProcessListBoxItem::blend(const QColor &c1, const QColor &c2, double k) c
     int g = normalize((int)blend1((double)c1.green(), (double)c2.green(), k));
     int b = normalize((int)blend1((double)c1.blue(),  (double)c2.blue(),  k));
 
-    return QColor(qRgb(r, g, b));
+    return TQColor(qRgb(r, g, b));
 }
 
-void ProcessListBoxItem::paint(QPainter *p)
+void ProcessListBoxItem::paint(TQPainter *p)
 {
-    QColor dim, warn, err, back;
+    TQColor dim, warn, err, back;
     if (listBox()) {
-        const QColorGroup& group = listBox()->palette().active();
+        const TQColorGroup& group = listBox()->palette().active();
         if (isSelected()) {
             back = group.button();
             warn = group.buttonText();
@@ -96,17 +96,17 @@ void ProcessListBoxItem::paint(QPainter *p)
         else
             back = Qt::white;
     }
-    p->fillRect(p->window(), QBrush(back));
+    p->fillRect(p->window(), TQBrush(back));
     p->setPen((t==Error)? err :
               (t==Diagnostic)? warn : dim);
-    QListBoxText::paint(p);
+    TQListBoxText::paint(p);
 }
 
 
-ProcessWidget::ProcessWidget(QWidget *parent, const char *name)
+ProcessWidget::ProcessWidget(TQWidget *parent, const char *name)
     : KListBox(parent, name)
 {
-    setFocusPolicy(QWidget::NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
 
     // Don't override the palette, as that can mess up styles. Instead, draw
     // the background ourselves (see ProcessListBoxItem::paint).
@@ -117,17 +117,17 @@ ProcessWidget::ProcessWidget(QWidget *parent, const char *name)
 
     procLineMaker = new ProcessLineMaker( childproc );
 
-    connect( procLineMaker, SIGNAL(receivedStdoutLine(const QCString&)),
-             this, SLOT(insertStdoutLine(const QCString&) ));
-    connect( procLineMaker, SIGNAL(receivedStderrLine(const QCString&)),
-             this, SLOT(insertStderrLine(const QCString&) ));
-    connect( procLineMaker, SIGNAL(receivedPartialStdoutLine(const QCString&)),
-             this, SLOT(addPartialStdoutLine(const QCString&) ));
-    connect( procLineMaker, SIGNAL(receivedPartialStderrLine(const QCString&)),
-             this, SLOT(addPartialStderrLine(const QCString&) ));
-
-    connect(childproc, SIGNAL(processExited(KProcess*)),
-            this, SLOT(slotProcessExited(KProcess*) )) ;
+    connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)),
+             this, TQT_SLOT(insertStdoutLine(const TQCString&) ));
+    connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)),
+             this, TQT_SLOT(insertStderrLine(const TQCString&) ));
+    connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)),
+             this, TQT_SLOT(addPartialStdoutLine(const TQCString&) ));
+    connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)),
+             this, TQT_SLOT(addPartialStderrLine(const TQCString&) ));
+
+    connect(childproc, TQT_SIGNAL(processExited(KProcess*)),
+            this, TQT_SLOT(slotProcessExited(KProcess*) )) ;
 }
 
 
@@ -138,7 +138,7 @@ ProcessWidget::~ProcessWidget()
 }
 
 
-void ProcessWidget::startJob(const QString &dir, const QString &command)
+void ProcessWidget::startJob(const TQString &dir, const TQString &command)
 {
     procLineMaker->clearBuffers();
     procLineMaker->blockSignals( false );
@@ -182,18 +182,18 @@ void ProcessWidget::slotProcessExited(KProcess *)
 }
 
 
-void ProcessWidget::insertStdoutLine(const QCString &line)
+void ProcessWidget::insertStdoutLine(const TQCString &line)
 {
     if( !stdoutbuf.isEmpty() )
     {
         stdoutbuf += line;
-        insertItem( new ProcessListBoxItem( QString::fromLocal8Bit(stdoutbuf),
+        insertItem( new ProcessListBoxItem( TQString::fromLocal8Bit(stdoutbuf),
                                             ProcessListBoxItem::Normal ),
                     lastRowStdout+1 );
         stdoutbuf.truncate( 0 );
     }else
     {
-        insertItem( new ProcessListBoxItem( QString::fromLocal8Bit( line ),
+        insertItem( new ProcessListBoxItem( TQString::fromLocal8Bit( line ),
                                             ProcessListBoxItem::Normal) );
     }
     lastRowStdout = count() - 1;
@@ -201,18 +201,18 @@ void ProcessWidget::insertStdoutLine(const QCString &line)
 }
 
 
-void ProcessWidget::insertStderrLine(const QCString &line)
+void ProcessWidget::insertStderrLine(const TQCString &line)
 {
     if( !stderrbuf.isEmpty() )
     {
         stderrbuf += line;
-        insertItem( new ProcessListBoxItem( QString::fromLocal8Bit( stderrbuf ),
+        insertItem( new ProcessListBoxItem( TQString::fromLocal8Bit( stderrbuf ),
                                             ProcessListBoxItem::Error ),
                     lastRowStderr+1 );
         stderrbuf.truncate( 0 );
     } else
     {
-        insertItem( new ProcessListBoxItem( QString::fromLocal8Bit( line ),
+        insertItem( new ProcessListBoxItem( TQString::fromLocal8Bit( line ),
                                             ProcessListBoxItem::Error) );
     }
     lastRowStderr = count() - 1;
@@ -222,7 +222,7 @@ void ProcessWidget::insertStderrLine(const QCString &line)
 
 void ProcessWidget::childFinished(bool normal, int status)
 {
-    QString s;
+    TQString s;
     ProcessListBoxItem::Type t;
 
     if (normal) {
@@ -249,12 +249,12 @@ void ProcessWidget::childFinished(bool normal, int status)
 }
 
 
-QSize ProcessWidget::minimumSizeHint() const
+TQSize ProcessWidget::minimumSizeHint() const
 {
     // I'm not sure about this, but when I don't use override minimumSizeHint(),
     // the initial size in clearly too small
 
-    return QSize( QListBox::sizeHint().width(),
+    return TQSize( TQListBox::sizeHint().width(),
                   (fontMetrics().lineSpacing()+2)*4 );
 }
 
@@ -270,12 +270,12 @@ void ProcessWidget::maybeScrollToBottom()
     }
 }
 
-void ProcessWidget::addPartialStderrLine(const QCString& linepart)
+void ProcessWidget::addPartialStderrLine(const TQCString& linepart)
 {
     stderrbuf += linepart;
 }
 
-void ProcessWidget::addPartialStdoutLine(const QCString& linepart)
+void ProcessWidget::addPartialStdoutLine(const TQCString& linepart)
 {
     stdoutbuf += linepart;
 }
diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h
index f1e28a57..ee1a6012 100644
--- a/lib/widgets/processwidget.h
+++ b/lib/widgets/processwidget.h
@@ -38,15 +38,15 @@ class ProcessListBoxItem : public QListBoxText
 public:
     enum Type { Diagnostic, Normal, Error };
 
-    ProcessListBoxItem(const QString &s, Type type);
+    ProcessListBoxItem(const TQString &s, Type type);
 
     virtual bool isCustomItem();
 
 protected:
-    QColor blend(const QColor &c1, const QColor &c2, double k = 0.25) const;
+    TQColor blend(const TQColor &c1, const TQColor &c2, double k = 0.25) const;
 
 private:
-    virtual void paint(QPainter *p);
+    virtual void paint(TQPainter *p);
     Type t;
 };
 
@@ -60,7 +60,7 @@ class ProcessWidget : public KListBox
     Q_OBJECT
 
 public:
-    ProcessWidget(QWidget *parent, const char *name=0);
+    ProcessWidget(TQWidget *parent, const char *name=0);
     ~ProcessWidget();
 
     /**
@@ -72,7 +72,7 @@ public slots:
     /**
      * Starts the child process.
      */
-    void startJob(const QString &dir, const QString &command);
+    void startJob(const TQString &dir, const TQString &command);
     /**
      * Kills the child processss.
      */
@@ -82,17 +82,17 @@ public slots:
      * be overridden by subclasses to implement
      * syntax highlighting.
      */
-    virtual void insertStdoutLine(const QCString &line);
+    virtual void insertStdoutLine(const TQCString &line);
     /**
      * Inserts one line from stderr into the listbox. This can
      * be overridden by subclasses to implement
      * syntax highlighting. By default, a ProcessListBoxItem
      * is used.
      */
-    virtual void insertStderrLine(const QCString &line);
+    virtual void insertStderrLine(const TQCString &line);
 
-    virtual void addPartialStdoutLine(const QCString&);
-    virtual void addPartialStderrLine(const QCString&);
+    virtual void addPartialStdoutLine(const TQCString&);
+    virtual void addPartialStderrLine(const TQCString&);
 
 protected:
     /**
@@ -108,7 +108,7 @@ signals:
     void rowSelected(int row);
 
 protected:
-    virtual QSize minimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
     void maybeScrollToBottom();
 
 protected slots:
@@ -117,8 +117,8 @@ protected slots:
 private:
     KProcess *childproc;
     ProcessLineMaker* procLineMaker;
-    QCString stderrbuf;
-    QCString stdoutbuf;
+    TQCString stderrbuf;
+    TQCString stdoutbuf;
     int lastRowStdout;
     int lastRowStderr;
 };
diff --git a/lib/widgets/propeditor/childproperty.cpp b/lib/widgets/propeditor/childproperty.cpp
index 12b7f4d9..ac53936a 100644
--- a/lib/widgets/propeditor/childproperty.cpp
+++ b/lib/widgets/propeditor/childproperty.cpp
@@ -19,29 +19,29 @@
  ***************************************************************************/
 #include "childproperty.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "multiproperty.h"
 
 namespace PropertyLib{
 
-ChildProperty::ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const QString &name,
-    const QString &description, const QVariant &value, bool save, bool readOnly)
+ChildProperty::ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name,
+    const TQString &description, const TQVariant &value, bool save, bool readOnly)
     :Property(type, name, description, value, save, readOnly), m_parent(parent), m_childType(childType)
 {
 }
 
-ChildProperty::ChildProperty(MultiProperty *parent, const QString & name, ChildPropertyType childType,
-    const QMap &v_valueList, const QString &description,
-    const QVariant &value, bool save, bool readOnly)
+ChildProperty::ChildProperty(MultiProperty *parent, const TQString & name, ChildPropertyType childType,
+    const TQMap &v_valueList, const TQString &description,
+    const TQVariant &value, bool save, bool readOnly)
     :Property(name, v_valueList, description, value, save, readOnly), m_parent(parent), m_childType(childType)
 {
 }
 
-void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue
+void ChildProperty::setValue(const TQVariant &value, bool // rememberOldValue
                              )
 {
     qWarning("ChildProperty::setValue");
@@ -51,8 +51,8 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue
     {
         case Size:
         {
-            qWarning("ChildProperty::setValue for QSize");
-            QSize v = m_parent->value().toSize();
+            qWarning("ChildProperty::setValue for TQSize");
+            TQSize v = m_parent->value().toSize();
             if (m_childType == Size_Height)
                 v.setHeight(value.toInt());
             else if (m_childType == Size_Width)
@@ -62,8 +62,8 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue
         }
         case Point:
         {
-            qWarning("ChildProperty::setValue for QPoint");
-            QPoint v = m_parent->value().toPoint();
+            qWarning("ChildProperty::setValue for TQPoint");
+            TQPoint v = m_parent->value().toPoint();
             if (m_childType == Point_X)
                 v.setX(value.toInt());
             else if (m_childType == Point_Y)
@@ -73,8 +73,8 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue
         }
         case Rect:
         {
-            qWarning("ChildProperty::setValue for QRect");
-            QRect v = m_parent->value().toRect();
+            qWarning("ChildProperty::setValue for TQRect");
+            TQRect v = m_parent->value().toRect();
             if (m_childType == Rect_X)
                 v.setX(value.toInt());
             else if (m_childType == Rect_Y)
@@ -88,12 +88,12 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue
         }
         case SizePolicy:
         {
-            qWarning("ChildProperty::setValue for QSizePolicy");
-            QSizePolicy v = m_parent->value().toSizePolicy();
+            qWarning("ChildProperty::setValue for TQSizePolicy");
+            TQSizePolicy v = m_parent->value().toSizePolicy();
             if (m_childType == SizePolicy_HorData)
-                v.setHorData(QSizePolicy::SizeType(value.toInt()));
+                v.setHorData(TQSizePolicy::SizeType(value.toInt()));
             else if (m_childType == SizePolicy_VerData)
-                v.setVerData(QSizePolicy::SizeType(value.toInt()));
+                v.setVerData(TQSizePolicy::SizeType(value.toInt()));
             else if (m_childType == SizePolicy_HorStretch)
                 v.setHorStretch(value.toInt());
             else if (m_childType == SizePolicy_VerStretch)
@@ -104,10 +104,10 @@ void ChildProperty::setValue(const QVariant &value, bool // rememberOldValue
     }
 }
 
-QVariant ChildProperty::value( ) const
+TQVariant ChildProperty::value( ) const
 {
     if (!m_parent->valid())
-        return QVariant();
+        return TQVariant();
     switch (m_parent->type())
     {
         case Size:
@@ -139,7 +139,7 @@ QVariant ChildProperty::value( ) const
             else if (m_childType == SizePolicy_VerStretch)
                 return m_parent->value().toSizePolicy().verStretch();
     }
-    return QVariant();
+    return TQVariant();
 }
 
 }
diff --git a/lib/widgets/propeditor/childproperty.h b/lib/widgets/propeditor/childproperty.h
index fc43553a..6e247fd3 100644
--- a/lib/widgets/propeditor/childproperty.h
+++ b/lib/widgets/propeditor/childproperty.h
@@ -60,18 +60,18 @@ public:
     /**Constructs empty property.*/
     ChildProperty() {}
     /**Constructs property.*/
-    ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const QString &name,
-        const QString &description, const QVariant &value = QVariant(),
+    ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name,
+        const TQString &description, const TQVariant &value = TQVariant(),
         bool save = true, bool readOnly = false);
     /**Constructs property with @ref ValueFromList type.*/
-    ChildProperty(MultiProperty *parent, const QString &name, ChildPropertyType childType,
-        const QMap &v_valueList, const QString &description,
-        const QVariant &value = QVariant(), bool save = true, bool readOnly = false);
+    ChildProperty(MultiProperty *parent, const TQString &name, ChildPropertyType childType,
+        const TQMap &v_valueList, const TQString &description,
+        const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false);
 
     /**@return the value of the property.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value of the property.*/
-    virtual void setValue(const QVariant &value, bool rememberOldValue = true);
+    virtual void setValue(const TQVariant &value, bool rememberOldValue = true);
     
 private:
     MultiProperty *m_parent;
diff --git a/lib/widgets/propeditor/compat_tools.h b/lib/widgets/propeditor/compat_tools.h
index 1a1a8735..a932b24a 100644
--- a/lib/widgets/propeditor/compat_tools.h
+++ b/lib/widgets/propeditor/compat_tools.h
@@ -1,6 +1,6 @@
 #ifndef COMPAT_TOOLS_H
 #define COMPAT_TOOLS_H
 
-#define i18n QObject::tr
+#define i18n TQObject::tr
 
 #endif
diff --git a/lib/widgets/propeditor/multiproperty.cpp b/lib/widgets/propeditor/multiproperty.cpp
index 17b05797..9c3b04c4 100644
--- a/lib/widgets/propeditor/multiproperty.cpp
+++ b/lib/widgets/propeditor/multiproperty.cpp
@@ -43,50 +43,50 @@ MultiProperty::~MultiProperty()
 {
 }
 
-QString MultiProperty::name() const
+TQString MultiProperty::name() const
 {
     if (list.count() >= 1)
         return list.getFirst()->name();
-    return QString::null;   
+    return TQString::null;   
 }
 
 int MultiProperty::type() const
 {
     if (list.count() >= 1)
         return list.getFirst()->type();
-    return QVariant::Invalid;   
+    return TQVariant::Invalid;   
 }
 
-QVariant MultiProperty::value() const
+TQVariant MultiProperty::value() const
 {
-    QVariant value;
+    TQVariant value;
     if (list.count() >= 1)
         value = list.getFirst()->value();
 
-    QPtrListIterator it(list);
+    TQPtrListIterator it(list);
     Property *property;
     while ((property = it.current()) != 0)
     {
         if (property->value() != value)
-            return QVariant::Invalid;
+            return TQVariant::Invalid;
         ++it;
     }
 
     return value;
 }
 
-QString MultiProperty::description() const
+TQString MultiProperty::description() const
 {
-    QString description;
+    TQString description;
     if (list.count() >= 1)
         description = list.getFirst()->description();
 
-    QPtrListIterator it(list);
+    TQPtrListIterator it(list);
     Property *property;
     while ((property = it.current()) != 0)
     {
         if (property->description() != description)
-            return QString::null;
+            return TQString::null;
         ++it;
     }
 
@@ -99,7 +99,7 @@ bool MultiProperty::readOnly() const
     if (list.count() >= 1)
         v = list.getFirst()->readOnly();
 
-    QPtrListIterator it(list);
+    TQPtrListIterator it(list);
     Property *property;
     while ((property = it.current()) != 0)
     {
@@ -117,7 +117,7 @@ bool MultiProperty::visible() const
     if (list.count() >= 1)
         v = list.getFirst()->readOnly();
 
-    QPtrListIterator it(list);
+    TQPtrListIterator it(list);
     Property *property;
     while ((property = it.current()) != 0)
     {
@@ -129,21 +129,21 @@ bool MultiProperty::visible() const
     return v;
 }
 
-QMap MultiProperty::valueList() const
+TQMap MultiProperty::valueList() const
 {
     if (list.count() >= 1)
         return list.getFirst()->valueList;
-    return QMap();
+    return TQMap();
 }
 
-void MultiProperty::setDescription(const QString &description)
+void MultiProperty::setDescription(const TQString &description)
 {
     Property *property;
     for (property = list.first(); property; property = list.next())
         property->setDescription(description);
 }
 
-/*void MultiProperty::setName(const QString &name)
+/*void MultiProperty::setName(const TQString &name)
 {
 }
 
@@ -151,7 +151,7 @@ void MultiProperty::setType(int type)
 {
 }
 */
-void MultiProperty::setValue(const QVariant &value)
+void MultiProperty::setValue(const TQVariant &value)
 {
     Property *property;
     for (property = list.first(); property; property = list.next())
@@ -165,7 +165,7 @@ void MultiProperty::setValue(const QVariant &value)
     }
 }
 
-void MultiProperty::setValue(const QVariant &value, bool emitChange)
+void MultiProperty::setValue(const TQVariant &value, bool emitChange)
 {
     Property *property;
     for (property = list.first(); property; property = list.next())
@@ -176,7 +176,7 @@ void MultiProperty::setValue(const QVariant &value, bool emitChange)
     }
 }
 
-void MultiProperty::setValueList(const QMap &valueList)
+void MultiProperty::setValueList(const TQMap &valueList)
 {
     Property *property;
     for (property = list.first(); property; property = list.next())
@@ -227,13 +227,13 @@ void MultiProperty::removeProperty( MultiProperty *prop)
         removeProperty(property);
 }
 
-QVariant MultiProperty::findValueDescription() const
+TQVariant MultiProperty::findValueDescription() const
 {
-    QVariant val = value();
+    TQVariant val = value();
     if (type() != Property::ValueFromList)
         return val;
-    QMap vl = valueList();
-    for (QMap::const_iterator it = vl.begin(); it != vl.end(); ++ it)
+    TQMap vl = valueList();
+    for (TQMap::const_iterator it = vl.begin(); it != vl.end(); ++ it)
     {
         if (it.data() == val)
             return it.key();
@@ -241,12 +241,12 @@ QVariant MultiProperty::findValueDescription() const
     return "";
 }
 
-QVariant MultiProperty::findValueDescription(QVariant val) const
+TQVariant MultiProperty::findValueDescription(TQVariant val) const
 {
     if (type() != Property::ValueFromList)
         return val;
-    QMap vl = valueList();
-    for (QMap::const_iterator it = vl.begin(); it != vl.end(); ++ it)
+    TQMap vl = valueList();
+    for (TQMap::const_iterator it = vl.begin(); it != vl.end(); ++ it)
     {
         if (it.data() == val)
             return it.key();
diff --git a/lib/widgets/propeditor/multiproperty.h b/lib/widgets/propeditor/multiproperty.h
index a0d63c64..49410a04 100644
--- a/lib/widgets/propeditor/multiproperty.h
+++ b/lib/widgets/propeditor/multiproperty.h
@@ -19,9 +19,9 @@
 #ifndef MULTIPROPERTY_H
 #define MULTIPROPERTY_H
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "property.h"
 #include "childproperty.h"
@@ -72,36 +72,36 @@ public:
     void removeProperty(MultiProperty *prop);
         
     /**Returns the name of a %property.*/
-    QString name() const;
+    TQString name() const;
     /**Returns the type of a %property.*/
     int type() const;
     /**Returns the value of a %property.*/
-    QVariant value() const;
+    TQVariant value() const;
     /**Returns the description of a %property.*/
-    QString description() const;
+    TQString description() const;
     /**Returns the readonly attribute of a %property.*/
     bool readOnly() const;
     /**Returns the visibility attribute of a %property.*/
     bool visible() const;
     /**The string-to-value correspondence list of the %property.*/
-    QMap valueList() const;
+    TQMap valueList() const;
     
     /**Sets the value of a %property.*/
-    void setValue(const QVariant& value);
+    void setValue(const TQVariant& value);
     /**Sets the value of a %property.
     @param value new value of thus %multiproperty 
     @param emitChange if set to true then %property list which owns this %multiproperty 
     emits propertyValueChanged signal.*/
-    void setValue(const QVariant& value, bool emitChange);
+    void setValue(const TQVariant& value, bool emitChange);
     /**Sets the description of a %property.*/
-    void setDescription(const QString &description);
+    void setDescription(const TQString &description);
     /**Sets the list of possible values of a %property.*/
-    void setValueList(const QMap< QString, QVariant >& valueList);
+    void setValueList(const TQMap< TQString, TQVariant >& valueList);
     
     /**Finds string description for a value.*/
-    QVariant findValueDescription() const;
+    TQVariant findValueDescription() const;
     /**Finds string description for a value.*/
-    QVariant findValueDescription(QVariant val) const;
+    TQVariant findValueDescription(TQVariant val) const;
     
     /**Returns true if the %multiproperty has no properties in the list (i.e. it's invalid).*/
     bool valid() const;
@@ -110,10 +110,10 @@ public:
     void undo();
     
     /**The list of child properties.*/
-    QValueList details;
+    TQValueList details;
 
 private:
-    QPtrList list;
+    TQPtrList list;
 
     PropertyList *m_propertyList;
     
diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp
index 15aacbff..3f406e4d 100644
--- a/lib/widgets/propeditor/pcheckbox.cpp
+++ b/lib/widgets/propeditor/pcheckbox.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 #include "pcheckbox.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #ifndef PURE_QT
 #include 
@@ -31,37 +31,37 @@
 
 namespace PropertyLib{
 
-PCheckBox::PCheckBox(MultiProperty *property, QWidget *parent, const char *name)
+PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
-    m_edit = new QCheckBox(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
+    m_edit = new TQCheckBox(this);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool)));
+    connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
 }
 
-QVariant PCheckBox::value() const
+TQVariant PCheckBox::value() const
 {
-    return QVariant(m_edit->isChecked());
+    return TQVariant(m_edit->isChecked());
 }
 
-void PCheckBox::setValue(const QVariant &value, bool emitChange)
+void PCheckBox::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool)));
+    disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
     m_edit->setChecked(value.toBool());
-    connect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool)));
+    connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
 void PCheckBox::updateProperty(bool val)
 {
-    emit propertyChanged(m_property, QVariant(val));
+    emit propertyChanged(m_property, TQVariant(val));
 }
 
-void PCheckBox::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value)
+void PCheckBox::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
     p->setBrush(cg.background());
     p->setPen(Qt::NoPen);
diff --git a/lib/widgets/propeditor/pcheckbox.h b/lib/widgets/propeditor/pcheckbox.h
index 0ea56498..53cefe57 100644
--- a/lib/widgets/propeditor/pcheckbox.h
+++ b/lib/widgets/propeditor/pcheckbox.h
@@ -32,21 +32,21 @@ namespace PropertyLib{
 class PCheckBox: public PropertyWidget{
     Q_OBJECT
 public:
-    PCheckBox(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PCheckBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true);
+    virtual void setValue(const TQVariant &value, bool emitChange=true);
     /**Function to draw a property viewer when the editor isn't shown.*/
-    virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value);
+    virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value);
 
 private slots:
     void updateProperty(bool val);
     
 private:
-    QCheckBox *m_edit;
+    TQCheckBox *m_edit;
 };
 
 }
diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp
index 84063e8b..9609442f 100644
--- a/lib/widgets/propeditor/pcolorbutton.cpp
+++ b/lib/widgets/propeditor/pcolorbutton.cpp
@@ -19,46 +19,46 @@
  ***************************************************************************/
 #include "pcolorbutton.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #ifndef PURE_QT
 #include 
 #else
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #endif
-#include 
+#include 
 
 namespace PropertyLib {
 
-PColorButton::PColorButton(MultiProperty* property, QWidget* parent, const char* name)
+PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char* name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 #ifndef PURE_QT
     m_edit = new KColorButton(this);
-    connect(m_edit, SIGNAL(changed(const QColor&)), this, SLOT(updateProperty(const QColor&)));
+    connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&)));
 #else
-    m_edit = new QPushButton(this);
-    connect(m_edit, SIGNAL(clicked()), this, SLOT(changeColor()));
+    m_edit = new TQPushButton(this);
+    connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor()));
 #endif
 
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 }
 
-QVariant PColorButton::value() const
+TQVariant PColorButton::value() const
 {
 #ifndef PURE_QT
-    return QVariant(m_edit->color());
+    return TQVariant(m_edit->color());
 #else
-    return QVariant(m_color);
+    return TQVariant(m_color);
 #endif
 }
 
-void PColorButton::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PColorButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
 /*    p->setBrush(value.toColor());
     p->setPen(Qt::NoPen);
@@ -69,22 +69,22 @@ void PColorButton::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r
 
     p->setBrush(value.toColor());
     p->setPen(Qt::SolidLine);
-    QRect r2(r);
-    r2.setTopLeft(r.topLeft() + QPoint(5,5));
-    r2.setBottomRight(r.bottomRight() - QPoint(5,5));
+    TQRect r2(r);
+    r2.setTopLeft(r.topLeft() + TQPoint(5,5));
+    r2.setBottomRight(r.bottomRight() - TQPoint(5,5));
     p->drawRect(r2);
 }
 
-void PColorButton::setValue(const QVariant& value, bool emitChange)
+void PColorButton::setValue(const TQVariant& value, bool emitChange)
 {
 #ifndef PURE_QT
-    disconnect(m_edit, SIGNAL(changed(const QColor&)), this, SLOT(updateProperty(const QColor&)));
+    disconnect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&)));
     m_edit->setColor(value.toColor());
-    connect(m_edit, SIGNAL(changed(const QColor&)), this, SLOT(updateProperty(const QColor&)));
+    connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&)));
 #else
     m_color = value.toColor();
     m_edit->setText(m_color.name());
-    QPixmap px;
+    TQPixmap px;
     px.resize(14,14);
     px.fill(m_color);
     m_edit->setIconSet(px);
@@ -94,7 +94,7 @@ void PColorButton::setValue(const QVariant& value, bool emitChange)
 
 }
 
-void PColorButton::updateProperty(const QColor &// color
+void PColorButton::updateProperty(const TQColor &// color
                                   )
 {
     emit propertyChanged(m_property, value());
@@ -106,7 +106,7 @@ void PColorButton::changeColor()
    m_color = QColorDialog::getColor(m_color,this);
    updateProperty(m_color);
    m_edit->setText(m_color.name());
-   QPixmap px;
+   TQPixmap px;
    px.resize(14,14);
    px.fill(m_color);
    m_edit->setIconSet(px);
diff --git a/lib/widgets/propeditor/pcolorbutton.h b/lib/widgets/propeditor/pcolorbutton.h
index 8c2ec49d..04126a50 100644
--- a/lib/widgets/propeditor/pcolorbutton.h
+++ b/lib/widgets/propeditor/pcolorbutton.h
@@ -26,7 +26,7 @@
 class KColorButton;
 #else
 class QPushButton;
-#include 
+#include 
 #endif
 namespace PropertyLib{
 
@@ -37,14 +37,14 @@ class PColorButton: public PropertyWidget
 {
     Q_OBJECT
 public:
-    PColorButton(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PColorButton(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
     
 protected slots:
-    void updateProperty(const QColor& color);
+    void updateProperty(const TQColor& color);
 
     void changeColor();
 
@@ -52,8 +52,8 @@ private:
 #ifndef PURE_QT
     KColorButton *m_edit;
 #else
-    QPushButton *m_edit;
-    QColor m_color;
+    TQPushButton *m_edit;
+    TQColor m_color;
 #endif
 };
 
diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp
index ecb3e618..eeac7de8 100644
--- a/lib/widgets/propeditor/pcolorcombo.cpp
+++ b/lib/widgets/propeditor/pcolorcombo.cpp
@@ -19,34 +19,34 @@
  ***************************************************************************/
 #include "pcolorcombo.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
 namespace PropertyLib{
 
-PColorCombo::PColorCombo(MultiProperty *property, QWidget *parent, const char *name)
+PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KColorCombo(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
-    connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
 }
 
-QVariant PColorCombo::value() const
+TQVariant PColorCombo::value() const
 {
-    return QVariant(m_edit->color());
+    return TQVariant(m_edit->color());
 }
 
-void PColorCombo::setValue(const QVariant &value, bool emitChange)
+void PColorCombo::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int)));
+    disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
     m_edit->setColor(value.toColor());
-    connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
@@ -56,7 +56,7 @@ void PColorCombo::updateProperty(int /*val*/)
     emit propertyChanged(m_property, value());
 }
 
-void PColorCombo::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value)
+void PColorCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
@@ -64,9 +64,9 @@ void PColorCombo::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r,
     
     p->setBrush(value.toColor());
     p->setPen(Qt::SolidLine);
-    QRect r2(r);
-    r2.setTopLeft(r.topLeft() + QPoint(5,5));
-    r2.setBottomRight(r.bottomRight() - QPoint(5,5));
+    TQRect r2(r);
+    r2.setTopLeft(r.topLeft() + TQPoint(5,5));
+    r2.setBottomRight(r.bottomRight() - TQPoint(5,5));
     p->drawRect(r2);
 }
 
diff --git a/lib/widgets/propeditor/pcolorcombo.h b/lib/widgets/propeditor/pcolorcombo.h
index 203058c0..68f19e58 100644
--- a/lib/widgets/propeditor/pcolorcombo.h
+++ b/lib/widgets/propeditor/pcolorcombo.h
@@ -32,15 +32,15 @@ namespace PropertyLib{
 class PColorCombo: public PropertyWidget{
     Q_OBJECT
 public:
-    PColorCombo(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PColorCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true);
+    virtual void setValue(const TQVariant &value, bool emitChange=true);
     /**Function to draw a property viewer when the editor isn't shown.*/
-    virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value);
+    virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value);
 
 private slots:
     void updateProperty(int val);
diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp
index 36296a25..958ba34d 100644
--- a/lib/widgets/propeditor/pcombobox.cpp
+++ b/lib/widgets/propeditor/pcombobox.cpp
@@ -19,18 +19,18 @@
  ***************************************************************************/
 #include "pcombobox.h"
 
-#include 
-#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
-PComboBox::PComboBox(MultiProperty *property, const QMap &list, QWidget *parent, const char *name)
+PComboBox::PComboBox(MultiProperty *property, const TQMap &list, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name), m_valueList(list)
 {
     init(false);
 }
 
-PComboBox::PComboBox(MultiProperty *property, const QMap &list, bool rw, QWidget *parent, const char *name)
+PComboBox::PComboBox(MultiProperty *property, const TQMap &list, bool rw, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name), m_valueList(list)
 {
     init(rw);
@@ -38,43 +38,43 @@ PComboBox::PComboBox(MultiProperty *property, const QMap &lis
 
 void PComboBox::init(bool rw)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
-    m_edit = new QComboBox(rw, this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
+    m_edit = new TQComboBox(rw, this);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
     fillBox();
     
-    connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
 }
 
 void PComboBox::fillBox()
 {
-    for (QMap::const_iterator it = m_valueList.begin(); it != m_valueList.end(); it++)
+    for (TQMap::const_iterator it = m_valueList.begin(); it != m_valueList.end(); it++)
     {
         m_edit->insertItem(it.key());
     }
 }
 
-QVariant PComboBox::value() const
+TQVariant PComboBox::value() const
 {
-    QMap::const_iterator it = m_valueList.find(m_edit->currentText());
+    TQMap::const_iterator it = m_valueList.find(m_edit->currentText());
     if (it == m_valueList.end())
-        return QVariant("");
-    return QVariant(it.data());
+        return TQVariant("");
+    return TQVariant(it.data());
 }
 
-void PComboBox::setValue(const QVariant &value, bool emitChange)
+void PComboBox::setValue(const TQVariant &value, bool emitChange)
 {
 #if QT_VERSION >= 0x030100
     if (!value.isNull())
 #else
-    if (value.canCast(QVariant::String))
+    if (value.canCast(TQVariant::String))
 #endif
     {
-        disconnect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int)));
+        disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
         m_edit->setCurrentText(findDescription(value));
-        connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int)));
+        connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
         if (emitChange)
             emit propertyChanged(m_property, value);
     }
@@ -85,9 +85,9 @@ void PComboBox::updateProperty(int /*val*/)
     emit propertyChanged(m_property, value());
 }
 
-QString PComboBox::findDescription(const QVariant &value)
+TQString PComboBox::findDescription(const TQVariant &value)
 {
-    for (QMap::const_iterator it = m_valueList.begin(); it != m_valueList.end(); ++ it)
+    for (TQMap::const_iterator it = m_valueList.begin(); it != m_valueList.end(); ++ it)
     {
         if (it.data() == value)
             return it.key();
@@ -95,7 +95,7 @@ QString PComboBox::findDescription(const QVariant &value)
     return "";
 }
 
-void PComboBox::setValueList(const QMap &valueList)
+void PComboBox::setValueList(const TQMap &valueList)
 {
     m_valueList = valueList;
     m_edit->clear();
diff --git a/lib/widgets/propeditor/pcombobox.h b/lib/widgets/propeditor/pcombobox.h
index c74869f3..71deb388 100644
--- a/lib/widgets/propeditor/pcombobox.h
+++ b/lib/widgets/propeditor/pcombobox.h
@@ -20,9 +20,9 @@
 #ifndef PCOMBOBOX_H
 #define PCOMBOBOX_H
 
-#include 
+#include 
 
-#include 
+#include 
 
 #include "propertywidget.h"
 
@@ -37,22 +37,22 @@ class PComboBox: public PropertyWidget{
     Q_OBJECT
 public:
     /**This constructor is used for read-only selection combo. It provides a value from valueList*/
-    PComboBox(MultiProperty *property, const QMap &list, QWidget *parent = 0, const char *name = 0);
+    PComboBox(MultiProperty *property, const TQMap &list, TQWidget *parent = 0, const char *name = 0);
     /**This constructor is used for read-write selection combo. It provides a value from valueList*/
-    PComboBox(MultiProperty *property, const QMap &list, bool rw, QWidget *parent = 0, const char *name = 0);
+    PComboBox(MultiProperty *property, const TQMap &list, bool rw, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true);
+    virtual void setValue(const TQVariant &value, bool emitChange=true);
     /**Sets the list of possible values shown in the editor widget. This method 
     does not emit propertyChanged signal. Reimplemented because combobox is used
     to display possible values from valueList.*/
-    virtual void setValueList(const QMap &valueList);
+    virtual void setValueList(const TQMap &valueList);
 
 protected:
-    QString findDescription(const QVariant &value);
+    TQString findDescription(const TQVariant &value);
 
 protected slots:
     void updateProperty(int val);
@@ -62,9 +62,9 @@ private:
     void init(bool rw = false);
     
     /** map*/
-    QMap m_valueList;
+    TQMap m_valueList;
 
-    QComboBox *m_edit;
+    TQComboBox *m_edit;
 };
 
 }
diff --git a/lib/widgets/propeditor/pcursoredit.cpp b/lib/widgets/propeditor/pcursoredit.cpp
index 7147d317..85aefd5e 100644
--- a/lib/widgets/propeditor/pcursoredit.cpp
+++ b/lib/widgets/propeditor/pcursoredit.cpp
@@ -19,17 +19,17 @@
  ***************************************************************************/
 #include "pcursoredit.h"
 
-#include 
+#include 
 
 namespace PropertyLib{
 
-PCursorEdit::PCursorEdit(MultiProperty* property, const QMap &spValues,
-    QWidget* parent, const char* name)
+PCursorEdit::PCursorEdit(MultiProperty* property, const TQMap &spValues,
+    TQWidget* parent, const char* name)
     :PComboBox(property, spValues, parent, name)
 {
 }
 
-void PCursorEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PCursorEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     PropertyWidget::drawViewer(p, cg, r, findDescription(value));
 }
diff --git a/lib/widgets/propeditor/pcursoredit.h b/lib/widgets/propeditor/pcursoredit.h
index bdd063f4..6149bce7 100644
--- a/lib/widgets/propeditor/pcursoredit.h
+++ b/lib/widgets/propeditor/pcursoredit.h
@@ -25,16 +25,16 @@
 namespace PropertyLib{
 
 /**
-@short %Property editor for QCursor values.
+@short %Property editor for TQCursor values.
 */
 class PCursorEdit: public PComboBox
 {
     Q_OBJECT
 public:
-    PCursorEdit(MultiProperty* property, const QMap &spValues,
-        QWidget* parent = 0, const char* name = 0);
+    PCursorEdit(MultiProperty* property, const TQMap &spValues,
+        TQWidget* parent = 0, const char* name = 0);
 
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);   
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);   
 };
 
 }
diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp
index 5aa5231c..141eef20 100644
--- a/lib/widgets/propeditor/pdateedit.cpp
+++ b/lib/widgets/propeditor/pdateedit.cpp
@@ -19,29 +19,29 @@
  ***************************************************************************/
 #include "pdateedit.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
-PDateEdit::PDateEdit(MultiProperty* property, QWidget* parent, const char* name)
+PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new QDateEdit(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, SIGNAL(valueChanged(const QDate&)), this, SLOT(updateProperty(const QDate&)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&)));
 }
 
-QVariant PDateEdit::value() const
+TQVariant PDateEdit::value() const
 {
-     return QVariant(m_edit->date());
+     return TQVariant(m_edit->date());
 }
 
-void PDateEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
@@ -49,18 +49,18 @@ void PDateEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, c
     p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toDate().toString(Qt::LocalDate));
 }
 
-void PDateEdit::setValue(const QVariant& value, bool emitChange)
+void PDateEdit::setValue(const TQVariant& value, bool emitChange)
 {
-    disconnect(m_edit, SIGNAL(valueChanged(const QDate&)), this, SLOT(updateProperty(const QDate&)));
+    disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&)));
     m_edit->setDate(value.toDate());
-    connect(m_edit, SIGNAL(valueChanged(const QDate&)), this, SLOT(updateProperty(const QDate&)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
-void PDateEdit::updateProperty(const QDate &val)
+void PDateEdit::updateProperty(const TQDate &val)
 {
-    emit propertyChanged(m_property, QVariant(val));
+    emit propertyChanged(m_property, TQVariant(val));
 }
 
 }
diff --git a/lib/widgets/propeditor/pdateedit.h b/lib/widgets/propeditor/pdateedit.h
index dd876557..da458737 100644
--- a/lib/widgets/propeditor/pdateedit.h
+++ b/lib/widgets/propeditor/pdateedit.h
@@ -27,20 +27,20 @@ class QDateEdit;
 namespace PropertyLib{
 
 /**
-@short %Property editor for QDate values.
+@short %Property editor for TQDate values.
 */
 class PDateEdit : public PropertyWidget
 {
 Q_OBJECT
 public:
-    PDateEdit(MultiProperty* property, QWidget* parent=0, const char* name=0);
+    PDateEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
 private slots:
-    void updateProperty(const QDate &val);    
+    void updateProperty(const TQDate &val);    
 
 private:
     QDateEdit *m_edit;
diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp
index 8f561888..5e414c77 100644
--- a/lib/widgets/propeditor/pdatetimeedit.cpp
+++ b/lib/widgets/propeditor/pdatetimeedit.cpp
@@ -19,28 +19,28 @@
  ***************************************************************************/
 #include "pdatetimeedit.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
-PDateTimeEdit::PDateTimeEdit(MultiProperty* property, QWidget* parent, const char* name): PropertyWidget(property, parent, name)
+PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new QDateTimeEdit(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(updateProperty(const QDateTime&)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&)));
 }
 
-QVariant PDateTimeEdit::value() const
+TQVariant PDateTimeEdit::value() const
 {
-     return QVariant(m_edit->dateTime());
+     return TQVariant(m_edit->dateTime());
 }
 
-void PDateTimeEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
@@ -48,18 +48,18 @@ void PDateTimeEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect&
     p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toDateTime().toString(Qt::LocalDate));
 }
 
-void PDateTimeEdit::setValue(const QVariant& value, bool emitChange)
+void PDateTimeEdit::setValue(const TQVariant& value, bool emitChange)
 {
-    disconnect(m_edit, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(updateProperty(const QDateTime&)));
+    disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&)));
     m_edit->setDateTime(value.toDateTime());
-    connect(m_edit, SIGNAL(valueChanged(const QDateTime&)), this, SLOT(updateProperty(const QDateTime&)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
-void PDateTimeEdit::updateProperty(const QDateTime &val)
+void PDateTimeEdit::updateProperty(const TQDateTime &val)
 {
-    emit propertyChanged(m_property, QVariant(val));
+    emit propertyChanged(m_property, TQVariant(val));
 }
 
 }
diff --git a/lib/widgets/propeditor/pdatetimeedit.h b/lib/widgets/propeditor/pdatetimeedit.h
index 39d9acba..40e8b428 100644
--- a/lib/widgets/propeditor/pdatetimeedit.h
+++ b/lib/widgets/propeditor/pdatetimeedit.h
@@ -27,20 +27,20 @@ class QDateTimeEdit;
 namespace PropertyLib{
 
 /**
-@short %Property editor for QDateTime values.
+@short %Property editor for TQDateTime values.
 */
 class PDateTimeEdit : public PropertyWidget
 {
 Q_OBJECT
 public:
-    PDateTimeEdit(MultiProperty* property, QWidget* parent=0, const char* name=0);
+    PDateTimeEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
 private slots:
-    void updateProperty(const QDateTime &val);    
+    void updateProperty(const TQDateTime &val);    
 
 private:
     QDateTimeEdit *m_edit;
diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp
index aa4f72aa..df6b3bcb 100644
--- a/lib/widgets/propeditor/pdoublenuminput.cpp
+++ b/lib/widgets/propeditor/pdoublenuminput.cpp
@@ -27,23 +27,23 @@
 
 #include 
 #include 
-#include 
+#include 
 
 namespace PropertyLib{
 
-PDoubleNumInput::PDoubleNumInput(MultiProperty *property, QWidget *parent, const char *name)
+PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 #ifndef PURE_QT
     m_edit = new KDoubleNumInput(-999999.0, 999999.0, 0.0, 0.01, 2, this);
-    m_edit->setLabel(QString::null);
-    connect(m_edit, SIGNAL(valueChanged(double)), this, SLOT(updateProperty(double)));
+    m_edit->setLabel(TQString::null);
+    connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double)));
 #else
     m_edit = new QFloatInput(-999999, 999999, 0.01, 2, this );
-    connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
 #endif
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 /*    m_edit->setMinValue(-999999999);
     m_edit->setMaxValue(+999999999);
     m_edit->setPrecision(2);*/
@@ -51,21 +51,21 @@ PDoubleNumInput::PDoubleNumInput(MultiProperty *property, QWidget *parent, const
 
 }
 
-QVariant PDoubleNumInput::value() const
+TQVariant PDoubleNumInput::value() const
 {
-    return QVariant(m_edit->value());
+    return TQVariant(m_edit->value());
 }
 
-void PDoubleNumInput::setValue(const QVariant &value, bool emitChange)
+void PDoubleNumInput::setValue(const TQVariant &value, bool emitChange)
 {
 #ifndef PURE_QT
-    disconnect(m_edit, SIGNAL(valueChanged(double)), this, SLOT(updateProperty(double)));
+    disconnect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double)));
     m_edit->setValue(value.toDouble());
-    connect(m_edit, SIGNAL(valueChanged(double)), this, SLOT(updateProperty(double)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double)));
 #else
-    disconnect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int)));
+    disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
     m_edit->setValue(int(value.toDouble()*pow(m_edit->digits(),10)));
-    connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
 #endif
     if (emitChange)
         emit propertyChanged(m_property, value);
@@ -73,15 +73,15 @@ void PDoubleNumInput::setValue(const QVariant &value, bool emitChange)
 
 void PDoubleNumInput::updateProperty(double val)
 {
-    emit propertyChanged(m_property, QVariant(val));
+    emit propertyChanged(m_property, TQVariant(val));
 }
 void PDoubleNumInput::updateProperty(int val)
 {
 #ifdef PURE_QT
-    QString format = QString("%.%1f").arg( m_edit->digits() );
-    QString strVal = QString().sprintf(format.latin1(),
+    TQString format = TQString("%.%1f").arg( m_edit->digits() );
+    TQString strVal = TQString().sprintf(format.latin1(),
                                        (val/(float)pow(m_edit->digits(),10)) );
-    emit propertyChanged(m_property, QVariant(strVal));
+    emit propertyChanged(m_property, TQVariant(strVal));
 #else
     Q_UNUSED(val);
 #endif
diff --git a/lib/widgets/propeditor/pdoublenuminput.h b/lib/widgets/propeditor/pdoublenuminput.h
index a612601a..83849335 100644
--- a/lib/widgets/propeditor/pdoublenuminput.h
+++ b/lib/widgets/propeditor/pdoublenuminput.h
@@ -37,13 +37,13 @@ class PDoubleNumInput: public PropertyWidget
 {
 Q_OBJECT
 public:
-    PDoubleNumInput(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PDoubleNumInput(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true);
+    virtual void setValue(const TQVariant &value, bool emitChange=true);
 
 private slots:
     //because of a bug in moc which doesn't detect conditional slots
diff --git a/lib/widgets/propeditor/pdummywidget.cpp b/lib/widgets/propeditor/pdummywidget.cpp
index b27f7476..65ec35e3 100644
--- a/lib/widgets/propeditor/pdummywidget.cpp
+++ b/lib/widgets/propeditor/pdummywidget.cpp
@@ -19,28 +19,28 @@
  ***************************************************************************/
 #include "pdummywidget.h"
 
-#include 
+#include 
 
 namespace PropertyLib{
 
-PDummyWidget::PDummyWidget(MultiProperty *property, QWidget *parent, const char *name)
+PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
 }
 
-QVariant PDummyWidget::value() const
+TQVariant PDummyWidget::value() const
 {
     return m_value;
 }
 
-void PDummyWidget::setValue(const QVariant &value, bool emitChange)
+void PDummyWidget::setValue(const TQVariant &value, bool emitChange)
 {
     m_value = value;
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
-void PDummyWidget::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &/*value*/)
+void PDummyWidget::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &/*value*/)
 {
     p->setBrush(cg.background());
     p->setPen(Qt::NoPen);
diff --git a/lib/widgets/propeditor/pdummywidget.h b/lib/widgets/propeditor/pdummywidget.h
index 6fcca0a5..7e94428a 100644
--- a/lib/widgets/propeditor/pdummywidget.h
+++ b/lib/widgets/propeditor/pdummywidget.h
@@ -41,18 +41,18 @@ class PDummyWidget: public PropertyWidget
 {
     Q_OBJECT
 public:
-    PDummyWidget(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PDummyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual void setValue(const TQVariant& value, bool emitChange);
     /**Function to draw a property viewer when the editor isn't shown.*/
-    virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value);
+    virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value);
     
 private:
-    QVariant m_value;
+    TQVariant m_value;
 };
 
 }
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index e4fdf7eb..dc976b8f 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 #include "pfontbutton.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -33,47 +33,47 @@
 
 namespace PropertyLib{
 
-PFontButton::PFontButton(MultiProperty* property, QWidget* parent, const char* name)
+PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KFontRequester(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 #ifndef PURE_QT
     m_edit->button()->setText(i18n("..."));
 #endif
     l->addWidget(m_edit);
 
-    connect(m_edit, SIGNAL(fontSelected(const QFont& )), this, SLOT(updateProperty(const QFont& )));
+    connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& )));
 }
 
-QVariant PFontButton::value() const
+TQVariant PFontButton::value() const
 {
-    return QVariant(m_edit->font());
+    return TQVariant(m_edit->font());
 }
 
-void PFontButton::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    QFontInfo fi(value.toFont());
+    TQFontInfo fi(value.toFont());
     p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine,
-        fi.family() + (fi.bold() ? i18n(" Bold") : QString("")) +
-        (fi.italic() ? i18n(" Italic") : QString("")) +
-        " " + QString("%1").arg(fi.pointSize()) );
+        fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) +
+        (fi.italic() ? i18n(" Italic") : TQString("")) +
+        " " + TQString("%1").arg(fi.pointSize()) );
 }
 
-void PFontButton::setValue(const QVariant& value, bool emitChange)
+void PFontButton::setValue(const TQVariant& value, bool emitChange)
 {
-    disconnect(m_edit, SIGNAL(fontSelected(const QFont&)), this, SLOT(updateProperty(const QFont&)));
+    disconnect(m_edit, TQT_SIGNAL(fontSelected(const TQFont&)), this, TQT_SLOT(updateProperty(const TQFont&)));
     m_edit->setFont(value.toFont());
-    connect(m_edit, SIGNAL(fontSelected(const QFont& )), this, SLOT(updateProperty(const QFont& )));
+    connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& )));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
-void PFontButton::updateProperty(const QFont &// font
+void PFontButton::updateProperty(const TQFont &// font
                                  )
 {
     emit propertyChanged(m_property, value());
diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h
index 54ada141..6538f5ae 100644
--- a/lib/widgets/propeditor/pfontbutton.h
+++ b/lib/widgets/propeditor/pfontbutton.h
@@ -33,14 +33,14 @@ class PFontButton : public PropertyWidget
 {
 Q_OBJECT
 public:
-    PFontButton(MultiProperty* property, QWidget* parent = 0, const char* name = 0);
+    PFontButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
 protected slots:
-    void updateProperty(const QFont& font);
+    void updateProperty(const TQFont& font);
 
 private:
     KFontRequester *m_edit;
diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp
index 368f18d9..8b0ee7a7 100644
--- a/lib/widgets/propeditor/pfontcombo.cpp
+++ b/lib/widgets/propeditor/pfontcombo.cpp
@@ -22,61 +22,61 @@
 #ifndef PURE_QT
 #include 
 #else
-#include 
+#include 
 #endif
 
-#include 
+#include 
 
 #ifdef PURE_QT
-#include 
+#include 
 #endif
 
 namespace PropertyLib{
 
-PFontCombo::PFontCombo(MultiProperty *property, QWidget *parent, const char *name)
+PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KFontCombo(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::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
-    activated(int) and textChanged(const QString &) are not emitted*/
+    activated(int) and textChanged(const TQString &) are not emitted*/
 #ifdef PURE_QT
-    QFontDatabase fonts;
+    TQFontDatabase fonts;
     m_edit->insertStringList(fonts.families());
-    connect(m_edit, SIGNAL(activated(const QString &)), this, SLOT(updateProperty(const QString&)));
+    connect(m_edit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateProperty(const TQString&)));
 #else
-    connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
 #endif
 }
 
-QVariant PFontCombo::value() const
+TQVariant PFontCombo::value() const
 {
 #ifndef PURE_QT
-    return QVariant(m_edit->currentFont());
+    return TQVariant(m_edit->currentFont());
 #else
-    return QVariant(m_edit->currentText());
+    return TQVariant(m_edit->currentText());
 #endif
 }
 
-void PFontCombo::setValue(const QVariant &value, bool emitChange)
+void PFontCombo::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
 #ifndef PURE_QT
     m_edit->setCurrentFont(value.toString());
 #else
     m_edit->setCurrentText(value.toString());
 #endif
-    connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
-void PFontCombo::updateProperty(const QString &val)
+void PFontCombo::updateProperty(const TQString &val)
 {
-    emit propertyChanged(m_property, QVariant(val));
+    emit propertyChanged(m_property, TQVariant(val));
 }
 
 }
diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h
index c2aa1948..a703c99d 100644
--- a/lib/widgets/propeditor/pfontcombo.h
+++ b/lib/widgets/propeditor/pfontcombo.h
@@ -36,16 +36,16 @@ namespace PropertyLib{
 class PFontCombo: public PropertyWidget{
     Q_OBJECT
 public:
-    PFontCombo(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PFontCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true);
+    virtual void setValue(const TQVariant &value, bool emitChange=true);
 
 private slots:
-    void updateProperty(const QString &val);
+    void updateProperty(const TQString &val);
     
 private:
     KFontCombo *m_edit;
diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp
index ebd8d848..f5e1ecb0 100644
--- a/lib/widgets/propeditor/plineedit.cpp
+++ b/lib/widgets/propeditor/plineedit.cpp
@@ -20,38 +20,38 @@
 #include "plineedit.h"
 
 #include 
-#include 
+#include 
 
 namespace PropertyLib{
 
-PLineEdit::PLineEdit(MultiProperty *property, QWidget *parent, const char *name)
+PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
 }
 
-QVariant PLineEdit::value() const
+TQVariant PLineEdit::value() const
 {
-    return QVariant(m_edit->text());
+    return TQVariant(m_edit->text());
 }
 
-void PLineEdit::setValue(const QVariant &value, bool emitChange)
+void PLineEdit::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
     m_edit->setText(value.toString());
-    connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
-void PLineEdit::updateProperty(const QString& val)
+void PLineEdit::updateProperty(const TQString& val)
 {
-    emit propertyChanged(m_property, QVariant(val));
+    emit propertyChanged(m_property, TQVariant(val));
 }
 
 }
diff --git a/lib/widgets/propeditor/plineedit.h b/lib/widgets/propeditor/plineedit.h
index f28ba191..6feb2a7b 100644
--- a/lib/widgets/propeditor/plineedit.h
+++ b/lib/widgets/propeditor/plineedit.h
@@ -32,16 +32,16 @@ namespace PropertyLib{
 class PLineEdit: public PropertyWidget{
     Q_OBJECT
 public:
-    PLineEdit(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PLineEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true);
+    virtual void setValue(const TQVariant &value, bool emitChange=true);
     
 private slots:
-    void updateProperty(const QString &val);
+    void updateProperty(const TQString &val);
     
 private:
     KLineEdit *m_edit;
diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp
index 50f55e5d..adee930e 100644
--- a/lib/widgets/propeditor/plinestyleedit.cpp
+++ b/lib/widgets/propeditor/plinestyleedit.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 #include "plinestyleedit.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 namespace PropertyLib {
 
@@ -127,75 +127,75 @@ namespace PropertyLib {
     "................................................"};
 
 
-PLineStyleEdit::PLineStyleEdit(MultiProperty* property, QWidget* parent, const char* name): PropertyWidget(property, parent, name)
+PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
-    m_edit = new QComboBox(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
+    m_edit = new TQComboBox(this);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
-    m_edit->insertItem(QPixmap(nopen));
-    m_edit->insertItem(QPixmap(solid));
-    m_edit->insertItem(QPixmap(dash));
-    m_edit->insertItem(QPixmap(dashdot));
-    m_edit->insertItem(QPixmap(dashdotdot));    
+    m_edit->insertItem(TQPixmap(nopen));
+    m_edit->insertItem(TQPixmap(solid));
+    m_edit->insertItem(TQPixmap(dash));
+    m_edit->insertItem(TQPixmap(dashdot));
+    m_edit->insertItem(TQPixmap(dashdotdot));    
 
-    connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
 }
 
-QVariant PLineStyleEdit::value() const
+TQVariant PLineStyleEdit::value() const
 {
     return m_edit->currentItem();
 }
 
-void PLineStyleEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PLineStyleEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
     
-    if (!value.canCast(QVariant::Int))
+    if (!value.canCast(TQVariant::Int))
     if ((value.toInt() > 5) || (value.toInt() < 0))
         return;
     
     switch (value.toInt()) {
     case 0:
-        p->drawPixmap(r, QPixmap(nopen));
+        p->drawPixmap(r, TQPixmap(nopen));
         break;
     case 1:
-        p->drawPixmap(r, QPixmap(solid));
+        p->drawPixmap(r, TQPixmap(solid));
         break;
     case 2:
-        p->drawPixmap(r, QPixmap(dash));
+        p->drawPixmap(r, TQPixmap(dash));
         break;
     case 3:
-        p->drawPixmap(r, QPixmap(dashdot));
+        p->drawPixmap(r, TQPixmap(dashdot));
         break;
     case 4:
-        p->drawPixmap(r, QPixmap(dashdot));
+        p->drawPixmap(r, TQPixmap(dashdot));
         break;
     case 5:
-        p->drawPixmap(r, QPixmap(dashdotdot));
+        p->drawPixmap(r, TQPixmap(dashdotdot));
         break;
     }
 }
 
-void PLineStyleEdit::setValue(const QVariant& value, bool emitChange)
+void PLineStyleEdit::setValue(const TQVariant& value, bool emitChange)
 {
-    if (!value.canCast(QVariant::Int))
+    if (!value.canCast(TQVariant::Int))
         return;
     if ((value.toInt() > 5) || (value.toInt() < 0))
         return;
-    disconnect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int)));
+    disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
     m_edit->setCurrentItem(value.toInt());
-    connect(m_edit, SIGNAL(activated(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
 void PLineStyleEdit::updateProperty(int val)
 {
-    emit propertyChanged(m_property, QVariant(val));
+    emit propertyChanged(m_property, TQVariant(val));
 }
 
 }
diff --git a/lib/widgets/propeditor/plinestyleedit.h b/lib/widgets/propeditor/plinestyleedit.h
index 16441273..00b546c6 100644
--- a/lib/widgets/propeditor/plinestyleedit.h
+++ b/lib/widgets/propeditor/plinestyleedit.h
@@ -32,17 +32,17 @@ namespace PropertyLib {
 class PLineStyleEdit : public PropertyWidget {
     Q_OBJECT
 public:
-    PLineStyleEdit(MultiProperty* property, QWidget* parent = 0, const char* name = 0);
+    PLineStyleEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
 private slots:
     void updateProperty(int val);
     
 private:
-    QComboBox *m_edit;
+    TQComboBox *m_edit;
 };
 
 }
diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp
index db6a69d3..a4c18791 100644
--- a/lib/widgets/propeditor/ppixmapedit.cpp
+++ b/lib/widgets/propeditor/ppixmapedit.cpp
@@ -21,10 +21,10 @@
  ***************************************************************************/
 #include "ppixmapedit.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #ifndef PURE_QT
 #include 
@@ -35,41 +35,41 @@
 #ifndef PURE_QT
 #include 
 #else
-#include 
+#include 
 #endif
-#include 
+#include 
 
 namespace PropertyLib{
 
-PPixmapEdit::PPixmapEdit(MultiProperty* property, QWidget* parent, const char* name)
+PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
-    m_edit = new QLabel(this);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
+    m_edit = new TQLabel(this);
     m_edit->setAlignment(Qt::AlignTop);
     m_edit->resize(width(), height()-1);
     m_edit->setBackgroundMode(Qt::PaletteBase);
     m_edit->installEventFilter(this);
     
-    m_button = new QPushButton(i18n("..."), this);
+    m_button = new TQPushButton(i18n("..."), this);
     m_button->resize(height(), height()-8);
     m_button->move(width() - m_button->width() -1, 0);
-    m_button->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+    m_button->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
     l->addWidget(m_edit);
     l->addWidget(m_button);
-    m_popup = new QLabel(0, 0, Qt::WStyle_NoBorder|Qt::WX11BypassWM|WStyle_StaysOnTop);
+    m_popup = new TQLabel(0, 0, Qt::WStyle_NoBorder|Qt::WX11BypassWM|WStyle_StaysOnTop);
     m_popup->hide();
     
 
-    connect(m_button, SIGNAL(clicked()), this, SLOT(updateProperty()));
+    connect(m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateProperty()));
 }
 
-QVariant PPixmapEdit::value() const
+TQVariant PPixmapEdit::value() const
 {
-    return QVariant(*(m_edit->pixmap()));
+    return TQVariant(*(m_edit->pixmap()));
 }
 
-void PPixmapEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PPixmapEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
@@ -77,7 +77,7 @@ void PPixmapEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r,
     p->drawPixmap(r.topLeft().x(), r.topLeft().y(), value.toPixmap());    
 }
 
-void PPixmapEdit::setValue(const QVariant& value, bool emitChange)
+void PPixmapEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_edit->setPixmap(value.toPixmap());
     if (emitChange)
@@ -87,51 +87,51 @@ void PPixmapEdit::setValue(const QVariant& value, bool emitChange)
 void PPixmapEdit::updateProperty()
 {
 #ifndef PURE_QT
-    KURL url = KFileDialog::getImageOpenURL(QString::null, this);
+    KURL url = KFileDialog::getImageOpenURL(TQString::null, this);
     if (!url.isEmpty())
     {
-        m_edit->setPixmap(QPixmap(url.path()));
+        m_edit->setPixmap(TQPixmap(url.path()));
         emit propertyChanged(m_property, value());
     }
 #else
-    QString url = QFileDialog::getOpenFileName();
+    TQString url = TQFileDialog::getOpenFileName();
     if (!url.isEmpty())
     {
-        m_edit->setPixmap(QPixmap(url));
+        m_edit->setPixmap(TQPixmap(url));
         emit propertyChanged(m_property, value());
     }
 #endif
 }
 
-void PPixmapEdit::resizeEvent(QResizeEvent *ev)
+void PPixmapEdit::resizeEvent(TQResizeEvent *ev)
 {
     m_edit->resize(ev->size().width(), ev->size().height()-1);
     m_button->move(ev->size().width() - m_button->width(), 0);
     m_edit->setMaximumHeight(m_button->height());
 }
 
-bool PPixmapEdit::eventFilter(QObject *o, QEvent *ev)
+bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev)
 {
     if(o == m_edit)
     {
-        if(ev->type() == QEvent::MouseButtonPress)
+        if(ev->type() == TQEvent::MouseButtonPress)
         {
             if(m_edit->pixmap()->size().height() < height()-2
                     && m_edit->pixmap()->size().width() < width()-20)
                     return false;
             m_popup->setPixmap(*(m_edit->pixmap()));
             m_popup->resize(m_edit->pixmap()->size());
-            m_popup->move(QCursor::pos());
+            m_popup->move(TQCursor::pos());
             m_popup->show();
         }
-        if(ev->type() == QEvent::MouseButtonRelease)
+        if(ev->type() == TQEvent::MouseButtonRelease)
         {
             if(m_popup->isVisible())
                     m_popup->hide();
         }
-        if(ev->type() == QEvent::KeyPress)
+        if(ev->type() == TQEvent::KeyPress)
         {
-            QKeyEvent* e = static_cast(ev);
+            TQKeyEvent* e = static_cast(ev);
             if((e->key() == Key_Enter) || (e->key()== Key_Space) || (e->key() == Key_Return))
             {
                     m_button->animateClick();
diff --git a/lib/widgets/propeditor/ppixmapedit.h b/lib/widgets/propeditor/ppixmapedit.h
index bf7b1bfc..aacc0be8 100644
--- a/lib/widgets/propeditor/ppixmapedit.h
+++ b/lib/widgets/propeditor/ppixmapedit.h
@@ -34,22 +34,22 @@ class PPixmapEdit : public PropertyWidget
 {
     Q_OBJECT
 public:
-    PPixmapEdit(MultiProperty* property, QWidget* parent = 0, const char* name = 0);
+    PPixmapEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
-    virtual void resizeEvent(QResizeEvent *ev);
-    virtual bool eventFilter(QObject *o, QEvent *ev);
+    virtual void resizeEvent(TQResizeEvent *ev);
+    virtual bool eventFilter(TQObject *o, TQEvent *ev);
     
 protected slots:
     void updateProperty();
 
 private:
-    QLabel *m_edit;
-    QLabel *m_popup;
-    QPushButton *m_button;
+    TQLabel *m_edit;
+    TQLabel *m_popup;
+    TQPushButton *m_button;
 };
 
 }
diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp
index a76f881a..eb1a382e 100644
--- a/lib/widgets/propeditor/ppointedit.cpp
+++ b/lib/widgets/propeditor/ppointedit.cpp
@@ -20,38 +20,38 @@
 #include "ppointedit.h"
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
-PPointEdit::PPointEdit(MultiProperty* property, QWidget* parent, const char* name): PropertyWidget(property, parent, name)
+PPointEdit::PPointEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     m_edit->setReadOnly(true);
 }
 
-QVariant PPointEdit::value() const
+TQVariant PPointEdit::value() const
 {
     return m_value;
 }
 
-void PPointEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PPointEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
+    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
 }
 
-void PPointEdit::setValue(const QVariant& value, bool emitChange)
+void PPointEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(QString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
+    m_edit->setText(TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/ppointedit.h b/lib/widgets/propeditor/ppointedit.h
index 754e1c79..e78f9928 100644
--- a/lib/widgets/propeditor/ppointedit.h
+++ b/lib/widgets/propeditor/ppointedit.h
@@ -27,21 +27,21 @@ class KLineEdit;
 namespace PropertyLib{
 
 /**
-@short %Property editor for QPoint values.
+@short %Property editor for TQPoint values.
 */
 class PPointEdit : public PropertyWidget
 {
 Q_OBJECT
 public:
-    PPointEdit(MultiProperty* property, QWidget* parent=0, const char* name=0);
+    PPointEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
 private:
     KLineEdit *m_edit;
-    QVariant m_value;
+    TQVariant m_value;
 
 };
 
diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp
index 4fd57fc2..6b7de9ce 100644
--- a/lib/widgets/propeditor/prectedit.cpp
+++ b/lib/widgets/propeditor/prectedit.cpp
@@ -20,38 +20,38 @@
 #include "prectedit.h"
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
-PRectEdit::PRectEdit(MultiProperty* property, QWidget* parent, const char* name): PropertyWidget(property, parent, name)
+PRectEdit::PRectEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     m_edit->setReadOnly(true);
 }
 
-QVariant PRectEdit::value() const
+TQVariant PRectEdit::value() const
 {
     return m_value;
 }
 
-void PRectEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PRectEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
+    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
 }
 
-void PRectEdit::setValue(const QVariant& value, bool emitChange)
+void PRectEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(QString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
+    m_edit->setText(TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/prectedit.h b/lib/widgets/propeditor/prectedit.h
index 3f8995b1..116ee668 100644
--- a/lib/widgets/propeditor/prectedit.h
+++ b/lib/widgets/propeditor/prectedit.h
@@ -27,21 +27,21 @@ class KLineEdit;
 namespace PropertyLib{
 
 /**
-@short %Property editor for QRect values.
+@short %Property editor for TQRect values.
 */
 class PRectEdit : public PropertyWidget
 {
     Q_OBJECT
 public:
-    PRectEdit(MultiProperty* property, QWidget* parent=0, const char* name=0);
+    PRectEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
 private:
     KLineEdit *m_edit;
-    QVariant m_value;
+    TQVariant m_value;
 
 };
 
diff --git a/lib/widgets/propeditor/property.cpp b/lib/widgets/propeditor/property.cpp
index 621a2cc9..d219b8c3 100644
--- a/lib/widgets/propeditor/property.cpp
+++ b/lib/widgets/propeditor/property.cpp
@@ -18,19 +18,19 @@
  ***************************************************************************/
 #include "property.h"
 
-#include 
+#include 
 
 namespace PropertyLib{
 
-Property::Property(int type, const QString &name, const QString &description,
-    const QVariant &value, bool save, bool readOnly):
+Property::Property(int type, const TQString &name, const TQString &description,
+    const TQVariant &value, bool save, bool readOnly):
     m_type(type), m_name(name), m_description(description), m_value(value), m_save(save),
     m_readOnly(readOnly), m_visible(true)
 {
 }
 
-Property::Property(const QString &name, const QMap &v_valueList,
-    const QString &description, const QVariant &value, bool save, bool readOnly):
+Property::Property(const TQString &name, const TQMap &v_valueList,
+    const TQString &description, const TQVariant &value, bool save, bool readOnly):
     valueList(v_valueList), m_type(ValueFromList), m_name(name),
     m_description(description), m_value(value), m_save(save), m_readOnly(readOnly),
     m_visible(true)
@@ -54,12 +54,12 @@ bool Property::operator<(const Property &prop) const
         return false;
 }
 
-QString Property::name() const
+TQString Property::name() const
 {
     return m_name;
 }
 
-void Property::setName(const QString &name)
+void Property::setName(const TQString &name)
 {
     m_name = name;
 }
@@ -74,12 +74,12 @@ void Property::setType(int type)
     m_type = type;
 }
 
-QVariant Property::value() const
+TQVariant Property::value() const
 {
     return m_value;
 }
 
-void Property::setValue(const QVariant &value, bool rememberOldValue)
+void Property::setValue(const TQVariant &value, bool rememberOldValue)
 {
     if (rememberOldValue)
         m_oldValue = m_value;
@@ -88,17 +88,17 @@ void Property::setValue(const QVariant &value, bool rememberOldValue)
     m_value = value;
 }
 
-QString Property::description() const
+TQString Property::description() const
 {
     return m_description;
 }
 
-void Property::setDescription(const QString &description)
+void Property::setDescription(const TQString &description)
 {
     m_description = description;
 }
 
-void Property::setValueList(const QMap &v_valueList)
+void Property::setValueList(const TQMap &v_valueList)
 {
     valueList = v_valueList;
 }
@@ -118,7 +118,7 @@ void Property::setVisible( const bool visible )
     m_visible = visible;
 }
 
-QVariant Property::oldValue() const
+TQVariant Property::oldValue() const
 {
     if (m_oldValue.isNull())
         return m_value;
diff --git a/lib/widgets/propeditor/property.h b/lib/widgets/propeditor/property.h
index 06f39c66..74fcb890 100644
--- a/lib/widgets/propeditor/property.h
+++ b/lib/widgets/propeditor/property.h
@@ -19,9 +19,9 @@
 #ifndef PROPERTY_H
 #define PROPERTY_H
 
-#include 
+#include 
 
-#include 
+#include 
 
 class QWidget;
 class QString;
@@ -36,14 +36,14 @@ namespace PropertyLib{
 /**
 @short Property.
 
-It includes support for QStringList properties, an i18n'ed label and stores an old value to allow undo.
+It includes support for TQStringList properties, an i18n'ed label and stores an old value to allow undo.
 
 Contains name, type and value.
 
-Type can be one of predefined types (including standard @ref QVariant types) by @ref PropertyLib::Property::PropertyType 
+Type can be one of predefined types (including standard @ref TQVariant types) by @ref PropertyLib::Property::PropertyType 
 enum or custom user type. User defined types should have values more than 3000.
 
-Value is a @ref QVariant.
+Value is a @ref TQVariant.
 
 Property can optionally have a list of possible values.
 In that case use @ref ValueFromList type and valueList member.
@@ -64,43 +64,43 @@ public:
     /** PropertyType.
         Integers that represent the type of the property. */
     enum PropertyType {
-        //standard supported QVariant types
-        Invalid = QVariant::Invalid        /***/,
-        List = QVariant::List              /***/,       
-        String = QVariant::String          /***/,
+        List = TQVariant::List              /***/,       
+        String = TQVariant::String          /** &v_valueList,
-        const QString &description, const QVariant &value = QVariant(), bool save = true, bool readOnly = false);
+    Property(const TQString &name, const TQMap &v_valueList,
+        const TQString &description, const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false);
     virtual ~Property();
 
     virtual bool operator<(const Property &prop) const;
 
     /**@return the name of the property.*/
-    virtual QString name() const;
+    virtual TQString name() const;
     /**Sets the name of the property.*/
-    virtual void setName(const QString &name);
+    virtual void setName(const TQString &name);
     /**@return the type of the property.*/
     virtual int type() const;
     /**Sets the type of the property.*/
     virtual void setType(int type);
     /**@return the value of the property.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value of the property.*/
-    virtual void setValue(const QVariant &value, bool rememberOldValue = true);
+    virtual void setValue(const TQVariant &value, bool rememberOldValue = true);
     /**@return the description of the property.*/
-    virtual QString description() const;
+    virtual TQString description() const;
     /**Sets the description of the property.*/
-    virtual void setDescription(const QString &description);
+    virtual void setDescription(const TQString &description);
     /**Sets the string-to-value correspondence list of the property.
     This is used to create comboboxes-like property editors.*/
-    virtual void setValueList(const QMap &list);
+    virtual void setValueList(const TQMap &list);
     /**The string-to-value correspondence list of the property.*/
-    QMap valueList;
+    TQMap valueList;
 
     /**Tells if the property can be saved to a stream, xml, etc.
     There is a possibility to use "GUI" properties that aren't
@@ -160,17 +160,17 @@ public:
     virtual void setVisible(const bool visible);
     
     /**Gets the previous property value.*/
-    virtual QVariant oldValue() const;
+    virtual TQVariant oldValue() const;
     
 private:
 //    Property(Property &property) {};
 //    void operator=(Property &property) {};
 
     int m_type;
-    QString m_name;
-    QString m_description;
-    QVariant m_value;
-    QVariant m_oldValue;
+    TQString m_name;
+    TQString m_description;
+    TQVariant m_value;
+    TQVariant m_oldValue;
     bool m_save;
     bool m_readOnly;
     bool m_visible;
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index 10f21ac1..c9e6e85d 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -27,12 +27,12 @@
 #include "compat_tools.h"
 #endif
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "property.h"
 #include "multiproperty.h"
@@ -59,7 +59,7 @@ public:
         return m_property->type();
     }
 
-    QString name() const
+    TQString name() const
     {
         return m_property->name();
     }
@@ -69,11 +69,11 @@ public:
         return m_property;
     }
 
-    virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align)
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align)
     {
         if ((column == 0) && m_changed)
         {
-            QFont font;
+            TQFont font;
             font.setBold(true);
             p->setFont(font);
             p->setBrush(cg.highlight());
@@ -81,18 +81,18 @@ public:
         }
         if (column == 1)
         {
-            QRect r(0, 0, m_editor->header()->sectionSize(1), height());
+            TQRect r(0, 0, m_editor->header()->sectionSize(1), height());
             //FIXME: this is ugly, but how else can we deal with ValueFromList properties?
-            QVariant valueToDraw;
+            TQVariant valueToDraw;
             if (m_property->type() == Property::ValueFromList)
                 valueToDraw = m_property->findValueDescription();
             else
                 valueToDraw = m_property->value();
-            QColorGroup icg(cg);
+            TQColorGroup icg(cg);
 #ifndef PURE_QT
-            icg.setColor(QColorGroup::Background, backgroundColor());
+            icg.setColor(TQColorGroup::Background, backgroundColor());
 #else
-            icg.setColor(QColorGroup::Background, white);
+            icg.setColor(TQColorGroup::Background, white);
 #endif
             m_editor->machine(m_property)->propertyEditor->drawViewer(p, icg, r, valueToDraw);
             return;
@@ -120,22 +120,22 @@ private:
 
 class PropertyGroupItem: public KListViewItem{
 public:
-    PropertyGroupItem(KListView *parent, const QString &name)
+    PropertyGroupItem(KListView *parent, const TQString &name)
         :KListViewItem(parent, name)
     {
         init();
     }
-    PropertyGroupItem(KListViewItem *parent, const QString &name)
+    PropertyGroupItem(KListViewItem *parent, const TQString &name)
         :KListViewItem(parent, name)
     {
         init();
     }
 
-    virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align)
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align)
     {
         if (column == 0)
         {
-            QFont font;
+            TQFont font;
             font.setBold(true);
             p->setFont(font);
             p->setBrush(cg.highlight());
@@ -164,7 +164,7 @@ public:
         setSelectable(false);
     }
 };
-PropertyEditor::PropertyEditor(QWidget *parent, const char *name)
+PropertyEditor::PropertyEditor(TQWidget *parent, const char *name)
     :KListView(parent, name)
 {
     setSorting(-1);
@@ -172,15 +172,15 @@ PropertyEditor::PropertyEditor(QWidget *parent, const char *name)
     addColumn(i18n("Name"));
     addColumn(i18n("Value"));
     setAllColumnsShowFocus(true);
-    setColumnWidthMode(0, QListView::Maximum);
-    setResizeMode(QListView::LastColumn);
+    setColumnWidthMode(0, TQListView::Maximum);
+    setResizeMode(TQListView::LastColumn);
 
     header()->setClickEnabled(false);
 
-    connect(header(), SIGNAL(sizeChange(int, int, int)),
-        this, SLOT(updateEditorSize()));
-    connect(this, SIGNAL(currentChanged(QListViewItem*)),
-        this, SLOT(slotClicked(QListViewItem*)));
+    connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
+        this, TQT_SLOT(updateEditorSize()));
+    connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
+        this, TQT_SLOT(slotClicked(TQListViewItem*)));
 
     m_currentEditItem = 0;
     m_doubleClickForEdit = true;
@@ -188,19 +188,19 @@ PropertyEditor::PropertyEditor(QWidget *parent, const char *name)
     m_currentEditWidget = 0;
     m_list = 0;
 
-    m_currentEditArea = new QWidget(viewport());
+    m_currentEditArea = new TQWidget(viewport());
     m_currentEditArea->hide();
-    m_undoButton = new QPushButton(m_currentEditArea);
+    m_undoButton = new TQPushButton(m_currentEditArea);
 #ifndef PURE_QT
     m_undoButton->setPixmap(SmallIcon("undo"));
 #else
-    m_undoButton->setPixmap( QPixmap("undo.xpm") );
+    m_undoButton->setPixmap( TQPixmap("undo.xpm") );
 #endif
-    m_undoButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding);
+    m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
     m_undoButton->resize(m_undoButton->height(), m_undoButton->height());
     m_undoButton->hide();
-    connect(m_undoButton, SIGNAL(clicked()), this, SLOT(undo()));
-    m_currentEditLayout = new QGridLayout(m_currentEditArea, 1, 2, 0, 0);
+    connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo()));
+    m_currentEditLayout = new TQGridLayout(m_currentEditArea, 1, 2, 0, 0);
 //    m_currentEditLayout->addWidget(m_undoButton, 0, 1);
 }
 
@@ -214,17 +214,17 @@ void PropertyEditor::populateProperties(PropertyList *list)
     if (list == 0)
         return;
     m_list = list;
-    connect(m_list, SIGNAL(propertyValueChanged(Property*)), this, SLOT(propertyValueChanged(Property*)));
-    const QValueList > >& groups = m_list->propertiesOfGroup();
-    for (QValueList > >::const_iterator it = groups.begin();
+    connect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*)));
+    const TQValueList > >& groups = m_list->propertiesOfGroup();
+    for (TQValueList > >::const_iterator it = groups.begin();
         it != groups.end(); ++it)
     {
 //        qWarning("PropertyEditor::populateProperties:    adding group %s", (*it).first.ascii());
         PropertyGroupItem *group = 0;
         if ( (!(*it).first.isEmpty()) && ((*it).second.count() > 0) )
             group = new PropertyGroupItem(this, (*it).first);
-        const QValueList &properties = (*it).second;
-        for (QValueList::const_iterator it2 = properties.begin(); it2 != properties.end(); ++it2)
+        const TQValueList &properties = (*it).second;
+        for (TQValueList::const_iterator it2 = properties.begin(); it2 != properties.end(); ++it2)
         {
 //            qWarning("PropertyEditor::populateProperties:    adding property %s", (*it2).ascii());
             if (group)
@@ -241,7 +241,7 @@ void PropertyEditor::populateProperties(PropertyList *list)
     }
 }
 
-void PropertyEditor::addProperty(PropertyGroupItem *group, const QString &name)
+void PropertyEditor::addProperty(PropertyGroupItem *group, const TQString &name)
 {
     if ((*m_list)[name] == 0)
         return;
@@ -250,7 +250,7 @@ void PropertyEditor::addProperty(PropertyGroupItem *group, const QString &name)
     addChildProperties(pitem);
 }
 
-void PropertyEditor::addProperty(const QString &name)
+void PropertyEditor::addProperty(const TQString &name)
 {
     if ((*m_list)[name] == 0)
         return;
@@ -273,7 +273,7 @@ void PropertyEditor::addChildProperties(PropertyItem *parent)
 //     qWarning("seeking children: count: %d", prop->details.count());
 
     parent->setOpen(true);
-    for (QValueList::iterator it = prop->details.begin(); it != prop->details.end(); ++it)
+    for (TQValueList::iterator it = prop->details.begin(); it != prop->details.end(); ++it)
     {
 //         qWarning("found child %s", (*it).name().ascii());
         new PropertyItem(this, parent, new MultiProperty(&m_detailedList, &(*it)));
@@ -288,7 +288,7 @@ void PropertyEditor::clearProperties()
 
     hideEditor();
 
-    disconnect(m_list, SIGNAL(propertyValueChanged(Property*)), this, SLOT(propertyValueChanged(Property*)));
+    disconnect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*)));
     clear();
     delete m_list;
     m_list = 0;
@@ -302,7 +302,7 @@ void PropertyEditor::propertyValueChanged(Property *property)
     else
     {
 //        repaint all items
-        QListViewItemIterator it(this);
+        TQListViewItemIterator it(this);
         while (it.current())
         {
             repaintItem(it.current());
@@ -311,7 +311,7 @@ void PropertyEditor::propertyValueChanged(Property *property)
     }
 }
 
-void PropertyEditor::propertyChanged(MultiProperty *property, const QVariant &value)
+void PropertyEditor::propertyChanged(MultiProperty *property, const TQVariant &value)
 {
     if (!property)
         return;
@@ -360,7 +360,7 @@ void PropertyEditor::showEditor(PropertyItem *item)
 
 void PropertyEditor::placeEditor(PropertyItem *item)
 {
-    QRect r = itemRect(item);
+    TQRect r = itemRect(item);
     if (!r.size().isValid())
     {
         ensureItemVisible(item);
@@ -374,7 +374,7 @@ void PropertyEditor::placeEditor(PropertyItem *item)
     if (visibleWidth() < r.right())
         r.setRight(visibleWidth());
 
-    r = QRect(viewportToContents(r.topLeft()), r.size());
+    r = TQRect(viewportToContents(r.topLeft()), r.size());
 
     if (item->pixmap(1))
     {
@@ -417,7 +417,7 @@ void PropertyEditor::updateEditorSize()
         placeEditor(m_currentEditItem);
 }
 
-void PropertyEditor::slotClicked(QListViewItem *item)
+void PropertyEditor::slotClicked(TQListViewItem *item)
 {
     if (item == 0)
     {
@@ -440,13 +440,13 @@ void PropertyEditor::slotClicked(QListViewItem *item)
 Machine *PropertyEditor::machine(MultiProperty *property)
 {
 //    int type = property->type();
-    QString name = property->name();
-    QMap values = property->valueList();
+    TQString name = property->name();
+    TQMap values = property->valueList();
     if (m_registeredForType[name] == 0)
     {
         m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property);
-        connect(m_registeredForType[name]->propertyEditor, SIGNAL(propertyChanged(MultiProperty*, const QVariant&)),
-		this, SLOT(propertyChanged(MultiProperty*, const QVariant&)));
+        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->childrenRect().topLeft());
         m_registeredForType[name]->propertyEditor->hide();
     }
@@ -455,7 +455,7 @@ Machine *PropertyEditor::machine(MultiProperty *property)
 
 void PropertyEditor::clearMachineCache()
 {
-    for (QMap::iterator it = m_registeredForType.begin(); it != m_registeredForType.end(); ++it)
+    for (TQMap::iterator it = m_registeredForType.begin(); it != m_registeredForType.end(); ++it)
     {
         delete it.data();
     }
diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h
index 4091d31a..c6c72237 100644
--- a/lib/widgets/propeditor/propertyeditor.h
+++ b/lib/widgets/propeditor/propertyeditor.h
@@ -23,7 +23,7 @@
 #ifndef PURE_QT
 #include 
 #else
-#include 
+#include 
 #define KListView QListView
 #define KListViewItem QListViewItem
 #endif
@@ -59,7 +59,7 @@ class PropertyEditor: public KListView{
    Q_OBJECT
 public:
     /**Constructs the property editor.*/
-    PropertyEditor(QWidget *parent = 0, const char *name = 0);
+    PropertyEditor(TQWidget *parent = 0, const char *name = 0);
     ~PropertyEditor();
     
     /**@return @ref Machine for given property.
@@ -83,25 +83,25 @@ protected slots:
     /**Updates property widget in the editor.*/
     void propertyValueChanged(Property* property);
     /**Updates property in the list when new value is selected in the editor.*/
-    void propertyChanged(MultiProperty *property, const QVariant &value);
+    void propertyChanged(MultiProperty *property, const TQVariant &value);
 
     /**Shows property editor.*/
-    void slotClicked(QListViewItem* item);
+    void slotClicked(TQListViewItem* item);
     void updateEditorSize();
     
     /**Undoes the last change in property editor.*/
     void undo();
     
 protected:
-    void editItem(QListViewItem*, int);
+    void editItem(TQListViewItem*, int);
     void hideEditor();
     void showEditor(PropertyItem *item);
     void placeEditor(PropertyItem *item);
     PropertyWidget *prepareEditor(PropertyItem *item);
 
-    void addGroup(const QString &name);
-    void addProperty(PropertyGroupItem *group, const QString &name);
-    void addProperty(const QString &name);
+    void addGroup(const TQString &name);
+    void addProperty(PropertyGroupItem *group, const TQString &name);
+    void addProperty(const TQString &name);
     void addChildProperties(PropertyItem *parent);
     
 private:
@@ -109,17 +109,17 @@ private:
     PropertyList m_detailedList;
 
     //machines cache for property types, machines will be deleted
-    QMap m_registeredForType;
+    TQMap m_registeredForType;
 
     PropertyItem *m_currentEditItem;
     PropertyWidget *m_currentEditWidget;
-    QWidget *m_currentEditArea;
-    QGridLayout *m_currentEditLayout;
+    TQWidget *m_currentEditArea;
+    TQGridLayout *m_currentEditLayout;
     
     bool m_doubleClickForEdit;
-    QListViewItem* m_lastClickedItem;
+    TQListViewItem* m_lastClickedItem;
     
-    QPushButton *m_undoButton;
+    TQPushButton *m_undoButton;
     
 friend class PropertyItem;
 };
diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp
index e92f28b3..491c2ebb 100644
--- a/lib/widgets/propeditor/propertylist.cpp
+++ b/lib/widgets/propeditor/propertylist.cpp
@@ -25,12 +25,12 @@
 namespace PropertyLib{
 
 PropertyList::PropertyList()
-    :QObject(0, 0), m_propertyOwner(true)
+    :TQObject(0, 0), m_propertyOwner(true)
 {
 }
 
 PropertyList::PropertyList(bool propertyOwner)
-    :QObject(0, 0), m_propertyOwner(propertyOwner)
+    :TQObject(0, 0), m_propertyOwner(propertyOwner)
 {
 }
 
@@ -39,7 +39,7 @@ PropertyList::~PropertyList()
     clear();
 }
 
-MultiProperty *PropertyList::operator[](const QString &name)
+MultiProperty *PropertyList::operator[](const TQString &name)
 {
     if (m_list.contains(name))
         return m_list[name];
@@ -47,7 +47,7 @@ MultiProperty *PropertyList::operator[](const QString &name)
         return new MultiProperty(this);
 }
 
-MultiProperty *PropertyList::property( const QString &name )
+MultiProperty *PropertyList::property( const TQString &name )
 {
 	if (m_list.contains(name))
 		return m_list[name];
@@ -73,7 +73,7 @@ void PropertyList::addProperty(Property *property)
     }
 }
 
-void PropertyList::addProperty(const QString &group, Property *property)
+void PropertyList::addProperty(const TQString &group, Property *property)
 {
     if (property == 0)
         return;
@@ -101,9 +101,9 @@ void PropertyList::removeProperty(Property *property)
         emit aboutToDeleteProperty(property);
 
     MultiProperty *mp = m_list[property->name()];
-    QString group = m_groupOfProperty[mp];
+    TQString group = m_groupOfProperty[mp];
     removeFromGroup(mp);
-    QString pname = property->name();
+    TQString pname = property->name();
     mp->removeProperty(property);
     if (m_propertyOwner)
         delete property;
@@ -117,11 +117,11 @@ void PropertyList::removeProperty(Property *property)
         addToGroup(group, mp);
 }
 
-void PropertyList::removeProperty(const QString &name)
+void PropertyList::removeProperty(const TQString &name)
 {
     if (m_list.contains(name))
     {
-        QString group = m_groupOfProperty[m_list[name]];
+        TQString group = m_groupOfProperty[m_list[name]];
         removeFromGroup(m_list[name]);
         Property *property;
         for (property = m_list[name]->list.first(); property; property = m_list[name]->list.next())
@@ -146,17 +146,17 @@ void PropertyList::removeProperty(const QString &name)
     }
 }
 
-const QValueList > >& PropertyList::propertiesOfGroup() const
+const TQValueList > >& PropertyList::propertiesOfGroup() const
 {
     return m_propertiesOfGroup;
 }
 
-const QMap& PropertyList::groupOfProperty() const
+const TQMap& PropertyList::groupOfProperty() const
 {
     return m_groupOfProperty;
 }
 
-void PropertyList::addToGroup(const QString &group, MultiProperty *property)
+void PropertyList::addToGroup(const TQString &group, MultiProperty *property)
 {
     if (!property)
         return;
@@ -165,8 +165,8 @@ void PropertyList::addToGroup(const QString &group, MultiProperty *property)
     if (m_groupOfProperty.contains(property) && (m_groupOfProperty[property] == group))
         return;
 
-    QPair > *groupPair = 0;
-    for(QValueList > >::iterator it = m_propertiesOfGroup.begin();
+    QPair > *groupPair = 0;
+    for(TQValueList > >::iterator it = m_propertiesOfGroup.begin();
         it != m_propertiesOfGroup.end(); ++it)
     {
         if ((*it).first == group)
@@ -177,7 +177,7 @@ void PropertyList::addToGroup(const QString &group, MultiProperty *property)
     }
     if (groupPair == 0)
     {
-        groupPair = new QPair >();
+        groupPair = new QPair >();
         groupPair->first = group;
         groupPair->second.append(property->name());
         m_propertiesOfGroup.append(*groupPair);
@@ -193,10 +193,10 @@ void PropertyList::addToGroup(const QString &group, MultiProperty *property)
 
 void PropertyList::removeFromGroup(MultiProperty *property)
 {
-    QString group = m_groupOfProperty[property];
+    TQString group = m_groupOfProperty[property];
 //    qWarning("removeFromGroup group=%s", group.ascii());
 
-    for(QValueList > >::iterator it = m_propertiesOfGroup.begin();
+    for(TQValueList > >::iterator it = m_propertiesOfGroup.begin();
         it != m_propertiesOfGroup.end(); ++it)
     {
 //        qWarning("removeFromGroup checking %s", (*it).first.ascii());
@@ -213,22 +213,22 @@ void PropertyList::removeFromGroup(MultiProperty *property)
 
 void PropertyList::clear( )
 {
-    for (QMap::iterator it = m_list.begin(); it != m_list.end(); ++it)
+    for (TQMap::iterator it = m_list.begin(); it != m_list.end(); ++it)
         removeProperty(it.key());
 }
 
-bool PropertyList::contains( const QString & name )
+bool PropertyList::contains( const TQString & name )
 {
     if (m_list.contains(name))
         return true;
     return false;
 }
 
-QPtrList PropertyList::properties(const QString &name)
+TQPtrList PropertyList::properties(const TQString &name)
 {
     if (m_list.contains(name))
         return m_list[name]->list;
-    return QPtrList();
+    return TQPtrList();
 }
 
 PropertyList::Iterator PropertyList::begin()
@@ -276,7 +276,7 @@ MultiProperty *PropertyList::Iterator::operator *()
     return data();
 }
 
-QString PropertyList::Iterator::key()
+TQString PropertyList::Iterator::key()
 {
     return current.key();
 }
@@ -306,7 +306,7 @@ PropertyBuffer::PropertyBuffer( )
 void PropertyBuffer::intersect(const PropertyList *list)
 {
     qWarning("PropertyBuffer::intersect");
-    for (QMap::iterator it = m_list.begin(); it != m_list.end(); ++it)
+    for (TQMap::iterator it = m_list.begin(); it != m_list.end(); ++it)
     {
 //        qWarning("intersect:: for mp = %s", it.data()->name().ascii());
         if (list->m_list.contains(it.key()))
@@ -327,13 +327,13 @@ void PropertyBuffer::intersect(const PropertyList *list)
 //        qWarning("intersect::     removing %s from intersection", it.key().ascii());
         removeProperty(it.key());
     }
-    connect(list, SIGNAL(propertyValueChanged(Property*)), this, SLOT(intersectedValueChanged(Property*)));
+    connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*)));
 }
 
 void PropertyBuffer::intersectedValueChanged(Property *property)
 {
 //     qWarning("PropertyBuffer::intersectedValueChanged");
-    QString propertyName = property->name();
+    TQString propertyName = property->name();
     if (!contains(propertyName))
         return;
 
@@ -341,7 +341,7 @@ void PropertyBuffer::intersectedValueChanged(Property *property)
     if (mp == *m_list[propertyName])
     {
         Property *prop;
-        QPtrList props = properties(propertyName);
+        TQPtrList props = properties(propertyName);
         for (prop = props.first(); prop; prop = props.next())
             emit propertyValueChanged(prop);
     }
@@ -351,7 +351,7 @@ PropertyBuffer::PropertyBuffer(PropertyList *list)
     :PropertyList(false)
 {
     //deep copy of m_list
-    for (QMap::const_iterator it = list->m_list.begin();
+    for (TQMap::const_iterator it = list->m_list.begin();
             it != list->m_list.end(); ++it)
     {
         MultiProperty *mp = new MultiProperty(*it.data());
@@ -359,7 +359,7 @@ PropertyBuffer::PropertyBuffer(PropertyList *list)
         addToGroup(list->m_groupOfProperty[it.data()], mp);
         m_list[it.key()] = mp;
     }
-    connect(list, SIGNAL(propertyValueChanged(Property*)), this, SLOT(intersectedValueChanged(Property*)));
+    connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*)));
 }
 
 }
diff --git a/lib/widgets/propeditor/propertylist.h b/lib/widgets/propeditor/propertylist.h
index 45071606..96e351fc 100644
--- a/lib/widgets/propeditor/propertylist.h
+++ b/lib/widgets/propeditor/propertylist.h
@@ -20,11 +20,11 @@
 #ifndef PROPERTYLIST_H
 #define PROPERTYLIST_H
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
@@ -66,7 +66,7 @@ public:
         
         bool operator != (Iterator it);
         
-        QString key();
+        TQString key();
         MultiProperty *data();
         
     private:
@@ -74,7 +74,7 @@ public:
         Iterator(PropertyList *list, bool end);
         
         void next();
-        QMap::iterator current;
+        TQMap::iterator current;
         
         PropertyList *m_list;
         friend class PropertyList;
@@ -93,34 +93,34 @@ public:
     list["My Property"]->setValue("My Value");
     /endcode
     @return @ref MultiProperty with given name.*/
-    virtual MultiProperty *operator[](const QString &name);
+    virtual MultiProperty *operator[](const TQString &name);
     /**Accesses a property by it's name. All property modifications are allowed
     trough this method. For example, to set a value of a property
     */
-    MultiProperty *property( const QString &name );
+    MultiProperty *property( const TQString &name );
 
     /**Adds the property to the list to the "common" group.*/
     virtual void addProperty(Property *property);
     /**Adds the property to the list in group.*/
-    virtual void addProperty(const QString &group, Property *property);
+    virtual void addProperty(const TQString &group, Property *property);
     /**Removes property from the list. Emits aboutToDeleteProperty before removing.*/
     virtual void removeProperty(Property *property);
     /**Removes property with the given name from the list.
     Emits @ref aboutToDeleteProperty before removing.*/
-    virtual void removeProperty(const QString &name);
+    virtual void removeProperty(const TQString &name);
     
     /**@return the list of grouped properties.*/
-    virtual const QValueList > >& propertiesOfGroup() const;
+    virtual const TQValueList > >& propertiesOfGroup() const;
     /**@return the map: property - group name.*/
-    virtual const QMap& groupOfProperty() const;
+    virtual const TQMap& groupOfProperty() const;
     
     /**Clears the list of properties.*/
     virtual void clear();
     /**Returns true if the list of properties contains property with given name.*/
-    virtual bool contains(const QString &name);
+    virtual bool contains(const TQString &name);
     
     /**The list of properties with given name.*/
-    QPtrList properties(const QString &name);
+    TQPtrList properties(const TQString &name);
     
     Iterator begin();
     Iterator end();
@@ -136,19 +136,19 @@ protected:
     PropertyList(bool propertyOwner);
 
     /**Adds property to a group.*/
-    void addToGroup(const QString &group, MultiProperty *property);
+    void addToGroup(const TQString &group, MultiProperty *property);
     /**Removes property from a group.*/
     void removeFromGroup(MultiProperty *property);
         
 private:
     //sorted list of properties in form name: property
-    QMap m_list;
+    TQMap m_list;
     
     //groups of properties:
     // list of group name: (list of property names)
-    QValueList > > m_propertiesOfGroup;
+    TQValueList > > m_propertiesOfGroup;
     // map of property: group
-    QMap m_groupOfProperty;
+    TQMap m_groupOfProperty;
 
     //indicates that this list will delete properties after removeProperty()
     //and also in destructor
diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp
index 0ab0945f..613777d6 100644
--- a/lib/widgets/propeditor/propertymachinefactory.cpp
+++ b/lib/widgets/propeditor/propertymachinefactory.cpp
@@ -22,10 +22,10 @@
 #ifndef PURE_QT
 #include 
 #else
-#define i18n QObject::tr
+#define i18n TQObject::tr
 #endif
 
-#include 
+#include 
 
 #include "property.h"
 #include "childproperty.h"
@@ -73,8 +73,8 @@ PropertyMachineFactory::~PropertyMachineFactory()
 Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property)
 {
     int type = property->type();
-    QString propertyName = property->name();
-    QMap valueList = property->valueList();
+    TQString propertyName = property->name();
+    TQMap valueList = property->valueList();
 
     if (m_registeredForType.contains(propertyName))
         return (*m_registeredForType[propertyName])();
@@ -143,14 +143,14 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property)
         }
         case Property::SizePolicy:
         {
-            QMap spValues;
-            spValues[i18n("Fixed")] = QSizePolicy::Fixed;
-            spValues[i18n("Minimum")] = QSizePolicy::Minimum;
-            spValues[i18n("Maximum")] = QSizePolicy::Maximum;
-            spValues[i18n("Preferred")] = QSizePolicy::Preferred;
-            spValues[i18n("Expanding")] = QSizePolicy::Expanding;
-            spValues[i18n("Minimum Expanding")] = QSizePolicy::MinimumExpanding;
-            spValues[i18n("Ignored")] = QSizePolicy::Ignored;
+            TQMap spValues;
+            spValues[i18n("Fixed")] = TQSizePolicy::Fixed;
+            spValues[i18n("Minimum")] = TQSizePolicy::Minimum;
+            spValues[i18n("Maximum")] = TQSizePolicy::Maximum;
+            spValues[i18n("Preferred")] = TQSizePolicy::Preferred;
+            spValues[i18n("Expanding")] = TQSizePolicy::Expanding;
+            spValues[i18n("Minimum Expanding")] = TQSizePolicy::MinimumExpanding;
+            spValues[i18n("Ignored")] = TQSizePolicy::Ignored;
         
             Machine *mach = new Machine(new PSizePolicyEdit(property, spValues));
             property->details.append(ChildProperty(property, i18n("hSizeType"), ChildProperty::SizePolicy_HorData, spValues, i18n("Horizontal Size Type")));
@@ -161,7 +161,7 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property)
         }
         case Property::Cursor:
         {
-            QMap spValues;
+            TQMap spValues;
             spValues[i18n("Arrow")] = Qt::ArrowCursor;
             spValues[i18n("Up Arrow")] = Qt::UpArrowCursor;
             spValues[i18n("Cross")] = Qt::CrossCursor;
diff --git a/lib/widgets/propeditor/propertymachinefactory.h b/lib/widgets/propeditor/propertymachinefactory.h
index a8d1e33f..09ea3bbe 100644
--- a/lib/widgets/propeditor/propertymachinefactory.h
+++ b/lib/widgets/propeditor/propertymachinefactory.h
@@ -20,7 +20,7 @@
 #ifndef PROPERTYMACHINEFACTORY_H
 #define PROPERTYMACHINEFACTORY_H
 
-#include 
+#include 
 
 #include "propertywidget.h"
 
@@ -89,7 +89,7 @@ private:
     virtual ~PropertyMachineFactory();
 
     //registered machines for property types
-    QMap m_registeredForType;
+    TQMap m_registeredForType;
 };
 
 }
diff --git a/lib/widgets/propeditor/propertywidget.cpp b/lib/widgets/propeditor/propertywidget.cpp
index 388fd68a..dad296c5 100644
--- a/lib/widgets/propeditor/propertywidget.cpp
+++ b/lib/widgets/propeditor/propertywidget.cpp
@@ -19,16 +19,16 @@
  ***************************************************************************/
 #include "propertywidget.h"
 
-#include 
+#include 
 
 namespace PropertyLib{
 
-PropertyWidget::PropertyWidget(MultiProperty *property, QWidget *parent, const char *name)
-    :QWidget(parent, name), m_property(property)
+PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *parent, const char *name)
+    :TQWidget(parent, name), m_property(property)
 {
 }
 
-QString PropertyWidget::propertyName() const
+TQString PropertyWidget::propertyName() const
 {
     return m_property->name();
 }
@@ -38,7 +38,7 @@ void PropertyWidget::setProperty(MultiProperty *property)
     m_property = property;
 }
 
-void PropertyWidget::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value)
+void PropertyWidget::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
@@ -46,7 +46,7 @@ void PropertyWidget::drawViewer(QPainter *p, const QColorGroup &cg, const QRect
     p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toString());
 }
 
-void PropertyWidget::setValueList(const QMap &// valueList
+void PropertyWidget::setValueList(const TQMap &// valueList
                                   )
 {
     //this does nothing
diff --git a/lib/widgets/propeditor/propertywidget.h b/lib/widgets/propeditor/propertywidget.h
index 42ebfa95..edbdf6f3 100644
--- a/lib/widgets/propeditor/propertywidget.h
+++ b/lib/widgets/propeditor/propertywidget.h
@@ -20,8 +20,8 @@
 #ifndef PROPERTYWIDGET_H
 #define PROPERTYWIDGET_H
 
-#include 
-#include 
+#include 
+#include 
 
 /** @file propertywidget.h
 @short Contains @ref PropertyLib::PropertyWidget class.
@@ -39,8 +39,8 @@ Subclass this class to create custom property viewer and editor widget.
 Descendants should implement value() and setValue() methods.
 
 Hint: in case you want to implement your property editor widget using
-existing widgets like QLineEdit, QComboBox, etc. you can't use multiple
-inheritance from two QObject descendants due to Qt library restriction.
+existing widgets like TQLineEdit, TQComboBox, etc. you can't use multiple
+inheritance from two TQObject descendants due to Qt library restriction.
 Therefore use line edits and combo boxes as child widgets.
 
 A set of predefined widgets for predefined property types are available
@@ -50,24 +50,24 @@ class PropertyWidget: public QWidget{
     Q_OBJECT
 public:
     /**Constructs widget for property with name "propertyName".*/
-    PropertyWidget(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PropertyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
     virtual ~PropertyWidget() {}
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const = 0;
+    virtual TQVariant value() const = 0;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true) = 0;
+    virtual void setValue(const TQVariant &value, bool emitChange=true) = 0;
     /**@return the name of edited property.*/
-    virtual QString propertyName() const;
+    virtual TQString propertyName() const;
     /**Sets the name of edited property.*/
     virtual void setProperty(MultiProperty *property);
     /**Sets the list of possible values shown in the editor widget. This method 
     does not emit propertyChanged signal.*/
-    virtual void setValueList(const QMap &valueList);
+    virtual void setValueList(const TQMap &valueList);
     
     /**Function to draw a property viewer when the editor isn't shown.*/
-    virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value);
+    virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value);
     
     /**Reverts the property value to previous setting.*/
     virtual void undo();
@@ -77,7 +77,7 @@ signals:
     to emit it only from @ref setValue() method.
     @ref PropertyLib::PropertyEditor widget will connect this to the appropriate slot which
     will make updates to the @ref PropertyLib::PropertyList that hold propeties.*/
-    void propertyChanged(MultiProperty *property, const QVariant &value);
+    void propertyChanged(MultiProperty *property, const TQVariant &value);
 
 protected:
     MultiProperty *m_property;
diff --git a/lib/widgets/propeditor/propertywidgetproxy.cpp b/lib/widgets/propeditor/propertywidgetproxy.cpp
index d2c29aae..813708ca 100644
--- a/lib/widgets/propeditor/propertywidgetproxy.cpp
+++ b/lib/widgets/propeditor/propertywidgetproxy.cpp
@@ -19,18 +19,18 @@
  ***************************************************************************/
 #include "propertywidgetproxy.h"
 
-#include 
+#include 
 
 #include "propertywidget.h"
 #include "propertymachinefactory.h"
 
 namespace PropertyLib{
 
-PropertyWidgetProxy::PropertyWidgetProxy(QWidget *parent, const char *name)
-    :QWidget(parent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0)
+PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *parent, const char *name)
+    :TQWidget(parent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0)
 {
     p = new Property();
-    m_layout = new QHBoxLayout(this, 0, 0);
+    m_layout = new TQHBoxLayout(this, 0, 0);
 }
 
 PropertyWidgetProxy::~PropertyWidgetProxy()
@@ -60,26 +60,26 @@ void PropertyWidgetProxy::setWidget()
     m_editor = PropertyMachineFactory::getInstance()->machineForProperty(mp)->propertyEditor;
     if (m_editor)
     {
-        m_editor->reparent(this, QPoint(0,0), true);
+        m_editor->reparent(this, TQPoint(0,0), true);
         m_layout->addWidget(m_editor);
     }
 }
 
-QVariant PropertyWidgetProxy::value() const
+TQVariant PropertyWidgetProxy::value() const
 {
     if (m_editor)
         return m_editor->value();
     else
-        return QVariant();
+        return TQVariant();
 }
 
-void PropertyWidgetProxy::setValue(const QVariant &value)
+void PropertyWidgetProxy::setValue(const TQVariant &value)
 {
     if (m_editor)
         m_editor->setValue(value, false);
 }
 
-bool PropertyWidgetProxy::setProperty( const char * name, const QVariant & value )
+bool PropertyWidgetProxy::setProperty( const char * name, const TQVariant & value )
 {
 	if( strcmp( name, "value") == 0 )
 	{
@@ -88,15 +88,15 @@ bool PropertyWidgetProxy::setProperty( const char * name, const QVariant & value
 		return true;
 	}
 	else
-		return QWidget::setProperty(name, value);
+		return TQWidget::setProperty(name, value);
 }
 
-QVariant PropertyWidgetProxy::property( const char * name ) const
+TQVariant PropertyWidgetProxy::property( const char * name ) const
 {
 	if( strcmp( name, "value") == 0 )
 		return value(  );
 	else
-		return QWidget::property(name);
+		return TQWidget::property(name);
 }
 
 }
diff --git a/lib/widgets/propeditor/propertywidgetproxy.h b/lib/widgets/propeditor/propertywidgetproxy.h
index 31c28e76..e1183d91 100644
--- a/lib/widgets/propeditor/propertywidgetproxy.h
+++ b/lib/widgets/propeditor/propertywidgetproxy.h
@@ -20,8 +20,8 @@
 #ifndef PROPERTYWIDGETPROXY_H
 #define PROPERTYWIDGETPROXY_H
 
-#include 
-#include 
+#include 
+#include 
 
 #include "multiproperty.h"
 
@@ -45,7 +45,7 @@ Q_OBJECT
 Q_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true )
 Q_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false )
 public:
-    PropertyWidgetProxy(QWidget *parent = 0, const char *name = 0);
+    PropertyWidgetProxy(TQWidget *parent = 0, const char *name = 0);
     ~PropertyWidgetProxy();
     
     /**Sets the type of a property editor to appear.*/
@@ -55,13 +55,13 @@ public:
     void setPropertyType2(PropertyType propertyType);
     PropertyType propertyType2() const { return m_propertyType; }
     
-    QVariant value() const;
-    void setValue(const QVariant &value);
+    TQVariant value() const;
+    void setValue(const TQVariant &value);
     
     /**Sets the type of an editor basing on the @p value if the name is "value".
-    Otherwise works as QWidget::setProperty.*/
-    bool setProperty( const char *name, const QVariant &value);
-    QVariant property( const char *name) const;
+    Otherwise works as TQWidget::setProperty.*/
+    bool setProperty( const char *name, const TQVariant &value);
+    TQVariant property( const char *name) const;
     
 protected:
     virtual void setWidget();
@@ -73,7 +73,7 @@ private:
     PropertyType m_propertyType;
     PropertyWidget *m_editor;
     
-    QHBoxLayout *m_layout;
+    TQHBoxLayout *m_layout;
 };
 
 }
diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp
index 5cbc1d40..90208304 100644
--- a/lib/widgets/propeditor/psizeedit.cpp
+++ b/lib/widgets/propeditor/psizeedit.cpp
@@ -20,39 +20,39 @@
 #include "psizeedit.h"
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
-PSizeEdit::PSizeEdit(MultiProperty *property, QWidget *parent, const char *name)
+PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     m_edit->setReadOnly(true);
 }
 
-QVariant PSizeEdit::value() const
+TQVariant PSizeEdit::value() const
 {
     return m_value;
 }
 
-void PSizeEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PSizeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
+    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
 }
 
-void PSizeEdit::setValue(const QVariant& value, bool emitChange)
+void PSizeEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(QString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
+    m_edit->setText(TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/psizeedit.h b/lib/widgets/propeditor/psizeedit.h
index 3053f28f..4613f532 100644
--- a/lib/widgets/propeditor/psizeedit.h
+++ b/lib/widgets/propeditor/psizeedit.h
@@ -29,21 +29,21 @@ class QPainter;
 namespace PropertyLib{
 
 /**
-@short %Property editor for QSize values.
+@short %Property editor for TQSize values.
 */
 class PSizeEdit: public PropertyWidget
 {
     Q_OBJECT
 public:
-    PSizeEdit(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PSizeEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
 private:
     KLineEdit *m_edit;
-    QVariant m_value;
+    TQVariant m_value;
 };
 
 }
diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp
index 8695b9cd..9447a4bc 100644
--- a/lib/widgets/propeditor/psizepolicyedit.cpp
+++ b/lib/widgets/propeditor/psizepolicyedit.cpp
@@ -20,49 +20,49 @@
 #include "psizepolicyedit.h"
 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
-PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const QMap &spValues, QWidget* parent, const char* name)
+PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap &spValues, TQWidget* parent, const char* name)
     :PropertyWidget(property, parent, name), m_spValues(spValues)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     m_edit->setReadOnly(true);
 }
 
-QVariant PSizePolicyEdit::value() const
+TQVariant PSizePolicyEdit::value() const
 {
     return m_value;
 }
 
-void PSizePolicyEdit::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PSizePolicyEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
+    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
 }
 
-void PSizePolicyEdit::setValue(const QVariant& value, bool emitChange)
+void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(QString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
+    m_edit->setText(TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
-QString PSizePolicyEdit::findValueDescription(QVariant val) const
+TQString PSizePolicyEdit::findValueDescription(TQVariant val) const
 {
 //    qWarning("PSizePolicyEdit::findValueDescription : %d", val.toInt());
-    for (QMap::const_iterator it = m_spValues.begin(); it != m_spValues.end(); ++ it)
+    for (TQMap::const_iterator it = m_spValues.begin(); it != m_spValues.end(); ++ it)
     {
         if (it.data() == val)
             return it.key();
diff --git a/lib/widgets/propeditor/psizepolicyedit.h b/lib/widgets/propeditor/psizepolicyedit.h
index 668359c2..36c26d1b 100644
--- a/lib/widgets/propeditor/psizepolicyedit.h
+++ b/lib/widgets/propeditor/psizepolicyedit.h
@@ -22,31 +22,31 @@
 
 #include "propertywidget.h"
 
-#include 
+#include 
 
 class KLineEdit;
 
 namespace PropertyLib{
 
 /**
-@short %Property editor for QSizePolicy values.
+@short %Property editor for TQSizePolicy values.
 */
 class PSizePolicyEdit : public PropertyWidget
 {
 Q_OBJECT
 public:
-    PSizePolicyEdit(MultiProperty* property, const QMap &spValues, QWidget* parent=0, const char* name=0);
+    PSizePolicyEdit(MultiProperty* property, const TQMap &spValues, TQWidget* parent=0, const char* name=0);
     
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
-    QString findValueDescription(QVariant val) const;
+    TQString findValueDescription(TQVariant val) const;
     
 private:
     KLineEdit *m_edit;
-    QVariant m_value;
-    QMap m_spValues;
+    TQVariant m_value;
+    TQMap m_spValues;
 };
 
 }
diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp
index 0171adfb..755041c1 100644
--- a/lib/widgets/propeditor/pspinbox.cpp
+++ b/lib/widgets/propeditor/pspinbox.cpp
@@ -21,49 +21,49 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
-PSpinBox::PSpinBox(MultiProperty *property, QWidget *parent, const char *name)
+PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
-    m_edit = new QSpinBox(INT_MIN, INT_MAX, 1, this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
+    m_edit = new TQSpinBox(INT_MIN, INT_MAX, 1, this);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
 }
 
-PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, QWidget *parent, const char *name)
+PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
-    m_edit = new QSpinBox(minValue, maxValue, step, this);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
+    m_edit = new TQSpinBox(minValue, maxValue, step, this);
     l->addWidget(m_edit);
     
-    connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
 }
 
-QVariant PSpinBox::value() const
+TQVariant PSpinBox::value() const
 {
-    return QVariant(m_edit->cleanText().toInt());
+    return TQVariant(m_edit->cleanText().toInt());
 }
 
-void PSpinBox::setValue(const QVariant &value, bool emitChange)
+void PSpinBox::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int)));
+    disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
     m_edit->setValue(value.toInt());
-    connect(m_edit, SIGNAL(valueChanged(int)), this, SLOT(updateProperty(int)));
+    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
 
 void PSpinBox::updateProperty(int val)
 {
-    emit propertyChanged(m_property, QVariant(val));
+    emit propertyChanged(m_property, TQVariant(val));
 }
 
 }
diff --git a/lib/widgets/propeditor/pspinbox.h b/lib/widgets/propeditor/pspinbox.h
index 55d723f2..9998ff2f 100644
--- a/lib/widgets/propeditor/pspinbox.h
+++ b/lib/widgets/propeditor/pspinbox.h
@@ -32,20 +32,20 @@ namespace PropertyLib{
 class PSpinBox: public PropertyWidget{
     Q_OBJECT
 public:
-    PSpinBox(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
-    PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, QWidget *parent = 0, const char *name = 0);
+    PSpinBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true);
+    virtual void setValue(const TQVariant &value, bool emitChange=true);
 
 private slots:
     void updateProperty(int val);
     
 private:
-    QSpinBox *m_edit;
+    TQSpinBox *m_edit;
 };
 
 }
diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp
index 18b8756e..f6803304 100644
--- a/lib/widgets/propeditor/pstringlistedit.cpp
+++ b/lib/widgets/propeditor/pstringlistedit.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 #include "pstringlistedit.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
 #ifndef PURE_QT
@@ -30,34 +30,34 @@
 #include 
 #else
 #include "qeditlistbox.h"
-#include 
+#include 
 #include "compat_tools.h"
 #endif
 
 namespace PropertyLib{
 
-PStringListEdit::PStringListEdit(MultiProperty *property, QWidget *parent, const char *name)
+PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, const char *name)
      :PropertyWidget(property, parent, name)
 {
-    l = new QHBoxLayout(this);
+    l = new TQHBoxLayout(this);
 
     edit = new KLineEdit(this);
     edit->setReadOnly(true);
-    edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(edit);
-    pbSelect = new QPushButton("...", this);
-    pbSelect->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding);
+    pbSelect = new TQPushButton("...", this);
+    pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
     l->addWidget(pbSelect);
 
-    connect(pbSelect, SIGNAL(clicked()), this, SLOT(showEditor()));
+    connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor()));
 }
 
-QVariant PStringListEdit::value() const
+TQVariant PStringListEdit::value() const
 {
-    return QVariant(m_list);
+    return TQVariant(m_list);
 }
 
-void PStringListEdit::setValue(const QVariant &value, bool emitChange)
+void PStringListEdit::setValue(const TQVariant &value, bool emitChange)
 {
     m_list = value.toStringList();
     edit->setText(value.toStringList().join(", "));
@@ -67,8 +67,8 @@ void PStringListEdit::setValue(const QVariant &value, bool emitChange)
 
 void PStringListEdit::showEditor()
 {
-    QDialog* dia = new QDialog(this, "stringlist_dialog", true);
-    QVBoxLayout *dv = new QVBoxLayout(dia, 2);
+    TQDialog* dia = new TQDialog(this, "stringlist_dialog", true);
+    TQVBoxLayout *dv = new TQVBoxLayout(dia, 2);
 
 #ifdef PURE_QT
     QEditListBox *select = new QEditListBox(dia, "select_char");
@@ -77,18 +77,18 @@ void PStringListEdit::showEditor()
 #endif
     dv->addWidget(select);
 
-    QHBoxLayout *dh = new QHBoxLayout(dv, 6);
+    TQHBoxLayout *dh = new TQHBoxLayout(dv, 6);
 #ifndef PURE_QT
     KPushButton *pbOk = new KPushButton(KStdGuiItem::ok(), dia);
     KPushButton *pbCancel = new KPushButton(KStdGuiItem::cancel(), dia);
 #else
-    QPushButton *pbOk = new QPushButton(i18n("Ok"), dia);
-    QPushButton *pbCancel = new QPushButton(i18n("Cancel"), dia);
+    TQPushButton *pbOk = new TQPushButton(i18n("Ok"), dia);
+    TQPushButton *pbCancel = new TQPushButton(i18n("Cancel"), dia);
 #endif
-    QSpacerItem *si = new QSpacerItem(30, 0, QSizePolicy::Expanding, QSizePolicy::Expanding);
+    TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 
-    connect(pbOk, SIGNAL(clicked()), dia, SLOT(accept()));
-    connect(pbCancel, SIGNAL(clicked()), dia, SLOT(reject()));
+    connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept()));
+    connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject()));
 
     dh->addItem(si);
     dh->addWidget(pbOk);
@@ -96,7 +96,7 @@ void PStringListEdit::showEditor()
 
     select->insertStringList(m_list);
 
-    if (dia->exec() == QDialog::Accepted)
+    if (dia->exec() == TQDialog::Accepted)
     {
         m_list = select->items();
         edit->setText(select->items().join(", "));
@@ -106,7 +106,7 @@ void PStringListEdit::showEditor()
     emit propertyChanged(m_property, m_list);
 }
 
-void PStringListEdit::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value)
+void PStringListEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
     p->setPen(Qt::NoPen);
     p->setBrush(cg.background());
diff --git a/lib/widgets/propeditor/pstringlistedit.h b/lib/widgets/propeditor/pstringlistedit.h
index 086391e8..25bbec74 100644
--- a/lib/widgets/propeditor/pstringlistedit.h
+++ b/lib/widgets/propeditor/pstringlistedit.h
@@ -36,25 +36,25 @@ class PStringListEdit: public PropertyWidget
 {
     Q_OBJECT
 public:
-    PStringListEdit(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PStringListEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true);
+    virtual void setValue(const TQVariant &value, bool emitChange=true);
     /**Function to draw a property viewer when the editor isn't shown.*/
-    virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value);
+    virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value);
 
 private slots:
     void showEditor();
 
 private:
-    QPushButton *pbSelect;
-    QHBoxLayout *l;
+    TQPushButton *pbSelect;
+    TQHBoxLayout *l;
     KLineEdit *edit;
 
-    QStringList m_list;
+    TQStringList m_list;
 };
 
 }
diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp
index 05ec4563..24f4259c 100644
--- a/lib/widgets/propeditor/psymbolcombo.cpp
+++ b/lib/widgets/propeditor/psymbolcombo.cpp
@@ -18,9 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
 #ifndef PURE_QT
@@ -28,52 +28,52 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #endif
 
 #include "psymbolcombo.h"
 
 namespace PropertyLib{
 
-PSymbolCombo::PSymbolCombo(MultiProperty *property, QWidget *parent, const char *name)
+PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char *name)
     :PropertyWidget(property, parent, name)
 {
-    l = new QHBoxLayout(this);
+    l = new TQHBoxLayout(this);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     m_edit->setMaxLength(1);
     l->addWidget(m_edit);
-    m_select = new QPushButton("...", this);
-    m_select->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding);
+    m_select = new TQPushButton("...", this);
+    m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_select);
 
 #ifdef PURE_QT
     m_select->hide();
 #endif
 
-    connect(m_select, SIGNAL(clicked()), this, SLOT(selectChar()));
-    connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    connect(m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectChar()));
+    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
 }
 
-QVariant PSymbolCombo::value() const
+TQVariant PSymbolCombo::value() const
 {
     if (!(m_edit->text().isNull()))
-        return QVariant(QString("%1").arg(m_edit->text().at(0).unicode()));
+        return TQVariant(TQString("%1").arg(m_edit->text().at(0).unicode()));
     else
-        return QVariant(0);
+        return TQVariant(0);
 }
 
-void PSymbolCombo::setValue(const QVariant &value, bool emitChange)
+void PSymbolCombo::setValue(const TQVariant &value, bool emitChange)
 {
 #if QT_VERSION >= 0x030100
     if (!(value.isNull()))
 #else
-    if (value.canCast(QVariant::Int))
+    if (value.canCast(TQVariant::Int))
 #endif
     {
-        disconnect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
-        m_edit->setText(QChar(value.toInt()));
-        connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+        disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+        m_edit->setText(TQChar(value.toInt()));
+        connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
         if (emitChange)
             emit propertyChanged(m_property, value);
     }
@@ -82,19 +82,19 @@ void PSymbolCombo::setValue(const QVariant &value, bool emitChange)
 void PSymbolCombo::selectChar()
 {
 #ifndef PURE_QT
-    QDialog* dia = new QDialog(this, "select_dialog", true);
-    QVBoxLayout *dv = new QVBoxLayout(dia, 2);
+    TQDialog* dia = new TQDialog(this, "select_dialog", true);
+    TQVBoxLayout *dv = new TQVBoxLayout(dia, 2);
 
     KCharSelect *select = new KCharSelect(dia, "select_char");
     dv->addWidget(select);
 
-    QHBoxLayout *dh = new QHBoxLayout(dv, 6);
+    TQHBoxLayout *dh = new TQHBoxLayout(dv, 6);
     KPushButton *pbOk = new KPushButton(KStdGuiItem::ok(), dia);
     KPushButton *pbCancel = new KPushButton(KStdGuiItem::cancel(), dia);
-    QSpacerItem *si = new QSpacerItem(30, 0, QSizePolicy::Expanding, QSizePolicy::Expanding);
+    TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 
-    connect(pbOk, SIGNAL(clicked()), dia, SLOT(accept()));
-    connect(pbCancel, SIGNAL(clicked()), dia, SLOT(reject()));
+    connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept()));
+    connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject()));
 
     dh->addItem(si);
     dh->addWidget(pbOk);
@@ -103,7 +103,7 @@ void PSymbolCombo::selectChar()
     if (!(m_edit->text().isNull()))
         select->setChar(m_edit->text().at(0));
 
-    if (dia->exec() == QDialog::Accepted)
+    if (dia->exec() == TQDialog::Accepted)
     {
         m_edit->setText(select->chr());
     }
@@ -111,17 +111,17 @@ void PSymbolCombo::selectChar()
 #endif
 }
 
-void PSymbolCombo::updateProperty(const QString& val)
+void PSymbolCombo::updateProperty(const TQString& val)
 {
-    emit propertyChanged(m_property, QVariant(QString("%1").arg(val.at(0).unicode())));
+    emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).unicode())));
 }
 
-void PSymbolCombo::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value)
+void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
     p->setBrush(cg.background());
     p->setPen(Qt::NoPen);
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, QChar(value.toInt()));
+    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQChar(value.toInt()));
 }
 
 }
diff --git a/lib/widgets/propeditor/psymbolcombo.h b/lib/widgets/propeditor/psymbolcombo.h
index e3bedfa8..621ce23c 100644
--- a/lib/widgets/propeditor/psymbolcombo.h
+++ b/lib/widgets/propeditor/psymbolcombo.h
@@ -35,26 +35,26 @@ namespace PropertyLib{
 class PSymbolCombo: public PropertyWidget{
     Q_OBJECT
 public:
-    PSymbolCombo(MultiProperty *property, QWidget *parent = 0, const char *name = 0);
+    PSymbolCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
-    virtual QVariant value() const;
+    virtual TQVariant value() const;
     /**Sets the value shown in the editor widget. Set emitChange to false
     if you don't want to emit propertyChanged signal.*/
-    virtual void setValue(const QVariant &value, bool emitChange=true);
+    virtual void setValue(const TQVariant &value, bool emitChange=true);
     /**Function to draw a property viewer when the editor isn't shown.*/
-    virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value);
+    virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value);
 
 public slots:
     void selectChar();
 
 private slots:
-    void updateProperty(const QString &val);
+    void updateProperty(const TQString &val);
 
 private:
     KLineEdit *m_edit;
-    QPushButton *m_select;
-    QHBoxLayout *l;
+    TQPushButton *m_select;
+    TQHBoxLayout *l;
 };
 
 }
diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp
index 3a896cdf..64e4d0c7 100644
--- a/lib/widgets/propeditor/purledit.cpp
+++ b/lib/widgets/propeditor/purledit.cpp
@@ -22,49 +22,49 @@
 #ifndef PURE_QT
 #include 
 #else
-#include 
-#include 
+#include 
+#include 
 #endif
-#include 
-#include 
+#include 
+#include 
 
 namespace PropertyLib{
 
-PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, QWidget* parent, const char* name)
+PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const char* name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 #ifndef PURE_QT
     m_edit = new KURLRequester(this);
     l->addWidget(m_edit);
     m_edit->setMode((KFile::Mode)mode);
-    connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
 #else
     m_edit = new KLineEdit(this);
-    m_select = new QPushButton("...",this);
+    m_select = new TQPushButton("...",this);
     l->addWidget(m_edit);
     l->addWidget(m_select);
     m_mode = mode;
-    connect( m_select, SIGNAL(clicked()),this,SLOT(select()));
+    connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select()));
 #endif
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 }
 
-QVariant PUrlEdit::value() const
+TQVariant PUrlEdit::value() const
 {
 #ifndef PURE_QT
-     return QVariant(m_edit->url());
+     return TQVariant(m_edit->url());
 #else
-     return QVariant(m_url);
+     return TQVariant(m_url);
 #endif
 }
 
-void PUrlEdit::setValue(const QVariant& value, bool emitChange)
+void PUrlEdit::setValue(const TQVariant& value, bool emitChange)
 {
 #ifndef PURE_QT
-    disconnect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
     m_edit->setURL(value.toString());
-    connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(updateProperty(const QString&)));
+    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
 #else
     m_edit->setText(value.toString());
 #endif
@@ -72,19 +72,19 @@ void PUrlEdit::setValue(const QVariant& value, bool emitChange)
         emit propertyChanged(m_property, value);
 }
 
-void PUrlEdit::updateProperty(const QString &val)
+void PUrlEdit::updateProperty(const TQString &val)
 {
-    emit propertyChanged(m_property, QVariant(val));
+    emit propertyChanged(m_property, TQVariant(val));
 }
 
 void PUrlEdit::select()
 {
 #ifdef PURE_QT
-    QString path = m_url;
+    TQString path = m_url;
     if( m_mode == Directory )
-	m_url = QFileDialog::getExistingDirectory( m_url,this);
+	m_url = TQFileDialog::getExistingDirectory( m_url,this);
     else
-        m_url = QFileDialog::getOpenFileName(m_url, QString::null, this);
+        m_url = TQFileDialog::getOpenFileName(m_url, TQString::null, this);
     updateProperty(m_url);
     m_edit->setText(m_url);
 #endif
diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h
index 6c9c8a8d..6508ea7d 100644
--- a/lib/widgets/propeditor/purledit.h
+++ b/lib/widgets/propeditor/purledit.h
@@ -46,21 +46,21 @@ public:
     enum Mode {File,Directory};
 #endif
 
-    PUrlEdit(Mode mode, MultiProperty* property, QWidget* parent=0, const char* name=0);
+    PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent=0, const char* name=0);
 
-    virtual QVariant value() const;
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void setValue(const TQVariant& value, bool emitChange);
     
 private slots:
-    void updateProperty(const QString &val);    
+    void updateProperty(const TQString &val);    
     void select();
 private:
 #ifndef PURE_QT
     KURLRequester *m_edit;
 #else
     KLineEdit *m_edit;
-    QPushButton *m_select;
-    QString m_url;
+    TQPushButton *m_select;
+    TQString m_url;
     Mode m_mode;
 #endif
 };
diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp
index 763ac630..308570be 100644
--- a/lib/widgets/propeditor/pyesnobutton.cpp
+++ b/lib/widgets/propeditor/pyesnobutton.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 #include "pyesnobutton.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #ifndef PURE_QT
 #include 
@@ -31,34 +31,34 @@
 
 namespace PropertyLib{
 
-PYesNoButton::PYesNoButton(MultiProperty* property, QWidget* parent, const char* name)
+PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char* name)
     :PropertyWidget(property, parent, name)
 {
-    QHBoxLayout *l = new QHBoxLayout(this, 0, 0);
-    m_edit = new QPushButton(this);
+    TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
+    m_edit = new TQPushButton(this);
     m_edit->setToggleButton(true);
-    m_edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
-    connect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool)));
+    connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
 }
 
-QVariant PYesNoButton::value() const
+TQVariant PYesNoButton::value() const
 {
-    return QVariant(m_edit->isOn());
+    return TQVariant(m_edit->isOn());
 }
 
-void PYesNoButton::drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value)
+void PYesNoButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
     PropertyWidget::drawViewer(p, cg, r, value.toBool() ? i18n("Yes") : i18n("No"));
 }
 
-void PYesNoButton::setValue(const QVariant& value, bool emitChange)
+void PYesNoButton::setValue(const TQVariant& value, bool emitChange)
 {
-    disconnect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool)));
+    disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
     m_edit->setDown(value.toBool());
     value.toBool() ? m_edit->setText(i18n("Yes")) : m_edit->setText(i18n("No"));
-    connect(m_edit, SIGNAL(toggled(bool)), this, SLOT(updateProperty(bool)));
+    connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/pyesnobutton.h b/lib/widgets/propeditor/pyesnobutton.h
index 3f4cabc4..9e5af75b 100644
--- a/lib/widgets/propeditor/pyesnobutton.h
+++ b/lib/widgets/propeditor/pyesnobutton.h
@@ -33,17 +33,17 @@ class PYesNoButton : public PropertyWidget
 {
     Q_OBJECT
 public:
-    PYesNoButton(MultiProperty* property, QWidget* parent = 0, const char* name = 0);
+    PYesNoButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0);
 
-    virtual QVariant value() const;
-    virtual void drawViewer(QPainter* p, const QColorGroup& cg, const QRect& r, const QVariant& value);
-    virtual void setValue(const QVariant& value, bool emitChange);
+    virtual TQVariant value() const;
+    virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
+    virtual void setValue(const TQVariant& value, bool emitChange);
 
 protected slots:
     void updateProperty(bool toggled);
 
 private:
-    QPushButton *m_edit;
+    TQPushButton *m_edit;
 };
 
 }
diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp
index 4de4e567..e1b09e4e 100644
--- a/lib/widgets/propeditor/qeditlistbox.cpp
+++ b/lib/widgets/propeditor/qeditlistbox.cpp
@@ -23,15 +23,15 @@
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -46,24 +46,24 @@ public:
     int buttons;
 };
 
-QEditListBox::QEditListBox(QWidget *parent, const char *name,
+QEditListBox::QEditListBox(TQWidget *parent, const char *name,
 			   bool checkAtEntering, int buttons )
-    :QGroupBox(parent, name )
+    :TQGroupBox(parent, name )
 {
     init( checkAtEntering, buttons );
 }
 
-QEditListBox::QEditListBox(const QString& title, QWidget *parent,
+QEditListBox::QEditListBox(const TQString& title, TQWidget *parent,
 			   const char *name, bool checkAtEntering, int buttons)
-    :QGroupBox(title, parent, name )
+    :TQGroupBox(title, parent, name )
 {
     init( checkAtEntering, buttons );
 }
 
-QEditListBox::QEditListBox(const QString& title, const CustomEditor& custom,
-                           QWidget *parent, const char *name,
+QEditListBox::QEditListBox(const TQString& title, const CustomEditor& custom,
+                           TQWidget *parent, const char *name,
                            bool checkAtEntering, int buttons)
-    :QGroupBox(title, parent, name )
+    :TQGroupBox(title, parent, name )
 {
     m_lineEdit = custom.lineEdit();
     init( checkAtEntering, buttons, custom.representationWidget() );
@@ -76,7 +76,7 @@ QEditListBox::~QEditListBox()
 }
 
 void QEditListBox::init( bool checkAtEntering, int buttons,
-                         QWidget *representationWidget )
+                         TQWidget *representationWidget )
 {
     d=new QEditListBoxPrivate;
     d->m_checkAtEntering=checkAtEntering;
@@ -92,11 +92,11 @@ void QEditListBox::init( bool checkAtEntering, int buttons,
 
 
     servNewButton = servRemoveButton = servUpButton = servDownButton = 0L;
-    setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
-                              QSizePolicy::MinimumExpanding));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+                              TQSizePolicy::MinimumExpanding));
 
-    QWidget * gb = this;
-    QGridLayout * grid = new QGridLayout(gb, 7 - lostButtons, 2,
+    TQWidget * gb = this;
+    TQGridLayout * grid = new TQGridLayout(gb, 7 - lostButtons, 2,
                                          MarginSize,
                                          SpazingSize);
     grid->addRowSpacing(0, fontMetrics().lineSpacing());
@@ -106,56 +106,56 @@ void QEditListBox::init( bool checkAtEntering, int buttons,
     grid->setMargin(15);
 
     if ( representationWidget )
-        representationWidget->reparent( gb, QPoint(0,0) );
+        representationWidget->reparent( gb, TQPoint(0,0) );
     else
         m_lineEdit=new KLineEdit(gb);
 
-    m_listBox = new QListBox(gb);
+    m_listBox = new TQListBox(gb);
 
-    QWidget *editingWidget = representationWidget ?
+    TQWidget *editingWidget = representationWidget ?
                              representationWidget : m_lineEdit;
     grid->addMultiCellWidget(editingWidget,1,1,0,1);
     grid->addMultiCellWidget(m_listBox, 2, 6 - lostButtons, 0, 0);
     int row = 2;
     if ( buttons & Add ) {
-        servNewButton = new QPushButton(i18n("&Add"), gb);
+        servNewButton = new TQPushButton(i18n("&Add"), gb);
         servNewButton->setEnabled(false);
-        connect(servNewButton, SIGNAL(clicked()), SLOT(addItem()));
+        connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
 
         grid->addWidget(servNewButton, row++, 1);
     }
 
     if ( buttons & Remove ) {
-        servRemoveButton = new QPushButton(i18n("&Remove"), gb);
+        servRemoveButton = new TQPushButton(i18n("&Remove"), gb);
         servRemoveButton->setEnabled(false);
-        connect(servRemoveButton, SIGNAL(clicked()), SLOT(removeItem()));
+        connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
 
         grid->addWidget(servRemoveButton, row++, 1);
     }
 
     if ( buttons & UpDown ) {
-        servUpButton = new QPushButton(i18n("Move &Up"), gb);
+        servUpButton = new TQPushButton(i18n("Move &Up"), gb);
         servUpButton->setEnabled(false);
-        connect(servUpButton, SIGNAL(clicked()), SLOT(moveItemUp()));
+        connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp()));
 
-        servDownButton = new QPushButton(i18n("Move &Down"), gb);
+        servDownButton = new TQPushButton(i18n("Move &Down"), gb);
         servDownButton->setEnabled(false);
-        connect(servDownButton, SIGNAL(clicked()), SLOT(moveItemDown()));
+        connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown()));
 
         grid->addWidget(servUpButton, row++, 1);
         grid->addWidget(servDownButton, row++, 1);
     }
 
-    connect(m_lineEdit,SIGNAL(textChanged(const QString&)),this,SLOT(typedSomething(const QString&)));
+    connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&)));
 
-    connect(m_lineEdit,SIGNAL(returnPressed()),this,SLOT(addItem()));
-    connect(m_listBox, SIGNAL(highlighted(int)), SLOT(enableMoveButtons(int)));
+    connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem()));
+    connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int)));
 
     // maybe supplied lineedit has some text already
     typedSomething( m_lineEdit->text() );
 }
 
-void QEditListBox::typedSomething(const QString& text)
+void QEditListBox::typedSomething(const TQString& text)
 {
     if(currentItem() >= 0) {
         if(currentText() != m_lineEdit->text())
@@ -206,7 +206,7 @@ void QEditListBox::moveItemUp()
         return;
     }
 
-    QListBoxItem *selItem = m_listBox->item(selIndex);
+    TQListBoxItem *selItem = m_listBox->item(selIndex);
     m_listBox->takeItem(selItem);
     m_listBox->insertItem(selItem, selIndex-1);
     m_listBox->setCurrentItem(selIndex - 1);
@@ -229,7 +229,7 @@ void QEditListBox::moveItemDown()
         return;
     }
 
-    QListBoxItem *selItem = m_listBox->item(selIndex);
+    TQListBoxItem *selItem = m_listBox->item(selIndex);
     m_listBox->takeItem(selItem);
     m_listBox->insertItem(selItem, selIndex+1);
     m_listBox->setCurrentItem(selIndex + 1);
@@ -245,7 +245,7 @@ void QEditListBox::addItem()
     if ( !servNewButton || !servNewButton->isEnabled() )
         return;
 
-    const QString& currentTextLE=m_lineEdit->text();
+    const TQString& currentTextLE=m_lineEdit->text();
     bool alreadyInList(false);
     //if we didn't check for dupes at the inserting we have to do it now
     if (!d->m_checkAtEntering)
@@ -294,7 +294,7 @@ void QEditListBox::removeItem()
 
     if ( selected >= 0 )
     {
-	QString removedText = m_listBox->currentText();
+	TQString removedText = m_listBox->currentText();
 
         m_listBox->removeItem( selected );
         if ( count() > 0 )
@@ -351,17 +351,17 @@ void QEditListBox::clear()
     emit changed();
 }
 
-void QEditListBox::insertStringList(const QStringList& list, int index)
+void QEditListBox::insertStringList(const TQStringList& list, int index)
 {
     m_listBox->insertStringList(list,index);
 }
 
-void QEditListBox::insertStrList(const QStrList* list, int index)
+void QEditListBox::insertStrList(const TQStrList* list, int index)
 {
     m_listBox->insertStrList(list,index);
 }
 
-void QEditListBox::insertStrList(const QStrList& list, int index)
+void QEditListBox::insertStrList(const TQStrList& list, int index)
 {
     m_listBox->insertStrList(list,index);
 }
@@ -371,16 +371,16 @@ void QEditListBox::insertStrList(const char ** list, int numStrings, int index)
     m_listBox->insertStrList(list,numStrings,index);
 }
 
-QStringList QEditListBox::items() const
+TQStringList QEditListBox::items() const
 {
-    QStringList list;
+    TQStringList list;
     for ( uint i = 0; i < m_listBox->count(); i++ )
 	list.append( m_listBox->text( i ));
 
     return list;
 }
 
-void QEditListBox::setItems(const QStringList& items)
+void QEditListBox::setItems(const TQStringList& items)
 {
   m_listBox->clear();
   m_listBox->insertStringList(items, 0);
@@ -393,7 +393,7 @@ void QEditListBox::virtual_hook( int, void* )
 ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////
 
-QEditListBox::CustomEditor::CustomEditor( QComboBox *combo )
+QEditListBox::CustomEditor::CustomEditor( TQComboBox *combo )
 {
     m_representationWidget = combo;
     m_lineEdit = dynamic_cast( combo->lineEdit() );
diff --git a/lib/widgets/propeditor/qeditlistbox.h b/lib/widgets/propeditor/qeditlistbox.h
index 93bf8bf3..245f8b57 100644
--- a/lib/widgets/propeditor/qeditlistbox.h
+++ b/lib/widgets/propeditor/qeditlistbox.h
@@ -20,8 +20,8 @@
 #ifndef QEDITLISTBOX_H
 #define QEDITLISTBOX_H
 
-#include 
-#include 
+#include 
+#include 
 
 class KLineEdit;
 class QComboBox;
@@ -46,7 +46,7 @@ class QEditListBox : public QGroupBox
 {
    Q_OBJECT
 
-   Q_PROPERTY( QStringList items READ items WRITE setItems )
+   Q_PROPERTY( TQStringList items READ items WRITE setItems )
 
 public:
     // @since 3.1
@@ -56,19 +56,19 @@ public:
         CustomEditor()
             : m_representationWidget( 0L ),
               m_lineEdit( 0L ) {}
-        CustomEditor( QWidget *repWidget, KLineEdit *edit )
+        CustomEditor( TQWidget *repWidget, KLineEdit *edit )
             : m_representationWidget( repWidget ),
               m_lineEdit( edit ) {}
-        CustomEditor( QComboBox *combo );
+        CustomEditor( TQComboBox *combo );
 
-        void setRepresentationWidget( QWidget *repWidget ) {
+        void setRepresentationWidget( TQWidget *repWidget ) {
             m_representationWidget = repWidget;
         }
         void setLineEdit( KLineEdit *edit ) {
             m_lineEdit = edit;
         }
 
-        virtual QWidget   *representationWidget() const {
+        virtual TQWidget   *representationWidget() const {
             return m_representationWidget;
         }
         virtual KLineEdit *lineEdit() const {
@@ -76,7 +76,7 @@ public:
         }
 
     protected:
-        QWidget *m_representationWidget;
+        TQWidget *m_representationWidget;
         KLineEdit *m_lineEdit;
     };
 
@@ -100,7 +100,7 @@ public:
        * it will be checked if you press the Add-button. It is not
        * possible to enter items twice into the listbox.
        */
-      QEditListBox(QWidget *parent = 0, const char *name = 0,
+      QEditListBox(TQWidget *parent = 0, const char *name = 0,
 		   bool checkAtEntering=false, int buttons = All );
       /**
        * Create an editable listbox.
@@ -108,33 +108,33 @@ public:
        * The same as the other constructor, additionally it takes
        * @p title, which will be the title of the frame around the listbox.
        */
-      QEditListBox(const QString& title, QWidget *parent = 0,
+      QEditListBox(const TQString& title, TQWidget *parent = 0,
 		   const char *name = 0, bool checkAtEntering=false,
 		   int buttons = All );
 
       /**
        * Another constructor, which allows to use a custom editing widget
-       * instead of the standard QLineEdit widget. E.g. you can use a
-       * KURLRequester or a QComboBox as input widget. The custom
+       * instead of the standard TQLineEdit widget. E.g. you can use a
+       * KURLRequester or a TQComboBox as input widget. The custom
        * editor must consist of a lineedit and optionally another widget that
-       * is used as representation. A QComboBox or a KURLRequester have a
-       * QLineEdit as child-widget for example, so the QComboBox is used as
+       * is used as representation. A TQComboBox or a KURLRequester have a
+       * TQLineEdit as child-widget for example, so the TQComboBox is used as
        * the representation widget.
        *
        * @see KURLRequester::customEditor()
        * @since 3.1
        */
-      QEditListBox( const QString& title,
+      QEditListBox( const TQString& title,
                     const CustomEditor &customEditor,
-                    QWidget *parent = 0, const char *name = 0,
+                    TQWidget *parent = 0, const char *name = 0,
                     bool checkAtEntering = false, int buttons = All );
 
       virtual ~QEditListBox();
 
       /**
-       * Return a pointer to the embedded QListBox.
+       * Return a pointer to the embedded TQListBox.
        */
-      QListBox* listBox() const     { return m_listBox; }
+      TQListBox* listBox() const     { return m_listBox; }
       /**
        * Return a pointer to the embedded KLineEdit.
        */
@@ -142,72 +142,72 @@ public:
       /**
        * Return a pointer to the Add button
        */
-      QPushButton* addButton() const     { return servNewButton; }
+      TQPushButton* addButton() const     { return servNewButton; }
       /**
        * Return a pointer to the Remove button
        */
-      QPushButton* removeButton() const     { return servRemoveButton; }
+      TQPushButton* removeButton() const     { return servRemoveButton; }
       /**
        * Return a pointer to the Up button
        */
-      QPushButton* upButton() const     { return servUpButton; }
+      TQPushButton* upButton() const     { return servUpButton; }
       /**
        * Return a pointer to the Down button
        */
-      QPushButton* downButton() const     { return servDownButton; }
+      TQPushButton* downButton() const     { return servDownButton; }
 
       /**
-       * See QListBox::count()
+       * See TQListBox::count()
        */
       int count() const   { return int(m_listBox->count()); }
       /**
-       * See QListBox::insertStringList()
+       * See TQListBox::insertStringList()
        */
-      void insertStringList(const QStringList& list, int index=-1);
+      void insertStringList(const TQStringList& list, int index=-1);
       /**
-       * See QListBox::insertStringList()
+       * See TQListBox::insertStringList()
        */
-      void insertStrList(const QStrList* list, int index=-1);
+      void insertStrList(const TQStrList* list, int index=-1);
       /**
-       * See QListBox::insertStrList()
+       * See TQListBox::insertStrList()
        */
-      void insertStrList(const QStrList& list, int index=-1);
+      void insertStrList(const TQStrList& list, int index=-1);
       /**
-       * See QListBox::insertStrList()
+       * See TQListBox::insertStrList()
        */
       void insertStrList(const char ** list, int numStrings=-1, int index=-1);
       /**
-       * See QListBox::insertItem()
+       * See TQListBox::insertItem()
        */
-      void insertItem(const QString& text, int index=-1) {m_listBox->insertItem(text,index);}
+      void insertItem(const TQString& text, int index=-1) {m_listBox->insertItem(text,index);}
       /**
        * Clears both the listbox and the line edit.
        */
       void clear();
       /**
-       * See QListBox::text()
+       * See TQListBox::text()
        */
-      QString text(int index) const { return m_listBox->text(index); }
+      TQString text(int index) const { return m_listBox->text(index); }
       /**
-       * See QListBox::currentItem()
+       * See TQListBox::currentItem()
        */
       int currentItem() const;
       /**
-       * See QListBox::currentText()
+       * See TQListBox::currentText()
        */
-      QString currentText() const  { return m_listBox->currentText(); }
+      TQString currentText() const  { return m_listBox->currentText(); }
 
       /**
        * @returns a stringlist of all items in the listbox
        */
-      QStringList items() const;
+      TQStringList items() const;
 
       /**
        * Clears the listbox and sets the contents to @p items
        *
        * @since 3.4
        */
-      void setItems(const QStringList& items);
+      void setItems(const TQStringList& items);
 
    signals:
       void changed();
@@ -217,14 +217,14 @@ public:
        * the parameter is the added string.
        * @since 3.2
        */
-      void added( const QString & text );
+      void added( const TQString & text );
 
       /**
        * This signal is emitted when the user removes a string from the list,
        * the parameter is the removed string.
        * @since 3.2
        */
-      void removed( const QString & text );
+      void removed( const TQString & text );
 
    protected slots:
       //the names should be self-explaining
@@ -233,17 +233,17 @@ public:
       void addItem();
       void removeItem();
       void enableMoveButtons(int index);
-      void typedSomething(const QString& text);
+      void typedSomething(const TQString& text);
 
    private:
-      QListBox *m_listBox;
-      QPushButton *servUpButton, *servDownButton;
-      QPushButton *servNewButton, *servRemoveButton;
+      TQListBox *m_listBox;
+      TQPushButton *servUpButton, *servDownButton;
+      TQPushButton *servNewButton, *servRemoveButton;
       KLineEdit *m_lineEdit;
 
       //this is called in both ctors, to avoid code duplication
       void init( bool checkAtEntering, int buttons,
-                 QWidget *representationWidget = 0L );
+                 TQWidget *representationWidget = 0L );
 
    protected:
       virtual void virtual_hook( int id, void* data );
diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp
index f1bde4cd..a8522105 100644
--- a/lib/widgets/propeditor/qfloatinput.cpp
+++ b/lib/widgets/propeditor/qfloatinput.cpp
@@ -23,23 +23,23 @@
 #include 
 
 QFloatInput::QFloatInput( int min, int max, float step, int digits,
-                            QWidget *parent, const char *name )
-    : QSpinBox( (int) (min*pow(digits,10)),
+                            TQWidget *parent, const char *name )
+    : TQSpinBox( (int) (min*pow(digits,10)),
                 (int) (max*pow(digits,10)),
                 (int) (step*pow(digits,10)), parent, name ),
       m_digits( digits )
 {
     setValue( (int) (min*pow(digits,10)) );
     delete validator();
-    QDoubleValidator* validator =
-        new QDoubleValidator( min,  max, m_digits, this );
+    TQDoubleValidator* validator =
+        new TQDoubleValidator( min,  max, m_digits, this );
     setValidator( validator );
 }
 
-QString QFloatInput::mapValueToText( int value )
+TQString QFloatInput::mapValueToText( int value )
 {
-    QString format = QString("%.%1f").arg( m_digits );
-    return QString().sprintf(format.latin1(),
+    TQString format = TQString("%.%1f").arg( m_digits );
+    return TQString().sprintf(format.latin1(),
                              (value/(float)pow(m_digits,10)) );
 }
 
diff --git a/lib/widgets/propeditor/qfloatinput.h b/lib/widgets/propeditor/qfloatinput.h
index 5f5adbd4..4bbe63e6 100644
--- a/lib/widgets/propeditor/qfloatinput.h
+++ b/lib/widgets/propeditor/qfloatinput.h
@@ -21,17 +21,17 @@
 #ifndef QFLOATINPUT_H
 #define QFLOATINPUT_H
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 class QFloatInput : public QSpinBox
 {
 public:
     QFloatInput( int min, int max, float step, int digits,
-                  QWidget *parent, const char *name = 0 );
+                  TQWidget *parent, const char *name = 0 );
 
-    virtual QString  mapValueToText( int value );
+    virtual TQString  mapValueToText( int value );
 
     virtual int mapTextToValue( bool* ok );
 
diff --git a/lib/widgets/propeditor/test.cpp b/lib/widgets/propeditor/test.cpp
index 0063e2d6..82665f98 100644
--- a/lib/widgets/propeditor/test.cpp
+++ b/lib/widgets/propeditor/test.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include 
+#include 
 
 #include "propertyeditor.h"
 #include "propertylist.h"
@@ -27,7 +27,7 @@ using namespace PropertyLib;
 
 int main( int argc, char **argv )
 {
-    QApplication app( argc, argv );
+    TQApplication app( argc, argv );
 
     PropertyEditor *editor = new PropertyEditor( 0 );
 
@@ -44,10 +44,10 @@ int main( int argc, char **argv )
                       "sample pixmap description" ) );
     currentList->addProperty(
         new Property( Property::Rect, "Rectangle",
-                      "sample rectangle", QRect( 10, 11, 30, 40 ) ) );
+                      "sample rectangle", TQRect( 10, 11, 30, 40 ) ) );
     currentList->addProperty(
         new Property( Property::Point, "Point",
-                      "sample point", QPoint( 20, 30 ) ) );
+                      "sample point", TQPoint( 20, 30 ) ) );
     currentList->addProperty(
         new Property( Property::Boolean, "Boolean",
                       "sample bool", false ) );
@@ -59,7 +59,7 @@ int main( int argc, char **argv )
         new Property( Property::Double, "Double",
                       "sample double", 7.0 ) );
 
-    QStringList things;
+    TQStringList things;
     things += "Thing 1";
     things += "Thing 2";
 
diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp
index 2cab4fea..800eec47 100644
--- a/lib/widgets/qcomboview.cpp
+++ b/lib/widgets/qcomboview.cpp
@@ -16,21 +16,21 @@
 #include "qcomboview.h"
 #include 
 #ifndef QT_NO_COMBOBOX
-#include "qpopupmenu.h"
-#include "qlistview.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qstrlist.h"
-#include "qpixmap.h"
-#include "qtimer.h"
-#include "qapplication.h"
-#include "qlineedit.h"
-#include "qbitmap.h"
+#include "tqpopupmenu.h"
+#include "tqlistview.h"
+#include "tqpainter.h"
+#include "tqdrawutil.h"
+#include "tqstrlist.h"
+#include "tqpixmap.h"
+#include "tqtimer.h"
+#include "tqapplication.h"
+#include "tqlineedit.h"
+#include "tqbitmap.h"
 #include "private/qeffects_p.h"
-#include "qstringlist.h"
-#include "qcombobox.h"
-#include "qstyle.h"
-#include "qheader.h"
+#include "tqstringlist.h"
+#include "tqcombobox.h"
+#include "tqstyle.h"
+#include "tqheader.h"
 #include 
 
 class QComboViewData
@@ -39,16 +39,16 @@ public:
     QComboViewData( QComboView *cb ): current(0), lView( 0 ), combo( cb )
     {
         duplicatesEnabled = TRUE;
-        cb->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed ) );
+        cb->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
     }
 
-    inline QListView * listView() { return lView; }
+    inline TQListView * listView() { return lView; }
     void updateLinedGeometry();
 
-    void setListView( QListView *l ) { lView = l ;
+    void setListView( TQListView *l ) { lView = l ;
         l->setMouseTracking( TRUE );}
 
-    QListViewItem *current;
+    TQListViewItem *current;
     int maxCount;
     int sizeLimit;
     QComboView::Policy p;
@@ -65,14 +65,14 @@ public:
     bool duplicatesEnabled;
     int fullHeight, currHeight;
 
-    QLineEdit * ed;  // /bin/ed rules!
-    QTimer *completionTimer;
+    TQLineEdit * ed;  // /bin/ed rules!
+    TQTimer *completionTimer;
 
-    QSize sizeHint;
+    TQSize sizeHint;
 
 private:
     bool	usinglView;
-    QListView   *lView;
+    TQListView   *lView;
     QComboView *combo;
 
 };
@@ -81,11 +81,11 @@ void QComboViewData::updateLinedGeometry()
 {
     if ( !ed || !combo )
         return;
-    QRect r = QStyle::visualRect( combo->style().querySubControlMetrics(QStyle::CC_ComboBox, combo,
-                                        QStyle::SC_ComboBoxEditField), combo );
+    TQRect r = TQStyle::visualRect( combo->style().querySubControlMetrics(TQStyle::CC_ComboBox, combo,
+                                        TQStyle::SC_ComboBoxEditField), combo );
 
 //    qWarning("updateLinedGeometry(): currentItem is %d", combo->currentItem() == 0 ? 0 : 1);
-    const QPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0;
+    const TQPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0;
     if ( pix && pix->width() < r.width() )
         r.setLeft( r.left() + pix->width() + 4 );
     if ( r != ed->geometry() )
@@ -138,8 +138,8 @@ static inline bool checkIndex( const char *method, const char * name,
 */
 
 
-QComboView::QComboView( bool rw, QWidget *parent, const char *name )
-    : QWidget( parent, name, WResizeNoErase )
+QComboView::QComboView( bool rw, TQWidget *parent, const char *name )
+    : TQWidget( parent, name, WResizeNoErase )
 {
     d = new QComboViewData( this );
     setUpListView();
@@ -156,7 +156,7 @@ QComboView::QComboView( bool rw, QWidget *parent, const char *name )
     d->useCompletion = FALSE;
     d->completeAt = 0;
     d->completeNow = FALSE;
-    d->completionTimer = new QTimer( this );
+    d->completionTimer = new TQTimer( this );
 
     setFocusPolicy( StrongFocus );
 
@@ -204,18 +204,18 @@ void QComboView::clear()
 
     d->current = 0;
     if ( d->ed ) {
-        d->ed->setText( QString::fromLatin1("") );
+        d->ed->setText( TQString::fromLatin1("") );
         d->updateLinedGeometry();
     }
     currentChanged();
 }
 
-QListViewItem *QComboView::currentItem() const
+TQListViewItem *QComboView::currentItem() const
 {
     return d->current;
 }
 
-void QComboView::setCurrentItem( QListViewItem *item )
+void QComboView::setCurrentItem( TQListViewItem *item )
 {
     if ( item == d->current && !d->ed ) {
         return;
@@ -272,16 +272,16 @@ void QComboView::setAutoResize( bool enable )
     the contents change dynamically. To invalidate the cached value
     call setFont().
 */
-QSize QComboView::sizeHint() const
+TQSize QComboView::sizeHint() const
 {
     if ( isVisible() && d->sizeHint.isValid() )
         return d->sizeHint;
 
     constPolish();
 //    int i, w;
-    QFontMetrics fm = fontMetrics();
+    TQFontMetrics fm = fontMetrics();
 
-    int maxW = childCount() ? 18 : 7 * fm.width(QChar('x')) + 18;
+    int maxW = childCount() ? 18 : 7 * fm.width(TQChar('x')) + 18;
     int maxH = QMAX( fm.lineSpacing(), 14 ) + 2;
 
 /*    for( i = 0; i < count(); i++ ) {
@@ -290,8 +290,8 @@ QSize QComboView::sizeHint() const
             maxW = w;
     }
 */
-    d->sizeHint = (style().sizeFromContents(QStyle::CT_ComboBox, this,
-        QSize(maxW, maxH)).expandedTo(QApplication::globalStrut()));
+    d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this,
+        TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()));
 
     return d->sizeHint;
 }
@@ -303,7 +303,7 @@ QSize QComboView::sizeHint() const
   the activated() signal.
 */
 
-void QComboView::internalActivate( QListViewItem * item )
+void QComboView::internalActivate( TQListViewItem * item )
 {
     if (!item)
     {
@@ -319,7 +319,7 @@ void QComboView::internalActivate( QListViewItem * item )
 
     d->current = item;
 
-    QString t( item->text(0) );
+    TQString t( item->text(0) );
     if ( d->ed ) {
         d->ed->setText( t );
 //        qWarning("internalActivate( %s )", item->text(0).latin1());
@@ -337,7 +337,7 @@ void QComboView::internalActivate( QListViewItem * item )
   the highlighted() signal.
 */
 
-void QComboView::internalHighlight( QListViewItem * item )
+void QComboView::internalHighlight( TQListViewItem * item )
 {
     if (!item)
     {
@@ -349,7 +349,7 @@ void QComboView::internalHighlight( QListViewItem * item )
         return;
     }
     emit highlighted( item );
-    QString t = item->text(0);
+    TQString t = item->text(0);
     if ( !t.isNull() )
         emit highlighted( t );
 }
@@ -369,9 +369,9 @@ void QComboView::internalClickTimeout()
     popup list to \a palette.
 */
 
-void QComboView::setPalette( const QPalette &palette )
+void QComboView::setPalette( const TQPalette &palette )
 {
-    QWidget::setPalette( palette );
+    TQWidget::setPalette( palette );
     if( d ) {
         if(d->listView())
             d->listView()->setPalette( palette );
@@ -383,10 +383,10 @@ void QComboView::setPalette( const QPalette &palette )
     list to \a font.
 */
 
-void QComboView::setFont( const QFont &font )
+void QComboView::setFont( const TQFont &font )
 {
-    d->sizeHint = QSize();      // invalidate size hint
-    QWidget::setFont( font );
+    d->sizeHint = TQSize();      // invalidate size hint
+    TQWidget::setFont( font );
     d->listView()->setFont( font );
     if (d->ed)
         d->ed->setFont( font );
@@ -398,49 +398,49 @@ void QComboView::setFont( const QFont &font )
 /*!reimp
 */
 
-void QComboView::resizeEvent( QResizeEvent * e )
+void QComboView::resizeEvent( TQResizeEvent * e )
 {
     if ( d->ed )
         d->updateLinedGeometry();
     d->listView()->resize( width(), d->listView()->height() );
-    QWidget::resizeEvent( e );
+    TQWidget::resizeEvent( e );
 }
 
 /*!reimp
 */
 
-void QComboView::paintEvent( QPaintEvent * )
+void QComboView::paintEvent( TQPaintEvent * )
 {
-    QPainter p( this );
-    const QColorGroup & g = colorGroup();
+    TQPainter p( this );
+    const TQColorGroup & g = colorGroup();
     p.setPen(g.text());
 
-    QStyle::SFlags flags = QStyle::Style_Default;
+    TQStyle::SFlags flags = TQStyle::Style_Default;
     if (isEnabled())
-        flags |= QStyle::Style_Enabled;
+        flags |= TQStyle::Style_Enabled;
     if (hasFocus())
-        flags |= QStyle::Style_HasFocus;
+        flags |= TQStyle::Style_HasFocus;
 
     if ( width() < 5 || height() < 5 ) {
         qDrawShadePanel( &p, rect(), g, FALSE, 2,
-                &g.brush( QColorGroup::Button ) );
+                &g.brush( TQColorGroup::Button ) );
         return;
     }
 
-//    bool reverse = QApplication::reverseLayout();
-    style().drawComplexControl( QStyle::CC_ComboBox, &p, this, rect(), g,
-                    flags, QStyle::SC_All,
+//    bool reverse = TQApplication::reverseLayout();
+    style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+                    flags, TQStyle::SC_All,
                     (d->arrowDown ?
-                    QStyle::SC_ComboBoxArrow :
-                    QStyle::SC_None ));
+                    TQStyle::SC_ComboBoxArrow :
+                    TQStyle::SC_None ));
 
-    QRect re = style().querySubControlMetrics( QStyle::CC_ComboBox, this,
-                        QStyle::SC_ComboBoxEditField );
-    re = QStyle::visualRect(re, this);
+    TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+                        TQStyle::SC_ComboBoxEditField );
+    re = TQStyle::visualRect(re, this);
     p.setClipRect( re );
 
     if ( !d->ed ) {
-        QListViewItem * item = d->current;
+        TQListViewItem * item = d->current;
         if ( item ) {
             // we calculate the QListBoxTexts height (ignoring strut)
             int itemh = d->listView()->fontMetrics().lineSpacing() + 2;
@@ -448,11 +448,11 @@ void QComboView::paintEvent( QPaintEvent * )
             item->paintCell( &p, d->listView()->colorGroup(), 0, width(), AlignLeft | AlignVCenter );
         }
     } else if ( d->listView() && d->listView()->currentItem( ) && d->current ) {
-        QListViewItem * item = d->current ;
-        const QPixmap *pix = item->pixmap(0);
+        TQListViewItem * item = d->current ;
+        const TQPixmap *pix = item->pixmap(0);
         if ( pix ) {
             p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(),
-                    colorGroup().brush( QColorGroup::Base ) );
+                    colorGroup().brush( TQColorGroup::Base ) );
             p.drawPixmap( re.x() + 2, re.y() +
                     ( re.height() - pix->height() ) / 2, *pix );
         }
@@ -464,7 +464,7 @@ void QComboView::paintEvent( QPaintEvent * )
 /*!reimp
 */
 
-void QComboView::mousePressEvent( QMouseEvent *e )
+void QComboView::mousePressEvent( TQMouseEvent *e )
 {
     if ( e->button() != LeftButton )
         return;
@@ -472,9 +472,9 @@ void QComboView::mousePressEvent( QMouseEvent *e )
         d->discardNextMousePress = FALSE;
         return;
     }
-    QRect arrowRect = style().querySubControlMetrics( QStyle::CC_ComboBox, this,
-                                QStyle::SC_ComboBoxArrow);
-    arrowRect = QStyle::visualRect(arrowRect, this);
+    TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+                                TQStyle::SC_ComboBoxArrow);
+    arrowRect = TQStyle::visualRect(arrowRect, this);
 
     // Correction for motif style, where arrow is smaller
     // and thus has a rect that doesn't fit the button.
@@ -491,7 +491,7 @@ void QComboView::mousePressEvent( QMouseEvent *e )
             d->arrowDown    = TRUE;
             repaint( FALSE );
         }
-        QTimer::singleShot( 200, this, SLOT(internalClickTimeout()));
+        TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout()));
         d->shortClick = TRUE;
     }
 }
@@ -499,21 +499,21 @@ void QComboView::mousePressEvent( QMouseEvent *e )
 /*!reimp
 */
 
-void QComboView::mouseMoveEvent( QMouseEvent * )
+void QComboView::mouseMoveEvent( TQMouseEvent * )
 {
 }
 
 /*!reimp
 */
 
-void QComboView::mouseReleaseEvent( QMouseEvent * )
+void QComboView::mouseReleaseEvent( TQMouseEvent * )
 {
 }
 
 /*!reimp
 */
 
-void QComboView::mouseDoubleClickEvent( QMouseEvent *e )
+void QComboView::mouseDoubleClickEvent( TQMouseEvent *e )
 {
     mousePressEvent( e );
 }
@@ -522,9 +522,9 @@ void QComboView::mouseDoubleClickEvent( QMouseEvent *e )
 /*!reimp
 */
 
-void QComboView::keyPressEvent( QKeyEvent *e )
+void QComboView::keyPressEvent( TQKeyEvent *e )
 {
-    QListViewItem *c = currentItem();
+    TQListViewItem *c = currentItem();
     if ( ( e->key() == Key_F4 && e->state() == 0 ) ||
         ( e->key() == Key_Down && (e->state() & AltButton) ) ||
         ( !d->ed && e->key() == Key_Space ) ) {
@@ -571,7 +571,7 @@ void QComboView::keyPressEvent( QKeyEvent *e )
                 return;
         } else {
             d->completionTimer->stop();
-            QString ct = currentText().left( d->completeAt ) + e->text();
+            TQString ct = currentText().left( d->completeAt ) + e->text();
             c = completionIndex( ct, c );
             if ( c == 0 && d->completeAt > 0 ) {
                 c = completionIndex( e->text(), listView()->firstChild() );
@@ -597,22 +597,22 @@ void QComboView::keyPressEvent( QKeyEvent *e )
     emit activated( c );
 }
 
-QString QComboView::currentText() const
+TQString QComboView::currentText() const
 {
     if ( d->ed )
         return d->ed->text();
     else if ( d->current )
         return currentItem()->text(0);
     else
-        return QString::null;
+        return TQString::null;
 }
 
 /*!reimp
 */
 
-void QComboView::focusInEvent( QFocusEvent * e )
+void QComboView::focusInEvent( TQFocusEvent * e )
 {
-    QWidget::focusInEvent( e );
+    TQWidget::focusInEvent( e );
     d->completeNow = FALSE;
     d->completeAt = 0;
 
@@ -622,9 +622,9 @@ void QComboView::focusInEvent( QFocusEvent * e )
 /*!reimp
 */
 
-void QComboView::focusOutEvent( QFocusEvent * e )
+void QComboView::focusOutEvent( TQFocusEvent * e )
 {
-    QWidget::focusOutEvent( e );
+    TQWidget::focusOutEvent( e );
     d->completeNow = FALSE;
     d->completeAt = 0;
 
@@ -634,20 +634,20 @@ void QComboView::focusOutEvent( QFocusEvent * e )
 /*!reimp
 */
 
-void QComboView::wheelEvent( QWheelEvent *e )
+void QComboView::wheelEvent( TQWheelEvent *e )
 {
     if ( d->poppedUp ) {
-        QApplication::sendEvent( d->listView(), e );
+        TQApplication::sendEvent( d->listView(), e );
     } else {
         if ( e->delta() > 0 ) {
-            QListViewItem *c = currentItem();
+            TQListViewItem *c = currentItem();
             if ( c && c->itemAbove() ) {
                 setCurrentItem( c->itemAbove() );
                 emit activated( currentItem() );
                 emit activated( currentText() );
             }
         } else {
-            QListViewItem *c = currentItem();
+            TQListViewItem *c = currentItem();
             if ( c && c->itemBelow() ) {
                 setCurrentItem( c->itemBelow() );
                 emit activated( currentItem() );
@@ -658,10 +658,10 @@ void QComboView::wheelEvent( QWheelEvent *e )
     }
 }
 
-int childCount(QListViewItem *it)
+int childCount(TQListViewItem *it)
 {
     int count = 1;
-    QListViewItem * myChild = it->firstChild();
+    TQListViewItem * myChild = it->firstChild();
     while( myChild ) {
         count += childCount(myChild);
         myChild = myChild->nextSibling();
@@ -669,10 +669,10 @@ int childCount(QListViewItem *it)
     return count;
 }
 
-int childCount(QListView *lv)
+int childCount(TQListView *lv)
 {
     int count = 0;
-    QListViewItem * myChild = lv->firstChild();
+    TQListViewItem * myChild = lv->firstChild();
     while( myChild ) {
         count += childCount(myChild);
 //        count += 1;
@@ -686,7 +686,7 @@ int childCount(QListView *lv)
    Calculates the listbox height needed to contain all items, or as
    many as the list box is supposed to contain.
 */
-static int listHeight( QListView *l, int /*sl*/ )
+static int listHeight( TQListView *l, int /*sl*/ )
 {
 /*    if ( l->childCount() > 0 )
         return QMIN( l->childCount(), (uint)sl) * l->firstChild()->height();
@@ -722,7 +722,7 @@ void QComboView::popup()
         return;
 
     // Send all listbox events to eventFilter():
-    QListView* lb = d->listView();
+    TQListView* lb = d->listView();
     lb->triggerUpdate( );
     lb->installEventFilter( this );
     lb->viewport()->installEventFilter( this );
@@ -730,13 +730,13 @@ void QComboView::popup()
 //    int w = lb->variableWidth() ? lb->sizeHint().width() : width();
     int w = width();
     int h = listHeight( lb, d->sizeLimit );
-    QRect screen = QApplication::desktop()->availableGeometry( const_cast(this) );
+    TQRect screen = TQApplication::desktop()->availableGeometry( const_cast(this) );
 
     int sx = screen.x();        // screen pos
     int sy = screen.y();
     int sw = screen.width();    // screen width
     int sh = screen.height();   // screen height
-    QPoint pos = mapToGlobal( QPoint(0,height()) );
+    TQPoint pos = mapToGlobal( TQPoint(0,height()) );
     // ## Similar code is in QPopupMenu
     int x = pos.x();
     int y = pos.y();
@@ -748,10 +748,10 @@ void QComboView::popup()
         x = sx;
     if (y + h > sy+sh && y - h - height() >= 0 )
         y = y - h - height();
-    QRect rect =
-    style().querySubControlMetrics( QStyle::CC_ComboBox, this,
-                    QStyle::SC_ComboBoxListBoxPopup,
-                    QStyleOption( x, y, w, h ) );
+    TQRect rect =
+    style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+                    TQStyle::SC_ComboBoxListBoxPopup,
+                    TQStyleOption( x, y, w, h ) );
     if ( rect.isNull() )
         rect.setRect( x, y, w, h );
     lb->setGeometry( rect );
@@ -759,17 +759,17 @@ void QComboView::popup()
     lb->raise();
     bool block = lb->signalsBlocked();
     lb->blockSignals( TRUE );
-    QListViewItem *currentLBItem = d->current ;
+    TQListViewItem *currentLBItem = d->current ;
     lb->setCurrentItem( currentLBItem );
     // set the current item to also be the selected item if it isn't already
     if ( currentLBItem && currentLBItem->isSelectable() && !currentLBItem->isSelected() )
         lb->setSelected( currentLBItem, TRUE );
     lb->blockSignals( block );
-    lb->setVScrollBarMode(QScrollView::Auto);
+    lb->setVScrollBarMode(TQScrollView::Auto);
 
 //#ifndef QT_NO_EFFECTS
-/*    if ( QApplication::isEffectEnabled( UI_AnimateCombo ) ) {
-        if ( lb->y() < mapToGlobal(QPoint(0,0)).y() )
+/*    if ( TQApplication::isEffectEnabled( UI_AnimateCombo ) ) {
+        if ( lb->y() < mapToGlobal(TQPoint(0,0)).y() )
         qScrollEffect( lb, QEffects::UpScroll );
         else
         qScrollEffect( lb );
@@ -785,12 +785,12 @@ void QComboView::popup()
 */
 void QComboView::updateMask()
 {
-    QBitmap bm( size() );
+    TQBitmap bm( size() );
     bm.fill( color0 );
 
     {
-        QPainter p( &bm, this );
-        style().drawComplexControlMask(QStyle::CC_ComboBox, &p, this, rect());
+        TQPainter p( &bm, this );
+        style().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect());
     }
 
     setMask( bm );
@@ -846,42 +846,42 @@ void QComboView::currentChanged()
   when the mouse button is released.
 */
 
-bool QComboView::eventFilter( QObject *object, QEvent *event )
+bool QComboView::eventFilter( TQObject *object, TQEvent *event )
 {
     if ( !event )
         return TRUE;
     else if ( object == d->ed ) {
-        if ( event->type() == QEvent::KeyPress ) {
-            bool isAccepted = ( (QKeyEvent*)event )->isAccepted();
-            keyPressEvent( (QKeyEvent *)event );
-            if ( ((QKeyEvent *)event)->isAccepted() ) {
+        if ( event->type() == TQEvent::KeyPress ) {
+            bool isAccepted = ( (TQKeyEvent*)event )->isAccepted();
+            keyPressEvent( (TQKeyEvent *)event );
+            if ( ((TQKeyEvent *)event)->isAccepted() ) {
                 d->completeNow = FALSE;
                 return TRUE;
-            } else if ( ((QKeyEvent *)event)->key() != Key_End ) {
+            } else if ( ((TQKeyEvent *)event)->key() != Key_End ) {
                 d->completeNow = TRUE;
                 d->completeAt = d->ed->cursorPosition();
             }
             if ( isAccepted )
-                ( (QKeyEvent*)event )->accept();
+                ( (TQKeyEvent*)event )->accept();
             else
-                ( (QKeyEvent*)event )->ignore();
-        } else if ( event->type() == QEvent::KeyRelease ) {
+                ( (TQKeyEvent*)event )->ignore();
+        } else if ( event->type() == TQEvent::KeyRelease ) {
             d->completeNow = FALSE;
-            keyReleaseEvent( (QKeyEvent *)event );
-            return ((QKeyEvent *)event)->isAccepted();
-        } else if ( event->type() == QEvent::FocusIn ) {
-            focusInEvent( (QFocusEvent *)event );
-        } else if ( event->type() == QEvent::FocusOut ) {
-            focusOutEvent( (QFocusEvent *)event );
+            keyReleaseEvent( (TQKeyEvent *)event );
+            return ((TQKeyEvent *)event)->isAccepted();
+        } else if ( event->type() == TQEvent::FocusIn ) {
+            focusInEvent( (TQFocusEvent *)event );
+        } else if ( event->type() == TQEvent::FocusOut ) {
+            focusOutEvent( (TQFocusEvent *)event );
         } else if ( d->useCompletion && d->completeNow ) {
             if ( !d->ed->text().isNull() &&
             d->ed->cursorPosition() > d->completeAt &&
             d->ed->cursorPosition() == (int)d->ed->text().length() ) {
                 d->completeNow = FALSE;
-                QString ct( d->ed->text() );
-                QListViewItem *i = completionIndex( ct, currentItem() );
+                TQString ct( d->ed->text() );
+                TQListViewItem *i = completionIndex( ct, currentItem() );
                 if ( i ) {
-                    QString it = i->text(0);
+                    TQString it = i->text(0);
                     d->ed->validateAndSet( it, ct.length(),
                             ct.length(), it.length() );
                 }
@@ -889,22 +889,22 @@ bool QComboView::eventFilter( QObject *object, QEvent *event )
         }
     } else if ( ( object == d->listView() ||
                         object == d->listView()->viewport() )) {
-        QMouseEvent *e = (QMouseEvent*)event;
+        TQMouseEvent *e = (TQMouseEvent*)event;
         switch( event->type() ) {
-        case QEvent::MouseMove:
+        case TQEvent::MouseMove:
             if ( !d->mouseWasInsidePopup  ) {
 //                qWarning("!d->mouseWasInsidePopup");
-                QPoint pos = e->pos();
+                TQPoint pos = e->pos();
                 if ( d->listView()->rect().contains( pos ) )
                     d->mouseWasInsidePopup = TRUE;
                 // Check if arrow button should toggle
                 if ( d->arrowPressed ) {
-                    QPoint comboPos;
+                    TQPoint comboPos;
                     comboPos = mapFromGlobal( d->listView()->mapToGlobal(pos) );
-                    QRect arrowRect =
-                    style().querySubControlMetrics( QStyle::CC_ComboBox, this,
-                                    QStyle::SC_ComboBoxArrow);
-                    arrowRect = QStyle::visualRect(arrowRect, this);
+                    TQRect arrowRect =
+                    style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+                                    TQStyle::SC_ComboBoxArrow);
+                    arrowRect = TQStyle::visualRect(arrowRect, this);
                     if ( arrowRect.contains( comboPos ) ) {
                         if ( !d->arrowDown  ) {
                             d->arrowDown = TRUE;
@@ -918,12 +918,12 @@ bool QComboView::eventFilter( QObject *object, QEvent *event )
                     }
                 }
             } else if ((e->state() & ( RightButton | LeftButton | MidButton ) ) == 0 &&
-                style().styleHint(QStyle::SH_ComboBox_ListMouseTracking, this)) {
+                style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) {
 //                qWarning("event filter:: emu");
-                QWidget *mouseW = QApplication::widgetAt( e->globalPos(), TRUE );
+                TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE );
 //                if ( mouseW == d->listView()->viewport() ) { //###
                 if ( mouseW == d->listView()->viewport() ) {
-                    QListViewItem *sel = d->listView()->itemAt(e->pos());
+                    TQListViewItem *sel = d->listView()->itemAt(e->pos());
                     if (sel)
                     {
                         d->listView()->setCurrentItem(sel);
@@ -934,12 +934,12 @@ bool QComboView::eventFilter( QObject *object, QEvent *event )
             }
 
             break;
-        case QEvent::MouseButtonRelease:
+        case TQEvent::MouseButtonRelease:
             if ( d->listView()->rect().contains( e->pos() ) ) {
-                QMouseEvent tmp( QEvent::MouseButtonDblClick,
+                TQMouseEvent tmp( TQEvent::MouseButtonDblClick,
                         e->pos(), e->button(), e->state() ) ;
                 // will hide popup
-                QApplication::sendEvent( object, &tmp );
+                TQApplication::sendEvent( object, &tmp );
                 return TRUE;
             } else {
                 if ( d->mouseWasInsidePopup ) {
@@ -953,11 +953,11 @@ bool QComboView::eventFilter( QObject *object, QEvent *event )
                 }
             }
             break;
-        case QEvent::MouseButtonDblClick:
-        case QEvent::MouseButtonPress:
+        case TQEvent::MouseButtonDblClick:
+        case TQEvent::MouseButtonPress:
             if ( !d->listView()->rect().contains( e->pos() ) ) {
-                QPoint globalPos = d->listView()->mapToGlobal(e->pos());
-                if ( QApplication::widgetAt( globalPos, TRUE ) == this ) {
+                TQPoint globalPos = d->listView()->mapToGlobal(e->pos());
+                if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) {
                     d->discardNextMousePress = TRUE;
                     // avoid popping up again
                 }
@@ -965,11 +965,11 @@ bool QComboView::eventFilter( QObject *object, QEvent *event )
                 return TRUE;
             }
             break;
-        case QEvent::KeyPress:
-            switch( ((QKeyEvent *)event)->key() ) {
+        case TQEvent::KeyPress:
+            switch( ((TQKeyEvent *)event)->key() ) {
                 case Key_Up:
                 case Key_Down:
-                    if ( !(((QKeyEvent *)event)->state() & AltButton) )
+                    if ( !(((TQKeyEvent *)event)->state() & AltButton) )
                         break;
                 case Key_F4:
                 case Key_Escape:
@@ -986,14 +986,14 @@ bool QComboView::eventFilter( QObject *object, QEvent *event )
                 break;
             }
             break;
-        case QEvent::Hide:
+        case TQEvent::Hide:
             popDownListView();
             break;
         default:
             break;
         }
     }
-    return QWidget::eventFilter( object, event );
+    return TQWidget::eventFilter( object, event );
 }
 
 
@@ -1003,10 +1003,10 @@ bool QComboView::eventFilter( QObject *object, QEvent *event )
     items start with \a prefix.
 */
 
-QListViewItem *QComboView::completionIndex( const QString & prefix,
-                    QListViewItem *startingAt ) const
+TQListViewItem *QComboView::completionIndex( const TQString & prefix,
+                    TQListViewItem *startingAt ) const
 {
-    QListViewItem *start = startingAt;
+    TQListViewItem *start = startingAt;
 /*    if ( start < 0 || start >= count() )
         start = 0;
     if ( start >= count() )
@@ -1017,12 +1017,12 @@ QListViewItem *QComboView::completionIndex( const QString & prefix,
         return 0;
 /*    if (!start->itemBelow())
         return 0;*/
-    QString match = prefix.lower();
+    TQString match = prefix.lower();
     if ( match.length() < 1 )
         return start;
 
-    QString current;
-    QListViewItem *i = start;
+    TQString current;
+    TQListViewItem *i = start;
     do {
         current = i->text(0).lower();
         if ( current.startsWith( match ) )
@@ -1077,12 +1077,12 @@ void QComboView::setInsertionPolicy( Policy policy )
 
 void QComboView::returnPressed()
 {
-    QString s( d->ed->text() );
+    TQString s( d->ed->text() );
 
     if ( s.isEmpty() )
         return;
 
-    QListViewItem *c = 0;
+    TQListViewItem *c = 0;
     bool doInsert = TRUE;
     if ( !d->duplicatesEnabled ) {
         c = listView()->findItem(s, 0);
@@ -1113,11 +1113,11 @@ void QComboView::returnPressed()
                 return;
 //                break;
             case AtBottom:
-                c = new QListViewItem(listView(), listView()->lastItem(), s);
+                c = new TQListViewItem(listView(), listView()->lastItem(), s);
                 break;
             case BeforeCurrent:
                 if (currentItem() && currentItem()->itemAbove())
-                    c = new QListViewItem(listView(), currentItem()->itemAbove(), s);
+                    c = new TQListViewItem(listView(), currentItem()->itemAbove(), s);
                 else
                 {
                     c = 0;
@@ -1126,7 +1126,7 @@ void QComboView::returnPressed()
                 break;
             case AfterCurrent:
                 if (currentItem() && currentItem()->itemBelow())
-                    c = new QListViewItem(listView(), currentItem()->itemBelow(), s);
+                    c = new TQListViewItem(listView(), currentItem()->itemBelow(), s);
                 else
                 {
                     c = 0;
@@ -1150,7 +1150,7 @@ void QComboView::returnPressed()
 
 void QComboView::setEnabled( bool enable )
 {
-    QWidget::setEnabled( enable );
+    TQWidget::setEnabled( enable );
 }
 
 
@@ -1164,7 +1164,7 @@ void QComboView::setEnabled( bool enable )
     \sa validator() clearValidator() QValidator
 */
 
-void QComboView::setValidator( const QValidator * v )
+void QComboView::setValidator( const TQValidator * v )
 {
     if ( d && d->ed )
         d->ed->setValidator( v );
@@ -1178,7 +1178,7 @@ void QComboView::setValidator( const QValidator * v )
     \sa setValidator() clearValidator() QValidator
 */
 
-const QValidator * QComboView::validator() const
+const TQValidator * QComboView::validator() const
 {
     return d && d->ed ? d->ed->validator() : 0;
 }
@@ -1205,19 +1205,19 @@ void QComboView::clearValidator()
     necessary because of the line edit in QComboView.
 */
 
-void QComboView::setListView( QListView * newListView )
+void QComboView::setListView( TQListView * newListView )
 {
     clear();
 
     delete d->listView();
 
-    newListView->reparent( this, WType_Popup, QPoint(0,0), FALSE );
+    newListView->reparent( this, WType_Popup, TQPoint(0,0), FALSE );
     d->setListView( newListView );
     d->listView()->setFont( font() );
     d->listView()->setPalette( palette() );
-/*    d->listView()->setVScrollBarMode(QScrollView::AlwaysOff);
-    d->listView()->setHScrollBarMode(QScrollView::AlwaysOff);*/
-    d->listView()->setFrameStyle( QFrame::Box | QFrame::Plain );
+/*    d->listView()->setVScrollBarMode(TQScrollView::AlwaysOff);
+    d->listView()->setHScrollBarMode(TQScrollView::AlwaysOff);*/
+    d->listView()->setFrameStyle( TQFrame::Box | TQFrame::Plain );
     d->listView()->setLineWidth( 1 );
 /*    d->listView()->setRootIsDecorated( true );
     d->listView()->setAllColumnsShowFocus(true);*/
@@ -1231,9 +1231,9 @@ void QComboView::setListView( QListView * newListView )
 
 /*    d->listView()->setFont( font() );
     d->listView()->setPalette( palette() );
-    d->listView()->setVScrollBarMode( QScrollView::AlwaysOff );
-    d->listView()->setHScrollBarMode( QScrollView::AlwaysOff );
-    d->listView()->setFrameStyle( QFrame::Box | QFrame::Plain );
+    d->listView()->setVScrollBarMode( TQScrollView::AlwaysOff );
+    d->listView()->setHScrollBarMode( TQScrollView::AlwaysOff );
+    d->listView()->setFrameStyle( TQFrame::Box | TQFrame::Plain );
     d->listView()->setLineWidth( 1 );
     d->listView()->setRootIsDecorated( true );
     d->listView()->setAllColumnsShowFocus(true);
@@ -1241,28 +1241,28 @@ void QComboView::setListView( QListView * newListView )
     d->listView()->resize( 100, 10 );
 */
 
-    connect( d->listView(), SIGNAL(returnPressed(QListViewItem*)),
-            SLOT(internalActivate(QListViewItem*)));
-    connect( d->listView(), SIGNAL(doubleClicked(QListViewItem*)),
-            SLOT(internalActivate(QListViewItem*)));
-    connect( d->listView(), SIGNAL(doubleClicked(QListViewItem*)),
-            SLOT(checkState(QListViewItem*)));
-    connect( d->listView(), SIGNAL(currentChanged(QListViewItem*)),
-            SLOT(internalHighlight(QListViewItem*)));
-    connect( d->listView(), SIGNAL(selectionChanged(QListViewItem*)),
-            SLOT(internalHighlight(QListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)),
+            TQT_SLOT(internalActivate(TQListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
+            TQT_SLOT(internalActivate(TQListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
+            TQT_SLOT(checkState(TQListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)),
+            TQT_SLOT(internalHighlight(TQListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)),
+            TQT_SLOT(internalHighlight(TQListViewItem*)));
 }
 
 
 /*!
     Returns the current list box, or 0 if there is no list box.
-    (QComboView can use QPopupMenu instead of QListBox.) Provided to
+    (QComboView can use TQPopupMenu instead of TQListBox.) Provided to
     match setlistView().
 
     \sa setlistView()
 */
 
-QListView * QComboView::listView() const
+TQListView * QComboView::listView() const
 {
     return d ? d->listView() : 0;
 }
@@ -1272,7 +1272,7 @@ QListView * QComboView::listView() const
 
     Only editable listboxes have a line editor.
 */
-QLineEdit* QComboView::lineEdit() const
+TQLineEdit* QComboView::lineEdit() const
 {
     return d->ed;
 }
@@ -1309,7 +1309,7 @@ void QComboView::clearEdit()
     \sa clearEdit() insertItem()
 */
 
-void QComboView::setEditText( const QString &newText )
+void QComboView::setEditText( const TQString &newText )
 {
     if ( d && d->ed ) {
         d->updateLinedGeometry();
@@ -1331,12 +1331,12 @@ bool QComboView::autoCompletion() const
 
 /*!reimp
  */
-void QComboView::styleChange( QStyle& s )
+void QComboView::styleChange( TQStyle& s )
 {
-    d->sizeHint = QSize();		// invalidate size hint...
+    d->sizeHint = TQSize();		// invalidate size hint...
     if ( d->ed )
         d->updateLinedGeometry();
-    QWidget::styleChange( s );
+    TQWidget::styleChange( s );
 }
 
 bool QComboView::editable() const
@@ -1367,49 +1367,49 @@ void QComboView::setEditable( bool y )
 
 void QComboView::setUpListView()
 {
-    d->setListView( new QListView( this, "in-combo", WType_Popup ) );
+    d->setListView( new TQListView( this, "in-combo", WType_Popup ) );
 
     d->listView()->setFont( font() );
     d->listView()->setPalette( palette() );
-/*    d->listView()->setVScrollBarMode( QScrollView::AlwaysOff );
-    d->listView()->setHScrollBarMode( QScrollView::AlwaysOff );*/
-    d->listView()->setFrameStyle( QFrame::Box | QFrame::Plain );
+/*    d->listView()->setVScrollBarMode( TQScrollView::AlwaysOff );
+    d->listView()->setHScrollBarMode( TQScrollView::AlwaysOff );*/
+    d->listView()->setFrameStyle( TQFrame::Box | TQFrame::Plain );
     d->listView()->setLineWidth( 1 );
     d->listView()->setRootIsDecorated( false );
     d->listView()->setAllColumnsShowFocus(true);
     d->listView()->addColumn("");
     d->listView()->resize( 100, 10 );
-    d->listView()->setResizeMode(QListView::LastColumn);
+    d->listView()->setResizeMode(TQListView::LastColumn);
 
     if (d->listView()->firstChild())
         d->current = d->listView()->firstChild();
 
     d->listView()->header()->hide();
 
-    connect( d->listView(), SIGNAL(returnPressed(QListViewItem*)),
-            SLOT(internalActivate(QListViewItem*)));
-    connect( d->listView(), SIGNAL(doubleClicked(QListViewItem*)),
-            SLOT(internalActivate(QListViewItem*)));
-    connect( d->listView(), SIGNAL(doubleClicked(QListViewItem*)),
-            SLOT(checkState(QListViewItem*)));
-    connect( d->listView(), SIGNAL(currentChanged(QListViewItem*)),
-            SLOT(internalHighlight(QListViewItem*)));
-    connect( d->listView(), SIGNAL(selectionChanged(QListViewItem*)),
-            SLOT(internalHighlight(QListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)),
+            TQT_SLOT(internalActivate(TQListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
+            TQT_SLOT(internalActivate(TQListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
+            TQT_SLOT(checkState(TQListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)),
+            TQT_SLOT(internalHighlight(TQListViewItem*)));
+    connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)),
+            TQT_SLOT(internalHighlight(TQListViewItem*)));
 }
 
 
 void QComboView::setUpLineEdit()
 {
     if ( !d->ed )
-        setLineEdit( new QLineEdit( this, "combo edit" ) );
+        setLineEdit( new TQLineEdit( this, "combo edit" ) );
 }
 
 /*!
     Sets the line edit to use \a edit instead of the current line edit.
 */
 
-void QComboView::setLineEdit( QLineEdit *edit )
+void QComboView::setLineEdit( TQLineEdit *edit )
 {
     if ( !edit ) {
 #if defined(QT_CHECK_NULL)
@@ -1431,13 +1431,13 @@ void QComboView::setLineEdit( QLineEdit *edit )
     d->ed = edit;
 
     if ( edit->parent() != this ) {
-        edit->reparent( this, QPoint(0,0), FALSE );
+        edit->reparent( this, TQPoint(0,0), FALSE );
         edit->setFont( font() );
     }
 
-    connect (edit, SIGNAL( textChanged( const QString& ) ),
-            this, SIGNAL( textChanged( const QString& ) ) );
-    connect( edit, SIGNAL(returnPressed()), SLOT(returnPressed()) );
+    connect (edit, TQT_SIGNAL( textChanged( const TQString& ) ),
+            this, TQT_SIGNAL( textChanged( const TQString& ) ) );
+    connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) );
 
     edit->setFrame( FALSE );
     d->updateLinedGeometry();
@@ -1454,9 +1454,9 @@ void QComboView::setLineEdit( QLineEdit *edit )
     update();
 }
 
-void QComboView::setCurrentText( const QString& txt )
+void QComboView::setCurrentText( const TQString& txt )
 {
-    QListViewItem *i;
+    TQListViewItem *i;
     i = listView()->findItem(txt, 0);
     if ( i )
         setCurrentItem( i );
@@ -1466,12 +1466,12 @@ void QComboView::setCurrentText( const QString& txt )
         currentItem()->setText(0, txt);
 }
 
-void QComboView::checkState( QListViewItem * item)
+void QComboView::checkState( TQListViewItem * item)
 {
     item->setOpen(!item->isOpen());
 }
 
-void QComboView::setCurrentActiveItem( QListViewItem * item )
+void QComboView::setCurrentActiveItem( TQListViewItem * item )
 {
     if ( item == d->current && !d->ed ) {
         return;
diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h
index 8f618f50..b918df1f 100644
--- a/lib/widgets/qcomboview.h
+++ b/lib/widgets/qcomboview.h
@@ -17,7 +17,7 @@
 #define QCOMBOVIEW_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_COMBOBOX
@@ -36,9 +36,9 @@ class QListViewItem;
 class QComboViewData;
 
 /**
-QComboView - a combo with a QListView as a popup widget.
+QComboView - a combo with a TQListView as a popup widget.
 This means that you can have a treeview inside of a combo. Otherwise it works
-in the same way as QComboBox and have similar API.
+in the same way as TQComboBox and have similar API.
 */
 class Q_EXPORT QComboView : public QWidget
 {
@@ -46,8 +46,8 @@ class Q_EXPORT QComboView : public QWidget
     Q_ENUMS( Policy )
     Q_PROPERTY( bool editable READ editable WRITE setEditable )
 //    Q_PROPERTY( int count READ count )
-    Q_PROPERTY( QString currentText READ currentText WRITE setCurrentText DESIGNABLE false )
-//    Q_PROPERTY( QListView *currentItem READ currentItem WRITE setCurrentItem )
+    Q_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false )
+//    Q_PROPERTY( TQListView *currentItem READ currentItem WRITE setCurrentItem )
     Q_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
     Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
 //    Q_PROPERTY( int maxCount READ maxCount WRITE setMaxCount )
@@ -57,22 +57,22 @@ class Q_EXPORT QComboView : public QWidget
     Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
 public:
-//    QComboView( QWidget* parent=0, const char* name=0 );
-    QComboView( bool rw, QWidget* parent=0, const char* name=0 );
+//    QComboView( TQWidget* parent=0, const char* name=0 );
+    QComboView( bool rw, TQWidget* parent=0, const char* name=0 );
     ~QComboView();
 
     int childCount() const;
 
-    QListViewItem *currentItem() const;
-    virtual void setCurrentItem( QListViewItem * );
-    virtual void setCurrentActiveItem( QListViewItem * );
+    TQListViewItem *currentItem() const;
+    virtual void setCurrentItem( TQListViewItem * );
+    virtual void setCurrentActiveItem( TQListViewItem * );
 
     bool	autoResize()	const;
     virtual void setAutoResize( bool );
     QSize	sizeHint() const;
 
-    void	setPalette( const QPalette & );
-    void	setFont( const QFont & );
+    void	setPalette( const TQPalette & );
+    void	setFont( const TQFont & );
     void	setEnabled( bool );
 
     virtual void setSizeLimit( int );
@@ -87,19 +87,19 @@ public:
     virtual void setInsertionPolicy( Policy policy );
     Policy	insertionPolicy() const;
 
-    virtual void setValidator( const QValidator * );
-    const QValidator * validator() const;
+    virtual void setValidator( const TQValidator * );
+    const TQValidator * validator() const;
 
-    virtual void setListView( QListView * );
-    QListView *	listView() const;
+    virtual void setListView( TQListView * );
+    TQListView *	listView() const;
 
-    virtual void setLineEdit( QLineEdit *edit );
-    QLineEdit*	lineEdit() const;
+    virtual void setLineEdit( TQLineEdit *edit );
+    TQLineEdit*	lineEdit() const;
 
     virtual void setAutoCompletion( bool );
     bool	autoCompletion() const;
 
-    bool	eventFilter( QObject *object, QEvent *event );
+    bool	eventFilter( TQObject *object, TQEvent *event );
 
     void	setDuplicatesEnabled( bool enable );
     bool	duplicatesEnabled() const;
@@ -109,43 +109,43 @@ public:
 
     virtual void popup();
 
-    QString currentText() const;
-    void setCurrentText( const QString& );
+    TQString currentText() const;
+    void setCurrentText( const TQString& );
 
 public slots:
     virtual void clear();
     void	clearValidator();
     void	clearEdit();
-    virtual void setEditText( const QString &);
+    virtual void setEditText( const TQString &);
 
 signals:
-    void	activated( QListViewItem * item );
-    void	highlighted( QListViewItem * item );
-    void	activated( const QString &);
-    void	highlighted( const QString &);
-    void	textChanged( const QString &);
+    void	activated( TQListViewItem * item );
+    void	highlighted( TQListViewItem * item );
+    void	activated( const TQString &);
+    void	highlighted( const TQString &);
+    void	textChanged( const TQString &);
     void    focusGranted();
     void    focusLost();
 
 private slots:
-    void	internalActivate( QListViewItem * );
-    void	internalHighlight( QListViewItem * );
+    void	internalActivate( TQListViewItem * );
+    void	internalHighlight( TQListViewItem * );
     void	internalClickTimeout();
     void	returnPressed();
-    void checkState(QListViewItem*);
+    void checkState(TQListViewItem*);
 
 protected:
-    void	paintEvent( QPaintEvent * );
-    void	resizeEvent( QResizeEvent * );
-    void	mousePressEvent( QMouseEvent * );
-    void	mouseMoveEvent( QMouseEvent * );
-    void	mouseReleaseEvent( QMouseEvent * );
-    void	mouseDoubleClickEvent( QMouseEvent * );
-    void	keyPressEvent( QKeyEvent *e );
-    void	focusInEvent( QFocusEvent *e );
-    void	focusOutEvent( QFocusEvent *e );
-    void	wheelEvent( QWheelEvent *e );
-    void	styleChange( QStyle& );
+    void	paintEvent( TQPaintEvent * );
+    void	resizeEvent( TQResizeEvent * );
+    void	mousePressEvent( TQMouseEvent * );
+    void	mouseMoveEvent( TQMouseEvent * );
+    void	mouseReleaseEvent( TQMouseEvent * );
+    void	mouseDoubleClickEvent( TQMouseEvent * );
+    void	keyPressEvent( TQKeyEvent *e );
+    void	focusInEvent( TQFocusEvent *e );
+    void	focusOutEvent( TQFocusEvent *e );
+    void	wheelEvent( TQWheelEvent *e );
+    void	styleChange( TQStyle& );
 
     void	updateMask();
 
@@ -155,7 +155,7 @@ private:
     void	popDownListView();
     void	reIndex();
     void	currentChanged();
-    QListViewItem *completionIndex( const QString &, QListViewItem * ) const;
+    TQListViewItem *completionIndex( const TQString &, TQListViewItem * ) const;
 
     QComboViewData	*d;
 
diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp
index 7d7ecb39..6ca7e239 100644
--- a/lib/widgets/resizablecombo.cpp
+++ b/lib/widgets/resizablecombo.cpp
@@ -20,11 +20,11 @@
 
 #include "kcomboview.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -51,43 +51,43 @@ static const char * resize_xpm[] = {
 "    .    ",
 "         "};
 
-ResizableCombo::ResizableCombo(KComboView *view, QWidget *parent, const char *name):
-    QWidget(parent, name), m_sizer(0), m_combo(view)
+ResizableCombo::ResizableCombo(KComboView *view, TQWidget *parent, const char *name):
+    TQWidget(parent, name), m_sizer(0), m_combo(view)
 {
-    QHBoxLayout *l = new QHBoxLayout(this);
-    view->reparent(this, QPoint(0,0));
+    TQHBoxLayout *l = new TQHBoxLayout(this);
+    view->reparent(this, TQPoint(0,0));
     l->addWidget(view);
 
     m_sizer = new MyPushButton(this);
-    m_sizer->setPixmap(QPixmap(resize_xpm));
-    QWhatsThis::add(m_sizer, i18n("Drag this to resize the combobox."));
+    m_sizer->setPixmap(TQPixmap(resize_xpm));
+    TQWhatsThis::add(m_sizer, i18n("Drag this to resize the combobox."));
     l->addWidget(m_sizer);
 }
 
-void MyPushButton::mousePressEvent( QMouseEvent * e )
+void MyPushButton::mousePressEvent( TQMouseEvent * e )
 {
     m_resizing = true;
     m_pressedPos = e->globalPos();
     m_width = m_combo->m_combo->width();
-    QPushButton::mousePressEvent(e);
+    TQPushButton::mousePressEvent(e);
 }
 
-void MyPushButton::mouseReleaseEvent( QMouseEvent * e )
+void MyPushButton::mouseReleaseEvent( TQMouseEvent * e )
 {
     m_resizing = false;
-    QPushButton::mouseReleaseEvent(e);
+    TQPushButton::mouseReleaseEvent(e);
 }
 
-void MyPushButton::mouseMoveEvent( QMouseEvent * e )
+void MyPushButton::mouseMoveEvent( TQMouseEvent * e )
 {
     if (m_resizing)
         m_combo->m_combo->setMinimumWidth(m_width + e->globalPos().x() - pressedPos().x());
 
-    QPushButton::mouseMoveEvent(e);
+    TQPushButton::mouseMoveEvent(e);
 }
 
 MyPushButton::MyPushButton( ResizableCombo * parent, const char * name )
-    :QPushButton(parent, name), m_resizing(false), m_combo(parent)
+    :TQPushButton(parent, name), m_resizing(false), m_combo(parent)
 {
     setFocusPolicy(NoFocus);
     setFlat(true);
diff --git a/lib/widgets/resizablecombo.h b/lib/widgets/resizablecombo.h
index 5c417378..b76b4f7e 100644
--- a/lib/widgets/resizablecombo.h
+++ b/lib/widgets/resizablecombo.h
@@ -19,8 +19,8 @@
 #ifndef RESIZABLECOMBO_H
 #define RESIZABLECOMBO_H
 
-#include 
-#include 
+#include 
+#include 
 
 class KComboView;
 class QMouseEvent;
@@ -38,7 +38,7 @@ Used to place resizable KComboBox onto toolbars.
 class ResizableCombo: public QWidget{
     Q_OBJECT
 public:
-    ResizableCombo(KComboView *view, QWidget *parent = 0, const char *name = 0);
+    ResizableCombo(KComboView *view, TQWidget *parent = 0, const char *name = 0);
 
 private:
     MyPushButton *m_sizer;
@@ -52,19 +52,19 @@ class MyPushButton: public QPushButton
 public:
     MyPushButton(ResizableCombo *parent = 0, const char *name = 0 );
 
-    QPoint pressedPos()
+    TQPoint pressedPos()
     {
         return m_pressedPos;
     }
 
 protected:
-    virtual void mouseReleaseEvent ( QMouseEvent * e );
-    virtual void mousePressEvent ( QMouseEvent * e );
-    virtual void mouseMoveEvent ( QMouseEvent * e );
+    virtual void mouseReleaseEvent ( TQMouseEvent * e );
+    virtual void mousePressEvent ( TQMouseEvent * e );
+    virtual void mouseMoveEvent ( TQMouseEvent * e );
 
 private:
     bool m_resizing;
-    QPoint m_pressedPos;
+    TQPoint m_pressedPos;
     int m_width;
     ResizableCombo *m_combo;
 };
diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp
index d7729249..6e174603 100644
--- a/parts/abbrev/abbrevconfigwidget.cpp
+++ b/parts/abbrev/abbrevconfigwidget.cpp
@@ -18,25 +18,25 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "addtemplatedlg.h"
 #include "abbrevpart.h"
 
-AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, QWidget *parent, const char *name)
+AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent, const char *name)
     : AbbrevConfigWidgetBase(parent, name)
 {
     m_part = part;
 
     qWarning("creating abbrevconfigwidget for %d abbrevs", part->templates().allTemplates().count());
-    QPtrList templates = part->templates().allTemplates();
+    TQPtrList templates = part->templates().allTemplates();
     CodeTemplate *templ;
     for (templ = templates.first(); templ; templ = templates.next())
     {
         qWarning("creating item for code template ");
-        QListViewItem *it = new QListViewItem( listTemplates,
+        TQListViewItem *it = new TQListViewItem( listTemplates,
                            templ->name,
                            templ->description,
                            templ->suffixes,
@@ -56,15 +56,15 @@ AbbrevConfigWidget::~AbbrevConfigWidget()
 
 void AbbrevConfigWidget::addTemplate()
 {
-    QStringList suffixesList = m_part->templates().suffixes();
+    TQStringList suffixesList = m_part->templates().suffixes();
 
     AddTemplateDialog dlg( suffixesList, this );
     if( dlg.exec() ){
-        QString templ = dlg.templ();
-        QString description = dlg.description();
-        QString suffixes = dlg.suffixes();
+        TQString templ = dlg.templ();
+        TQString description = dlg.description();
+        TQString suffixes = dlg.suffixes();
         if( !(templ.isEmpty() || description.isEmpty()) || suffixes.isEmpty()) {
-            QListViewItem* item = new QListViewItem( listTemplates, templ, description, suffixes );
+            TQListViewItem* item = new TQListViewItem( listTemplates, templ, description, suffixes );
             listTemplates->setSelected( item, true );
             editCode->setFocus();
         }
@@ -82,7 +82,7 @@ void AbbrevConfigWidget::removeTemplate()
 
 void AbbrevConfigWidget::selectionChanged()
 {
-    QListViewItem* item = listTemplates->selectedItem();
+    TQListViewItem* item = listTemplates->selectedItem();
     if( item ){
         editCode->setText( item->text(3) );
     }
@@ -91,7 +91,7 @@ void AbbrevConfigWidget::selectionChanged()
 
 void AbbrevConfigWidget::codeChanged()
 {
-    QListViewItem* item = listTemplates->selectedItem();
+    TQListViewItem* item = listTemplates->selectedItem();
     if( item ){
         item->setText( 3, editCode->text() );
         if (item->text(3) == item->text(4))
@@ -106,7 +106,7 @@ void AbbrevConfigWidget::accept()
 {
     m_part->clearTemplates();
 
-    QListViewItem* item = listTemplates->firstChild();
+    TQListViewItem* item = listTemplates->firstChild();
     while( item ){
         m_part->addTemplate( item->text(0),
                              item->text(1),
diff --git a/parts/abbrev/abbrevconfigwidget.h b/parts/abbrev/abbrevconfigwidget.h
index b8cc1983..818aa3ba 100644
--- a/parts/abbrev/abbrevconfigwidget.h
+++ b/parts/abbrev/abbrevconfigwidget.h
@@ -25,7 +25,7 @@ class AbbrevConfigWidget : public AbbrevConfigWidgetBase
     Q_OBJECT
     
 public:
-    AbbrevConfigWidget(AbbrevPart *part, QWidget *parent=0, const char *name=0);
+    AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent=0, const char *name=0);
     ~AbbrevConfigWidget();
 
 public slots:
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 181606f4..a86d98f8 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -15,10 +15,10 @@
 
 #include "abbrevpart.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -65,26 +65,26 @@ public:
 
 K_EXPORT_COMPONENT_FACTORY( libkdevabbrev, AbbrevFactory )
 
-AbbrevPart::AbbrevPart(QObject *parent, const char *name, const QStringList &)
+AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevPlugin(&data, parent, name ? name : "AbbrevPart")
 {
     setInstance(AbbrevFactory::instance());
     setXMLFile("kdevabbrev.rc");
 
-    connect(partController(), SIGNAL(activePartChanged(KParts::Part*)),
-    	this, SLOT(slotActivePartChanged(KParts::Part*)) );
+    connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
+    	this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) );
 
-    connect(core(), SIGNAL(configWidget(KDialogBase*)), this, SLOT(configWidget(KDialogBase*)));
+    connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*)));
 
     KAction *action;
     action = new KAction( i18n("Expand Text"), CTRL + Key_J,
-                          this, SLOT(slotExpandText()),
+                          this, TQT_SLOT(slotExpandText()),
                           actionCollection(), "edit_expandtext" );
     action->setToolTip( i18n("Expand current word") );
     action->setWhatsThis( i18n("Expand current word
    Current word can be completed using the list of similar words in source files.") );
 
     action = new KAction( i18n("Expand Abbreviation"), CTRL + Key_L,
-                          this, SLOT(slotExpandAbbrev()),
+                          this, TQT_SLOT(slotExpandAbbrev()),
                           actionCollection(), "edit_expandabbrev" );
     action->setToolTip( i18n("Expand abbreviation") );
     action->setWhatsThis( i18n("Expand abbreviation
    Enable and configure abbreviations in KDevelop Settings, Abbreviations tab.") );
@@ -140,56 +140,56 @@ void AbbrevPart::setAutoWordCompletionEnabled( bool enabled )
     disconnect( docIface->widget(), 0, this, 0 );
 
     if( m_autoWordCompletionEnabled ){
-	connect( docIface->widget(), SIGNAL(completionAborted()),
-		 this, SLOT(slotCompletionAborted()) );
-	connect( docIface->widget(), SIGNAL(completionDone()),
-		 this, SLOT(slotCompletionDone()) );
-	connect( docIface->widget(), SIGNAL(aboutToShowCompletionBox()),
-		 this, SLOT(slotAboutToShowCompletionBox()) );
-
-	connect( docIface, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) );
+	connect( docIface->widget(), TQT_SIGNAL(completionAborted()),
+		 this, TQT_SLOT(slotCompletionAborted()) );
+	connect( docIface->widget(), TQT_SIGNAL(completionDone()),
+		 this, TQT_SLOT(slotCompletionDone()) );
+	connect( docIface->widget(), TQT_SIGNAL(aboutToShowCompletionBox()),
+		 this, TQT_SLOT(slotAboutToShowCompletionBox()) );
+
+	connect( docIface, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) );
     }
 }
 void AbbrevPart::load()
 {
     KStandardDirs *dirs = AbbrevFactory::instance()->dirs();
-    QString localTemplatesFile = locateLocal("codetemplates", "templates", AbbrevFactory::instance());
-    QStringList files;
-    if (QFileInfo(localTemplatesFile).exists())
+    TQString localTemplatesFile = locateLocal("codetemplates", "templates", AbbrevFactory::instance());
+    TQStringList files;
+    if (TQFileInfo(localTemplatesFile).exists())
         files << localTemplatesFile;
     else
-        files = dirs->findAllResources("codetemplates", QString::null, false, true);
+        files = dirs->findAllResources("codetemplates", TQString::null, false, true);
 
-    QString localSourcesFile = locateLocal("sources", "sources", AbbrevFactory::instance());
-    QStringList sourceFiles;
-    if (QFileInfo(localSourcesFile).exists())
+    TQString localSourcesFile = locateLocal("sources", "sources", AbbrevFactory::instance());
+    TQStringList sourceFiles;
+    if (TQFileInfo(localSourcesFile).exists())
         sourceFiles << localSourcesFile;
     else
-        sourceFiles = dirs->findAllResources("sources", QString::null, false, true);
+        sourceFiles = dirs->findAllResources("sources", TQString::null, false, true);
     kdDebug(9028) << "=========> sourceFiles: " << sourceFiles.join(" ") << endl;
 
-    this->m_completionFile = QString::null;
-    for( QStringList::Iterator it=sourceFiles.begin(); it!=sourceFiles.end(); ++it ) {
-        QString fn = *it;
+    this->m_completionFile = TQString::null;
+    for( TQStringList::Iterator it=sourceFiles.begin(); it!=sourceFiles.end(); ++it ) {
+        TQString fn = *it;
 	kdDebug(9028) << "===> load file: " << fn << endl;
-        QFile f( fn );
+        TQFile f( fn );
         if ( f.open(IO_ReadOnly) ) {
-		QTextStream stream( &f );
-		m_completionFile += ( stream.read() + QString("\n") );
+		TQTextStream stream( &f );
+		m_completionFile += ( stream.read() + TQString("\n") );
 		f.close();
 	}
     }
 
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for (it = files.begin(); it != files.end(); ++it) {
-        QString fn = *it;
+        TQString fn = *it;
         kdDebug(9028) << "fn = " << fn << endl;
-        QFile f( fn );
+        TQFile f( fn );
         if ( f.open(IO_ReadOnly) ) {
-            QDomDocument doc;
+            TQDomDocument doc;
             doc.setContent( &f );
-            QDomElement root = doc.firstChild().toElement();
-            QDomElement e = root.firstChild().toElement();
+            TQDomElement root = doc.firstChild().toElement();
+            TQDomElement e = root.firstChild().toElement();
             while ( !e.isNull() ){
                 addTemplate( e.attribute("name"),
                              e.attribute("description"),
@@ -205,18 +205,18 @@ void AbbrevPart::load()
 
 void AbbrevPart::save()
 {
-    QString fn = AbbrevFactory::instance()->dirs()->saveLocation("codetemplates", "", true);
+    TQString fn = AbbrevFactory::instance()->dirs()->saveLocation("codetemplates", "", true);
     kdDebug(9028) << "fn = " << fn << endl;
 
-    QDomDocument doc( "Templates" );
-    QDomElement root = doc.createElement( "Templates" );
+    TQDomDocument doc( "Templates" );
+    TQDomElement root = doc.createElement( "Templates" );
     doc.appendChild( root );
 
-    QPtrList templates = m_templates.allTemplates();
+    TQPtrList templates = m_templates.allTemplates();
     CodeTemplate *templ;
     for (templ = templates.first(); templ; templ = templates.next())
     {
-        QDomElement e = doc.createElement( "Template" );
+        TQDomElement e = doc.createElement( "Template" );
         e.setAttribute( "name", templ->name );
         e.setAttribute( "description", templ->description );
         e.setAttribute( "suffixes", templ->suffixes );
@@ -224,16 +224,16 @@ void AbbrevPart::save()
         root.appendChild( e );
     }
 
-    QFile f( fn + "templates" );
+    TQFile f( fn + "templates" );
     if( f.open(IO_WriteOnly) ){
-        QTextStream stream( &f );
+        TQTextStream stream( &f );
         stream << doc.toString();
         f.close();
     }
 }
 
 
-QString AbbrevPart::currentWord() const
+TQString AbbrevPart::currentWord() const
 {
     return KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
 }
@@ -241,9 +241,9 @@ QString AbbrevPart::currentWord() const
 
 void AbbrevPart::configWidget(KDialogBase *dlg)
 {
-	QVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), KIcon::SizeMedium) );
+	TQVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), KIcon::SizeMedium) );
     AbbrevConfigWidget *w = new AbbrevConfigWidget(this, vbox, "abbrev config widget");
-    connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
+    connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
 }
 
 
@@ -252,17 +252,17 @@ void AbbrevPart::slotExpandText()
     if( !editIface || !completionIface || !viewCursorIface )
         return;
 
-    QString word = currentWord();
+    TQString word = currentWord();
     if (word.isEmpty())
         return;
 
-    QValueList entries = findAllWords(editIface->text(), word);
+    TQValueList entries = findAllWords(editIface->text(), word);
     if (entries.count() == 0) {
         ; // some statusbar message?
 //    } else if (entries.count() == 1) {
 //        uint line, col;
 //        viewCursorIface->cursorPositionReal(&line, &col);
-//        QString txt = entries[0].text.mid(word.length());
+//        TQString txt = entries[0].text.mid(word.length());
 //        editIface->insertText( line, col, txt );
 //        viewCursorIface->setCursorPositionReal( line, col + txt.length() );
     } else {
@@ -272,32 +272,32 @@ void AbbrevPart::slotExpandText()
 }
 
 
-QValueList AbbrevPart::findAllWords(const QString &text, const QString &prefix)
+TQValueList AbbrevPart::findAllWords(const TQString &text, const TQString &prefix)
 {
-    QValueList entries;
+    TQValueList entries;
 
     KParts::ReadWritePart *part = dynamic_cast(partController()->activePart());
-    QWidget *view = partController()->activeWidget();
+    TQWidget *view = partController()->activeWidget();
     if (!part || !view) {
         kdDebug(9028) << "no rw part" << endl;
         return entries;
     }
 
-    QString suffix = part->url().url();
+    TQString suffix = part->url().url();
     int pos = suffix.findRev('.');
     if (pos != -1)
         suffix.remove(0, pos+1);
     kdDebug(9028) << "AbbrevPart::findAllWords with suffix " << suffix << endl;
 
-    QMap map;
-    QRegExp rx( QString("\\b") + prefix + "[a-zA-Z0-9_]+\\b" );
+    TQMap map;
+    TQRegExp rx( TQString("\\b") + prefix + "[a-zA-Z0-9_]+\\b" );
 
     int idx = 0;
     pos = 0;
     int len = 0;
     while ( (pos = rx.search(text, idx)) != -1 ) {
 	len = rx.matchedLength();
-	QString word = text.mid(pos, len);
+	TQString word = text.mid(pos, len);
         if (map.find(word) == map.end()) {
             KTextEditor::CompletionEntry e;
             e.text = word;
@@ -312,7 +312,7 @@ QValueList AbbrevPart::findAllWords(const QString
     len = 0;
     while ( (pos = rx.search(m_completionFile, idx)) != -1 ) {
 	len = rx.matchedLength();
-	QString word = m_completionFile.mid(pos, len);
+	TQString word = m_completionFile.mid(pos, len);
         if (map.find(word) == map.end()) {
             KTextEditor::CompletionEntry e;
             e.text = word;
@@ -323,8 +323,8 @@ QValueList AbbrevPart::findAllWords(const QString
     }
 
 
-    QMap m = m_templates[suffix];
-    for (QMap::const_iterator it = m.begin(); it != m.end() ; ++it) {
+    TQMap m = m_templates[suffix];
+    for (TQMap::const_iterator it = m.begin(); it != m.end() ; ++it) {
         KTextEditor::CompletionEntry e;
         e.text = it.data()->description + " ";
         e.userdata = it.key();
@@ -338,13 +338,13 @@ QValueList AbbrevPart::findAllWords(const QString
 void AbbrevPart::slotExpandAbbrev()
 {
     KParts::ReadWritePart *part = dynamic_cast(partController()->activePart());
-    QWidget *view = partController()->activeWidget();
+    TQWidget *view = partController()->activeWidget();
     if (!part || !view) {
         kdDebug(9028) << "no rw part" << endl;
         return;
     }
 
-    QString suffix = part->url().url();
+    TQString suffix = part->url().url();
     int pos = suffix.findRev('.');
     if (pos != -1)
         suffix.remove(0, pos+1);
@@ -362,18 +362,18 @@ void AbbrevPart::slotExpandAbbrev()
         return;
     }
 
-    QString word = currentWord();
+    TQString word = currentWord();
     kdDebug(9028) << "Expanding word " << word << " with suffix " << suffix << "." << endl;
 
-    QMap m = m_templates[suffix];
-    for (QMap::const_iterator it = m.begin(); it != m.end() ; ++it) {
+    TQMap m = m_templates[suffix];
+    for (TQMap::const_iterator it = m.begin(); it != m.end() ; ++it) {
         if (it.key() != word)
             continue;
 
         uint line, col;
         cursoriface->cursorPositionReal(&line, &col);
 
-        QString linestr = editIface->textLine(line);
+        TQString linestr = editIface->textLine(line);
         int startPos = QMAX( QMIN( (int)col, (int)linestr.length()-1 ), 0 );
         int endPos = startPos;
         startPos--;
@@ -388,15 +388,15 @@ void AbbrevPart::slotExpandAbbrev()
 }
 
 
-void AbbrevPart::insertChars( const QString &chars )
+void AbbrevPart::insertChars( const TQString &chars )
 {
     unsigned line=0, col=0;
     viewCursorIface->cursorPositionReal( &line, &col );
 
     unsigned int currentLine=line, currentCol=col;
 
-    QString spaces;
-    QString s = editIface->textLine( currentLine );
+    TQString spaces;
+    TQString s = editIface->textLine( currentLine );
     uint i=0;
     while( isetCursorPositionReal( currentLine, currentCol );
 }
 
-void AbbrevPart::addTemplate( const QString& templ,
-                              const QString& descr,
-                              const QString& suffixes,
-                              const QString& code)
+void AbbrevPart::addTemplate( const TQString& templ,
+                              const TQString& descr,
+                              const TQString& suffixes,
+                              const TQString& code)
 {
     m_templates.insert(templ, descr, code, suffixes);
 }
 
 
-void AbbrevPart::removeTemplate( const QString &suffixes, const QString &name )
+void AbbrevPart::removeTemplate( const TQString &suffixes, const TQString &name )
 {
     m_templates.remove( suffixes, name );
 }
@@ -502,14 +502,14 @@ void AbbrevPart::slotActivePartChanged( KParts::Part* part )
     disconnect( part->widget(), 0, this, 0 );
     disconnect( doc, 0, this, 0 );
 
-    connect( part->widget(), SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, QString*)),
-	     this, SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, QString*)) );
+    connect( part->widget(), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)),
+	     this, TQT_SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, TQString*)) );
 
     if( autoWordCompletionEnabled() ){
-	connect( part->widget(), SIGNAL(completionAborted()), this, SLOT(slotCompletionAborted()) );
-	connect( part->widget(), SIGNAL(completionDone()), this, SLOT(slotCompletionDone()) );
-	connect( part->widget(), SIGNAL(aboutToShowCompletionBox()), this, SLOT(slotAboutToShowCompletionBox()) );
-	connect( doc, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) );
+	connect( part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(slotCompletionAborted()) );
+	connect( part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(slotCompletionDone()) );
+	connect( part->widget(), TQT_SIGNAL(aboutToShowCompletionBox()), this, TQT_SLOT(slotAboutToShowCompletionBox()) );
+	connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) );
     }
 
     m_prevLine = -1;
@@ -533,11 +533,11 @@ void AbbrevPart::slotTextChanged()
 	return;
     }
 
-    QString textLine = editIface->textLine( line );
-    QChar ch = textLine[ col-1 ];
-    QChar currentChar = textLine[ col ];
+    TQString textLine = editIface->textLine( line );
+    TQChar ch = textLine[ col-1 ];
+    TQChar currentChar = textLine[ col ];
 
-    if( currentChar.isLetterOrNumber() || currentChar == QChar('_') || !(ch.isLetterOrNumber() || ch == QChar('_')) ){
+    if( currentChar.isLetterOrNumber() || currentChar == TQChar('_') || !(ch.isLetterOrNumber() || ch == TQChar('_')) ){
         // reset
         m_prevLine = -1;
 	return;
@@ -551,17 +551,17 @@ void AbbrevPart::slotTextChanged()
     m_prevColumn = col;
 }
 
-void AbbrevPart::slotFilterInsertString( KTextEditor::CompletionEntry* entry, QString* text )
+void AbbrevPart::slotFilterInsertString( KTextEditor::CompletionEntry* entry, TQString* text )
 {
     kdDebug(9028) << "AbbrevPart::slotFilterInsertString()" << endl;
     KParts::ReadWritePart *part = dynamic_cast(partController()->activePart());
-    QWidget *view = partController()->activeWidget();
+    TQWidget *view = partController()->activeWidget();
     if (!part || !view) {
         kdDebug(9028) << "no rw part" << endl;
         return;
     }
 
-    QString suffix = part->url().url();
+    TQString suffix = part->url().url();
     int pos = suffix.findRev('.');
     if (pos != -1)
         suffix.remove(0, pos+1);
@@ -570,9 +570,9 @@ void AbbrevPart::slotFilterInsertString( KTextEditor::CompletionEntry* entry, QS
     if( !entry || !text || !viewCursorIface || !editIface )
 	return;
 
-    QString expand( " " );
+    TQString expand( " " );
     if( !entry->userdata.isNull() && entry->text.endsWith(expand) ){
-	QString macro = entry->text.left( entry->text.length() - expand.length() );
+	TQString macro = entry->text.left( entry->text.length() - expand.length() );
 	*text = "";
         uint line, col;
         viewCursorIface->cursorPositionReal( &line, &col );
@@ -614,19 +614,19 @@ CodeTemplateList::~ CodeTemplateList( )
 {
 }
 
-QMap< QString, CodeTemplate * > CodeTemplateList::operator [ ]( QString suffix )
+TQMap< TQString, CodeTemplate * > CodeTemplateList::operator [ ]( TQString suffix )
 {
     kdDebug(9028) << "CodeTemplateList::operator []" << endl;
-    QMap< QString, CodeTemplate * > selectedTemplates;
-    for (QMap >::const_iterator it = templates.begin(); it != templates.end(); ++it)
+    TQMap< TQString, CodeTemplate * > selectedTemplates;
+    for (TQMap >::const_iterator it = templates.begin(); it != templates.end(); ++it)
     {
         kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << endl;
-        if (QStringList::split(",", it.key()).contains(suffix))
+        if (TQStringList::split(",", it.key()).contains(suffix))
         {
             kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << " contains " << suffix << endl;
 
-            QMap m = it.data();
-            for (QMap::const_iterator itt = m.begin(); itt != m.end(); ++itt)
+            TQMap m = it.data();
+            for (TQMap::const_iterator itt = m.begin(); itt != m.end(); ++itt)
             {
                 kdDebug(9028) << "x" << endl;
                 selectedTemplates[itt.key()] = itt.data();
@@ -636,10 +636,10 @@ QMap< QString, CodeTemplate * > CodeTemplateList::operator [ ]( QString suffix )
     return selectedTemplates;
 }
 
-void CodeTemplateList::insert( QString name, QString description, QString code, QString suffixes )
+void CodeTemplateList::insert( TQString name, TQString description, TQString code, TQString suffixes )
 {
-    QString origSuffixes = suffixes;
-//    QStringList suffixList;
+    TQString origSuffixes = suffixes;
+//    TQStringList suffixList;
     int pos = suffixes.find('(');
     if (pos == -1)
         return;
@@ -648,7 +648,7 @@ void CodeTemplateList::insert( QString name, QString description, QString code,
     if (pos == -1)
         return;
     suffixes.remove(pos, suffixes.length()-pos);
-//    suffixList = QStringList::split(",", suffixes);
+//    suffixList = TQStringList::split(",", suffixes);
 
     CodeTemplate *t;
     if (templates.contains(suffixes) && templates[suffixes].contains(name))
@@ -671,12 +671,12 @@ void CodeTemplateList::insert( QString name, QString description, QString code,
         m_suffixes.append(origSuffixes);
 }
 
-QPtrList< CodeTemplate > CodeTemplateList::allTemplates( ) const
+TQPtrList< CodeTemplate > CodeTemplateList::allTemplates( ) const
 {
     return allCodeTemplates;
 }
 
-void CodeTemplateList::remove( const QString & suffixes, const QString & name )
+void CodeTemplateList::remove( const TQString & suffixes, const TQString & name )
 {
     allCodeTemplates.remove(templates[suffixes][name]);
     templates[suffixes].remove(name);
@@ -688,7 +688,7 @@ void CodeTemplateList::clear( )
     allCodeTemplates.clear();
 }
 
-QStringList CodeTemplateList::suffixes( )
+TQStringList CodeTemplateList::suffixes( )
 {
     return m_suffixes;
 }
diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h
index f0029b51..d1c1bc7c 100644
--- a/parts/abbrev/abbrevpart.h
+++ b/parts/abbrev/abbrevpart.h
@@ -16,8 +16,8 @@
 #ifndef _ABBREVPART_H_
 #define _ABBREVPART_H_
 
-#include 
-#include 
+#include 
+#include 
 #include "kdevplugin.h"
 
 #include 
@@ -35,10 +35,10 @@ namespace KTextEditor{
 }
 
 struct CodeTemplate {
-    QString name;
-    QString description;
-    QString code;
-    QString suffixes;
+    TQString name;
+    TQString description;
+    TQString code;
+    TQString suffixes;
 };
 
 class CodeTemplateList {
@@ -46,18 +46,18 @@ public:
     CodeTemplateList();
     ~CodeTemplateList();
 
-    QMap operator[](QString suffix);
-    void insert(QString name, QString description, QString code, QString suffixes);
-    void remove(const QString &suffixes, const QString &name);
+    TQMap operator[](TQString suffix);
+    void insert(TQString name, TQString description, TQString code, TQString suffixes);
+    void remove(const TQString &suffixes, const TQString &name);
     void clear();
-    QStringList suffixes();
+    TQStringList suffixes();
 
-    QPtrList allTemplates() const;
+    TQPtrList allTemplates() const;
 
 private:
-    QMap > templates;
-    QPtrList allCodeTemplates;
-    QStringList m_suffixes;
+    TQMap > templates;
+    TQPtrList allCodeTemplates;
+    TQStringList m_suffixes;
 };
 
 class AbbrevPart : public KDevPlugin
@@ -65,15 +65,15 @@ class AbbrevPart : public KDevPlugin
     Q_OBJECT
 
 public:
-    AbbrevPart( QObject *parent, const char *name, const QStringList & );
+    AbbrevPart( TQObject *parent, const char *name, const TQStringList & );
     ~AbbrevPart();
 
     bool autoWordCompletionEnabled() const;
     void setAutoWordCompletionEnabled( bool enabled );
 
-    void addTemplate(const QString &templ, const QString &descr,
-                     const QString &suffixes, const QString &code);
-    void removeTemplate(const QString &suffixes, const QString &name);
+    void addTemplate(const TQString &templ, const TQString &descr,
+                     const TQString &suffixes, const TQString &code);
+    void removeTemplate(const TQString &suffixes, const TQString &name);
     void clearTemplates();
     CodeTemplateList templates() const;
 
@@ -85,24 +85,24 @@ private slots:
     void slotTextChanged();
     void slotCompletionAborted();
     void slotCompletionDone();
-    void slotFilterInsertString( KTextEditor::CompletionEntry*, QString* );
+    void slotFilterInsertString( KTextEditor::CompletionEntry*, TQString* );
     void slotAboutToShowCompletionBox();
 
 private:
     void updateActions();
     void load();
     void save();
-    QString currentWord() const;
-    QValueList findAllWords(const QString &text, const QString &prefix);
-    void insertChars( const QString &chars );
-//    QAsciiDict m_templates;
+    TQString currentWord() const;
+    TQValueList findAllWords(const TQString &text, const TQString &prefix);
+    void insertChars( const TQString &chars );
+//    TQAsciiDict m_templates;
     CodeTemplateList m_templates;
     bool m_inCompletion;
     int m_prevLine;
     int m_prevColumn;
     int m_sequenceLength;
     bool m_autoWordCompletionEnabled;
-    QString m_completionFile;
+    TQString m_completionFile;
 
     KTextEditor::Document* docIface;
     KTextEditor::EditInterface* editIface;
diff --git a/parts/abbrev/addtemplatedlg.cpp b/parts/abbrev/addtemplatedlg.cpp
index 35342ffe..a837c08a 100644
--- a/parts/abbrev/addtemplatedlg.cpp
+++ b/parts/abbrev/addtemplatedlg.cpp
@@ -18,17 +18,17 @@
  *
  */
 #include "addtemplatedlg.h"
-#include 
+#include 
 #include 
-#include 
+#include 
 
-AddTemplateDialog::AddTemplateDialog( QStringList suffixesList, QWidget *parent, const char *name )
+AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *parent, const char *name )
     : AddTemplateDialogBase( parent, name )
 {
     setFocusProxy( editTemplate );
     comboSuffixes->insertStringList(suffixesList);
-    connect( editTemplate,  SIGNAL(textChanged ( const QString & )), this, SLOT( textChanged()));
-    connect( editDescription,  SIGNAL(textChanged ( const QString & )), this, SLOT( textChanged()));
+    connect( editTemplate,  TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged()));
+    connect( editDescription,  TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged()));
     buttonOk->setEnabled(false);
 }
 
@@ -41,17 +41,17 @@ void AddTemplateDialog::textChanged()
     buttonOk->setEnabled( !editTemplate->text().isEmpty() && !editDescription->text().isEmpty() );
 }
 
-QString AddTemplateDialog::templ() const
+TQString AddTemplateDialog::templ() const
 {
     return editTemplate->text();
 }
 
-QString AddTemplateDialog::description() const
+TQString AddTemplateDialog::description() const
 {
     return editDescription->text();
 }
 
-QString AddTemplateDialog::suffixes() const
+TQString AddTemplateDialog::suffixes() const
 {
     return comboSuffixes->currentText();
 }
diff --git a/parts/abbrev/addtemplatedlg.h b/parts/abbrev/addtemplatedlg.h
index 9a20479e..64bcc24e 100644
--- a/parts/abbrev/addtemplatedlg.h
+++ b/parts/abbrev/addtemplatedlg.h
@@ -28,12 +28,12 @@ class AddTemplateDialog: public AddTemplateDialogBase
     Q_OBJECT
     
 public:
-    AddTemplateDialog( QStringList suffixesList, QWidget *parent=0, const char *name=0 );
+    AddTemplateDialog( TQStringList suffixesList, TQWidget *parent=0, const char *name=0 );
     virtual ~AddTemplateDialog();
 
-    QString templ() const;
-    QString description() const;
-    QString suffixes() const;
+    TQString templ() const;
+    TQString description() const;
+    TQString suffixes() const;
 private slots:
     void textChanged();
 };
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 816786ff..3d854ba0 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -13,26 +13,26 @@
 
 #include "appwizarddlg.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -53,7 +53,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -61,7 +61,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "domutil.h"
 #include "kdevversioncontrol.h"
@@ -90,7 +90,7 @@
 #include "propeditor/propertylist.h"
 #include "propeditor/propertyeditor.h"
 
-AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const char *name)
+AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const char *name)
     : AppWizardDialogBase(parent, name,true), m_pCurrentAppInfo(0),
 	m_profileSupport(new ProfileSupport(part))
 {
@@ -98,17 +98,17 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
 
 	m_customOptions = 0L;
 	loadLicenses();
-    connect( this, SIGNAL( selected( const QString & ) ), this, SLOT( pageChanged() ) );
+    connect( this, TQT_SIGNAL( selected( const TQString & ) ), this, TQT_SLOT( pageChanged() ) );
 
 	helpButton()->hide();
     templates_listview->header()->hide();
-	templates_listview->setColumnWidthMode(0, QListView::Maximum);	//to provide horiz scrollbar.
+	templates_listview->setColumnWidthMode(0, TQListView::Maximum);	//to provide horiz scrollbar.
 
 	m_templatesMenu = new KPopupMenu(templates_listview);
-	m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, SLOT(addTemplateToFavourites()));
+	m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQT_SLOT(addTemplateToFavourites()));
 
 	m_favouritesMenu = new KPopupMenu(favourites_iconview);
-	m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, SLOT(removeFavourite()));
+	m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQT_SLOT(removeFavourite()));
 
     m_pathIsValid=false;
     m_part = part;
@@ -122,15 +122,15 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
 	//templates_tabwidget->setCurrentPage(config->readNumEntry("CurrentTab", 0));
 
 	config->setGroup("General Options");
-    QString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", QDir::homeDirPath()+"/");
+    TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/");
 
     KStandardDirs *dirs = AppWizardFactory::instance()->dirs();
-    QStringList m_templateNames = dirs->findAllResources("apptemplates", QString::null, false, true);
+    TQStringList m_templateNames = dirs->findAllResources("apptemplates", TQString::null, false, true);
 
     kdDebug(9010) << "Templates: " << endl;
-    QStringList categories;
+    TQStringList categories;
 
-    QStringList::Iterator it;
+    TQStringList::Iterator it;
     for (it = m_templateNames.begin(); it != m_templateNames.end(); ++it) {
         kdDebug(9010) << (*it) << endl;
 
@@ -147,10 +147,10 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
         info->comment = templateConfig.readEntry("Comment");
         info->fileTemplates = templateConfig.readEntry("FileTemplates");
         info->openFilesAfterGeneration = templateConfig.readListEntry("ShowFilesAfterGeneration");
-        QString destDir = templateConfig.readPathEntry("DefaultDestinatonDir", defaultProjectsDir);
-        destDir.replace(QRegExp("HOMEDIR"), QDir::homeDirPath());
+        TQString destDir = templateConfig.readPathEntry("DefaultDestinatonDir", defaultProjectsDir);
+        destDir.replace(TQRegExp("HOMEDIR"), TQDir::homeDirPath());
         info->defaultDestDir = destDir;
-        QString category = templateConfig.readEntry("Category");
+        TQString category = templateConfig.readEntry("Category");
         // format category to a unique status
         if (category.right(1) == "/")
             category.remove(category.length()-1, 1); // remove /
@@ -161,13 +161,13 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
 		info->sourceArchive = templateConfig.readEntry("Archive");
 
 		// Grab includes list
-		QStringList groups = templateConfig.groupList();
+		TQStringList groups = templateConfig.groupList();
 		groups.remove("General");
-		QStringList::Iterator group = groups.begin();
+		TQStringList::Iterator group = groups.begin();
 		for(  ; group != groups.end(); ++group)
 		{
 			templateConfig.setGroup( (*group) );
-			QString type = templateConfig.readEntry("Type").lower();
+			TQString type = templateConfig.readEntry("Type").lower();
 			if( type == "include" )  // Add value
 			{
 				info->includes.append( templateConfig.readEntry( "File" ) );
@@ -176,16 +176,16 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
 		}
 
 		// Build builtins map to bootstrap.
-		QString source = kdevRoot( info->templateName );
+		TQString source = kdevRoot( info->templateName );
 		info->subMap.insert("kdevelop", source );
 
 		// Add includes to the main template...
-		QStringList::Iterator include = info->includes.begin();
+		TQStringList::Iterator include = info->includes.begin();
 		for( ; include != info->includes.end(); ++include)
 		{
 			if( !(*include).isEmpty() )
 			{
-				QString file = KMacroExpander::expandMacros( ( *include ), info->subMap);
+				TQString file = KMacroExpander::expandMacros( ( *include ), info->subMap);
 				KConfig tmpCfg( file );
 				tmpCfg.copyTo( "", &templateConfig);
 				kdDebug(9010) << "Merging: " << tmpCfg.name() << endl;
@@ -197,15 +197,15 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
 		for(  ; group != groups.end(); ++group)
 		{
 			templateConfig.setGroup( (*group) );
-			QString type = templateConfig.readEntry("Type", "value").lower();
+			TQString type = templateConfig.readEntry("Type", "value").lower();
 			kdDebug(9010) << "Reading " <<  (*group) << " of type " << type << endl;
 			if( type == "value" )  // Add value
 			{
-				QString name = templateConfig.readEntry( "Value" );
-				QString label = templateConfig.readEntry( "Comment" );
-				QString type = templateConfig.readEntry( "ValueType", "String" );
-				QVariant::Type variantType = QVariant::nameToType( type.latin1());
-				QVariant value = templateConfig.readPropertyEntry( "Default", variantType );
+				TQString name = templateConfig.readEntry( "Value" );
+				TQString label = templateConfig.readEntry( "Comment" );
+				TQString type = templateConfig.readEntry( "ValueType", "String" );
+				TQVariant::Type variantType = TQVariant::nameToType( type.latin1());
+				TQVariant value = templateConfig.readPropertyEntry( "Default", variantType );
 				value.cast( variantType );  // fix this in kdelibs...
 				if( !name.isEmpty() && !label.isEmpty() )
 					info->propValues->addProperty( new PropertyLib::Property( (int)variantType, name, label, value ) );
@@ -245,7 +245,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
 			}
 			else if( type == "ui")
 			{
-				QString name = templateConfig.readPathEntry("File");
+				TQString name = templateConfig.readPathEntry("File");
 				info->customUI = name;
 			}
 			else if( type == "message" )
@@ -264,9 +264,9 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
         insertCategoryIntoTreeView(*it);
 
     // Insert items into list view
-    QPtrListIterator ait(m_appsInfo);
+    TQPtrListIterator ait(m_appsInfo);
     for (; ait.current(); ++ait) {
-        QListViewItem *item = m_categoryMap.find(ait.current()->category);
+        TQListViewItem *item = m_categoryMap.find(ait.current()->category);
         if (item)
 		{
             item = new KListViewItem(item, ait.current()->name);
@@ -281,11 +281,11 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
 	//Load favourites from config
 	populateFavourites();
 
-	QString author, email;
+	TQString author, email;
     AppWizardUtil::guessAuthorAndEmail(&author, &email);
     author_edit->setText(author);
     email_edit->setText(email);
-    QToolTip::add( dest_edit->button(), i18n("Choose projects directory") );
+    TQToolTip::add( dest_edit->button(), i18n("Choose projects directory") );
     dest_edit->setURL(defaultProjectsDir);
     dest_edit->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
 
@@ -297,20 +297,20 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
 
     setNextEnabled(generalPage, false);
 
-//    QRegExp appname_regexp ("[a-zA-Z][a-zA-Z0-9_]*"); //Non-Unicode version
+//    TQRegExp appname_regexp ("[a-zA-Z][a-zA-Z0-9_]*"); //Non-Unicode version
     /* appname will start with a letter, and will contain letters,
        digits or underscores. */
-    QRegExp appname_regexp ("[a-zA-Z][a-zA-Z0-9_]*");
+    TQRegExp appname_regexp ("[a-zA-Z][a-zA-Z0-9_]*");
     // How about names like "__" or "123" for project name? Are they legal?
-    QRegExpValidator *appname_edit_validator;
-    appname_edit_validator = new QRegExpValidator (appname_regexp,
+    TQRegExpValidator *appname_edit_validator;
+    appname_edit_validator = new TQRegExpValidator (appname_regexp,
                                                    appname_edit,
                                                    "AppNameValidator");
     appname_edit->setValidator(appname_edit_validator);
 
     // insert the licenses into the license_combo
-    QDict< KDevLicense > lics( licenses() );
-    QDictIterator< KDevLicense > dit(lics);
+    TQDict< KDevLicense > lics( licenses() );
+    TQDictIterator< KDevLicense > dit(lics);
     int idx=1;
     for( ; dit.current(); ++dit )
     {
@@ -319,9 +319,9 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, QWidget *parent, const cha
             license_combo->setCurrentItem( idx - 1 );
     }
 
-	connect( license_combo, SIGNAL(activated(int)), this, SLOT(licenseChanged()) );
+	connect( license_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(licenseChanged()) );
 
-	m_custom_options_layout = new QHBoxLayout( custom_options );
+	m_custom_options_layout = new TQHBoxLayout( custom_options );
 	m_custom_options_layout->setAutoAdd(true);
 
 	showTemplates(false);
@@ -347,15 +347,15 @@ void AppWizardDialog::loadVcs()
 		kdDebug(9010) << "AppWizardDialog::loadVcs: creating vcs integrator "
 			<< service->name() << endl;
 
-		KLibFactory *factory = KLibLoader::self()->factory(QFile::encodeName(service->library()));
+		KLibFactory *factory = KLibLoader::self()->factory(TQFile::encodeName(service->library()));
 		if (!factory) {
-			QString errorMessage = KLibLoader::self()->lastErrorMessage();
+			TQString errorMessage = KLibLoader::self()->lastErrorMessage();
 			kdDebug(9010) << "There was an error loading the module " << service->name() << endl <<
 			"The diagnostics is:" << endl << errorMessage << endl;
 			continue;
 		}
-		QStringList args;
-		QObject *obj = factory->create(0, service->name().latin1(),
+		TQStringList args;
+		TQObject *obj = factory->create(0, service->name().latin1(),
 									"KDevVCSIntegrator", args);
 		KDevVCSIntegrator *integrator = (KDevVCSIntegrator*) obj;
 
@@ -365,7 +365,7 @@ void AppWizardDialog::loadVcs()
 		{
 			kdDebug(9010) << "    success" << endl;
 
-			QString vcsName = service->property("X-KDevelop-VCS").toString();
+			TQString vcsName = service->property("X-KDevelop-VCS").toString();
 			m_vcsForm->combo->insertItem(vcsName, i);
 			m_integrators.insert(vcsName, integrator);
 
@@ -373,7 +373,7 @@ void AppWizardDialog::loadVcs()
 			if (vcs)
 			{
 				m_integratorDialogs[i] = vcs;
-				QWidget *w = vcs->self();
+				TQWidget *w = vcs->self();
 				if (w)
 					m_vcsForm->stack->addWidget(w, i++);
 				else
@@ -409,19 +409,19 @@ void AppWizardDialog::textChanged()
 
 void AppWizardDialog::licenseChanged()
 {
-	QValueList::Iterator it;
+	TQValueList::Iterator it;
 	if( license_combo->currentItem() == 0 )
 	{
 		for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it)
 		{
-			QMultiLineEdit *edit = (*it).edit;
-			edit->setText( QString::null );
+			TQMultiLineEdit *edit = (*it).edit;
+			edit->setText( TQString::null );
 		}
 	} else {
 		KDevLicense* lic = licenses()[ license_combo->currentText() ];
 		for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) {
-			QString style = (*it).style;
-			QMultiLineEdit *edit = (*it).edit;
+			TQString style = (*it).style;
+			TQMultiLineEdit *edit = (*it).edit;
 
 			KDevFile::CommentingStyle commentStyle = KDevFile::CPPStyle;
 			if (style == "PStyle") {
@@ -434,25 +434,25 @@ void AppWizardDialog::licenseChanged()
 				commentStyle = KDevFile::XMLStyle;
 			}
 
-			QString text;
+			TQString text;
 			text = lic->assemble( commentStyle, author_edit->text(), email_edit->text() , 0 );
 			edit->setText(text);
 		}
 	}
 }
 
-QString AppWizardDialog::kdevRoot(const QString &templateName ) const
+TQString AppWizardDialog::kdevRoot(const TQString &templateName ) const
 {
-	QString source;
-    QFileInfo finfo(templateName);
-    QDir dir(finfo.dir());
+	TQString source;
+    TQFileInfo finfo(templateName);
+    TQDir dir(finfo.dir());
     dir.cdUp();
     return dir.absPath();
 }
 
 void AppWizardDialog::accept()
 {
-    QFileInfo fi(finalLoc_label->text());
+    TQFileInfo fi(finalLoc_label->text());
     // check /again/ whether the dir already exists; maybe users create it in the meantime
     if (fi.exists() ) {
         KMessageBox::sorry(this, i18n("The directory you have chosen as the location for "
@@ -463,7 +463,7 @@ void AppWizardDialog::accept()
         return;
     }
 
-    if( !QFileInfo(dest_edit->url()).isWritable()  ){
+    if( !TQFileInfo(dest_edit->url()).isWritable()  ){
         KMessageBox::sorry(this, i18n("The directory you have chosen as the location for "
                                       "the project is not writeable."));
         showPage(generalPage);
@@ -472,7 +472,7 @@ void AppWizardDialog::accept()
         return;
     }
 
-	QString source = kdevRoot( m_pCurrentAppInfo->templateName );
+	TQString source = kdevRoot( m_pCurrentAppInfo->templateName );
 
 	// Unpack template archive to temp dir, and get the name
 	kdDebug(9010) << "Unpacking archive to temp dir" << endl;
@@ -503,18 +503,18 @@ void AppWizardDialog::accept()
 	m_pCurrentAppInfo->subMap.insert("dest", finalLoc_label->text() );
 	m_pCurrentAppInfo->subMap.insert("APPNAME", appname_edit->text() );
 	m_pCurrentAppInfo->subMap.insert("APPNAMELC", appname_edit->text().lower() );
-	m_pCurrentAppInfo->subMap.insert("APPNAMESC", QString(appname_edit->text()[0]).upper() + appname_edit->text().mid(1));
+	m_pCurrentAppInfo->subMap.insert("APPNAMESC", TQString(appname_edit->text()[0]).upper() + appname_edit->text().mid(1));
 	m_pCurrentAppInfo->subMap.insert("APPNAMEUC", appname_edit->text().upper() );
 	m_pCurrentAppInfo->subMap.insert("AUTHOR", author_edit->text() );
 	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", QString::number( QDate::currentDate().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.
 	// These are the licenses known to KDE-3.2 KAboutData, KDevelop doesn't have all of these as prepared options today
-	QString license = license_combo->currentText();
+	TQString license = license_combo->currentText();
 	if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"||
 		license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" || 
 		license == "QPL" || license == "QPL_V1_0" )
@@ -527,7 +527,7 @@ void AppWizardDialog::accept()
 	}
 
 
-	QStringList cleanUpSubstMap;
+	TQStringList cleanUpSubstMap;
 	cleanUpSubstMap << "src" << "I18N" << "kdevelop";
 
 
@@ -542,37 +542,37 @@ void AppWizardDialog::accept()
 	m_pCurrentAppInfo->dirList.prepend( baseDir );
 
 	// This is too silly for words, but it's either this or reimplementing FileTemplate
-	QString tempProjectDomSource = "%1%2%3";
+	TQString tempProjectDomSource = "%1%2%3";
 	tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() );
-	QDomDocument tempProjectDom;
+	TQDomDocument tempProjectDom;
 	tempProjectDom.setContent( tempProjectDomSource );
 
-    QValueList::Iterator it;
+    TQValueList::Iterator it;
     for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) {
         KTempFile *tempFile = new KTempFile();
         m_tempFiles.append(tempFile);
 
-		QString templateText( FileTemplate::makeSubstitutions( tempProjectDom, (*it).edit->text() ) );
-		QFile f;
+		TQString templateText( FileTemplate::makeSubstitutions( tempProjectDom, (*it).edit->text() ) );
+		TQFile f;
 		f.open(IO_WriteOnly, tempFile->handle());
-		QTextStream temps(&f);
-		temps.setEncoding(QTextStream::UnicodeUTF8);
+		TQTextStream temps(&f);
+		temps.setEncoding(TQTextStream::UnicodeUTF8);
 		temps << templateText;
 		f.flush();
-		QString templateName( QString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() );
+		TQString templateName( TQString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() );
 		cleanUpSubstMap << templateName;
 		m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap)  );
 
 		installFile file;
 		file.source = tempFile->name();
-		file.dest = QString( "%{dest}/templates/%1" ).arg( (*it).suffix );
+		file.dest = TQString( "%{dest}/templates/%1" ).arg( (*it).suffix );
 		file.process = true;
 		file.isXML = false;
 		m_pCurrentAppInfo->fileList.append( file );
     }
 
 	// Add license file to the file list
-	QString licenseFile, licenseName = i18n("Custom");
+	TQString licenseFile, licenseName = i18n("Custom");
 
     if( license_combo->currentItem() != 0 )
     {
@@ -580,13 +580,13 @@ void AppWizardDialog::accept()
         KDevLicense* lic = licenses()[ licenseName ];
         if( lic )
         {
-            QStringList files( lic->copyFiles() );
-			QStringList::Iterator it = files.begin();
+            TQStringList files( lic->copyFiles() );
+			TQStringList::Iterator it = files.begin();
 			for( ; it != files.end(); ++it )
 			{
 				installFile file;
-				file.source = QString( "%{kdevelop}/template-common/%1" ).arg( *it );
-				file.dest = QString("%{dest}/%1").arg( *it );
+				file.source = TQString( "%{kdevelop}/template-common/%1" ).arg( *it );
+				file.dest = TQString("%{dest}/%1").arg( *it );
 				file.process = true;
 				file.isXML = false;
 				m_pCurrentAppInfo->fileList.append( file );
@@ -597,7 +597,7 @@ void AppWizardDialog::accept()
     }
 
 	// Run macro expander on both the dir map and file maps
-	QValueList::Iterator fileIt = m_pCurrentAppInfo->fileList.begin();
+	TQValueList::Iterator fileIt = m_pCurrentAppInfo->fileList.begin();
 	for( ; fileIt != m_pCurrentAppInfo->fileList.end(); ++fileIt)
 	{
 		(*fileIt).source = KMacroExpander::expandMacros((*fileIt).source , m_pCurrentAppInfo->subMap);
@@ -605,14 +605,14 @@ void AppWizardDialog::accept()
 		(*fileIt).dest = KMacroExpander::expandMacros((*fileIt).dest , m_pCurrentAppInfo->subMap);
 	}
 
-	QValueList::Iterator archIt = m_pCurrentAppInfo->archList.begin();
+	TQValueList::Iterator archIt = m_pCurrentAppInfo->archList.begin();
 	for( ; archIt != m_pCurrentAppInfo->archList.end(); ++archIt)
 	{
 		(*archIt).source = KMacroExpander::expandMacros((*archIt).source , m_pCurrentAppInfo->subMap);
 		(*archIt).dest = KMacroExpander::expandMacros((*archIt).dest , m_pCurrentAppInfo->subMap);
 	}
 
-	QValueList::Iterator dirIt = m_pCurrentAppInfo->dirList.begin();
+	TQValueList::Iterator dirIt = m_pCurrentAppInfo->dirList.begin();
 	for( ; dirIt != m_pCurrentAppInfo->dirList.end(); ++dirIt)
 	{
 		(*dirIt).dir = KMacroExpander::expandMacros((*dirIt).dir , m_pCurrentAppInfo->subMap);
@@ -626,10 +626,10 @@ void AppWizardDialog::accept()
                 m_pCurrentAppInfo->finishCmdDir, m_pCurrentAppInfo->subMap );
     }
 
-	QMap::Iterator mapIt( m_pCurrentAppInfo->subMap.begin() );
+	TQMap::Iterator mapIt( m_pCurrentAppInfo->subMap.begin() );
 	for( ; mapIt != m_pCurrentAppInfo->subMap.end(); ++mapIt )
 	{
-		QString escaped( mapIt.data() );
+		TQString escaped( mapIt.data() );
 		escaped.replace( "&", "&" );
 		escaped.replace( "<", "<" );
 		escaped.replace( ">", ">" );
@@ -698,7 +698,7 @@ void AppWizardDialog::accept()
 
 //	KMessageBox::information(this, KMacroExpander::expandMacros(m_pCurrentAppInfo->message, m_pCurrentAppInfo->subMap));
 
-	QStringList::Iterator cleanIt = cleanUpSubstMap.begin();
+	TQStringList::Iterator cleanIt = cleanUpSubstMap.begin();
 	for(;cleanIt != cleanUpSubstMap.end(); ++cleanIt )
 	{
 		m_pCurrentAppInfo->subMap.remove( *cleanIt );
@@ -737,7 +737,7 @@ void AppWizardDialog::accept()
 		kdDebug(9010) << "vcs integrator wasn't selected" << endl;
 
 	openAfterGeneration();
-	QWizard::accept();
+	TQWizard::accept();
 }
 
 bool AppWizardDialog::copyFile( const installFile& file )
@@ -751,23 +751,23 @@ bool AppWizardDialog::copyFile( const installFile& file )
 #include 
 #include 
 
-bool AppWizardDialog::copyFile( const QString &source, const QString &dest, bool isXML, bool process )
+bool AppWizardDialog::copyFile( const TQString &source, const TQString &dest, bool isXML, bool process )
 {
 	kdDebug( 9010 ) << "Copy: " << source << " to " << dest << endl;
 	if( process )
 	{
 		// Process the file and save it at the destFile location
-		QFile inputFile( source);
-		QFile outputFile( dest );
+		TQFile inputFile( source);
+		TQFile outputFile( dest );
 
-		const QMap &subMap = isXML ?
+		const TQMap &subMap = isXML ?
 			m_pCurrentAppInfo->subMapXML : m_pCurrentAppInfo->subMap;
 		if( inputFile.open( IO_ReadOnly ) && outputFile.open(IO_WriteOnly) )
 		{
-			QTextStream input( &inputFile );
-			input.setEncoding(QTextStream::UnicodeUTF8);
-			QTextStream output( &outputFile );
-			output.setEncoding(QTextStream::UnicodeUTF8);
+			TQTextStream input( &inputFile );
+			input.setEncoding(TQTextStream::UnicodeUTF8);
+			TQTextStream output( &outputFile );
+			output.setEncoding(TQTextStream::UnicodeUTF8);
 			while( !input.atEnd() )
 				output << KMacroExpander::expandMacros(input.readLine(), subMap) << "\n";
 			// Preserve file mode...
@@ -791,16 +791,16 @@ bool AppWizardDialog::copyFile( const QString &source, const QString &dest, bool
 	return true;
 }
 
-void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const QString &dest, bool process )
+void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQString &dest, bool process )
 {
 	KIO::NetAccess::mkdir( dest , this );
 	kdDebug(9010) << "Dir : " << dir->name() << " at " << dest << endl;
-	QStringList entries = dir->entries();
+	TQStringList entries = dir->entries();
 	kdDebug(9010) << "Entries : " << entries.join(",") << endl;
 
 	KTempDir tdir;
 
-	QStringList::Iterator entry = entries.begin();
+	TQStringList::Iterator entry = entries.begin();
 	for( ; entry != entries.end(); ++entry )
 	{
 
@@ -822,7 +822,7 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const QString
 				file->copyTo(tdir.name());
 				// assume that an archive does not contain XML files
 				// ( where should we currently get that info from? )
-				if ( !copyFile( QDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) )
+				if ( !copyFile( TQDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) )
 				{
 					KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( dest) );
 					return;
@@ -834,14 +834,14 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const QString
 	tdir.unlink();
 }
 
-void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item)
+void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item)
 {
 	if( m_customOptions )
 		delete m_customOptions;
 
     // Delete old file template pages
     while (!m_fileTemplates.isEmpty()) {
-        QMultiLineEdit *edit = m_fileTemplates.first().edit;
+        TQMultiLineEdit *edit = m_fileTemplates.first().edit;
         removePage(edit);
         delete edit;
         m_fileTemplates.remove(m_fileTemplates.begin());
@@ -852,10 +852,10 @@ void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item)
     if (info) {
         m_pCurrentAppInfo = info;
         if (!info->icon.isEmpty()) {
-            QFileInfo fi(info->templateName);
-            QDir dir(fi.dir());
+            TQFileInfo fi(info->templateName);
+            TQDir dir(fi.dir());
             dir.cdUp();
-            QPixmap pm;
+            TQPixmap pm;
             pm.load(dir.filePath(info->icon));
             icon_label->setPixmap(pm);
         } else {
@@ -872,11 +872,11 @@ void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item)
 
 
         // Create new file template pages
-        QStringList l = QStringList::split(",", info->fileTemplates);
+        TQStringList l = TQStringList::split(",", info->fileTemplates);
         if (l.empty()) //if the app template doesn't show file templates, we need to set another m_lastPage, aleXXX
            m_lastPage=m_vcsForm;
 
-        QStringList::ConstIterator it = l.begin();
+        TQStringList::ConstIterator it = l.begin();
         while (it != l.end()) {
             AppWizardFileTemplate fileTemplate;
             fileTemplate.suffix = *it;
@@ -887,8 +887,8 @@ void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item)
             } else
                 fileTemplate.style = "";
 
-            QMultiLineEdit *edit = new QMultiLineEdit(this);
-            edit->setWordWrap(QTextEdit::NoWrap);
+            TQMultiLineEdit *edit = new TQMultiLineEdit(this);
+            edit->setWordWrap(TQTextEdit::NoWrap);
             edit->setFont(KGlobalSettings::fixedFont());
             if (it == l.end())
                 m_lastPage = edit;
@@ -908,15 +908,15 @@ void AppWizardDialog::templatesTreeViewClicked(QListViewItem *item)
 }
 
 
-void AppWizardDialog::destButtonClicked(const QString& dir)
+void AppWizardDialog::destButtonClicked(const TQString& dir)
 {
     if(!dir.isEmpty()) {
 
         // set new location as default project dir?
         KConfig *config = kapp->config();
         config->setGroup("General Options");
-        QDir defPrjDir( config->readPathEntry("DefaultProjectsDir", QDir::homeDirPath()) );
-        QDir newDir (dir);
+        TQDir defPrjDir( config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()) );
+        TQDir newDir (dir);
         kdDebug(9010) << "DevPrjDir == newdir?: " << defPrjDir.absPath() << " == " << newDir.absPath() << endl;
         if (defPrjDir != newDir) {
             if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").arg( newDir.absPath() ),
@@ -941,8 +941,8 @@ void AppWizardDialog::projectLocationChanged()
   // Jakob Simon-Gaarde: Got tired of the anoying bug with the appname/location confussion.
   // This version insures WYSIWYG and checks pathvalidity
   finalLoc_label->setText(dest_edit->url() + (dest_edit->url().right(1)=="/" ? "":"/") + appname_edit->text());
-  QDir qd(dest_edit->url());
-  QFileInfo fi(dest_edit->url() + "/" + appname_edit->text());
+  TQDir qd(dest_edit->url());
+  TQFileInfo fi(dest_edit->url() + "/" + appname_edit->text());
   if (!qd.exists() || appname_edit->displayText().isEmpty()||fi.exists())
   {
     if (!fi.exists() || appname_edit->displayText().isEmpty()) {
@@ -958,17 +958,17 @@ void AppWizardDialog::projectLocationChanged()
 }
 
 
-void AppWizardDialog::insertCategoryIntoTreeView(const QString &completeCategoryPath)
+void AppWizardDialog::insertCategoryIntoTreeView(const TQString &completeCategoryPath)
 {
     kdDebug(9010) << "TemplateCategory: " << completeCategoryPath << endl;
-    QStringList categories = QStringList::split("/", completeCategoryPath);
-    QString category ="";
-    QListViewItem* pParentItem=0;
+    TQStringList categories = TQStringList::split("/", completeCategoryPath);
+    TQString category ="";
+    TQListViewItem* pParentItem=0;
 
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for (it = categories.begin(); it != categories.end(); ++it) {
         category = category + "/" + *it;
-        QListViewItem *item = m_categoryMap.find(category);
+        TQListViewItem *item = m_categoryMap.find(category);
         if (!item) { // not found, create it
             if (!pParentItem)
                 pParentItem = new KListViewItem(templates_listview,*it);
@@ -987,9 +987,9 @@ void AppWizardDialog::insertCategoryIntoTreeView(const QString &completeCategory
 }
 
 
-ApplicationInfo *AppWizardDialog::templateForItem(QListViewItem *item)
+ApplicationInfo *AppWizardDialog::templateForItem(TQListViewItem *item)
 {
-    QPtrListIterator it(m_appsInfo);
+    TQPtrListIterator it(m_appsInfo);
     for (; it.current(); ++it)
         if (it.current()->item == item)
             return it.current();
@@ -999,16 +999,16 @@ ApplicationInfo *AppWizardDialog::templateForItem(QListViewItem *item)
 
 void AppWizardDialog::openAfterGeneration()
 {
-	QString projectFile( finalLoc_label->text() + "/" + appname_edit->text().lower() + ".kdevelop" );
+	TQString projectFile( finalLoc_label->text() + "/" + appname_edit->text().lower() + ".kdevelop" );
 
 	// Read the DOM of the newly created project
-	QFile file( projectFile );
+	TQFile file( projectFile );
 	if( !file.open( IO_ReadOnly ) )
 		return;
-	QDomDocument projectDOM;
+	TQDomDocument projectDOM;
 
 	int errorLine, errorCol;
-	QString errorMsg;
+	TQString errorMsg;
 	bool success = projectDOM.setContent( &file, &errorMsg, &errorLine, &errorCol);
 	file.close();
 	if ( !success )
@@ -1023,7 +1023,7 @@ void AppWizardDialog::openAfterGeneration()
 	DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap );
 
 	//save the selected vcs
-	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", QString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
+	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
 	if (offers.count() == 1)
 	{
 		KService::Ptr service = offers.first();
@@ -1031,11 +1031,11 @@ void AppWizardDialog::openAfterGeneration()
 	}
 
 	// figure out what plugins we should disable by default
-	QString profileName = DomUtil::readEntry( projectDOM, "general/profile" );
+	TQString profileName = DomUtil::readEntry( projectDOM, "general/profile" );
 	if ( profileName.isEmpty() )
 	{
-		QString language = DomUtil::readEntry( projectDOM, "general/primarylanguage" );
-		QStringList keywords = DomUtil::readListEntry( projectDOM, "general/keywords", "keyword" );
+		TQString language = DomUtil::readEntry( projectDOM, "general/primarylanguage" );
+		TQStringList keywords = DomUtil::readListEntry( projectDOM, "general/keywords", "keyword" );
 
 		profileName = Settings::profileByAttributes( language, keywords );
 	}
@@ -1043,14 +1043,14 @@ void AppWizardDialog::openAfterGeneration()
 	ProfileEngine & engine = m_part->pluginController()->engine();
 	Profile * profile = engine.findProfile( profileName );
 
-	QStringList disableList;
+	TQStringList disableList;
 	Profile::EntryList disableEntryList = profile->list( Profile::ExplicitDisable );
 	for ( Profile::EntryList::const_iterator it = disableEntryList.constBegin(); it != disableEntryList.constEnd(); ++it )
 	{
 		disableList << (*it).name;
 	}
 
-	QStringList projectIgnoreparts = DomUtil::readListEntry( projectDOM, "/general/ignoreparts", "part" );
+	TQStringList projectIgnoreparts = DomUtil::readListEntry( projectDOM, "/general/ignoreparts", "part" );
 	projectIgnoreparts += disableList;
 	DomUtil::writeListEntry( projectDOM, "/general/ignoreparts", "part", projectIgnoreparts );
 
@@ -1059,8 +1059,8 @@ void AppWizardDialog::openAfterGeneration()
 	// write the dom back
 	if( !file.open( IO_WriteOnly ) )
 		return;
-	QTextStream ts( &file );
-	ts.setEncoding(QTextStream::UnicodeUTF8);
+	TQTextStream ts( &file );
+	ts.setEncoding(TQTextStream::UnicodeUTF8);
 	ts << projectDOM.toString(2);
 	file.close();
 
@@ -1071,10 +1071,10 @@ void AppWizardDialog::openAfterGeneration()
 	// timer to queue opening (so that files will not be opened before the project
 	// which is also queued by ProjectManager )
 	KURL::List urlsToOpen;
-	QStringList::Iterator it = m_pCurrentAppInfo->openFilesAfterGeneration.begin();
+	TQStringList::Iterator it = m_pCurrentAppInfo->openFilesAfterGeneration.begin();
 	for( ; it != m_pCurrentAppInfo->openFilesAfterGeneration.end(); ++it )
 	{
-		QString fileName( *it );
+		TQString fileName( *it );
 		if ( !fileName.isNull() )
 		{
 			fileName = KMacroExpander::expandMacros(fileName, m_pCurrentAppInfo->subMap);
@@ -1093,7 +1093,7 @@ void AppWizardDialog::pageChanged()
 
 
 	//it is possible that project name was changed - we need to update all vcs integrator dialogs
-	for (QMap::iterator it = m_integratorDialogs.begin();
+	for (TQMap::iterator it = m_integratorDialogs.begin();
 		it != m_integratorDialogs.end(); ++it)
 		(*it)->init(getProjectName(), getProjectLocation());
 }
@@ -1103,7 +1103,7 @@ void AppWizardDialog::addTemplateToFavourites()
 	addFavourite(templates_listview->currentItem());
 }
 
-void AppWizardDialog::addFavourite(QListViewItem* item, QString favouriteName)
+void AppWizardDialog::addFavourite(TQListViewItem* item, TQString favouriteName)
 {
 	if(item->childCount())
 		return;
@@ -1120,9 +1120,9 @@ void AppWizardDialog::addFavourite(QListViewItem* item, QString favouriteName)
 	}
 }
 
-ApplicationInfo* AppWizardDialog::findFavouriteInfo(QIconViewItem* item)
+ApplicationInfo* AppWizardDialog::findFavouriteInfo(TQIconViewItem* item)
 {
-    QPtrListIterator info(m_appsInfo);
+    TQPtrListIterator info(m_appsInfo);
     for (; info.current(); ++info)
         if (info.current()->favourite == item)
             return info.current();
@@ -1130,7 +1130,7 @@ ApplicationInfo* AppWizardDialog::findFavouriteInfo(QIconViewItem* item)
 	return 0;
 }
 
-void AppWizardDialog::favouritesIconViewClicked( QIconViewItem* item)
+void AppWizardDialog::favouritesIconViewClicked( TQIconViewItem* item)
 {
 	ApplicationInfo* info = findFavouriteInfo(item);
 	templatesTreeViewClicked(info->item);
@@ -1138,10 +1138,10 @@ void AppWizardDialog::favouritesIconViewClicked( QIconViewItem* item)
 
 void AppWizardDialog::removeFavourite()
 {
-	QIconViewItem* curFavourite = favourites_iconview->currentItem();
+	TQIconViewItem* curFavourite = favourites_iconview->currentItem();
 
 	//remove reference to favourite from associated appinfo
-	QPtrListIterator info(m_appsInfo);
+	TQPtrListIterator info(m_appsInfo);
 	for (; info.current(); ++info)
 	{
         if(info.current()->favourite && info.current()->favourite == curFavourite)
@@ -1163,14 +1163,14 @@ void AppWizardDialog::populateFavourites()
 
 	//favourites are stored in config as a list of templates and a seperate
 	//list of icon names.
-	QStringList templatesList = config->readPathListEntry("FavTemplates");
-	QStringList iconNamesList = config->readListEntry("FavNames");
+	TQStringList templatesList = config->readPathListEntry("FavTemplates");
+	TQStringList iconNamesList = config->readListEntry("FavNames");
 
-	QStringList::Iterator curTemplate = templatesList.begin();
-	QStringList::Iterator curIconName = iconNamesList.begin();
+	TQStringList::Iterator curTemplate = templatesList.begin();
+	TQStringList::Iterator curIconName = iconNamesList.begin();
 	while(curTemplate != templatesList.end())
 	{
-		QPtrListIterator info(m_appsInfo);
+		TQPtrListIterator info(m_appsInfo);
 		for (; info.current(); ++info)
 		{
 			if(info.current()->templateName == *curTemplate)
@@ -1190,11 +1190,11 @@ void AppWizardDialog::done(int r)
 	//it's icon name.  We have a one list for the templates
 	//and one for the names.
 
-	QStringList templatesList;
-	QStringList iconNamesList;
+	TQStringList templatesList;
+	TQStringList iconNamesList;
 
 	//Built the stringlists for each template that has a favourite.
-	QPtrListIterator it(m_appsInfo);
+	TQPtrListIterator it(m_appsInfo);
 	for (; it.current(); ++it)
 	{
         if(it.current()->favourite)
@@ -1211,24 +1211,24 @@ void AppWizardDialog::done(int r)
 	//config->writeEntry("CurrentTab", templates_tabwidget->currentPageIndex());
 	config->sync();
 
-	QDialog::done(r);
+	TQDialog::done(r);
 }
 
-void AppWizardDialog::templatesContextMenu(QListViewItem* item, const QPoint& point, int)
+void AppWizardDialog::templatesContextMenu(TQListViewItem* item, const TQPoint& point, int)
 {
 	if(item && !item->childCount())
 		m_templatesMenu->popup(point);
 }
 
-void AppWizardDialog::favouritesContextMenu(QIconViewItem* item, const QPoint& point)
+void AppWizardDialog::favouritesContextMenu(TQIconViewItem* item, const TQPoint& point)
 {
 	if(item)
 		m_favouritesMenu->popup(point);
 }
 
-void AppWizardDialog::setPermissions(const KArchiveFile *source, QString dest)
+void AppWizardDialog::setPermissions(const KArchiveFile *source, TQString dest)
 {
-	kdDebug(9010) << "AppWizardDialog::setPermissions(const KArchiveFile *source, QString dest)" << endl;
+	kdDebug(9010) << "AppWizardDialog::setPermissions(const KArchiveFile *source, TQString dest)" << endl;
 	kdDebug(9010) << "	dest: " << dest << endl;
 
 	if (source->permissions() & 00100)
@@ -1273,7 +1273,7 @@ void AppWizardDialog::setPermissions(const installFile &file)
 	}
 }
 
-QDict AppWizardDialog::licenses()
+TQDict AppWizardDialog::licenses()
 {
 	return m_licenses;
 }
@@ -1283,14 +1283,14 @@ void AppWizardDialog::loadLicenses()
 	// kdDebug(9010) << "======================== Entering loadLicenses" << endl;
 	KStandardDirs* dirs = KGlobal::dirs();
 	dirs->addResourceType( "licenses", KStandardDirs::kde_default( "data" ) + "kdevelop/licenses/" );
-	QStringList licNames = dirs->findAllResources( "licenses", QString::null, false, true );
+	TQStringList licNames = dirs->findAllResources( "licenses", TQString::null, false, true );
 
-	QStringList::Iterator it;
+	TQStringList::Iterator it;
 	for (it = licNames.begin(); it != licNames.end(); ++it)
 	{
-		QString licPath( dirs->findResource( "licenses", *it ) );
+		TQString licPath( dirs->findResource( "licenses", *it ) );
 		kdDebug(9010) << "Loading license file: " << licPath << endl;
-		QString licName = licPath.mid( licPath.findRev('/') + 1 );
+		TQString licName = licPath.mid( licPath.findRev('/') + 1 );
 		KDevLicense* lic = new KDevLicense( licName, licPath );
 		m_licenses.insert( licName, lic );
 	}
@@ -1301,7 +1301,7 @@ void AppWizardDialog::showTemplates(bool all)
 {
 	if (all)
 	{
-		QListViewItemIterator it(templates_listview);
+		TQListViewItemIterator it(templates_listview);
 		while ( it.current() ) {
 			it.current()->setVisible(true);
 			++it;
@@ -1309,19 +1309,19 @@ void AppWizardDialog::showTemplates(bool all)
 	}
 	else
 	{
-		QPtrListIterator ait(m_appsInfo);
+		TQPtrListIterator ait(m_appsInfo);
 		for (; ait.current(); ++ait)
 		{
 			ait.current()->item->setVisible(m_profileSupport->isInTemplateList(ait.current()->templateName));
 		}
 
-		QDictIterator dit(m_categoryMap);
+		TQDictIterator dit(m_categoryMap);
 		for (; dit.current(); ++dit)
 		{
 			//checking whether all children are not visible
 			kdDebug(9010) << "check: " << dit.current()->text(0) << endl;
 			bool visible = false;
-			QListViewItemIterator it(dit.current());
+			TQListViewItemIterator it(dit.current());
 			while ( it.current() ) {
 				if ((it.current()->childCount() == 0) && it.current()->isVisible())
 				{
@@ -1337,9 +1337,9 @@ void AppWizardDialog::showTemplates(bool all)
 	}
 }
 
-void AppWizardDialog::checkAndHideItems(QListView *view)
+void AppWizardDialog::checkAndHideItems(TQListView *view)
 {
-	QListViewItem *item = view->firstChild();
+	TQListViewItem *item = view->firstChild();
 	while (item)
 	{
 		if (!m_categoryItems.contains(item))
@@ -1349,11 +1349,11 @@ void AppWizardDialog::checkAndHideItems(QListView *view)
 	}
 }
 
-bool AppWizardDialog::checkAndHideItems(QListViewItem *item)
+bool AppWizardDialog::checkAndHideItems(TQListViewItem *item)
 {
 	if (!m_categoryItems.contains(item))
 		return !item->isVisible();
-	QListViewItem *child = item->firstChild();
+	TQListViewItem *child = item->firstChild();
 	bool hide = true;
 	while (child)
 	{
diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h
index 7ce8c2ff..d69d069c 100644
--- a/parts/appwizard/appwizarddlg.h
+++ b/parts/appwizard/appwizarddlg.h
@@ -25,11 +25,11 @@ class QHBoxLayout;
 class KArchiveDirectory;
 class KArchiveFile;
 class ProfileSupport;
-#include 
-#include 
+#include 
+#include 
 #include 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include "kdevversioncontrol.h"
@@ -46,60 +46,60 @@ namespace PropertyLib {
 
 struct installFile
 {
-	QString source;
-	QString dest;
-	QString option;
+	TQString source;
+	TQString dest;
+	TQString option;
 	bool process;
 	bool isXML;
 };
 
 struct installArchive
 {
-	QString source;
-	QString dest;
-	QString option;
+	TQString source;
+	TQString dest;
+	TQString option;
 	bool process;
 };
 
 struct installDir
 {
-	QString dir;
-	QString option;
+	TQString dir;
+	TQString option;
 	int perms;
 };
 
 struct ApplicationInfo
 {
-    QString templateName;
-    QString name;
-    QString comment;
-    QString icon;
-    QString category;
-    QString defaultDestDir;
-    QString fileTemplates;
-    QStringList openFilesAfterGeneration;
-    QString templateFile;
-    QMap subMap;
-	QMap subMapXML;
-    QStringList includes;
-
-	//QMap subValues;
+    TQString templateName;
+    TQString name;
+    TQString comment;
+    TQString icon;
+    TQString category;
+    TQString defaultDestDir;
+    TQString fileTemplates;
+    TQStringList openFilesAfterGeneration;
+    TQString templateFile;
+    TQMap subMap;
+	TQMap subMapXML;
+    TQStringList includes;
+
+	//TQMap subValues;
 	PropertyLib::PropertyList *propValues;
 
-    QValueList fileList;
-    QValueList archList;
-    QValueList dirList;
-    QString customUI;
-    QString message;
-    QString finishCmd;
-    QString finishCmdDir;
-    QString sourceArchive;
+    TQValueList fileList;
+    TQValueList archList;
+    TQValueList dirList;
+    TQString customUI;
+    TQString message;
+    TQString finishCmd;
+    TQString finishCmdDir;
+    TQString sourceArchive;
 
     //! item pointer to the listview
-    QListViewItem *item;
+    TQListViewItem *item;
 
 	//! pointer to favourite icon (NULL if there isn't one)
-	QIconViewItem *favourite;
+	TQIconViewItem *favourite;
 
     ApplicationInfo()
     : item( 0 ), favourite( 0 )
@@ -108,9 +108,9 @@ struct ApplicationInfo
 
 struct AppWizardFileTemplate
 {
-    QString suffix;
-    QString style;
-    QMultiLineEdit *edit;
+    TQString suffix;
+    TQString style;
+    TQMultiLineEdit *edit;
 
     AppWizardFileTemplate()
     : edit( 0 )
@@ -123,27 +123,27 @@ class AppWizardDialog : public AppWizardDialogBase
     Q_OBJECT
 
 public:
-    AppWizardDialog( AppWizardPart *part, QWidget *parent=0, const char *name=0 );
+    AppWizardDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 );
     ~AppWizardDialog();
-    QString getProjectName() { return appname_edit->text(); }
-    QString getProjectLocation() { return finalLoc_label->text(); }
+    TQString getProjectName() { return appname_edit->text(); }
+    TQString getProjectLocation() { return finalLoc_label->text(); }
 
 protected:
     virtual void accept();
 
-	virtual QDict licenses();
+	virtual TQDict licenses();
 	void loadLicenses();
 
 protected slots:
-    virtual void templatesTreeViewClicked(QListViewItem*);
+    virtual void templatesTreeViewClicked(TQListViewItem*);
     virtual void textChanged();
     virtual void licenseChanged();
-    virtual void destButtonClicked(const QString&);
+    virtual void destButtonClicked(const TQString&);
     virtual void projectNameChanged();
     virtual void projectLocationChanged();
-    virtual void favouritesIconViewClicked( QIconViewItem * );
-	virtual void templatesContextMenu(QListViewItem*, const QPoint&, int);
-	virtual void favouritesContextMenu(QIconViewItem* item, const QPoint& point);
+    virtual void favouritesIconViewClicked( TQIconViewItem * );
+	virtual void templatesContextMenu(TQListViewItem*, const TQPoint&, int);
+	virtual void favouritesContextMenu(TQIconViewItem* item, const TQPoint& point);
 	virtual void addTemplateToFavourites();
 	virtual void done(int r);
 	virtual void removeFavourite();
@@ -151,42 +151,42 @@ protected slots:
 
 private: //methods
 
-    ApplicationInfo *templateForItem(QListViewItem *item);
-    void insertCategoryIntoTreeView(const QString &completeCategoryPath);
+    ApplicationInfo *templateForItem(TQListViewItem *item);
+    void insertCategoryIntoTreeView(const TQString &completeCategoryPath);
     void loadVcs();
 	void updateNextButtons();
 
 	void populateFavourites();
-	void addFavourite(QListViewItem* item, QString favouriteName="");
-	ApplicationInfo* findFavouriteInfo(QIconViewItem* item);
+	void addFavourite(TQListViewItem* item, TQString favouriteName="");
+	ApplicationInfo* findFavouriteInfo(TQIconViewItem* item);
 
-	void unpackArchive( const KArchiveDirectory *dir, const QString &dest, bool process );
+	void unpackArchive( const KArchiveDirectory *dir, const TQString &dest, bool process );
 	bool copyFile( const installFile& file );
-	bool copyFile( const QString &source, const QString &dest, bool isXML, bool process );
-	QString kdevRoot(const QString &templateName ) const;
+	bool copyFile( const TQString &source, const TQString &dest, bool isXML, bool process );
+	TQString kdevRoot(const TQString &templateName ) const;
 	void openAfterGeneration();
 
-	void setPermissions(const KArchiveFile *source, QString dest);
+	void setPermissions(const KArchiveFile *source, TQString dest);
 	void setPermissions(const installFile &file);
 
-	void checkAndHideItems(QListView *view);
-	bool checkAndHideItems(QListViewItem *item);
+	void checkAndHideItems(TQListView *view);
+	bool checkAndHideItems(TQListViewItem *item);
 
 private: //data
 
-    QPtrList m_appsInfo;
-	QValueList m_fileTemplates;
+    TQPtrList m_appsInfo;
+	TQValueList m_fileTemplates;
     //! Store the category name and the pointer in the treeview
-    QDict m_categoryMap;
-	QValueList m_categoryItems;
+    TQDict m_categoryMap;
+	TQValueList m_categoryItems;
     //! A list of currently available version control systems
-//    QDict m_availVcs;
+//    TQDict m_availVcs;
 
-    QHBoxLayout *m_custom_options_layout;
+    TQHBoxLayout *m_custom_options_layout;
 	PropertyLib::PropertyEditor *m_customOptions;
     AppWizardPart *m_part;
-    QWidget *m_lastPage;
-    QPtrList m_tempFiles;
+    TQWidget *m_lastPage;
+    TQPtrList m_tempFiles;
     ApplicationInfo* m_pCurrentAppInfo;
     bool m_projectLocationWasChanged;
     VcsForm *m_vcsForm;
@@ -194,9 +194,9 @@ private: //data
 	KPopupMenu* m_favouritesMenu;
 	KPopupMenu* m_templatesMenu;
 
-	QDict m_licenses;
-	QDict m_integrators;
-	QMap m_integratorDialogs;
+	TQDict m_licenses;
+	TQDict m_integrators;
+	TQMap m_integratorDialogs;
 
 	ProfileSupport *m_profileSupport;
 
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index 8a19f548..6b57b320 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "appwizardpart.h"
 
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include "importdlg.h"
 #include "appwizarddlg.h"
@@ -34,7 +34,7 @@
 #include 
 #include 
 
-AppWizardPart::AppWizardPart(QObject *parent, const char *name, const QStringList &)
+AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart")
 {
     setInstance(AppWizardFactory::instance());
@@ -43,7 +43,7 @@ AppWizardPart::AppWizardPart(QObject *parent, const char *name, const QStringLis
     KAction *action;
 
     action = new KAction( i18n("&New Project..."), "window_new", 0,
-                          this, SLOT(slotNewProject()),
+                          this, TQT_SLOT(slotNewProject()),
                           actionCollection(), "project_new" );
     action->setToolTip( i18n("Generate a new project from a template") );
     action->setWhatsThis( i18n("New project
    "
@@ -52,7 +52,7 @@ AppWizardPart::AppWizardPart(QObject *parent, const char *name, const QStringLis
                                "application from a set of templates.") );
 
     action = new KAction( i18n("&Import Existing Project..."),"wizard", 0,
-                          this, SLOT(slotImportProject()),
+                          this, TQT_SLOT(slotImportProject()),
                           actionCollection(), "project_import" );
     action->setToolTip( i18n("Import existing project") );
     action->setWhatsThis( i18n("Import existing project
    Creates a project file for a given directory.") );
@@ -82,7 +82,7 @@ void AppWizardPart::slotImportProject()
 void AppWizardPart::openFilesAfterGeneration(const KURL::List urlsToOpen)
 {
 	m_urlsToOpen = urlsToOpen;
-	connect( core(), SIGNAL( projectOpened() ), this, SLOT( openFilesAfterGeneration() ) );
+	connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) );
 }
 
 void AppWizardPart::openFilesAfterGeneration()
@@ -90,7 +90,7 @@ void AppWizardPart::openFilesAfterGeneration()
 	for (KURL::List::const_iterator it = m_urlsToOpen.begin(); it != m_urlsToOpen.end(); ++it)
 		partController()->editDocument(*it);
 	m_urlsToOpen.clear();
-	disconnect( core(), SIGNAL( projectOpened() ), this, SLOT( openFilesAfterGeneration() ) );
+	disconnect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) );
 }
 
 #include "appwizardpart.moc"
diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h
index 0678d04a..5b434ebf 100644
--- a/parts/appwizard/appwizardpart.h
+++ b/parts/appwizard/appwizardpart.h
@@ -12,10 +12,10 @@
 #ifndef _APPWIZARDPART_H_
 #define _APPWIZARDPART_H_
 
-#include 
+#include 
 #include "kdevplugin.h"
-#include 
-#include 
+#include 
+#include 
 #include 
 
 class AppWizardDialog;
@@ -26,7 +26,7 @@ class AppWizardPart : public KDevPlugin
     Q_OBJECT
 
 public:
-    AppWizardPart( QObject *parent, const char *name, const QStringList & );
+    AppWizardPart( TQObject *parent, const char *name, const TQStringList & );
     ~AppWizardPart();
 
     void openFilesAfterGeneration(const KURL::List urlsToOpen);
diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp
index 8b60e369..e7436d04 100644
--- a/parts/appwizard/filepropspage.cpp
+++ b/parts/appwizard/filepropspage.cpp
@@ -1,18 +1,18 @@
 #include "filepropspage.h"
-#include 
+#include 
 #include 
-#include 
+#include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 /* 
  *  Constructs a FilePropsPage which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-FilePropsPage::FilePropsPage( QWidget* parent,  const char* name, WFlags fl )
+FilePropsPage::FilePropsPage( TQWidget* parent,  const char* name, WFlags fl )
     : FilePropsPageBase( parent, name, fl ){
-  m_props = new QPtrList;
+  m_props = new TQPtrList;
   m_current_class = 9999; // no current  
 }
 
@@ -60,7 +60,7 @@ void FilePropsPage::slotSelectionChanged()
   m_current_class = item;
 }
 
-void FilePropsPage::setClassFileProps(QPtrList props,bool different_header_impl){
+void FilePropsPage::setClassFileProps(TQPtrList props,bool different_header_impl){
   *m_props = props;
   m_different_header_impl = different_header_impl;
   if (!m_different_header_impl){
@@ -78,10 +78,10 @@ void FilePropsPage::setClassFileProps(QPtrList props,bool differe
   slotSelectionChanged();
 }
 
-QPtrList FilePropsPage::getClassFileProps(){
+TQPtrList FilePropsPage::getClassFileProps(){
   return *m_props;
 }
-void FilePropsPage::slotClassnameChanged(const QString& text){
+void FilePropsPage::slotClassnameChanged(const TQString& text){
   classes_listbox->changeItem(text, classes_listbox->currentItem());
 }
 
diff --git a/parts/appwizard/filepropspage.h b/parts/appwizard/filepropspage.h
index 3435dfa2..a0c923ed 100644
--- a/parts/appwizard/filepropspage.h
+++ b/parts/appwizard/filepropspage.h
@@ -1,19 +1,19 @@
 #ifndef FILEPROPSPAGE_H
 #define FILEPROPSPAGE_H
 #include "filepropspagebase.h"
-#include 
-#include 
+#include 
+#include 
 
 
 class ClassFileProp {
  public:
-  QString m_classname;
-  QString m_implfile;
-  QString m_headerfile;
-  QString m_baseclass;
-  QString m_description; // rich text
+  TQString m_classname;
+  TQString m_implfile;
+  TQString m_headerfile;
+  TQString m_baseclass;
+  TQString m_description; // rich text
   /** to idetify this object*/
-  QString m_key; 
+  TQString m_key; 
   bool m_change_baseclass;
 };
 
@@ -22,17 +22,17 @@ class FilePropsPage : public FilePropsPageBase
     Q_OBJECT
 
 public:
-    FilePropsPage( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    FilePropsPage( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~FilePropsPage();
-    void setClassFileProps(QPtrList props,bool different_header_impl=true);
-    QPtrList getClassFileProps();
+    void setClassFileProps(TQPtrList props,bool different_header_impl=true);
+    TQPtrList getClassFileProps();
 
 public slots:
     void slotSelectionChanged(); 
- virtual void slotClassnameChanged(const QString&);
+ virtual void slotClassnameChanged(const TQString&);
  protected:
  
- QPtrList* m_props;
+ TQPtrList* m_props;
  bool m_different_header_impl;
  uint m_current_class;
  
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index b900181d..9cb9838a 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -11,17 +11,17 @@
 
 #include "importdlg.h"
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -51,25 +51,25 @@
 #include "misc.h"
 
 
-ImportDialog::ImportDialog(AppWizardPart *part, QWidget *parent, const char *name)
+ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *name)
     : ImportDialogBase(parent, name, true), m_part(part)
 {
-    QString author, email;
+    TQString author, email;
     AppWizardUtil::guessAuthorAndEmail(&author, &email);
     author_edit->setText(author);
     email_edit->setText(email);
-    QToolTip::add( urlinput_edit->button(), i18n("Choose directory to import") );
+    TQToolTip::add( urlinput_edit->button(), i18n("Choose directory to import") );
     urlinput_edit->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
 
     KStandardDirs *dirs = AppWizardFactory::instance()->dirs();
-    importNames = dirs->findAllResources("appimports", QString::null, false, true);
+    importNames = dirs->findAllResources("appimports", TQString::null, false, true);
     importNames.sort();
 
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for (it = importNames.begin(); it != importNames.end(); ++it) {
         KConfig config(KGlobal::dirs()->findResource("appimports", *it));
         config.setGroup("General");
-        QString type = config.readEntry("Comment");
+        TQString type = config.readEntry("Comment");
         project_combo->insertItem(type);
 
         if (config.hasGroup("Infrastructure"))
@@ -86,12 +86,12 @@ ImportDialog::ImportDialog(AppWizardPart *part, QWidget *parent, const char *nam
 
     infrastructureBox->setEnabled(false);
     setProjectType("c");
-    connect( name_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotProjectNameChanged( const QString & ) ) );
+    connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotProjectNameChanged( const TQString & ) ) );
 //    scanAvailableVCS();
-    connect( fetchModuleButton, SIGNAL(clicked()),
-        this, SLOT(slotFetchModulesFromRepository()) );
-    connect(urlinput_edit, SIGNAL(urlSelected(const QString& )), this, SLOT(dirChanged()));
-    connect(urlinput_edit, SIGNAL(returnPressed(const QString& )), this, SLOT(dirChanged()));
+    connect( fetchModuleButton, TQT_SIGNAL(clicked()),
+        this, TQT_SLOT(slotFetchModulesFromRepository()) );
+    connect(urlinput_edit, TQT_SIGNAL(urlSelected(const TQString& )), this, TQT_SLOT(dirChanged()));
+    connect(urlinput_edit, TQT_SIGNAL(returnPressed(const TQString& )), this, TQT_SLOT(dirChanged()));
     slotProjectNameChanged( name_edit->text() );
 }
 
@@ -99,20 +99,20 @@ ImportDialog::ImportDialog(AppWizardPart *part, QWidget *parent, const char *nam
 ImportDialog::~ImportDialog()
 {}
 
-void ImportDialog::slotProjectNameChanged( const QString &_text )
+void ImportDialog::slotProjectNameChanged( const TQString &_text )
 {
-    ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().contains( QRegExp("\\s") ) );
+    ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().contains( TQRegExp("\\s") ) );
 }
 
 void ImportDialog::accept()
 {
-    QDir dir(urlinput_edit->url());
+    TQDir dir(urlinput_edit->url());
     if (urlinput_edit->url().isEmpty() || !dir.exists()) {
         KMessageBox::sorry(this, i18n("You have to choose a directory."));
         return;
     }
 
-    QString projectName = name_edit->text();
+    TQString projectName = name_edit->text();
     if (projectName.isEmpty()) {
         KMessageBox::sorry(this, i18n("You have to choose a project name."));
         return;
@@ -127,13 +127,13 @@ void ImportDialog::accept()
     if (infrastructureBox->isVisible() && infrastructureBox->isChecked())
         createProjectInfrastructure();
 
-//    QString author = author_edit->text();
-//    QString email = email_edit->text();
+//    TQString author = author_edit->text();
+//    TQString email = email_edit->text();
 
-    QFileInfo finfo(importNames[project_combo->currentItem()]);
-    QDir importdir(finfo.dir());
+    TQFileInfo finfo(importNames[project_combo->currentItem()]);
+    TQDir importdir(finfo.dir());
     importdir.cdUp();
-    QFile src(importdir.filePath("importfiles/" + finfo.fileName() + ".kdevelop"));
+    TQFile src(importdir.filePath("importfiles/" + finfo.fileName() + ".kdevelop"));
     kdDebug(9010) << "Import template " << src.name() << endl;
     if (!src.open(IO_ReadOnly)) {
         KMessageBox::sorry(this, i18n("Cannot open project template."));
@@ -141,10 +141,10 @@ void ImportDialog::accept()
     }
 
     // Read the DOM of the newly created project
-    QDomDocument projectDOM;
+    TQDomDocument projectDOM;
 
     int errorLine, errorCol;
-    QString errorMsg;
+    TQString errorMsg;
     bool success = projectDOM.setContent( &src, &errorMsg, &errorLine, &errorCol);
     src.close();
     if ( !success )
@@ -165,11 +165,11 @@ void ImportDialog::accept()
     }
 
     // figure out what plugins we should disable by default
-    QString profileName = DomUtil::readEntry( projectDOM, "general/profile" );
+    TQString profileName = DomUtil::readEntry( projectDOM, "general/profile" );
     if ( profileName.isEmpty() )
     {
-        QString language = DomUtil::readEntry( projectDOM, "general/primarylanguage" );
-        QStringList keywords = DomUtil::readListEntry( projectDOM, "general/keywords", "keyword" );
+        TQString language = DomUtil::readEntry( projectDOM, "general/primarylanguage" );
+        TQStringList keywords = DomUtil::readListEntry( projectDOM, "general/keywords", "keyword" );
 
         profileName = Settings::profileByAttributes( language, keywords );
     }
@@ -177,7 +177,7 @@ void ImportDialog::accept()
     ProfileEngine & engine = m_part->pluginController()->engine();
     Profile * profile = engine.findProfile( profileName );
 
-    QStringList disableList;
+    TQStringList disableList;
     Profile::EntryList disableEntryList = profile->list( Profile::ExplicitDisable );
     for ( Profile::EntryList::const_iterator it = disableEntryList.constBegin(); it != disableEntryList.constEnd(); ++it )
     {
@@ -188,25 +188,25 @@ void ImportDialog::accept()
 
 
     // write the dom back
-    QFile dest(dir.filePath(projectName + ".kdevelop"));
+    TQFile dest(dir.filePath(projectName + ".kdevelop"));
     if (!dest.open(IO_WriteOnly)) {
         KMessageBox::sorry(this, i18n("Cannot write the project file."));
         return;
     }
-    QTextStream ts( &dest );
-    ts.setEncoding(QTextStream::UnicodeUTF8);
+    TQTextStream ts( &dest );
+    ts.setEncoding(TQTextStream::UnicodeUTF8);
     ts << projectDOM.toString(2);
     dest.close();
 
 
-//     QTextStream srcstream(&src);
-//     QTextStream deststream(&dest);
+//     TQTextStream srcstream(&src);
+//     TQTextStream deststream(&dest);
 //
 //     while (!srcstream.atEnd()) {
-//         QString line = srcstream.readLine();
-//         line.replace(QRegExp("\\$APPNAMELC\\$"), projectName);
-//         line.replace(QRegExp("\\$AUTHOR\\$"), author);
-//         line.replace(QRegExp("\\$EMAIL\\$"), email);
+//         TQString line = srcstream.readLine();
+//         line.replace(TQRegExp("\\$APPNAMELC\\$"), projectName);
+//         line.replace(TQRegExp("\\$AUTHOR\\$"), author);
+//         line.replace(TQRegExp("\\$EMAIL\\$"), email);
 //         deststream << line << endl;
 //     }
 //
@@ -217,31 +217,31 @@ void ImportDialog::accept()
 
     kdDebug(9010) << "OPENING PROJECT: " << dir.filePath(projectName + ".kdevelop") << endl;
 
-    QDialog::accept();
+    TQDialog::accept();
 }
 
 
 // Checks if the directory dir and all of its subdirectories
 // (one level recursion) have files that follow patterns
 // patterns is comma-separated
-static bool dirHasFiles(QDir &dir, const QString &patterns)
+static bool dirHasFiles(TQDir &dir, const TQString &patterns)
 {
-    QStringList::ConstIterator pit, sit;
+    TQStringList::ConstIterator pit, sit;
 
-    QStringList patternList = QStringList::split(",", patterns);
+    TQStringList patternList = TQStringList::split(",", patterns);
     for (pit = patternList.begin(); pit != patternList.end(); ++pit) {
-        if (!dir.entryList(*pit, QDir::Files).isEmpty()) {
+        if (!dir.entryList(*pit, TQDir::Files).isEmpty()) {
             kdDebug(9010) << "Has files " << (*pit) << endl;
             return true;
         }
     }
 
-    QStringList subdirList = dir.entryList("*", QDir::Dirs);
+    TQStringList subdirList = dir.entryList("*", TQDir::Dirs);
     for (sit = subdirList.begin(); sit != subdirList.end(); ++sit) {
-        QDir subdir(dir);
+        TQDir subdir(dir);
         subdir.cd(*sit);
         for (pit = patternList.begin(); pit != patternList.end(); ++pit) {
-            if (!subdir.entryList(*pit, QDir::Files).isEmpty()) {
+            if (!subdir.entryList(*pit, TQDir::Files).isEmpty()) {
                 kdDebug(9010) << "Has files " << (*pit) << " in " << (*sit) << endl;
                 return true;
             }
@@ -255,12 +255,12 @@ static bool dirHasFiles(QDir &dir, const QString &patterns)
 void ImportDialog::dirChanged()
 {
     kdDebug(9010) << "ImportDialog::dirChanged" << endl;
-    QString dirName = urlinput_edit->url();
-    QDir dir(dirName);
+    TQString dirName = urlinput_edit->url();
+    TQDir dir(dirName);
     if (!dir.exists())
         return;
 
-    if ( dirName.contains( QRegExp("\\s") ) )
+    if ( dirName.contains( TQRegExp("\\s") ) )
     {
         ok_button->setEnabled( false );
         return;
@@ -270,7 +270,7 @@ void ImportDialog::dirChanged()
     }
 
     // KDevelop legacy project?
-    QStringList files = dir.entryList("*.kdevprj");
+    TQStringList files = dir.entryList("*.kdevprj");
     if (!files.isEmpty()) {
         scanLegacyKDevelopProject(dir.absFilePath(files.first()));
         return;
@@ -290,7 +290,7 @@ void ImportDialog::dirChanged()
     }
 
     // Remove any characters from the dirName that would be invalid in a project name
-    QString projectName(dir.dirName().replace(QRegExp("[^a-zA-Z0-9_]"), "_"));
+    TQString projectName(dir.dirName().replace(TQRegExp("[^a-zA-Z0-9_]"), "_"));
 
     // Set the project name
     name_edit->setText(projectName);
@@ -328,7 +328,7 @@ void ImportDialog::dirChanged()
 }
 
 
-void ImportDialog::scanLegacyKDevelopProject(const QString &fileName)
+void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName)
 {
     kdDebug(9010) << "Scanning legacy KDevelop project file " << fileName << endl;
 
@@ -338,8 +338,8 @@ void ImportDialog::scanLegacyKDevelopProject(const QString &fileName)
     email_edit->setText(config.readEntry("email"));
     name_edit->setText(config.readEntry("project_name"));
 
-    QString legacyType = config.readEntry("project_type");
-    if (QStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").contains(legacyType))
+    TQString legacyType = config.readEntry("project_type");
+    if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").contains(legacyType))
         setProjectType("kde");
     else if (legacyType == "normal_gnome")
         setProjectType("gnome");
@@ -350,7 +350,7 @@ void ImportDialog::scanLegacyKDevelopProject(const QString &fileName)
 }
 
 
-void ImportDialog::scanLegacyStudioProject(const QString &fileName)
+void ImportDialog::scanLegacyStudioProject(const TQString &fileName)
 {
     kdDebug(9010) << "Scanning legacy studio project file " << fileName << endl;
 
@@ -361,15 +361,15 @@ void ImportDialog::scanLegacyStudioProject(const QString &fileName)
 }
 
 
-void ImportDialog::scanAutomakeProject(const QString &dirName)
+void ImportDialog::scanAutomakeProject(const TQString &dirName)
 {
     kdDebug(9010) << "Scanning automake project directory " << dirName << endl;
 
     bool stop = false;
-    if (QFile::exists(dirName + "/admin/am_edit")) {
+    if (TQFile::exists(dirName + "/admin/am_edit")) {
         setProjectType("kde");
         stop = true;
-    } else if (QFile::exists(dirName + "/macros/gnome.m4")) {
+    } else if (TQFile::exists(dirName + "/macros/gnome.m4")) {
         setProjectType("gnome");
         stop = true;
     } else {
@@ -377,13 +377,13 @@ void ImportDialog::scanAutomakeProject(const QString &dirName)
     }
 
     // if we get an authors file, use it.
-    QFile af(dirName + "/AUTHORS");
+    TQFile af(dirName + "/AUTHORS");
     if (af.open(IO_ReadOnly)){
-        QTextStream astream(&af);
+        TQTextStream astream(&af);
 
-        QRegExp authorre("(.*)<(.*)>");
+        TQRegExp authorre("(.*)<(.*)>");
         while (!astream.atEnd()) {
-            QString s = astream.readLine();
+            TQString s = astream.readLine();
             if (authorre.search(s) != -1) {
                 author_edit->setText(authorre.cap(1).stripWhiteSpace());
                 email_edit->setText(authorre.cap(2).stripWhiteSpace());
@@ -396,30 +396,30 @@ void ImportDialog::scanAutomakeProject(const QString &dirName)
     // we ignore old AC_INIT that had no version..
     // only match the if there is a comma and at least two args..
     // AC_INIT (package, version, [bug-report], [tarname])
-    QRegExp ac_init("^AC_INIT\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)");
+    TQRegExp ac_init("^AC_INIT\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)");
 
     // AM_INIT_AUTOMAKE([OPTIONS])
     // example: AM_INIT_AUTOMAKE([gnits 1.5 no-define dist-bzip2])
-    QRegExp am_autoSpace("^AM_INIT_AUTOMAKE\\s{0,}\\(\\s{0,}([\\[\\s]{0,}[^\\s]+)\\s+([^\\s\\)\\]]+)(.*)");
+    TQRegExp am_autoSpace("^AM_INIT_AUTOMAKE\\s{0,}\\(\\s{0,}([\\[\\s]{0,}[^\\s]+)\\s+([^\\s\\)\\]]+)(.*)");
 
     // AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-    QRegExp am_autoComma("^AM_INIT_AUTOMAKE\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)");
+    TQRegExp am_autoComma("^AM_INIT_AUTOMAKE\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)");
 
     // look for version in a define.
     // AC_DEFINE(VERSION, "5.6")
-    QRegExp ac_define("^AC_DEFINE\\s*\\(\\s*[^,]+,([^\\)]+)");
-    QRegExp version("(\\bversion\\b)");
+    TQRegExp ac_define("^AC_DEFINE\\s*\\(\\s*[^,]+,([^\\)]+)");
+    TQRegExp version("(\\bversion\\b)");
     version.setCaseSensitive(FALSE);
 
-    QTextStream cstream;
+    TQTextStream cstream;
     // try for configure.in.in, configure.in, then configure.ac
-    QFile configInIn(dirName + "/configure.in.in");
-    QFile configIn(dirName+"/configure.in");
-    QFile configAc(dirName+"/configure.ac");
+    TQFile configInIn(dirName + "/configure.in.in");
+    TQFile configIn(dirName+"/configure.in");
+    TQFile configAc(dirName+"/configure.ac");
     if (configInIn.open(IO_ReadOnly)){
         cstream.setDevice(&configInIn);
         while (!cstream.atEnd()) {
-            QString line = cstream.readLine();
+            TQString line = cstream.readLine();
             if ( ac_init.search(line) >= 0){
                 projectVersion=ac_init.cap(2).stripWhiteSpace();
             }
@@ -448,11 +448,11 @@ void ImportDialog::scanAutomakeProject(const QString &dirName)
         }
     }
 
-    QRegExp namere("\\s*AM_INIT_AUTOMAKE\\((.*),.*\\).*");
-    QRegExp cppre("\\s*AC_PROG_CXX");
-    QRegExp f77re("\\s*AC_PROG_F77");
+    TQRegExp namere("\\s*AM_INIT_AUTOMAKE\\((.*),.*\\).*");
+    TQRegExp cppre("\\s*AC_PROG_CXX");
+    TQRegExp f77re("\\s*AC_PROG_F77");
     while (!cstream.atEnd()) {
-        QString line = cstream.readLine();
+        TQString line = cstream.readLine();
         if ( ac_init.search(line) >= 0){
             projectVersion=ac_init.cap(2).stripWhiteSpace();
         }
@@ -481,14 +481,14 @@ void ImportDialog::scanAutomakeProject(const QString &dirName)
 }
 
 
-void ImportDialog::setProjectType(const QString &type)
+void ImportDialog::setProjectType(const TQString &type)
 {
     kdDebug(9010) << "Setting project type " << type << endl;
-    QString suffix = "/" + type;
+    TQString suffix = "/" + type;
     int suffixLength = suffix.length();
 
     int i=0;
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for (it = importNames.begin(); it != importNames.end(); ++it) {
         if ((*it).right(suffixLength) == suffix) {
             project_combo->setCurrentItem(i);
@@ -512,7 +512,7 @@ void ImportDialog::scanAvailableVCS()
 }
 */
 /*
-void ImportDialog::slotFinishedCheckout( QString destinationDir )
+void ImportDialog::slotFinishedCheckout( TQString destinationDir )
 {
     urlinput_edit->setURL( destinationDir );
 
@@ -531,8 +531,8 @@ void ImportDialog::slotFetchModulesFromRepository()
     setCursor( KCursor::waitCursor() );
 //    setEnabled( false );
 
-    connect( vcs, SIGNAL(finishedFetching(QString)),
-        this, SLOT(slotFinishedCheckout(QString)) );
+    connect( vcs, TQT_SIGNAL(finishedFetching(TQString)),
+        this, TQT_SLOT(slotFinishedCheckout(TQString)) );
 
     //restore cursor if we can't fetch repository
     if ( !vcs->fetchFromRepository() )
@@ -540,7 +540,7 @@ void ImportDialog::slotFetchModulesFromRepository()
 
 }
 */
-void ImportDialog::projectTypeChanged( const QString &type )
+void ImportDialog::projectTypeChanged( const TQString &type )
 {
     if (m_infrastructure[type].isOn)
     {
@@ -561,14 +561,14 @@ void ImportDialog::createProjectInfrastructure( )
     if (!cmd.isOn)
         return;
 
-    QDir dir (urlinput_edit->url());
-    QStringList files = dir.entryList(cmd.existingPattern);
+    TQDir dir (urlinput_edit->url());
+    TQStringList files = dir.entryList(cmd.existingPattern);
     if (!files.isEmpty()) {
-        if (KMessageBox::questionYesNo(this, i18n("Project infrastrucure already exists in target directory.\nGenerate new project infrastructure and overwrite old?"), QString::null, i18n("Generate"), i18n("Do Not Generate")) == KMessageBox::No)
+        if (KMessageBox::questionYesNo(this, i18n("Project infrastrucure already exists in target directory.\nGenerate new project infrastructure and overwrite old?"), TQString::null, i18n("Generate"), i18n("Do Not Generate")) == KMessageBox::No)
             return;
     }
 
-    QString command = "cd " + urlinput_edit->url() + " && " + cmd.command;
+    TQString command = "cd " + urlinput_edit->url() + " && " + cmd.command;
     kdDebug(9010) << "executing " << command.ascii() << endl;
     system(command.ascii());
 }
diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h
index daa136b6..35772133 100644
--- a/parts/appwizard/importdlg.h
+++ b/parts/appwizard/importdlg.h
@@ -13,16 +13,16 @@
 #define _IMPORTDLG_H_
 
 #include "importdlgbase.h"
-#include 
+#include 
 
 
 class AppWizardPart;
 
 struct InfrastructureCmd{
     bool isOn;
-    QString comment;
-    QString command;
-    QString existingPattern;
+    TQString comment;
+    TQString command;
+    TQString existingPattern;
 };
 
 class ImportDialog : public ImportDialogBase
@@ -30,7 +30,7 @@ class ImportDialog : public ImportDialogBase
     Q_OBJECT
 
 public:
-    ImportDialog( AppWizardPart *part, QWidget *parent=0, const char *name=0 );
+    ImportDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 );
     ~ImportDialog();
 
 protected:
@@ -38,27 +38,27 @@ protected:
 
 protected slots:
     virtual void dirChanged();
-    virtual void projectTypeChanged(const QString &type);
+    virtual void projectTypeChanged(const TQString &type);
     virtual void projectTypeChanged(int type);
 
 private slots:
-//    void slotFinishedCheckout( QString destinationDir );
+//    void slotFinishedCheckout( TQString destinationDir );
 //    void slotFetchModulesFromRepository();
-    void slotProjectNameChanged( const QString &_text );
+    void slotProjectNameChanged( const TQString &_text );
 private:
 //    void scanAvailableVCS();
-    void scanLegacyKDevelopProject(const QString &fileName);
-    void scanLegacyStudioProject(const QString &fileName);
-    void scanAutomakeProject(const QString &dirName);
-    void setProjectType(const QString &type);
+    void scanLegacyKDevelopProject(const TQString &fileName);
+    void scanLegacyStudioProject(const TQString &fileName);
+    void scanAutomakeProject(const TQString &dirName);
+    void setProjectType(const TQString &type);
 
     void createProjectInfrastructure();
 
-    QStringList importNames;
+    TQStringList importNames;
     AppWizardPart *m_part;
-    QString projectVersion;
+    TQString projectVersion;
 
-    QMap m_infrastructure;
+    TQMap m_infrastructure;
 };
 
 #endif
diff --git a/parts/appwizard/kdevfile.cpp b/parts/appwizard/kdevfile.cpp
index 12e4826f..4edb62c7 100644
--- a/parts/appwizard/kdevfile.cpp
+++ b/parts/appwizard/kdevfile.cpp
@@ -40,7 +40,7 @@ static struct MimeTypeMapping
 {	NULL,                       KDevFile::NoCommenting       }
 };
 
-KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( const QString& mimeType )
+KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( const TQString& mimeType )
 {
 	int idx = 0;
 	while( mimeTypeMapping[idx].szMimeType )
diff --git a/parts/appwizard/kdevfile.h b/parts/appwizard/kdevfile.h
index ea822357..6b2e2699 100644
--- a/parts/appwizard/kdevfile.h
+++ b/parts/appwizard/kdevfile.h
@@ -47,7 +47,7 @@ public:
 public:
     /**@return A commenting style for a given mime type.
     @param mimeType A string which defines a mime type (like "text/x-c+++src").*/
-    static CommentingStyle commentingStyleFromMimeType(const QString& mimeType);
+    static CommentingStyle commentingStyleFromMimeType(const TQString& mimeType);
     
     /**@return A commenting style for a given mime type.
     @param mimeType The mime type.*/
diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp
index 6987a54d..5e189422 100644
--- a/parts/appwizard/kdevlicense.cpp
+++ b/parts/appwizard/kdevlicense.cpp
@@ -18,23 +18,23 @@
 */
 #include "kdevlicense.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
-KDevLicense::KDevLicense( const QString& name, const QString& fileName )
+KDevLicense::KDevLicense( const TQString& name, const TQString& fileName )
 	: m_name( name )
 {
 	readFile( fileName );
 }
 
-void KDevLicense::readFile( const QString& fileName )
+void KDevLicense::readFile( const TQString& fileName )
 {
-	QFile f(fileName);
+	TQFile f(fileName);
 	if (!f.open(IO_ReadOnly))
 		return;
-	QTextStream stream(&f);
-	QString str;
+	TQTextStream stream(&f);
+	TQString str;
 	enum { readingText, readingFiles } mode = readingText;
 	for(;;)
 	{
@@ -57,25 +57,25 @@ void KDevLicense::readFile( const QString& fileName )
 
 }
 
-QString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const QString& author, const QString& email, int leadingSpaces )
+TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces )
 {
 	// first, build a CPP Style license
 	
-	QString strFill;
+	TQString strFill;
 	strFill.fill( ' ', leadingSpaces );
 	
-	QString str = 
+	TQString str = 
 		strFill + "/***************************************************************************\n" +
 		strFill + " *   Copyright (C) $YEAR$ by $AUTHOR$   *\n" +
 		strFill + " *   $EMAIL$   *\n" +
 		strFill + " *                                                                         *\n";
 	
-//	str = str.arg(QDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67);
+//	str = str.arg(TQDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67);
 	
-	QStringList::Iterator it;
+	TQStringList::Iterator it;
 	for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it )
 	{
-		str += QString( "%1 *   %2 *\n").arg( strFill ).arg( *it, -69 );
+		str += TQString( "%1 *   %2 *\n").arg( strFill ).arg( *it, -69 );
 	}
 	
 	str += strFill + " ***************************************************************************/\n";
@@ -87,28 +87,28 @@ QString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const
 			return str;
 			
 		case KDevFile::PascalStyle:
-			str.replace(QRegExp("/\\**\n \\*"), "{\n  ");
-			str.replace(QRegExp("\\*\n \\*"), " \n  ");
-			str.replace(QRegExp(" *\\**/\n"), "}\n");
+			str.replace(TQRegExp("/\\**\n \\*"), "{\n  ");
+			str.replace(TQRegExp("\\*\n \\*"), " \n  ");
+			str.replace(TQRegExp(" *\\**/\n"), "}\n");
 			return str;
 			
 		case KDevFile::AdaStyle:
-			str.replace(QRegExp("/\\*"), "--");
-			str.replace(QRegExp(" \\*"), "--");
-			str.replace(QRegExp("\\*/"), "*");
+			str.replace(TQRegExp("/\\*"), "--");
+			str.replace(TQRegExp(" \\*"), "--");
+			str.replace(TQRegExp("\\*/"), "*");
 			return str;
 			
 		case KDevFile::BashStyle:
-			str.replace(QRegExp("\\*|/"), "#");
-			str.replace(QRegExp("\n ##"), "\n##");
-			str.replace(QRegExp("\n #"), "\n# ");
+			str.replace(TQRegExp("\\*|/"), "#");
+			str.replace(TQRegExp("\n ##"), "\n##");
+			str.replace(TQRegExp("\n #"), "\n# ");
 			return str;
 
 		case KDevFile::XMLStyle:
-			str.replace(QRegExp("/\\*"), "\n");
-			str.replace(QRegExp("\\*"), "_");
+			str.replace(TQRegExp("/\\*"), "\n");
+			str.replace(TQRegExp("\\*"), "_");
 			return str;
 	}
 
diff --git a/parts/appwizard/kdevlicense.h b/parts/appwizard/kdevlicense.h
index 0f8a41ce..2e81c9ec 100644
--- a/parts/appwizard/kdevlicense.h
+++ b/parts/appwizard/kdevlicense.h
@@ -24,7 +24,7 @@
 The interface to installed licenses.
 */
 
-#include 
+#include 
 
 #include "kdevfile.h"
 
@@ -35,41 +35,41 @@ public:
     /**Constructs a KDevLicense and loads the given license template file.
     @param name The name of this license.
     @param fileName The file name where license template text is kept.*/
-    KDevLicense(const QString& name, const QString& fileName);
+    KDevLicense(const TQString& name, const TQString& fileName);
 
 public:
     /**Assembles the license to a string suitable for replacement of a %{LICENSE} .*/
-    QString assemble(KDevFile::CommentingStyle commentingStyle, const QString& author, const QString& email, int leadingSpaces );
+    TQString assemble(KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces );
 
     /**
     * returns the name of this license.
     */
-    QString name() const { return m_name; }
+    TQString name() const { return m_name; }
 
     /**
     * returns list of files tat must be present in the project's root directory
     * if any source files uses this license.
     */
-    QStringList copyFiles(){ return m_copyFiles; }
+    TQStringList copyFiles(){ return m_copyFiles; }
 
 private:
-    void readFile( const QString& fileName );
+    void readFile( const TQString& fileName );
 
 private:
     /**
     * Name of this license
     */
-    QString m_name;
+    TQString m_name;
     /**
     * Raw lines of the license. Should contain no spaces at
     * the start or end of each line.
     */
-    QStringList m_rawLines;
+    TQStringList m_rawLines;
     /**
     * List of files that must be added to the project, if any
     * file in the project uses this license.
     */
-    QStringList m_copyFiles;
+    TQStringList m_copyFiles;
 };
 
 #endif
diff --git a/parts/appwizard/misc.cpp b/parts/appwizard/misc.cpp
index 3590b589..63d670b5 100644
--- a/parts/appwizard/misc.cpp
+++ b/parts/appwizard/misc.cpp
@@ -11,7 +11,7 @@
 
 #include "misc.h"
 
-#include 
+#include 
 #include 
 
 #include 
@@ -21,12 +21,12 @@
 #include 
 #include 
 
-void AppWizardUtil::guessAuthorAndEmail(QString *author, QString *email)
+void AppWizardUtil::guessAuthorAndEmail(TQString *author, TQString *email)
 {
   KEMailSettings emailConfig;
   emailConfig.setProfile( emailConfig.defaultProfileName() );
-  QString fromAddr = emailConfig.getSetting( KEMailSettings::EmailAddress );
-  QString name = emailConfig.getSetting( KEMailSettings::RealName );
+  TQString fromAddr = emailConfig.getSetting( KEMailSettings::EmailAddress );
+  TQString name = emailConfig.getSetting( KEMailSettings::RealName );
 
   if ( !fromAddr.isEmpty() && !name.isEmpty() ) {
     *author = name;
@@ -45,11 +45,11 @@ void AppWizardUtil::guessAuthorAndEmail(QString *author, QString *email)
   (void) ::gethostname(hostname, sizeof hostname);
 
   if ( name.isEmpty() )
-    *author = QString::fromLocal8Bit( pw->pw_gecos );
+    *author = TQString::fromLocal8Bit( pw->pw_gecos );
   else
     *author = name;
   if ( fromAddr.isEmpty() )
-    *email = QString(pw->pw_name) + "@" + hostname;
+    *email = TQString(pw->pw_name) + "@" + hostname;
   else
     *email = fromAddr;
 }
diff --git a/parts/appwizard/misc.h b/parts/appwizard/misc.h
index 1378943b..8d9402b3 100644
--- a/parts/appwizard/misc.h
+++ b/parts/appwizard/misc.h
@@ -12,12 +12,12 @@
 #ifndef _MISC_H_
 #define _MISC_H_
 
-#include 
+#include 
 
 class AppWizardUtil
 {
 public:
-    static void guessAuthorAndEmail(QString *author, QString *email);
+    static void guessAuthorAndEmail(TQString *author, TQString *email);
 };
 
 #endif
diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp
index e50e5535..084156f5 100644
--- a/parts/appwizard/profilesupport.cpp
+++ b/parts/appwizard/profilesupport.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "profilesupport.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -38,7 +38,7 @@ ProfileSupport::ProfileSupport(KDevPlugin *parent)
     }
 }
 
-bool ProfileSupport::isInTemplateList(const QString &templateUrl)
+bool ProfileSupport::isInTemplateList(const TQString &templateUrl)
 {
-    return m_templateList.contains(QFileInfo(templateUrl).baseName());
+    return m_templateList.contains(TQFileInfo(templateUrl).baseName());
 }
diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h
index f3b89ac8..b18a9620 100644
--- a/parts/appwizard/profilesupport.h
+++ b/parts/appwizard/profilesupport.h
@@ -25,10 +25,10 @@
 class ProfileSupport{
 public:
     ProfileSupport(KDevPlugin *parent);
-    bool isInTemplateList(const QString &templateUrl);
+    bool isInTemplateList(const TQString &templateUrl);
     
 private:
-    QStringList m_templateList;
+    TQStringList m_templateList;
 };
 
 #endif
diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp
index 124da96e..6d6d44b6 100644
--- a/parts/astyle/astyle_adaptor.cpp
+++ b/parts/astyle/astyle_adaptor.cpp
@@ -4,19 +4,19 @@
 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
 
 
 
-ASStringIterator::ASStringIterator(const QString &text)
+ASStringIterator::ASStringIterator(const TQString &text)
   : ASSourceIterator(), _content(text)
 {
-  _is = new QTextStream(&_content, IO_ReadOnly);
+  _is = new TQTextStream(&_content, IO_ReadOnly);
 }
 
 
@@ -38,9 +38,9 @@ string ASStringIterator::nextLine()
 }
 
 
-KDevFormatter::KDevFormatter(const QMap& options)
+KDevFormatter::KDevFormatter(const TQMap& options)
 {
-// 	for ( QMap::ConstIterator iter = options.begin();iter != options.end();iter++ )
+// 	for ( TQMap::ConstIterator iter = options.begin();iter != options.end();iter++ )
 // 	{
 // 		kdDebug ( 9009 ) << "format: " << iter.key() << "=" << iter.data()  << endl;
 // 	}
@@ -48,7 +48,7 @@ KDevFormatter::KDevFormatter(const QMap& options)
 	setCStyle();
 
 	// style
-	QString s = options["FStyle"].toString();
+	TQString s = options["FStyle"].toString();
 	if ( predefinedStyle( s ) )
 	{
 		return;
@@ -215,7 +215,7 @@ KDevFormatter::KDevFormatter( AStyleWidget * widget )
 	setSingleStatementsMode( !widget->Keep_Statements->isChecked() );
 }
 
-bool KDevFormatter::predefinedStyle( const QString & style )
+bool KDevFormatter::predefinedStyle( const TQString & style )
 {
 	if (style == "ANSI")
 	{
diff --git a/parts/astyle/astyle_adaptor.h b/parts/astyle/astyle_adaptor.h
index 2367c4d7..21398fbb 100644
--- a/parts/astyle/astyle_adaptor.h
+++ b/parts/astyle/astyle_adaptor.h
@@ -2,10 +2,10 @@
 #define __ASTYLE_ADAPTOR_H__
 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "astyle.h"
 
@@ -17,7 +17,7 @@ class ASStringIterator : public astyle::ASSourceIterator
 {
 public:
 
-  ASStringIterator(const QString &string);
+  ASStringIterator(const TQString &string);
   virtual ~ASStringIterator();
 
   virtual bool hasMoreLines() const;
@@ -26,8 +26,8 @@ public:
 
 private:
 
-  QString _content;
-  QTextStream *_is;
+  TQString _content;
+  TQTextStream *_is;
 
 };
 
@@ -37,18 +37,18 @@ class KDevFormatter : public astyle::ASFormatter
 {
 public:
 
-  KDevFormatter(const QMap& options);
+  KDevFormatter(const TQMap& options);
   KDevFormatter( AStyleWidget * widget );
-  QString indentString() const
+  TQString indentString() const
   {
 	  return m_indentString;
   }
   
 private:
-	bool predefinedStyle( const QString & style );
+	bool predefinedStyle( const TQString & style );
 
 private:
-	QString m_indentString;
+	TQString m_indentString;
 };
 
 
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 526af170..f89c2b95 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -1,9 +1,9 @@
 #include "astyle_part.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -27,8 +27,8 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include "astyle_widget.h"
 #include "astyle_adaptor.h"
@@ -43,20 +43,20 @@ namespace {
 typedef KDevGenericFactory AStyleFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) )
 
-AStylePart::AStylePart(QObject *parent, const char *name, const QStringList &)
+AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
   : KDevSourceFormatter(&data, parent, name ? name : "AStylePart")
 {
   setInstance(AStyleFactory::instance());
 
   setXMLFile("kdevpart_astyle.rc");
 
-  formatTextAction = new KAction(i18n("&Reformat Source"), 0, this, SLOT(beautifySource()), actionCollection(), "edit_astyle");
+  formatTextAction = new KAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle");
   formatTextAction->setEnabled(false);
   formatTextAction->setToolTip(i18n("Reformat source"));
   formatTextAction->setWhatsThis(i18n("Reformat source
    Source reformatting functionality using astyle library. "
                              "Also available in New Class and Subclassing wizards."));
 
-  formatFileAction = new KAction(i18n("Format files"), 0, this, SLOT(formatFilesSelect()), actionCollection(), "tools_astyle");
+  formatFileAction = new KAction(i18n("Format files"), 0, this, TQT_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle");
   formatFileAction->setEnabled(false);
   formatFileAction->setToolTip(i18n("Format files"));
   formatFileAction->setWhatsThis(i18n("Fomat files
    Formatting functionality using astyle library. "
@@ -68,11 +68,11 @@ AStylePart::AStylePart(QObject *parent, const char *name, const QStringList &)
   m_configProxy->createProjectConfigPage(i18n("Formatting"), PROJECTDOC_OPTIONS, info()->icon());
 
 
-  connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase* ,QWidget*,unsigned int)), this, SLOT(insertConfigWidget(const KDialogBase*,QWidget*,unsigned int)));
+  connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQT_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int)));
 
-  connect(partController(), SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(activePartChanged(KParts::Part*)));
+  connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*)));
 
-  connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
+  connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
   loadGlobal();
   //use the globals first, project level will override later..
@@ -90,18 +90,18 @@ void AStylePart::loadGlobal()
 //   kdDebug(9009) << "Load global"<config();
   config->setGroup("AStyle");
-  QString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,");
-  m_globalExtensions=QStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions));
+  TQString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,");
+  m_globalExtensions=TQStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions));
 
- QStringList pairs = QStringList::split( ",", options);
- QStringList::Iterator it;
+ TQStringList pairs = TQStringList::split( ",", options);
+ TQStringList::Iterator it;
  for ( it = pairs.begin(); it != pairs.end(); ++it ) {
-	QStringList bits = QStringList::split( "=", (*it) );
+	TQStringList bits = TQStringList::split( "=", (*it) );
 	m_global[bits[0]] = bits[1];
  }
 
 
-//   for (QMap::iterator iter = m_global.begin();iter != m_global.end();iter++)
+//   for (TQMap::iterator iter = m_global.begin();iter != m_global.end();iter++)
 //         {
 //               kdDebug(9009) << "load: " <::iterator iter = m_project.begin();iter != m_project.end();iter++)
+// 		for (TQMap::iterator iter = m_project.begin();iter != m_project.end();iter++)
 //         {
 //               kdDebug(9009) << "project before: "  <sync();
-//   	 for (QMap::iterator iter = m_global.begin();iter != m_global.end();iter++)
+//   	 for (TQMap::iterator iter = m_global.begin();iter != m_global.end();iter++)
 //         {
 //               kdDebug(9009) << "global after: "  <selection();
+  	TQString original = sel_iface->selection();
 	for (;indentCountactivePart(), col, line );
 }
 
-void AStylePart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo)
+void AStylePart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo)
 {
 	switch (pageNo)
 	{
 		case GLOBALDOC_OPTIONS:
 		{
 			AStyleWidget *w = new AStyleWidget(this, true, page, "astyle config widget");
-			connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
+			connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
 			break;
 		}
 		case PROJECTDOC_OPTIONS:
 		{
 			AStyleWidget *w = new AStyleWidget(this, false, page, "astyle config widget");
-			connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
+			connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
 			break;
 		}
 	}
 }
 
-QString AStylePart::getGlobalExtensions(){
-	QString values = m_globalExtensions.join("\n");
+TQString AStylePart::getGlobalExtensions(){
+	TQString values = m_globalExtensions.join("\n");
 	return values.stripWhiteSpace();
 }
-QString AStylePart::getProjectExtensions(){
-	QString values = m_projectExtensions.join("\n");
+TQString AStylePart::getProjectExtensions(){
+	TQString values = m_projectExtensions.join("\n");
 	return values.stripWhiteSpace();
 }
 
@@ -277,21 +277,21 @@ QString AStylePart::getProjectExtensions(){
  * end up at the top
  * @param ext
  */
-void AStylePart::setExtensions ( QString ext, bool global )
+void AStylePart::setExtensions ( TQString ext, bool global )
 {
 	kdDebug(9009) << "setExtensions " << ext<url().path();
+				TQString extension = rw_part->url().path();
 				int pos = extension.findRev ( '.' );
 				if ( pos >= 0 )
 				{
@@ -343,18 +343,18 @@ void AStylePart::activePartChanged ( KParts::Part *part )
 	formatTextAction->setEnabled ( enabled );
 }
 
-QString AStylePart::formatSource( const QString text, AStyleWidget * widget, const QMap& options  )
+TQString AStylePart::formatSource( const TQString text, AStyleWidget * widget, const TQMap& options  )
 {
 	ASStringIterator is(text);
 	KDevFormatter * formatter = ( widget)? new KDevFormatter( widget ) : new KDevFormatter(options);
 
 	formatter->init(&is);
 
-	QString output;
-	QTextStream os(&output, IO_WriteOnly);
+	TQString output;
+	TQTextStream os(&output, IO_WriteOnly);
 
 	while ( formatter->hasMoreLines() )
-		os << QString::fromUtf8( formatter->nextLine().c_str() ) << endl;
+		os << TQString::fromUtf8( formatter->nextLine().c_str() ) << endl;
 
 	delete formatter;
 
@@ -383,23 +383,23 @@ void AStylePart::setCursorPos( KParts::Part *part, uint line, uint col )
 	}
 }
 
-QString AStylePart::formatSource( const QString text )
+TQString AStylePart::formatSource( const TQString text )
 {
     return formatSource(text, 0, m_project);
 }
 
-QString AStylePart::indentString( ) const
+TQString AStylePart::indentString( ) const
 {
   KDevFormatter formatter(m_project);
   return formatter.indentString();
 }
 
-void AStylePart::contextMenu(QPopupMenu *popup, const Context *context)
+void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context)
 {
 	if (context->hasType( Context::EditorContext ))
 	{
 		popup->insertSeparator();
-		int id = popup->insertItem( i18n("Format selection"), this, SLOT(beautifySource()) );
+		int id = popup->insertItem( i18n("Format selection"), this, TQT_SLOT(beautifySource()) );
 		popup->setWhatsThis(id, i18n("Format
    Formats the current selection, if possible"));
 	}
 	else if ( context->hasType( Context::FileContext )){
@@ -407,16 +407,16 @@ void AStylePart::contextMenu(QPopupMenu *popup, const Context *context)
 		m_urls = ctx->urls();
 
 		popup->insertSeparator();
-		int id = popup->insertItem( i18n("Format files"), this, SLOT(formatFiles()) );
+		int id = popup->insertItem( i18n("Format files"), this, TQT_SLOT(formatFiles()) );
 		popup->setWhatsThis(id, i18n("Format files
    Formats selected files if possible"));
 
 	}
 }
 
-void AStylePart::restorePartialProjectSession(const QDomElement * el)
+void AStylePart::restorePartialProjectSession(const TQDomElement * el)
 {
 	kdDebug(9009) << "Load project" << endl;
-	QDomElement style = el->namedItem("AStyle").toElement();
+	TQDomElement style = el->namedItem("AStyle").toElement();
 
 	if (style.attribute("FStyle", "GLOBAL") == "GLOBAL")
 	{
@@ -426,36 +426,36 @@ void AStylePart::restorePartialProjectSession(const QDomElement * el)
 	}
 	else
 	{
-		for (QMap::iterator iter = m_global.begin();iter != m_global.end();iter++)
+		for (TQMap::iterator iter = m_global.begin();iter != m_global.end();iter++)
         {
               m_project[iter.key()] = style.attribute(iter.key(),iter.data().toString());
 		}
 
-		QDomElement exten = el->namedItem("Extensions").toElement();
-		QString ext = exten.attribute("ext").simplifyWhiteSpace();
+		TQDomElement exten = el->namedItem("Extensions").toElement();
+		TQString ext = exten.attribute("ext").simplifyWhiteSpace();
 		if ( ext.isEmpty()){
             ext=defaultFormatExtensions;
 		}
-		setExtensions(ext.replace(QChar(','), QChar('\n')),false);
+		setExtensions(ext.replace(TQChar(','), TQChar('\n')),false);
 	}
 }
 
 
-void AStylePart::savePartialProjectSession(QDomElement * el)
+void AStylePart::savePartialProjectSession(TQDomElement * el)
 {
-	QDomDocument domDoc = el->ownerDocument();
+	TQDomDocument domDoc = el->ownerDocument();
 	if (domDoc.isNull())
 		return;
 
-	QDomElement style = domDoc.createElement("AStyle");
+	TQDomElement style = domDoc.createElement("AStyle");
 	style.setAttribute("FStyle", m_project["FStyle"].toString());
 	if (m_project["FStyle"] != "GLOBAL")
 	{
-		 for (QMap::iterator iter = m_project.begin();iter != m_project.end();iter++)
+		 for (TQMap::iterator iter = m_project.begin();iter != m_project.end();iter++)
         {
               style.setAttribute(iter.key(),iter.data().toString());
 		}
-		QDomElement exten = domDoc.createElement ( "Extensions" );
+		TQDomElement exten = domDoc.createElement ( "Extensions" );
 		exten.setAttribute ( "ext", m_projectExtensions.join(",").simplifyWhiteSpace() );
 		el->appendChild(exten);
 	}
@@ -464,9 +464,9 @@ void AStylePart::savePartialProjectSession(QDomElement * el)
 
 void AStylePart::formatFilesSelect(){
 	m_urls.clear();
-	QStringList filenames = KFileDialog::getOpenFileNames (  QString::null, getProjectExtensions(),0,"Select files to format" );
+	TQStringList filenames = KFileDialog::getOpenFileNames (  TQString::null, getProjectExtensions(),0,"Select files to format" );
 
-	for(QStringList::Iterator it = filenames.begin(); it != filenames.end();it++){
+	for(TQStringList::Iterator it = filenames.begin(); it != filenames.end();it++){
 		m_urls << *it;
 	}
 	formatFiles();
@@ -488,12 +488,12 @@ void AStylePart::formatFiles()
 	uint processed = 0;
 	for ( uint fileCount = 0; fileCount < m_urls.size(); fileCount++ )
 	{
-		QString fileName = m_urls[fileCount].pathOrURL();
+		TQString fileName = m_urls[fileCount].pathOrURL();
 
 		bool found = false;
-		for ( QMap::Iterator it = m_searchExtensions.begin(); it != m_searchExtensions.end(); ++it )
+		for ( TQMap::Iterator it = m_searchExtensions.begin(); it != m_searchExtensions.end(); ++it )
 		{
-			QRegExp re ( it.data(), true, true );
+			TQRegExp re ( it.data(), true, true );
 			if ( re.search ( fileName ) == 0 && ( uint ) re.matchedLength() == fileName.length() )
 			{
 				found = true;
@@ -503,19 +503,19 @@ void AStylePart::formatFiles()
 
 		if ( found )
 		{
-			QString backup = fileName + "#";
-			QFile fin ( fileName );
-			QFile fout ( backup );
+			TQString backup = fileName + "#";
+			TQFile fin ( fileName );
+			TQFile fout ( backup );
 			if ( fin.open ( IO_ReadOnly ) )
 			{
 				if ( fout.open ( IO_WriteOnly ) )
 				{
-					QString fileContents ( fin.readAll() );
+					TQString fileContents ( fin.readAll() );
 					fin.close();
-					QTextStream outstream ( &fout );
+					TQTextStream outstream ( &fout );
 					outstream << formatSource ( fileContents );
 					fout.close();
-					QDir().rename ( backup, fileName );
+					TQDir().rename ( backup, fileName );
 					processed++;
 				}
 				else
diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h
index bf572dcc..377a2b85 100644
--- a/parts/astyle/astyle_part.h
+++ b/parts/astyle/astyle_part.h
@@ -12,8 +12,8 @@ class KDialogBase;
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 class AStyleWidget;
 class QPopupMenu;
@@ -26,21 +26,21 @@ class AStylePart : public KDevSourceFormatter
 
 public:
 
-  AStylePart(QObject *parent, const char *name, const QStringList &);
+  AStylePart(TQObject *parent, const char *name, const TQStringList &);
   ~AStylePart();
 
-  QString formatSource(const QString text, AStyleWidget * widget, const QMap& options);
-  virtual QString formatSource(const QString text);
-  QString indentString() const;
+  TQString formatSource(const TQString text, AStyleWidget * widget, const TQMap& options);
+  virtual TQString formatSource(const TQString text);
+  TQString indentString() const;
   void saveGlobal();
-  void setExtensions(QString ext, bool global);
-  QString getProjectExtensions();
-  QString getGlobalExtensions();
-  void restorePartialProjectSession(const QDomElement * el);
-  void savePartialProjectSession(QDomElement * el);
+  void setExtensions(TQString ext, bool global);
+  TQString getProjectExtensions();
+  TQString getGlobalExtensions();
+  void restorePartialProjectSession(const TQDomElement * el);
+  void savePartialProjectSession(TQDomElement * el);
 
-  QMap& getProjectOptions(){return m_project;}
-  QMap& getGlobalOptions(){return m_global;}
+  TQMap& getProjectOptions(){return m_project;}
+  TQMap& getGlobalOptions(){return m_global;}
 
 
 private slots:
@@ -49,8 +49,8 @@ private slots:
   void beautifySource();
   void formatFiles();
   void formatFilesSelect();
-  void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo);
-  void contextMenu(QPopupMenu *popup, const Context *context);
+  void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo);
+  void contextMenu(TQPopupMenu *popup, const Context *context);
 
 private:
 
@@ -64,11 +64,11 @@ private:
   KAction *formatFileAction;
 
   // the configurable options.
-  QMap  m_project;
-  QMap m_global;
-  QStringList m_projectExtensions;
-  QStringList m_globalExtensions;
-  QMap m_searchExtensions;
+  TQMap  m_project;
+  TQMap m_global;
+  TQStringList m_projectExtensions;
+  TQStringList m_globalExtensions;
+  TQMap m_searchExtensions;
   KURL::List m_urls;
 };
 
diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp
index 0622b91b..0cb26abb 100644
--- a/parts/astyle/astyle_widget.cpp
+++ b/parts/astyle/astyle_widget.cpp
@@ -1,59 +1,59 @@
 #include "astyle_part.h"
 #include "astyle_widget.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
 
 
-AStyleWidget::AStyleWidget(AStylePart * part, bool global, QWidget *parent, const char *name)
+AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, const char *name)
     : AStyleConfig(parent, name), m_part(part), isGlobalWidget(global)
 {
   // which style changed - disable the other pages.
-  connect(StyleGroup, SIGNAL(clicked(int)), this, SLOT(styleChanged()));
-  connect(ConfigTabs, SIGNAL(currentChanged(QWidget*)), this, SLOT(styleChanged()) );
+  connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged()));
+  connect(ConfigTabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(styleChanged()) );
 
-  connect(FillingGroup, SIGNAL(clicked(int)), this, SLOT(styleChanged()));
-  connect(Fill_ForceTabs, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Fill_TabCount, SIGNAL(valueChanged(int)), this, SLOT(styleChanged()));
-  connect(Fill_SpaceCount, SIGNAL(valueChanged(int)), this, SLOT(styleChanged()));
+  connect(FillingGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged()));
+  connect(Fill_ForceTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Fill_TabCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged()));
+  connect(Fill_SpaceCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged()));
 
-  connect(BracketGroup, SIGNAL(clicked(int)), this, SLOT(styleChanged()));
-  connect(Brackets_CloseHeaders, SIGNAL(clicked()), this, SLOT(styleChanged()));
+  connect(BracketGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged()));
+  connect(Brackets_CloseHeaders, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
 
-  connect(Indent_Switches, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Indent_Cases, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Indent_Classes, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Indent_Brackets, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Indent_Namespaces, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Indent_Labels, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Indent_Blocks, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Indent_Preprocessors, SIGNAL(clicked()), this, SLOT(styleChanged()));
+  connect(Indent_Switches, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Indent_Cases, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Indent_Classes, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Indent_Brackets, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Indent_Namespaces, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Indent_Labels, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Indent_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Indent_Preprocessors, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
 
-  connect(Continue_MaxStatement, SIGNAL(valueChanged(int)), this, SLOT(styleChanged()));
-  connect(Continue_MinConditional, SIGNAL(valueChanged(int)), this, SLOT(styleChanged()));
+  connect(Continue_MaxStatement, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged()));
+  connect(Continue_MinConditional, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged()));
 
-  connect(Block_Break, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Block_BreakAll, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Block_IfElse, SIGNAL(clicked()), this, SLOT(styleChanged()));
+  connect(Block_Break, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Block_BreakAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Block_IfElse, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
 
-  connect(Pad_ParenthesesIn, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Pad_ParenthesesOut, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Pad_ParenthesesUn, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Pad_Operators, SIGNAL(clicked()), this, SLOT(styleChanged()));
+  connect(Pad_ParenthesesIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Pad_ParenthesesOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Pad_ParenthesesUn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Pad_Operators, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
 
-  connect(Keep_Statements, SIGNAL(clicked()), this, SLOT(styleChanged()));
-  connect(Keep_Blocks, SIGNAL(clicked()), this, SLOT(styleChanged()));
+  connect(Keep_Statements, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+  connect(Keep_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
 
 
-  QMap option;
+  TQMap option;
   if ( isGlobalWidget){
 	Style_Global->hide();
 	option = m_part->getGlobalOptions();
@@ -64,7 +64,7 @@ AStyleWidget::AStyleWidget(AStylePart * part, bool global, QWidget *parent, cons
   }
 
   // style
-  QString s = option["FStyle"].toString();
+  TQString s = option["FStyle"].toString();
   // fake the id so we disable the other pages.
   int id=0;
   if (s == "ANSI") id=1;
@@ -172,7 +172,7 @@ AStyleWidget::~AStyleWidget()
 
 void AStyleWidget::accept()
 {
-  QMap* m_option;
+  TQMap* m_option;
   if ( isGlobalWidget){
 	m_option = &(m_part->getGlobalOptions());
 	m_part->setExtensions(GeneralExtension->text(),true);
@@ -195,8 +195,8 @@ void AStyleWidget::accept()
   else if (Style_JAVA->isChecked())
     (*m_option)["FStyle"] = "JAVA";
   else if (Style_Global->isChecked()){
-	  QMap& global = m_part->getGlobalOptions();
-	  QMap& project = m_part->getProjectOptions();
+	  TQMap& global = m_part->getGlobalOptions();
+	  TQMap& project = m_part->getProjectOptions();
 	  project=global;
 	  project["FStyle"]="GLOBAL";
   }
@@ -264,7 +264,7 @@ void AStyleWidget::accept()
   }
 
   if ( isGlobalWidget){
-	  QMap& project = m_part->getProjectOptions();
+	  TQMap& project = m_part->getProjectOptions();
 	  if ( project["FStyle"] == "GLOBAL"){
 		  project = m_part->getGlobalOptions();
 		  project["FStyle"] = "GLOBAL";
@@ -272,7 +272,7 @@ void AStyleWidget::accept()
 	  m_part->saveGlobal();
   }
 
-//   for ( QMap::ConstIterator iter = m_option->begin();iter != m_option->end();iter++ )
+//   for ( TQMap::ConstIterator iter = m_option->begin();iter != m_option->end();iter++ )
 // 	{
 // 		kdDebug ( 9009 ) << "widget: " << iter.key() << "=" << iter.data()  << endl;
 // 	}
@@ -296,13 +296,13 @@ void AStyleWidget::styleChanged(  )
 
 	StyleExample->clear();
 
-	QString bracketSample = "namespace foospace {\n\tint Foo(){\n\tif (isBar)\n{\nbar(); \n\treturn 1; } else \nreturn 0;}}\n\nvoid test(){\n\tif (isFoo){\n\tbar();\n} else\n{\n\tbar();\n}\n}\n";
+	TQString bracketSample = "namespace foospace {\n\tint Foo(){\n\tif (isBar)\n{\nbar(); \n\treturn 1; } else \nreturn 0;}}\n\nvoid test(){\n\tif (isFoo){\n\tbar();\n} else\n{\n\tbar();\n}\n}\n";
 
-	QString indentSample = "#define foobar(A)\\\n{Foo();Bar();}\n#define anotherFoo(B)\\\nreturn Bar()\n\nnamespace Bar\n{\nclass Foo\n{public:\nFoo();\nvirtual ~Foo();\n};\nswitch (foo)\n{\ncase 1:\na+=1;\nbreak;\ncase 2:\n{\na += 2;\n break;\n}\n}\nif (isFoo)\n{\nbar();\n}\nelse\n{\nanotherBar();\n}\nint foo()\n\twhile(isFoo)\n\t\t{\n\t\t\t...\n\t\t\tgoto error;\n\t\t....\n\t\terror:\n\t\t\t...\n\t\t}\n\t}\nfooArray[]={ red,\n\tgreen,\n\tdarkblue};\nfooFunction(barArg1,\n\tbarArg2,\n\tbarArg3);\n";
+	TQString indentSample = "#define foobar(A)\\\n{Foo();Bar();}\n#define anotherFoo(B)\\\nreturn Bar()\n\nnamespace Bar\n{\nclass Foo\n{public:\nFoo();\nvirtual ~Foo();\n};\nswitch (foo)\n{\ncase 1:\na+=1;\nbreak;\ncase 2:\n{\na += 2;\n break;\n}\n}\nif (isFoo)\n{\nbar();\n}\nelse\n{\nanotherBar();\n}\nint foo()\n\twhile(isFoo)\n\t\t{\n\t\t\t...\n\t\t\tgoto error;\n\t\t....\n\t\terror:\n\t\t\t...\n\t\t}\n\t}\nfooArray[]={ red,\n\tgreen,\n\tdarkblue};\nfooFunction(barArg1,\n\tbarArg2,\n\tbarArg3);\n";
 
-	QString formattingSample = "void func(){\n\tif(isFoo(a,b))\n\tbar(a,b);\nif(isFoo)\n\ta=bar((b-c)*a,*d--);\nif(  isFoo( a,b ) )\n\tbar(a, b);\nif (isFoo) {isFoo=false;cat << isFoo <
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -44,7 +44,7 @@ typedef KDevGenericFactory BookmarksFactory;
 static const KDevPluginInfo data("kdevbookmarks");
 K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) )
 
-BookmarksPart::BookmarksPart(QObject *parent, const char *name, const QStringList& )
+BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& )
 	: KDevPlugin(&data, parent, name ? name : "BookmarksPart" )
 {
 	setInstance(BookmarksFactory::instance());
@@ -54,9 +54,9 @@ BookmarksPart::BookmarksPart(QObject *parent, const char *name, const QStringLis
 	_widget->setCaption(i18n("Bookmarks"));
 	_widget->setIcon(SmallIcon( info()->icon() ));
 
-	_marksChangeTimer = new QTimer( this );
+	_marksChangeTimer = new TQTimer( this );
 
-	QWhatsThis::add(_widget, i18n("Bookmarks
    "
+	TQWhatsThis::add(_widget, i18n("Bookmarks
    "
 			"The bookmark viewer shows all the source bookmarks in the project."));
 
 	mainWindow()->embedSelectView(_widget, i18n("Bookmarks"), i18n("Source bookmarks"));
@@ -64,19 +64,19 @@ BookmarksPart::BookmarksPart(QObject *parent, const char *name, const QStringLis
 	_editorMap.setAutoDelete( true );
 	_settingMarks = false;
 
-	connect( partController(), SIGNAL( partAdded( KParts::Part * ) ), this, SLOT( partAdded( KParts::Part * ) ) );
+	connect( partController(), TQT_SIGNAL( partAdded( KParts::Part * ) ), this, TQT_SLOT( partAdded( KParts::Part * ) ) );
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createProjectConfigPage( i18n("Bookmarks"), BOOKMARKSETTINGSPAGE, info()->icon() );
-	connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )),
-		this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) );
+	connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
-	connect( _widget, SIGNAL( removeAllBookmarksForURL( const KURL & ) ),
-		this, SLOT( removeAllBookmarksForURL( const KURL & ) ) );
-	connect( _widget, SIGNAL( removeBookmarkForURL( const KURL &, int ) ),
-		this, SLOT( removeBookmarkForURL( const KURL &, int ) ) );
+	connect( _widget, TQT_SIGNAL( removeAllBookmarksForURL( const KURL & ) ),
+		this, TQT_SLOT( removeAllBookmarksForURL( const KURL & ) ) );
+	connect( _widget, TQT_SIGNAL( removeBookmarkForURL( const KURL &, int ) ),
+		this, TQT_SLOT( removeBookmarkForURL( const KURL &, int ) ) );
 
-	connect( _marksChangeTimer, SIGNAL( timeout() ), this, SLOT( marksChanged() ) );
+	connect( _marksChangeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( marksChanged() ) );
 
 	_config = new BookmarksConfig;
 	_config->readConfig();
@@ -112,10 +112,10 @@ void BookmarksPart::partAdded( KParts::Part * part )
 
 			// connect to this editor
 			KTextEditor::Document * doc = static_cast( ro_part );
-			connect( doc, SIGNAL( marksChanged() ), this, SLOT( marksEvent() ) );
+			connect( doc, TQT_SIGNAL( marksChanged() ), this, TQT_SLOT( marksEvent() ) );
 
 			// workaround for a katepart oddity where it drops all bookmarks on 'reload'
-			connect( doc, SIGNAL( completed() ), this, SLOT( reload() ) );
+			connect( doc, TQT_SIGNAL( completed() ), this, TQT_SLOT( reload() ) );
 		}
 	}
 }
@@ -124,7 +124,7 @@ void BookmarksPart::reload()
 {
 	//kdDebug(0) << "BookmarksPart::reload()" << endl;
 
-	QObject * senderobj = const_cast( sender() );
+	TQObject * senderobj = const_cast( sender() );
 	if ( KParts::ReadOnlyPart * ro_part = dynamic_cast( senderobj ) )
 	{
 		if ( partIsSane( ro_part ) )
@@ -140,7 +140,7 @@ void BookmarksPart::marksEvent()
 
 	if ( ! _settingMarks )
 	{
-		QObject * senderobj = const_cast( sender() );
+		TQObject * senderobj = const_cast( sender() );
 		KParts::ReadOnlyPart * ro_part = dynamic_cast( senderobj );
 
 		if ( partIsSane( ro_part ) && !_dirtyParts.contains( ro_part ) )
@@ -155,7 +155,7 @@ void BookmarksPart::marksChanged()
 {
 	//kdDebug(0) << "BookmarksPart::marksChanged()" << endl;
 
-	QValueListIterator it = _dirtyParts.begin();
+	TQValueListIterator it = _dirtyParts.begin();
 	while ( it != _dirtyParts.end() )
 	{
 		KParts::ReadOnlyPart * ro_part = *it;
@@ -179,31 +179,31 @@ void BookmarksPart::marksChanged()
 	_dirtyParts.clear();
 }
 
-void BookmarksPart::restorePartialProjectSession( const QDomElement * el )
+void BookmarksPart::restorePartialProjectSession( const TQDomElement * el )
 {
 	//kdDebug(0) << "BookmarksPart::restorePartialProjectSession()" << endl;
 
 	if ( ! el ) return;
 
-	QDomElement bookmarksList = el->namedItem( "bookmarks" ).toElement();
+	TQDomElement bookmarksList = el->namedItem( "bookmarks" ).toElement();
 	if ( bookmarksList.isNull() ) return;
 
-	QDomElement bookmark = bookmarksList.firstChild().toElement();
+	TQDomElement bookmark = bookmarksList.firstChild().toElement();
 	while ( ! bookmark.isNull() )
 	{
-		QString path = bookmark.attribute( "url" );
-		if ( path != QString::null )
+		TQString path = bookmark.attribute( "url" );
+		if ( path != TQString::null )
 		{
 			EditorData * data = new EditorData;
 			data->url.setPath( path );
 
-			QDomElement mark = bookmark.firstChild().toElement();
+			TQDomElement mark = bookmark.firstChild().toElement();
 			while ( ! mark.isNull() )
 			{
-				QString line = mark.attribute( "line" );
-				if ( line != QString::null )
+				TQString line = mark.attribute( "line" );
+				if ( line != TQString::null )
 				{
-					data->marks.append( qMakePair( line.toInt(), QString() ) );
+					data->marks.append( qMakePair( line.toInt(), TQString() ) );
 				}
 				mark = mark.nextSibling().toElement();
 			}
@@ -224,28 +224,28 @@ void BookmarksPart::restorePartialProjectSession( const QDomElement * el )
 	_widget->update( _editorMap );
 }
 
-void BookmarksPart::savePartialProjectSession( QDomElement * el )
+void BookmarksPart::savePartialProjectSession( TQDomElement * el )
 {
 	//kdDebug(0) << "BookmarksPart::savePartialProjectSession()" << endl;
 
 	if ( ! el ) return;
 
-    QDomDocument domDoc = el->ownerDocument();
+    TQDomDocument domDoc = el->ownerDocument();
     if ( domDoc.isNull() ) return;
 
-	QDomElement bookmarksList = domDoc.createElement( "bookmarks" );
+	TQDomElement bookmarksList = domDoc.createElement( "bookmarks" );
 
-	QDictIterator it( _editorMap );
+	TQDictIterator it( _editorMap );
 	while ( it.current() )
 	{
-		QDomElement bookmark = domDoc.createElement( "bookmark" );
+		TQDomElement bookmark = domDoc.createElement( "bookmark" );
 		bookmark.setAttribute( "url", it.current()->url.path() );
 		bookmarksList.appendChild( bookmark );
 
-		QValueListIterator< QPair > it2 = it.current()->marks.begin();
+		TQValueListIterator< QPair > it2 = it.current()->marks.begin();
 		while ( it2 != it.current()->marks.end() )
 		{
-			QDomElement line = domDoc.createElement( "mark" );
+			TQDomElement line = domDoc.createElement( "mark" );
 			line.setAttribute( "line", (*it2).first );
 			bookmark.appendChild( line );
 			++it2;
@@ -275,7 +275,7 @@ void BookmarksPart::removeBookmarkForURL( KURL const & url, int line )
 
 	if ( EditorData * data = _editorMap.find( url.path() ) )
 	{
-		QValueListIterator< QPair > it = data->marks.begin();
+		TQValueListIterator< QPair > it = data->marks.begin();
 		while ( it != data->marks.end() )
 		{
 			if ( (*it).first == line )
@@ -309,7 +309,7 @@ void BookmarksPart::updateContextStringForURL( KParts::ReadOnlyPart * ro_part )
 
 	if ( ! ( data && ed ) ) return;
 
-	QValueListIterator< QPair > it = data->marks.begin();
+	TQValueListIterator< QPair > it = data->marks.begin();
 	while ( it != data->marks.end() )
 	{
 		(*it).second = ed->textLine( (*it).first );
@@ -324,7 +324,7 @@ void BookmarksPart::updateContextStringForURL( KURL const & url )
 
 void BookmarksPart::updateContextStringForAll()
 {
-	QDictIterator it( _editorMap );
+	TQDictIterator it( _editorMap );
 	while ( it.current() )
 	{
 		if ( ! it.current()->marks.isEmpty() )
@@ -347,7 +347,7 @@ bool BookmarksPart::setBookmarksForURL( KParts::ReadOnlyPart * ro_part )
 		{
 			// we've seen this one before, apply stored bookmarks
 
-			QValueListIterator< QPair > it = data->marks.begin();
+			TQValueListIterator< QPair > it = data->marks.begin();
 			while ( it != data->marks.end() )
 			{
 				mi->addMark( (*it).first, KTextEditor::MarkInterface::markType01 );
@@ -371,8 +371,8 @@ bool BookmarksPart::clearBookmarksForURL( KParts::ReadOnlyPart * ro_part )
 	{
 		_settingMarks = true;
 
-		QPtrList marks = mi->marks();
-		QPtrListIterator it( marks );
+		TQPtrList marks = mi->marks();
+		TQPtrListIterator it( marks );
 		while ( it.current() )
 		{
 			if ( it.current()->type & KTextEditor::MarkInterface::markType01 )
@@ -402,14 +402,14 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part
 		// removing previous data for this url, if any
 		_editorMap.remove( data->url.path() );
 
-		QPtrList marks = mi->marks();
-		QPtrListIterator it( marks );
+		TQPtrList marks = mi->marks();
+		TQPtrListIterator it( marks );
 		while ( it.current() )
 		{
 			if ( it.current()->type & KTextEditor::MarkInterface::markType01 )
 			{
 			    int line = it.current()->line;
-				data->marks.append( qMakePair( line, QString() ) );
+				data->marks.append( qMakePair( line, TQString() ) );
 			}
 			++it;
 		}
@@ -430,9 +430,9 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part
 
 void BookmarksPart::setBookmarksForAllURLs()
 {
-	if( const QPtrList * partlist = partController()->parts() )
+	if( const TQPtrList * partlist = partController()->parts() )
 	{
-		QPtrListIterator it( *partlist );
+		TQPtrListIterator it( *partlist );
 		while ( KParts::Part* part = it.current() )
 		{
 			if ( KParts::ReadOnlyPart * ro_part = dynamic_cast( part ) )
@@ -446,9 +446,9 @@ void BookmarksPart::setBookmarksForAllURLs()
 
 void BookmarksPart::storeBookmarksForAllURLs()
 {
-	if( const QPtrList * partlist = partController()->parts() )
+	if( const TQPtrList * partlist = partController()->parts() )
 	{
-		QPtrListIterator it( *partlist );
+		TQPtrListIterator it( *partlist );
 		while ( KParts::Part* part = it.current() )
 		{
 			if ( KParts::ReadOnlyPart * ro_part = dynamic_cast( part ) )
@@ -463,7 +463,7 @@ void BookmarksPart::storeBookmarksForAllURLs()
 // reimplemented from PartController::partForURL to avoid linking
 KParts::ReadOnlyPart * BookmarksPart::partForURL( KURL const & url )
 {
-	QPtrListIterator it( *partController()->parts() );
+	TQPtrListIterator it( *partController()->parts() );
 	while( it.current() )
 	{
 		KParts::ReadOnlyPart *ro_part = dynamic_cast(it.current());
@@ -483,20 +483,20 @@ bool BookmarksPart::partIsSane( KParts::ReadOnlyPart * ro_part )
 			!ro_part->url().path().isEmpty();
 }
 
-void BookmarksPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber )
+void BookmarksPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber )
 {
 	kdDebug() << k_funcinfo << endl;
 
 	if ( pagenumber == BOOKMARKSETTINGSPAGE )
 	{
 		BookmarkSettings * w = new BookmarkSettings( this, page );
-		connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) );
+		connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) );
 	}
 }
 
 ////////////////////////////////////////////
 
-QStringList BookmarksPart::getContextFromStream( QTextStream & istream, unsigned int line, unsigned int context )
+TQStringList BookmarksPart::getContextFromStream( TQTextStream & istream, unsigned int line, unsigned int context )
 {
 	kdDebug() << k_funcinfo << endl;
 
@@ -504,10 +504,10 @@ QStringList BookmarksPart::getContextFromStream( QTextStream & istream, unsigned
 	int endline = line + context;
 
 	int n = 0;
-	QStringList list;
+	TQStringList list;
 	while ( !istream.atEnd() )
 	{
-		QString templine = istream.readLine();
+		TQString templine = istream.readLine();
 		if ( (n >= startline) && ( n <= endline ) )
 		{
 			list << templine;
@@ -531,31 +531,31 @@ QStringList BookmarksPart::getContextFromStream( QTextStream & istream, unsigned
 	return list;
 }
 
-QStringList BookmarksPart::getContext( KURL const & url, unsigned int line, unsigned int context )
+TQStringList BookmarksPart::getContext( KURL const & url, unsigned int line, unsigned int context )
 {
 	// if the file is open - get the line from the editor buffer
 	if ( KTextEditor::EditInterface * ei = dynamic_cast( partForURL( url ) ) )
 	{
 		kdDebug() << "the file is open - get the line from the editor buffer" << endl;
 
-		QString ibuffer = ei->text();
-		QTextStream istream( &ibuffer, IO_ReadOnly );
+		TQString ibuffer = ei->text();
+		TQTextStream istream( &ibuffer, IO_ReadOnly );
 		return getContextFromStream( istream, line, context );
 	}
 	else if ( url.isLocalFile() ) // else the file is not open - get the line from the file on disk
 	{
 		kdDebug() << "the file is not open - get the line from the file on disk" << endl;
 
-		QFile file( url.path() );
-		QString buffer;
+		TQFile file( url.path() );
+		TQString buffer;
 
 		if ( file.open( IO_ReadOnly ) )
 		{
-			QTextStream istream( &file );
+			TQTextStream istream( &file );
 			return getContextFromStream( istream, line, context );
 		}
 	}
-	return QStringList( i18n("Could not find file") );
+	return TQStringList( i18n("Could not find file") );
 }
 
 BookmarksConfig * BookmarksPart::config( )
diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h
index 32a105ad..7abfeb9e 100644
--- a/parts/bookmarks/bookmarks_part.h
+++ b/parts/bookmarks/bookmarks_part.h
@@ -14,10 +14,10 @@
 #define __KDEVPART_BOOKMARKS_H__
 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -32,7 +32,7 @@ class ConfigWidgetProxy;
 struct EditorData
 {
 	KURL url;
-	QValueList< QPair > marks;
+	TQValueList< QPair > marks;
 };
 
 class BookmarksWidget;
@@ -44,16 +44,16 @@ class BookmarksPart : public KDevPlugin
 
 public:
 
-	BookmarksPart(QObject *parent, const char *name, const QStringList &);
+	BookmarksPart(TQObject *parent, const char *name, const TQStringList &);
 	~BookmarksPart();
 
 	// reimplemented from KDevPlugin
-	void restorePartialProjectSession( const QDomElement * el );
-	void savePartialProjectSession( QDomElement * el );
+	void restorePartialProjectSession( const TQDomElement * el );
+	void savePartialProjectSession( TQDomElement * el );
 	
 	BookmarksConfig * config();
 
-	QStringList getContext( KURL const & url, unsigned int line, unsigned int context );
+	TQStringList getContext( KURL const & url, unsigned int line, unsigned int context );
 	
 private slots:
 	// connected to partcontroller
@@ -72,7 +72,7 @@ private slots:
 	void removeAllBookmarksForURL( const KURL & );
 	void removeBookmarkForURL( const KURL &, int );
 
-	void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int );
+	void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int );
 	
 private:
 	bool setBookmarksForURL( KParts::ReadOnlyPart * );
@@ -86,21 +86,21 @@ private:
 	void updateContextStringForURL( KURL const & url );
 	void updateContextStringForAll();
 
-	QStringList getContextFromStream( QTextStream & istream, unsigned int line, unsigned int context );
+	TQStringList getContextFromStream( TQTextStream & istream, unsigned int line, unsigned int context );
 	
 	KParts::ReadOnlyPart * partForURL( KURL const & url );
 	bool partIsSane( KParts::ReadOnlyPart * );
 
-	QGuardedPtr _widget;
-	QDict _editorMap;
+	TQGuardedPtr _widget;
+	TQDict _editorMap;
 	bool _settingMarks;	//	are we currently in the process of setting bookmarks?
 	
 	BookmarksConfig * _config;
 	
 	ConfigWidgetProxy * _configProxy;
 	
-	QTimer * _marksChangeTimer;
-	QValueList _dirtyParts;
+	TQTimer * _marksChangeTimer;
+	TQValueList _dirtyParts;
 };
 
 
diff --git a/parts/bookmarks/bookmarks_settings.cpp b/parts/bookmarks/bookmarks_settings.cpp
index 235ec261..58369d92 100644
--- a/parts/bookmarks/bookmarks_settings.cpp
+++ b/parts/bookmarks/bookmarks_settings.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
 #include "bookmarks_part.h"
@@ -19,7 +19,7 @@
 #include "bookmarks_settings.h"
 
 
-BookmarkSettings::BookmarkSettings( BookmarksPart * part, QWidget* parent, const char* name, WFlags fl )
+BookmarkSettings::BookmarkSettings( BookmarksPart * part, TQWidget* parent, const char* name, WFlags fl )
 : BookmarkSettingsBase( parent, name, fl ), m_part( part )
 {
 	m_part->config()->readConfig();
diff --git a/parts/bookmarks/bookmarks_settings.h b/parts/bookmarks/bookmarks_settings.h
index 3fa6c5e9..699941ca 100644
--- a/parts/bookmarks/bookmarks_settings.h
+++ b/parts/bookmarks/bookmarks_settings.h
@@ -21,7 +21,7 @@ class BookmarkSettings : public BookmarkSettingsBase
   Q_OBJECT
 
 public:
-  BookmarkSettings( BookmarksPart * part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  BookmarkSettings( BookmarksPart * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~BookmarkSettings();
 
 public slots:
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index 683c32e1..20ab2cd9 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -59,13 +59,13 @@ static const char* const bookmark_xpm[]={
 class BookmarkItem : public QListViewItem
 {
 public:
-	BookmarkItem( QListView * parent, KURL const & url )
-			: QListViewItem( parent, url.fileName() ),
+	BookmarkItem( TQListView * parent, KURL const & url )
+			: TQListViewItem( parent, url.fileName() ),
 			_url( url ), _line( -1 ), _isBookmark( false )
 	{}
 
-	BookmarkItem( QListViewItem * parent, KURL const & url, QPair mark )
-			: QListViewItem( parent, QString::number( mark.first +1 ).rightJustify( 5 ) ),
+	BookmarkItem( TQListViewItem * parent, KURL const & url, QPair mark )
+			: TQListViewItem( parent, TQString::number( mark.first +1 ).rightJustify( 5 ) ),
 			_url( url ), _line( mark.first ), _isBookmark( true ) 
 	{
 		BookmarksWidget * lv = static_cast( listView() );
@@ -97,17 +97,17 @@ public:
 		return _line;
 	}
 
-	QString tipText()
+	TQString tipText()
 	{
 		if ( _isBookmark )
 		{
 			BookmarksWidget * w = static_cast ( listView() );
-			QStringList list = w->getContext( _url, _line );
+			TQStringList list = w->getContext( _url, _line );
 			
-			QString code = "
    ";
+			TQString code = "
    ";
 			for ( uint i = 0; i < list.count(); i++)
 			{
-				QString temp = QStyleSheet::escape( list[i] );
+				TQString temp = TQStyleSheet::escape( list[i] );
 				
 				if ( i == (list.count() / 2) )	// count() is always odd
 				{
@@ -134,40 +134,40 @@ private:
 	KURL _url;
 	int _line;
 	bool _isBookmark;
-	QString _code;
+	TQString _code;
 
 };
 
 BookmarksWidget::BookmarksWidget(BookmarksPart *part)
-		: KListView(0, "bookmarks widget"), QToolTip( viewport() ),
+		: KListView(0, "bookmarks widget"), TQToolTip( viewport() ),
 		_part( part )
 
 {
-	addColumn( QString::null );
+	addColumn( TQString::null );
 	header()->hide();
 	setRootIsDecorated( true );
-	setResizeMode( QListView::LastColumn );
+	setResizeMode( TQListView::LastColumn );
 	setAllColumnsShowFocus( true );
 // 	setSortColumn( -1 );
 
-	connect( this, SIGNAL( executed( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) );
-	connect( this, SIGNAL( returnPressed( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) );
-	connect( this, SIGNAL( contextMenuRequested ( QListViewItem *, const QPoint & , int ) ),
-		this, SLOT( popupMenu(QListViewItem *, const QPoint & , int ) ) );
+	connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) );
+	connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) );
+	connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ),
+		this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) );
 }
 
 
 BookmarksWidget::~BookmarksWidget()
 {}
 
-void BookmarksWidget::maybeTip(const QPoint &p)
+void BookmarksWidget::maybeTip(const TQPoint &p)
 {
 //	kdDebug(0) << "ToolTip::maybeTip()" << endl;
 	
 	if ( ! _part->config()->toolTip() ) return;
 
 	BookmarkItem * item = dynamic_cast( itemAt( p ) );
-	QRect r = itemRect( item );
+	TQRect r = itemRect( item );
 
 	if ( item && r.isValid() )
 	{
@@ -175,13 +175,13 @@ void BookmarksWidget::maybeTip(const QPoint &p)
 	}
 }
 
-void BookmarksWidget::update( QDict const & map )
+void BookmarksWidget::update( TQDict const & map )
 {
 //	kdDebug(0) << "BookmarksWidget::update()" << endl;
 
-	QListView::clear();
+	TQListView::clear();
 
-	QDictIterator it( map );
+	TQDictIterator it( map );
 	while ( it.current() )
 	{
 		if ( ! it.current()->marks.isEmpty() )
@@ -209,15 +209,15 @@ void BookmarksWidget::createURL( EditorData * data )
 
 	if ( data )
 	{
-		QListViewItem * file = new BookmarkItem( this, data->url );
+		TQListViewItem * file = new BookmarkItem( this, data->url );
 		file->setOpen( true );
 		file->setPixmap( 0, SmallIcon( "document" ) );
 
-		QValueListIterator< QPair > it = data->marks.begin();
+		TQValueListIterator< QPair > it = data->marks.begin();
 		while ( it != data->marks.end() )
 		{
-			QListViewItem * item = new BookmarkItem( file, data->url, *it );
-			item->setPixmap( 0, QPixmap((const char**)bookmark_xpm) );
+			TQListViewItem * item = new BookmarkItem( file, data->url, *it );
+			item->setPixmap( 0, TQPixmap((const char**)bookmark_xpm) );
 			++it;
 		}
 	}
@@ -227,7 +227,7 @@ bool BookmarksWidget::removeURL( KURL const & url )
 {
 //	kdDebug(0) << "BookmarksWidget::removeURL()" << endl;
 
-	QListViewItem * item = firstChild();
+	TQListViewItem * item = firstChild();
 	while ( item )
 	{
 		BookmarkItem * bm = static_cast(item);
@@ -255,7 +255,7 @@ void BookmarksWidget::doEmitRemoveBookMark()
 	}
 }
 
-void BookmarksWidget::popupMenu( QListViewItem * item, const QPoint & p, int )
+void BookmarksWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int )
 {
 //	kdDebug(0) << "BookmarksWidget::contextMenuRequested()" << endl;
 
@@ -268,27 +268,27 @@ void BookmarksWidget::popupMenu( QListViewItem * item, const QPoint & p, int )
 		if ( _selectedItem->isBookmark() )
 		{
 			popup.insertTitle( _selectedItem->url().fileName() + i18n(", line ")
-				+ QString::number( _selectedItem->line() +1 ) );
+				+ TQString::number( _selectedItem->line() +1 ) );
 
-			popup.insertItem( i18n("Remove This Bookmark"), this, SLOT( doEmitRemoveBookMark() ) );
+			popup.insertItem( i18n("Remove This Bookmark"), this, TQT_SLOT( doEmitRemoveBookMark() ) );
 		}
 		else
 		{
 			popup.insertTitle( _selectedItem->url().fileName() + i18n( ", All" ) );
-			popup.insertItem( i18n("Remove These Bookmarks"), this, SLOT( doEmitRemoveBookMark() ) );
+			popup.insertItem( i18n("Remove These Bookmarks"), this, TQT_SLOT( doEmitRemoveBookMark() ) );
 		}
 		
 		popup.insertSeparator();
 		
-		popup.insertItem( i18n( "Collapse All" ), this, SLOT(collapseAll()) );
-		popup.insertItem( i18n( "Expand All" ), this, SLOT(expandAll()) );
+		popup.insertItem( i18n( "Collapse All" ), this, TQT_SLOT(collapseAll()) );
+		popup.insertItem( i18n( "Expand All" ), this, TQT_SLOT(expandAll()) );
 		
 		popup.exec(p);
 	}
 
 }
 
-void BookmarksWidget::itemClicked( QListViewItem * clickedItem )
+void BookmarksWidget::itemClicked( TQListViewItem * clickedItem )
 {
 //	kdDebug(0) << "BookmarksWidget::itemClicked()" << endl;
 
@@ -305,14 +305,14 @@ BookmarksConfig * BookmarksWidget::config( )
 	return _part->config();
 }
 
-QStringList BookmarksWidget::getContext( KURL const & url, unsigned int line )
+TQStringList BookmarksWidget::getContext( KURL const & url, unsigned int line )
 {
 	return _part->getContext( url, line, config()->context() );
 }
 
 void BookmarksWidget::collapseAll( )
 {
-	QListViewItem * it = firstChild();
+	TQListViewItem * it = firstChild();
 	while( it )
 	{
 		it->setOpen( false );
@@ -322,7 +322,7 @@ void BookmarksWidget::collapseAll( )
 
 void BookmarksWidget::expandAll( )
 {
-	QListViewItem * it = firstChild();
+	TQListViewItem * it = firstChild();
 	while( it )
 	{
 		it->setOpen( true );
diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h
index 96bfe046..6af0b563 100644
--- a/parts/bookmarks/bookmarks_widget.h
+++ b/parts/bookmarks/bookmarks_widget.h
@@ -13,10 +13,10 @@
 #define __BOOKMARKS_WIDGET_H__
 
 
-#include 
-#include 
-//#include 
-#include 
+#include 
+#include 
+//#include 
+#include 
 
 #include 
 
@@ -34,23 +34,23 @@ public:
 	BookmarksWidget( BookmarksPart * );
 	~BookmarksWidget();
 
-	void update( QDict const & );
+	void update( TQDict const & );
 	void updateURL( EditorData * );
 	bool removeURL( KURL const & );
 	
 	BookmarksConfig * config();
-	QStringList getContext( KURL const &, unsigned int );
+	TQStringList getContext( KURL const &, unsigned int );
 
 signals:
 	void removeAllBookmarksForURL( const KURL & );
 	void removeBookmarkForURL( const KURL &, int );
 
 protected:
-	void maybeTip( QPoint const & );
+	void maybeTip( TQPoint const & );
 
 private slots:
-	void itemClicked( QListViewItem * );
-	void popupMenu( QListViewItem * , const QPoint & , int );
+	void itemClicked( TQListViewItem * );
+	void popupMenu( TQListViewItem * , const TQPoint & , int );
 	void collapseAll();
 	void expandAll();
 	void doEmitRemoveBookMark();
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index 91ed28fc..df51f6f4 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -13,9 +13,9 @@
 
 #include "classtooldlg.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -27,54 +27,54 @@
 
 
 ClassToolDialog::ClassToolDialog( ClassViewPart *part )
-    : QWidget(0, "class tool dialog")
+    : TQWidget(0, "class tool dialog")
 {
     currentOperation = ViewNone;
     comboAccess = (PIAccess)-1;
     currentClass = 0;
     m_part = part;
 
-    class_combo = new QComboBox(false, this);
+    class_combo = new TQComboBox(false, this);
 
-    QPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
+    TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
 
-    parents_button = new QToolButton(this);
+    parents_button = new TQToolButton(this);
     parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) );
     parents_button->setToggleButton(true);
     parents_button->setFixedSize(parents_button->sizeHint());
-    QToolTip::add(parents_button, i18n("Show parents"));
+    TQToolTip::add(parents_button, i18n("Show parents"));
 
-    children_button = new QToolButton(this);
+    children_button = new TQToolButton(this);
     children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
     children_button->setToggleButton(true);
     children_button->setFixedSize(children_button->sizeHint());
-    QToolTip::add(children_button, i18n("Show children"));
+    TQToolTip::add(children_button, i18n("Show children"));
 
-    clients_button = new QToolButton(this);
+    clients_button = new TQToolButton(this);
     clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) );
     clients_button->setToggleButton(true);
     clients_button->setFixedSize(clients_button->sizeHint());
-    QToolTip::add(clients_button, i18n("Show clients"));
+    TQToolTip::add(clients_button, i18n("Show clients"));
 
-    suppliers_button = new QToolButton(this);
+    suppliers_button = new TQToolButton(this);
     suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) );
     suppliers_button->setToggleButton(true);
     suppliers_button->setFixedSize(suppliers_button->sizeHint());
-    QToolTip::add(suppliers_button, i18n("Show suppliers"));
+    TQToolTip::add(suppliers_button, i18n("Show suppliers"));
 
-    methods_button = new QToolButton(this);
+    methods_button = new TQToolButton(this);
     methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) );
     methods_button->setToggleButton(true);
     methods_button->setFixedSize(methods_button->sizeHint());
-    QToolTip::add(methods_button, i18n("Show methods"));
+    TQToolTip::add(methods_button, i18n("Show methods"));
 
-    attributes_button = new QToolButton(this);
+    attributes_button = new TQToolButton(this);
     attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) );
     attributes_button->setToggleButton(true);
     attributes_button->setFixedSize(attributes_button->sizeHint());
-    QToolTip::add(attributes_button, i18n("Show attributes"));
+    TQToolTip::add(attributes_button, i18n("Show attributes"));
 
-    access_combo = new QComboBox(false, this, "access combo");
+    access_combo = new TQComboBox(false, this, "access combo");
     access_combo->setMinimumWidth(100);
     access_combo->setSizeLimit(10);
     access_combo->insertItem(i18n("member access","All"));
@@ -86,9 +86,9 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     class_tree = new ClassToolWidget(part, this);
     //    classTree->setMinimumSize( 500, 400 );
 
-    QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    QHBoxLayout *firstrowLayout = new QHBoxLayout();
-    QHBoxLayout *secondrowLayout = new QHBoxLayout();
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQHBoxLayout *firstrowLayout = new TQHBoxLayout();
+    TQHBoxLayout *secondrowLayout = new TQHBoxLayout();
     layout->addLayout(firstrowLayout);
     layout->addLayout(secondrowLayout);
 
@@ -106,21 +106,21 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
 
     layout->addWidget(class_tree, 10);
 
-    connect( class_combo, SIGNAL(activated(const QString&)),
-             this, SLOT(slotClassComboChoice(const QString&)) );
-    connect( close_button, SIGNAL(clicked()),
-             this, SLOT(slotClose()) );
-    connect( access_combo, SIGNAL(activated(const QString&)),
-             this, SLOT(slotAccessComboChoice(const QString&)) );
-    connect( parents_button, SIGNAL(clicked()), SLOT(viewParents()));
-    connect( children_button, SIGNAL(clicked()), SLOT(viewChildren()));
-    connect( clients_button, SIGNAL(clicked()), SLOT(viewClients()));
-    connect( suppliers_button, SIGNAL(clicked()), SLOT(viewSuppliers()));
-    connect( methods_button, SIGNAL(clicked()), SLOT(viewMethods()));
-    connect( attributes_button, SIGNAL(clicked()), SLOT(viewAttributes()));
-
-    connect( part, SIGNAL(setLanguageSupport(KDevLanguageSupport*)),
-             this, SLOT(setLanguageSupport(KDevLanguageSupport*)) );
+    connect( class_combo, TQT_SIGNAL(activated(const TQString&)),
+             this, TQT_SLOT(slotClassComboChoice(const TQString&)) );
+    connect( close_button, TQT_SIGNAL(clicked()),
+             this, TQT_SLOT(slotClose()) );
+    connect( access_combo, TQT_SIGNAL(activated(const TQString&)),
+             this, TQT_SLOT(slotAccessComboChoice(const TQString&)) );
+    connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
+    connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
+    connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients()));
+    connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers()));
+    connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods()));
+    connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes()));
+
+    connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)),
+             this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) );
 
     m_part->registerClassToolDialog(this);
 }
@@ -136,7 +136,7 @@ void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls)
 {
     if (ls) {
         disconnect(ls, 0, this, 0);
-        connect(ls, SIGNAL(updatedSourceInfo()), this, SLOT(refresh()));
+        connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh()));
     } else
         refresh();
 
@@ -144,11 +144,11 @@ void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls)
 }
 
 
-void ClassToolDialog::setClassName(const QString &name)
+void ClassToolDialog::setClassName(const TQString &name)
 {
     if ( class_combo->count() == 0 ) refresh();
 
-    QListBox *lb = class_combo->listBox();
+    TQListBox *lb = class_combo->listBox();
 
     for (int i=0; i < (int)lb->count(); ++i)
         if (lb->text(i) == name) {
@@ -218,7 +218,7 @@ void ClassToolDialog::viewAttributes()
 }
 
 
-void ClassToolDialog::slotAccessComboChoice(const QString &str)
+void ClassToolDialog::slotAccessComboChoice(const TQString &str)
 {
     if( str == i18n("member access","All") )
         comboAccess = (PIAccess)-1;
@@ -240,7 +240,7 @@ void ClassToolDialog::slotAccessComboChoice(const QString &str)
 void ClassToolDialog::slotClose()
 {
     delete this;
-    //    QTimer::singleShot(0, this, SLOT(delayedClose()));
+    //    TQTimer::singleShot(0, this, TQT_SLOT(delayedClose()));
 }
 
 
@@ -250,7 +250,7 @@ void ClassToolDialog::delayedClose()
 }
 
 
-void ClassToolDialog::slotClassComboChoice(const QString &str)
+void ClassToolDialog::slotClassComboChoice(const TQString &str)
 {
     setClassName(str);
     refresh();
@@ -262,10 +262,10 @@ void ClassToolDialog::refresh()
     // Clear the combo box and fill it with the new items.
     // Try to select the previously selected class
 
-    QString oldName = class_combo->currentText();
+    TQString oldName = class_combo->currentText();
 
     class_combo->clear();
-    QStringList list = m_part->classStore()->getSortedClassNameList();
+    TQStringList list = m_part->classStore()->getSortedClassNameList();
     class_combo->insertStringList(list);
     setClassName(oldName);
 
@@ -277,8 +277,8 @@ void ClassToolDialog::refresh()
 /** Change the caption depending on the current operation. */
 void ClassToolDialog::updateCaptionAndButtons()
 {
-    QString caption;
-    QToolButton *button;
+    TQString caption;
+    TQToolButton *button;
 
     switch (currentOperation)
         {
@@ -343,19 +343,19 @@ void ClassToolDialog::buildTree()
             break;
         case ViewChildren:
             {
-                QValueList list = m_part->classStore()->getClassesByParent(currentClass->name());
+                TQValueList list = m_part->classStore()->getClassesByParent(currentClass->name());
                 class_tree->insertClassAndClasses(currentClass, list);
             }
             break;
         case ViewClients:
             {
-                QValueList list = m_part->classStore()->getClassClients(currentClass->name());
+                TQValueList list = m_part->classStore()->getClassClients(currentClass->name());
                 class_tree->insertClassAndClasses(currentClass, list);
             }
             break;
         case ViewSuppliers:
             {
-                QValueList list = m_part->classStore()->getClassSuppliers(currentClass->name());
+                TQValueList list = m_part->classStore()->getClassSuppliers(currentClass->name());
                 class_tree->insertClassAndClasses(currentClass, list);
             }
             break;
diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h
index 1ab8b5c1..01c86f3b 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -14,11 +14,11 @@
 #ifndef _CLASSTOOLDLG_H_
 #define _CLASSTOOLDLG_H_
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include "classtoolwidget.h"
 #include "parseditem.h"
 
@@ -38,7 +38,7 @@ public:
     ClassToolDialog( ClassViewPart *part );
     ~ClassToolDialog();
 
-    void setClassName(const QString &name);
+    void setClassName(const TQString &name);
 
 public slots:
 
@@ -63,8 +63,8 @@ private slots:
 
     void delayedClose();
     void slotClose();
-    void slotAccessComboChoice(const QString &str);
-    void slotClassComboChoice(const QString &str);
+    void slotAccessComboChoice(const TQString &str);
+    void slotClassComboChoice(const TQString &str);
 
 
 private:
@@ -72,15 +72,15 @@ private:
     void buildTree();
 
     ClassToolWidget *class_tree;
-    QComboBox *class_combo;
+    TQComboBox *class_combo;
     
-    QToolButton *parents_button;
-    QToolButton *children_button;
-    QToolButton *clients_button;
-    QToolButton *suppliers_button;
-    QToolButton *methods_button;
-    QToolButton *attributes_button;
-    QComboBox *access_combo;
+    TQToolButton *parents_button;
+    TQToolButton *children_button;
+    TQToolButton *clients_button;
+    TQToolButton *suppliers_button;
+    TQToolButton *methods_button;
+    TQToolButton *attributes_button;
+    TQComboBox *access_combo;
     
     /** Store that holds all classes in the system. */
     ClassStore *m_store;
diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp
index f800bd15..5aefe6e5 100644
--- a/parts/classview/classtoolwidget.cpp
+++ b/parts/classview/classtoolwidget.cpp
@@ -20,7 +20,7 @@
 #include "classstore.h"
 
 
-ClassToolWidget::ClassToolWidget(ClassViewPart *part, QWidget *parent)
+ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *parent)
     : ClassTreeBase(part, parent, "class tool widget")
 {}
 
@@ -41,13 +41,13 @@ KPopupMenu *ClassToolWidget::createPopup()
 }
 
 
-void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, QValueList classList)
+void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, TQValueList classList)
 {
     ClassTreeItem *root = new ClassTreeClassItem(this, 0, parsedClass);
     
     ClassTreeItem *lastItem = 0;
 
-    QValueList::ConstIterator it;
+    TQValueList::ConstIterator it;
     for (it = classList.begin(); it != classList.end(); ++it) {
         lastItem = new ClassTreeClassItem(root, lastItem, *it);
         lastItem->setExpandable(false);
@@ -60,13 +60,13 @@ void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, QValueList
 }
 
 
-void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const QPtrList &parentList)
+void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &parentList)
 {
     ClassTreeItem *root = new ClassTreeClassItem(this, 0, parsedClass);
     
     ClassTreeItem *lastItem = 0;
 
-    QPtrListIterator it(parentList);
+    TQPtrListIterator it(parentList);
     for (; it.current(); ++it) {
         ParsedClass *parentClass = m_part->classStore()->getClassByName((*it)->name());
         lastItem = new ClassTreeClassItem(root, lastItem, parentClass);
@@ -86,8 +86,8 @@ void ClassToolWidget::addClassAndAttributes(ParsedClass *parsedClass, PIAccess f
 
     ClassTreeItem *ilastItem = 0;
     
-    QValueList attrList = parsedClass->getSortedAttributeList();
-    QValueList::ConstIterator it;
+    TQValueList attrList = parsedClass->getSortedAttributeList();
+    TQValueList::ConstIterator it;
     for (it = attrList.begin(); it != attrList.end(); ++it) {
         if (filter == (PIAccess)-1 || filter == (*it)->access())
             ilastItem = new ClassTreeAttrItem(*lastItem, ilastItem, *it);
@@ -106,8 +106,8 @@ void ClassToolWidget::addClassAndMethods(ParsedClass *parsedClass, PIAccess filt
     
     ClassTreeItem *ilastItem = 0;
     
-    QValueList methodList = parsedClass->getSortedMethodList();
-    QValueList::ConstIterator it;
+    TQValueList methodList = parsedClass->getSortedMethodList();
+    TQValueList::ConstIterator it;
     for (it = methodList.begin(); it != methodList.end(); ++it) {
         if (filter == (PIAccess)-1 || filter == (*it)->access())
             ilastItem = new ClassTreeMethodItem(*lastItem, ilastItem, *it);
diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h
index 75119e8f..4d7d8036 100644
--- a/parts/classview/classtoolwidget.h
+++ b/parts/classview/classtoolwidget.h
@@ -22,11 +22,11 @@ class ClassToolWidget : public ClassTreeBase
     Q_OBJECT
     
 public:
-    ClassToolWidget(ClassViewPart *part, QWidget *parent=0);
+    ClassToolWidget(ClassViewPart *part, TQWidget *parent=0);
     ~ClassToolWidget();
 
-    void insertClassAndClasses(ParsedClass *parsedClass, QValueList classList);
-    void insertClassAndClasses(ParsedClass *parsedClass, const QPtrList &parentList);
+    void insertClassAndClasses(ParsedClass *parsedClass, TQValueList classList);
+    void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &parentList);
     void insertAllClassMethods(ParsedClass *parsedClass, PIAccess filter);
     void insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter);
 
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index f5c0f4b9..c6d2770e 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -13,9 +13,9 @@
 
 #include "classtreebase.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -40,11 +40,11 @@ KPopupMenu *ClassTreeItem::createPopup()
 
     KPopupMenu *popup = new KPopupMenu();
     if (features & KDevLanguageSupport::Declarations)
-        popup->insertItem( i18n("Go to Declaration"), classTree(), SLOT(slotGotoDeclaration()) );
+        popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) );
     if (m_item->itemType() == PIT_METHOD)
-        popup->insertItem( i18n("Go to Definition"), classTree(), SLOT(slotGotoImplementation()) );
+        popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) );
 
-    QString title;
+    TQString title;
     switch(m_item->itemType()) {
     case PIT_CLASS:
         {
@@ -52,13 +52,13 @@ KPopupMenu *ClassTreeItem::createPopup()
             bool hasAddMethod = features & KDevLanguageSupport::AddMethod;
             bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute;
             if (hasAddMethod)
-                popup->insertItem( i18n("Add Method..."), classTree(), SLOT(slotAddMethod()));
+                popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod()));
             if (hasAddAttribute)
-                popup->insertItem( i18n("Add Attribute..."), classTree(), SLOT(slotAddAttribute()));
+                popup->insertItem( i18n("Add Attribute..."), classTree(), TQT_SLOT(slotAddAttribute()));
             popup->insertSeparator();
-            popup->insertItem( i18n("Parent Classes..."), classTree(), SLOT(slotClassBaseClasses()));
-            popup->insertItem( i18n("Child Classes..."), classTree(), SLOT(slotClassDerivedClasses()));
-            popup->insertItem( i18n("Class Tool..."), classTree(), SLOT(slotClassTool()));
+            popup->insertItem( i18n("Parent Classes..."), classTree(), TQT_SLOT(slotClassBaseClasses()));
+            popup->insertItem( i18n("Child Classes..."), classTree(), TQT_SLOT(slotClassDerivedClasses()));
+            popup->insertItem( i18n("Class Tool..."), classTree(), TQT_SLOT(slotClassTool()));
             }
         break;
     case PIT_STRUCT:
@@ -90,16 +90,16 @@ KPopupMenu *ClassTreeItem::createPopup()
 }
 
 
-QString ClassTreeItem::scopedText() const
+TQString ClassTreeItem::scopedText() const
 {
     if (m_item)
         return m_item->path();
 
-    return QString::null;
+    return TQString::null;
 }
 
 
-void ClassTreeItem::getDeclaration(QString *toFile, int *toLine)
+void ClassTreeItem::getDeclaration(TQString *toFile, int *toLine)
 {
     if (m_item) {
         *toFile = m_item->declaredInFile();
@@ -108,7 +108,7 @@ void ClassTreeItem::getDeclaration(QString *toFile, int *toLine)
 }
 
 
-void ClassTreeItem::getImplementation(QString *toFile, int *toLine)
+void ClassTreeItem::getImplementation(TQString *toFile, int *toLine)
 {
     if (m_item) {
         *toFile = m_item->definedInFile();
@@ -117,15 +117,15 @@ void ClassTreeItem::getImplementation(QString *toFile, int *toLine)
 }
 
 
-QString ClassTreeItem::text( int ) const
+TQString ClassTreeItem::text( int ) const
 {
     if (m_item)
         return m_item->asString();
-    return QString::null;
+    return TQString::null;
 }
 
 
-QString ClassTreeItem::tipText() const
+TQString ClassTreeItem::tipText() const
 {
     // Purposefully avoid virtual dispatch here
     return ClassTreeItem::text(0);
@@ -146,10 +146,10 @@ void ClassTreeScopeItem::init()
 }
 
 
-QString ClassTreeScopeItem::text( int col ) const
+TQString ClassTreeScopeItem::text( int col ) const
 {
     if (!m_item)
-        return QString::null;
+        return TQString::null;
     if (m_item->name().isEmpty())
         return i18n("Global");
     return ClassTreeItem::text( col );
@@ -171,39 +171,39 @@ void ClassTreeScopeItem::setOpen(bool o)
         KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
         
         // Add namespaces
-        QValueList scopeList = pScope->getSortedScopeList();
-        QValueList::ConstIterator it;
+        TQValueList scopeList = pScope->getSortedScopeList();
+        TQValueList::ConstIterator it;
         for (it = scopeList.begin(); it != scopeList.end(); ++it)
             lastItem = new ClassTreeScopeItem(this, lastItem, *it);
 
         if (features & KDevLanguageSupport::Classes) {
             // Add classes
-            QValueList classList = pScope->getSortedClassList();
-            QValueList::ConstIterator it;
+            TQValueList classList = pScope->getSortedClassList();
+            TQValueList::ConstIterator it;
             for (it = classList.begin(); it != classList.end(); ++it)
                 lastItem = new ClassTreeClassItem(this, lastItem, *it);
         }
             
         if (features & KDevLanguageSupport::Structs) {
             // Add structs
-            QValueList structList = pScope->getSortedStructList();
-            QValueList::ConstIterator it;
+            TQValueList structList = pScope->getSortedStructList();
+            TQValueList::ConstIterator it;
             for (it = structList.begin(); it != structList.end(); ++it)
                 lastItem = new ClassTreeClassItem(this, lastItem, *it, true);
         }
 
         if (features & KDevLanguageSupport::Functions) {
             // Add functions
-            QValueList methodList = pScope->getSortedMethodList();
-            QValueList::ConstIterator it;
+            TQValueList methodList = pScope->getSortedMethodList();
+            TQValueList::ConstIterator it;
             for (it = methodList.begin(); it != methodList.end(); ++it)
                 lastItem = new ClassTreeMethodItem(this, lastItem, *it);
         }
 
         if (features & KDevLanguageSupport::Variables) {
             // Add attributes
-            QValueList attrList = pScope->getSortedAttributeList();
-            QValueList::ConstIterator it;
+            TQValueList attrList = pScope->getSortedAttributeList();
+            TQValueList::ConstIterator it;
             for (it = attrList.begin(); it != attrList.end(); ++it)
                 lastItem = new ClassTreeAttrItem(this, lastItem, *it);
         }
@@ -232,38 +232,38 @@ void ClassTreeClassItem::setOpen(bool o)
         ClassTreeItem *lastItem = 0;
 
         // Add nested classes
-        QValueList classList = pClass->getSortedClassList();
-        QValueList::ConstIterator classIt;
+        TQValueList classList = pClass->getSortedClassList();
+        TQValueList::ConstIterator classIt;
         for (classIt = classList.begin(); classIt != classList.end(); ++classIt)
             lastItem = new ClassTreeClassItem(this, lastItem, *classIt);
 
         // Add nested structs
-        QValueList structList = pClass->getSortedStructList();
-        QValueList::ConstIterator structIt;
+        TQValueList structList = pClass->getSortedStructList();
+        TQValueList::ConstIterator structIt;
         for (structIt = structList.begin(); structIt != structList.end(); ++structIt)
             lastItem = new ClassTreeClassItem(this, lastItem, *structIt, true);
 
         // Add methods
-        QValueList methodList = pClass->getSortedMethodList();
-        QValueList::ConstIterator methodIt;
+        TQValueList methodList = pClass->getSortedMethodList();
+        TQValueList::ConstIterator methodIt;
         for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt)
             lastItem = new ClassTreeMethodItem(this, lastItem, *methodIt);
 
         // Add slots
-        QValueList slotList = pClass->getSortedSlotList();
-        QValueList::ConstIterator slotIt;
+        TQValueList slotList = pClass->getSortedSlotList();
+        TQValueList::ConstIterator slotIt;
         for (slotIt = slotList.begin(); slotIt != slotList.end(); ++slotIt)
             lastItem = new ClassTreeMethodItem(this, lastItem, *slotIt);
 
         // Add signals
-        QValueList signalList = pClass->getSortedSignalList();
-        QValueList::ConstIterator signalIt;
+        TQValueList signalList = pClass->getSortedSignalList();
+        TQValueList::ConstIterator signalIt;
         for (signalIt = signalList.begin(); signalIt != signalList.end(); ++signalIt)
             lastItem = new ClassTreeMethodItem(this, lastItem, *signalIt);
 
         // Add attributes
-        QValueList attrList = pClass->getSortedAttributeList();
-        QValueList::ConstIterator attrIt;
+        TQValueList attrList = pClass->getSortedAttributeList();
+        TQValueList::ConstIterator attrIt;
         for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt)
             lastItem = new ClassTreeAttrItem(this, lastItem, *attrIt);
         
@@ -276,7 +276,7 @@ ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *l
                                          ParsedMethod *parsedMethod)
     : ClassTreeItem(parent, lastSibling, parsedMethod)
 {
-    QString icon;
+    TQString icon;
 
     if ( !parsedMethod )
       return;
@@ -305,12 +305,12 @@ ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *l
     setPixmap(0, UserIcon(icon, KIcon::DefaultState, ClassViewFactory::instance()));
 }
 
-QString ClassTreeMethodItem::text( int ) const
+TQString ClassTreeMethodItem::text( int ) const
 {
-    QString str;
+    TQString str;
 
     if ( !m_item )
-        return QString::null;
+        return TQString::null;
  
     ParsedMethod* method = static_cast(m_item);
 
@@ -340,7 +340,7 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS
                                      ParsedAttribute *parsedAttr)
     : ClassTreeItem(parent, lastSibling, parsedAttr)
 {
-    QString icon;
+    TQString icon;
     
     if ( !parsedAttr )
       return;
@@ -360,10 +360,10 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS
 }
 
 
-QString ClassTreeAttrItem::text( int ) const
+TQString ClassTreeAttrItem::text( int ) const
 {
     if ( !m_item )
-        return QString::null;
+        return TQString::null;
     return m_item->name();
 }
 
@@ -371,7 +371,7 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l
                                      ParsedScript *parsedScript)
     : ClassTreeItem(parent, lastSibling, parsedScript)
 {
-    QString icon;
+    TQString icon;
 
     if ( !parsedScript )
       return;
@@ -384,10 +384,10 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l
 }
 
 
-QString ClassTreeScriptItem::text( int ) const
+TQString ClassTreeScriptItem::text( int ) const
 {
     if ( !m_item )
-        return QString::null;
+        return TQString::null;
     return m_item->name();
 }
 
@@ -402,14 +402,14 @@ void ClassTreeScriptItem::setOpen(bool o)
         ClassTreeItem *lastItem = 0;
 
         // Add methods
-        QValueList methodList = pClass->getSortedMethodList();
-        QValueList::ConstIterator methodIt;
+        TQValueList methodList = pClass->getSortedMethodList();
+        TQValueList::ConstIterator methodIt;
         for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt)
             lastItem = new ClassTreeMethodItem(this, lastItem, *methodIt);
 
         // Add attributes
-        QValueList attrList = pClass->getSortedAttributeList();
-        QValueList::ConstIterator attrIt;
+        TQValueList attrList = pClass->getSortedAttributeList();
+        TQValueList::ConstIterator attrIt;
         for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt)
             lastItem = new ClassTreeAttrItem(this, lastItem, *attrIt);
 
@@ -422,51 +422,51 @@ void ClassTreeScriptItem::setOpen(bool o)
 class ClassToolTip : public QToolTip
 {
 public:
-    ClassToolTip( QWidget *parent )
-        : QToolTip(parent)
+    ClassToolTip( TQWidget *parent )
+        : TQToolTip(parent)
         {}
 
 protected:
-    void maybeTip(const QPoint &p);
+    void maybeTip(const TQPoint &p);
 };
 
 
-void ClassToolTip::maybeTip(const QPoint &p)
+void ClassToolTip::maybeTip(const TQPoint &p)
 {
     ClassTreeBase *ctw = static_cast(parentWidget());
 
-    QListViewItem *item = ctw->itemAt(p);
-    QRect r = ctw->itemRect(item);
+    TQListViewItem *item = ctw->itemAt(p);
+    TQRect r = ctw->itemRect(item);
 
     if (item && r.isValid()) {
         ClassTreeItem *ctitem = static_cast(item);
-        QString str = ctitem->tipText();
+        TQString str = ctitem->tipText();
         if (!str.isEmpty())
             tip(r, str);
     }
 }
 
 
-ClassTreeBase::ClassTreeBase(ClassViewPart *part, QWidget *parent, const char *name)
+ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *name)
     : KListView(parent, name)
 {
     setFocusPolicy(ClickFocus);
     setRootIsDecorated(true);
-    setResizeMode(QListView::LastColumn);
+    setResizeMode(TQListView::LastColumn);
     setSorting(-1);
     header()->hide();
-    addColumn(QString::null);
+    addColumn(TQString::null);
 
     (void) new ClassToolTip(this);
     
-    connect( this, SIGNAL(executed(QListViewItem*)),
-             this, SLOT(slotItemExecuted(QListViewItem*)) );
-    connect( this, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int)),
-             this, SLOT(slotItemPressed(int, QListViewItem*)) );
-    connect( this, SIGNAL(returnPressed( QListViewItem*)), 
-             SLOT( slotItemExecuted(QListViewItem*)) );
-    connect( this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)),
-             this, SLOT(slotContextMenuRequested(QListViewItem*, const QPoint&)) );
+    connect( this, TQT_SIGNAL(executed(TQListViewItem*)),
+             this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+             this, TQT_SLOT(slotItemPressed(int, TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(returnPressed( TQListViewItem*)), 
+             TQT_SLOT( slotItemExecuted(TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
+             this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) );
 
     m_part = part;
 }
@@ -481,11 +481,11 @@ ClassTreeBase::TreeState ClassTreeBase::treeState() const
     TreeState state;
 
     ClassTreeBase *that = const_cast(this);
-    QListViewItemIterator it(that);
+    TQListViewItemIterator it(that);
     for (; it.current(); ++it)
         if (it.current()->isOpen()) {
-            QStringList path;
-            QListViewItem *item = it.current();
+            TQStringList path;
+            TQListViewItem *item = it.current();
             while (item) {
                 path.prepend(item->text(0));
                 item = item->parent();
@@ -501,10 +501,10 @@ void ClassTreeBase::setTreeState(TreeState state)
 {
     TreeStateIterator tsit;
     for (tsit = state.begin(); tsit != state.end(); ++tsit) {
-        QListViewItemIterator it(this);
+        TQListViewItemIterator it(this);
         for (; it.current(); ++it) {
-            QStringList path;
-            QListViewItem *item = it.current();
+            TQStringList path;
+            TQListViewItem *item = it.current();
             while (item) {
                 path.prepend(item->text(0));
                 item = item->parent();
@@ -520,7 +520,7 @@ void ClassTreeBase::setTreeState(TreeState state)
 
 
   
-void ClassTreeBase::slotItemExecuted( QListViewItem* item )
+void ClassTreeBase::slotItemExecuted( TQListViewItem* item )
 {
     if (!item)
         return;
@@ -535,7 +535,7 @@ void ClassTreeBase::slotItemExecuted( QListViewItem* item )
     if (ctitem->isOrganizer())
         return;
         
-    QString toFile;
+    TQString toFile;
     int toLine = -1;
     if (dynamic_cast(item)) {
         ctitem->getDeclaration(&toFile, &toLine);
@@ -548,7 +548,7 @@ void ClassTreeBase::slotItemExecuted( QListViewItem* item )
 }
 
 
-void ClassTreeBase::slotItemPressed(int button, QListViewItem *item)
+void ClassTreeBase::slotItemPressed(int button, TQListViewItem *item)
 {
     if (!item)
         return;
@@ -560,7 +560,7 @@ void ClassTreeBase::slotItemPressed(int button, QListViewItem *item)
         return;
 
     if (button == MidButton) {
-        QString toFile;
+        TQString toFile;
         int toLine = -1;
         ctitem->getDeclaration(&toFile, &toLine);
         m_part->partController()->editDocument(toFile, toLine);
@@ -568,7 +568,7 @@ void ClassTreeBase::slotItemPressed(int button, QListViewItem *item)
     }
 }
 
-void ClassTreeBase::slotContextMenuRequested(QListViewItem *item, const QPoint &p)
+void ClassTreeBase::slotContextMenuRequested(TQListViewItem *item, const TQPoint &p)
 {
     contextItem = static_cast(item);
     
@@ -579,7 +579,7 @@ void ClassTreeBase::slotContextMenuRequested(QListViewItem *item, const QPoint &
 
 void ClassTreeBase::slotGotoDeclaration()
 {
-    QString toFile;
+    TQString toFile;
     int toLine = -1;
     
     contextItem->getDeclaration(&toFile, &toLine);
@@ -589,7 +589,7 @@ void ClassTreeBase::slotGotoDeclaration()
 
 void ClassTreeBase::slotGotoImplementation()
 {
-    QString toFile;
+    TQString toFile;
     int toLine = -1;
     
     contextItem->getImplementation(&toFile, &toLine);
diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h
index e019bcc2..91ac8054 100644
--- a/parts/classview/classtreebase.h
+++ b/parts/classview/classtreebase.h
@@ -32,12 +32,12 @@ class ClassTreeBase : public KListView
     Q_OBJECT
     
 public: 
-    ClassTreeBase( ClassViewPart *part, QWidget *parent=0, const char *name=0 );
+    ClassTreeBase( ClassViewPart *part, TQWidget *parent=0, const char *name=0 );
     ~ClassTreeBase();
 
 protected:
-    typedef QValueList TreeState;
-    typedef QValueList::Iterator TreeStateIterator;
+    typedef TQValueList TreeState;
+    typedef TQValueList::Iterator TreeStateIterator;
     TreeState treeState() const;
     void setTreeState(TreeState state);
     
@@ -45,9 +45,9 @@ protected:
     virtual KPopupMenu *createPopup() = 0;
     
 private slots:
-    void slotItemExecuted(QListViewItem*);
-    void slotItemPressed(int button, QListViewItem *item);
-    void slotContextMenuRequested(QListViewItem *item, const QPoint &p);
+    void slotItemExecuted(TQListViewItem*);
+    void slotItemPressed(int button, TQListViewItem *item);
+    void slotContextMenuRequested(TQListViewItem *item, const TQPoint &p);
     void slotGotoDeclaration();
     void slotGotoImplementation();
     void slotAddMethod();
@@ -63,21 +63,21 @@ protected:
 };
 
 
-class ClassTreeItem : public QListViewItem, public NotifyClient
+class ClassTreeItem : public TQListViewItem, public NotifyClient
 {
 public:
     ClassTreeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem )
-        : QListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem)
+        : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem)
     {
         init();
     }
     ClassTreeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem )
-        : QListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem)
+        : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem)
     {
         init();
     }
     ClassTreeItem( const ClassTreeItem& other )
-        : QListViewItem( other.parent(), other.nextSibling()), NotifyClient()
+        : TQListViewItem( other.parent(), other.nextSibling()), NotifyClient()
     {
         m_item = other.m_item;
         init();
@@ -105,12 +105,12 @@ public:
             m_item->registerNotifyClient( (NotifyClient*)this );
     }
     
-    void getDeclaration(QString *toFile, int *toLine);
-    void getImplementation(QString *toFile, int *toLine);
+    void getDeclaration(TQString *toFile, int *toLine);
+    void getImplementation(TQString *toFile, int *toLine);
 
-    virtual QString scopedText() const;
-    virtual QString text( int ) const;
-    virtual QString tipText() const;
+    virtual TQString scopedText() const;
+    virtual TQString text( int ) const;
+    virtual TQString tipText() const;
     
 protected:
     ClassTreeBase *classTree()
@@ -123,22 +123,22 @@ class ClassTreeOrganizerItem : public ClassTreeItem
 {
 public:
     ClassTreeOrganizerItem( ClassTreeBase *parent, ClassTreeItem *lastSibling,
-                            const QString &text )
+                            const TQString &text )
         : ClassTreeItem(parent, lastSibling, 0 )
         , m_text( text )
         { init(); }
     ClassTreeOrganizerItem( ClassTreeItem *parent, ClassTreeItem *lastSibling,
-                            const QString &text )
+                            const TQString &text )
         : ClassTreeItem(parent, lastSibling, 0 )
         , m_text( text )
         { init(); }
     ~ClassTreeOrganizerItem()
         {}
 
-    virtual QString text( int ) const { return m_text; }
+    virtual TQString text( int ) const { return m_text; }
     
 private:
-    QString m_text;
+    TQString m_text;
     
     void init();
 };
@@ -163,7 +163,7 @@ public:
     {
     }
 
-    virtual QString text( int ) const;
+    virtual TQString text( int ) const;
     virtual void setOpen(bool o);
 
 private:
@@ -209,7 +209,7 @@ public:
         {
         }
 
-    virtual QString text( int ) const;
+    virtual TQString text( int ) const;
 };
 
 
@@ -222,7 +222,7 @@ public:
         {
         }
 
-    virtual QString text( int ) const;
+    virtual TQString text( int ) const;
 };
 
 class ClassTreeScriptItem : public ClassTreeItem
@@ -234,7 +234,7 @@ public:
         {
         }
 
-    virtual QString text( int ) const;
+    virtual TQString text( int ) const;
     virtual void setOpen(bool o);
 };
 
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 42410fbe..24163bf4 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -19,10 +19,10 @@
  *
  */
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -63,13 +63,13 @@ class FunctionCompletion : public CustomCompleter {
         FunctionCompletion() {
 					setOrder( Insertion ); 
         };
-        typedef QMap FuncMap;
+        typedef TQMap FuncMap;
         FuncMap nameMap; /// real ->  short
         FuncMap revNameMap; /// short -> real
     
-        static const QString processName( QString function ) {
-            QString args;
-            QString fScope;
+        static const TQString processName( TQString function ) {
+            TQString args;
+            TQString fScope;
             int cutpos;
     
             if((cutpos = function.find('(')) != -1) {
@@ -86,10 +86,10 @@ class FunctionCompletion : public CustomCompleter {
             return function;
         }
     
-        virtual void addItem ( const QString &item ) {
-            QString newItemName = item;
+        virtual void addItem ( const TQString &item ) {
+            TQString newItemName = item;
             KCompletion::addItem(newItemName);
-            QString tx = processName( item );
+            TQString tx = processName( item );
             tx += "  \"" + item + "\"";
             nameMap[item] = tx;
             revNameMap[tx] = item;
@@ -102,7 +102,7 @@ class FunctionCompletion : public CustomCompleter {
             KCompletion::addItem( item );
         }
     
-        virtual void removeItem ( const QString &item ) {
+        virtual void removeItem ( const TQString &item ) {
             FuncMap::iterator it = nameMap.find( item );
             if( it != nameMap.end() ) {
                 KCompletion::removeItem( *it );
@@ -117,15 +117,15 @@ class FunctionCompletion : public CustomCompleter {
             KCompletion::clear();
         }
     
-        virtual void postProcessMatch ( QString *match ) const  {
+        virtual void postProcessMatch ( TQString *match ) const  {
             FuncMap::const_iterator it = revNameMap.find( *match );
             if( it != revNameMap.end() ) {
                 *match = *it;
             }
         };
     
-        virtual void   postProcessMatches ( QStringList *matches ) const {
-            QStringList::iterator it = matches->begin();
+        virtual void   postProcessMatches ( TQStringList *matches ) const {
+            TQStringList::iterator it = matches->begin();
             
             while( it != matches->end() ) {
                 postProcessMatch( &(*it) );
@@ -142,7 +142,7 @@ typedef KDevGenericFactory ClassViewFactory;
 static const KDevPluginInfo data("kdevclassview");
 K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) )
 
-ClassViewPart::ClassViewPart(QObject *parent, const char *name, const QStringList& )
+ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& )
     :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
     KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
     m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0)
@@ -158,14 +158,14 @@ ClassViewPart::ClassViewPart(QObject *parent, const char *name, const QStringLis
     m_widget->setIcon( SmallIcon("view_tree") );
     m_widget->setCaption(i18n("Class Browser"));
     mainWindow()->embedSelectView( m_widget, i18n("Classes"), i18n("Class browser") );
-    QWhatsThis::add(m_widget, i18n("Class browser
    "
+    TQWhatsThis::add(m_widget, i18n("Class browser
    "
             "The class browser shows all namespaces, classes and namespace and class members in a project."));
 
-    connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
-    connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) );
-    connect( core(), SIGNAL(languageChanged()), this, SLOT(slotProjectOpened()) );
-    connect( partController(), SIGNAL(activePartChanged(KParts::Part*)),
-        this, SLOT(activePartChanged(KParts::Part*)));
+    connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
+    connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
+    connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) );
+    connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
+        this, TQT_SLOT(activePartChanged(KParts::Part*)));
 }
 
 bool ClassViewPart::jumpedToItem( ItemDom item ) {
@@ -182,34 +182,34 @@ ClassViewPart::~ClassViewPart()
 
 void ClassViewPart::slotProjectOpened( )
 {
-    connect( languageSupport(), SIGNAL(updatedSourceInfo()), navigator, SLOT(refresh()) );
-    connect( languageSupport(), SIGNAL(addedSourceInfo(const QString& )), navigator, SLOT(addFile(const QString& )));
+    connect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) );
+    connect( languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQT_SLOT(addFile(const TQString& )));
     navigator->refresh();
 }
 
 void ClassViewPart::slotProjectClosed( )
 {
 //    navigator->refresh();
-//    disconnect( languageSupport(), SIGNAL(updatedSourceInfo()), navigator, SLOT(refresh()) );
+//    disconnect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) );
 }
 
 void ClassViewPart::setupActions( )
 {
     m_functionsnav = new KListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true );
-    connect(m_functionsnav->view(), SIGNAL(activated(QListViewItem*)), navigator, SLOT(selectFunctionNav(QListViewItem*)));
+    connect(m_functionsnav->view(), TQT_SIGNAL(activated(TQListViewItem*)), navigator, TQT_SLOT(selectFunctionNav(TQListViewItem*)));
 //    m_functionsnav->view()->setEditable(false);
-    connect(m_functionsnav->view(), SIGNAL(focusGranted()), navigator, SLOT(functionNavFocused()));
-    connect(m_functionsnav->view(), SIGNAL(focusLost()), navigator, SLOT(functionNavUnFocused()));
+    connect(m_functionsnav->view(), TQT_SIGNAL(focusGranted()), navigator, TQT_SLOT(functionNavFocused()));
+    connect(m_functionsnav->view(), TQT_SIGNAL(focusLost()), navigator, TQT_SLOT(functionNavUnFocused()));
     m_functionsnav->setToolTip(i18n("Functions in file"));
     m_functionsnav->setWhatsThis(i18n("Function navigator
    Navigates over functions contained in the file."));
 //    m_functionsnav->view()->setCurrentText(NAV_NODEFINITION);
     m_functionsnav->view()->setDefaultText(NAV_NODEFINITION);
 
-    new KAction( i18n("Focus Navigator"), 0, this, SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" );
+    new KAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" );
 
     if (langHasFeature(KDevLanguageSupport::Classes))
     {
-        KAction *ac = new KAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, SLOT(graphicalClassView()), actionCollection(), "inheritance_dia");
+        KAction *ac = new KAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia");
         ac->setToolTip(i18n("Class inheritance diagram"));
         ac->setWhatsThis(i18n("Class inheritance diagram
    Displays inheritance relationship between classes in project. "
                                  "Note, it does not display classes outside inheritance hierarchy."));    
@@ -242,8 +242,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part)
     navigator->stopTimer();
     if (m_activeView)
     {
-        disconnect(m_activeView, SIGNAL(cursorPositionChanged()), 
-            navigator, SLOT(slotCursorPositionChanged()));
+        disconnect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), 
+            navigator, TQT_SLOT(slotCursorPositionChanged()));
     }
     
     kdDebug() << "ClassViewPart::activePartChanged()" << endl;
@@ -254,7 +254,7 @@ void ClassViewPart::activePartChanged( KParts::Part * part)
     m_activeSelection = dynamic_cast( part );
     m_activeViewCursor = part ? dynamic_cast( m_activeView ) : 0;
 
-    m_activeFileName = QString::null;
+    m_activeFileName = TQString::null;
 
     if (m_activeDocument)
     {
@@ -263,12 +263,12 @@ void ClassViewPart::activePartChanged( KParts::Part * part)
         navigator->syncFunctionNavDelayed(200);
 /*        if ( languageSupport()->mimeTypes().find(
             KMimeType::findByPath(m_activeFileName)) != languageSupport()->mimeTypes().end() )
-            m_activeFileName = QString::null;*/
+            m_activeFileName = TQString::null;*/
     }
     if( m_activeViewCursor )
     {
-        connect(m_activeView, SIGNAL(cursorPositionChanged()),
-            navigator, SLOT(slotCursorPositionChanged()) );
+        connect(m_activeView, TQT_SIGNAL(cursorPositionChanged()),
+            navigator, TQT_SLOT(slotCursorPositionChanged()) );
     }
 }
 void ClassViewPart::slotFocusNavbar()
diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h
index 0f4aa115..ffa1cc1f 100644
--- a/parts/classview/classviewpart.h
+++ b/parts/classview/classviewpart.h
@@ -24,8 +24,8 @@
 #include "kdevlanguagesupport.h"
 #include "viewcombos.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
@@ -56,7 +56,7 @@ class ClassViewPart : public Extensions::KDevCodeBrowserFrontend
 {
     Q_OBJECT
 public:
-    ClassViewPart(QObject *parent, const char *name, const QStringList &);
+    ClassViewPart(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ClassViewPart();
 
     bool langHasFeature(KDevLanguageSupport::Features feature);
@@ -82,9 +82,9 @@ private slots:
 private:
     void setupActions();
 
-    QGuardedPtr m_widget;
+    TQGuardedPtr m_widget;
 
-    QString m_activeFileName;
+    TQString m_activeFileName;
     KTextEditor::Document* m_activeDocument;
     KTextEditor::View* m_activeView;
     KTextEditor::SelectionInterface* m_activeSelection;
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 0ab90856..64079546 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -41,15 +41,15 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 // namespace ?!?
 
 ClassViewWidget::ClassViewWidget( ClassViewPart * part )
-    : KListView( 0, "ClassViewWidget" ), QToolTip( viewport() ), m_part( part ), m_projectDirectoryLength( 0 )
+    : KListView( 0, "ClassViewWidget" ), TQToolTip( viewport() ), m_part( part ), m_projectDirectoryLength( 0 )
 {
     addColumn( "" );
     header()->hide();
@@ -59,40 +59,40 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part )
 
     m_projectItem = 0;
 
-    connect( this, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) );
-    connect( this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) );
-    connect( m_part->core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
-    connect( m_part->core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) );
-    connect( m_part->core(), SIGNAL(languageChanged()), this, SLOT(slotProjectOpened()) );
+    connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) );
+    connect( m_part->core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
+    connect( m_part->core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
+    connect( m_part->core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) );
 
-    QStringList lst;
+    TQStringList lst;
     lst << i18n( "Group by Directories" ) << i18n( "Plain List" ) << i18n( "Java Like Mode" );
     m_actionViewMode = new KSelectAction( i18n("View Mode"), KShortcut(), m_part->actionCollection(), "classview_mode" );
     m_actionViewMode->setItems( lst );
     m_actionViewMode->setWhatsThis(i18n("View mode
    Class browser items can be grouped by directories, listed in a plain or java like view."));
 
-    m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), this, SLOT(slotNewClass()),
+    m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), this, TQT_SLOT(slotNewClass()),
 				    m_part->actionCollection(), "classview_new_class" );
     m_actionNewClass->setWhatsThis(i18n("New class
    Calls the New Class wizard."));
 	
-	m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), this, SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
+	m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), this, TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
 	
 	
-    m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), this, SLOT(slotAddMethod()),
+    m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), this, TQT_SLOT(slotAddMethod()),
 				    m_part->actionCollection(), "classview_add_method" );
     m_actionAddMethod->setWhatsThis(i18n("Add method
    Calls the New Method wizard."));
-    m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), this, SLOT(slotAddAttribute()),
+    m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), this, TQT_SLOT(slotAddAttribute()),
 				    m_part->actionCollection(), "classview_add_attribute" );
     m_actionAddAttribute->setWhatsThis(i18n("Add attribute
    Calls the New Attribute wizard."));
 
-    m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), this, SLOT(slotOpenDeclaration()),
+    m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), this, TQT_SLOT(slotOpenDeclaration()),
 				    m_part->actionCollection(), "classview_open_declaration" );
     m_actionOpenDeclaration->setWhatsThis(i18n("Open declaration
    Opens a file where the selected item is declared and jumps to the declaration line."));
-    m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), this, SLOT(slotOpenImplementation()),
+    m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), this, TQT_SLOT(slotOpenImplementation()),
 				    m_part->actionCollection(), "classview_open_implementation" );
     m_actionOpenImplementation->setWhatsThis(i18n("Open implementation
    Opens a file where the selected item is defined (implemented) and jumps to the definition line."));
 
-	m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), this, SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
+	m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), this, TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
 
     KConfig* config = m_part->instance()->config();
     config->setGroup( "General" );
@@ -110,13 +110,13 @@ ClassViewWidget::~ClassViewWidget( )
 }
 
 template 
-        static bool selectItemG( ItemDom item, const QMap, ListItemType*>& map )
+        static bool selectItemG( ItemDom item, const TQMap, ListItemType*>& map )
 {
     ModelType* c = dynamic_cast( &(*item) );
     
     if( c ) {
         KSharedPtr d( c );
-        typename QMap, ListItemType*>::ConstIterator it = map.find(d);
+        typename TQMap, ListItemType*>::ConstIterator it = map.find(d);
         if( it != map.end() ) {
             ( *it )->select();
             return true;
@@ -126,7 +126,7 @@ template 
 }
 
 
-void ClassViewWidget::slotExecuted( QListViewItem* item )
+void ClassViewWidget::slotExecuted( TQListViewItem* item )
 {
     if( ClassViewItem* cbitem = dynamic_cast( item ) ){
 	if( cbitem->hasImplementation() )
@@ -143,7 +143,7 @@ void ClassViewWidget::clear( )
     m_projectItem = 0;
 }
 
-void restoreOpenNodes( QStringList & list, QListViewItem * item )
+void restoreOpenNodes( TQStringList & list, TQListViewItem * item )
 {
 	if ( item && !list.isEmpty() )
 	{
@@ -160,13 +160,13 @@ void restoreOpenNodes( QStringList & list, QListViewItem * item )
 	}
 }
 
-void storeOpenNodes( QValueList & openNodes, QStringList const & list, QListViewItem * item )
+void storeOpenNodes( TQValueList & openNodes, TQStringList const & list, TQListViewItem * item )
 {
 	if ( item )
 	{
 		if ( item->isOpen() )
 		{
-			QStringList mylist( list );
+			TQStringList mylist( list );
 			mylist << item->text( 0 );
 			openNodes << mylist;
 			storeOpenNodes( openNodes, mylist, item->firstChild() );
@@ -180,8 +180,8 @@ void ClassViewWidget::refresh()
     if( !m_part->project() )
 	return;
 
-    QValueList openNodes;
-    storeOpenNodes( openNodes, QStringList(), firstChild() );
+    TQValueList openNodes;
+    storeOpenNodes( openNodes, TQStringList(), firstChild() );
     int scrollbarPos = verticalScrollBar()->value();
 
     clear();
@@ -196,7 +196,7 @@ void ClassViewWidget::refresh()
 	++it;
     }
 
-    QValueList::iterator itt = openNodes.begin();
+    TQValueList::iterator itt = openNodes.begin();
     while ( itt != openNodes.end() )
     {
         restoreOpenNodes ( *itt, firstChild() );
@@ -218,12 +218,12 @@ void ClassViewWidget::slotProjectOpened( )
 
     m_projectDirectoryLength = m_projectDirectory.length() + 1;
 
-    connect( m_part->languageSupport(), SIGNAL(updatedSourceInfo()),
-	     this, SLOT(refresh()) );
-    connect( m_part->languageSupport(), SIGNAL(aboutToRemoveSourceInfo(const QString&)),
-	     this, SLOT(removeFile(const QString&)) );
-    connect( m_part->languageSupport(), SIGNAL(addedSourceInfo(const QString&)),
-	     this, SLOT(insertFile(const QString&)) );
+    connect( m_part->languageSupport(), TQT_SIGNAL(updatedSourceInfo()),
+	     this, TQT_SLOT(refresh()) );
+    connect( m_part->languageSupport(), TQT_SIGNAL(aboutToRemoveSourceInfo(const TQString&)),
+	     this, TQT_SLOT(removeFile(const TQString&)) );
+    connect( m_part->languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString&)),
+	     this, TQT_SLOT(insertFile(const TQString&)) );
 }
 
 void ClassViewWidget::slotProjectClosed( )
@@ -231,9 +231,9 @@ void ClassViewWidget::slotProjectClosed( )
 }
 
 
-void ClassViewWidget::insertFile( const QString& fileName )
+void ClassViewWidget::insertFile( const TQString& fileName )
 {
-    QString fn = URLUtil::canonicalPath( fileName );
+    TQString fn = URLUtil::canonicalPath( fileName );
     //kdDebug() << "======================== insertFile(" << fn << ")" << endl;
 
     FileDom dom = m_part->codeModel()->fileByName( fn );
@@ -241,13 +241,13 @@ void ClassViewWidget::insertFile( const QString& fileName )
 	return;
 
     fn = URLUtil::relativePathToFile(m_part->project()->projectDirectory(), fn);
-    QStringList path;
+    TQStringList path;
 
     switch( viewMode() )
     {
     case KDevelop3ViewMode:
 	{
-	    path = QStringList::split( "/", fn );
+	    path = TQStringList::split( "/", fn );
 	    path.pop_back();
 	}
 	break;
@@ -259,10 +259,10 @@ void ClassViewWidget::insertFile( const QString& fileName )
 
     case JavaLikeViewMode:
 	{
-	    QStringList l = QStringList::split( "/", fn );
+	    TQStringList l = TQStringList::split( "/", fn );
 	    l.pop_back();
 
-	    QString package = l.join(".");
+	    TQString package = l.join(".");
 	    if( !package.isEmpty() )
 		path.push_back( package );
 	}
@@ -272,9 +272,9 @@ void ClassViewWidget::insertFile( const QString& fileName )
     m_projectItem->processFile( dom, path );
 }
 
-void ClassViewWidget::removeFile( const QString& fileName )
+void ClassViewWidget::removeFile( const TQString& fileName )
 {
-    QString fn = URLUtil::canonicalPath( fileName );
+    TQString fn = URLUtil::canonicalPath( fileName );
     //kdDebug() << "======================== removeFile(" << fn << ")" << endl;
 
     FileDom dom = m_part->codeModel()->fileByName( fn );
@@ -282,13 +282,13 @@ void ClassViewWidget::removeFile( const QString& fileName )
 	return;
 
     fn = URLUtil::relativePathToFile(m_part->project()->projectDirectory(), fn);
-    QStringList path;
+    TQStringList path;
 
     switch( viewMode() )
     {
     case KDevelop3ViewMode:
 	{
-	    path = QStringList::split( "/", fn );
+	    path = TQStringList::split( "/", fn );
 	    path.pop_back();
 	}
 	break;
@@ -300,10 +300,10 @@ void ClassViewWidget::removeFile( const QString& fileName )
 
     case JavaLikeViewMode:
 	{
-	    QStringList l = QStringList::split( "/", fn );
+	    TQStringList l = TQStringList::split( "/", fn );
 	    l.pop_back();
 
-	    QString package = l.join(".");
+	    TQString package = l.join(".");
 	    if( !package.isEmpty() )
 		path.push_back( package );
 	}
@@ -313,7 +313,7 @@ void ClassViewWidget::removeFile( const QString& fileName )
     m_projectItem->processFile( dom, path, true );
 }
 
-void ClassViewWidget::contentsContextMenuEvent( QContextMenuEvent * ev )
+void ClassViewWidget::contentsContextMenuEvent( TQContextMenuEvent * ev )
 {
     KPopupMenu menu( this );
 
@@ -376,14 +376,14 @@ int ClassViewWidget::viewMode( ) const
      return m_actionViewMode->currentItem();
 }
 
-QString ClassViewItem::comment() {
-    return QString();
+TQString ClassViewItem::comment() {
+    return TQString();
 }
 
 void ClassViewItem::select( ) {
     setOpen(true);
     listView()->setCurrentItem(this);
-    QListViewItem* c = firstChild();
+    TQListViewItem* c = firstChild();
     int size = 0;
     if(c != 0) {
         while(c->nextSibling()) {
@@ -411,7 +411,7 @@ bool ClassViewWidget::selectItem( ItemDom item ) {
 }
 
 
-QString NamespaceDomBrowserItem::comment() {
+TQString NamespaceDomBrowserItem::comment() {
     return m_dom->comment();
 }
 
@@ -437,17 +437,17 @@ bool FolderBrowserItem::selectItem(ItemDom item)
         ///searching for namespaces is currently not supported and not useful
     }
     
-    for( QMap::Iterator it = m_classes.begin(); it != m_classes.end(); ++it ) {
+    for( TQMap::Iterator it = m_classes.begin(); it != m_classes.end(); ++it ) {
         if( (*it)->selectItem(item) )
             return true;
     }
     
-    for( QMap::Iterator it = m_namespaces.begin(); it != m_namespaces.end(); ++it ) {
+    for( TQMap::Iterator it = m_namespaces.begin(); it != m_namespaces.end(); ++it ) {
         if( (*it)->selectItem(item) )
             return true;
     }
 
-    for( QMap::Iterator it = m_folders.begin(); it != m_folders.end(); ++it ) {
+    for( TQMap::Iterator it = m_folders.begin(); it != m_folders.end(); ++it ) {
         if( (*it)->selectItem(item) ) {
             return true;
         }
@@ -456,7 +456,7 @@ bool FolderBrowserItem::selectItem(ItemDom item)
 }
 
 
-void FolderBrowserItem::processFile( FileDom file, QStringList& path, bool remove )
+void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remove )
 {
     if( path.isEmpty() ){
 	NamespaceList namespaceList = file->namespaceList();
@@ -479,7 +479,7 @@ void FolderBrowserItem::processFile( FileDom file, QStringList& path, bool remov
 	return;
     }
 
-    QString current = path.front();
+    TQString current = path.front();
     path.pop_front();
 
     FolderBrowserItem* item = m_folders.contains( current ) ? m_folders[ current ] : 0;
@@ -664,12 +664,12 @@ bool NamespaceDomBrowserItem::selectItem( ItemDom item)
         ///currently not neccessary..
     }
     
-    for(QMap::Iterator it = m_classes.begin(); it != m_classes.end(); ++it) {
+    for(TQMap::Iterator it = m_classes.begin(); it != m_classes.end(); ++it) {
         if( (*it)->selectItem(item) )
             return true;
     }
     
-    for(QMap::Iterator it = m_namespaces.begin(); it != m_namespaces.end(); ++it) {
+    for(TQMap::Iterator it = m_namespaces.begin(); it != m_namespaces.end(); ++it) {
         if( (*it)->selectItem(item) )
             return true;
     }
@@ -834,7 +834,7 @@ bool ClassDomBrowserItem::selectItem(ItemDom item)
         if( selectItemG ( item, m_variables ) ) return true;
     }
     
-    for(QMap::Iterator it = m_classes.begin(); it != m_classes.end(); ++it) {
+    for(TQMap::Iterator it = m_classes.begin(); it != m_classes.end(); ++it) {
         if( (*it)->selectItem(item) )
             return true;
     }
@@ -951,7 +951,7 @@ void NamespaceDomBrowserItem::setup( )
     setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, listView()->m_part->instance()) );
     setExpandable( true );
 
-    QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
+    TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
     setText( 0, txt );
 }
 
@@ -961,7 +961,7 @@ void ClassDomBrowserItem::setup( )
     setPixmap( 0, UserIcon("CVclass", KIcon::DefaultState, listView()->m_part->instance()) );
     setExpandable( true );
 
-    QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
+    TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
     setText( 0, txt );
 }
 
@@ -971,7 +971,7 @@ void TypeAliasDomBrowserItem::setup( )
     setPixmap( 0, UserIcon("CVtypedef", KIcon::DefaultState, listView()->m_part->instance()) );
     setExpandable( false );
 
-    QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
+    TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
     setText( 0, txt );
 }
 
@@ -979,8 +979,8 @@ void FunctionDomBrowserItem::setup( )
 {
     ClassViewItem::setup();
 
-    QString iconName;
-	QString methodType;
+    TQString iconName;
+	TQString methodType;
 
 	if ( m_dom->isSignal() )
 		methodType = "signal";
@@ -998,7 +998,7 @@ void FunctionDomBrowserItem::setup( )
 
     setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, listView()->m_part->instance()) );
 
-    QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
+    TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
     
     item() = highlightFunctionName(txt, 1, m_styles);
 }
@@ -1020,13 +1020,13 @@ void FunctionDomBrowserItem::openImplementation()
         return;
 
     FunctionDefinitionDom fun;
-    QFileInfo fileInfo( m_dom->fileName() );
-    QString path = fileInfo.dirPath( true );
+    TQFileInfo fileInfo( m_dom->fileName() );
+    TQString path = fileInfo.dirPath( true );
 
     for( FunctionDefinitionList::Iterator it=lst.begin(); it!=lst.end(); ++it )
     {
-        QFileInfo defFileInfo( (*it)->fileName() );
-        QString defPath = defFileInfo.dirPath( true );
+        TQFileInfo defFileInfo( (*it)->fileName() );
+        TQString defPath = defFileInfo.dirPath( true );
 
         if( path != defPath )
             continue;
@@ -1050,7 +1050,7 @@ void FunctionDomBrowserItem::openImplementation()
 void VariableDomBrowserItem::setup( )
 {
     ClassViewItem::setup();
-    QString iconName;
+    TQString iconName;
     if( m_dom->access() == CodeModelItem::Private )
         iconName = "CVprivate_var";
     else if( m_dom->access() == CodeModelItem::Protected )
@@ -1060,7 +1060,7 @@ void VariableDomBrowserItem::setup( )
 
     setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, listView()->m_part->instance()) );
 
-    QString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
+    TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
     setText( 0, txt );
 }
 
@@ -1076,32 +1076,32 @@ void VariableDomBrowserItem::openImplementation()
 {
 }
 
-QString FolderBrowserItem::key( int , bool ) const
+TQString FolderBrowserItem::key( int , bool ) const
 {
     return "0 " + text( 0 );
 }
 
-QString NamespaceDomBrowserItem::key( int , bool ) const
+TQString NamespaceDomBrowserItem::key( int , bool ) const
 {
     return "1 " + text( 0 );
 }
 
-QString ClassDomBrowserItem::key( int , bool ) const
+TQString ClassDomBrowserItem::key( int , bool ) const
 {
     return "2 " + text( 0 );
 }
 
-QString TypeAliasDomBrowserItem::key( int , bool ) const
+TQString TypeAliasDomBrowserItem::key( int , bool ) const
 {
     return "3 " + text( 0 );
 }
 
-QString FunctionDomBrowserItem::key( int , bool ) const
+TQString FunctionDomBrowserItem::key( int , bool ) const
 {
     return "4 " + text( 0 );
 }
 
-QString VariableDomBrowserItem::key( int , bool ) const
+TQString VariableDomBrowserItem::key( int , bool ) const
 {
     return "5 " + text( 0 );
 }
@@ -1165,12 +1165,12 @@ bool FunctionDomBrowserItem::hasImplementation() const
     return !lst.isEmpty();
 }
 
-void ClassViewWidget::maybeTip( QPoint const & p )
+void ClassViewWidget::maybeTip( TQPoint const & p )
 {
 	ClassViewItem * item = dynamic_cast( itemAt( p ) );
 	if ( !item ) return;
 	
-	QString tooltip;
+	TQString tooltip;
 	
 	if ( item->isNamespace() )
 	{
@@ -1195,7 +1195,7 @@ void ClassViewWidget::maybeTip( QPoint const & p )
 		FunctionDomBrowserItem * fitem = dynamic_cast( item );
 		if ( fitem )
 		{
-			QString access;
+			TQString access;
 			if ( fitem->dom()->access() == CodeModelItem::Private )
 				access = "[private] ";
 			else if ( fitem->dom()->access() == CodeModelItem::Protected )
@@ -1203,7 +1203,7 @@ void ClassViewWidget::maybeTip( QPoint const & p )
 			else if ( fitem->dom()->access() == CodeModelItem::Public )
 				access = "[public] ";
 
-			QStringList arguments;
+			TQStringList arguments;
 			ArgumentList const & list = fitem->dom()->argumentList();
 			ArgumentList::ConstIterator it( list.begin() );
 			while ( it != list.end() )
@@ -1212,13 +1212,13 @@ void ClassViewWidget::maybeTip( QPoint const & p )
 				++it;
 			}
 			
-			QString strstatic = fitem->dom()->isStatic() ? QString( "[static] " ) : QString::null;
-			QString strsignal = fitem->dom()->isSignal() ? QString( "[signal] " ) : QString::null;
-			QString strslot = fitem->dom()->isSlot() ? QString( "[slot] " ) : QString::null;
-			QString strresult = !fitem->dom()->resultType().isEmpty() ? fitem->dom()->resultType() + " " : QString::null;
+			TQString strstatic = fitem->dom()->isStatic() ? TQString( "[static] " ) : TQString::null;
+			TQString strsignal = fitem->dom()->isSignal() ? TQString( "[signal] " ) : TQString::null;
+			TQString strslot = fitem->dom()->isSlot() ? TQString( "[slot] " ) : TQString::null;
+			TQString strresult = !fitem->dom()->resultType().isEmpty() ? fitem->dom()->resultType() + " " : TQString::null;
 			
-			QString strconstant = fitem->dom()->isConstant() ? QString( " [const]" ) : QString::null;
-			QString strabstract = fitem->dom()->isAbstract() ? QString( " [abstract]" ) : QString::null;
+			TQString strconstant = fitem->dom()->isConstant() ? TQString( " [const]" ) : TQString::null;
+			TQString strabstract = fitem->dom()->isAbstract() ? TQString( " [abstract]" ) : TQString::null;
 			
 			tooltip = access + strstatic + strsignal + strslot + strresult
 				+ fitem->dom()->scope().join("::") + "::" + fitem->dom()->name() 
@@ -1230,7 +1230,7 @@ void ClassViewWidget::maybeTip( QPoint const & p )
 		VariableDomBrowserItem * vitem = dynamic_cast( item );
 		if ( vitem )
 		{
-			QString access;
+			TQString access;
 			if ( vitem->dom()->access() == CodeModelItem::Private )
 				access = "[private] ";
 			else if ( vitem->dom()->access() == CodeModelItem::Protected )
@@ -1238,7 +1238,7 @@ void ClassViewWidget::maybeTip( QPoint const & p )
 			else if ( vitem->dom()->access() == CodeModelItem::Public )
 				access = "[public] ";
 
-			QString strstatic = vitem->dom()->isStatic() ? QString( "[static] " ) : QString::null;
+			TQString strstatic = vitem->dom()->isStatic() ? TQString( "[static] " ) : TQString::null;
 			tooltip = access + strstatic + vitem->dom()->type() + " " + vitem->dom()->name();
 		}	
 	}
@@ -1246,7 +1246,7 @@ void ClassViewWidget::maybeTip( QPoint const & p )
 	{
 		if( TypeAliasDomBrowserItem * titem = dynamic_cast( item ) )
 		{
-			tooltip = QString( "[Type] " ) + titem->dom()->type() + " " + titem->dom()->name();
+			tooltip = TQString( "[Type] " ) + titem->dom()->type() + " " + titem->dom()->name();
 		}
 	}
         
@@ -1259,11 +1259,11 @@ void ClassViewWidget::maybeTip( QPoint const & p )
         
 	kdDebug(0) << tooltip << endl;
 	
-	QRect r = itemRect( item );
+	TQRect r = itemRect( item );
 
 	if ( item && r.isValid() && !tooltip.isEmpty() )
 	{
-		tip( r, QString("
    ") + QStyleSheet::escape( tooltip ) + QString("
    ") );
+		tip( r, TQString("
    ") + TQStyleSheet::escape( tooltip ) + TQString("
    ") );
 	}
 }
 
diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h
index 975f6e09..0ace5692 100644
--- a/parts/classview/classviewwidget.h
+++ b/parts/classview/classviewwidget.h
@@ -23,10 +23,10 @@
 #define __CLASSVIEW_WIDGET_H__
 
 #include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -80,21 +80,21 @@ private slots:
     void slotFollowEditor();
 
 protected:
-    void contentsContextMenuEvent( QContextMenuEvent* );
-	void maybeTip( QPoint const & );
+    void contentsContextMenuEvent( TQContextMenuEvent* );
+	void maybeTip( TQPoint const & );
 
 private slots:
     void slotProjectOpened();
     void slotProjectClosed();
     void refresh();
-    void insertFile( const QString& fileName );
-    void removeFile( const QString& fileName );
-    void slotExecuted( QListViewItem* item );
+    void insertFile( const TQString& fileName );
+    void removeFile( const TQString& fileName );
+    void slotExecuted( TQListViewItem* item );
 
 private:
     ClassViewPart* m_part;
-    QStringList removedText;
-    QString m_projectDirectory;
+    TQStringList removedText;
+    TQString m_projectDirectory;
     int m_projectDirectoryLength;
     FolderBrowserItem* m_projectItem;
     KSelectAction* m_actionViewMode;
@@ -120,9 +120,9 @@ class ClassViewItem: public FancyListViewItem
 {
     private:
 public:
-    ClassViewItem( QListView* parent, const QString& text=QString::null )
+    ClassViewItem( TQListView* parent, const TQString& text=TQString::null )
         : FancyListViewItem( static_cast( parent )->m_paintStyles, parent, text ) {}
-    ClassViewItem( QListViewItem* parent, const QString& text=QString::null )
+    ClassViewItem( TQListViewItem* parent, const TQString& text=TQString::null )
     : FancyListViewItem( static_cast( parent->listView() )->m_paintStyles, parent, text ) {}
     
     virtual const CodeModelItem* model() const { return 0; }
@@ -143,26 +143,26 @@ public:
 
     void select();
     
-    virtual QString comment();
+    virtual TQString comment();
     
-    ClassViewWidget* listView() { return static_cast( QListViewItem::listView() ); }
-    const ClassViewWidget* listView() const { return static_cast( QListViewItem::listView() ); }
+    ClassViewWidget* listView() { return static_cast( TQListViewItem::listView() ); }
+    const ClassViewWidget* listView() const { return static_cast( TQListViewItem::listView() ); }
 };
 
 class FolderBrowserItem: public ClassViewItem
 {
 public:
-    FolderBrowserItem( ClassViewWidget* widget, QListView* parent, const QString& name=QString::null )
+    FolderBrowserItem( ClassViewWidget* widget, TQListView* parent, const TQString& name=TQString::null )
     	: ClassViewItem( parent, name ), m_widget(widget) {}
-    FolderBrowserItem( ClassViewWidget* widget, QListViewItem* parent, const QString& name=QString::null )
+    FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* parent, const TQString& name=TQString::null )
     	: ClassViewItem( parent, name ), m_widget(widget) {}
 
     virtual bool isFolder() const { return true; }
 
     void setup();
-    QString key( int, bool ) const;
+    TQString key( int, bool ) const;
 
-    void processFile( FileDom file, QStringList& path, bool remove=false );
+    void processFile( FileDom file, TQStringList& path, bool remove=false );
     void processNamespace( NamespaceDom ns, bool remove=false );
     void processClass( ClassDom klass, bool remove=false );
     void processTypeAlias( TypeAliasDom typeAlias, bool remove=false );
@@ -171,12 +171,12 @@ public:
     bool selectItem(ItemDom item);
 
 private:
-    QMap m_folders;
-    QMap m_namespaces;
-    QMap m_classes;
-    QMap m_typeAliases;
-    QMap m_functions;
-    QMap m_variables;
+    TQMap m_folders;
+    TQMap m_namespaces;
+    TQMap m_classes;
+    TQMap m_typeAliases;
+    TQMap m_functions;
+    TQMap m_variables;
 
     ClassViewWidget* m_widget;
 };
@@ -184,9 +184,9 @@ private:
 class NamespaceDomBrowserItem: public ClassViewItem
 {
 public:
-    NamespaceDomBrowserItem( QListView* parent, NamespaceDom dom )
+    NamespaceDomBrowserItem( TQListView* parent, NamespaceDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    NamespaceDomBrowserItem( QListViewItem* parent, NamespaceDom dom )
+    NamespaceDomBrowserItem( TQListViewItem* parent, NamespaceDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
@@ -194,7 +194,7 @@ public:
     virtual bool isNamespace() const { return true; }
 
     void setup();
-    QString key( int, bool ) const;
+    TQString key( int, bool ) const;
 
     void processNamespace( NamespaceDom ns, bool remove=false );
     void processClass( ClassDom klass, bool remove=false );
@@ -202,25 +202,25 @@ public:
     void processFunction( FunctionDom fun, bool remove=false );
     void processVariable( VariableDom var, bool remove=false );
     bool selectItem( ItemDom item );
-    virtual QString comment();
+    virtual TQString comment();
 
     NamespaceDom dom() { return m_dom; }
 
 private:
     NamespaceDom m_dom;
-    QMap m_namespaces;
-    QMap m_classes;
-    QMap m_typeAliases;
-    QMap m_functions;
-    QMap m_variables;
+    TQMap m_namespaces;
+    TQMap m_classes;
+    TQMap m_typeAliases;
+    TQMap m_functions;
+    TQMap m_variables;
 };
 
 class ClassDomBrowserItem: public ClassViewItem
 {
 public:
-    ClassDomBrowserItem( QListView* parent, ClassDom dom )
+    ClassDomBrowserItem( TQListView* parent, ClassDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    ClassDomBrowserItem( QListViewItem* parent, ClassDom dom )
+    ClassDomBrowserItem( TQListViewItem* parent, ClassDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
@@ -230,14 +230,14 @@ public:
     virtual void openDeclaration();
 
     void setup();
-    QString key( int, bool ) const;
+    TQString key( int, bool ) const;
 
     void processClass( ClassDom klass, bool remove=false );
     void processTypeAlias( TypeAliasDom typeAlias, bool remove=false );
     void processFunction( FunctionDom fun, bool remove=false );
     void processVariable( VariableDom var, bool remove=false );
     
-    virtual QString comment() {
+    virtual TQString comment() {
         if( !m_dom ) return "";
         return m_dom->comment();
     }
@@ -247,18 +247,18 @@ public:
 
 private:
     ClassDom m_dom;
-    QMap m_classes;
-    QMap m_typeAliases;
-    QMap m_functions;
-    QMap m_variables;
+    TQMap m_classes;
+    TQMap m_typeAliases;
+    TQMap m_functions;
+    TQMap m_variables;
 };
 
 class TypeAliasDomBrowserItem: public ClassViewItem
 {
 public:
-    TypeAliasDomBrowserItem( QListView* parent, TypeAliasDom dom )
+    TypeAliasDomBrowserItem( TQListView* parent, TypeAliasDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    TypeAliasDomBrowserItem( QListViewItem* parent, TypeAliasDom dom )
+    TypeAliasDomBrowserItem( TQListViewItem* parent, TypeAliasDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
@@ -267,13 +267,13 @@ public:
     virtual bool hasDeclaration() const { return true; }
     virtual void openDeclaration();
     
-    virtual QString comment() {
+    virtual TQString comment() {
         if( !m_dom ) return "";
         return m_dom->comment();
     }
 
     void setup();
-    QString key( int, bool ) const;
+    TQString key( int, bool ) const;
 
     TypeAliasDom dom() { return m_dom; }
 
@@ -284,9 +284,9 @@ private:
 class FunctionDomBrowserItem: public ClassViewItem
 {
 public:
-    FunctionDomBrowserItem( QListView* parent, FunctionDom dom )
+    FunctionDomBrowserItem( TQListView* parent, FunctionDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    FunctionDomBrowserItem( QListViewItem* parent, FunctionDom dom )
+    FunctionDomBrowserItem( TQListViewItem* parent, FunctionDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
@@ -298,13 +298,13 @@ public:
     virtual void openDeclaration();
     virtual void openImplementation();
     
-    virtual QString comment() {
+    virtual TQString comment() {
         if( !m_dom ) return "";
         return m_dom->comment();
     }
 
     void setup();
-    QString key( int, bool ) const;
+    TQString key( int, bool ) const;
 
     FunctionDom dom() { return m_dom; }
 
@@ -315,9 +315,9 @@ private:
 class VariableDomBrowserItem: public ClassViewItem
 {
 public:
-    VariableDomBrowserItem( QListView* parent, VariableDom dom )
+    VariableDomBrowserItem( TQListView* parent, VariableDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    VariableDomBrowserItem( QListViewItem* parent, VariableDom dom )
+    VariableDomBrowserItem( TQListViewItem* parent, VariableDom dom )
     	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
@@ -326,7 +326,7 @@ public:
     virtual bool hasDeclaration() const { return true; }
     virtual bool hasImplementation() const { return false; }
     
-    virtual QString comment() {
+    virtual TQString comment() {
         if( !m_dom ) return "";
         return m_dom->comment();
     }
@@ -335,7 +335,7 @@ public:
     virtual void openImplementation();
 
     void setup();
-    QString key( int, bool ) const;
+    TQString key( int, bool ) const;
 
     VariableDom dom() { return m_dom; }
 
@@ -355,8 +355,8 @@ struct FindOp2 ///a template would look nicer
         if( m_dom->isConstant() != m_dom->isConstant() )
             return false;
 
-        QString scope1 = QString("::") + m_dom->scope().join("::");
-        QString scope2 = QString("::") + def->scope().join("::");
+        TQString scope1 = TQString("::") + m_dom->scope().join("::");
+        TQString scope2 = TQString("::") + def->scope().join("::");
         if( !scope1.endsWith(scope2) )
             return false;
 
@@ -389,8 +389,8 @@ struct FindOp
        if( m_dom->isConstant() != m_dom->isConstant() )
            return false;
 
-       QString scope1 = QString("::") + m_dom->scope().join("::");
-       QString scope2 = QString("::") + def->scope().join("::");
+       TQString scope1 = TQString("::") + m_dom->scope().join("::");
+       TQString scope2 = TQString("::") + def->scope().join("::");
        if( !scope1.endsWith(scope2) )
            return false;
 
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index b566757f..8bb8e963 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -13,10 +13,10 @@
 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -33,22 +33,22 @@ struct DigraphNode
     int y;
     int w;
     int h;
-    QString name;
+    TQString name;
 };
 
 
 struct DigraphEdge
 {
-    QPointArray points;
+    TQPointArray points;
 };
 
 
-DigraphView::DigraphView(QWidget *parent, const char *name)
-    : QScrollView(parent, name, WRepaintNoErase|WStaticContents|WResizeNoErase)
+DigraphView::DigraphView(TQWidget *parent, const char *name)
+    : TQScrollView(parent, name, WRepaintNoErase|WStaticContents|WResizeNoErase)
 {
     viewport()->setBackgroundMode(PaletteBase);
 
-    QPaintDeviceMetrics m(this);
+    TQPaintDeviceMetrics m(this);
     xscale = m.logicalDpiX();
     yscale = m.logicalDpiY();
 
@@ -86,7 +86,7 @@ void DigraphView::setRenderedExtent(double w, double h)
 }
 
 
-void DigraphView::addRenderedNode(const QString &name,
+void DigraphView::addRenderedNode(const TQString &name,
                                   double x, double y, double w, double h)
 {
     DigraphNode *node = new DigraphNode;
@@ -99,8 +99,8 @@ void DigraphView::addRenderedNode(const QString &name,
 }
 
 
-void DigraphView::addRenderedEdge(const QString &/*name1*/, const QString &/*name2*/,
-                                  QMemArray coords)
+void DigraphView::addRenderedEdge(const TQString &/*name1*/, const TQString &/*name2*/,
+                                  TQMemArray coords)
 {
     if (coords.count() < 4)
         return;
@@ -109,15 +109,15 @@ void DigraphView::addRenderedEdge(const QString &/*name1*/, const QString &/*nam
     edge->points.resize(coords.count()/2);
 
     for (uint i = 0; i < edge->points.count(); ++i)
-        edge->points[i] = QPoint(toXPixel(coords[2*i]), toYPixel(coords[2*i+1]));
+        edge->points[i] = TQPoint(toXPixel(coords[2*i]), toYPixel(coords[2*i+1]));
 
     edges.append(edge);
 }
 
 
-void DigraphView::addEdge(const QString &name1, const QString &name2)
+void DigraphView::addEdge(const TQString &name1, const TQString &name2)
 {
-    QString line;
+    TQString line;
     line = "\"";
     line += name1;
     line += "\" -> \"";
@@ -139,9 +139,9 @@ void DigraphView::clear()
 }
 
 
-void DigraphView::setSelected(const QString &name)
+void DigraphView::setSelected(const TQString &name)
 {
-    QPtrListIterator it(nodes);
+    TQPtrListIterator it(nodes);
     for (; it.current(); ++it) {
         if (it.current()->name == name) {
             updateContents(selNode->x-selNode->w/2, selNode->y-selNode->h/2,
@@ -155,21 +155,21 @@ void DigraphView::setSelected(const QString &name)
 }
 
 
-void DigraphView::ensureVisible(const QString &name)
+void DigraphView::ensureVisible(const TQString &name)
 {
-    QPtrListIterator it(nodes);
+    TQPtrListIterator it(nodes);
     for (; it.current(); ++it) {
         if (it.current()->name == name) {
-            QScrollView::ensureVisible((*it)->x, (*it)->y, (*it)->w, (*it)->h);
+            TQScrollView::ensureVisible((*it)->x, (*it)->y, (*it)->w, (*it)->h);
             return;
         }
     }
 }
 
 
-QStringList DigraphView::splitLine(QString str)
+TQStringList DigraphView::splitLine(TQString str)
 {
-    QStringList result;
+    TQStringList result;
 
     while (!str.isEmpty()) {
         if (str[0] == '"') {
@@ -193,11 +193,11 @@ QStringList DigraphView::splitLine(QString str)
 }
 
 
-void DigraphView::parseDotResults(const QStringList &list)
+void DigraphView::parseDotResults(const TQStringList &list)
 {
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for (it = list.begin(); it != list.end(); ++it) {
-        QStringList tokens = splitLine(*it);
+        TQStringList tokens = splitLine(*it);
         if (tokens.count() == 0)
             continue;
         if (tokens[0] == "graph") {
@@ -212,7 +212,7 @@ void DigraphView::parseDotResults(const QStringList &list)
         } else if (tokens[0] == "edge") {
             if (tokens.count() < 8)
                 continue;
-            QMemArray coords(tokens.count()-6);
+            TQMemArray coords(tokens.count()-6);
             for (uint i=0; i != tokens.count()-6; ++i)
                 coords[i] = tokens[i+4].toDouble();
             addRenderedEdge(tokens[1], tokens[2], coords);
@@ -221,22 +221,22 @@ void DigraphView::parseDotResults(const QStringList &list)
 }
 
 
-void DigraphView::process( const QString& file, const QString& ext )
+void DigraphView::process( const TQString& file, const TQString& ext )
 {
-    QString cmd = KGlobal::dirs()->findExe("dot");
+    TQString cmd = KGlobal::dirs()->findExe("dot");
     if (cmd.isEmpty()) {
         KMessageBox::sorry(0, i18n("You do not have 'dot' installed.\nIt can be downloaded from www.graphviz.org."));
         return;
     }
 
-    QStringList results;
+    TQStringList results;
 
     KTempFile ifile, ofile;
-    QTextStream &is = *ifile.textStream();
+    TQTextStream &is = *ifile.textStream();
     is << "digraph G {" << endl;
     is << "rankdir=LR;" << endl;
     is << "node [shape=box,fontname=Helvetica,fontsize=12];" << endl;
-    QStringList::Iterator it;
+    TQStringList::Iterator it;
     for (it = inputs.begin(); it != inputs.end(); ++it)
         is << (*it) << endl;
     is << "}" << endl;
@@ -245,8 +245,8 @@ void DigraphView::process( const QString& file, const QString& ext )
     KProcess proc;
     if( !file.isEmpty() && !ext.isEmpty() )
     {
-        proc << cmd << QString("-T")+ext << ifile.name() << "-o" << file;
-	kdDebug() << "Executing: " << cmd <<" "<update();
 }
 
-void DigraphView::drawContents(QPainter* p, int clipx, int clipy, int clipw, int cliph)
+void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph)
 {
-    QRect clipRect(clipx, clipy, clipw, cliph);
+    TQRect clipRect(clipx, clipy, clipw, cliph);
     p->eraseRect(clipRect);
 
     p->setFont(KGlobalSettings::generalFont());
-    QPtrListIterator it1(nodes);
+    TQPtrListIterator it1(nodes);
     for (; it1.current(); ++it1) {
-        QRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h);
+        TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h);
         if (r.intersects(clipRect)) {
             if (it1.current() == selNode)
-                p->fillRect(r, QBrush(lightGray, SolidPattern));
+                p->fillRect(r, TQBrush(lightGray, SolidPattern));
             else
                 p->drawRect(r);
             p->drawText(r, AlignCenter, (*it1)->name);
         }
     }
-    p->setBrush(QBrush(black, SolidPattern));
-    QPtrListIterator it2(edges);
+    p->setBrush(TQBrush(black, SolidPattern));
+    TQPtrListIterator it2(edges);
     for (; it2.current(); ++it2) {
         int n = (*it2)->points.count();
         for (int i=0; i+3 < n; i+=3)
             {
-                QPointArray a(4);
-                QPointArray &b = (*it2)->points;
+                TQPointArray a(4);
+                TQPointArray &b = (*it2)->points;
                 for (int j=0; j<4; ++j)
                     a.setPoint(j, b.point(i+j));
                 if (a.boundingRect().intersects(clipRect))
                     p->drawCubicBezier((*it2)->points, i);
             }
-        QPoint p1 = (*it2)->points[n-2];
-        QPoint p2 = (*it2)->points[n-1];
-        QPoint d = p1-p2;
+        TQPoint p1 = (*it2)->points[n-2];
+        TQPoint p2 = (*it2)->points[n-1];
+        TQPoint d = p1-p2;
         double l = sqrt(d.x()*d.x()+d.y()*d.y());
         double d11 = (10.0)/l*d.x();
         double d12 = (10.0)/l*d.y();
         double d21 = -(3.0/l)*d.y();
         double d22 = (3.0/l)*d.x();
-        QPointArray triangle(3);
-        triangle[0] = p2 + QPoint((int)(d11+d21),(int)(d12+d22));
-        triangle[1] = p2 + QPoint((int)(d11-d21),(int)(d12-d22));
+        TQPointArray triangle(3);
+        triangle[0] = p2 + TQPoint((int)(d11+d21),(int)(d12+d22));
+        triangle[1] = p2 + TQPoint((int)(d11-d21),(int)(d12-d22));
         triangle[2] = p2;
         p->drawPolygon(triangle, true);
     }
 }
 
 
-void DigraphView::contentsMousePressEvent(QMouseEvent *e)
+void DigraphView::contentsMousePressEvent(TQMouseEvent *e)
 {
-    QPtrListIterator it1(nodes);
+    TQPtrListIterator it1(nodes);
     for (; it1.current(); ++it1) {
-        QRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h);
+        TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h);
         if (r.contains(e->pos())) {
             if (selNode) {
-                QRect oldr(selNode->x-selNode->w/2, selNode->y-selNode->h/2,
+                TQRect oldr(selNode->x-selNode->w/2, selNode->y-selNode->h/2,
                            selNode->w, selNode->h);
                 updateContents(oldr);
             }
@@ -338,21 +338,21 @@ void DigraphView::contentsMousePressEvent(QMouseEvent *e)
 }
 
 
-QSize DigraphView::sizeHint() const
+TQSize DigraphView::sizeHint() const
 {
     if (width == -1)
-        return QSize(100, 100); // arbitrary
+        return TQSize(100, 100); // arbitrary
 
-    QSize dsize = KGlobalSettings::desktopGeometry(viewport()).size();
+    TQSize dsize = KGlobalSettings::desktopGeometry(viewport()).size();
     kdDebug(9003) << "sizehint for inheritance diagram" << dsize << " " << width << " " << height << endl;
-    return QSize(width, height).boundedTo(QSize(dsize.width()*2/3, dsize.height()*2/3));
+    return TQSize(width, height).boundedTo(TQSize(dsize.width()*2/3, dsize.height()*2/3));
 }
 
 
 #if 0
 int main(int argc, char **argv)
 {
-    QApplication app(argc, argv);
+    TQApplication app(argc, argv);
 
     DigraphView *dw = new DigraphView(0, "dot widget");
 dw->addEdge(	"5th Edition", "6th Edition");
diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h
index c5fb2a28..b7215075 100644
--- a/parts/classview/digraphview.h
+++ b/parts/classview/digraphview.h
@@ -12,10 +12,10 @@
 #ifndef _DIGRAPHVIEW_H_
 #define _DIGRAPHVIEW_H_
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 class DigraphNode;
 class DigraphEdge;
@@ -26,40 +26,40 @@ class DigraphView : public QScrollView
     Q_OBJECT
     
 public:
-    DigraphView(QWidget *parent, const char *name);
+    DigraphView(TQWidget *parent, const char *name);
     ~DigraphView();
 
-    void addEdge(const QString &name1, const QString &name2);
-    void process(const QString& file = "", const QString& ext = "");
+    void addEdge(const TQString &name1, const TQString &name2);
+    void process(const TQString& file = "", const TQString& ext = "");
     void clear();
-    void setSelected(const QString &name);
-    void ensureVisible(const QString &name);
+    void setSelected(const TQString &name);
+    void ensureVisible(const TQString &name);
     
 signals:
-    void selected(const QString &name);
+    void selected(const TQString &name);
 
 protected:
-    virtual void drawContents(QPainter* p, int clipx, int clipy, int clipw, int cliph);
-    virtual void contentsMousePressEvent(QMouseEvent *e);
-    virtual QSize sizeHint() const;
+    virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph);
+    virtual void contentsMousePressEvent(TQMouseEvent *e);
+    virtual TQSize sizeHint() const;
 
 private:
     int toXPixel(double x);
     int toYPixel(double x);
 
     void setRenderedExtent(double w, double h);
-    void addRenderedNode(const QString &name,
+    void addRenderedNode(const TQString &name,
                          double x, double y, double w, double h);
-    void addRenderedEdge(const QString &name1, const QString &name2,
-                         QMemArray coords);
-    static QStringList splitLine(QString str);
-    void parseDotResults(const QStringList &list);
+    void addRenderedEdge(const TQString &name1, const TQString &name2,
+                         TQMemArray coords);
+    static TQStringList splitLine(TQString str);
+    void parseDotResults(const TQStringList &list);
     
     double xscale, yscale;
     int width, height;
-    QStringList inputs;
-    QPtrList nodes;
-    QPtrList edges;
+    TQStringList inputs;
+    TQPtrList nodes;
+    TQPtrList edges;
     DigraphNode *selNode;
 };
 
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index 21a54031..a1f2c763 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -22,11 +22,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "kdevlanguagesupport.h"
 #include "kcomboview.h"
@@ -38,25 +38,25 @@
 
 
 HierarchyDialog::HierarchyDialog( ClassViewPart *part )
-    : QDialog(0, "hierarchy dialog", false)
+    : TQDialog(0, "hierarchy dialog", false)
 {
     class_combo = new KComboView(true, 150, this);
-    class_combo->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+    class_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
 //    class_combo->setMinimumWidth(150);
     namespace_combo = new KComboView(true, 150, this);
-    namespace_combo->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+    namespace_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
 //    namespace_combo->setMinimumWidth(150);
 
-    QPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
-    QPushButton *save_button = new KPushButton(KStdGuiItem::save(), this);
-    QPushButton *refresh_button = new KPushButton(i18n("Refresh"), this);
+    TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
+    TQPushButton *save_button = new KPushButton(KStdGuiItem::save(), this);
+    TQPushButton *refresh_button = new KPushButton(i18n("Refresh"), this);
 
-    QSplitter *splitter = new QSplitter(Vertical, this);
+    TQSplitter *splitter = new TQSplitter(Vertical, this);
     digraph = new DigraphView(splitter, "digraph view");
 //    member_tree = new ClassToolWidget(part, splitter);
 
-    QBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    QBoxLayout *combo_layout = new QHBoxLayout();
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQBoxLayout *combo_layout = new TQHBoxLayout();
     layout->addLayout(combo_layout);
     combo_layout->addWidget(namespace_combo);
     combo_layout->addWidget(class_combo);
@@ -66,22 +66,22 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
     combo_layout->addWidget(close_button);
     layout->addWidget(splitter);
 
-    connect( namespace_combo, SIGNAL(activated(QListViewItem*)),
-             this, SLOT(slotNamespaceComboChoice(QListViewItem*)) );
-    connect( class_combo, SIGNAL(activated(QListViewItem*)),
-             this, SLOT(slotClassComboChoice(QListViewItem*)) );
-    connect( namespace_combo, SIGNAL(textChanged(const QString&)),
-             this, SLOT(slotNamespaceComboChoice(const QString&)) );
-    connect( class_combo, SIGNAL(textChanged(const QString&)),
-             this, SLOT(slotClassComboChoice(const QString&)) );
-    connect( close_button, SIGNAL(clicked()),
-             this, SLOT(hide()) );
-    connect( save_button, SIGNAL(clicked()),
-             this, SLOT(save()) );
-    connect( refresh_button, SIGNAL(clicked()),
-             this, SLOT(refresh()) );
-    connect( digraph, SIGNAL(selected(const QString&)),
-             this, SLOT(classSelected(const QString&)) );
+    connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)),
+             this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) );
+    connect( class_combo, TQT_SIGNAL(activated(TQListViewItem*)),
+             this, TQT_SLOT(slotClassComboChoice(TQListViewItem*)) );
+    connect( namespace_combo, TQT_SIGNAL(textChanged(const TQString&)),
+             this, TQT_SLOT(slotNamespaceComboChoice(const TQString&)) );
+    connect( class_combo, TQT_SIGNAL(textChanged(const TQString&)),
+             this, TQT_SLOT(slotClassComboChoice(const TQString&)) );
+    connect( close_button, TQT_SIGNAL(clicked()),
+             this, TQT_SLOT(hide()) );
+    connect( save_button, TQT_SIGNAL(clicked()),
+             this, TQT_SLOT(save()) );
+    connect( refresh_button, TQT_SIGNAL(clicked()),
+             this, TQT_SLOT(refresh()) );
+    connect( digraph, TQT_SIGNAL(selected(const TQString&)),
+             this, TQT_SLOT(classSelected(const TQString&)) );
 
     m_part = part;
 //    m_part->registerHierarchyDialog(this);
@@ -96,33 +96,33 @@ HierarchyDialog::~HierarchyDialog()
 
 void HierarchyDialog::save()
 {
-    KURLRequesterDlg dlg(QString::null, this, "save_inheritance");
+    KURLRequesterDlg dlg(TQString::null, this, "save_inheritance");
     dlg.fileDialog()->setFilter("image/png image/jpeg image/bmp image/svg+xml");
     dlg.fileDialog()->setOperationMode( KFileDialog::Saving );
     dlg.fileDialog()->setMode( KFile::File | KFile::LocalOnly );
     dlg.urlRequester()->setMode( KFile::File | KFile::LocalOnly );
     if(dlg.exec() && dlg.selectedURL().isLocalFile())
     {
-	QFileInfo fi(dlg.selectedURL().pathOrURL());
-        QApplication::setOverrideCursor( Qt::waitCursor );
+	TQFileInfo fi(dlg.selectedURL().pathOrURL());
+        TQApplication::setOverrideCursor( Qt::waitCursor );
         KDevLanguageSupport *ls = m_part->languageSupport();
-        for (QMap::const_iterator it = classes.begin(); it != classes.end(); ++it)
+        for (TQMap::const_iterator it = classes.begin(); it != classes.end(); ++it)
         {
             kdDebug(9003) << "Adding class to graph: " << it.key() << endl;
-            QString formattedName = ls->formatClassName(it.key());
-            QStringList baseClasses = it.data()->baseClassList();
-            for (QStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit)
+            TQString formattedName = ls->formatClassName(it.key());
+            TQStringList baseClasses = it.data()->baseClassList();
+            for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit)
             {
-                QMap::const_iterator baseIt = uclasses.find(*bit);
+                TQMap::const_iterator baseIt = uclasses.find(*bit);
                 if (baseIt != uclasses.end())
                 {
-                    QString formattedParentName = ls->formatClassName(baseIt.data());
+                    TQString formattedParentName = ls->formatClassName(baseIt.data());
                     digraph->addEdge(formattedParentName, formattedName);
                 }
             }
         }
         digraph->process(fi.absFilePath(), fi.extension());
-        QApplication::restoreOverrideCursor();
+        TQApplication::restoreOverrideCursor();
     }
 }
 
@@ -136,17 +136,17 @@ void HierarchyDialog::refresh()
 
     KDevLanguageSupport *ls = m_part->languageSupport();
 
-    for (QMap::const_iterator it = classes.begin(); it != classes.end(); ++it)
+    for (TQMap::const_iterator it = classes.begin(); it != classes.end(); ++it)
     {
         kdDebug(9003) << "Adding class to graph: " << it.key() << endl;
-        QString formattedName = ls->formatClassName(it.key());
-        QStringList baseClasses = it.data()->baseClassList();
-        for (QStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit)
+        TQString formattedName = ls->formatClassName(it.key());
+        TQStringList baseClasses = it.data()->baseClassList();
+        for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit)
         {
-            QMap::const_iterator baseIt = uclasses.find(*bit);
+            TQMap::const_iterator baseIt = uclasses.find(*bit);
             if (baseIt != uclasses.end())
             {
-                QString formattedParentName = ls->formatClassName(baseIt.data());
+                TQString formattedParentName = ls->formatClassName(baseIt.data());
                 digraph->addEdge(formattedParentName, formattedName);
             }
         }
@@ -157,13 +157,13 @@ void HierarchyDialog::refresh()
 void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls)
 {
     if (ls)
-        connect(ls, SIGNAL(updatedSourceInfo()), this, SLOT(refresh()));
+        connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh()));
     else
         refresh();
 }
 
 
-void HierarchyDialog::slotClassComboChoice(QListViewItem * item)
+void HierarchyDialog::slotClassComboChoice(TQListViewItem * item)
 {
     ClassItem *ci = dynamic_cast(item);
     if (!ci)
@@ -171,15 +171,15 @@ void HierarchyDialog::slotClassComboChoice(QListViewItem * item)
 
     KDevLanguageSupport *ls = m_part->languageSupport();
 
-    QString className = ls->formatClassName(uclasses[item->text(0)]);
+    TQString className = ls->formatClassName(uclasses[item->text(0)]);
     digraph->setSelected(className);
     digraph->ensureVisible(className);
     classSelected(className);
 }
 
-void HierarchyDialog::slotClassComboChoice( const QString& itemText )
+void HierarchyDialog::slotClassComboChoice( const TQString& itemText )
 {
-    QListViewItem* item = class_combo->listView()->firstChild();
+    TQListViewItem* item = class_combo->listView()->firstChild();
     while( item )
     {
         if( item->text(0) == itemText )
@@ -190,7 +190,7 @@ void HierarchyDialog::slotClassComboChoice( const QString& itemText )
         
             KDevLanguageSupport *ls = m_part->languageSupport();
         
-            QString className = ls->formatClassName(uclasses[item->text(0)]);
+            TQString className = ls->formatClassName(uclasses[item->text(0)]);
             digraph->setSelected(className);
             digraph->ensureVisible(className);
             classSelected(className);
@@ -200,7 +200,7 @@ void HierarchyDialog::slotClassComboChoice( const QString& itemText )
     }
 }
 
-void HierarchyDialog::classSelected(const QString &/*className*/)
+void HierarchyDialog::classSelected(const TQString &/*className*/)
 {
 /*    ParsedClass *currentClass = m_part->classStore()->getClassByName(className);
     member_tree->clear();
@@ -213,7 +213,7 @@ void HierarchyDialog::classSelected(const QString &/*className*/)
     }*/
 }
 
-void HierarchyDialog::slotNamespaceComboChoice( QListViewItem * item )
+void HierarchyDialog::slotNamespaceComboChoice( TQListViewItem * item )
 {
     NamespaceItem *ni = dynamic_cast(item);
     if (!ni)
@@ -221,9 +221,9 @@ void HierarchyDialog::slotNamespaceComboChoice( QListViewItem * item )
     ViewCombosOp::refreshClasses(m_part, class_combo, ni->dom()->name());
 }
 
-void HierarchyDialog::slotNamespaceComboChoice( const QString& itemText )
+void HierarchyDialog::slotNamespaceComboChoice( const TQString& itemText )
 {
-    QListViewItem* item = namespace_combo->listView()->firstChild();
+    TQListViewItem* item = namespace_combo->listView()->firstChild();
     while( item )
     {
         if( item->text(0) == itemText )
@@ -238,11 +238,11 @@ void HierarchyDialog::slotNamespaceComboChoice( const QString& itemText )
     }
 }
 
-void HierarchyDialog::processNamespace( QString prefix, NamespaceDom dom )
+void HierarchyDialog::processNamespace( TQString prefix, NamespaceDom dom )
 {
     qWarning("processNamespace: prefix %s", prefix.latin1());
-    QString prefixInc = prefix.isEmpty() ? "" : ".";
-//    QString nsprefix = dom->name().isEmpty() ? QString("") : prefixInc + dom->name();
+    TQString prefixInc = prefix.isEmpty() ? "" : ".";
+//    TQString nsprefix = dom->name().isEmpty() ? TQString("") : prefixInc + dom->name();
 
     NamespaceList namespaceList = dom->namespaceList();
     for (NamespaceList::const_iterator it = namespaceList.begin(); it != namespaceList.end(); ++it)
@@ -258,11 +258,11 @@ void HierarchyDialog::processNamespace( QString prefix, NamespaceDom dom )
     }
 }
 
-void HierarchyDialog::processClass( QString prefix, ClassDom dom )
+void HierarchyDialog::processClass( TQString prefix, ClassDom dom )
 {
     qWarning("processClass: prefix %s class %s", prefix.latin1(), dom->name().latin1());
 
-    QString prefixInc = prefix.isEmpty() ? "" : ".";
+    TQString prefixInc = prefix.isEmpty() ? "" : ".";
     classes[prefix + prefixInc + dom->name()] = dom;
     uclasses[dom->name()] = prefix + prefixInc + dom->name();
 
diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h
index 82cf2d4a..79a6d470 100644
--- a/parts/classview/hierarchydlg.h
+++ b/parts/classview/hierarchydlg.h
@@ -12,7 +12,7 @@
 #ifndef _HIERARCHYDLG_H_
 #define _HIERARCHYDLG_H_
 
-#include 
+#include 
 
 #include "codemodel.h"
 
@@ -35,21 +35,21 @@ public slots:
 
 private slots:
     void setLanguageSupport(KDevLanguageSupport *ls);
-    void slotClassComboChoice(QListViewItem *item);
-    void slotNamespaceComboChoice(QListViewItem *item);
-    void slotClassComboChoice(const QString&);
-    void slotNamespaceComboChoice(const QString&);
-    void classSelected(const QString &className);
+    void slotClassComboChoice(TQListViewItem *item);
+    void slotNamespaceComboChoice(TQListViewItem *item);
+    void slotClassComboChoice(const TQString&);
+    void slotNamespaceComboChoice(const TQString&);
+    void classSelected(const TQString &className);
     void save();
 
 private:
-    void processNamespace(QString prefix, NamespaceDom dom);
-    void processClass(QString prefix, ClassDom dom);
+    void processNamespace(TQString prefix, NamespaceDom dom);
+    void processClass(TQString prefix, ClassDom dom);
 
-    QMap classes;
-    //QMap
+    TQMap classes;
+    //TQMap
     //like MyClass - MyNamespace.MyClass
-    QMap uclasses;
+    TQMap uclasses;
 
     KComboView *namespace_combo;
     KComboView *class_combo;
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index 596b5786..fa83a4ff 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "navigator.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -46,10 +46,10 @@
 namespace
 {
     template
-    QValueList QValueList_reversed ( const QValueList & list )
+    TQValueList QValueList_reversed ( const TQValueList & list )
     {
-        QValueList rList;
-        typename QValueList::ConstIterator it = list.begin();
+        TQValueList rList;
+        typename TQValueList::ConstIterator it = list.begin();
         while ( it != list.end() )
         {
             rList.push_front ( *it );
@@ -61,7 +61,7 @@ namespace
 
 struct NavOp
 {
-   NavOp(Navigator *navigator, const QString &fullName)
+   NavOp(Navigator *navigator, const TQString &fullName)
        :m_navigator(navigator), m_fullName(fullName) {}
 
    bool operator() ( const FunctionDefinitionDom& def ) const
@@ -75,7 +75,7 @@ struct NavOp
 
 private:
     Navigator *m_navigator;
-    QString m_fullName;
+    TQString m_fullName;
 };
 
 
@@ -85,9 +85,9 @@ private:
 public:
     enum Type { Declaration, Definition };
 
-    FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, QListView *parent, QString name, Type type)
+    FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *parent, TQString name, Type type)
         :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {}
-    FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, QListViewItem *parent, QString name, Type type)
+    FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *parent, TQString name, Type type)
         :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {}
     ~FunctionNavItem() {}
 
@@ -105,31 +105,31 @@ private:
 
 
 Navigator::Navigator(ClassViewPart *parent, const char *name)
- : QObject(parent, name), m_part(parent)
+ : TQObject(parent, name), m_part(parent)
 {
     m_state = GoToDefinitions;
     m_navNoDefinition = true;
 
     m_actionSyncWithEditor = new KAction( i18n("Sync ClassView"), "view_tree", KShortcut(), this,
-        SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" );
+        TQT_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" );
 
     KAction * action = new KAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this,
-        SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" );
+        TQT_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" );
     action->plug( &m_dummyActionWidget );
 
     action = new KAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this,
-        SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" );
+        TQT_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" );
     action->plug( &m_dummyActionWidget );
 
-    m_syncTimer = new QTimer(this);
-    connect(m_syncTimer, SIGNAL(timeout()), this, SLOT(syncFunctionNav()));
+    m_syncTimer = new TQTimer(this);
+    connect(m_syncTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(syncFunctionNav()));
 }
 
 Navigator::~Navigator()
 {
 }
 
-void Navigator::selectFunctionNav(QListViewItem *item)
+void Navigator::selectFunctionNav(TQListViewItem *item)
 {
     FunctionNavItem *nav = dynamic_cast(item);
     if (!nav)
@@ -247,7 +247,7 @@ void Navigator::syncFunctionNav()
         m_part->m_functionsnav->view()->setCurrentText(NAV_NODEFINITION);
 }
 
-void Navigator::refreshNavBars(const QString &activeFileName, bool clear)
+void Navigator::refreshNavBars(const TQString &activeFileName, bool clear)
 {
     kdDebug(9003) << k_funcinfo << endl;
     if (clear)
@@ -261,13 +261,13 @@ void Navigator::refreshNavBars(const QString &activeFileName, bool clear)
     if (!file)
         return;
 
-    QStringList toLeave;
+    TQStringList toLeave;
 
     FunctionList list1 = CodeModelUtils::allFunctionsExhaustive(file);
     FunctionList::const_iterator flEnd = list1.end();
     for (FunctionList::const_iterator it = list1.begin(); it != flEnd; ++it)
     {
-        QString fullName = fullFunctionDeclarationName(*it);
+        TQString fullName = fullFunctionDeclarationName(*it);
 
         if (clear || !m_functionNavDecls[fullName] && m_part->m_functionsnav->view()->listView())
         {
@@ -284,10 +284,10 @@ void Navigator::refreshNavBars(const QString &activeFileName, bool clear)
     kdDebug(9003) << k_funcinfo << "leave list: " << toLeave << endl;
 
     //remove items not in toLeave list
-    QMap::iterator it = m_functionNavDecls.begin();
+    TQMap::iterator it = m_functionNavDecls.begin();
     while ( it != m_functionNavDecls.end() )
     {
-        QMap::iterator it2 = it;
+        TQMap::iterator it2 = it;
         ++it;
         if ( !toLeave.contains( it2.key() ) )
         {
@@ -303,7 +303,7 @@ void Navigator::refreshNavBars(const QString &activeFileName, bool clear)
     FunctionDefinitionList list = CodeModelUtils::allFunctionDefinitionsExhaustive(file);
     for (FunctionDefinitionList::const_iterator it = list.begin(); it != list.end(); ++it)
     {
-        QString fullName = fullFunctionDefinitionName(*it);
+        TQString fullName = fullFunctionDefinitionName(*it);
 
         if (clear || !m_functionNavDefs[fullName])
         {
@@ -326,10 +326,10 @@ void Navigator::refreshNavBars(const QString &activeFileName, bool clear)
 
     kdDebug(9003) << k_funcinfo << "leave list: " << toLeave << endl;
     //remove items not in toLeave list
-    QMap::iterator itt = m_functionNavDefs.begin();
+    TQMap::iterator itt = m_functionNavDefs.begin();
     while ( itt != m_functionNavDefs.end() )
     {
-        QMap::iterator it2 = itt;
+        TQMap::iterator it2 = itt;
         ++itt;
         if ( !toLeave.contains( it2.key() ) )
         {
@@ -347,7 +347,7 @@ void Navigator::refresh()
     refreshNavBars(m_part->m_activeFileName, true);
 }
 
-void Navigator::addFile(const QString & file)
+void Navigator::addFile(const TQString & file)
 {
     kdDebug(9003) << k_funcinfo << "file: " << file << endl;
     if (file == m_part->m_activeFileName)
@@ -374,16 +374,16 @@ FunctionDom Navigator::currentFunction()
 
 ///Some time this might be moved into the language-support-part, so each language
 ///can highlight as it likes
-TextPaintItem highlightFunctionName(QString function, int type, TextPaintStyleStore& styles) {
+TextPaintItem highlightFunctionName(TQString function, int type, TextPaintStyleStore& styles) {
     TextPaintItem ret;
 
     if( !styles.hasStyle( type ) ) {
-        QFont font = styles.getStyle( 0 ).font;
+        TQFont font = styles.getStyle( 0 ).font;
 
         switch(type) {
             case 1:
             default:
-                font.setWeight( QFont::DemiBold );
+                font.setWeight( TQFont::DemiBold );
                 ///since bold makes the font a little bigger, make it smaller again
 #ifdef BOLDFONTSMALLER
                 font.setPointSize( (font.pointSize() * 9) / 10 );
@@ -393,8 +393,8 @@ TextPaintItem highlightFunctionName(QString function, int type, TextPaintStyleSt
         styles.addStyle( type, font );
     }
 
-    QString args;
-    QString fScope;
+    TQString args;
+    TQString fScope;
     int cutpos;
 
     if((cutpos = function.find('(')) != -1) {
@@ -419,8 +419,8 @@ template 
 TextPaintItem Navigator::fullFunctionItem(DomType fun)
 {
 
-    QStringList scope = fun->scope();
-    QString function = scope.join(".");
+    TQStringList scope = fun->scope();
+    TQString function = scope.join(".");
     if (!function.isEmpty())
         function += ".";
     function += m_part->languageSupport()->formatModelItem(fun, true);
@@ -429,10 +429,10 @@ TextPaintItem Navigator::fullFunctionItem(DomType fun)
     return highlightFunctionName(function, 1, m_styles);
 }
 
-QString Navigator::fullFunctionDefinitionName(FunctionDefinitionDom fun)
+TQString Navigator::fullFunctionDefinitionName(FunctionDefinitionDom fun)
 {
-    QStringList scope = fun->scope();
-    QString funName = scope.join(".");
+    TQStringList scope = fun->scope();
+    TQString funName = scope.join(".");
     if (!funName.isEmpty())
         funName += ".";
     funName += m_part->languageSupport()->formatModelItem(fun, true);
@@ -441,10 +441,10 @@ QString Navigator::fullFunctionDefinitionName(FunctionDefinitionDom fun)
     return funName;
 }
 
-QString Navigator::fullFunctionDeclarationName(FunctionDom fun)
+TQString Navigator::fullFunctionDeclarationName(FunctionDom fun)
 {
-    QStringList scope = fun->scope();
-    QString funName = scope.join(".");
+    TQStringList scope = fun->scope();
+    TQString funName = scope.join(".");
     if (!funName.isEmpty())
         funName += ".";
     funName += m_part->languageSupport()->formatModelItem(fun, true);
@@ -474,10 +474,10 @@ void Navigator::slotJumpToNextFunction()
     unsigned int currentLine, currentCol;
     m_part->m_activeViewCursor->cursorPositionReal ( ¤tLine, ¤tCol );
 
-    QValueList lines = functionStartLines();
+    TQValueList lines = functionStartLines();
     if ( lines.isEmpty() ) return;
 
-    QValueList::iterator it = lines.begin();
+    TQValueList::iterator it = lines.begin();
     while ( it != lines.end() )
     {
         if ( *it > currentLine )
@@ -499,10 +499,10 @@ void Navigator::slotJumpToPreviousFunction()
     unsigned int currentLine, currentCol;
     m_part->m_activeViewCursor->cursorPositionReal ( ¤tLine, ¤tCol );
 
-    QValueList lines = QValueList_reversed ( functionStartLines() );
+    TQValueList lines = QValueList_reversed ( functionStartLines() );
     if ( lines.isEmpty() ) return;
 
-    QValueList::iterator it = lines.begin();
+    TQValueList::iterator it = lines.begin();
     while ( it != lines.end() )
     {
         if ( *it < currentLine )
@@ -516,12 +516,12 @@ void Navigator::slotJumpToPreviousFunction()
     }
 }
 
-QValueList Navigator::functionStartLines()
+TQValueList Navigator::functionStartLines()
 {
     FileDom file = m_part->codeModel()->fileByName ( m_part->m_activeFileName );
-    if ( !file ) return QValueList();
+    if ( !file ) return TQValueList();
 
-    QValueList lines;
+    TQValueList lines;
     FunctionDefinitionList list = CodeModelUtils::allFunctionDefinitionsExhaustive ( file );
     FunctionDefinitionList::const_iterator it = list.begin();
     while ( it != list.end() )
diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h
index 6953c55d..48470f19 100644
--- a/parts/classview/navigator.h
+++ b/parts/classview/navigator.h
@@ -20,9 +20,9 @@
 #ifndef NAVIGATOR_H
 #define NAVIGATOR_H
 
-#include 
+#include 
 #include 
-#include 
+#include 
 #include 
 
 class TextPaintStyleStore;
@@ -34,7 +34,7 @@ class KAction;
 #define NAV_NODEFINITION "(no function)"
 
 class TextPaintItem;
-TextPaintItem highlightFunctionName( QString function, int type, TextPaintStyleStore& styles );
+TextPaintItem highlightFunctionName( TQString function, int type, TextPaintStyleStore& styles );
 
 class Navigator : public QObject
 {
@@ -46,23 +46,23 @@ public:
     ~Navigator();
 
     void stopTimer();
-    void refreshNavBars(const QString &activeFileName, bool clear = true);
+    void refreshNavBars(const TQString &activeFileName, bool clear = true);
 
-    QString fullFunctionDefinitionName(FunctionDefinitionDom fun);
-    QString fullFunctionDeclarationName(FunctionDom fun);
+    TQString fullFunctionDefinitionName(FunctionDefinitionDom fun);
+    TQString fullFunctionDeclarationName(FunctionDom fun);
 
     template 
     TextPaintItem fullFunctionItem(DomType fun);
     
 public slots:
-    void selectFunctionNav(QListViewItem *item);
+    void selectFunctionNav(TQListViewItem *item);
     void syncFunctionNav();
     void syncFunctionNavDelayed(int delay);
     void functionNavFocused();
     void functionNavUnFocused();
     void slotCursorPositionChanged();
     void refresh();
-    void addFile(const QString &file);
+    void addFile(const TQString &file);
     void slotSyncWithEditor();
     void slotJumpToNextFunction();
     void slotJumpToPreviousFunction();
@@ -70,20 +70,20 @@ public slots:
 protected:
 
     FunctionDom currentFunction();
-    QValueList functionStartLines();
+    TQValueList functionStartLines();
 
 private:
     ClassViewPart *m_part;
-    QTimer *m_syncTimer;
+    TQTimer *m_syncTimer;
     NavigationState m_state;
 
-    QWidget m_dummyActionWidget;
+    TQWidget m_dummyActionWidget;
     KAction* m_actionSyncWithEditor;
 
     bool m_navNoDefinition;
 
-    QMap m_functionNavDefs;
-    QMap m_functionNavDecls;
+    TQMap m_functionNavDefs;
+    TQMap m_functionNavDecls;
     
     TextPaintStyleStore m_styles;
 };
diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp
index 63e861c6..bb7bf01d 100644
--- a/parts/classview/viewcombos.cpp
+++ b/parts/classview/viewcombos.cpp
@@ -27,13 +27,13 @@
 #include "viewcombos.h"
 #include "classviewpart.h"
 
-NamespaceItem::NamespaceItem(ClassViewPart *part, QListView *parent, QString name, NamespaceDom dom)
-    :QListViewItem(parent, name), m_dom(dom), m_part(part)
+NamespaceItem::NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom)
+    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
 {
 }
 
-NamespaceItem::NamespaceItem(ClassViewPart *part, QListViewItem *parent, QString name, NamespaceDom dom)
-    :QListViewItem(parent, name), m_dom(dom), m_part(part)
+NamespaceItem::NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom)
+    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
 {
 }
 
@@ -48,18 +48,18 @@ NamespaceDom NamespaceItem::dom() const
 
 void NamespaceItem::setup()
 {
-    QListViewItem::setup();
+    TQListViewItem::setup();
     setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, m_part->instance()) );
 }
 
 
-ClassItem::ClassItem(ClassViewPart *part, QListView *parent, QString name, ClassDom dom)
-    :QListViewItem(parent, name), m_dom(dom), m_part(part)
+ClassItem::ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom)
+    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
 {
 }
 
-ClassItem::ClassItem(ClassViewPart *part, QListViewItem *parent, QString name, ClassDom dom)
-    :QListViewItem(parent, name), m_dom(dom), m_part(part)
+ClassItem::ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom)
+    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
 {
 }
 
@@ -74,18 +74,18 @@ ClassDom ClassItem::dom() const
 
 void ClassItem::setup()
 {
-    QListViewItem::setup();
+    TQListViewItem::setup();
     setPixmap( 0, UserIcon("CVclass", KIcon::DefaultState, m_part->instance()) );
 }
 
 
-FunctionItem::FunctionItem(ClassViewPart *part, QListView *parent, QString name, FunctionDom dom)
-    :QListViewItem(parent, name), m_dom(dom), m_part(part)
+FunctionItem::FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom)
+    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
 {
 }
 
-FunctionItem::FunctionItem(ClassViewPart *part, QListViewItem *parent, QString name, FunctionDom dom)
-    :QListViewItem(parent, name), m_dom(dom), m_part(part)
+FunctionItem::FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom)
+    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
 {
 }
 
@@ -100,8 +100,8 @@ FunctionDom FunctionItem::dom() const
 
 void FunctionItem::setup()
 {
-    QListViewItem::setup();
-    QString iconName;
+    TQListViewItem::setup();
+    TQString iconName;
     if( m_dom->access() == CodeModelItem::Private )
         iconName = "CVprivate_meth";
     else if( m_dom->access() == CodeModelItem::Protected )
@@ -131,7 +131,7 @@ void refreshNamespaces(ClassViewPart *part, KComboView *view)
     view->setCurrentActiveItem(global_item);
 }
 
-void refreshClasses(ClassViewPart *part, KComboView *view, const QString &dom)
+void refreshClasses(ClassViewPart *part, KComboView *view, const TQString &dom)
 {
     view->clear();
 
@@ -168,7 +168,7 @@ void refreshFunctions(ClassViewPart *part, KComboView *view, const ClassDom & do
     }
 }
 
-void refreshFunctions(ClassViewPart *part, KComboView *view, const QString & dom)
+void refreshFunctions(ClassViewPart *part, KComboView *view, const TQString & dom)
 {
     view->clear();
 
@@ -194,7 +194,7 @@ void refreshFunctions(ClassViewPart *part, KComboView *view, const QString & dom
 
 }
 
-NamespaceDom ViewCombosOp::namespaceByName( NamespaceDom dom, QString name )
+NamespaceDom ViewCombosOp::namespaceByName( NamespaceDom dom, TQString name )
 {
     NamespaceDom result;
 
diff --git a/parts/classview/viewcombos.h b/parts/classview/viewcombos.h
index 7c63ccd8..7525a5d8 100644
--- a/parts/classview/viewcombos.h
+++ b/parts/classview/viewcombos.h
@@ -22,20 +22,20 @@
 
 #include 
 
-#include 
+#include 
 
 #include "codemodel.h"
 
 class ClassViewPart;
 class KComboView;
 
-const QString EmptyClasses = i18n("(Classes)");
-const QString EmptyFunctions = i18n("(Functions)");
+const TQString EmptyClasses = i18n("(Classes)");
+const TQString EmptyFunctions = i18n("(Functions)");
 
 class NamespaceItem: public QListViewItem{
 public:
-    NamespaceItem(ClassViewPart *part, QListView *parent, QString name, NamespaceDom dom);
-    NamespaceItem(ClassViewPart *part, QListViewItem *parent, QString name, NamespaceDom dom);
+    NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom);
+    NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom);
     ~NamespaceItem();
     NamespaceDom dom() const;
     virtual void setup();
@@ -46,8 +46,8 @@ private:
 
 class ClassItem: public QListViewItem{
 public:
-    ClassItem(ClassViewPart *part, QListView *parent, QString name, ClassDom dom);
-    ClassItem(ClassViewPart *part, QListViewItem *parent, QString name, ClassDom dom);
+    ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom);
+    ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom);
     ~ClassItem();
     ClassDom dom() const;
     virtual void setup();
@@ -58,8 +58,8 @@ private:
 
 class FunctionItem: public QListViewItem{
 public:
-    FunctionItem(ClassViewPart *part, QListView *parent, QString name, FunctionDom dom);
-    FunctionItem(ClassViewPart *part, QListViewItem *parent, QString name, FunctionDom dom);
+    FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom);
+    FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom);
     ~FunctionItem();
     FunctionDom dom() const;
     virtual void setup();
@@ -73,11 +73,11 @@ namespace ViewCombosOp{
 enum ProcessType {Refresh, Reload};
 
 void refreshNamespaces(ClassViewPart *part, KComboView *view);
-void refreshClasses(ClassViewPart *part, KComboView *view, const QString &dom);
+void refreshClasses(ClassViewPart *part, KComboView *view, const TQString &dom);
 void refreshFunctions(ClassViewPart *part, KComboView *view, const ClassDom & dom);
-void refreshFunctions(ClassViewPart *part, KComboView *view, const QString & dom);
+void refreshFunctions(ClassViewPart *part, KComboView *view, const TQString & dom);
 
-NamespaceDom namespaceByName(NamespaceDom dom, QString name);
+NamespaceDom namespaceByName(NamespaceDom dom, TQString name);
 
 }
 
diff --git a/parts/ctags2/ctags2_createtagfile.cpp b/parts/ctags2/ctags2_createtagfile.cpp
index b1ced0dd..5193d8cd 100644
--- a/parts/ctags2/ctags2_createtagfile.cpp
+++ b/parts/ctags2/ctags2_createtagfile.cpp
@@ -16,7 +16,7 @@
 #include "ctags2_part.h"
 
 
-CreateTagFile::CreateTagFile(QWidget* parent, const char* name, bool modal, WFlags fl)
+CreateTagFile::CreateTagFile(TQWidget* parent, const char* name, bool modal, WFlags fl)
 : CTags2CreateTagFileBase( parent, name, modal, fl )
 {
 	dirToTag->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
@@ -35,17 +35,17 @@ void CreateTagFile::validate()
 	createTagFileButton->setEnabled( valid );
 }
 
-QString CreateTagFile::name( )
+TQString CreateTagFile::name( )
 {
 	return displayName->text();
 }
 
-QString CreateTagFile::tagsfilePath( )
+TQString CreateTagFile::tagsfilePath( )
 {
 	return newTagFilePath->url();
 }
 
-QString CreateTagFile::directory( )
+TQString CreateTagFile::directory( )
 {
 	return dirToTag->url();
 }
diff --git a/parts/ctags2/ctags2_createtagfile.h b/parts/ctags2/ctags2_createtagfile.h
index 93b530d4..068c1815 100644
--- a/parts/ctags2/ctags2_createtagfile.h
+++ b/parts/ctags2/ctags2_createtagfile.h
@@ -21,11 +21,11 @@ class CreateTagFile : public CTags2CreateTagFileBase {
 Q_OBJECT
 
 public:
-	CreateTagFile(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	CreateTagFile(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~CreateTagFile();
-	QString name();
-	QString tagsfilePath();
-	QString directory();
+	TQString name();
+	TQString tagsfilePath();
+	TQString directory();
 
 private:
 
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 29b564e6..b05a12a4 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -58,41 +58,41 @@ typedef KDevGenericFactory CTags2Factory;
 static const KDevPluginInfo data("kdevctags2");
 K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) )
 
-CTags2Part::CTags2Part(QObject *parent, const char *name, const QStringList& )
+CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& )
   : KDevPlugin(&data, parent, name ? name : "ctags2Part" )
 {
 	setInstance(CTags2Factory::instance());
 	setXMLFile("kdevpart_ctags2.rc");
 
-	QDomDocument & dom = *projectDom();
-	QString customTagFile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" );
+	TQDomDocument & dom = *projectDom();
+	TQString customTagFile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" );
 	if ( customTagFile.isEmpty() )
 	{
 		customTagFile =  project()->projectDirectory() + "/tags";
 	}
-	QStringList tagFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file");
+	TQStringList tagFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file");
 	tagFiles.push_front(customTagFile);
 
 	Tags::setTagFiles(tagFiles);
 
 	m_widget = new CTags2Widget(this);
 
-	QWhatsThis::add(m_widget, i18n("CTags
    Result view for a tag lookup. Click a line to go to the corresponding place in the code."));
+	TQWhatsThis::add(m_widget, i18n("CTags
    Result view for a tag lookup. Click a line to go to the corresponding place in the code."));
 	m_widget->setCaption(i18n("CTags Lookup"));
 	mainWindow()->embedOutputView( m_widget, i18n( "CTags" ), i18n( "CTags lookup results" ) );
 
-	connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
+	connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createProjectConfigPage( i18n("CTags"), CTAGSSETTINGSPAGE, info()->icon() );
-	connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )),
-		this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) );
-
-	new KAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut");
-	new KAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut");
-	new KAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut");
-	new KAction( i18n("Jump to Next Match"), 0, 0, this, SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next");
-	new KAction( i18n("Open Lookup Dialog"), 0, 0, this, SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut");
+	connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
+
+	new KAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQT_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut");
+	new KAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQT_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut");
+	new KAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQT_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut");
+	new KAction( i18n("Jump to Next Match"), 0, 0, this, TQT_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next");
+	new KAction( i18n("Open Lookup Dialog"), 0, 0, this, TQT_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut");
 }
 
 
@@ -106,17 +106,17 @@ CTags2Part::~CTags2Part()
 	delete _configProxy;
 }
 
-void CTags2Part::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber )
+void CTags2Part::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber )
 {
 	if ( pagenumber == CTAGSSETTINGSPAGE )
 	{
 		CTags2SettingsWidget * w = new CTags2SettingsWidget( this, page );
-		connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) );
-		connect( w, SIGNAL(newTagsfileName(const QString& )), this, SLOT(updateTagsfileName(const QString& )) );
+		connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) );
+		connect( w, TQT_SIGNAL(newTagsfileName(const TQString& )), this, TQT_SLOT(updateTagsfileName(const TQString& )) );
 	}
 }
 
-void CTags2Part::updateTagsfileName( const QString & )
+void CTags2Part::updateTagsfileName( const TQString & )
 {
 	m_widget->updateDBDateLabel();
 }
@@ -125,14 +125,14 @@ void CTags2Part::updateTagsfileName( const QString & )
 bool CTags2Part::createTagsFile()
 {
 	// check if user specified a custom tag file name
-	QDomDocument & dom = *projectDom();
-	QString tagsFileCustom = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ).stripWhiteSpace();
+	TQDomDocument & dom = *projectDom();
+	TQString tagsFileCustom = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ).stripWhiteSpace();
 
 	return createTagsFile(tagsFileCustom, project()->projectDirectory());
 }
 
 // creates a new tag file with the specified name for the specified source directory
-bool CTags2Part::createTagsFile(const QString& tagFile, const QString& dir)
+bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir)
 {
 /*
 	KProcess proc;
@@ -149,18 +149,18 @@ bool CTags2Part::createTagsFile(const QString& tagFile, const QString& dir)
 	// get name of the ctags binary
 	KConfig * config = kapp->config();
 	config->setGroup( "CTAGS" );
-	QString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace();
+	TQString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace();
 	if ( ctagsBinary.isEmpty() )
 	{
 		ctagsBinary = "ctags";
 	}
 
 	// set a default argument list
-	QString argsDefault = "-R --c++-types=+px --excmd=pattern --exclude=Makefile --exclude=.";
+	TQString argsDefault = "-R --c++-types=+px --excmd=pattern --exclude=Makefile --exclude=.";
 
-	QDomDocument & dom = *projectDom();
-	QString argsCustom = DomUtil::readEntry( dom, "/ctagspart/customArguments" ).stripWhiteSpace();
-	QString commandline = ctagsBinary + " " + ( argsCustom.isEmpty() ? argsDefault : argsCustom ) + ( tagFile.isEmpty() ? "" : " -f " + tagFile );
+	TQDomDocument & dom = *projectDom();
+	TQString argsCustom = DomUtil::readEntry( dom, "/ctagspart/customArguments" ).stripWhiteSpace();
+	TQString commandline = ctagsBinary + " " + ( argsCustom.isEmpty() ? argsDefault : argsCustom ) + ( tagFile.isEmpty() ? "" : " -f " + tagFile );
 	commandline += " ";
 	commandline += dir;
 
@@ -170,13 +170,13 @@ bool CTags2Part::createTagsFile(const QString& tagFile, const QString& dir)
 	return true;
 }
 
-void CTags2Part::contextMenu(QPopupMenu *popup, const Context *context)
+void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context)
 {
 	if (!context->hasType( Context::EditorContext ))
 		return;
 
 	const EditorContext *econtext = static_cast(context);
-	QString ident = econtext->currentWord();
+	TQString ident = econtext->currentWord();
 	if (ident.isEmpty())
 		return;
 
@@ -189,18 +189,18 @@ void CTags2Part::contextMenu(QPopupMenu *popup, const Context *context)
 	if ( Tags::hasTag( ident ) && ( showDefinition || showDeclaration || showLookup  ) )
 	{
 		m_contextString = ident;
-	    QString squeezed = KStringHandler::csqueeze(ident, 30);
+	    TQString squeezed = KStringHandler::csqueeze(ident, 30);
 
 		popup->insertSeparator();
 
 		if ( showDeclaration )
-			popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, SLOT(slotGotoDeclaration()) );
+			popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) );
 
 		if ( showDefinition )
-			popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, SLOT(slotGotoDefinition()) );
+			popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) );
 
 		if ( showLookup )
-			popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, SLOT(slotGotoTag()) );
+			popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) );
 	}
 }
 
@@ -217,7 +217,7 @@ void CTags2Part::slotGotoTag( )
 	showHits( Tags::getExactMatches( m_contextString ) );
 }
 
-void CTags2Part::gotoTagForTypes( QStringList const & types )
+void CTags2Part::gotoTagForTypes( TQStringList const & types )
 {
 	Tags::TagList list = Tags::getMatches( m_contextString, false, types );
 
@@ -231,7 +231,7 @@ void CTags2Part::gotoTagForTypes( QStringList const & types )
 	{
 		Tags::TagEntry tag = list.first();
 		KURL url;
-		QString fileWithTagInside;
+		TQString fileWithTagInside;
 		// assume relative path to project directory if path does not start with slash
 		if (tag.file[0] != '/') {
 			fileWithTagInside = project()->projectDirectory() + "/" + tag.file;
@@ -251,25 +251,25 @@ void CTags2Part::gotoTagForTypes( QStringList const & types )
 
 void CTags2Part::slotGotoDefinition( )
 {
-	QStringList types;
+	TQStringList types;
 	types << "S" << "d" << "f" << "t" << "v";
 	gotoTagForTypes( types );
 }
 
 void CTags2Part::slotGotoDeclaration( )
 {
-	QStringList types;
+	TQStringList types;
 	types << "L" << "c" << "e" << "g" << "m" << "n" << "p" << "s" << "u" << "x";
 	gotoTagForTypes( types );
 }
 
 
-int CTags2Part::getFileLineFromStream( QTextStream & istream, QString const & pattern )
+int CTags2Part::getFileLineFromStream( TQTextStream & istream, TQString const & pattern )
 {
 	if ( pattern.isEmpty() ) return -1;
 
 	// ctags interestingly escapes "/", but apparently nothing else. lets revert that
-	QString unescaped = pattern;
+	TQString unescaped = pattern;
 	unescaped.replace( "\\/", "/" );
 
 	// most of the time, the ctags pattern has the form /^foo$/
@@ -277,21 +277,21 @@ int CTags2Part::getFileLineFromStream( QTextStream & istream, QString const & pa
 	// where the form is only /^foo/
 	// I have no idea if this is a ctags bug or not, but we have to deal with it
 
-	QString reduced, escaped, re_string;
+	TQString reduced, escaped, re_string;
 	if ( unescaped.endsWith( "$/" ) )
 	{
 		reduced = unescaped.mid( 2, unescaped.length() -4 );
-		escaped = QRegExp::escape( reduced );
-		re_string = QString( "^" + escaped + "$" );
+		escaped = TQRegExp::escape( reduced );
+		re_string = TQString( "^" + escaped + "$" );
 	}
 	else
 	{
 		reduced = unescaped.mid( 2, unescaped.length() -3 );
-		escaped = QRegExp::escape( reduced );
-		re_string = QString( "^" + escaped );
+		escaped = TQRegExp::escape( reduced );
+		re_string = TQString( "^" + escaped );
 	}
 
-	QRegExp re( re_string );
+	TQRegExp re( re_string );
 
 	int n = 0;
 	while ( !istream.atEnd() )
@@ -305,23 +305,23 @@ int CTags2Part::getFileLineFromStream( QTextStream & istream, QString const & pa
 	return -1;
 }
 
-int CTags2Part::getFileLineFromPattern( KURL const & url, QString const & pattern )
+int CTags2Part::getFileLineFromPattern( KURL const & url, TQString const & pattern )
 {
 	// if the file is open - get the line from the editor buffer
 	if ( KTextEditor::EditInterface * ei = dynamic_cast( partController()->partForURL( url ) ) )
 	{
-		QString ibuffer = ei->text();
-		QTextStream istream( &ibuffer, IO_ReadOnly );
+		TQString ibuffer = ei->text();
+		TQTextStream istream( &ibuffer, IO_ReadOnly );
 		return getFileLineFromStream( istream, pattern );
 	}
 	else // else the file is not open - get the line from the file on disk
 	{
-		QFile file( url.path() );
-		QString buffer;
+		TQFile file( url.path() );
+		TQString buffer;
 
 		if ( file.open( IO_ReadOnly ) )
 		{
-			QTextStream istream( &file );
+			TQTextStream istream( &file );
 			return getFileLineFromStream( istream, pattern );
 		}
 	}
diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h
index 77725500..b602ca35 100644
--- a/parts/ctags2/ctags2_part.h
+++ b/parts/ctags2/ctags2_part.h
@@ -12,8 +12,8 @@
 #ifndef __KDEVPART_CTAGS2_H__
 #define __KDEVPART_CTAGS2_H__
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include "tags.h"
@@ -32,12 +32,12 @@ class CTags2Part : public KDevPlugin
 
 public:
    
-	CTags2Part(QObject *parent, const char *name, const QStringList &);
+	CTags2Part(TQObject *parent, const char *name, const TQStringList &);
 	~CTags2Part();
 
-	int getFileLineFromPattern( KURL const & url, QString const & pattern);
+	int getFileLineFromPattern( KURL const & url, TQString const & pattern);
 	bool createTagsFile();
-	bool createTagsFile(const QString& tagFile, const QString& dir);
+	bool createTagsFile(const TQString& tagFile, const TQString& dir);
 
 private slots:
 	void slotLookupDeclaration();
@@ -48,17 +48,17 @@ private slots:
 	void slotGotoDefinition();
 	void slotGotoDeclaration();
 	void slotGotoTag();
-	void contextMenu(QPopupMenu *, const Context *);
-	void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int );
-	void updateTagsfileName( const QString & name );
+	void contextMenu(TQPopupMenu *, const Context *);
+	void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int );
+	void updateTagsfileName( const TQString & name );
 	
 private:
-	int getFileLineFromStream( QTextStream & stream, QString const & pattern);
-	void gotoTagForTypes( QStringList const & types );
+	int getFileLineFromStream( TQTextStream & stream, TQString const & pattern);
+	void gotoTagForTypes( TQStringList const & types );
 	void showHits( Tags::TagList const & tags );
     
-	QGuardedPtr m_widget;
-	QString m_contextString ;
+	TQGuardedPtr m_widget;
+	TQString m_contextString ;
 	
 	ConfigWidgetProxy * _configProxy;
 };
diff --git a/parts/ctags2/ctags2_selecttagfile.cpp b/parts/ctags2/ctags2_selecttagfile.cpp
index d9ae94be..adb3ee78 100644
--- a/parts/ctags2/ctags2_selecttagfile.cpp
+++ b/parts/ctags2/ctags2_selecttagfile.cpp
@@ -15,7 +15,7 @@
 #include "ctags2_selecttagfile.h"
 
 
-SelectTagFile::SelectTagFile( QWidget* parent, const char* name, bool modal, WFlags fl)
+SelectTagFile::SelectTagFile( TQWidget* parent, const char* name, bool modal, WFlags fl)
 : SelectTagFileBase( parent, name, modal, fl )
 {
 	tagFile->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
@@ -33,12 +33,12 @@ void SelectTagFile::validate()
 	okButton->setEnabled( valid );
 }
 
-QString SelectTagFile::name( )
+TQString SelectTagFile::name( )
 {
 	return displayName->text();
 }
 
-QString SelectTagFile::tagsfilePath( )
+TQString SelectTagFile::tagsfilePath( )
 {
 	return tagFile->url();
 }
diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h
index 103ba98c..d4f4f5f9 100644
--- a/parts/ctags2/ctags2_selecttagfile.h
+++ b/parts/ctags2/ctags2_selecttagfile.h
@@ -18,10 +18,10 @@ class SelectTagFile : public SelectTagFileBase {
 	Q_OBJECT
 
 	public:
-	SelectTagFile( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	SelectTagFile( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~SelectTagFile();
-	QString name();
-	QString tagsfilePath();
+	TQString name();
+	TQString tagsfilePath();
 
 public slots:
 	virtual void validate();
diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp
index 4bcdb122..d7458a85 100644
--- a/parts/ctags2/ctags2_settingswidget.cpp
+++ b/parts/ctags2/ctags2_settingswidget.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -30,7 +30,7 @@
 #include "ctags2_createtagfile.h"
 
 
-CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, QWidget* parent, const char* name, WFlags fl )
+CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* parent, const char* name, WFlags fl )
 	: CTags2SettingsWidgetBase( parent, name, fl ), m_part( part )
 {
 	binaryPath->completionObject()->setMode( KURLCompletion::FileCompletion );
@@ -55,23 +55,23 @@ CTags2SettingsWidget::~CTags2SettingsWidget()
 
 void CTags2SettingsWidget::loadSettings()
 {
-	QDomDocument & dom = *m_part->projectDom();
+	TQDomDocument & dom = *m_part->projectDom();
 
-	QString customArgs = DomUtil::readEntry( dom, "/ctagspart/customArguments" );
+	TQString customArgs = DomUtil::readEntry( dom, "/ctagspart/customArguments" );
 	if ( !customArgs.isEmpty() )
 	{
 		tagfileCustomBox->setChecked( true );
 		tagfileCustomEdit->setText( customArgs );
 	}
 
-	QString customTagfile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" );
+	TQString customTagfile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" );
 	if (customTagfile.isEmpty())
 	{
 		customTagfile =  m_part->project()->projectDirectory() + "/tags";
 	}
 	tagfilePath->setURL(customTagfile);
 
-	QStringList activeTagsFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file");
+	TQStringList activeTagsFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file");
 
 	KConfig * config = kapp->config();
 	config->setGroup( "CTAGS" );
@@ -79,18 +79,18 @@ void CTags2SettingsWidget::loadSettings()
 	showDefinitionBox->setChecked( config->readBoolEntry( "ShowDefinition", true ) );
 	showLookupBox->setChecked( config->readBoolEntry( "ShowLookup", true ) );
 	jumpToFirstBox->setChecked( config->readBoolEntry( "JumpToFirst", false ) );
-	QString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace();
+	TQString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace();
 	if ( !ctagsBinary.isEmpty() )
 	{
 		binaryPath->setURL( ctagsBinary );
 	}
 
 	config->setGroup( "CTAGS-tagsfiles" );
-	QMap entryMap = config->entryMap( "CTAGS-tagsfiles" );
-	QMap::const_iterator it = entryMap.begin();
+	TQMap entryMap = config->entryMap( "CTAGS-tagsfiles" );
+	TQMap::const_iterator it = entryMap.begin();
     while ( it != entryMap.end() )
 	{
-		QString file = config->readPathEntry( it.key() );
+		TQString file = config->readPathEntry( it.key() );
 		new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.contains( file ) );
 		++it;
 	}
@@ -98,7 +98,7 @@ void CTags2SettingsWidget::loadSettings()
 
 void CTags2SettingsWidget::storeSettings()
 {
-	QDomDocument & dom = *m_part->projectDom();
+	TQDomDocument & dom = *m_part->projectDom();
 	DomUtil::writeEntry( dom, "/ctagspart/customArguments", tagfileCustomEdit->text() );
 	DomUtil::writeEntry( dom, "/ctagspart/customTagfilePath", tagfilePath->url() );
 
@@ -113,7 +113,7 @@ void CTags2SettingsWidget::storeSettings()
 	config->deleteGroup( "CTAGS-tagsfiles" );
 	config->setGroup( "CTAGS-tagsfiles" );
 
-	QStringList activeTagsFiles;
+	TQStringList activeTagsFiles;
 	TagsItem * item = static_cast( otherTagFiles->firstChild() );
 	while ( item )
 	{
@@ -142,7 +142,7 @@ void CTags2SettingsWidget::slotAccept( )
 void CTags2SettingsWidget::createNewTagSlot()
 {
 	CreateTagFile* dlg = new CreateTagFile;
-	if ( dlg->exec() == QDialog::Accepted )
+	if ( dlg->exec() == TQDialog::Accepted )
 	{
 		m_part->createTagsFile( dlg->tagsfilePath(), dlg->directory() );
 		new TagsItem( otherTagFiles, dlg->name(), dlg->tagsfilePath(), true );
@@ -153,7 +153,7 @@ void CTags2SettingsWidget::addNewTagFile()
 {
 	SelectTagFile* dlg = new SelectTagFile;
 
-	if ( dlg->exec() == QDialog::Accepted )
+	if ( dlg->exec() == TQDialog::Accepted )
 	{
 		new TagsItem( otherTagFiles, dlg->name(), dlg->tagsfilePath(), true );
 	}
diff --git a/parts/ctags2/ctags2_settingswidget.h b/parts/ctags2/ctags2_settingswidget.h
index ac208ad4..5a9d5c71 100644
--- a/parts/ctags2/ctags2_settingswidget.h
+++ b/parts/ctags2/ctags2_settingswidget.h
@@ -12,7 +12,7 @@
 #ifndef CTAGS2_SETTINGSWIDGET_H
 #define CTAGS2_SETTINGSWIDGET_H
 
-#include 
+#include 
 
 #include "ctags2_settingswidgetbase.h"
 
@@ -21,18 +21,18 @@ class CTags2Part;
 class TagsItem : public QCheckListItem
 {
 public:
-	TagsItem( QListView * parent, QString name, QString tagsfilePath, bool active )
-		: QCheckListItem( parent, name, QCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath )
+	TagsItem( TQListView * parent, TQString name, TQString tagsfilePath, bool active )
+		: TQCheckListItem( parent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath )
 	{
 		setOn( active );
 		setText( 1, tagsfilePath );
 	}
-	QString name() { return m_name; }
-	QString tagsfilePath() { return m_tagsfilePath; }
+	TQString name() { return m_name; }
+	TQString tagsfilePath() { return m_tagsfilePath; }
 
 private:
-	QString m_name;
-	QString m_tagsfilePath;
+	TQString m_name;
+	TQString m_tagsfilePath;
 };
 
 
@@ -42,11 +42,11 @@ class CTags2SettingsWidget : public CTags2SettingsWidgetBase
 	Q_OBJECT
 
 public:
-	CTags2SettingsWidget( CTags2Part * part, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+	CTags2SettingsWidget( CTags2Part * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~CTags2SettingsWidget();
 
 signals:
-	void newTagsfileName( const QString & name );
+	void newTagsfileName( const TQString & name );
 
 public slots:
 	void slotAccept();
diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index 7196ed1b..ab277966 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -31,31 +31,31 @@
 class TagItem : public QListViewItem
 {
 public:
-    TagItem(QListView * lv, QString const & tag, QString const & type, QString const & file, QString const & pattern );
+    TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern );
 
-	QString tag;
-	QString type;
-	QString file;
-	QString pattern;
+	TQString tag;
+	TQString type;
+	TQString file;
+	TQString pattern;
 };
 
-TagItem::TagItem( QListView * lv, QString const & tag, QString const & type, QString const & file, QString const & pattern )
-	: QListViewItem( lv, tag, type, file ), tag(tag), type(type), file(file), pattern(pattern)
+TagItem::TagItem( TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern )
+	: TQListViewItem( lv, tag, type, file ), tag(tag), type(type), file(file), pattern(pattern)
 {
 }
 
 CTags2Widget::CTags2Widget( CTags2Part * part, const char* name, WFlags fl)
 : CTags2WidgetBase(0,name,fl), _part(part)
 {
-    output_view->setColumnWidthMode(0,QListView::Maximum);
-	output_view->setColumnWidthMode(1,QListView::Maximum);
-	output_view->setColumnWidthMode(2,QListView::Maximum);
+    output_view->setColumnWidthMode(0,TQListView::Maximum);
+	output_view->setColumnWidthMode(1,TQListView::Maximum);
+	output_view->setColumnWidthMode(2,TQListView::Maximum);
 
-	_typeTimeout = new QTimer( this );
-	connect( _typeTimeout, SIGNAL(timeout()), this, SLOT(line_edit_changed()) );
+	_typeTimeout = new TQTimer( this );
+	connect( _typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(line_edit_changed()) );
 
-	connect( output_view, SIGNAL(executed(QListViewItem*)), this, SLOT(itemExecuted(QListViewItem*)) );
-	connect( output_view, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(itemExecuted(QListViewItem*)) );
+	connect( output_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) );
+	connect( output_view, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) );
 
 	updateDBDateLabel();
 }
@@ -112,12 +112,12 @@ int CTags2Widget::calculateHitCount( )
 	return Tags::numberOfPartialMatches( input_edit->text() ) ;
 }
 
-void CTags2Widget::itemExecuted( QListViewItem * item )
+void CTags2Widget::itemExecuted( TQListViewItem * item )
 {
 	TagItem * tagItem = static_cast( item );
 
 	KURL url;
-	QString fileWithTagInside;
+	TQString fileWithTagInside;
 	// assume relative path to project directory if path does not start with slash
 	if (tagItem->file[0] != '/') {
 		fileWithTagInside = _part->project()->projectDirectory() + "/" + tagItem->file;
@@ -133,19 +133,19 @@ void CTags2Widget::itemExecuted( QListViewItem * item )
 
 void CTags2Widget::regeneratebutton_clicked()
 {
-	QApplication::setOverrideCursor(Qt::waitCursor);
+	TQApplication::setOverrideCursor(Qt::waitCursor);
 
 	_part->createTagsFile();
 
-	QApplication::restoreOverrideCursor();
+	TQApplication::restoreOverrideCursor();
 
 	updateDBDateLabel();
 }
 
 void CTags2Widget::updateDBDateLabel( )
 {
-	QStringList tagFiles = Tags::getTagFiles();
-	QFileInfo tagsdb(tagFiles[0]);
+	TQStringList tagFiles = Tags::getTagFiles();
+	TQFileInfo tagsdb(tagFiles[0]);
 	if ( tagsdb.exists() )
 	{
 		datetime_label->setText( tagsdb.created().date().toString( Qt::ISODate ) );
@@ -156,7 +156,7 @@ void CTags2Widget::updateDBDateLabel( )
 	}
 }
 
-void CTags2Widget::focusInEvent( QFocusEvent* )
+void CTags2Widget::focusInEvent( TQFocusEvent* )
 {
 	updateDBDateLabel();
 	input_edit->setFocus();
@@ -164,7 +164,7 @@ void CTags2Widget::focusInEvent( QFocusEvent* )
 
 void CTags2Widget::goToNext( )
 {
-	QListViewItem * item = output_view->firstChild();
+	TQListViewItem * item = output_view->firstChild();
 	while( item )
 	{
 		if ( item->isSelected() )
diff --git a/parts/ctags2/ctags2_widget.h b/parts/ctags2/ctags2_widget.h
index 2a4423a4..758e73b1 100644
--- a/parts/ctags2/ctags2_widget.h
+++ b/parts/ctags2/ctags2_widget.h
@@ -34,20 +34,20 @@ public:
 	void goToNext();
 
 protected:
-	void focusInEvent( QFocusEvent *e );
+	void focusInEvent( TQFocusEvent *e );
 		
 private slots:
     virtual void line_edit_changed();
     virtual void line_edit_changed_delayed();
 	virtual void regeneratebutton_clicked();	  
-	void itemExecuted( QListViewItem * );
+	void itemExecuted( TQListViewItem * );
 
 private: 
 	void showHitCount( int );
 	int calculateHitCount();
 	
 	CTags2Part * _part;
-	QTimer * _typeTimeout;
+	TQTimer * _typeTimeout;
 
 };
 
diff --git a/parts/ctags2/ctagskinds.cpp b/parts/ctags2/ctagskinds.cpp
index c8d5ef93..e198c577 100644
--- a/parts/ctags2/ctagskinds.cpp
+++ b/parts/ctags2/ctagskinds.cpp
@@ -273,7 +273,7 @@ static CTagsExtensionMapping extensionMapping[] = {
 };
 
 
-static CTagsKindMapping *findKindMapping(const QString &extension)
+static CTagsKindMapping *findKindMapping(const TQString &extension)
 {
     const char *pextension = extension.latin1();
 
@@ -288,9 +288,9 @@ static CTagsKindMapping *findKindMapping(const QString &extension)
 }
 
 
-QString CTagsKinds::findKind( const char * kindChar, const QString &extension )
+TQString CTagsKinds::findKind( const char * kindChar, const TQString &extension )
 {
-    if ( kindChar == 0 ) return QString::null;
+    if ( kindChar == 0 ) return TQString::null;
 
     CTagsKindMapping *kindMapping = findKindMapping(extension);
     if (kindMapping) {
@@ -302,5 +302,5 @@ QString CTagsKinds::findKind( const char * kindChar, const QString &extension )
         }
     }
 
-    return QString::null;
+    return TQString::null;
 }
diff --git a/parts/ctags2/ctagskinds.h b/parts/ctags2/ctagskinds.h
index de695319..7bf76a09 100644
--- a/parts/ctags2/ctagskinds.h
+++ b/parts/ctags2/ctagskinds.h
@@ -12,13 +12,13 @@
 #ifndef _CTAGSKINDS_H_
 #define _CTAGSKINDS_H_
 
-#include 
+#include 
 
 
 class CTagsKinds
 {
 public:
-    static QString findKind( const char * kindChar, const QString &extension);
+    static TQString findKind( const char * kindChar, const TQString &extension);
 };
 
 #endif
diff --git a/parts/ctags2/tagitem.cpp b/parts/ctags2/tagitem.cpp
index e2ddf158..36220db5 100644
--- a/parts/ctags2/tagitem.cpp
+++ b/parts/ctags2/tagitem.cpp
@@ -11,8 +11,8 @@
 
 #include "tagitem.h"
 
-TagItem::TagItem( QListView * lv, QString const & tag, QString const & type, QString const & file, QString const & pattern )
-	: QListViewItem( lv ), tag(tag), type(type), file(file), pattern(pattern)
+TagItem::TagItem( TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern )
+	: TQListViewItem( lv ), tag(tag), type(type), file(file), pattern(pattern)
 {}
 
 TagItem::~TagItem()
diff --git a/parts/ctags2/tagitem.h b/parts/ctags2/tagitem.h
index fddb823d..19bc0a59 100644
--- a/parts/ctags2/tagitem.h
+++ b/parts/ctags2/tagitem.h
@@ -12,18 +12,18 @@
 #ifndef TAGITEM_H
 #define TAGITEM_H
 
-#include 
+#include 
 
 class TagItem : public QListViewItem
 {
 public:
-    TagItem(QListView * lv, QString const & tag, QString const & type, QString const & file, QString const & pattern );
+    TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern );
     ~TagItem();
 
-	QString tag;
-	QString type;
-	QString file;
-	QString pattern;
+	TQString tag;
+	TQString type;
+	TQString file;
+	TQString pattern;
 };
 
 #endif
diff --git a/parts/ctags2/tags.cpp b/parts/ctags2/tags.cpp
index 3ba98159..19993823 100644
--- a/parts/ctags2/tags.cpp
+++ b/parts/ctags2/tags.cpp
@@ -18,18 +18,18 @@ namespace ctags
 
 #include "tags.h"
 
-QStringList Tags::_tagFiles;
+TQStringList Tags::_tagFiles;
 
 Tags::TagEntry::TagEntry() {}
 
-Tags::TagEntry::TagEntry( const QString & tag, const QString & type, const QString & file, const QString & pattern )
+Tags::TagEntry::TagEntry( const TQString & tag, const TQString & type, const TQString & file, const TQString & pattern )
 	: tag(tag), type(type), file(file), pattern(pattern)
 {}
 
 
-bool Tags::hasTag(const QString & tag )
+bool Tags::hasTag(const TQString & tag )
 {
-	QStringList::iterator it;
+	TQStringList::iterator it;
 	for (it = _tagFiles.begin(); it != _tagFiles.end() ; it++) {
 		if (hasTag((*it).ascii(), tag))
 			return true;
@@ -38,7 +38,7 @@ bool Tags::hasTag(const QString & tag )
 	return false;
 }
 
-bool Tags::hasTag(const char* tagFile, const QString & tag )
+bool Tags::hasTag(const char* tagFile, const TQString & tag )
 {
 	ctags::tagFileInfo info;
 	ctags::tagFile * file = ctags::tagsOpen(tagFile, &info );
@@ -51,10 +51,10 @@ bool Tags::hasTag(const char* tagFile, const QString & tag )
 	return found;
 }
 
-unsigned int Tags::numberOfMatches( const QString & tagpart, bool partial )
+unsigned int Tags::numberOfMatches( const TQString & tagpart, bool partial )
 {
 	unsigned int n = 0;
-	QStringList::iterator it;
+	TQStringList::iterator it;
 	for (it = _tagFiles.begin(); it != _tagFiles.end(); it++)
 	{
 		n += numberOfMatches( (*it).ascii(), tagpart, partial );
@@ -63,7 +63,7 @@ unsigned int Tags::numberOfMatches( const QString & tagpart, bool partial )
 	return n;
 }
 
-unsigned int Tags::numberOfMatches(const char* tagFile, const QString & tagpart, bool partial )
+unsigned int Tags::numberOfMatches(const char* tagFile, const TQString & tagpart, bool partial )
 {
 	unsigned int n = 0;
 
@@ -88,12 +88,12 @@ unsigned int Tags::numberOfMatches(const char* tagFile, const QString & tagpart,
 }
 
 
-Tags::TagList Tags::getMatches( const QString & tagpart, bool partial, const QStringList & types )
+Tags::TagList Tags::getMatches( const TQString & tagpart, bool partial, const TQStringList & types )
 {
 	Tags::TagList list;
 
 	// build a compound tag list from all the configured tag files
-	QStringList::iterator it;
+	TQStringList::iterator it;
 	for ( it = _tagFiles.begin(); it != _tagFiles.end(); it++ )
 	{
 		list += getMatches((*it).ascii(), tagpart, partial, types);
@@ -102,7 +102,7 @@ Tags::TagList Tags::getMatches( const QString & tagpart, bool partial, const QSt
 	return list;
 }
 
-Tags::TagList Tags::getMatches(const char* tagFile, const QString & tagpart, bool partial, const QStringList & types )
+Tags::TagList Tags::getMatches(const char* tagFile, const TQString & tagpart, bool partial, const TQStringList & types )
 {
 	Tags::TagList list;
 
@@ -116,8 +116,8 @@ Tags::TagList Tags::getMatches(const char* tagFile, const QString & tagpart, boo
 	{
 		do
 		{
-			QString type( CTagsKinds::findKind( entry.kind, QString( entry.file ).section( '.', -1 ) ) );
-			QString file( entry.file );
+			TQString type( CTagsKinds::findKind( entry.kind, TQString( entry.file ).section( '.', -1 ) ) );
+			TQString file( entry.file );
 
 			if ( type.isEmpty() && file.endsWith( "Makefile" ) )
 			{
@@ -125,7 +125,7 @@ Tags::TagList Tags::getMatches(const char* tagFile, const QString & tagpart, boo
 			}
 			if ( types.isEmpty() || types.contains( entry.kind ) )
 			{
-				list << TagEntry( QString( entry.name ), type, file, QString( entry.address.pattern ) );
+				list << TagEntry( TQString( entry.name ), type, file, TQString( entry.address.pattern ) );
 			}
 		}
 		while ( ctags::tagsFindNext( file, &entry ) == ctags::TagSuccess );
@@ -136,32 +136,32 @@ Tags::TagList Tags::getMatches(const char* tagFile, const QString & tagpart, boo
 	return list;
 }
 
-void Tags::setTagFiles(const QStringList& tagFiles )
+void Tags::setTagFiles(const TQStringList& tagFiles )
 {
 	_tagFiles = tagFiles;
 }
 
-QStringList Tags::getTagFiles( )
+TQStringList Tags::getTagFiles( )
 {
 	return _tagFiles;
 }
 
-unsigned int Tags::numberOfPartialMatches( const QString & tagpart )
+unsigned int Tags::numberOfPartialMatches( const TQString & tagpart )
 {
 	return numberOfMatches( tagpart, true );
 }
 
-unsigned int Tags::numberOfExactMatches( const QString & tagpart )
+unsigned int Tags::numberOfExactMatches( const TQString & tagpart )
 {
 	return numberOfMatches( tagpart, false );
 }
 
-Tags::TagList Tags::getPartialMatches( const QString & tagpart )
+Tags::TagList Tags::getPartialMatches( const TQString & tagpart )
 {
 	return getMatches( tagpart, true );
 }
 
-Tags::TagList Tags::getExactMatches( const QString & tag )
+Tags::TagList Tags::getExactMatches( const TQString & tag )
 {
 	return getMatches( tag, false );
 }
diff --git a/parts/ctags2/tags.h b/parts/ctags2/tags.h
index 1d7e3604..22b7e7ea 100644
--- a/parts/ctags2/tags.h
+++ b/parts/ctags2/tags.h
@@ -12,10 +12,10 @@
 #ifndef TAGS_H
 #define TAGS_H
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 class Tags
 {
@@ -24,49 +24,49 @@ public:
 	struct TagEntry
 	{
 		TagEntry();
-		TagEntry( const QString & tag, const QString & type, const QString & file, const QString & pattern );
+		TagEntry( const TQString & tag, const TQString & type, const TQString & file, const TQString & pattern );
 		
-		QString tag;
-		QString type;
-		QString file;
-		QString pattern;
+		TQString tag;
+		TQString type;
+		TQString file;
+		TQString pattern;
 	};
 	
-	typedef QValueList TagList;
+	typedef TQValueList TagList;
 	
 	/**
 	 *    Method to set the tag database filename
 	 * @param file the tag database filename
 	 */
-	static void setTagFiles(const QStringList& tagFiles);
+	static void setTagFiles(const TQStringList& tagFiles);
 	
-	static QStringList getTagFiles();
+	static TQStringList getTagFiles();
 	
 	/**
 	 *    Method to check if the tag database contains a specific tag
 	 * @param tag Tag to look up
 	 * @return returns true if tag database contains 'tag'
 	 */
-	static bool hasTag( const QString & tag );
+	static bool hasTag( const TQString & tag );
 	
-	static unsigned int numberOfPartialMatches( const QString & tagpart );
-	static unsigned int numberOfExactMatches( const QString & tag );
-	static unsigned int numberOfMatches( const QString & tagpart, bool partial );
+	static unsigned int numberOfPartialMatches( const TQString & tagpart );
+	static unsigned int numberOfExactMatches( const TQString & tag );
+	static unsigned int numberOfMatches( const TQString & tagpart, bool partial );
 	
-	static TagList getPartialMatches( const QString & tagpart );
-	static TagList getExactMatches( const QString & tag );
-	static TagList getMatches( const QString & tagpart, bool partial, const QStringList & types = QStringList() );	
+	static TagList getPartialMatches( const TQString & tagpart );
+	static TagList getExactMatches( const TQString & tag );
+	static TagList getMatches( const TQString & tagpart, bool partial, const TQStringList & types = TQStringList() );	
 
 private:
 	static Tags::TagList getMatches(const char* tagFile, 
-								   const QString & tagpart, 
+								   const TQString & tagpart, 
 								   bool partial,
-								   const QStringList & types );
+								   const TQStringList & types );
 	static unsigned int numberOfMatches(const char* tagFile, 
-									   const QString & tagpart, 
+									   const TQString & tagpart, 
 									   bool partial );
-	static bool hasTag(const char* tagFile, const QString & tag );
-	static QStringList _tagFiles;
+	static bool hasTag(const char* tagFile, const TQString & tag );
+	static TQStringList _tagFiles;
 };
 
 #endif
diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp
index 049a3d60..e5a8c74d 100644
--- a/parts/diff/diffdlg.cpp
+++ b/parts/diff/diffdlg.cpp
@@ -9,20 +9,20 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
+#include 
 
 #include 
  
 #include "diffdlg.h"
 #include "diffwidget.h"
 
-DiffDlg::DiffDlg( QWidget *parent, const char *name ):
+DiffDlg::DiffDlg( TQWidget *parent, const char *name ):
     KDialogBase( parent, name, true, i18n("Difference Viewer"), Ok )
 {
   diffWidget = new DiffWidget( this, "Main Diff Widget" );
   setMainWidget( diffWidget );
 
-  QVBoxLayout* layout = new QVBoxLayout( this, 0, spacingHint() );
+  TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() );
   layout->addWidget( diffWidget );
 }
 
@@ -35,7 +35,7 @@ void DiffDlg::slotClear()
   diffWidget->slotClear();
 }
 
-void DiffDlg::setDiff( const QString& diff )
+void DiffDlg::setDiff( const TQString& diff )
 {
   diffWidget->setDiff( diff );
 }
diff --git a/parts/diff/diffdlg.h b/parts/diff/diffdlg.h
index 6f47dcf2..a25a3957 100644
--- a/parts/diff/diffdlg.h
+++ b/parts/diff/diffdlg.h
@@ -22,14 +22,14 @@ class DiffDlg : public KDialogBase
     Q_OBJECT
 
 public:
-    DiffDlg( QWidget *parent = 0, const char *name = 0 );
+    DiffDlg( TQWidget *parent = 0, const char *name = 0 );
     virtual ~DiffDlg();
 
 public slots:
     /** The URL has to point to a diff file */
     void openURL( const KURL& url );
     /** Pass a diff file in here */
-    void setDiff( const QString& diff );
+    void setDiff( const TQString& diff );
     /** clears the difference viewer */
     void slotClear();
 
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 8f04b060..fab596ad 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -12,8 +12,8 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -41,7 +41,7 @@ static const KDevPluginInfo data("kdevdiff");
 typedef KDevGenericFactory DiffFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
 
-DiffPart::DiffPart(QObject *parent, const char *name, const QStringList &)
+DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
 {
   setInstance(DiffFactory::instance());
@@ -49,22 +49,22 @@ DiffPart::DiffPart(QObject *parent, const char *name, const QStringList &)
 
   diffWidget = new DiffWidget(this, 0, "diffWidget");
   diffWidget->setIcon( SmallIcon("editcopy") );
-  QString nm( i18n( "Diff" ) );
+  TQString nm( i18n( "Diff" ) );
   diffWidget->setCaption( i18n( "Diff Output" ) );
-  QWhatsThis::add(diffWidget, i18n("Difference viewer
    Shows output of the diff format. "
+  TQWhatsThis::add(diffWidget, i18n("Difference viewer
    Shows output of the diff format. "
     "Can utilize every installed component that is able to show diff output. "
     "For example if you have Kompare installed, Difference Viewer can use its graphical diff view."));
   mainWindow()->embedOutputView( diffWidget, nm, i18n("Output of the diff command") );
   mainWindow()->setViewAvailable( diffWidget, false );
 
   KAction *action = new KAction( i18n("Difference Viewer..."), 0,
-	       this, SLOT(slotExecDiff()),
+	       this, TQT_SLOT(slotExecDiff()),
 	       actionCollection(), "tools_diff" );
   action->setToolTip(i18n("Difference viewer"));
   action->setWhatsThis(i18n("Difference viewer
    Shows the contents of a patch file."));
 
-  connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-           this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
+  connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+           this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 }
 
 static bool urlIsEqual(const KURL &a, const KURL &b)
@@ -73,8 +73,8 @@ static bool urlIsEqual(const KURL &a, const KURL &b)
   {
     struct stat aStat, bStat;
 
-    if ((::stat(QFile::encodeName(a.fileName()), &aStat) == 0)
-        && (::stat(QFile::encodeName(b.fileName()), &bStat) == 0))
+    if ((::stat(TQFile::encodeName(a.fileName()), &aStat) == 0)
+        && (::stat(TQFile::encodeName(b.fileName()), &bStat) == 0))
     {
       return (aStat.st_dev == bStat.st_dev) && (aStat.st_ino == bStat.st_ino);
     }
@@ -87,7 +87,7 @@ static KParts::ReadWritePart* partForURL(const KURL &url, KDevPartController* pc
 {
   if ( !pc )
     return 0;
-  QPtrListIterator it(*(pc->parts()));
+  TQPtrListIterator it(*(pc->parts()));
   for ( ; it.current(); ++it)
   {
     KParts::ReadWritePart *rw_part = dynamic_cast(it.current());
@@ -98,7 +98,7 @@ static KParts::ReadWritePart* partForURL(const KURL &url, KDevPartController* pc
   return 0;
 }
 
-void DiffPart::contextMenu( QPopupMenu* popup, const Context* context )
+void DiffPart::contextMenu( TQPopupMenu* popup, const Context* context )
 {
 	if ( context->hasType( Context::EditorContext ) )
 	{
@@ -121,7 +121,7 @@ void DiffPart::contextMenu( QPopupMenu* popup, const Context* context )
 	if ( partController()->documentState( rw_part->url() ) != Clean )
 	{
 		int id = popup->insertItem( i18n( "Difference to Disk File" ),
-							this, SLOT(localDiff()) );
+							this, TQT_SLOT(localDiff()) );
 		popup->setWhatsThis(id, i18n("Difference to disk file
    Shows the difference between "
 			"the file contents in this editor and the file contents on disk."));
 	}
@@ -146,7 +146,7 @@ void DiffPart::localDiff()
   if ( !editIface )
     return;
   buffer = editIface->text().local8Bit();
-  resultBuffer = resultErr = QString::null;
+  resultBuffer = resultErr = TQString::null;
 
   delete proc;
   proc = new KProcess();
@@ -155,14 +155,14 @@ void DiffPart::localDiff()
   *proc << "-u" << popupFile.path() << "-";
   proc->setWorkingDirectory( popupFile.directory() );
 
-  connect( proc, SIGNAL(processExited( KProcess* )),
-           this, SLOT(processExited( KProcess* )) );
-  connect( proc, SIGNAL(receivedStdout( KProcess*, char*, int )),
-           this, SLOT(receivedStdout( KProcess*, char*, int )) );
-  connect( proc, SIGNAL(receivedStderr( KProcess*, char*, int )),
-           this, SLOT(receivedStderr( KProcess*, char*, int )) );
-  connect( proc, SIGNAL(wroteStdin( KProcess* )),
-           this, SLOT(wroteStdin( KProcess* )) );
+  connect( proc, TQT_SIGNAL(processExited( KProcess* )),
+           this, TQT_SLOT(processExited( KProcess* )) );
+  connect( proc, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )),
+           this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) );
+  connect( proc, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )),
+           this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) );
+  connect( proc, TQT_SIGNAL(wroteStdin( KProcess* )),
+           this, TQT_SLOT(wroteStdin( KProcess* )) );
 
   if ( !proc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
     KMessageBox::error( 0, i18n( "Could not invoke the \"diff\" command." ) );
@@ -184,20 +184,20 @@ void DiffPart::processExited( KProcess* p )
   } else {
     KMessageBox::error( 0, i18n("Diff command failed (%1):\n").arg( p->exitStatus() ) + resultErr );
   }
-  resultBuffer = resultErr = QString::null;
+  resultBuffer = resultErr = TQString::null;
   delete proc;
   proc = 0;
 }
 
 void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen )
 {
-  resultBuffer += QString::fromLocal8Bit( buf, buflen );
+  resultBuffer += TQString::fromLocal8Bit( buf, buflen );
 }
 
 void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen )
 {
-  kdDebug(9033) << "received Stderr: " << QString::fromLocal8Bit( buf, buflen ) << endl;
-  resultErr += QString::fromLocal8Bit( buf, buflen );
+  kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ) << endl;
+  resultErr += TQString::fromLocal8Bit( buf, buflen );
 }
 
 void DiffPart::wroteStdin( KProcess* p )
@@ -220,7 +220,7 @@ void DiffPart::openURL( const KURL& url )
 */
 }
 
-void DiffPart::showDiff( const QString& diff )
+void DiffPart::showDiff( const TQString& diff )
 {
   diffWidget->slotClear();
   diffWidget->setDiff( diff );
@@ -237,7 +237,7 @@ void DiffPart::showDiff( const QString& diff )
 
 void DiffPart::slotExecDiff()
 {
-  KURL url = KFileDialog::getOpenURL( QString::null, QString::null, 0, i18n("Please Select Patch File") );
+  KURL url = KFileDialog::getOpenURL( TQString::null, TQString::null, 0, i18n("Please Select Patch File") );
 
   if ( url.isEmpty() )
     return;
diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h
index f89d0d18..dff5ba0c 100644
--- a/parts/diff/diffpart.h
+++ b/parts/diff/diffpart.h
@@ -12,8 +12,8 @@
 #ifndef _DIFFPART_H_
 #define _DIFFPART_H_
 
-#include 
-#include 
+#include 
+#include 
 
 #include "kdevplugin.h"
 #include "kdevdifffrontend.h"
@@ -29,18 +29,18 @@ class DiffPart : public KDevDiffFrontend
     Q_OBJECT
 
 public:
-    DiffPart( QObject *parent, const char *name, const QStringList & );
+    DiffPart( TQObject *parent, const char *name, const TQStringList & );
     virtual ~DiffPart();
 
     void openURL( const KURL& url );
-    void showDiff( const QString& diff );
+    void showDiff( const TQString& diff );
     void showDiff( const KURL &, const KURL & ) { /** @todo */ }
 
 public slots:
     void slotExecDiff();
 
 private slots:
-    void contextMenu( QPopupMenu* popup, const Context* context );
+    void contextMenu( TQPopupMenu* popup, const Context* context );
     void localDiff();
     void processExited( KProcess* p );
     void receivedStdout( KProcess* p, char* buf, int buflen );
@@ -48,12 +48,12 @@ private slots:
     void wroteStdin( KProcess* p );
 
 private:
-    QGuardedPtr diffWidget;
+    TQGuardedPtr diffWidget;
     KURL popupFile;
     KProcess* proc;
-    QCString buffer;
-    QString resultBuffer;
-    QString resultErr;
+    TQCString buffer;
+    TQString resultBuffer;
+    TQString resultErr;
 };
 
 #endif
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 0b3399ab..7d403e46 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -39,10 +39,10 @@
 // yup, magic value for the popupmenu-id
 static const int POPUP_BASE = 130977;
 
-QStringList KDiffTextEdit::extParts;
-QStringList KDiffTextEdit::extPartsTranslated;
+TQStringList KDiffTextEdit::extParts;
+TQStringList KDiffTextEdit::extPartsTranslated;
 
-KDiffTextEdit::KDiffTextEdit( QWidget* parent, const char* name ): QTextEdit( parent, name )
+KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name )
 {
   KConfig* config = kapp->config();
   config->setGroup( "Diff" );
@@ -59,51 +59,51 @@ KDiffTextEdit::~KDiffTextEdit()
   config->writeEntry( "Highlight", _highlight );
 }
 
-QPopupMenu* KDiffTextEdit::createPopupMenu()
+TQPopupMenu* KDiffTextEdit::createPopupMenu()
 {
-  return createPopupMenu( QPoint() );
+  return createPopupMenu( TQPoint() );
 }
 
-QPopupMenu* KDiffTextEdit::createPopupMenu( const QPoint& p )
+TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
 {
-  QPopupMenu* popup = QTextEdit::createPopupMenu( p );
+  TQPopupMenu* popup = TQTextEdit::createPopupMenu( p );
   if ( !popup )
-    popup = new QPopupMenu( this );
+    popup = new TQPopupMenu( this );
 
   int i = 0;
 
-  for ( QStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
+  for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
     popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i );
     i++;
   }
   if ( !extPartsTranslated.isEmpty() )
     popup->insertSeparator( i );
-  connect( popup, SIGNAL(activated(int)), this, SLOT(popupActivated(int)) );
+  connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) );
 
-  popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 );
+  popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 );
   popup->setItemEnabled( POPUP_BASE - 2, length() > 0 );
 
   popup->insertSeparator( 1 );
 
-  popup->insertItem( i18n( "Highlight Syntax" ), this, SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 );
+  popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 );
   popup->setItemChecked( POPUP_BASE - 1, _highlight );
   popup->insertSeparator( 3 );
 
   popup->insertSeparator();
-  popup->insertItem( i18n("Hide view"), parent(), SLOT(hideView()) );
+  popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) );
 
   return popup;
 }
 
 void KDiffTextEdit::saveAs()
 {
-  QString fName = KFileDialog::getSaveFileName();
+  TQString fName = KFileDialog::getSaveFileName();
   if ( fName.isEmpty() )
     return;
 
-  QFile f( fName );
+  TQFile f( fName );
   if ( f.open( IO_WriteOnly ) ) {
-    QTextStream stream( &f );
+    TQTextStream stream( &f );
     int pCount = paragraphs();
     for ( int i = 0; i < pCount; ++i )
       stream << text( i ) << "\n";
@@ -125,15 +125,15 @@ void KDiffTextEdit::toggleSyntaxHighlight()
 void KDiffTextEdit::applySyntaxHighlight()
 {
   // the diff has been loaded so we apply a simple highlighting
-  static QColor cAdded( 190, 190, 237);
-  static QColor cRemoved( 190, 237, 190 );
+  static TQColor cAdded( 190, 190, 237);
+  static TQColor cRemoved( 190, 237, 190 );
 
   if ( !_highlight )
     return;
 
   int paragCount = paragraphs();
   for ( int i = 0; i < paragCount; ++i ) {
-    QString txt = text( i );
+    TQString txt = text( i );
     if ( txt.length() > 0 ) {
       if ( txt.startsWith( "+" ) || txt.startsWith( ">" ) ) {
         setParagraphBackgroundColor( i, cAdded );
@@ -180,19 +180,19 @@ void KDiffTextEdit::popupActivated( int id )
   emit externalPartRequested( extParts[ id ] );
 }
 
-DiffWidget::DiffWidget( DiffPart * part, QWidget *parent, const char *name, WFlags f ):
-    QWidget( parent, name, f ), m_part( part ), tempFile( 0 )
+DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFlags f ):
+    TQWidget( parent, name, f ), m_part( part ), tempFile( 0 )
 {
   job = 0;
   extPart = 0;
 
   te = new KDiffTextEdit( this, "Main Diff Viewer" );
   te->setReadOnly( true );
-  te->setTextFormat( QTextEdit::PlainText );
+  te->setTextFormat( TQTextEdit::PlainText );
 //  te->setMinimumSize( 300, 200 );
-  connect( te, SIGNAL(externalPartRequested(const QString&)), this, SLOT(loadExtPart(const QString&)) );
+  connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
 
-  QVBoxLayout* layout = new QVBoxLayout( this );
+  TQVBoxLayout* layout = new TQVBoxLayout( this );
   layout->addWidget( te );
 }
 
@@ -217,7 +217,7 @@ void DiffWidget::setExtPartVisible( bool visible )
   }
 }
 
-void DiffWidget::loadExtPart( const QString& partName )
+void DiffWidget::loadExtPart( const TQString& partName )
 {
   if ( extPart ) {
     setExtPartVisible( false );
@@ -243,22 +243,22 @@ void DiffWidget::loadExtPart( const QString& partName )
 
 void DiffWidget::slotClear()
 {
-  rawDiff = QString();
+  rawDiff = TQString();
   te->clear();
   if ( extPart )
     extPart->closeURL();
 }
 
 // internally for the TextEdit only!
-void DiffWidget::slotAppend( const QString& str )
+void DiffWidget::slotAppend( const TQString& str )
 {
   te->append( str );
 }
 
 // internally for the TextEdit only!
-void DiffWidget::slotAppend( KIO::Job*, const QByteArray& ba )
+void DiffWidget::slotAppend( KIO::Job*, const TQByteArray& ba )
 {
-  slotAppend( QString( ba ) );
+  slotAppend( TQString( ba ) );
 }
 
 void DiffWidget::populateExtPart()
@@ -292,7 +292,7 @@ void DiffWidget::slotFinished()
     populateExtPart();
 }
 
-void DiffWidget::setDiff( const QString& diff )
+void DiffWidget::setDiff( const TQString& diff )
 {
   slotClear();
   rawDiff = diff;
@@ -309,24 +309,24 @@ void DiffWidget::openURL( const KURL& url )
   if ( !job )
     return;
 
-  connect( job, SIGNAL(data( KIO::Job *, const QByteArray & )),
-           this, SLOT(slotAppend( KIO::Job*, const QByteArray& )) );
-  connect( job, SIGNAL(result( KIO::Job * )),
-           this, SLOT(slotFinished()) );
+  connect( job, TQT_SIGNAL(data( KIO::Job *, const TQByteArray & )),
+           this, TQT_SLOT(slotAppend( KIO::Job*, const TQByteArray& )) );
+  connect( job, TQT_SIGNAL(result( KIO::Job * )),
+           this, TQT_SLOT(slotFinished()) );
 }
 
-void DiffWidget::contextMenuEvent( QContextMenuEvent* /* e */ )
+void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ )
 {
-  QPopupMenu* popup = new QPopupMenu( this );
+  TQPopupMenu* popup = new TQPopupMenu( this );
 
   if ( !te->isVisible() )
   {
-    popup->insertItem( i18n("Display &Raw Output"), this, SLOT(showTextEdit()) );
+    popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) );
     popup->insertSeparator();
-    popup->insertItem( i18n("Hide view"), this, SLOT(hideView()) );
+    popup->insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) );
   }
 
-  popup->exec( QCursor::pos() );
+  popup->exec( TQCursor::pos() );
   delete popup;
 }
 
diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h
index 665b1110..dc8568c2 100644
--- a/parts/diff/diffwidget.h
+++ b/parts/diff/diffwidget.h
@@ -12,9 +12,9 @@
 #ifndef _DIFFWIDGET_H_
 #define _DIFFWIDGET_H_
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -34,17 +34,17 @@ class KDiffTextEdit: public QTextEdit
 {
   Q_OBJECT
 public:
-  KDiffTextEdit( QWidget* parent = 0, const char* name = 0 );
+  KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 );
   virtual ~KDiffTextEdit();
   void applySyntaxHighlight();
   void clearSyntaxHighlight();
 
 signals:
-  void externalPartRequested( const QString& partName );
+  void externalPartRequested( const TQString& partName );
 
 protected:
-  virtual QPopupMenu* createPopupMenu( const QPoint& );
-  virtual QPopupMenu* createPopupMenu();
+  virtual TQPopupMenu* createPopupMenu( const TQPoint& );
+  virtual TQPopupMenu* createPopupMenu();
 
 private slots:
   void popupActivated( int );
@@ -53,8 +53,8 @@ private slots:
 
 private:
   static void searchExtParts();
-  static QStringList extParts;
-  static QStringList extPartsTranslated;
+  static TQStringList extParts;
+  static TQStringList extPartsTranslated;
   bool _highlight;
 };
 
@@ -63,33 +63,33 @@ class DiffWidget : public QWidget
     Q_OBJECT
 
 public:
-    DiffWidget( DiffPart * part, QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    DiffWidget( DiffPart * part, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     virtual ~DiffWidget();
 
 public slots:
     /** The URL has to point to a diff file */
     void openURL( const KURL& url );
     /** Pass a diff file in here */
-    void setDiff( const QString& diff );
+    void setDiff( const TQString& diff );
     /** clears the difference viewer */
     void slotClear();
 
 private slots:
     /** appends a piece of "diff" */
-    void slotAppend( const QString& str );
+    void slotAppend( const TQString& str );
     /** overloaded for convenience */
-    void slotAppend( KIO::Job*, const QByteArray& ba );
+    void slotAppend( KIO::Job*, const TQByteArray& ba );
     /** call this when the whole "diff" has been sent.
      *  Don't call slotAppend afterwards!
      */
     void slotFinished();
     void showExtPart();
     void showTextEdit();
-    void loadExtPart( const QString& partName );
+    void loadExtPart( const TQString& partName );
     void hideView();
 
 protected:
-    void contextMenuEvent( QContextMenuEvent* e );
+    void contextMenuEvent( TQContextMenuEvent* e );
 
 private:
     void setExtPartVisible( bool visible );
@@ -101,7 +101,7 @@ private:
     KIO::Job* job;
     KParts::ReadOnlyPart* extPart;
     KTempFile* tempFile;
-    QString rawDiff;
+    TQString rawDiff;
 };
 
 #endif
diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp
index badd4782..77e69705 100644
--- a/parts/distpart/distpart_part.cpp
+++ b/parts/distpart/distpart_part.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "distpart_part.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -37,7 +37,7 @@ typedef KDevGenericFactory DistpartFactory;
 static const KDevPluginInfo data("kdevdistpart");
 K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) )
 
-DistpartPart::DistpartPart(QObject *parent, const char *name, const QStringList &)
+DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &)
   : KDevPlugin(&data, parent, name ? name : "DistpartPart") {
 
     kdDebug(9007) << "DistpartPart::DistpartPart()" << endl;
@@ -46,20 +46,20 @@ DistpartPart::DistpartPart(QObject *parent, const char *name, const QStringList
     setXMLFile("kdevpart_distpart.rc");
 
     m_action =  new KAction( i18n("Distribution && Publishing"), "package", 0,
-                             this, SLOT(show()),
+                             this, TQT_SLOT(show()),
                              actionCollection(), "make_dist" );
 
     m_action->setToolTip(i18n("Make source and binary distribution"));
     m_action->setWhatsThis(i18n("Project distribution & publishing
    Helps users package and publish their software."));
-    //QWhatsThis::add(m_widget, i18n("This will help users package and publish their software."));
+    //TQWhatsThis::add(m_widget, i18n("This will help users package and publish their software."));
 
     m_dlg = new KDialogBase( 0 , "dist_part", false, i18n("Distribution & Publishing"), KDialogBase::Ok|KDialogBase::Cancel);
 
     m_dialog = new DistpartDialog(this, m_dlg );
     m_dlg->setMainWidget(m_dialog);
 
-    connect( m_dlg, SIGNAL(okClicked()), m_dialog, SLOT(slotokayPushButtonPressed()));
-    connect( m_dlg, SIGNAL(cancelClicked()), m_dialog, SLOT(slotcancelPushButtonPressed()));
+    connect( m_dlg, TQT_SIGNAL(okClicked()), m_dialog, TQT_SLOT(slotokayPushButtonPressed()));
+    connect( m_dlg, TQT_SIGNAL(cancelClicked()), m_dialog, TQT_SLOT(slotcancelPushButtonPressed()));
     // Package types
     //RpmPackage = new SpecSupport(this);
     //LsmPackage = new LsmSupport(this);
diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h
index 562974e0..d380d4fd 100644
--- a/parts/distpart/distpart_part.h
+++ b/parts/distpart/distpart_part.h
@@ -23,7 +23,7 @@
 #define __KDEVPART_DISTPART_H__
 
 
-#include 
+#include 
 #include 
 #include 
 
@@ -37,7 +37,7 @@ class DistpartPart : public KDevPlugin {
 
 public:
 
-    DistpartPart(QObject *parent, const char *name, const QStringList &);
+    DistpartPart(TQObject *parent, const char *name, const TQStringList &);
     ~DistpartPart();
     
 public slots:
@@ -46,9 +46,9 @@ public slots:
 
 private:
     packageBase *RpmPackage, *LsmPackage;
-    QGuardedPtr m_dialog;
+    TQGuardedPtr m_dialog;
     KAction *m_action;
-    QGuardedPtr m_dlg;
+    TQGuardedPtr m_dlg;
 };
 
 
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 7942776a..eebbbe36 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -33,61 +33,61 @@
 #include 
 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include "distpart_part.h"
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include "kdevmakefrontend.h"
 #include 
 
-#include 
+#include 
 #include "specsupport.h"
 #include "lsmsupport.h"
 
-DistpartDialog::DistpartDialog(DistpartPart *part, QWidget *parent)
+DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *parent)
         :distpart_ui(parent, "dist_widget"), m_part(part) {
     m_spec = new SpecSupport(m_part);
 
-    connect( customProjectCheckBox, SIGNAL(toggled(bool) ),
-            this, SLOT(slotcustomProjectCheckBoxChanged()));
-    connect( uploadCustomCheckBox, SIGNAL(toggled(bool)),
-            this, SLOT(slotuploadCustomCheckBoxChanged()));
-
-//    connect( okayPushButton, SIGNAL(clicked()),
-//            this, SLOT(slotokayPushButtonPressed()));
-//    connect( cancelPushButton, SIGNAL(clicked()),
-//            this, SLOT(slotcancelPushButtonPressed()));
-/*    connect(help_PushButton, SIGNAL(clicked()),
-            this, SLOT(slothelp_PushButtonPressed()));*/
-    connect( createSrcArchPushButton, SIGNAL(clicked()),
-            this, SLOT(slotcreateSrcArchPushButtonPressed()));
-    connect( resetSrcPushButton, SIGNAL(clicked()),
-            this, SLOT(slotresetSrcPushButtonPressed()));
-
-    connect( genHTMLPushButton, SIGNAL(clicked()),
-            this, SLOT(slotgenHTMLPushButtonPressed()));
-    connect( resetHTMLPushButton, SIGNAL(clicked()),
-            this, SLOT(slotresetHTMLPushButtonPressed()));
-    connect( uploadSubmitPushButton, SIGNAL(clicked()),
-            this, SLOT(slotuploadSubmitPushButtonPressed()));
-    connect( uploadResetPushButton, SIGNAL(clicked()),
-            this, SLOT(slotuploadResetPushButtonPressed()));
-    connect( uploadAddFileToolButton, SIGNAL(clicked()),
-            this, SLOT(slotuploadAddFileToolButtonPressed()));
-    connect( uploadRemoveToolButton, SIGNAL(clicked()),
-            this, SLOT(slotuploadRemoveToolButtonPressed()));
-	connect ( srcDistFileListBox, SIGNAL(clicked(QListBoxItem *item)), this, SLOT(slotRemoveFile(QListBoxItem *item)));
-//	connect(  buildAllPushButton, SIGNAL( clicked() ), this, SLOT( slotbuildAllPushButtonPressed() ));
-//	connect(  exportSPECPushButton, SIGNAL( clicked() ), this, SLOT( slotexportSPECPushButtonPressed( ) ) );
-//	connect(  srcPackagePushButton, SIGNAL( clicked() ), this, SLOT( slotsrcPackagePushButtonPressed() ) );
-//	connect(  importSPECPushButton, SIGNAL( clicked() ), this, SLOT( slotimportSPECPushButtonPressed() ) );
+    connect( customProjectCheckBox, TQT_SIGNAL(toggled(bool) ),
+            this, TQT_SLOT(slotcustomProjectCheckBoxChanged()));
+    connect( uploadCustomCheckBox, TQT_SIGNAL(toggled(bool)),
+            this, TQT_SLOT(slotuploadCustomCheckBoxChanged()));
+
+//    connect( okayPushButton, TQT_SIGNAL(clicked()),
+//            this, TQT_SLOT(slotokayPushButtonPressed()));
+//    connect( cancelPushButton, TQT_SIGNAL(clicked()),
+//            this, TQT_SLOT(slotcancelPushButtonPressed()));
+/*    connect(help_PushButton, TQT_SIGNAL(clicked()),
+            this, TQT_SLOT(slothelp_PushButtonPressed()));*/
+    connect( createSrcArchPushButton, TQT_SIGNAL(clicked()),
+            this, TQT_SLOT(slotcreateSrcArchPushButtonPressed()));
+    connect( resetSrcPushButton, TQT_SIGNAL(clicked()),
+            this, TQT_SLOT(slotresetSrcPushButtonPressed()));
+
+    connect( genHTMLPushButton, TQT_SIGNAL(clicked()),
+            this, TQT_SLOT(slotgenHTMLPushButtonPressed()));
+    connect( resetHTMLPushButton, TQT_SIGNAL(clicked()),
+            this, TQT_SLOT(slotresetHTMLPushButtonPressed()));
+    connect( uploadSubmitPushButton, TQT_SIGNAL(clicked()),
+            this, TQT_SLOT(slotuploadSubmitPushButtonPressed()));
+    connect( uploadResetPushButton, TQT_SIGNAL(clicked()),
+            this, TQT_SLOT(slotuploadResetPushButtonPressed()));
+    connect( uploadAddFileToolButton, TQT_SIGNAL(clicked()),
+            this, TQT_SLOT(slotuploadAddFileToolButtonPressed()));
+    connect( uploadRemoveToolButton, TQT_SIGNAL(clicked()),
+            this, TQT_SLOT(slotuploadRemoveToolButtonPressed()));
+	connect ( srcDistFileListBox, TQT_SIGNAL(clicked(TQListBoxItem *item)), this, TQT_SLOT(slotRemoveFile(TQListBoxItem *item)));
+//	connect(  buildAllPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotbuildAllPushButtonPressed() ));
+//	connect(  exportSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotexportSPECPushButtonPressed( ) ) );
+//	connect(  srcPackagePushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotsrcPackagePushButtonPressed() ) );
+//	connect(  importSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotimportSPECPushButtonPressed() ) );
     loadSettings();
 
 
@@ -103,39 +103,39 @@ DistpartDialog::DistpartDialog(DistpartPart *part, QWidget *parent)
 DistpartDialog::~DistpartDialog() {
 }
 
-//    QPushButton* okayPushButton;
+//    TQPushButton* okayPushButton;
 
 void DistpartDialog::slotokayPushButtonPressed() {
     storeSettings();
 //    accept();
 }
-//    QPushButton* cancelPushButton;
+//    TQPushButton* cancelPushButton;
 
 void DistpartDialog::slotcancelPushButtonPressed() {
 //    reject();
 }
-//    QPushButton* help_PushButton;
+//    TQPushButton* help_PushButton;
 
 /*void DistpartDialog::slothelp_PushButtonPressed() {
-    QMessageBox::about(this,i18n("Distpart Help"),i18n("In order to build a RPM package :\n\t1) Create a source archive\n\t2) Generate a SPEC File\n\t3) Build the package"));
+    TQMessageBox::about(this,i18n("Distpart Help"),i18n("In order to build a RPM package :\n\t1) Create a source archive\n\t2) Generate a SPEC File\n\t3) Build the package"));
 }*/
 
-//    QPushButton* createSrcArchPushButton;
+//    TQPushButton* createSrcArchPushButton;
 void DistpartDialog::slotcreateSrcArchPushButtonPressed() {
     kdDebug() << "Starting archive..." << endl;
-    QString dist = (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? "application/x-bzip2" : "application/x-gzip";
+    TQString dist = (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? "application/x-bzip2" : "application/x-gzip";
 
-    QString filename = m_part->project()->projectDirectory() + "/" + getSourceName();
+    TQString filename = m_part->project()->projectDirectory() + "/" + getSourceName();
 
     KTar tar(filename, dist);
     if ( tar.open(IO_WriteOnly) )
     {
-    	//QStringList files = m_part->project()->distFiles();
+    	//TQStringList files = m_part->project()->distFiles();
 	KProgressDialog *prog = new KProgressDialog( 0, "dialog", i18n("Building Package"), "", true );
 	prog->show();
 	for( uint idx = 0; idx < srcDistFileListBox->numRows(); ++idx)
 	{
-		QString file = srcDistFileListBox->text(idx);
+		TQString file = srcDistFileListBox->text(idx);
 		if ( !tar.addLocalFile( m_part->project()->projectDirectory() + "/" + file, getappNameFormatLineEditText() + "/" + file) )
 		{
 			kdDebug() << "Failed to write file " << file << endl;
@@ -159,7 +159,7 @@ void DistpartDialog::slotcreateSrcArchPushButtonPressed() {
 
 }
 
-//    QPushButton* resetSrcPushButton;
+//    TQPushButton* resetSrcPushButton;
 void DistpartDialog::slotresetSrcPushButtonPressed() {
 	srcDistFileListBox->clear();
 	loadSettings();
@@ -167,24 +167,24 @@ void DistpartDialog::slotresetSrcPushButtonPressed() {
 
 
 
-//    QPushButton* genHTMLPushButton;
+//    TQPushButton* genHTMLPushButton;
 void DistpartDialog::slotgenHTMLPushButtonPressed() {}
 
-//    QPushButton* resetHTMLPushButton;
+//    TQPushButton* resetHTMLPushButton;
 void DistpartDialog::slotresetHTMLPushButtonPressed() {}
 
-//    QToolButton* uploadAddFileToolButton;
+//    TQToolButton* uploadAddFileToolButton;
 void DistpartDialog::slotuploadAddFileToolButtonPressed() {
      uploadFileListBox->insertStringList(KFileDialog::getOpenFileNames());
 }
 
-//    QToolButton* uploadRemoveToolButton;
+//    TQToolButton* uploadRemoveToolButton;
 void DistpartDialog::slotuploadRemoveToolButtonPressed() {
     for(unsigned int i=0; i<  uploadFileListBox->count(); i++)
 	if ( uploadFileListBox->isSelected(i))  uploadFileListBox->removeItem(i);
 }
 
-//    QPushButton* uploadSubmitPushButton;
+//    TQPushButton* uploadSubmitPushButton;
 void DistpartDialog::slotuploadSubmitPushButtonPressed() {
 
     if(getuploadftpkdeorgCheckBoxState() || getuploadAppsKDEcomCheckBoxState())
@@ -192,11 +192,11 @@ void DistpartDialog::slotuploadSubmitPushButtonPressed() {
     else {
         for(unsigned int i=0; i< uploadFileListBox->count(); i++)
 	    KIO::NetAccess::copy(KURL::fromPathOrURL( uploadFileListBox->text(i) ),
-                    KURL::fromPathOrURL( getuploadURLLineEditText() +  uploadFileListBox->text(i).replace(QRegExp("[^/]*/"),"") ));
+                    KURL::fromPathOrURL( getuploadURLLineEditText() +  uploadFileListBox->text(i).replace(TQRegExp("[^/]*/"),"") ));
     }
 }
 
-//    QPushButton* uploadResetPushButton;
+//    TQPushButton* uploadResetPushButton;
 void DistpartDialog::slotuploadResetPushButtonPressed() {
      uploadFileListBox->clear();
 }
@@ -205,7 +205,7 @@ void DistpartDialog::slotuploadResetPushButtonPressed() {
 // accessors and mutators
 
 
-//    QCheckBox* customProjectCheckBox;
+//    TQCheckBox* customProjectCheckBox;
 void DistpartDialog::slotcustomProjectCheckBoxChanged() {
     kdDebug () << "New State" <<  customProjectCheckBox->isChecked() << endl;
      sourceOptionsGroupBox->setEnabled( customProjectCheckBox->isChecked());
@@ -219,7 +219,7 @@ void DistpartDialog::setcustomProjectCheckBoxState(bool state) {
      customProjectCheckBox->setChecked(state);
 }
 
-//  QCheckBox* uploadCustomCheckBox;
+//  TQCheckBox* uploadCustomCheckBox;
 void DistpartDialog::slotuploadCustomCheckBoxChanged() {
      uploadURLLineEdit->setEnabled( uploadCustomCheckBox->isChecked());
 }
@@ -234,7 +234,7 @@ void DistpartDialog::setuploadCustomCheckBoxState(bool state) {
 
 // Add accessors and mutators for the following
 
-//   QCheckBox* bzipCheckBox;
+//   TQCheckBox* bzipCheckBox;
 bool DistpartDialog::getbzipCheckBoxState() {
     return  bzipCheckBox->isChecked();
 }
@@ -243,7 +243,7 @@ void DistpartDialog::setbzipCheckBoxState(bool state) {
      bzipCheckBox->setChecked(state);
 }
 
-//    QCheckBox* appIconCheckBox;
+//    TQCheckBox* appIconCheckBox;
 bool DistpartDialog::getappIconCheckBoxState() {
     return  appIconCheckBox->isChecked();
 }
@@ -252,7 +252,7 @@ void DistpartDialog::setappIconCheckBoxState(bool state) {
      appIconCheckBox->setChecked(state);
 }
 
-//    QCheckBox* genHTMLCheckBox;
+//    TQCheckBox* genHTMLCheckBox;
 bool DistpartDialog::getgenHTMLCheckBoxState() {
     return  genHTMLCheckBox->isChecked();
 }
@@ -261,7 +261,7 @@ void DistpartDialog::setgenHTMLCheckBoxState(bool state) {
      genHTMLCheckBox->setChecked(state);
 }
 
-//    QCheckBox* useRPMInfoCheckBox;
+//    TQCheckBox* useRPMInfoCheckBox;
 bool DistpartDialog::getuseRPMInfoCheckBoxState() {
     return  useRPMInfoCheckBox->isChecked();
 }
@@ -270,7 +270,7 @@ void DistpartDialog::setuseRPMInfoCheckBoxState(bool state) {
      useRPMInfoCheckBox->setChecked(state);
 }
 
-//    QCheckBox* uploadAppsKDEcomCheckBox;
+//    TQCheckBox* uploadAppsKDEcomCheckBox;
 bool DistpartDialog::getuploadAppsKDEcomCheckBoxState() {
     return  uploadAppsKDEcomCheckBox->isChecked();
 }
@@ -279,7 +279,7 @@ void DistpartDialog::setuploadAppsKDEcomCheckBoxState(bool state) {
      uploadAppsKDEcomCheckBox->setChecked(state);
 }
 
-//    QCheckBox* uploadftpkdeorgCheckBox;
+//    TQCheckBox* uploadftpkdeorgCheckBox;
 bool DistpartDialog::getuploadftpkdeorgCheckBoxState() {
     return  uploadftpkdeorgCheckBox->isChecked();
 }
@@ -288,7 +288,7 @@ void DistpartDialog::setuploadftpkdeorgCheckBoxState(bool state) {
      uploadftpkdeorgCheckBox->setChecked(state);
 }
 
-//    QCheckBox* devPackageCheckBox;
+//    TQCheckBox* devPackageCheckBox;
 bool DistpartDialog::getdevPackageCheckBoxState() {
     return  devPackageCheckBox->isChecked();
 }
@@ -297,7 +297,7 @@ void DistpartDialog::setdevPackageCheckBoxState(bool state) {
      devPackageCheckBox->setChecked(state);
 }
 
-//    QCheckBox* docsPackageCheckBox;
+//    TQCheckBox* docsPackageCheckBox;
 bool DistpartDialog::getdocsPackageCheckBoxState() {
     return  docsPackageCheckBox->isChecked();
 }
@@ -306,98 +306,98 @@ void DistpartDialog::setdocsPackageCheckBoxState(bool state) {
      docsPackageCheckBox->setChecked(state);
 }
 
-//    QLineEdit* archNameFormatLineEdit;
-QString DistpartDialog::getarchNameFormatLineEditText() {
+//    TQLineEdit* archNameFormatLineEdit;
+TQString DistpartDialog::getarchNameFormatLineEditText() {
     return  archNameFormatLineEdit->text();
 }
 
-void DistpartDialog::setarchNameFormatLineEditText(QString text) {
+void DistpartDialog::setarchNameFormatLineEditText(TQString text) {
      archNameFormatLineEdit->setText(text);
 }
 
-//    QLineEdit* appNameLineEdit;
-QString DistpartDialog::getappNameFormatLineEditText() {
+//    TQLineEdit* appNameLineEdit;
+TQString DistpartDialog::getappNameFormatLineEditText() {
     return  appNameLineEdit->text();
 }
 
-void DistpartDialog::setappNameFormatLineEditText(QString text) {
+void DistpartDialog::setappNameFormatLineEditText(TQString text) {
      appNameLineEdit->setText(text);
 }
 
-//    QLineEdit* summaryLineEdit;
-QString DistpartDialog::getsummaryLineEditText() {
+//    TQLineEdit* summaryLineEdit;
+TQString DistpartDialog::getsummaryLineEditText() {
     return  summaryLineEdit->text();
 }
 
-void DistpartDialog::setsummaryLineEditText(QString text) {
+void DistpartDialog::setsummaryLineEditText(TQString text) {
      summaryLineEdit->setText(text);
 }
 
-//    QLineEdit* groupLineEdit;
-QString DistpartDialog::getgroupLineEditText() {
+//    TQLineEdit* groupLineEdit;
+TQString DistpartDialog::getgroupLineEditText() {
     return  groupLineEdit->text();
 }
 
-void DistpartDialog::setgroupLineEditText(QString text) {
+void DistpartDialog::setgroupLineEditText(TQString text) {
      groupLineEdit->setText(text);
 }
 
-//    QLineEdit* releaseLineEdit;
-QString DistpartDialog::getreleaseLineEditText() {
+//    TQLineEdit* releaseLineEdit;
+TQString DistpartDialog::getreleaseLineEditText() {
     return  releaseLineEdit->text();
 }
 
-void DistpartDialog::setreleaseLineEditText(QString text) {
+void DistpartDialog::setreleaseLineEditText(TQString text) {
      releaseLineEdit->setText(text);
 }
 
-//    QLineEdit* VersionLineEdit;
-QString DistpartDialog::getversionLineEditText() {
+//    TQLineEdit* VersionLineEdit;
+TQString DistpartDialog::getversionLineEditText() {
     return  versionLineEdit->text();
 }
 
-void DistpartDialog::setversionLineEditText(QString text) {
+void DistpartDialog::setversionLineEditText(TQString text) {
      versionLineEdit->setText( text );
 }
 
-//    QLineEdit* VendorLineEdit;
-QString DistpartDialog::getvendorLineEditText() {
+//    TQLineEdit* VendorLineEdit;
+TQString DistpartDialog::getvendorLineEditText() {
     return  vendorLineEdit->text();
 }
 
-void DistpartDialog::setvendorLineEditText(QString text) {
+void DistpartDialog::setvendorLineEditText(TQString text) {
      vendorLineEdit->setText(text);
 }
 
-//    QLineEdit* LicenseLineEdit;
-QString DistpartDialog::getlicenseLineEditText() {
+//    TQLineEdit* LicenseLineEdit;
+TQString DistpartDialog::getlicenseLineEditText() {
     return  licenseLineEdit->text();
 }
 
-void DistpartDialog::setlicenseLineEditText(QString text) {
+void DistpartDialog::setlicenseLineEditText(TQString text) {
      licenseLineEdit->setText(text);
 }
 
-//    QLineEdit* uploadURLLineEdit;
-QString DistpartDialog::getuploadURLLineEditText() {
+//    TQLineEdit* uploadURLLineEdit;
+TQString DistpartDialog::getuploadURLLineEditText() {
     return  uploadURLLineEdit->text();
 }
 
-void DistpartDialog::setuploadURLLineEditText(QString text) {
+void DistpartDialog::setuploadURLLineEditText(TQString text) {
      uploadURLLineEdit->setText(text);
 }
 
-//    QLineEdit* PackagerLineEdit;
-QString DistpartDialog::getpackagerLineEditText() {
+//    TQLineEdit* PackagerLineEdit;
+TQString DistpartDialog::getpackagerLineEditText() {
     return  packagerLineEdit->text();
 }
 
-void DistpartDialog::setpackagerLineEditText(QString text) {
+void DistpartDialog::setpackagerLineEditText(TQString text) {
      packagerLineEdit->setText(text);
 }
 
-//    QComboBox* archComboBox;
-QString DistpartDialog::getarchComboBoxText() {
+//    TQComboBox* archComboBox;
+TQString DistpartDialog::getarchComboBoxText() {
     return  archComboBox->currentText();
 }
 
@@ -409,8 +409,8 @@ void DistpartDialog::setarchComboBoxItem(int item) {
      archComboBox->setCurrentItem( item );
 }
 
-//    QListBox* uploadFileListBox;
-QString DistpartDialog::getuploadFileListBoxText() {
+//    TQListBox* uploadFileListBox;
+TQString DistpartDialog::getuploadFileListBoxText() {
     return  uploadFileListBox->currentText();
 }
 
@@ -422,8 +422,8 @@ void DistpartDialog::setuploadFileListBoxItem(int item) {
      uploadFileListBox->setCurrentItem( item);
 }
 
-//    QListBox* srcDistFileListBox;
-QString DistpartDialog::getsrcDistFileListBoxText() {
+//    TQListBox* srcDistFileListBox;
+TQString DistpartDialog::getsrcDistFileListBoxText() {
     return  srcDistFileListBox->currentText ();
 }
 
@@ -435,33 +435,33 @@ void DistpartDialog::setsrcDistFileListBoxItem(int item) {
      srcDistFileListBox->setCurrentItem( item );
 }
 
-//    QMultiLineEdit* projectDescriptionMultilineEdit;
-QString DistpartDialog::getprojectDescriptionMultilineEditText() {
+//    TQMultiLineEdit* projectDescriptionMultilineEdit;
+TQString DistpartDialog::getprojectDescriptionMultilineEditText() {
     return  projectDescriptionMultilineEdit->text();
 }
 
-void DistpartDialog::setprojectDescriptionMultilineEditText(QString text) {
+void DistpartDialog::setprojectDescriptionMultilineEditText(TQString text) {
      projectDescriptionMultilineEdit->setText(text);
 }
 
-QString DistpartDialog::getprojectChangelogMultilineEditText() {
+TQString DistpartDialog::getprojectChangelogMultilineEditText() {
     return  projectChangelogMultilineEdit->text();
 }
 
-void DistpartDialog::setprojectChangelogMultilineEditText(QString text) {
+void DistpartDialog::setprojectChangelogMultilineEditText(TQString text) {
      projectChangelogMultilineEdit->setText(text);
 }
 
-QString DistpartDialog::getSourceName() {
-    QString name = (getcustomProjectCheckBoxState()) ? getarchNameFormatLineEditText() : QString("%n-%v");
+TQString DistpartDialog::getSourceName() {
+    TQString name = (getcustomProjectCheckBoxState()) ? getarchNameFormatLineEditText() : TQString("%n-%v");
     name += (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? ".tar.bz2" : ".tar.gz";
-    return name.replace(QRegExp("%n"),getappNameFormatLineEditText())
-	.replace(QRegExp("%v"),getversionLineEditText())
-	.replace(QRegExp("%d"),QDate::currentDate().toString("yyyyMMdd"));
+    return name.replace(TQRegExp("%n"),getappNameFormatLineEditText())
+	.replace(TQRegExp("%v"),getversionLineEditText())
+	.replace(TQRegExp("%d"),TQDate::currentDate().toString("yyyyMMdd"));
 }
 
 void DistpartDialog::loadSettings() {
-    QDomDocument &dom = *m_part->projectDom();
+    TQDomDocument &dom = *m_part->projectDom();
 
      srcDistFileListBox->insertStringList( m_part->project()->distFiles() );
 
@@ -499,7 +499,7 @@ void DistpartDialog::loadSettings() {
 }
 
 void DistpartDialog::storeSettings() {
-    QDomDocument &dom = *m_part->projectDom();
+    TQDomDocument &dom = *m_part->projectDom();
 
     // First Tab
     DomUtil::writeBoolEntry(dom,"/dist/custom",getcustomProjectCheckBoxState());
@@ -584,14 +584,14 @@ void DistpartDialog::slotsrcPackagePushButtonPressed( )
 
 
 void DistpartDialog::slotAddFileButtonPressed(){
-	QStringList filenames = KFileDialog::getOpenFileNames();
+	TQStringList filenames = KFileDialog::getOpenFileNames();
 	for(uint count =0; count< filenames.size(); count++){
-		QString base = m_part->project()->projectDirectory() +"/";
+		TQString base = m_part->project()->projectDirectory() +"/";
 		srcDistFileListBox->insertItem(filenames[count].remove(base));
 	}
 }
 
-void DistpartDialog::slotRemoveFile(QListBoxItem *item){
+void DistpartDialog::slotRemoveFile(TQListBoxItem *item){
 	if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").arg( item->text() ), i18n("Remove File") )){
 	for(uint count =0; count< srcDistFileListBox->numRows(); count++){
 		if ( item == srcDistFileListBox->item(count)){
diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h
index 36d3f9ba..87e2c2fd 100644
--- a/parts/distpart/distpart_widget.h
+++ b/parts/distpart/distpart_widget.h
@@ -21,16 +21,16 @@
 #define __DISTPART_WIDGET_H__
 
 
-#include 
-#include 
+#include 
+#include 
 #include "distpart_ui.h"
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 class KDevProject;
 class DistpartPart;
@@ -49,7 +49,7 @@ class DistpartDialog : public distpart_ui {
 
 public:
 
-    DistpartDialog(DistpartPart *part, QWidget *parent);
+    DistpartDialog(DistpartPart *part, TQWidget *parent);
     ~DistpartDialog();
 
 signals:
@@ -72,37 +72,37 @@ signals:
 
 
 public slots:
-    //    QPushButton* okayPushButton;
+    //    TQPushButton* okayPushButton;
 
 
     void slotokayPushButtonPressed();
-    //    QPushButton* cancelPushButton;
+    //    TQPushButton* cancelPushButton;
     void slotcancelPushButtonPressed();
-    //    QPushButton* help_PushButton;
+    //    TQPushButton* help_PushButton;
 //    void slothelp_PushButtonPressed();
-    //    QPushButton* createSrcArchPushButton;
+    //    TQPushButton* createSrcArchPushButton;
     void slotcreateSrcArchPushButtonPressed();
-    //    QPushButton* resetSrcPushButton;
+    //    TQPushButton* resetSrcPushButton;
     void slotresetSrcPushButtonPressed();
 
-    //    QPushButton* genHTMLPushButton;
+    //    TQPushButton* genHTMLPushButton;
     void slotgenHTMLPushButtonPressed();
-    //    QPushButton* resetHTMLPushButton;
+    //    TQPushButton* resetHTMLPushButton;
     void slotresetHTMLPushButtonPressed();
-    //    QToolButton* uploadAddFileToolButton;
+    //    TQToolButton* uploadAddFileToolButton;
     void slotuploadAddFileToolButtonPressed();
-    //    QToolButton* uploadRemoveToolButton;
+    //    TQToolButton* uploadRemoveToolButton;
     void slotuploadRemoveToolButtonPressed();
-    //    QPushButton* uploadSubmitPushButton;
+    //    TQPushButton* uploadSubmitPushButton;
     void slotuploadSubmitPushButtonPressed();
-    //    QPushButton* uploadResetPushButton;
+    //    TQPushButton* uploadResetPushButton;
     void slotuploadResetPushButtonPressed();
 
     // Connect Slots to the following widgets and add
     // accessors and mutators
-    //    QCheckBox* customProjectCheckBox;
+    //    TQCheckBox* customProjectCheckBox;
     void slotcustomProjectCheckBoxChanged();
-    //  QCheckBox* uploadCustomCheckBox;
+    //  TQCheckBox* uploadCustomCheckBox;
     void slotuploadCustomCheckBoxChanged();
 
     void slotbuildAllPushButtonPressed();
@@ -110,7 +110,7 @@ public slots:
     void slotimportSPECPushButtonPressed();
     void slotsrcPackagePushButtonPressed();
 	void slotAddFileButtonPressed();
-	void slotRemoveFile(QListBoxItem *item);
+	void slotRemoveFile(TQListBoxItem *item);
 
 public:
     bool getcustomProjectCheckBoxState();
@@ -120,80 +120,80 @@ public:
 
     // Add accessors and mutators for the following
 
-    //   QCheckBox* bzipCheckBox;
+    //   TQCheckBox* bzipCheckBox;
     bool getbzipCheckBoxState();
     void setbzipCheckBoxState(bool state);
-    //    QCheckBox* appIconCheckBox;
+    //    TQCheckBox* appIconCheckBox;
     bool getappIconCheckBoxState();
     void setappIconCheckBoxState(bool state);
-    //    QCheckBox* genHTMLCheckBox;
+    //    TQCheckBox* genHTMLCheckBox;
     bool getgenHTMLCheckBoxState();
     void setgenHTMLCheckBoxState(bool state);
-    //    QCheckBox* useRPMInfoCheckBox;
+    //    TQCheckBox* useRPMInfoCheckBox;
     bool getuseRPMInfoCheckBoxState();
     void setuseRPMInfoCheckBoxState(bool state);
-    //    QCheckBox* uploadAppsKDEcomCheckBox;
+    //    TQCheckBox* uploadAppsKDEcomCheckBox;
     bool getuploadAppsKDEcomCheckBoxState();
     void setuploadAppsKDEcomCheckBoxState(bool state);
-    //    QCheckBox* uploadftpkdeorgCheckBox;
+    //    TQCheckBox* uploadftpkdeorgCheckBox;
     bool getuploadftpkdeorgCheckBoxState();
     void setuploadftpkdeorgCheckBoxState(bool state);
-    //    QCheckBox* devPackageCheckBox;
+    //    TQCheckBox* devPackageCheckBox;
     bool getdevPackageCheckBoxState();
     void setdevPackageCheckBoxState(bool state);
-    //    QCheckBox* docsPackageCheckBox;
+    //    TQCheckBox* docsPackageCheckBox;
     bool getdocsPackageCheckBoxState();
     void setdocsPackageCheckBoxState(bool state);
-    //    QLineEdit* archNameFormatLineEdit;
-    QString getarchNameFormatLineEditText();
-    void setarchNameFormatLineEditText(QString text);
-    //    QLineEdit* appNameLineEdit;
-    QString getappNameFormatLineEditText();
-    void setappNameFormatLineEditText(QString text);
-    //    QLineEdit* summaryLineEdit;
-    QString getsummaryLineEditText();
-    void setsummaryLineEditText(QString text);
-    //    QLineEdit* groupLineEdit;
-    QString getgroupLineEditText();
-    void setgroupLineEditText(QString text);
-    //    QLineEdit* releaseLineEdit;
-    QString getreleaseLineEditText();
-    void setreleaseLineEditText(QString text);
-    //    QLineEdit* VersionLineEdit;
-    QString getversionLineEditText();
-    void setversionLineEditText(QString text);
-    //    QLineEdit* VendorLineEdit;
-    QString getvendorLineEditText();
-    void setvendorLineEditText(QString text);
-    //    QLineEdit* LicenseLineEdit;
-    QString getlicenseLineEditText();
-    void setlicenseLineEditText(QString text);
-    //    QLineEdit* uploadURLLineEdit;
-    QString getuploadURLLineEditText();
-    void setuploadURLLineEditText(QString text);
-    //    QLineEdit* PackagerLineEdit;
-    QString getpackagerLineEditText();
-    void setpackagerLineEditText(QString text);
-    //    QComboBox* archComboBox;
-    QString getarchComboBoxText();
+    //    TQLineEdit* archNameFormatLineEdit;
+    TQString getarchNameFormatLineEditText();
+    void setarchNameFormatLineEditText(TQString text);
+    //    TQLineEdit* appNameLineEdit;
+    TQString getappNameFormatLineEditText();
+    void setappNameFormatLineEditText(TQString text);
+    //    TQLineEdit* summaryLineEdit;
+    TQString getsummaryLineEditText();
+    void setsummaryLineEditText(TQString text);
+    //    TQLineEdit* groupLineEdit;
+    TQString getgroupLineEditText();
+    void setgroupLineEditText(TQString text);
+    //    TQLineEdit* releaseLineEdit;
+    TQString getreleaseLineEditText();
+    void setreleaseLineEditText(TQString text);
+    //    TQLineEdit* VersionLineEdit;
+    TQString getversionLineEditText();
+    void setversionLineEditText(TQString text);
+    //    TQLineEdit* VendorLineEdit;
+    TQString getvendorLineEditText();
+    void setvendorLineEditText(TQString text);
+    //    TQLineEdit* LicenseLineEdit;
+    TQString getlicenseLineEditText();
+    void setlicenseLineEditText(TQString text);
+    //    TQLineEdit* uploadURLLineEdit;
+    TQString getuploadURLLineEditText();
+    void setuploadURLLineEditText(TQString text);
+    //    TQLineEdit* PackagerLineEdit;
+    TQString getpackagerLineEditText();
+    void setpackagerLineEditText(TQString text);
+    //    TQComboBox* archComboBox;
+    TQString getarchComboBoxText();
     int getarchComboBoxItem();
     void setarchComboBoxItem(int item);
-    //    QListBox* uploadFileListBox;
-    QString getuploadFileListBoxText();
+    //    TQListBox* uploadFileListBox;
+    TQString getuploadFileListBoxText();
     int getuploadFileListBoxItem();
     void setuploadFileListBoxItem(int item);
-    //    QListBox* srcDistFileListBox;
-    QString getsrcDistFileListBoxText();
+    //    TQListBox* srcDistFileListBox;
+    TQString getsrcDistFileListBoxText();
     int getsrcDistFileListBoxItem();
     void setsrcDistFileListBoxItem(int item);
-    //    QMultiLineEdit* projectDescriptionMultilineEdit;
-    QString getprojectDescriptionMultilineEditText();
-    void setprojectDescriptionMultilineEditText(QString text);
+    //    TQMultiLineEdit* projectDescriptionMultilineEdit;
+    TQString getprojectDescriptionMultilineEditText();
+    void setprojectDescriptionMultilineEditText(TQString text);
 
-    QString getprojectChangelogMultilineEditText();
-    void setprojectChangelogMultilineEditText(QString text);
+    TQString getprojectChangelogMultilineEditText();
+    void setprojectChangelogMultilineEditText(TQString text);
 
-    QString getSourceName();
+    TQString getSourceName();
 
 private:
     void loadSettings();
@@ -203,7 +203,7 @@ private:
 
     SpecSupport *m_spec;
     DistpartPart *m_part;
-    QString dir;
+    TQString dir;
 };
 
 
diff --git a/parts/distpart/lsmsupport.cpp b/parts/distpart/lsmsupport.cpp
index b9a71e8b..5e3fcd89 100644
--- a/parts/distpart/lsmsupport.cpp
+++ b/parts/distpart/lsmsupport.cpp
@@ -26,7 +26,7 @@ LsmSupport::LsmSupport() : packageBase() {
 LsmSupport::~LsmSupport() {
 }
 
-QString LsmSupport::generatePackage( )
+TQString LsmSupport::generatePackage( )
 {
 	return "";
 }
diff --git a/parts/distpart/lsmsupport.h b/parts/distpart/lsmsupport.h
index 4d13bc8a..ce52194b 100644
--- a/parts/distpart/lsmsupport.h
+++ b/parts/distpart/lsmsupport.h
@@ -29,7 +29,7 @@ class LsmSupport : public packageBase
 public:
     LsmSupport();
     virtual ~LsmSupport();
-QString generatePackage( );
+TQString generatePackage( );
 };
 
 #endif
diff --git a/parts/distpart/packagebase.cpp b/parts/distpart/packagebase.cpp
index 797c2613..f0c2db37 100644
--- a/parts/distpart/packagebase.cpp
+++ b/parts/distpart/packagebase.cpp
@@ -6,112 +6,112 @@ packageBase::packageBase() {
 
 packageBase::~packageBase() {}
 
-QString packageBase::getAppName() {
+TQString packageBase::getAppName() {
     return AppName;
 }
 
-QString packageBase::getAppVersion() {
+TQString packageBase::getAppVersion() {
     return AppVersion;
 }
 
-QString packageBase::getAppRevision() {
+TQString packageBase::getAppRevision() {
     return AppRevision;
 }
 
-QString packageBase::getAppGroup() {
+TQString packageBase::getAppGroup() {
     return AppGroup;
 }
 
-QString packageBase::getAppPackager() {
+TQString packageBase::getAppPackager() {
     return AppPackager;
 }
 
-QString packageBase::getAppURL() {
+TQString packageBase::getAppURL() {
     return AppURL;
 }
 
-QString packageBase::getAppSummary() {
+TQString packageBase::getAppSummary() {
     return AppSummary;
 }
 
-QString packageBase::getAppVendor() {
+TQString packageBase::getAppVendor() {
     return AppVendor;
 }
 
-QString packageBase::getAppLicense() {
+TQString packageBase::getAppLicense() {
     return AppLicense;
 }
 
-QString packageBase::getAppArch() {
+TQString packageBase::getAppArch() {
     return AppArch;
 }
 
-QString packageBase::getAppDescription() {
+TQString packageBase::getAppDescription() {
     return AppDescription;
 }
 
-QString packageBase::getAppChangelog() {
+TQString packageBase::getAppChangelog() {
     return AppChangelog;
 }
 
-QString packageBase::getAppSource() {
+TQString packageBase::getAppSource() {
     return AppSource;
 }
 
-QStringList packageBase::getAppFileList() {
+TQStringList packageBase::getAppFileList() {
     return AppFileList;
 }
 
-void packageBase::setAppName(const QString& name) {
+void packageBase::setAppName(const TQString& name) {
     AppName = name;
 }
 
-void packageBase::setAppVersion(const QString& version){
+void packageBase::setAppVersion(const TQString& version){
    AppVersion = version;
 }
 
-void packageBase::setAppRevision(const QString& revision){
+void packageBase::setAppRevision(const TQString& revision){
     AppRevision = revision;
 }
 
-void packageBase::setAppGroup(const QString& group){
+void packageBase::setAppGroup(const TQString& group){
    AppGroup = group;
 }
 
-void packageBase::setAppPackager(const QString& packager){
+void packageBase::setAppPackager(const TQString& packager){
     AppPackager = packager;
 }
 
-void packageBase::setAppURL(const QString& url)
+void packageBase::setAppURL(const TQString& url)
 {
     AppURL = url;
 }
 
-void packageBase::setAppSummary(const QString& summary){
+void packageBase::setAppSummary(const TQString& summary){
     AppSummary = summary;
 }
 
-void packageBase::setAppVendor(const QString& vendor){
+void packageBase::setAppVendor(const TQString& vendor){
     AppVendor = vendor;
 }
 
-void packageBase::setAppLicense(const QString& licence){
+void packageBase::setAppLicense(const TQString& licence){
     AppLicense = licence;
 }
 
-void packageBase::setAppArch(const QString& arch){
+void packageBase::setAppArch(const TQString& arch){
     AppArch = arch;
 }
 
-void packageBase::setAppDescription(const QString& description){
+void packageBase::setAppDescription(const TQString& description){
     AppDescription = description;
 }
 
-void packageBase::setAppChangelog(const QString& changelog){
+void packageBase::setAppChangelog(const TQString& changelog){
     AppChangelog = changelog;
 }
 
-void packageBase::setAppFileList( const QStringList & list )
+void packageBase::setAppFileList( const TQStringList & list )
 {
 	AppFileList = list;
 }
diff --git a/parts/distpart/packagebase.h b/parts/distpart/packagebase.h
index 95d7d813..b3ba172e 100644
--- a/parts/distpart/packagebase.h
+++ b/parts/distpart/packagebase.h
@@ -21,7 +21,7 @@
 #define __PACKAGEBASE_H__
 
 #include 
-#include 
+#include 
 
 class packageBase
 {
@@ -31,54 +31,54 @@ public:
    virtual ~packageBase();
    
 // Generic accessors and mutators for child classes
-   virtual QString generatePackage( ) = 0 ;
+   virtual TQString generatePackage( ) = 0 ;
    //virtual bool loadFile(KURL theFile) = 0;
    //virtual bool saveFile(KURL theFile) = 0;
 
-   virtual QString getAppName();
-   virtual QString getAppVersion();
-   virtual QString getAppRevision();
-   virtual QString getAppGroup();
-   virtual QString getAppPackager();
-   virtual QString getAppURL();
-   virtual QString getAppSummary();
-   virtual QString getAppVendor();
-   virtual QString getAppLicense();
-   virtual QString getAppArch();
-   virtual QString getAppDescription();
-   virtual QString getAppChangelog();
-   virtual QString getAppSource();
-   virtual QStringList getAppFileList();
+   virtual TQString getAppName();
+   virtual TQString getAppVersion();
+   virtual TQString getAppRevision();
+   virtual TQString getAppGroup();
+   virtual TQString getAppPackager();
+   virtual TQString getAppURL();
+   virtual TQString getAppSummary();
+   virtual TQString getAppVendor();
+   virtual TQString getAppLicense();
+   virtual TQString getAppArch();
+   virtual TQString getAppDescription();
+   virtual TQString getAppChangelog();
+   virtual TQString getAppSource();
+   virtual TQStringList getAppFileList();
    
-   virtual void setAppName(const QString&);
-   virtual void setAppVersion(const QString&);
-   virtual void setAppRevision(const QString&);
-   virtual void setAppGroup(const QString&);
-   virtual void setAppPackager(const QString&);
-   virtual void setAppURL(const QString&);
-   virtual void setAppSummary(const QString&);
-   virtual void setAppVendor(const QString&);
-   virtual void setAppLicense(const QString&);
-   virtual void setAppArch(const QString&);
-   virtual void setAppDescription(const QString&);
-   virtual void setAppChangelog(const QString&);
-   virtual void setAppFileList(const QStringList &list);
+   virtual void setAppName(const TQString&);
+   virtual void setAppVersion(const TQString&);
+   virtual void setAppRevision(const TQString&);
+   virtual void setAppGroup(const TQString&);
+   virtual void setAppPackager(const TQString&);
+   virtual void setAppURL(const TQString&);
+   virtual void setAppSummary(const TQString&);
+   virtual void setAppVendor(const TQString&);
+   virtual void setAppLicense(const TQString&);
+   virtual void setAppArch(const TQString&);
+   virtual void setAppDescription(const TQString&);
+   virtual void setAppChangelog(const TQString&);
+   virtual void setAppFileList(const TQStringList &list);
    
    private:
-   	QString AppName;
-	QString AppVersion;
-	QString AppRevision;
-	QString AppGroup;
-	QString AppPackager;
-	QString AppURL;
-	QString AppSummary;
-	QString AppVendor;
-	QString AppLicense;
-	QString AppArch;
-	QString AppDescription;
-	QString AppChangelog;
-	QString AppSource;
-	QStringList AppFileList;
+   	TQString AppName;
+	TQString AppVersion;
+	TQString AppRevision;
+	TQString AppGroup;
+	TQString AppPackager;
+	TQString AppURL;
+	TQString AppSummary;
+	TQString AppVendor;
+	TQString AppLicense;
+	TQString AppArch;
+	TQString AppDescription;
+	TQString AppChangelog;
+	TQString AppSource;
+	TQStringList AppFileList;
 };
 
 #endif
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index e3ca8a65..ab4d684f 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -27,25 +27,25 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-//#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+//#include 
+#include 
+#include 
+#include 
 
 /// \FIXME This is at least the fifth place in the kdevelop code something like this exists
-QString QRegExp_escape(const QString& str )
+TQString QRegExp_escape(const TQString& str )
 {
 #if QT_VERSION >= 0x030100
-    return QRegExp::escape(str);
+    return TQRegExp::escape(str);
 #else
     // this block is copyrighted by Trolltech AS (GPL)
     static const char meta[] = "$()*+.?[\\]^{|}";
-    QString quoted = str;
+    TQString quoted = str;
     int i = 0;
 
     while ( i < (int) quoted.length() ) {
@@ -60,21 +60,21 @@ QString QRegExp_escape(const QString& str )
 SpecSupport::SpecSupport(DistpartPart *part) : packageBase(), m_part(part) {
 	dir = "";
 
-//     srcPackagePushButton = new QPushButton(i18n("Src Package"),area());
-//     buildAllPushButton = new QPushButton(i18n("Src/Binary Packages"),area());
-//     exportSPECPushButton = new QPushButton(i18n("Export SPEC File"),area());
-//     importSPECPushButton = new QPushButton(i18n("Import SPEC File"),area());
+//     srcPackagePushButton = new TQPushButton(i18n("Src Package"),area());
+//     buildAllPushButton = new TQPushButton(i18n("Src/Binary Packages"),area());
+//     exportSPECPushButton = new TQPushButton(i18n("Export SPEC File"),area());
+//     importSPECPushButton = new TQPushButton(i18n("Import SPEC File"),area());
 //
 //
 //
-//     connect(buildAllPushButton, SIGNAL(clicked()),
-//             this, SLOT(slotbuildAllPushButtonPressed()));
-//     connect(exportSPECPushButton, SIGNAL(clicked()),
-//             this, SLOT(slotexportSPECPushButtonPressed()));
-//     connect(importSPECPushButton, SIGNAL(clicked()),
-//             this, SLOT(slotimportSPECPushButtonPressed()));
-//     connect(srcPackagePushButton, SIGNAL(clicked()),
-//             this, SLOT(slotsrcPackagePushButtonPressed()));
+//     connect(buildAllPushButton, TQT_SIGNAL(clicked()),
+//             this, TQT_SLOT(slotbuildAllPushButtonPressed()));
+//     connect(exportSPECPushButton, TQT_SIGNAL(clicked()),
+//             this, TQT_SLOT(slotexportSPECPushButtonPressed()));
+//     connect(importSPECPushButton, TQT_SIGNAL(clicked()),
+//             this, TQT_SLOT(slotimportSPECPushButtonPressed()));
+//     connect(srcPackagePushButton, TQT_SIGNAL(clicked()),
+//             this, TQT_SLOT(slotsrcPackagePushButtonPressed()));
 
     parseDotRpmmacros();
 }
@@ -82,14 +82,14 @@ SpecSupport::SpecSupport(DistpartPart *part) : packageBase(), m_part(part) {
 SpecSupport::~SpecSupport() {
 }
 
-//    QPushButton* buildAllPushButton;
+//    TQPushButton* buildAllPushButton;
 void SpecSupport::slotbuildAllPushButtonPressed() {
-    QMap::Iterator it;
-    QFile file1(dir + "/" + getAppSource());
-    QFile file2(*(map.find("_sourcedir")) + "/" + getAppSource());
+    TQMap::Iterator it;
+    TQFile file1(dir + "/" + getAppSource());
+    TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource());
     if (!file2.exists()) {
 	if (!file1.exists()) {
-	    QMessageBox::critical(0 ,i18n("Error"),i18n("You need to create a source archive first."));
+	    TQMessageBox::critical(0 ,i18n("Error"),i18n("You need to create a source archive first."));
 	    return;
 	}
 	else
@@ -102,15 +102,15 @@ void SpecSupport::slotbuildAllPushButtonPressed() {
 		 " && rpmbuild -ba " + m_part->project()->projectName() + ".spec");
 }
 
-//    QPushButton* exportSPECPushButton;
+//    TQPushButton* exportSPECPushButton;
 void SpecSupport::slotexportSPECPushButtonPressed() {
-    QMap::Iterator it;
-    QString specname = ((it = map.find("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory());
+    TQMap::Iterator it;
+    TQString specname = ((it = map.find("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory());
     specname += ("/" + m_part->project()->projectName() + ".spec");
-    QFile file(specname);
+    TQFile file(specname);
 
     if(file.open(IO_WriteOnly)) {
-        QTextStream stream(&file);
+        TQTextStream stream(&file);
 	stream << generatePackage();
         file.close();
     } else {
@@ -118,26 +118,26 @@ void SpecSupport::slotexportSPECPushButtonPressed() {
     }
 }
 
-QString SpecSupport::getInfo(QString s, QString motif) {
-    QRegExp re(motif + "[ \t]*([^ \t].*[^ \t])[ \t]*");
+TQString SpecSupport::getInfo(TQString s, TQString motif) {
+    TQRegExp re(motif + "[ \t]*([^ \t].*[^ \t])[ \t]*");
     if (re.exactMatch(s))
         return re.cap(1);
-    return QString::null;
+    return TQString::null;
 }
 
-//    QPushButton* importSPECPushButton;
+//    TQPushButton* importSPECPushButton;
 void SpecSupport::slotimportSPECPushButtonPressed() {
-       QString fileName = KFileDialog::getOpenFileName(dir,"*.spec");
+       TQString fileName = KFileDialog::getOpenFileName(dir,"*.spec");
        if( fileName.isEmpty())
                return;
-    QFile file(fileName);
+    TQFile file(fileName);
 
     if(file.open(IO_ReadOnly)) {
-        QTextStream stream(&file);
+        TQTextStream stream(&file);
 
         while (!stream.atEnd()) {
-            QString s = stream.readLine();
-            QString info;
+            TQString s = stream.readLine();
+            TQString info;
             if (!(info = getInfo(s,"Name:")).isEmpty())
                 setAppName(info);
             else if (!(info = getInfo(s,"Version:")).isEmpty())
@@ -155,18 +155,18 @@ void SpecSupport::slotimportSPECPushButtonPressed() {
             else if (!(info = getInfo(s,"Packager:")).isEmpty())
                 setAppPackager(info);
             else if (s.startsWith("%description")) {
-                QString desc;
+                TQString desc;
                 while (!stream.atEnd()) {
-                    QString str = stream.readLine();
+                    TQString str = stream.readLine();
                     if (str.startsWith("%")) break;
                     else desc += str + "\n";
                 }
                 setAppDescription(desc);
             }
 	    else if (s.startsWith("%changelog")) {
-		QString change;
+		TQString change;
 		while (!stream.atEnd()) {
-		    QString str = stream.readLine();
+		    TQString str = stream.readLine();
 		    if (str.startsWith("%")) break;
                     else change += str + "\n";
                 }
@@ -177,18 +177,18 @@ void SpecSupport::slotimportSPECPushButtonPressed() {
 }
 
 void SpecSupport::slotAddFileButtonPressed(){
-QString filename = KFileDialog::getOpenFileName ();
+TQString filename = KFileDialog::getOpenFileName ();
 }
 
-//    QPushButton* srcPackagePushButton;
+//    TQPushButton* srcPackagePushButton;
 void SpecSupport::slotsrcPackagePushButtonPressed() {
-    QMap::Iterator it;
+    TQMap::Iterator it;
 
-    QFile file1(dir + "/" + getAppSource());
-    QFile file2(*(map.find("_sourcedir")) + "/" + getAppSource());
+    TQFile file1(dir + "/" + getAppSource());
+    TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource());
     if (!file2.exists()) {
 	if (!file1.exists()) {
-	    QMessageBox::critical(0,i18n("Error"),i18n("You need to create a source archive first."));
+	    TQMessageBox::critical(0,i18n("Error"),i18n("You need to create a source archive first."));
 	    return;
 	}
 	else
@@ -202,15 +202,15 @@ void SpecSupport::slotsrcPackagePushButtonPressed() {
 }
 
 void SpecSupport::parseDotRpmmacros() {
-    QFile dotfile(QDir::homeDirPath() + "/.rpmmacros");
+    TQFile dotfile(TQDir::homeDirPath() + "/.rpmmacros");
 
     if (!dotfile.open(IO_ReadOnly)) {
-//        QErrorMessage * msg = new QErrorMessage(this);
+//        TQErrorMessage * msg = new TQErrorMessage(this);
 //        msg->message("It seems you don't have a ~/.rpmmacros\nYou may experience problems building packages.\n");
 //        msg->exec();
         return;
     }
-    QTextStream stream(&dotfile);
+    TQTextStream stream(&dotfile);
 
     // Perhaps will it appear as a necessity to parse the global rpm config file?
 
@@ -219,14 +219,14 @@ void SpecSupport::parseDotRpmmacros() {
 
     // .rpmmacros parsing :
     while (!stream.atEnd()) {
-        QString s = stream.readLine();
-        QRegExp re("%([^ \t]*)[ \t][ \t]*([^\t]*)$");
+        TQString s = stream.readLine();
+        TQRegExp re("%([^ \t]*)[ \t][ \t]*([^\t]*)$");
         if(re.exactMatch(s)) {
-            QRegExp subst("%\\{([^%]*)\\}");
-            QString value = re.cap(2).stripWhiteSpace();
+            TQRegExp subst("%\\{([^%]*)\\}");
+            TQString value = re.cap(2).stripWhiteSpace();
 
             while(subst.search(value) != -1) {
-                value.replace(QRegExp("%\\{"+ QRegExp_escape( subst.cap(1) ) +"\\}"),*map.find(subst.cap(1)));
+                value.replace(TQRegExp("%\\{"+ QRegExp_escape( subst.cap(1) ) +"\\}"),*map.find(subst.cap(1)));
             }
             map.insert(re.cap(1),value);
         }
@@ -243,18 +243,18 @@ void SpecSupport::parseDotRpmmacros() {
     createRpmDirectoryFromMacro("_srcrpmdir");
 }
 
-bool SpecSupport::createRpmDirectoryFromMacro(const QString & name) {
-    QMap::Iterator it;
+bool SpecSupport::createRpmDirectoryFromMacro(const TQString & name) {
+    TQMap::Iterator it;
     if((it = map.find(name)) != map.end()) {
-        QDir dir(*it);
+        TQDir dir(*it);
         if (!dir.exists()) return dir.mkdir(*it);
     }
     return false;
 }
 
-QString SpecSupport::generatePackage( )
+TQString SpecSupport::generatePackage( )
 {
-	QString spec;
+	TQString spec;
         spec += "# This spec file was generated by KDevelop \n";
         spec += "# Please report any problem to KDevelop Team  \n";
         spec += "# Thanks to Matthias Saou for his explanations on http://freshrpms.net/docs/fight.html\n\n";
diff --git a/parts/distpart/specsupport.h b/parts/distpart/specsupport.h
index 3689771c..aeaca906 100644
--- a/parts/distpart/specsupport.h
+++ b/parts/distpart/specsupport.h
@@ -20,8 +20,8 @@
 #ifndef __SPECSUPPORT_H__
 #define __SPECSUPPORT_H__
 
-#include 
-#include 
+#include 
+#include 
 #include "packagebase.h"
 #include "distpart_part.h"
 #include "distpart_widget.h"
@@ -33,7 +33,7 @@ public:
     ~SpecSupport();
 
 public:
-    QString generatePackage();
+    TQString generatePackage();
     void slotbuildAllPushButtonPressed();
     void slotexportSPECPushButtonPressed();
     void slotimportSPECPushButtonPressed();
@@ -42,13 +42,13 @@ public:
 
 private:
     void parseDotRpmmacros();
-    bool createRpmDirectoryFromMacro(const QString & name);
+    bool createRpmDirectoryFromMacro(const TQString & name);
 
-    QString getInfo(QString s, QString motif);
+    TQString getInfo(TQString s, TQString motif);
 
-    QString dir;
+    TQString dir;
     DistpartPart *m_part;
-    QMap map;
+    TQMap map;
 };
 
 #endif
diff --git a/parts/documentation/KDevDocumentationIface.cpp b/parts/documentation/KDevDocumentationIface.cpp
index 2d64f193..329b8474 100644
--- a/parts/documentation/KDevDocumentationIface.cpp
+++ b/parts/documentation/KDevDocumentationIface.cpp
@@ -22,7 +22,7 @@
 #include "documentation_part.h"
 
 KDevDocumentationIface::KDevDocumentationIface(DocumentationPart *part)
-    :QObject(part), DCOPObject("KDevDocumentation"), m_part(part)
+    :TQObject(part), DCOPObject("KDevDocumentation"), m_part(part)
 {
 }
 
@@ -30,17 +30,17 @@ KDevDocumentationIface::~KDevDocumentationIface()
 {
 }
 
-void KDevDocumentationIface::lookupInIndex(QString term)
+void KDevDocumentationIface::lookupInIndex(TQString term)
 {
     m_part->lookInDocumentationIndex(term);
 }
 
-void KDevDocumentationIface::findInFinder(QString term)
+void KDevDocumentationIface::findInFinder(TQString term)
 {
     m_part->findInDocumentation(term);
 }
 
-void KDevDocumentationIface::searchInDocumentation(QString term)
+void KDevDocumentationIface::searchInDocumentation(TQString term)
 {
     m_part->searchInDocumentation(term);
 }
@@ -55,12 +55,12 @@ void KDevDocumentationIface::searchInDocumentation()
     m_part->searchInDocumentation();
 }
 
-void KDevDocumentationIface::manPage(QString term)
+void KDevDocumentationIface::manPage(TQString term)
 {
     m_part->manPage(term);
 }
 
-void KDevDocumentationIface::infoPage(QString term)
+void KDevDocumentationIface::infoPage(TQString term)
 {
     m_part->infoPage(term);
 }
diff --git a/parts/documentation/KDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h
index 35cd17fb..e398e89d 100644
--- a/parts/documentation/KDevDocumentationIface.h
+++ b/parts/documentation/KDevDocumentationIface.h
@@ -20,12 +20,12 @@
 #ifndef KDEVDOCUMENTATIONIFACE_H
 #define KDEVDOCUMENTATIONIFACE_H
 
-#include 
+#include 
 #include 
 
 class DocumentationPart;
 
-class KDevDocumentationIface : public QObject, public DCOPObject {
+class KDevDocumentationIface : public TQObject, public DCOPObject {
     Q_OBJECT
     K_DCOP
 public:
@@ -33,11 +33,11 @@ public:
     ~KDevDocumentationIface();
 
 k_dcop:
-    void lookupInIndex(QString term);
-    void findInFinder(QString term);
-    void searchInDocumentation(QString term);
-    void manPage(QString term);
-    void infoPage(QString term);
+    void lookupInIndex(TQString term);
+    void findInFinder(TQString term);
+    void searchInDocumentation(TQString term);
+    void manPage(TQString term);
+    void infoPage(TQString term);
 
     void lookupInIndex();
     void findInFinder();
diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp
index 867f6f6b..21913089 100644
--- a/parts/documentation/addcatalogdlg.cpp
+++ b/parts/documentation/addcatalogdlg.cpp
@@ -20,8 +20,8 @@
 
 #include "addcatalogdlg.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -31,23 +31,23 @@
 #include "docutils.h"
 #include "kdevdocumentationplugin.h"
 
-AddCatalogDlg::AddCatalogDlg( QValueList const & plugins, 
-	QWidget* parent, const char* name, bool modal, WFlags fl)
+AddCatalogDlg::AddCatalogDlg( TQValueList const & plugins, 
+	TQWidget* parent, const char* name, bool modal, WFlags fl)
 	:AddCatalogDlgBase(parent,name, modal,fl), m_plugins( plugins )
 {
-	for (QValueList::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it)
+	for (TQValueList::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it)
 	{
 		docTypeCombo->insertItem( (*it)->pluginName() );
 	}
 	
-	docTypeChanged( QString() );
+	docTypeChanged( TQString() );
 }
 
 AddCatalogDlg::~AddCatalogDlg()
 {
 }
 
-void AddCatalogDlg::locationURLChanged(const QString &text)
+void AddCatalogDlg::locationURLChanged(const TQString &text)
 {
 	DocumentationPlugin * plugin = this->plugin();
 	if ( !plugin ) return;
@@ -57,32 +57,32 @@ void AddCatalogDlg::locationURLChanged(const QString &text)
 
 void AddCatalogDlg::accept()
 {
-    QDialog::accept();
+    TQDialog::accept();
 }
 
-QString AddCatalogDlg::title() const
+TQString AddCatalogDlg::title() const
 {
     return titleEdit->text();
 }
 
-QString AddCatalogDlg::url() const
+TQString AddCatalogDlg::url() const
 {
     return DocUtils::envURL(locationURL);
 }
 
-void AddCatalogDlg::setTitle(const QString &title)
+void AddCatalogDlg::setTitle(const TQString &title)
 {
     titleEdit->setText(title);
 }
 
-void AddCatalogDlg::setURL(const QString &url)
+void AddCatalogDlg::setURL(const TQString &url)
 {
     locationURL->setURL(url);
 }
 
 DocumentationPlugin * AddCatalogDlg::plugin( )
 {
-	for (QValueList::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it)
+	for (TQValueList::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it)
 	{
 		if ( docTypeCombo->currentText() == (*it)->pluginName() )
 		{
@@ -92,7 +92,7 @@ DocumentationPlugin * AddCatalogDlg::plugin( )
 	return 0;
 }
 
-void AddCatalogDlg::docTypeChanged( const QString & )
+void AddCatalogDlg::docTypeChanged( const TQString & )
 {
 	kdDebug() << k_funcinfo << endl;
 
diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h
index 4599dc8d..0a437294 100644
--- a/parts/documentation/addcatalogdlg.h
+++ b/parts/documentation/addcatalogdlg.h
@@ -21,7 +21,7 @@
 #ifndef ADDCATALOGDLG_H
 #define ADDCATALOGDLG_H
 
-#include 
+#include 
 #include "addcatalogdlgbase.h"
 
 class DocumentationPlugin;
@@ -30,24 +30,24 @@ class AddCatalogDlg: public AddCatalogDlgBase
 {
 	Q_OBJECT
 	public:
-		AddCatalogDlg( QValueList const & plugins, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+		AddCatalogDlg( TQValueList const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
 		~AddCatalogDlg();
 	
-		QString title() const;
-		void setTitle(const QString &title);
-		QString url() const;
-		void setURL(const QString &url);
+		TQString title() const;
+		void setTitle(const TQString &title);
+		TQString url() const;
+		void setURL(const TQString &url);
 		DocumentationPlugin * plugin();
 		
 	public slots:
-		virtual void locationURLChanged(const QString &text);
-		virtual void docTypeChanged( const QString & );
+		virtual void locationURLChanged(const TQString &text);
+		virtual void docTypeChanged( const TQString & );
 	
 	protected slots:
 		virtual void accept();
 	
 	private:
-		QValueList const & m_plugins;
+		TQValueList const & m_plugins;
 };
 
 #endif
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 742c300a..ff2bbece 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 #include "bookmarkview.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -54,21 +54,21 @@ DocBookmarkOwner::DocBookmarkOwner(DocumentationPart *part)
 {
 }
 
-void DocBookmarkOwner::openBookmarkURL(const QString &_url)
+void DocBookmarkOwner::openBookmarkURL(const TQString &_url)
 {
     m_part->partController()->showDocument(KURL(_url));
 }
 
-QString DocBookmarkOwner::currentURL() const
+TQString DocBookmarkOwner::currentURL() const
 {
     KParts::ReadOnlyPart *activePart = dynamic_cast(m_part->partController()->activePart());
     if (activePart)
         return activePart->url().url();
     else
-        return QString::null;
+        return TQString::null;
 }
 
-QString DocBookmarkOwner::currentTitle() const
+TQString DocBookmarkOwner::currentTitle() const
 {
     KParts::ReadOnlyPart *activePart = dynamic_cast(m_part->partController()->activePart());
     if (activePart)
@@ -79,20 +79,20 @@ QString DocBookmarkOwner::currentTitle() const
         return activePart->url().prettyURL();
     }
     else
-        return QString::null;
+        return TQString::null;
 }
 
 class DocBookmarkItem: public DocumentationItem {
 public:
-    DocBookmarkItem(Type type, KListView *parent, const QString &name)
+    DocBookmarkItem(Type type, KListView *parent, const TQString &name)
         :DocumentationItem(type, parent, name)
     {
     }
-    DocBookmarkItem(Type type, KListView *parent, DocumentationItem *after, const QString &name)
+    DocBookmarkItem(Type type, KListView *parent, DocumentationItem *after, const TQString &name)
         :DocumentationItem(type, parent, after, name)
     {
     }
-    DocBookmarkItem(Type type, DocumentationItem *parent, const QString &name)
+    DocBookmarkItem(Type type, DocumentationItem *parent, const TQString &name)
         :DocumentationItem(type, parent, name)
     {
     }
@@ -108,41 +108,41 @@ private:
 //class BookmarkView
 
 BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name)
-    :QWidget(parent, name), m_widget(parent)
+    :TQWidget(parent, name), m_widget(parent)
 {
     m_bmManager = new DocBookmarkManager(m_widget->part());
     m_bmOwner = new DocBookmarkOwner(m_widget->part());
 
-    QVBoxLayout *l = new QVBoxLayout(this, 0, KDialog::spacingHint());
+    TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint());
     m_view = new KListView(this);
     m_view->addColumn(i18n("Title"));
     m_view->setSorting(-1);
     m_view->header()->hide();
-    m_view->setResizeMode(QListView::AllColumns);
+    m_view->setResizeMode(TQListView::AllColumns);
     m_view->setAllColumnsShowFocus( true );
     l->addWidget(m_view);
-    QHBoxLayout *l2 = new QHBoxLayout(l, KDialog::spacingHint());
+    TQHBoxLayout *l2 = new TQHBoxLayout(l, KDialog::spacingHint());
     m_addButton = new KPushButton(i18n("Add"), this);
     m_editButton = new KPushButton(i18n("Edit..."), this);
     m_removeButton = new KPushButton(i18n("Remove"), this);
     l2->addWidget(m_addButton);
     l2->addWidget(m_editButton);
     l2->addWidget(m_removeButton);
-    l2->addItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Fixed));
+    l2->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Expanding, TQSizePolicy::Fixed));
     l->addSpacing(2);
 
     showBookmarks();
 
-    connect(m_view, SIGNAL(executed(QListViewItem*, const QPoint&, int )),
-        this, SLOT(itemExecuted(QListViewItem*, const QPoint&, int )));
-    connect(m_addButton, SIGNAL(pressed()), this, SLOT(addBookmark()));
-    connect(m_editButton, SIGNAL(clicked()), this, SLOT(editBookmark()));
-    connect(m_removeButton, SIGNAL(clicked()), this, SLOT(removeBookmark()));
+    connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )),
+        this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int )));
+    connect(m_addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(addBookmark()));
+    connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editBookmark()));
+    connect(m_removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeBookmark()));
 
-    connect(m_widget->part(), SIGNAL(bookmarkLocation(const QString&, const KURL& )),
-        this, SLOT(addBookmark(const QString&, const KURL& )));
-    connect(m_view, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int )),
-        this, SLOT(itemMouseButtonPressed(int, QListViewItem*, const QPoint&, int )));
+    connect(m_widget->part(), TQT_SIGNAL(bookmarkLocation(const TQString&, const KURL& )),
+        this, TQT_SLOT(addBookmark(const TQString&, const KURL& )));
+    connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )),
+        this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )));
 }
 
 BookmarkView::~BookmarkView()
@@ -166,7 +166,7 @@ void BookmarkView::showBookmarks()
     }
 }
 
-void BookmarkView::itemExecuted(QListViewItem *item, const QPoint &// p
+void BookmarkView::itemExecuted(TQListViewItem *item, const TQPoint &// p
                                 , int // col
                                 )
 {
@@ -212,8 +212,8 @@ void BookmarkView::editBookmark()
 
 void BookmarkView::addBookmark()
 {
-    QString title = m_bmOwner->currentTitle();
-    QString url = m_bmOwner->currentURL();
+    TQString title = m_bmOwner->currentTitle();
+    TQString url = m_bmOwner->currentURL();
 
     KPopupMenu menu;
     bool useMenu = false;
@@ -227,7 +227,7 @@ void BookmarkView::addBookmark()
     if (useMenu)
     {
         m_addButton->setDown(true);
-        mode = menu.exec(mapToGlobal(QPoint(m_addButton->x(), m_addButton->y()+m_addButton->height())));
+        mode = menu.exec(mapToGlobal(TQPoint(m_addButton->x(), m_addButton->y()+m_addButton->height())));
         m_addButton->setDown(false);
     }
 
@@ -249,7 +249,7 @@ void BookmarkView::addBookmark()
     }
 }
 
-void BookmarkView::addBookmark(const QString &title, const KURL &url)
+void BookmarkView::addBookmark(const TQString &title, const KURL &url)
 {
     KBookmark bm = m_bmManager->root().addBookmark(m_bmManager, title, url);
     m_bmManager->save();
@@ -265,7 +265,7 @@ void BookmarkView::addBookmark(const QString &title, const KURL &url)
     item->setBookmark(bm);
 }
 
-void BookmarkView::itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int // c
+void BookmarkView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c
                                           )
 {
     if ((button != Qt::RightButton) || (!item))
@@ -277,7 +277,7 @@ void BookmarkView::itemMouseButtonPressed(int button, QListViewItem *item, const
     DocUtils::docItemPopup(m_widget->part(), docItem, pos, false, true);
 }
 
-void BookmarkView::focusInEvent(QFocusEvent */*e*/)
+void BookmarkView::focusInEvent(TQFocusEvent */*e*/)
 {
     m_view->setFocus();
 }
diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h
index 82bcaf4b..aaae4a29 100644
--- a/parts/documentation/bookmarkview.h
+++ b/parts/documentation/bookmarkview.h
@@ -20,7 +20,7 @@
 #ifndef BOOKMARKVIEW_H
 #define BOOKMARKVIEW_H
 
-#include 
+#include 
 
 #include 
 
@@ -39,9 +39,9 @@ class DocBookmarkOwner: public KBookmarkOwner {
 public:
     DocBookmarkOwner(DocumentationPart *part);
 
-    virtual void openBookmarkURL(const QString &_url);
-    virtual QString currentTitle() const;
-    virtual QString currentURL() const;
+    virtual void openBookmarkURL(const TQString &_url);
+    virtual TQString currentTitle() const;
+    virtual TQString currentURL() const;
 
 private:
     DocumentationPart *m_part;
@@ -55,18 +55,18 @@ public:
     ~BookmarkView();
     
 public slots:
-    void addBookmark(const QString &title, const KURL &url);
+    void addBookmark(const TQString &title, const KURL &url);
 
 protected:
     void showBookmarks();
-    virtual void focusInEvent(QFocusEvent *e);
+    virtual void focusInEvent(TQFocusEvent *e);
 
 protected slots:
-    void itemExecuted(QListViewItem *item, const QPoint &p, int col);
+    void itemExecuted(TQListViewItem *item, const TQPoint &p, int col);
     void addBookmark();
     void editBookmark();
     void removeBookmark();
-    void itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int c);
+    void itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int c);
 
 private:
     DocumentationWidget *m_widget;
diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp
index b2725e1c..2581f5a0 100644
--- a/parts/documentation/contentsview.cpp
+++ b/parts/documentation/contentsview.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "contentsview.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -34,23 +34,23 @@
 #include "docutils.h"
 
 ContentsView::ContentsView(DocumentationWidget *parent, const char *name)
-     :QWidget(parent, name), m_widget(parent)
+     :TQWidget(parent, name), m_widget(parent)
 {
-    QVBoxLayout *cl = new QVBoxLayout(this, 0, 0);
+    TQVBoxLayout *cl = new TQVBoxLayout(this, 0, 0);
     m_view = new KListView(this);
     cl->addWidget(m_view);
 
     m_view->addColumn(i18n( "Contents" ));
     m_view->header()->hide();
-    m_view->setResizeMode(QListView::AllColumns);
+    m_view->setResizeMode(TQListView::AllColumns);
     m_view->setRootIsDecorated(true);
     m_view->setSorting(-1);
     m_view->setAllColumnsShowFocus( true );
 
-    connect(m_view, SIGNAL(executed(QListViewItem*, const QPoint&, int )),
-        this, SLOT(itemExecuted(QListViewItem*, const QPoint&, int )));
-    connect(m_view, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int )),
-        this, SLOT(itemMouseButtonPressed(int, QListViewItem*, const QPoint&, int )));
+    connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )),
+        this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int )));
+    connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )),
+        this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )));
 }
 
 ContentsView::~ContentsView()
@@ -59,7 +59,7 @@ ContentsView::~ContentsView()
         m_widget->index()->clear();
 }
 
-void ContentsView::itemExecuted(QListViewItem *item, const QPoint &// p
+void ContentsView::itemExecuted(TQListViewItem *item, const TQPoint &// p
                                 , int // col
                                 )
 {
@@ -72,7 +72,7 @@ void ContentsView::itemExecuted(QListViewItem *item, const QPoint &// p
     m_widget->part()->partController()->showDocument(url);
 }
 
-void ContentsView::itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int // c
+void ContentsView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c
                                           )
 {
     if ((button != Qt::RightButton) || (!item))
@@ -84,7 +84,7 @@ void ContentsView::itemMouseButtonPressed(int button, QListViewItem *item, const
     DocUtils::docItemPopup(m_widget->part(), docItem, pos, true, true);
 }
 
-void ContentsView::focusInEvent(QFocusEvent */*e*/)
+void ContentsView::focusInEvent(TQFocusEvent */*e*/)
 {
     m_view->setFocus();
 }
diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h
index 54c16486..35595bca 100644
--- a/parts/documentation/contentsview.h
+++ b/parts/documentation/contentsview.h
@@ -20,7 +20,7 @@
 #ifndef CONTENTSVIEW_H
 #define CONTENTSVIEW_H
 
-#include 
+#include 
 
 class FindDocumentation;
 class DocumentationWidget;
@@ -37,11 +37,11 @@ public:
     KListView *view() const { return m_view; }
 
 protected slots:
-    void itemExecuted(QListViewItem *item, const QPoint &p, int col);
-    void itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int c);
+    void itemExecuted(TQListViewItem *item, const TQPoint &p, int col);
+    void itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int c);
 
 protected:
-    virtual void focusInEvent(QFocusEvent *e);
+    virtual void focusInEvent(TQFocusEvent *e);
     
 private:
     DocumentationWidget *m_widget;
diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp
index f09a860b..b8d6071c 100644
--- a/parts/documentation/docconfiglistview.cpp
+++ b/parts/documentation/docconfiglistview.cpp
@@ -23,7 +23,7 @@
 
 #include "kdevdocumentationplugin.h"
 
-DocConfigListView::DocConfigListView(QWidget *parent, const char *name)
+DocConfigListView::DocConfigListView(TQWidget *parent, const char *name)
      :KListView(parent, name)
 {
 //    setSorting(-1);
@@ -32,23 +32,23 @@ DocConfigListView::DocConfigListView(QWidget *parent, const char *name)
     addColumn(i18n("Search"));
     addColumn(i18n("Title"));
 //    addColumn(i18n("URL"));
-    setColumnWidthMode(0, QListView::Maximum);
-    setColumnWidthMode(1, QListView::Maximum);
-    setColumnWidthMode(2, QListView::Maximum);
-    setColumnWidthMode(3, QListView::Maximum);
-//    setColumnWidthMode(4, QListView::Maximum);
+    setColumnWidthMode(0, TQListView::Maximum);
+    setColumnWidthMode(1, TQListView::Maximum);
+    setColumnWidthMode(2, TQListView::Maximum);
+    setColumnWidthMode(3, TQListView::Maximum);
+//    setColumnWidthMode(4, TQListView::Maximum);
     setAllColumnsShowFocus(true);
-    setResizeMode( QListView::LastColumn );
+    setResizeMode( TQListView::LastColumn );
 
-    connect(this, SIGNAL(clicked(QListViewItem*, const QPoint&, int)),
-        this, SLOT(clickedItem(QListViewItem*, const QPoint&, int )));
+    connect(this, TQT_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)),
+        this, TQT_SLOT(clickedItem(TQListViewItem*, const TQPoint&, int )));
 }
 
 DocConfigListView::~DocConfigListView()
 {
 }
 
-void DocConfigListView::clickedItem(QListViewItem *item, const QPoint &// pnt
+void DocConfigListView::clickedItem(TQListViewItem *item, const TQPoint &// pnt
                                     , int c)
 {
     if (!item)
diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h
index 0f320099..a7c0aea0 100644
--- a/parts/documentation/docconfiglistview.h
+++ b/parts/documentation/docconfiglistview.h
@@ -26,11 +26,11 @@ class DocConfigListView : public KListView
 {
     Q_OBJECT
 public:
-    DocConfigListView(QWidget *parent = 0, const char *name = 0);
+    DocConfigListView(TQWidget *parent = 0, const char *name = 0);
     ~DocConfigListView();
 
 protected slots:
-    void clickedItem(QListViewItem *item, const QPoint &pnt, int c);
+    void clickedItem(TQListViewItem *item, const TQPoint &pnt, int c);
 };
 
 #endif
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 5cd6ff31..0184c4c9 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -23,10 +23,10 @@
  ***************************************************************************/
 #include "docglobalconfigwidget.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -51,13 +51,13 @@
 #include "docutils.h"
 
 DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
-    DocumentationWidget *widget, QWidget *parent, const char *name, WFlags fl)
+    DocumentationWidget *widget, TQWidget *parent, const char *name, WFlags fl)
     :DocGlobalConfigWidgetBase(parent, name, fl), m_part(part), m_widget(widget)
 {
     m_View = new DocConfigListView( viewHolder );
     viewHolder->addWidget( m_View );
     viewHolder->raiseWidget( m_View );
-    for (QValueList::const_iterator it = m_part->m_plugins.constBegin();
+    for (TQValueList::const_iterator it = m_part->m_plugins.constBegin();
         it != m_part->m_plugins.constEnd(); ++it)
     {
         (*it)->loadCatalogConfiguration( m_View );
@@ -66,7 +66,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
     KConfig *config = m_part->config();
     //read full text search settings
     config->setGroup("htdig");
-    QString databaseDir = kapp->dirs()->saveLocation("data",
+    TQString databaseDir = kapp->dirs()->saveLocation("data",
         "kdevdocumentation/search");
     databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir));
     htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")));
@@ -74,15 +74,15 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
     htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch")));
     if (config->readBoolEntry("IsSetup", false) == false)
     {
-        QFileInfo fi(htsearchbinEdit->url());
+        TQFileInfo fi(htsearchbinEdit->url());
         if (!fi.exists())
         {
             //try to guess htsearch location on Debian
-            QFileInfo fi("/usr/lib/cgi-bin/htsearch");
+            TQFileInfo fi("/usr/lib/cgi-bin/htsearch");
             if (!fi.exists())
             {
                 //try to guess htsearch location on SuSE
-                QFileInfo fi("/srv/www/cgi-bin/htsearch");
+                TQFileInfo fi("/srv/www/cgi-bin/htsearch");
                 if (fi.exists())
                     htsearchbinEdit->setURL("/srv/www/cgi-bin/htsearch");
             }
@@ -165,12 +165,12 @@ KListView *DocGlobalConfigWidget::activeView()
 void DocGlobalConfigWidget::accept()
 {
     //write catalog settings
-	for (QValueList::const_iterator it = m_part->m_plugins.constBegin(); 
+	for (TQValueList::const_iterator it = m_part->m_plugins.constBegin(); 
 		it != m_part->m_plugins.constEnd(); ++it)
 	{
 		(*it)->saveCatalogConfiguration( m_View );
 		//@todo: take restrictions into account
-		(*it)->reinit(m_widget->contents(), m_widget->index(), QStringList());
+		(*it)->reinit(m_widget->contents(), m_widget->index(), TQStringList());
 	}
 
     KConfig *config = m_part->config();
@@ -182,17 +182,17 @@ void DocGlobalConfigWidget::accept()
     config->writePathEntry("htsearchbin", DocUtils::envURL(htsearchbinEdit));
 
     //write full text search locations file
-    QString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
-    QFile f(ftsLocationsFile);
-    QStringList locs;
+    TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
+    TQFile f(ftsLocationsFile);
+    TQStringList locs;
     if (f.open(IO_ReadWrite | IO_Truncate))
     {
-        QTextStream str(&f);
-        for (QValueList::const_iterator it = m_part->m_plugins.constBegin();
+        TQTextStream str(&f);
+        for (TQValueList::const_iterator it = m_part->m_plugins.constBegin();
             it != m_part->m_plugins.constEnd(); ++ it)
         {
-            QStringList app = (*it)->fullTextSearchLocations();
-            for (QStringList::const_iterator it2 = app.constBegin();
+            TQStringList app = (*it)->fullTextSearchLocations();
+            for (TQStringList::const_iterator it2 = app.constBegin();
                 it2 != app.constEnd(); ++it2)
             {
                 if (!locs.contains(*it2))
diff --git a/parts/documentation/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h
index 41b0ba85..afef5730 100644
--- a/parts/documentation/docglobalconfigwidget.h
+++ b/parts/documentation/docglobalconfigwidget.h
@@ -22,7 +22,7 @@
 
 #include "docglobalconfigwidgetbase.h"
 
-#include 
+#include 
 
 class DocumentationPart;
 class DocumentationWidget;
@@ -34,7 +34,7 @@ class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase
     Q_OBJECT
 public:
     DocGlobalConfigWidget(DocumentationPart *part, DocumentationWidget *widget,
-        QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
+        TQWidget *parent = 0, const char *name = 0, WFlags fl = 0);
     ~DocGlobalConfigWidget();
     /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp
index 90950a80..a37ad5cb 100644
--- a/parts/documentation/docprojectconfigwidget.cpp
+++ b/parts/documentation/docprojectconfigwidget.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "docprojectconfigwidget.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -33,10 +33,10 @@
 #include "documentation_part.h"
 #include "documentation_widget.h"
 
-DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, QWidget *parent, const char *name)
+DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent, const char *name)
     :DocProjectConfigWidgetBase(parent, name), m_part(part)
 {
-    for (QValueList::const_iterator it = m_part->m_plugins.constBegin();
+    for (TQValueList::const_iterator it = m_part->m_plugins.constBegin();
         it != m_part->m_plugins.constEnd(); ++it)
     {
         if ((*it)->hasCapability(DocumentationPlugin::ProjectDocumentation))
@@ -45,7 +45,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, QWidget
             m_plugins[(*it)->pluginName()] = *it;
         }
     }
-    QString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docsystem");
+    TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docsystem");
     
     bool hasProjectDoc = false;
     for (int i = 0; i < docSystemCombo->count(); ++i)
@@ -67,7 +67,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, QWidget
     manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/usermanualurl"));
 }
 
-void DocProjectConfigWidget::changeDocSystem(const QString &text)
+void DocProjectConfigWidget::changeDocSystem(const TQString &text)
 {
     if (text.isEmpty())
         return;
@@ -79,9 +79,9 @@ void DocProjectConfigWidget::changeDocSystem(const QString &text)
     catalogURL->setMode(plugin->catalogLocatorProps().first);
     catalogURL->setFilter(plugin->catalogLocatorProps().second);
     
-    QString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docurl");
+    TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docurl");
     if (!projectDocURL.isEmpty())
-        projectDocURL = QDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + projectDocURL);
+        projectDocURL = TQDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + projectDocURL);
 
     catalogURL->setURL(projectDocURL);
     catalogURL->setEnabled(true);
@@ -104,7 +104,7 @@ void DocProjectConfigWidget::accept()
             delete m_part->m_userManualPlugin;
             m_part->m_userManualPlugin = 0;
         }
-        for (QValueList::const_iterator it = m_part->m_plugins.constBegin();
+        for (TQValueList::const_iterator it = m_part->m_plugins.constBegin();
             it != m_part->m_plugins.constEnd(); ++it)
         {
             if ((*it)->hasCapability(DocumentationPlugin::ProjectUserManual))
diff --git a/parts/documentation/docprojectconfigwidget.h b/parts/documentation/docprojectconfigwidget.h
index df64f31b..c5d904b5 100644
--- a/parts/documentation/docprojectconfigwidget.h
+++ b/parts/documentation/docprojectconfigwidget.h
@@ -28,14 +28,14 @@ class DocumentationPlugin;
 class DocProjectConfigWidget: public DocProjectConfigWidgetBase {
     Q_OBJECT
 public:
-    DocProjectConfigWidget(DocumentationPart *part, QWidget *parent = 0, const char *name = 0);
+    DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0);
 
 public slots:
-    virtual void changeDocSystem(const QString &text);
+    virtual void changeDocSystem(const TQString &text);
     virtual void accept();
     
 private:
     DocumentationPart *m_part;
-    QMap m_plugins;
+    TQMap m_plugins;
 };
 #endif
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 9e978f09..32e57d9e 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -21,13 +21,13 @@
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -76,7 +76,7 @@ static const KDevPluginInfo data("kdevdocumentation");
 typedef KDevGenericFactory DocumentationFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) )
 
-DocumentationPart::DocumentationPart(QObject *parent, const char *name, const QStringList& )
+DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& )
     :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
     m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false)
 {
@@ -86,17 +86,17 @@ DocumentationPart::DocumentationPart(QObject *parent, const char *name, const QS
     m_configProxy = new ConfigWidgetProxy(core());
 	m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() );
 	m_configProxy->createProjectConfigPage(i18n("Project Documentation"), PROJECTDOC_OPTIONS, info()->icon() );
-    connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int)));
-    connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-        this, SLOT(contextMenu(QPopupMenu *, const Context *)));
-    connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()));
-    connect(core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()));
+    connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)));
+    connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+        this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
+    connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
+    connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()));
 
     m_widget = new DocumentationWidget(this);
 	m_widget->setIcon(SmallIcon( info()->icon() ));
     m_widget->setCaption(i18n("Documentation"));
 
-    QWhatsThis::add(m_widget, i18n("Documentation browser
    "
+    TQWhatsThis::add(m_widget, i18n("Documentation browser
    "
         "The documentation browser gives access to various "
         "documentation sources (Qt DCF, Doxygen, KDoc, KDevelopTOC and DevHelp "
         "documentation) and the KDevelop manuals. It also provides documentation index "
@@ -107,7 +107,7 @@ DocumentationPart::DocumentationPart(QObject *parent, const char *name, const QS
     
     setupActions();
     
-    QTimer::singleShot(0, this, SLOT(init()));
+    TQTimer::singleShot(0, this, TQT_SLOT(init()));
     
     new KDevDocumentationIface(this);
 }
@@ -125,8 +125,8 @@ DocumentationPart::~DocumentationPart()
 void DocumentationPart::loadDocumentationPlugins()
 {
     KTrader::OfferList docPluginOffers =
-        KTrader::self()->query(QString::fromLatin1("KDevelop/DocumentationPlugins"),
-            QString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
+        KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"),
+            TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
 
     KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin();
     for ( ; serviceIt != docPluginOffers.end(); ++serviceIt )
@@ -139,14 +139,14 @@ void DocumentationPart::loadDocumentationPlugins()
         int error;
         DocumentationPlugin *docPlugin = KParts::ComponentFactory
             ::createInstanceFromService(docPluginService, 0,
-            docPluginService->name().latin1(), QStringList(), &error);
+            docPluginService->name().latin1(), TQStringList(), &error);
         if (!docPlugin)
             kdDebug() << "    failed to create doc plugin " << docPluginService->name() << endl;
         else
         {
             kdDebug() << "    success" << endl;
             docPlugin->init(m_widget->contents());
-            connect(this, SIGNAL(indexSelected(IndexBox* )), docPlugin, SLOT(createIndex(IndexBox* )));
+            connect(this, TQT_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQT_SLOT(createIndex(IndexBox* )));
             m_plugins.append(docPlugin);
         }
     }
@@ -156,28 +156,28 @@ void DocumentationPart::emitIndexSelected(IndexBox *indexBox)
 {
     if (!m_hasIndex)
     {
-        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+        TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor));
         emit indexSelected(indexBox);
         indexBox->fill();
         m_hasIndex = true;
-        QApplication::restoreOverrideCursor();
+        TQApplication::restoreOverrideCursor();
     }
 }
 
-void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo)
+void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo)
 {
     switch (pageNo)
     {
         case GLOBALDOC_OPTIONS:
         {
             DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, page, "doc config widget");
-            connect(dlg, SIGNAL(okClicked()), w1, SLOT(accept()));
+            connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept()));
             break;
         }
         case PROJECTDOC_OPTIONS:
         {
             DocProjectConfigWidget *w1 = new DocProjectConfigWidget(this, page, "doc project config");
-            connect(dlg, SIGNAL(okClicked()), w1, SLOT(accept()));
+            connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept()));
             break;
         }
     }
@@ -194,12 +194,12 @@ bool DocumentationPart::configure(int page)
                     KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, m_widget,
                     "docsettings dialog");
 
-    QVBoxLayout *l = new QVBoxLayout(dlg.plainPage(), 0, 0);
+    TQVBoxLayout *l = new TQVBoxLayout(dlg.plainPage(), 0, 0);
     DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, dlg.plainPage());
     l->addWidget(w1);
     w1->docTab->setCurrentPage(page);
-    connect(&dlg, SIGNAL(okClicked()), w1, SLOT(accept()));
-    return (dlg.exec() == QDialog::Accepted);
+    connect(&dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept()));
+    return (dlg.exec() == TQDialog::Accepted);
 }
 
 void DocumentationPart::setupActions()
@@ -210,7 +210,7 @@ void DocumentationPart::setupActions()
     KAction *action;
 
     action = new KAction(i18n("&Search in Documentation..."), CTRL+ALT+Key_S,
-                         this, SLOT(searchInDocumentation()),
+                         this, TQT_SLOT(searchInDocumentation()),
                          actionCollection(), "help_search_in_doc" );
     action->setToolTip(i18n("Full text search in the documentation"));
     action->setWhatsThis(i18n("Search in documentation
    "
@@ -221,7 +221,7 @@ void DocumentationPart::setupActions()
                               "configuration dialog of the documentation plugin."));    
 
     action = new KAction(i18n("&Look in Documentation Index..."), CTRL+ALT+Key_I,
-                         this, SLOT(lookInDocumentationIndex()),
+                         this, TQT_SLOT(lookInDocumentationIndex()),
                          actionCollection(), "help_look_in_index" );
     action->setToolTip(i18n("Look in the documentation index"));
     action->setWhatsThis(i18n("Look in documentation index
    "
@@ -230,19 +230,19 @@ void DocumentationPart::setupActions()
                               "the documentation index."));    
 
     action = new KAction(i18n("Man Page..."), 0,
-                         this, SLOT(manPage()),
+                         this, TQT_SLOT(manPage()),
                          actionCollection(), "help_manpage" );
     action->setToolTip(i18n("Show a manpage"));
     action->setWhatsThis(i18n("Show a manpage
    Opens a man page using embedded viewer."));
 
     action = new KAction(i18n("Info Page..."), 0,
-                         this, SLOT(infoPage()),
+                         this, TQT_SLOT(infoPage()),
                          actionCollection(), "help_infopage");
     action->setToolTip(i18n("Show an infopage"));
     action->setWhatsThis(i18n("Show an infopage
    Opens an info page using embedded viewer."));
 
     action = new KAction(i18n("Find Documentation..."), 0,
-                         this, SLOT(findInDocumentation()),
+                         this, TQT_SLOT(findInDocumentation()),
                          actionCollection(), "help_find_documentation");
     action->setToolTip(i18n("Find Documentation"));
     action->setWhatsThis(i18n("Find documentation
    "
@@ -252,14 +252,14 @@ void DocumentationPart::setupActions()
                                     "Google, etc."));
 }
 
-void DocumentationPart::emitBookmarkLocation(const QString &title, const KURL &url)
+void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL &url)
 {
     emit bookmarkLocation(title, url);
 }
 
 void DocumentationPart::searchInDocumentation()
 {
-     QString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
 
     if ( word.isEmpty() )
     {
@@ -274,7 +274,7 @@ void DocumentationPart::searchInDocumentation()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "KDevDocumentation", "searchInDocumentation(QString)", word );
+            callAssistant ( "KDevDocumentation", "searchInDocumentation(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -283,7 +283,7 @@ void DocumentationPart::searchInDocumentation()
     }
 }
 
-void DocumentationPart::searchInDocumentation(const QString &term)
+void DocumentationPart::searchInDocumentation(const TQString &term)
 {
     mainWindow()->raiseView(m_widget);
     m_widget->searchInDocumentation(term);
@@ -292,14 +292,14 @@ void DocumentationPart::searchInDocumentation(const QString &term)
 void DocumentationPart::contextSearchInDocumentation()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "searchInDocumentation(QString)", m_contextStr);
+        callAssistant("KDevDocumentation", "searchInDocumentation(TQString)", m_contextStr);
     else
         searchInDocumentation(m_contextStr);
 }
 
 void DocumentationPart::manPage()
 {
-     QString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
 
     if ( isAssistantUsed() )
     {
@@ -309,13 +309,13 @@ void DocumentationPart::manPage()
         }
         else
         {
-            callAssistant ( "KDevDocumentation", "manPage(QString)", word );
+            callAssistant ( "KDevDocumentation", "manPage(TQString)", word );
         }
     }
     else
     {
         bool ok;
-        QString manpage = KInputDialog::getText ( i18n ( "Show Manual Page" ), i18n ( "Show manpage on:" ), word, &ok, 0 );
+        TQString manpage = KInputDialog::getText ( i18n ( "Show Manual Page" ), i18n ( "Show manpage on:" ), word, &ok, 0 );
         if ( ok && !manpage.isEmpty() )
             manPage ( manpage );
     }
@@ -323,7 +323,7 @@ void DocumentationPart::manPage()
 
 void DocumentationPart::infoPage()
 {
-     QString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
  
     if ( isAssistantUsed() )
     {
@@ -333,34 +333,34 @@ void DocumentationPart::infoPage()
         }
         else
         {
-            callAssistant ( "KDevDocumentation", "infoPage(QString)", word );
+            callAssistant ( "KDevDocumentation", "infoPage(TQString)", word );
         }
     }
     else
     {
         bool ok;
-        QString infopage = KInputDialog::getText ( i18n ( "Show Info Page" ), i18n ( "Show infopage on:" ), word, &ok, 0 );
+        TQString infopage = KInputDialog::getText ( i18n ( "Show Info Page" ), i18n ( "Show infopage on:" ), word, &ok, 0 );
         if ( ok && !infopage.isEmpty() )
             infoPage ( infopage );
     }
 }
 
-void DocumentationPart::manPage(const QString &term)
+void DocumentationPart::manPage(const TQString &term)
 {
-    QString url = QString::fromLatin1("man:/%1").arg(term);
+    TQString url = TQString::fromLatin1("man:/%1").arg(term);
     partController()->showDocument(KURL(url));
 }
 
-void DocumentationPart::infoPage(const QString &term)
+void DocumentationPart::infoPage(const TQString &term)
 {
-    QString url = QString::fromLatin1("info:/%1").arg(term);
+    TQString url = TQString::fromLatin1("info:/%1").arg(term);
     partController()->showDocument(KURL(url));
 }
 
 void DocumentationPart::contextManPage()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "manPage(QString)", m_contextStr);
+        callAssistant("KDevDocumentation", "manPage(TQString)", m_contextStr);
     else
         manPage(m_contextStr);
 }
@@ -368,7 +368,7 @@ void DocumentationPart::contextManPage()
 void DocumentationPart::contextInfoPage()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "infoPage(QString)", m_contextStr);
+        callAssistant("KDevDocumentation", "infoPage(TQString)", m_contextStr);
     else
         infoPage(m_contextStr);
 }
@@ -376,14 +376,14 @@ void DocumentationPart::contextInfoPage()
 void DocumentationPart::contextFindDocumentation()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "findInFinder(QString)", m_contextStr);
+        callAssistant("KDevDocumentation", "findInFinder(TQString)", m_contextStr);
     else
         findInDocumentation(m_contextStr);
 }
 
 void DocumentationPart::findInDocumentation()
 {
-     QString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
     
     if ( word.isEmpty() )
     {
@@ -398,7 +398,7 @@ void DocumentationPart::findInDocumentation()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "KDevDocumentation", "findInFinder(QString)", word );
+            callAssistant ( "KDevDocumentation", "findInFinder(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -407,7 +407,7 @@ void DocumentationPart::findInDocumentation()
     }
 }
 
-void DocumentationPart::findInDocumentation(const QString &term)
+void DocumentationPart::findInDocumentation(const TQString &term)
 {
     mainWindow()->raiseView(m_widget);
     m_widget->findInDocumentation(term);
@@ -415,7 +415,7 @@ void DocumentationPart::findInDocumentation(const QString &term)
 
 void DocumentationPart::lookInDocumentationIndex()
 {
-     QString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
     
     if ( word.isEmpty() )
     {
@@ -430,7 +430,7 @@ void DocumentationPart::lookInDocumentationIndex()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "KDevDocumentation", "lookupInIndex(QString)", word );
+            callAssistant ( "KDevDocumentation", "lookupInIndex(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -439,7 +439,7 @@ void DocumentationPart::lookInDocumentationIndex()
     }
 }
 
-void DocumentationPart::lookInDocumentationIndex(const QString &term)
+void DocumentationPart::lookInDocumentationIndex(const TQString &term)
 {
     mainWindow()->raiseView(m_widget);
     m_widget->lookInDocumentationIndex(term);
@@ -448,25 +448,25 @@ void DocumentationPart::lookInDocumentationIndex(const QString &term)
 void DocumentationPart::contextLookInDocumentationIndex()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "lookupInIndex(QString)", m_contextStr);
+        callAssistant("KDevDocumentation", "lookupInIndex(TQString)", m_contextStr);
     else
         lookInDocumentationIndex(m_contextStr);
 }
 
-void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context)
+void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
 {
     if (context->hasType(Context::EditorContext))
     {
         const EditorContext *econtext = static_cast(context);
-        QString ident = econtext->currentWord();
+        TQString ident = econtext->currentWord();
         if (!ident.isEmpty()) 
         {
             m_contextStr = ident;
-            QString squeezed = KStringHandler::csqueeze(m_contextStr, 30);
+            TQString squeezed = KStringHandler::csqueeze(m_contextStr, 30);
             int id = -1;
             if (hasContextFeature(Finder)) {
                 id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed),
-                                    this, SLOT(contextFindDocumentation()));
+                                    this, TQT_SLOT(contextFindDocumentation()));
                 popup->setWhatsThis(id, i18n("Find documentation
    "
                                     "Opens the documentation finder tab and searches "
                                     "all possible sources of documentation like "
@@ -475,7 +475,7 @@ void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context)
             }
             if (hasContextFeature(IndexLookup)) {
                 id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed),
-                                this, SLOT(contextLookInDocumentationIndex()));
+                                this, TQT_SLOT(contextLookInDocumentationIndex()));
                 popup->setWhatsThis(id, i18n("Look in documentation index
    "
                                 "Opens the documentation index tab. It allows "
                                 "a term to be entered which will be looked for in "
@@ -483,7 +483,7 @@ void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context)
             }
             if (hasContextFeature(FullTextSearch)) {
                 id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed),
-                                this, SLOT(contextSearchInDocumentation()));
+                                this, TQT_SLOT(contextSearchInDocumentation()));
                 popup->setWhatsThis(id, i18n("Search in documentation
    Searches "
                                 "for a term under the cursor in "
                                 "the documentation. For this to work, "
@@ -492,12 +492,12 @@ void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context)
             }
             if (hasContextFeature(GotoMan)) {
                 id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed),
-                                this, SLOT(contextManPage()));
+                                this, TQT_SLOT(contextManPage()));
                 popup->setWhatsThis(id, i18n("Goto manpage
    Tries to open a man page for the term under the cursor."));
             }
             if (hasContextFeature(GotoInfo)) {
                 id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed),
-                                this, SLOT(contextInfoPage()) );
+                                this, TQT_SLOT(contextInfoPage()) );
                 popup->setWhatsThis(id, i18n("Goto infopage
    Tries to open an info page for the term under the cursor."));
             }
             if (id != -1)
@@ -509,7 +509,7 @@ void DocumentationPart::contextMenu(QPopupMenu *popup, const Context *context)
 bool DocumentationPart::hasContextFeature(ContextFeature feature)
 {
     KConfig *config = DocumentationFactory::instance()->config();
-    QString group = config->group();
+    TQString group = config->group();
     config->setGroup("Context Features");
     switch (feature)
     {
@@ -536,9 +536,9 @@ bool DocumentationPart::hasContextFeature(ContextFeature feature)
 void DocumentationPart::setContextFeature(ContextFeature feature, bool b)
 {
     KConfig *config = DocumentationFactory::instance()->config();
-    QString group = config->group();
+    TQString group = config->group();
     config->setGroup("Context Features");
-    QString key;
+    TQString key;
     switch (feature)
     {
         case Finder:
@@ -564,13 +564,13 @@ void DocumentationPart::setContextFeature(ContextFeature feature, bool b)
 
 void DocumentationPart::projectOpened()
 {
-    QString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem");
-    QString projectDocURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl");
+    TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem");
+    TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl");
     if (!projectDocURL.isEmpty())
-        projectDocURL = QDir::cleanDirPath(project()->projectDirectory() + "/" + projectDocURL);
-    QString userManualURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl");
+        projectDocURL = TQDir::cleanDirPath(project()->projectDirectory() + "/" + projectDocURL);
+    TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl");
     
-    for (QValueList::const_iterator it = m_plugins.constBegin();
+    for (TQValueList::const_iterator it = m_plugins.constBegin();
         it != m_plugins.constEnd(); ++it)
     {
         if ((*it)->hasCapability(DocumentationPlugin::ProjectDocumentation) &&
@@ -604,7 +604,7 @@ void DocumentationPart::saveProjectDocumentationInfo()
     {
         DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName());
 
-        QString relPath = URLUtil::extractPathNameRelative(project()->projectDirectory(),
+        TQString relPath = URLUtil::extractPathNameRelative(project()->projectDirectory(),
             m_projectDocumentationPlugin->catalogURL());
         DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", relPath);
     }
@@ -619,21 +619,21 @@ void DocumentationPart::saveProjectDocumentationInfo()
         DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", "");
 }
 
-QCString DocumentationPart::startAssistant()
+TQCString DocumentationPart::startAssistant()
 {
-    static QCString lastAssistant = "";
+    static TQCString lastAssistant = "";
     
     if (!lastAssistant.isEmpty() && KApplication::dcopClient()->isApplicationRegistered(lastAssistant))
         return lastAssistant;
     
     const char *function = 0;
-    QString app = "kdevassistant";
-    function = "start_service_by_desktop_name(QString,QStringList)";
-    QStringList URLs;
+    TQString app = "kdevassistant";
+    function = "start_service_by_desktop_name(TQString,TQStringList)";
+    TQStringList URLs;
 
-    QByteArray data, replyData;
-    QCString replyType;
-    QDataStream arg(data, IO_WriteOnly);
+    TQByteArray data, replyData;
+    TQCString replyType;
+    TQDataStream arg(data, IO_WriteOnly);
     arg << app << URLs;
 
     if (!KApplication::dcopClient()->call("klauncher", "klauncher", function,  data, replyType, replyData))
@@ -643,7 +643,7 @@ QCString DocumentationPart::startAssistant()
     } 
     else 
     {
-        QDataStream reply(replyData, IO_ReadOnly);
+        TQDataStream reply(replyData, IO_ReadOnly);
 
         if ( replyType != "serviceResult" )
         {
@@ -651,8 +651,8 @@ QCString DocumentationPart::startAssistant()
             lastAssistant = "";
         }
         int result;
-        QCString dcopName;
-        QString error;
+        TQCString dcopName;
+        TQString error;
         reply >> result >> dcopName >> error;
         if (result != 0)
         {
@@ -692,40 +692,40 @@ void DocumentationPart::setAssistantUsed(bool b)
     config->writeEntry("UseAssistant", isAssistantUsed());
 }
 
-void DocumentationPart::activateAssistantWindow(const QCString &ref)
+void DocumentationPart::activateAssistantWindow(const TQCString &ref)
 {
     kdDebug() << "DocumentationPart::activateAssistantWindow" << endl;
-    QByteArray data, replyData;
-    QCString replyType;
+    TQByteArray data, replyData;
+    TQCString replyType;
     if (KApplication::dcopClient()->call(ref, "MainWindow", "getWinID()", data, replyType, replyData))
     {
         kdDebug() << "    call successful " << endl;
-        QDataStream reply(replyData, IO_ReadOnly);
+        TQDataStream reply(replyData, IO_ReadOnly);
         
         int winId;
         reply >> winId;
         kdDebug() << "Win ID: " << winId << endl;
         KWin::forceActiveWindow(winId);
 
-        KApplication::dcopClient()->send(ref, "MainWindow", "show()", QByteArray());
+        KApplication::dcopClient()->send(ref, "MainWindow", "show()", TQByteArray());
     }
 }
 
-void DocumentationPart::callAssistant(const QCString &interface, const QCString &method)
+void DocumentationPart::callAssistant(const TQCString &interface, const TQCString &method)
 {
-    QCString ref = startAssistant();
-    QByteArray data;
+    TQCString ref = startAssistant();
+    TQByteArray data;
     if (KApplication::dcopClient()->send(ref, interface, method, data))
         activateAssistantWindow(ref);
     else
         kdDebug() << "problem communicating with: " << ref;
 }
 
-void DocumentationPart::callAssistant(const QCString &interface, const QCString &method, const QString &dataStr)
+void DocumentationPart::callAssistant(const TQCString &interface, const TQCString &method, const TQString &dataStr)
 {
-    QCString ref = startAssistant();
-    QByteArray data;
-    QDataStream arg(data, IO_WriteOnly);
+    TQCString ref = startAssistant();
+    TQByteArray data;
+    TQDataStream arg(data, IO_WriteOnly);
     arg << dataStr;
     if (KApplication::dcopClient()->send(ref, interface, method, data))
         activateAssistantWindow(ref);
@@ -739,7 +739,7 @@ void DocumentationPart::loadSettings()
     config->setGroup("Documentation");
     m_assistantUsed = config->readBoolEntry("UseAssistant", false);
     
-    if (QString(KGlobal::instance()->aboutData()->appName()) == "kdevassistant")
+    if (TQString(KGlobal::instance()->aboutData()->appName()) == "kdevassistant")
     {
         int page = config->readNumEntry("LastPage", 0);
         switch (page)
diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h
index 9f08029f..a3f761ab 100644
--- a/parts/documentation/documentation_part.h
+++ b/parts/documentation/documentation_part.h
@@ -20,7 +20,7 @@
 #ifndef __KDEVPART_DOCUMENTATION_H__
 #define __KDEVPART_DOCUMENTATION_H__
 
-#include 
+#include 
 #include 
 
 
@@ -45,11 +45,11 @@ class DocumentationPart : public KDevPlugin
 public:
     enum ContextFeature { Finder, IndexLookup, FullTextSearch, GotoMan, GotoInfo };
 
-    DocumentationPart(QObject *parent, const char *name, const QStringList &);
+    DocumentationPart(TQObject *parent, const char *name, const TQStringList &);
     ~DocumentationPart();
     
     void emitIndexSelected(IndexBox *indexBox);
-    void emitBookmarkLocation(const QString &title, const KURL &url);
+    void emitBookmarkLocation(const TQString &title, const KURL &url);
     bool configure(int page = 0);
     
     bool hasContextFeature(ContextFeature feature);
@@ -60,26 +60,26 @@ public:
 
 public slots:
     void lookInDocumentationIndex();
-    void lookInDocumentationIndex(const QString &term);
+    void lookInDocumentationIndex(const TQString &term);
     void contextLookInDocumentationIndex();
     void contextFindDocumentation();
     void findInDocumentation();
-    void findInDocumentation(const QString &term);
+    void findInDocumentation(const TQString &term);
     void searchInDocumentation();
-    void searchInDocumentation(const QString &term);
+    void searchInDocumentation(const TQString &term);
     void contextSearchInDocumentation();
     void manPage();
-    void manPage(const QString &term);
+    void manPage(const TQString &term);
     void contextManPage();
     void infoPage();
-    void infoPage(const QString &term);
+    void infoPage(const TQString &term);
     void contextInfoPage();
     void projectOpened();
     void projectClosed();
     
 signals:
     void indexSelected(IndexBox *indexBox);
-    void bookmarkLocation(const QString &title, const KURL &url);
+    void bookmarkLocation(const TQString &title, const KURL &url);
     
 protected:
     void loadDocumentationPlugins();
@@ -88,27 +88,27 @@ protected:
     void loadSettings();
     void saveProjectDocumentationInfo();
     
-    QCString startAssistant();
-    void activateAssistantWindow(const QCString &ref);
-    void callAssistant(const QCString &interface, const QCString &method);
-    void callAssistant(const QCString &interface, const QCString &method, const QString &dataStr);
+    TQCString startAssistant();
+    void activateAssistantWindow(const TQCString &ref);
+    void callAssistant(const TQCString &interface, const TQCString &method);
+    void callAssistant(const TQCString &interface, const TQCString &method, const TQString &dataStr);
     
 protected slots:
-    void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo);
-    void contextMenu(QPopupMenu *popup, const Context *context);
+    void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo);
+    void contextMenu(TQPopupMenu *popup, const Context *context);
     
 private slots:
     void init();
     
 private:
-    QGuardedPtr m_widget;
+    TQGuardedPtr m_widget;
     ConfigWidgetProxy *m_configProxy;
     
-    QValueList m_plugins;
+    TQValueList m_plugins;
     ProjectDocumentationPlugin *m_projectDocumentationPlugin;
     ProjectDocumentationPlugin *m_userManualPlugin;
     
-    QString m_contextStr;
+    TQString m_contextStr;
     bool m_hasIndex;
     bool m_assistantUsed;
     
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index 6a19e896..90cd6234 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "documentation_widget.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -42,11 +42,11 @@
 #include "find_documentation.h"
 
 DocumentationWidget::DocumentationWidget(DocumentationPart *part)
-    :QWidget(0, "documentation widget"), m_part(part)
+    :TQWidget(0, "documentation widget"), m_part(part)
 {
-    QVBoxLayout *l = new QVBoxLayout(this, 0, 0);
+    TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0);
     
-    m_tab = new QToolBox(this);
+    m_tab = new TQToolBox(this);
     l->addWidget(m_tab);
     
     m_contents = new ContentsView(this);
@@ -64,7 +64,7 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part)
     m_bookmarks = new BookmarkView(this);
     m_tab->addItem(m_bookmarks, i18n("Bookmarks"));
     
-    connect(m_tab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
+    connect(m_tab, TQT_SIGNAL(currentChanged(int)), this, TQT_SLOT(tabChanged(int)));
 }
 
 DocumentationWidget::~DocumentationWidget()
@@ -94,7 +94,7 @@ void DocumentationWidget::searchInDocumentation()
     m_search->askSearchTerm();
 }
 
-void DocumentationWidget::searchInDocumentation(const QString &term)
+void DocumentationWidget::searchInDocumentation(const TQString &term)
 {
     m_tab->setCurrentItem(m_search);
     m_search->setSearchTerm(term);
@@ -107,7 +107,7 @@ void DocumentationWidget::lookInDocumentationIndex()
     m_index->askSearchTerm();
 }
 
-void DocumentationWidget::lookInDocumentationIndex(const QString &term)
+void DocumentationWidget::lookInDocumentationIndex(const TQString &term)
 {
     m_tab->setCurrentItem(m_index);
     m_index->setSearchTerm(term);
@@ -115,7 +115,7 @@ void DocumentationWidget::lookInDocumentationIndex(const QString &term)
 //    m_index->searchInIndex();
 }
 
-void DocumentationWidget::findInDocumentation(const QString &term)
+void DocumentationWidget::findInDocumentation(const TQString &term)
 {
    m_tab->setCurrentItem(m_finder);
    m_finder->setSearchTerm(term);
@@ -128,7 +128,7 @@ void DocumentationWidget::findInDocumentation()
    m_finder->search_term->setFocus();
 }
 
-void DocumentationWidget::focusInEvent(QFocusEvent */*e*/)
+void DocumentationWidget::focusInEvent(TQFocusEvent */*e*/)
 {
     if (m_tab->currentItem())
         m_tab->currentItem()->setFocus();
diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h
index 0bc5fd4a..0043a78a 100644
--- a/parts/documentation/documentation_widget.h
+++ b/parts/documentation/documentation_widget.h
@@ -20,7 +20,7 @@
 #ifndef __DOCUMENTATION_WIDGET_H__
 #define __DOCUMENTATION_WIDGET_H__
 
-#include 
+#include 
 
 class FindDocumentation;
 class KDevProject;
@@ -48,14 +48,14 @@ public:
 
 public slots:
     void lookInDocumentationIndex();
-    void lookInDocumentationIndex(const QString &term);
+    void lookInDocumentationIndex(const TQString &term);
     void searchInDocumentation();
-    void searchInDocumentation(const QString &term);
+    void searchInDocumentation(const TQString &term);
     void findInDocumentation();
-    void findInDocumentation(const QString &term);
+    void findInDocumentation(const TQString &term);
     
 protected:
-    virtual void focusInEvent(QFocusEvent *e);
+    virtual void focusInEvent(TQFocusEvent *e);
 
 protected slots:
     void tabChanged(int t);
@@ -67,7 +67,7 @@ private:
     SearchView *m_search;
     BookmarkView *m_bookmarks;
     FindDocumentation *m_finder;
-    QToolBox *m_tab;
+    TQToolBox *m_tab;
 
 friend class FindDocumentation;
 };
diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp
index f0a00e4e..79fa9915 100644
--- a/parts/documentation/docutils.cpp
+++ b/parts/documentation/docutils.cpp
@@ -32,21 +32,21 @@
 #include "kdevdocumentationplugin.h"
 #include "documentation_part.h"
 
-QString DocUtils::noEnvURL(const QString &url)
+TQString DocUtils::noEnvURL(const TQString &url)
 {
     return KURLCompletion::replacedPath(url, true, true);
 }
 
 KURL DocUtils::noEnvURL(const KURL &url)
 {
-    QString replaced = KURLCompletion::replacedPath(url.url(), true, true);
+    TQString replaced = KURLCompletion::replacedPath(url.url(), true, true);
     KURL kurl(replaced);
     kurl.setQuery(url.query());
     kurl.setRef(url.ref());
     return kurl;
 }
 
-QString DocUtils::envURL(KURLRequester *req)
+TQString DocUtils::envURL(KURLRequester *req)
 {
     if (req->lineEdit())
         return req->lineEdit()->text();
@@ -57,12 +57,12 @@ QString DocUtils::envURL(KURLRequester *req)
 }
 
 void DocUtils::docItemPopup(DocumentationPart *part, DocumentationItem *docItem,
-    const QPoint &pos, bool showBookmark, bool showSearch, int titleCol)
+    const TQPoint &pos, bool showBookmark, bool showSearch, int titleCol)
 {
     docItemPopup(part, docItem->text(titleCol), docItem->url(), pos, showBookmark, showSearch);
 }
 
-void DocUtils::docItemPopup(DocumentationPart *part, IndexItem *docItem, const QPoint &pos,
+void DocUtils::docItemPopup(DocumentationPart *part, IndexItem *docItem, const TQPoint &pos,
     bool showBookmark, bool showSearch)
 {
     //FIXME: index item can have more than one url, what to do?
@@ -72,8 +72,8 @@ void DocUtils::docItemPopup(DocumentationPart *part, IndexItem *docItem, const Q
     docItemPopup(part, docItem->text(), url, pos, showBookmark, showSearch);
 }
 
-void DocUtils::docItemPopup(DocumentationPart *part, const QString &title, const KURL &url,
-    const QPoint &pos, bool showBookmark, bool showSearch)
+void DocUtils::docItemPopup(DocumentationPart *part, const TQString &title, const KURL &url,
+    const TQPoint &pos, bool showBookmark, bool showSearch)
 {
     KPopupMenu menu;
     menu.insertTitle(i18n("Documentation"));
@@ -87,7 +87,7 @@ void DocUtils::docItemPopup(DocumentationPart *part, const QString &title, const
     if (showSearch)
     {
         menu.insertSeparator();
-        menu.insertItem(QString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4);
+        menu.insertItem(TQString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4);
     }
     
     switch (menu.exec(pos))
diff --git a/parts/documentation/docutils.h b/parts/documentation/docutils.h
index b4870809..e4d93e1d 100644
--- a/parts/documentation/docutils.h
+++ b/parts/documentation/docutils.h
@@ -20,7 +20,7 @@
 #ifndef DOC_UTILS_H
 #define DOC_UTILS_H
 
-#include 
+#include 
 
 class KURLRequester;
 class KPopupMenu;
@@ -34,18 +34,18 @@ namespace DocUtils{
 
 /**Returns an url selected in KURLRequester but does not
 resolve environment variables.*/
-QString envURL(KURLRequester *req);
+TQString envURL(KURLRequester *req);
 /**Resolves environment variables in url.*/
-QString noEnvURL(const QString &url);
+TQString noEnvURL(const TQString &url);
 /**Resolves environment variables in url.*/
 KURL noEnvURL(const KURL &url);
 
-void docItemPopup(DocumentationPart *part, DocumentationItem *docItem, const QPoint &pos,
+void docItemPopup(DocumentationPart *part, DocumentationItem *docItem, const TQPoint &pos,
     bool showBookmark = false, bool showSearch = false, int titleCol = 0);
-void docItemPopup(DocumentationPart *part, IndexItem *docItem, const QPoint &pos,
+void docItemPopup(DocumentationPart *part, IndexItem *docItem, const TQPoint &pos,
     bool showBookmark = false, bool showSearch = false);
-void docItemPopup(DocumentationPart *part, const QString &title, const KURL &url,
-    const QPoint &pos, bool showBookmark = false, bool showSearch = false);
+void docItemPopup(DocumentationPart *part, const TQString &title, const KURL &url,
+    const TQPoint &pos, bool showBookmark = false, bool showSearch = false);
 }
 
 #endif
diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp
index 9e83a7ba..8bdc19d5 100644
--- a/parts/documentation/editcatalogdlg.cpp
+++ b/parts/documentation/editcatalogdlg.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "editcatalogdlg.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -28,7 +28,7 @@
 #include "docutils.h"
 #include "kdevdocumentationplugin.h"
 
-EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, QWidget* parent,
+EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent,
     const char* name, bool modal, WFlags fl)
     :EditCatalogBase(parent,name, modal,fl), m_plugin(plugin)
 {
@@ -46,32 +46,32 @@ EditCatalogDlg::~EditCatalogDlg()
 }
 
 /*$SPECIALIZATION$*/
-void EditCatalogDlg::locationURLChanged(const QString &text)
+void EditCatalogDlg::locationURLChanged(const TQString &text)
 {
     titleEdit->setText(m_plugin->catalogTitle(DocUtils::noEnvURL(text)));
 }
 
 void EditCatalogDlg::accept()
 {
-    QDialog::accept();
+    TQDialog::accept();
 }
 
-QString EditCatalogDlg::title() const
+TQString EditCatalogDlg::title() const
 {
     return titleEdit->text();
 }
 
-QString EditCatalogDlg::url() const
+TQString EditCatalogDlg::url() const
 {
     return DocUtils::envURL(locationURL);
 }
 
-void EditCatalogDlg::setTitle(const QString &title)
+void EditCatalogDlg::setTitle(const TQString &title)
 {
     titleEdit->setText(title);
 }
 
-void EditCatalogDlg::setURL(const QString &url)
+void EditCatalogDlg::setURL(const TQString &url)
 {
     locationURL->setURL(url);
 }
diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h
index 7d31244c..f8f1fabf 100644
--- a/parts/documentation/editcatalogdlg.h
+++ b/parts/documentation/editcatalogdlg.h
@@ -29,18 +29,18 @@ class EditCatalogDlg : public EditCatalogBase
     Q_OBJECT
 public:
     EditCatalogDlg(DocumentationPlugin *plugin, 
-        QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+        TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
     ~EditCatalogDlg();
     /*$PUBLIC_FUNCTIONS$*/
 
-    QString title() const;
-    void setTitle(const QString &title);
-    QString url() const;
-    void setURL(const QString &url);
+    TQString title() const;
+    void setTitle(const TQString &title);
+    TQString url() const;
+    void setURL(const TQString &url);
     
 public slots:
     /*$PUBLIC_SLOTS$*/
-    virtual void locationURLChanged(const QString &text);
+    virtual void locationURLChanged(const TQString &text);
 
 protected:
   /*$PROTECTED_FUNCTIONS$*/
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 1ca9e81a..782ef467 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -20,10 +20,10 @@
 #include "find_documentation.h"
 
 #include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -46,20 +46,20 @@ FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* na
     man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0),
     last_item(0), m_widget(parent)
 {
-    QWidget* tmp = QApplication::desktop();
+    TQWidget* tmp = TQApplication::desktop();
     setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height());
     proc_man = new KProcess( this );
     proc_info = new KProcess( this );
 
-    connect( proc_man, SIGNAL(processExited( KProcess* )),
-                this, SLOT(procManExited( KProcess* )) );
-    connect( proc_man, SIGNAL(receivedStdout( KProcess*, char*, int)),
-		this, SLOT(procManReadStdout( KProcess*, char*, int)) );
+    connect( proc_man, TQT_SIGNAL(processExited( KProcess* )),
+                this, TQT_SLOT(procManExited( KProcess* )) );
+    connect( proc_man, TQT_SIGNAL(receivedStdout( KProcess*, char*, int)),
+		this, TQT_SLOT(procManReadStdout( KProcess*, char*, int)) );
 
-    connect( proc_info, SIGNAL(processExited( KProcess* )),
-                this, SLOT(procInfoExited( KProcess* )) );
-    connect( proc_info, SIGNAL(receivedStdout( KProcess*, char*, int)),
-		this, SLOT(procInfoReadStdout( KProcess*, char*, int)) );
+    connect( proc_info, TQT_SIGNAL(processExited( KProcess* )),
+                this, TQT_SLOT(procInfoExited( KProcess* )) );
+    connect( proc_info, TQT_SIGNAL(receivedStdout( KProcess*, char*, int)),
+		this, TQT_SLOT(procInfoReadStdout( KProcess*, char*, int)) );
 
     result_list->header()->hide();
     result_list->setSorting(-1);
@@ -72,7 +72,7 @@ FindDocumentation::~FindDocumentation()
 }
 
 /*$SPECIALIZATION$*/
-void FindDocumentation::buttonPressedOnItem( int button, QListViewItem * item, const QPoint & pos, int // c
+void FindDocumentation::buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int // c
                                              )
 {
     if ((button != Qt::RightButton) || (!item))
@@ -84,7 +84,7 @@ void FindDocumentation::buttonPressedOnItem( int button, QListViewItem * item, c
     DocUtils::docItemPopup(m_widget->part(), docItem->text(0), docItem->url(), pos, true, false);
 }
 
-void FindDocumentation::clickOnItem( QListViewItem * item )
+void FindDocumentation::clickOnItem( TQListViewItem * item )
 {
     if(!item)
         return;
@@ -106,8 +106,8 @@ void FindDocumentation::procInfoExited( KProcess* )
 {
     if (proc_info->normalExit() && proc_info->exitStatus() == 0)
     {
-        QStringList lines = QStringList::split("\n", proc_info_out);
-        for( QStringList::const_iterator it = lines.begin(); it != lines.end(); ++it )
+        TQStringList lines = TQStringList::split("\n", proc_info_out);
+        for( TQStringList::const_iterator it = lines.begin(); it != lines.end(); ++it )
         {
             if( (*it) == "*")
                 break;
@@ -129,8 +129,8 @@ void FindDocumentation::procManExited( KProcess* )
 {
     if (proc_man->normalExit() && proc_man->exitStatus() == 0)
     {
-        QStringList lines = QStringList::split("\n", proc_man_out);
-        for( QStringList::const_iterator it = lines.begin(); it != lines.end(); ++it )
+        TQStringList lines = TQStringList::split("\n", proc_man_out);
+        for( TQStringList::const_iterator it = lines.begin(); it != lines.end(); ++it )
         {
             DocumentationItem* newitem = new DocumentationItem(DocumentationItem::Document, man_item, search_term->text());
             newitem->setURL(KURL("man://" + *it));
@@ -147,12 +147,12 @@ void FindDocumentation::procManExited( KProcess* )
 
 void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len)
 {
-    proc_info_out += QString::fromLatin1( buf, len );
+    proc_info_out += TQString::fromLatin1( buf, len );
 }
 
 void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len)
 {
-    proc_man_out += QString::fromLatin1( buf, len );
+    proc_man_out += TQString::fromLatin1( buf, len );
 }
 
 void FindDocumentation::searchInInfo()
@@ -217,7 +217,7 @@ void FindDocumentation::searchInContents()
     contents_item->setOpen(true);
     last_item = contents_item;
 
-    QListViewItemIterator it( m_widget->m_contents->m_view );
+    TQListViewItemIterator it( m_widget->m_contents->m_view );
     while ( it.current() )
     {
         DocumentationItem *docItem = dynamic_cast(it.current());
@@ -266,7 +266,7 @@ void FindDocumentation::searchInIndex()
             IndexItem::List urls = item->urls();
             for (IndexItem::List::const_iterator it = urls.begin(); it != urls.end(); ++it)
             {
-                QString text = item->text();
+                TQString text = item->text();
                 if (urls.count() > 1)
                     text = (*it).first;
                 if(newitem)
@@ -299,19 +299,19 @@ void FindDocumentation::startSearch()
     last_item = NULL;
     first_match_found = false;
 
-    QListViewItem* item = m_options->source_list->firstChild();
+    TQListViewItem* item = m_options->source_list->firstChild();
 
     while ( item && ( !m_options->goto_first_match->isOn() || !first_match_found ))
     {
-        if ( m_options->isMan(dynamic_cast(item)) )
+        if ( m_options->isMan(dynamic_cast(item)) )
             searchInMan();
-        else if ( m_options->isInfo(dynamic_cast(item)) )
+        else if ( m_options->isInfo(dynamic_cast(item)) )
             searchInInfo();
-        else if ( m_options->isIndex(dynamic_cast(item)) )
+        else if ( m_options->isIndex(dynamic_cast(item)) )
             searchInIndex();
-        else if ( m_options->isGoogle(dynamic_cast(item)) )
+        else if ( m_options->isGoogle(dynamic_cast(item)) )
             searchInGoogle();
-        else if ( m_options->isContents(dynamic_cast(item)) )
+        else if ( m_options->isContents(dynamic_cast(item)) )
             searchInContents();
 
         item = item->itemBelow();
@@ -325,20 +325,20 @@ void FindDocumentation::startSearch()
 
 }
 
-void FindDocumentation::setSearchTerm( const QString & term )
+void FindDocumentation::setSearchTerm( const TQString & term )
 {
     search_term->setText(term);
 }
 
 void FindDocumentation::clickOptions()
 {
-    if( m_options->exec() == QDialog::Accepted )
+    if( m_options->exec() == TQDialog::Accepted )
         m_options->writeOptions();
     else
         m_options->readOptions();
 }
 
-void FindDocumentation::focusInEvent( QFocusEvent * // e
+void FindDocumentation::focusInEvent( TQFocusEvent * // e
                                       )
 {
     search_term->setFocus();
diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h
index c02e1249..0a9a3e0a 100644
--- a/parts/documentation/find_documentation.h
+++ b/parts/documentation/find_documentation.h
@@ -38,8 +38,8 @@ public:
 
 public slots:
     /*$PUBLIC_SLOTS$*/
-    virtual void buttonPressedOnItem( int button, QListViewItem * item, const QPoint & pos, int c );
-    virtual void clickOnItem( QListViewItem * item );
+    virtual void buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c );
+    virtual void clickOnItem( TQListViewItem * item );
     virtual void procInfoExited( KProcess* );
     virtual void procManExited( KProcess* );
     virtual void procManReadStdout( KProcess*, char*, int );
@@ -50,12 +50,12 @@ public slots:
     virtual void searchInContents();
     virtual void searchInIndex();
     virtual void startSearch();
-    virtual void setSearchTerm( const QString & term );
+    virtual void setSearchTerm( const TQString & term );
     virtual void clickOptions();
 
 protected:
     /*$PROTECTED_FUNCTIONS$*/
-    virtual void focusInEvent(QFocusEvent *e);
+    virtual void focusInEvent(TQFocusEvent *e);
 
 protected slots:
   /*$PROTECTED_SLOTS$*/
@@ -63,8 +63,8 @@ protected slots:
 private:
     KProcess* proc_man;
     KProcess* proc_info;
-    QString proc_man_out;
-    QString proc_info_out;
+    TQString proc_man_out;
+    TQString proc_info_out;
     KListViewItem* man_item;
     KListViewItem* info_item;
     KListViewItem* index_item;
diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp
index 68f37791..df04ca81 100644
--- a/parts/documentation/find_documentation_options.cpp
+++ b/parts/documentation/find_documentation_options.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "find_documentation_options.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-FindDocumentationOptions::FindDocumentationOptions(QWidget* parent, const char* name, bool modal)
+FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal)
     :FindDocumentationOptionsBase(parent,name, modal),
     m_man_item(0), m_info_item(0), m_index_item(0), m_google_item(0), m_contents_item(0)
 {        
@@ -43,7 +43,7 @@ FindDocumentationOptions::~FindDocumentationOptions()
 }
 
 /*$SPECIALIZATION$*/
-bool FindDocumentationOptions::isContents( QCheckListItem * item )
+bool FindDocumentationOptions::isContents( TQCheckListItem * item )
 {
     if ( item == m_contents_item && m_contents_item->isOn()  )
         return true;
@@ -51,7 +51,7 @@ bool FindDocumentationOptions::isContents( QCheckListItem * item )
         return false;
 }
 
-bool FindDocumentationOptions::isGoogle( QCheckListItem * item )
+bool FindDocumentationOptions::isGoogle( TQCheckListItem * item )
 {
     if ( item == m_google_item && m_google_item->isOn()  )
         return true;
@@ -59,7 +59,7 @@ bool FindDocumentationOptions::isGoogle( QCheckListItem * item )
         return false;
 }
 
-bool FindDocumentationOptions::isIndex( QCheckListItem * item )
+bool FindDocumentationOptions::isIndex( TQCheckListItem * item )
 {
     if ( item == m_index_item  && m_index_item->isOn() )
         return true;
@@ -67,7 +67,7 @@ bool FindDocumentationOptions::isIndex( QCheckListItem * item )
         return false;
 }
 
-bool FindDocumentationOptions::isInfo( QCheckListItem * item )
+bool FindDocumentationOptions::isInfo( TQCheckListItem * item )
 {
     if ( item == m_info_item  && m_info_item->isOn() )
         return true;
@@ -75,7 +75,7 @@ bool FindDocumentationOptions::isInfo( QCheckListItem * item )
         return false;
 }
 
-bool FindDocumentationOptions::isMan( QCheckListItem * item )
+bool FindDocumentationOptions::isMan( TQCheckListItem * item )
 {
     if ( item == m_man_item && m_man_item->isOn() )
         return true;
@@ -100,7 +100,7 @@ void FindDocumentationOptions::sourceMoveUp()
     if (source_list->currentItem() == source_list->firstChild()) 
         return;
     
-    QListViewItem *item = source_list->firstChild();
+    TQListViewItem *item = source_list->firstChild();
     while (item->nextSibling() != source_list->currentItem())
         item = item->nextSibling();
     item->moveItem( source_list->currentItem()); 
@@ -113,7 +113,7 @@ void FindDocumentationOptions::writeOptions()
     
     config->writeEntry("goto_first_match", goto_first_match->isChecked());
     
-    QListViewItemIterator it( source_list );
+    TQListViewItemIterator it( source_list );
     int i = 0;
     while ( it.current() ) 
     {
@@ -160,27 +160,27 @@ void FindDocumentationOptions::readOptions()
     {
         if( config->readPropertyEntry( "Manpage" , 0 ) == i)
         {
-            m_man_item  = new QCheckListItem( source_list, i18n("Manual"), QCheckListItem::CheckBox );
+            m_man_item  = new TQCheckListItem( source_list, i18n("Manual"), TQCheckListItem::CheckBox );
             m_man_item->setOn(config->readBoolEntry( "ManpageEnabled" , true));
         }
         if( config->readPropertyEntry( "Info" , 1 ) == i)
         {
-            m_info_item = new QCheckListItem( source_list, i18n("Info"), QCheckListItem::CheckBox );
+            m_info_item = new TQCheckListItem( source_list, i18n("Info"), TQCheckListItem::CheckBox );
             m_info_item->setOn(config->readBoolEntry( "InfoEnabled" , true));
         }
         if( config->readPropertyEntry( "Index" , 2 ) == i)
         {
-            m_index_item = new QCheckListItem( source_list, i18n("Index"), QCheckListItem::CheckBox );
+            m_index_item = new TQCheckListItem( source_list, i18n("Index"), TQCheckListItem::CheckBox );
             m_index_item->setOn(config->readBoolEntry( "IndexEnabled" , true));
         }
         if( config->readPropertyEntry( "Google" , 3 ) == i)
         {
-            m_google_item = new QCheckListItem( source_list, i18n("Google"), QCheckListItem::CheckBox );
+            m_google_item = new TQCheckListItem( source_list, i18n("Google"), TQCheckListItem::CheckBox );
             m_google_item->setOn(config->readBoolEntry( "GoogleEnabled" , false)); 
         }
         if( config->readPropertyEntry( "Contents" , 4 ) == i)
         {
-            m_contents_item = new QCheckListItem( source_list, i18n("Contents"), QCheckListItem::CheckBox );
+            m_contents_item = new TQCheckListItem( source_list, i18n("Contents"), TQCheckListItem::CheckBox );
             m_contents_item->setOn(config->readBoolEntry( "ContentsEnabled" , false)); 
         }      
     }
diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h
index e3da05be..c67206cb 100644
--- a/parts/documentation/find_documentation_options.h
+++ b/parts/documentation/find_documentation_options.h
@@ -30,14 +30,14 @@ class FindDocumentationOptions : public FindDocumentationOptionsBase
 {
 Q_OBJECT
 public:
-    FindDocumentationOptions(QWidget* parent = 0, const char* name = 0, bool modal = FALSE);
+    FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE);
     ~FindDocumentationOptions();
     /*$PUBLIC_FUNCTIONS$*/
-    virtual bool isContents( QCheckListItem * item );
-    virtual bool isGoogle( QCheckListItem * item );
-    virtual bool isIndex( QCheckListItem * item );
-    virtual bool isInfo( QCheckListItem * item );
-    virtual bool isMan( QCheckListItem * item );
+    virtual bool isContents( TQCheckListItem * item );
+    virtual bool isGoogle( TQCheckListItem * item );
+    virtual bool isIndex( TQCheckListItem * item );
+    virtual bool isInfo( TQCheckListItem * item );
+    virtual bool isMan( TQCheckListItem * item );
 
 public slots:
     /*$PUBLIC_SLOTS$*/
@@ -53,11 +53,11 @@ protected slots:
   /*$PROTECTED_SLOTS$*/
 
 private:
-    QCheckListItem *m_man_item;
-    QCheckListItem *m_info_item;
-    QCheckListItem *m_index_item;
-    QCheckListItem *m_google_item;
-    QCheckListItem *m_contents_item;
+    TQCheckListItem *m_man_item;
+    TQCheckListItem *m_info_item;
+    TQCheckListItem *m_index_item;
+    TQCheckListItem *m_google_item;
+    TQCheckListItem *m_contents_item;
     
     KConfig* config;    
 };
diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp
index 29f0d9d5..6a7eddcf 100644
--- a/parts/documentation/indexview.cpp
+++ b/parts/documentation/indexview.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 #include "indexview.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -39,24 +39,24 @@
 #include "documentation_widget.h"
 
 IndexView::IndexView(DocumentationWidget *parent, const char *name)
-     :QWidget(parent, name), m_widget(parent)
+     :TQWidget(parent, name), m_widget(parent)
 {
-    QVBoxLayout *l = new QVBoxLayout(this, 0, 0);
+    TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0);
 
-    QHBoxLayout *hl = new QHBoxLayout(this, 0, 0);
+    TQHBoxLayout *hl = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    hl->addWidget(new QLabel(m_edit, i18n("&Look for:"), this));
+    hl->addWidget(new TQLabel(m_edit, i18n("&Look for:"), this));
     hl->addWidget(m_edit);
     l->addLayout(hl);
 
     m_index = new IndexBox(this);
     l->addWidget(m_index);
 
-    connect(m_index, SIGNAL(executed(QListBoxItem* )), this, SLOT(searchInIndex(QListBoxItem* )));
-    connect(m_index, SIGNAL(mouseButtonPressed(int, QListBoxItem*, const QPoint& )),
-        this, SLOT(itemMouseButtonPressed(int, QListBoxItem*, const QPoint& )));
-    connect(m_edit, SIGNAL(returnPressed()), this, SLOT(searchInIndex()));
-    connect(m_edit, SIGNAL(textChanged(const QString&)), this, SLOT(showIndex(const QString&)));
+    connect(m_index, TQT_SIGNAL(executed(TQListBoxItem* )), this, TQT_SLOT(searchInIndex(TQListBoxItem* )));
+    connect(m_index, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )),
+        this, TQT_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& )));
+    connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(searchInIndex()));
+    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(showIndex(const TQString&)));
 
     m_edit->installEventFilter(this);
 }
@@ -71,7 +71,7 @@ void IndexView::searchInIndex()
         searchInIndex(m_index->item(m_index->currentItem()));
 }
 
-void IndexView::searchInIndex(QListBoxItem *item)
+void IndexView::searchInIndex(TQListBoxItem *item)
 {
     kdDebug() << "IndexView::searchInIndex" << endl;
     IndexItem *indexItem = dynamic_cast(item);
@@ -92,13 +92,13 @@ void IndexView::searchInIndex(QListBoxItem *item)
     }
 }
 
-void IndexView::showIndex(const QString &term)
+void IndexView::showIndex(const TQString &term)
 {
-    QListBoxItem *i = m_index->firstItem();
-    QString sl = term.lower();
+    TQListBoxItem *i = m_index->firstItem();
+    TQString sl = term.lower();
     while (i)
     {
-        QString t = i->text();
+        TQString t = i->text();
         if ((t.length() >= sl.length()) && (i->text().left(term.length()).lower() == sl))
         {
             m_index->setCurrentItem(i);
@@ -118,14 +118,14 @@ void IndexView::showIndex(const QString &term)
     }*/
 }
 
-bool IndexView::eventFilter(QObject *watched, QEvent *e)
+bool IndexView::eventFilter(TQObject *watched, TQEvent *e)
 {
     if (!watched || !e)
         return true;
 
-    if ((watched == m_edit) && (e->type() == QEvent::KeyPress))
+    if ((watched == m_edit) && (e->type() == TQEvent::KeyPress))
     {
-        QKeyEvent *ke = (QKeyEvent*)e;
+        TQKeyEvent *ke = (TQKeyEvent*)e;
         if (ke->key() == Key_Up)
         {
             int i = m_index->currentItem();
@@ -150,17 +150,17 @@ bool IndexView::eventFilter(QObject *watched, QEvent *e)
             return true;
         } else if ((ke->key() == Key_Next) || (ke->key() == Key_Prior))
         {
-            QApplication::sendEvent(m_index, e);
+            TQApplication::sendEvent(m_index, e);
             m_edit->blockSignals(true);
             m_edit->setText(m_index->currentText());
             m_edit->blockSignals(false);
         }
     }
 
-    return QWidget::eventFilter(watched, e);
+    return TQWidget::eventFilter(watched, e);
 }
 
-void IndexView::itemMouseButtonPressed(int button, QListBoxItem *item, const QPoint &pos)
+void IndexView::itemMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &pos)
 {
     if ((button != Qt::RightButton) || (!item))
         return;
@@ -171,7 +171,7 @@ void IndexView::itemMouseButtonPressed(int button, QListBoxItem *item, const QPo
     DocUtils::docItemPopup(m_widget->part(), docItem, pos, false, true);
 }
 
-void IndexView::setSearchTerm(const QString &term)
+void IndexView::setSearchTerm(const TQString &term)
 {
     m_edit->setFocus();
     m_edit->setText(term);
@@ -182,7 +182,7 @@ void IndexView::askSearchTerm( )
     m_edit->setFocus();
 }
 
-void IndexView::focusInEvent(QFocusEvent */*e*/)
+void IndexView::focusInEvent(TQFocusEvent */*e*/)
 {
     m_edit->setFocus();
 }
diff --git a/parts/documentation/indexview.h b/parts/documentation/indexview.h
index 4a2f336a..af403891 100644
--- a/parts/documentation/indexview.h
+++ b/parts/documentation/indexview.h
@@ -20,7 +20,7 @@
 #ifndef INDEXVIEW_H
 #define INDEXVIEW_H
 
-#include 
+#include 
 
 class IndexBox;
 class KLineEdit;
@@ -35,22 +35,22 @@ public:
     IndexView(DocumentationWidget *parent = 0, const char *name = 0);
     ~IndexView();
     
-    virtual bool eventFilter(QObject *watched, QEvent *e);
+    virtual bool eventFilter(TQObject *watched, TQEvent *e);
     IndexBox *indexBox() const { return m_index; }
 
 public slots:
     void searchInIndex();
-    void setSearchTerm(const QString &term);
+    void setSearchTerm(const TQString &term);
     void askSearchTerm();
     
 protected slots:
-    void searchInIndex(QListBoxItem *item);
-    void showIndex(const QString &term);
+    void searchInIndex(TQListBoxItem *item);
+    void showIndex(const TQString &term);
 
-    void itemMouseButtonPressed(int button, QListBoxItem *item, const QPoint &pos);
+    void itemMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &pos);
 
 protected:
-    virtual void focusInEvent(QFocusEvent *e);
+    virtual void focusInEvent(TQFocusEvent *e);
     
 private:
     DocumentationWidget *m_widget;
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index fc63d9e8..3364f71a 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -18,11 +18,11 @@
 */
 #include "kdevdocumentationplugin.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -34,28 +34,28 @@
 //class DocumentationItem
 
 DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent,
-    const QString &name)
+    const TQString &name)
     :KListViewItem(parent, name), m_type(type)
 {
     init();
 }
 
 DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *parent,
-    const QString &name)
+    const TQString &name)
     :KListViewItem(parent, name), m_type(type)
 {
     init();
 }
 
 DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, 
-    KListViewItem *after, const QString &name)
+    KListViewItem *after, const TQString &name)
     :KListViewItem(parent, after, name), m_type(type)
 {
     init();
 }
 
 DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * parent,
-    KListViewItem * after, const QString & name )
+    KListViewItem * after, const TQString & name )
     :KListViewItem(parent, after, name), m_type(type)
 {
     init();
@@ -64,7 +64,7 @@ DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem
 
 void DocumentationItem::init( )
 {
-    QString icon;
+    TQString icon;
     
     switch (m_type)
     {
@@ -90,7 +90,7 @@ void DocumentationItem::init( )
 
   
 DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin,
-    KListView *parent, const QString &name)
+    KListView *parent, const TQString &name)
     :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin),
     isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false)
 {
@@ -99,7 +99,7 @@ DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin,
 }
 
 DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin,
-    DocumentationItem *parent, const QString &name)
+    DocumentationItem *parent, const TQString &name)
     :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin),
     isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false)
 {
@@ -146,7 +146,7 @@ void DocumentationCatalogItem::activate()
 //class IndexItemProto
 
 IndexItemProto::IndexItemProto(DocumentationPlugin *plugin, DocumentationCatalogItem *catalog, 
-    IndexBox *listbox, const QString &text, const QString &description)
+    IndexBox *listbox, const TQString &text, const TQString &description)
     : m_listbox(listbox), m_text(text), m_description(description)
 {
     plugin->indexes[catalog].append(this);
@@ -161,16 +161,16 @@ IndexItemProto::~IndexItemProto()
 
 //class IndexItem
 
-IndexItem::IndexItem(IndexBox *listbox, const QString &text)
-    :QListBoxText(listbox, text), m_listbox(listbox)
+IndexItem::IndexItem(IndexBox *listbox, const TQString &text)
+    :TQListBoxText(listbox, text), m_listbox(listbox)
 {
 }
 
 IndexItem::List IndexItem::urls() const
 {
     List urlList;
-    QValueList itemProtos = m_listbox->items[text()];
-    for (QValueList::const_iterator it = itemProtos.begin();
+    TQValueList itemProtos = m_listbox->items[text()];
+    for (TQValueList::const_iterator it = itemProtos.begin();
         it != itemProtos.end(); ++it)
         urlList.append(qMakePair((*it)->description(), (*it)->url()));
     return urlList;
@@ -181,9 +181,9 @@ IndexItem::List IndexItem::urls() const
 
 //class ConfigurationItem
 
-ConfigurationItem::ConfigurationItem(QListView *parent, DocumentationPlugin * plugin, const QString &title, const QString &url,
+ConfigurationItem::ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url,
     bool indexPossible, bool fullTextSearchPossible)
-    :QCheckListItem(parent, "", QCheckListItem::CheckBox), m_title(title), m_url(url),
+    :TQCheckListItem(parent, "", TQCheckListItem::CheckBox), m_title(title), m_url(url),
     m_origTitle(title), m_contents(true), m_index(false), m_fullTextSearch(false),
     m_indexPossible(indexPossible), m_fullTextSearchPossible(fullTextSearchPossible),
     m_docPlugin( plugin )
@@ -192,7 +192,7 @@ ConfigurationItem::ConfigurationItem(QListView *parent, DocumentationPlugin * pl
     setText(4, m_url);
 }
 
-void ConfigurationItem::paintCell(QPainter *p, const QColorGroup &cg, int column,
+void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
     int width, int align)
 {
     if ( (column == 0) || (column == 1) || (column == 2) )
@@ -200,25 +200,25 @@ void ConfigurationItem::paintCell(QPainter *p, const QColorGroup &cg, int column
         if ( !p )
             return;
     
-        QListView *lv = listView();
+        TQListView *lv = listView();
         if ( !lv )
             return;
     
         const BackgroundMode bgmode = lv->viewport()->backgroundMode();
-        const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode( bgmode );
+        const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
         p->fillRect(0, 0, width, height(), cg.brush(crole));
 
-        QFontMetrics fm(lv->fontMetrics());
-        int boxsize = lv->style().pixelMetric(QStyle::PM_CheckListButtonSize, lv);
+        TQFontMetrics fm(lv->fontMetrics());
+        int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
         int marg = lv->itemMargin();
-        int styleflags = QStyle::Style_Default;
+        int styleflags = TQStyle::Style_Default;
                 
         if (((column == 0) && m_contents) || ((column == 1) && m_index) || ((column == 2) && m_fullTextSearch))
-            styleflags |= QStyle::Style_On;
+            styleflags |= TQStyle::Style_On;
         else
-            styleflags |= QStyle::Style_Off;
+            styleflags |= TQStyle::Style_Off;
         if ((column == 0) || ((column == 1) && m_indexPossible) || ((column == 2) && m_fullTextSearchPossible))
-            styleflags |= QStyle::Style_Enabled;
+            styleflags |= TQStyle::Style_Enabled;
 
         int x = 0;
         int y = 0;
@@ -228,20 +228,20 @@ void ConfigurationItem::paintCell(QPainter *p, const QColorGroup &cg, int column
         else
             y = (fm.height() + 2 + marg - boxsize) / 2;
 
-        QStyleOption opt(this);
-        lv->style().drawPrimitive(QStyle::PE_CheckListIndicator, p,
-            QRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt);
+        TQStyleOption opt(this);
+        lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p,
+            TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt);
                
         return;
     }
-    QListViewItem::paintCell(p, cg, column, width, align);
+    TQListViewItem::paintCell(p, cg, column, width, align);
 }
 
-int ConfigurationItem::width(const QFontMetrics &fm, const QListView *lv, int c) const
+int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const
 {
     if ((c == 0) || (c == 1) || (c == 2))
-        return lv->style().pixelMetric(QStyle::PM_CheckListButtonSize, lv) + 4;
-    return QListViewItem::width(fm, lv, c);
+        return lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
+    return TQListViewItem::width(fm, lv, c);
 }
 
 
@@ -253,8 +253,8 @@ int ConfigurationItem::width(const QFontMetrics &fm, const QListView *lv, int c)
 
 //class DocumentationPlugin
 
-DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, QObject *parent, const char *name)
-    :QObject(parent, name), config(pluginConfig), m_indexCreated(false)
+DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *parent, const char *name)
+    :TQObject(parent, name), config(pluginConfig), m_indexCreated(false)
 {
 }
 
@@ -277,7 +277,7 @@ void DocumentationPlugin::autoSetup()
 void DocumentationPlugin::reload()
 {
     clear();
-    for (QValueList::iterator it = catalogs.begin();
+    for (TQValueList::iterator it = catalogs.begin();
         it != catalogs.end(); ++it)
     {
         createTOC(*it);
@@ -286,7 +286,7 @@ void DocumentationPlugin::reload()
 
 void DocumentationPlugin::clear()
 {
-    for (QValueList::iterator it = catalogs.begin();
+    for (TQValueList::iterator it = catalogs.begin();
         it != catalogs.end(); ++it)
     {
         clearCatalog(*it);
@@ -296,7 +296,7 @@ void DocumentationPlugin::clear()
 void DocumentationPlugin::clearCatalog(DocumentationCatalogItem *item)
 {
     //clear named catalog map
-    for (QMap::iterator it = namedCatalogs.begin();
+    for (TQMap::iterator it = namedCatalogs.begin();
         it != namedCatalogs.end(); ++it)
     {
         if (it.data() == item)
@@ -306,8 +306,8 @@ void DocumentationPlugin::clearCatalog(DocumentationCatalogItem *item)
         }
     }
     //clear indexes for catalog
-    QValueList idx = indexes[item];
-    for (QValueList::iterator it = idx.begin(); it != idx.end(); ++it)
+    TQValueList idx = indexes[item];
+    for (TQValueList::iterator it = idx.begin(); it != idx.end(); ++it)
     {
         delete *it;
     }
@@ -322,7 +322,7 @@ void DocumentationPlugin::createIndex(IndexBox *index)
     if (m_indexCreated)
         return;
     
-    for (QValueList::iterator it = catalogs.begin();
+    for (TQValueList::iterator it = catalogs.begin();
         it != catalogs.end(); ++it)
     {
         loadIndex(index, *it);
@@ -334,17 +334,17 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item)
 {
     kdDebug() << "Creating index cache for " << item->text(0) << endl;
     
-    QString cacheName = locateLocal("data", QString("kdevdocumentation/index/cache_") + item->text(0));
-    QFile cacheFile(cacheName);
+    TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->text(0));
+    TQFile cacheFile(cacheName);
     if (!cacheFile.open(IO_WriteOnly))
         return;
     
-    QTextStream str(&cacheFile);
-    str.setEncoding(QTextStream::Unicode);
+    TQTextStream str(&cacheFile);
+    str.setEncoding(TQTextStream::Unicode);
     str << CACHE_VERSION << endl;
 
-    QValueList catalogIndexes = indexes[item];
-    for (QValueList::const_iterator it = catalogIndexes.constBegin();
+    TQValueList catalogIndexes = indexes[item];
+    for (TQValueList::const_iterator it = catalogIndexes.constBegin();
         it != catalogIndexes.constEnd(); ++it)
     {
         str << (*it)->text() << endl;
@@ -357,26 +357,26 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item)
 
 bool DocumentationPlugin::loadCachedIndex(IndexBox *index, DocumentationCatalogItem *item)
 {
-    QString cacheName = locateLocal("data", QString("kdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0));
-    QFile cacheFile(cacheName);
+    TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0));
+    TQFile cacheFile(cacheName);
     if (!cacheFile.open(IO_ReadOnly))
         return false;
 
     kdDebug() << "Using cached index for item: " << item->text(0) << endl;
     
-    QTextStream str(&cacheFile);
-    str.setEncoding(QTextStream::Unicode);
-    QString cache = str.read();
-    QStringList cacheList = QStringList::split("\n", cache, true);
-    QString ver = cacheList.first();
+    TQTextStream str(&cacheFile);
+    str.setEncoding(TQTextStream::Unicode);
+    TQString cache = str.read();
+    TQStringList cacheList = TQStringList::split("\n", cache, true);
+    TQString ver = cacheList.first();
     if (ver != CACHE_VERSION)
     {
         kdDebug() << "Wrong cache version: " << ver << endl;
         return false;
     }
-    QStringList::const_iterator it = cacheList.begin();
+    TQStringList::const_iterator it = cacheList.begin();
     it++;
-    QString s[3]; int c = 0;
+    TQString s[3]; int c = 0;
     for (; it != cacheList.end(); ++it)
     {
         s[c] = *it;
@@ -397,18 +397,18 @@ void DocumentationPlugin::addCatalog(DocumentationCatalogItem *item)
 {
     catalogs.append(item);
     namedCatalogs[item->text(0)] = item;
-//    indexes[item] = QValueList();
+//    indexes[item] = TQValueList();
 }
 
 void DocumentationPlugin::addCatalogConfiguration(KListView *configurationView,
-    const QString &title, const QString &url)
+    const TQString &title, const TQString &url)
 {
     new ConfigurationItem(configurationView, this, title, url, 
         hasCapability(Index), hasCapability(FullTextSearch));
 }
 
 void DocumentationPlugin::editCatalogConfiguration(ConfigurationItem *configurationItem,
-    const QString &title, const QString &url)
+    const TQString &title, const TQString &url)
 {
     configurationItem->setTitle(title);
     configurationItem->setURL(url);
@@ -422,8 +422,8 @@ void DocumentationPlugin::deleteCatalogConfiguration(const ConfigurationItem *co
 void DocumentationPlugin::clearCatalogIndex(DocumentationCatalogItem *item)
 {
     //clear indexes for catalog
-    QValueList idx = indexes[item];
-    for (QValueList::iterator it = idx.begin(); it != idx.end(); ++it)
+    TQValueList idx = indexes[item];
+    for (TQValueList::iterator it = idx.begin(); it != idx.end(); ++it)
     {
         delete *it;
     }
@@ -443,9 +443,9 @@ void DocumentationPlugin::loadIndex(IndexBox *index, DocumentationCatalogItem *i
 void DocumentationPlugin::init(KListView *contents)
 {
     config->setGroup("Locations");
-    QMap entryMap = config->entryMap("Locations");
+    TQMap entryMap = config->entryMap("Locations");
     
-    for (QMap::const_iterator it = entryMap.begin();
+    for (TQMap::const_iterator it = entryMap.begin();
         it != entryMap.end(); ++it)
     {
         if (catalogEnabled(it.key()))
@@ -453,13 +453,13 @@ void DocumentationPlugin::init(KListView *contents)
     }
 }
 
-void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, QStringList restrictions)
+void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringList restrictions)
 {
     config->setGroup("Locations");
-    QMap entryMap = config->entryMap("Locations");
+    TQMap entryMap = config->entryMap("Locations");
 
     //remove deleted in configuration catalogs
-    for (QStringList::const_iterator it = deletedConfigurationItems.constBegin();
+    for (TQStringList::const_iterator it = deletedConfigurationItems.constBegin();
         it != deletedConfigurationItems.constEnd(); ++it)
     {
         if (namedCatalogs.contains(*it))
@@ -468,7 +468,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, QStringLi
     deletedConfigurationItems.clear();
     
     //update configuration
-    for (QMap::const_iterator it = entryMap.begin();
+    for (TQMap::const_iterator it = entryMap.begin();
         it != entryMap.end(); ++it)
     {
         config->setGroup("Locations");
@@ -507,9 +507,9 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, QStringLi
 void DocumentationPlugin::loadCatalogConfiguration(KListView *configurationView)
 {
     config->setGroup("Locations");
-    QMap entryMap = config->entryMap("Locations");
+    TQMap entryMap = config->entryMap("Locations");
 
-    for (QMap::const_iterator it = entryMap.begin();
+    for (TQMap::const_iterator it = entryMap.begin();
         it != entryMap.end(); ++it)
     {
         if (namedCatalogs.contains(it.key())
@@ -533,13 +533,13 @@ void DocumentationPlugin::saveCatalogConfiguration(KListView *configurationView)
 {
     config->setGroup("Locations");
     
-    for (QStringList::const_iterator it = deletedConfigurationItems.constBegin();
+    for (TQStringList::const_iterator it = deletedConfigurationItems.constBegin();
         it != deletedConfigurationItems.constEnd(); ++it)
     {
         config->deleteEntry(*it);
     }
     
-    QListViewItemIterator it(configurationView);
+    TQListViewItemIterator it(configurationView);
     while (it.current())
     {
         ConfigurationItem *confItem = dynamic_cast(it.current());
@@ -576,7 +576,7 @@ void DocumentationPlugin::saveCatalogConfiguration(KListView *configurationView)
 
 void DocumentationPlugin::setIndexEnabled( DocumentationCatalogItem * item, bool e )
 {
-    QString group = config->group();
+    TQString group = config->group();
     config->setGroup("Index Settings");
     config->writeEntry(item->text(0), e);
     config->setGroup(group);
@@ -584,25 +584,25 @@ void DocumentationPlugin::setIndexEnabled( DocumentationCatalogItem * item, bool
 
 bool DocumentationPlugin::indexEnabled( DocumentationCatalogItem * item ) const
 {
-    QString group = config->group();
+    TQString group = config->group();
     config->setGroup("Index Settings");
     bool b = config->readBoolEntry(item->text(0), false);
     config->setGroup(group);
     return b;
 }
 
-bool DocumentationPlugin::catalogEnabled(const QString &name) const
+bool DocumentationPlugin::catalogEnabled(const TQString &name) const
 {
-    QString group = config->group();
+    TQString group = config->group();
     config->setGroup("TOC Settings");
     bool b = config->readBoolEntry(name, true);
     config->setGroup(group);
     return b;
 }
 
-void DocumentationPlugin::setCatalogEnabled(const QString &name, bool e)
+void DocumentationPlugin::setCatalogEnabled(const TQString &name, bool e)
 {
-    QString group = config->group();
+    TQString group = config->group();
     config->setGroup("TOC Settings");
     config->writeEntry(name, e);
     config->setGroup(group);
@@ -613,7 +613,7 @@ void DocumentationPlugin::setCatalogEnabled(const QString &name, bool e)
 
 //class IndexBox
 
-IndexBox::IndexBox(QWidget *parent, const char *name)
+IndexBox::IndexBox(TQWidget *parent, const char *name)
     :KListBox(parent, name), m_dirty(false)
 {
 }
@@ -625,12 +625,12 @@ void IndexBox::addIndexItem(IndexItemProto *item)
 
 void IndexBox::removeIndexItem(IndexItemProto *item)
 {
-    QString text = item->text();
+    TQString text = item->text();
     items[text].remove(item);
     if (items[text].count() == 0)
     {
         items.remove(text);
-        QListBoxItem *item = findItem(text, Qt::CaseSensitive | Qt::ExactMatch);
+        TQListBoxItem *item = findItem(text, Qt::CaseSensitive | Qt::ExactMatch);
         if (item)
             delete item;
     }
@@ -638,7 +638,7 @@ void IndexBox::removeIndexItem(IndexItemProto *item)
 
 void IndexBox::fill()
 {
-    for (QMap >::const_iterator it = items.begin();
+    for (TQMap >::const_iterator it = items.begin();
         it != items.end(); ++it)
     {
         new IndexItem(this, it.key());
@@ -662,12 +662,12 @@ void IndexBox::refill()
 
 
 ProjectDocumentationPlugin::ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type)
-    :QObject(0, 0), m_docPlugin(docPlugin), m_catalog(0), m_type(type), m_contents(0), m_index(0)
+    :TQObject(0, 0), m_docPlugin(docPlugin), m_catalog(0), m_type(type), m_contents(0), m_index(0)
 {
     kdDebug() << "ProjectDocumentationPlugin::ProjectDocumentationPlugin for type " << type << endl;
     
     m_watch = new KDirWatch(this);
-    connect(m_watch, SIGNAL(dirty(const QString&)), this, SLOT(reinit()));
+    connect(m_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(reinit()));
     m_watch->startScan();
 }
 
@@ -676,7 +676,7 @@ ProjectDocumentationPlugin::~ProjectDocumentationPlugin()
     deinit();
 }
 
-void ProjectDocumentationPlugin::init(KListView *contents, IndexBox *index, const QString &url)
+void ProjectDocumentationPlugin::init(KListView *contents, IndexBox *index, const TQString &url)
 {
     m_contents = contents;
     m_index = index;
@@ -708,12 +708,12 @@ void ProjectDocumentationPlugin::deinit()
     m_catalog = 0;
 }
 
-QString ProjectDocumentationPlugin::pluginName() const
+TQString ProjectDocumentationPlugin::pluginName() const
 {
     return m_docPlugin->pluginName();
 }
 
-QString ProjectDocumentationPlugin::catalogURL() const
+TQString ProjectDocumentationPlugin::catalogURL() const
 {
     return m_url;
 }
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h
index 5d905085..658a4e7a 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.h
@@ -19,9 +19,9 @@
 #ifndef KDEV_DOC_PLUGIN_H
 #define KDEV_DOC_PLUGIN_H
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -43,10 +43,10 @@ public:
         Document      /** URL;
-    typedef QValueList List;
+    typedef QPair URL;
+    typedef TQValueList List;
 
-    IndexItem(IndexBox *listbox, const QString &text);
+    IndexItem(IndexBox *listbox, const TQString &text);
 
     List urls() const;
 
@@ -136,17 +136,17 @@ private:
 /**Documentation index view.*/
 class IndexBox: public KListBox{
 public:
-    IndexBox(QWidget *parent = 0, const char *name = 0);
+    IndexBox(TQWidget *parent = 0, const char *name = 0);
 
     virtual void addIndexItem(IndexItemProto *item);
     virtual void removeIndexItem(IndexItemProto *item);
     virtual void fill();
     virtual void refill();
     virtual void setDirty(bool dirty);
-//    virtual void refill(QValueList &items);
+//    virtual void refill(TQValueList &items);
 
 private:
-    QMap > items;
+    TQMap > items;
     friend class IndexItem;
 
     bool m_dirty;
@@ -161,19 +161,19 @@ class DocumentationPlugin;
 class ConfigurationItem: public QCheckListItem
 {
 public:
-    ConfigurationItem(QListView *parent, DocumentationPlugin * plugin, const QString &title, const QString &url,
+    ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url,
         bool indexPossible, bool fullTextSearchPossible);
 
-    virtual QString title() const { return m_title; }
-    virtual void setTitle(const QString title) { setText(3, m_title = title); }
-    virtual QString url() const { return m_url; }
-    virtual void setURL(const QString url) { setText(4, m_url = url); }
+    virtual TQString title() const { return m_title; }
+    virtual void setTitle(const TQString title) { setText(3, m_title = title); }
+    virtual TQString url() const { return m_url; }
+    virtual void setURL(const TQString url) { setText(4, m_url = url); }
 
     virtual bool isChanged() const { return m_title == m_origTitle; }
-    virtual QString origTitle() const {return m_origTitle; }
+    virtual TQString origTitle() const {return m_origTitle; }
 
-    virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align);
-    virtual int width(const QFontMetrics &fm, const QListView *lv, int c) const;
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align);
+    virtual int width(const TQFontMetrics &fm, const TQListView *lv, int c) const;
 
     bool contents() const { return m_contents; }
     void setContents(bool contents) { m_contents = contents; }
@@ -188,9 +188,9 @@ public:
     DocumentationPlugin * docPlugin() { return m_docPlugin; }
 
 private:
-    QString m_title;
-    QString m_url;
-    QString m_origTitle;
+    TQString m_title;
+    TQString m_url;
+    TQString m_origTitle;
 
     bool m_contents;
     bool m_index;
@@ -233,14 +233,14 @@ public:
     setCapabilities(Index | FullTextSearch);
     @endcode
     */
-    DocumentationPlugin(KConfig *pluginConfig, QObject *parent =0, const char *name =0);
+    DocumentationPlugin(KConfig *pluginConfig, TQObject *parent =0, const char *name =0);
     virtual ~DocumentationPlugin();
 
     /**Returns the i18n name of the plugin.*/
-    virtual QString pluginName() const = 0;
+    virtual TQString pluginName() const = 0;
 
     /**Creates documentation catalog with given title and url.*/
-    virtual DocumentationCatalogItem *createCatalog(KListView *contents, const QString &title, const QString &url) = 0;
+    virtual DocumentationCatalogItem *createCatalog(KListView *contents, const TQString &title, const TQString &url) = 0;
 
     /**Initialize a list of catalogs.
     @param contents the listview to fill with catalogs
@@ -252,7 +252,7 @@ public:
     @param index the listbox with index to update
     @param restrictions the list of catalogs names to remove
     */
-    virtual void reinit(KListView *contents, IndexBox *index, QStringList restrictions);
+    virtual void reinit(KListView *contents, IndexBox *index, TQStringList restrictions);
     /**Initializes plugin configuration. Documentation plugins should be able to
     initialize the default configuration on startup without any user interaction.
     Call this in the constructor of your plugin.*/
@@ -263,9 +263,9 @@ public:
     /**Indicates if a catalog with specified name is enabled. Documentation plugin
     should check this and do not load catalogs disabled in configuration.
     All catalogs are enabled by default.*/
-    virtual bool catalogEnabled(const QString &name) const;
+    virtual bool catalogEnabled(const TQString &name) const;
     /**Enables or disables documentation catalog.*/
-    virtual void setCatalogEnabled(const QString &name, bool e);
+    virtual void setCatalogEnabled(const TQString &name, bool e);
 
     /**Indicates if an index of given catalog should be rebuilt. This method
     is used by index caching algorythm to make a descision to rebuild index
@@ -292,7 +292,7 @@ public:
     clicks the documentation item. If it is too much overhead to determine the
     documentation catalog url in @ref createCatalog method then you can set it here.*/
     virtual void setCatalogURL(DocumentationCatalogItem *item) = 0;
-    virtual QStringList fullTextSearchLocations() = 0;
+    virtual TQStringList fullTextSearchLocations() = 0;
 
     /**Loads catalog configuration and fills configurationView with ConfigurationItem objects.*/
     virtual void loadCatalogConfiguration(KListView *configurationView);
@@ -302,17 +302,17 @@ public:
     virtual void saveCatalogConfiguration(KListView *configurationView);
     /**Adds new catalog to a configuration.*/
     virtual void addCatalogConfiguration(KListView *configurationView,
-        const QString &title, const QString &url);
+        const TQString &title, const TQString &url);
     /**Edits catalog configuration.*/
     virtual void editCatalogConfiguration(ConfigurationItem *configurationItem,
-        const QString &title, const QString &url);
+        const TQString &title, const TQString &url);
     /**Removes catalog from configuration. configurationItem should not be removed here.*/
     virtual void deleteCatalogConfiguration(const ConfigurationItem *const configurationItem);
 
     /**Returns a mode and a filter for catalog locator dialogs.*/
-    virtual QPair catalogLocatorProps() = 0;
+    virtual QPair catalogLocatorProps() = 0;
     /**Returns a title of catalog defined by an url parameter.*/
-    virtual QString catalogTitle(const QString &url) = 0;
+    virtual TQString catalogTitle(const TQString &url) = 0;
 
     /**Reloads documentation catalogs and indices.*/
     virtual void reload();
@@ -347,11 +347,11 @@ public slots:
 
 protected:
     /**A list of loaded documentation catalogs.*/
-    QValueList catalogs;
+    TQValueList catalogs;
     /**A map of names of loaded documentation catalogs.*/
-    QMap namedCatalogs;
+    TQMap namedCatalogs;
     /**A map of indices of loaded documentation catalogs.*/
-    QMap > indexes;
+    TQMap > indexes;
 
     /**Sets capabilities of documentation plugin.*/
     void setCapabilities(int caps) { m_capabilities = caps; }
@@ -362,7 +362,7 @@ protected:
 
     /**Stores items deleted from configuration. @ref saveCatalogConfiguration
     uses this to remove entries from configuration file.*/
-    QStringList deletedConfigurationItems;
+    TQStringList deletedConfigurationItems;
 
     /**Configuration object used by a plugin.*/
     KConfig *config;
@@ -387,19 +387,19 @@ friend class DocumentationCatalogItem;
 
 Represents functionality to display project documentation catalog and index in documentation browser.
 */
-class ProjectDocumentationPlugin: public QObject {
+class ProjectDocumentationPlugin: public TQObject {
     Q_OBJECT
 public:
     ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type);
     virtual ~ProjectDocumentationPlugin();
 
     /**Initializes project documentation plugin - creates documentation catalog.*/
-    virtual void init(KListView *contents, IndexBox *index, const QString &url);
+    virtual void init(KListView *contents, IndexBox *index, const TQString &url);
     /**Deinitializes project documentation plugin - removes documentation catalog.*/
     virtual void deinit();
 
-    QString pluginName() const;
-    QString catalogURL() const;
+    TQString pluginName() const;
+    TQString catalogURL() const;
 
 public slots:
     /**Performs reinitialization if project documentation has changed (after building api documentation).*/
@@ -415,7 +415,7 @@ private:
     class KDirWatch *m_watch;
     class KListView *m_contents;
     class IndexBox *m_index;
-    QString m_url;
+    TQString m_url;
 };
 
 #endif
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index e2a4172e..e0b19de9 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -27,10 +27,10 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
-#include 
+#include 
 
 #include "../../../../config.h"
 
@@ -38,7 +38,7 @@ static const KDevPluginInfo data("docchmplugin");
 typedef KDevGenericFactory DocCHMPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) )
 
-DocCHMPlugin::DocCHMPlugin(QObject* parent, const char* name, QStringList // args
+DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args
                            )
     :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name)
 {
@@ -51,7 +51,7 @@ DocCHMPlugin::~DocCHMPlugin()
 }
 
 
-DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const QString& title, const QString& url)
+DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url)
 {
     DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title);
     item->setURL(KURL(url));
@@ -59,29 +59,29 @@ DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const
     return item;
 }
 
-QPair DocCHMPlugin::catalogLocatorProps()
+QPair DocCHMPlugin::catalogLocatorProps()
 {
-    return QPair(KFile::File, "*.chm");
+    return QPair(KFile::File, "*.chm");
 }
 
-QString DocCHMPlugin::catalogTitle(const QString& // url
+TQString DocCHMPlugin::catalogTitle(const TQString& // url
                                    )
 {
-    return QString::null;
+    return TQString::null;
 }
 
-QString DocCHMPlugin::pluginName() const
+TQString DocCHMPlugin::pluginName() const
 {
     return i18n("CHM Documentation Collection");
 }
 
 
-QString DocCHMPlugin::getSpecialData(const QString& name, KURL url) {
-    QString ret = "";
+TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) {
+    TQString ret = "";
     url.setProtocol("ms-its");
     
     url.addPath("/:" + name);
-    QString tmpFile;
+    TQString tmpFile;
     if( KIO::NetAccess::download( url, tmpFile, 0 ) )
     {
         std::filebuf fb;
@@ -102,10 +102,10 @@ QString DocCHMPlugin::getSpecialData(const QString& name, KURL url) {
 
 
 ///this currently is useless, because htdig cannot use kioslaves
-QStringList DocCHMPlugin::fullTextSearchLocations()
+TQStringList DocCHMPlugin::fullTextSearchLocations()
 {
-    //return QStringList::split( '\n', getSpecialData("contents", m_url));
-    return QStringList();
+    //return TQStringList::split( '\n', getSpecialData("contents", m_url));
+    return TQStringList();
 }
 
 bool DocCHMPlugin::needRefreshIndex(DocumentationCatalogItem* // item
@@ -137,12 +137,12 @@ static KListViewItem* chainEnd(KListViewItem *parent) {
     return ret;
 }
 
-static QString decodeHTML(const QString& s) {
-    QRegExp rx(QString::fromLatin1("&#(\\d+);| "));
-    QString out = s;
+static TQString decodeHTML(const TQString& s) {
+    TQRegExp rx(TQString::fromLatin1("&#(\\d+);| "));
+    TQString out = s;
     int pos = rx.search(out);
     while(pos > -1) {
-        QString found = rx.cap(0);
+        TQString found = rx.cap(0);
         if(found != " ") {
             out.replace(pos, found.length(), static_cast(rx.cap(1).toInt()));
         }else{
@@ -156,12 +156,12 @@ static QString decodeHTML(const QString& s) {
 
 void DocCHMPlugin::createTOC(DocumentationCatalogItem* item)
 {
-    QStringList lines = QStringList::split("\n", getSpecialData("catalog", item->url()) );
+    TQStringList lines = TQStringList::split("\n", getSpecialData("catalog", item->url()) );
     if(lines.count() % 4 != 0) { kdDebug(9002) << "DocCHMPlugin::createTOC: wrong count of strings"; return;}
     
-    QValueVector items;
+    TQValueVector items;
     items.push_back(item);
-    for(QStringList::Iterator it = lines.begin(); it != lines.end();) {
+    for(TQStringList::Iterator it = lines.begin(); it != lines.end();) {
         bool ok1 = true, ok2 = true;
         int parent = (*it).toInt(&ok1);
         ++it;
@@ -172,7 +172,7 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item)
             break;
         }
         
-        QString& name(*it);
+        TQString& name(*it);
         ++it;
         KURL url(*it);
         ++it;
diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h
index 8db470b0..ca90a978 100644
--- a/parts/documentation/plugins/chm/docchmplugin.h
+++ b/parts/documentation/plugins/chm/docchmplugin.h
@@ -26,25 +26,25 @@ class DocCHMPlugin :public DocumentationPlugin
 {
     Q_OBJECT
 public:
-    DocCHMPlugin(QObject* parent, const char* name, QStringList args = QStringList());
+    DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList());
     ~DocCHMPlugin();
     
-    virtual QString pluginName() const;
+    virtual TQString pluginName() const;
 
     virtual void setCatalogURL(DocumentationCatalogItem* item);
-    virtual QString catalogTitle(const QString& url);
-    virtual QPair catalogLocatorProps();
-    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url);
+    virtual TQString catalogTitle(const TQString& url);
+    virtual QPair catalogLocatorProps();
+    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url);
     virtual void createTOC(DocumentationCatalogItem* item);
     
     virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item);
     virtual bool needRefreshIndex(DocumentationCatalogItem* item);
     
-    virtual QStringList fullTextSearchLocations();
+    virtual TQStringList fullTextSearchLocations();
     
     virtual void autoSetupPlugin();
 protected:
-    QString getSpecialData(const QString& name, KURL url);
+    TQString getSpecialData(const TQString& name, KURL url);
 };
 
 #endif
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index 9fa5ad99..ae95aff1 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -32,7 +32,7 @@ static const KDevPluginInfo data("doccustomplugin");
 typedef KDevGenericFactory DocCustomPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) )
 
-DocCustomPlugin::DocCustomPlugin(QObject* parent, const char* name, const QStringList // args
+DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args
                                  )
     :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name)
 {
@@ -50,31 +50,31 @@ bool DocCustomPlugin::needRefreshIndex(DocumentationCatalogItem* // item
     return false;
 }
 
-QString DocCustomPlugin::pluginName() const
+TQString DocCustomPlugin::pluginName() const
 {
     return i18n("Custom Documentation Collection");
 }
 
-DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, const QString& title, const QString& url)
+DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url)
 {
     DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title);
     item->setURL(KURL(url));
     return item;
 }
 
-QPair DocCustomPlugin::catalogLocatorProps()
+QPair DocCustomPlugin::catalogLocatorProps()
 {
-    return QPair(KFile::File, "all/allfiles");
+    return QPair(KFile::File, "all/allfiles");
 }
 
-QString DocCustomPlugin::catalogTitle(const QString& /*url*/)
+TQString DocCustomPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return QString::null;
+    return TQString::null;
 }
 
-QStringList DocCustomPlugin::fullTextSearchLocations()
+TQStringList DocCustomPlugin::fullTextSearchLocations()
 {
-    return QStringList();
+    return TQStringList();
 }
 
 
diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h
index e72261a6..77bc9750 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.h
+++ b/parts/documentation/plugins/custom/doccustomplugin.h
@@ -24,12 +24,12 @@
 
 class DocCustomPlugin : public DocumentationPlugin {
 public:
-    DocCustomPlugin(QObject* parent, const char* name, const QStringList args = QStringList());
+    DocCustomPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~DocCustomPlugin();
 
-    virtual QString pluginName() const;
+    virtual TQString pluginName() const;
     
-    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url);
+    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url);
 
     virtual void createTOC(DocumentationCatalogItem* item);
     virtual void setCatalogURL(DocumentationCatalogItem* item);
@@ -37,10 +37,10 @@ public:
     virtual bool needRefreshIndex(DocumentationCatalogItem* item);
     virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item);
 
-    virtual QStringList fullTextSearchLocations();
+    virtual TQStringList fullTextSearchLocations();
             
-    virtual QPair catalogLocatorProps();
-    virtual QString catalogTitle(const QString& url);
+    virtual QPair catalogLocatorProps();
+    virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
 
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index 95c404ae..11c2b6a7 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -21,10 +21,10 @@
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -40,32 +40,32 @@
 class DevHelpDocumentationCatalogItem: public DocumentationCatalogItem
 {
 public:
-    DevHelpDocumentationCatalogItem(const QString &devHelpFile, DocumentationPlugin* plugin,
-        KListView *parent, const QString &name)
+    DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin,
+        KListView *parent, const TQString &name)
         :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile)
     {
     }
-    DevHelpDocumentationCatalogItem(const QString &devHelpFile, DocumentationPlugin* plugin,
-        DocumentationItem *parent, const QString &name)
+    DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin,
+        DocumentationItem *parent, const TQString &name)
         :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile)
     {
     }
-    QString devHelpFile() const { return m_devHelpFile; }
+    TQString devHelpFile() const { return m_devHelpFile; }
 
-    virtual QString cacheVersion() const {
+    virtual TQString cacheVersion() const {
         unsigned int checksum=0;
         for(int a=0;a DocDevHelpPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) )
 
-DocDevHelpPlugin::DocDevHelpPlugin(QObject* parent, const char* name,
-    const QStringList /*args*/)
+DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name,
+    const TQStringList /*args*/)
     :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(Index | FullTextSearch | ProjectDocumentation);
@@ -85,55 +85,55 @@ DocDevHelpPlugin::~DocDevHelpPlugin()
 {
 }
 
-DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(KListView* contents, const QString& title, const QString& url)
+DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url)
 {
     return new DevHelpDocumentationCatalogItem(url, this, contents, title);
 }
 
-QPair DocDevHelpPlugin::catalogLocatorProps()
+QPair DocDevHelpPlugin::catalogLocatorProps()
 {
-    return QPair(KFile::File, "*.devhelp");
+    return QPair(KFile::File, "*.devhelp");
 }
 
-QString DocDevHelpPlugin::catalogTitle(const QString& url)
+TQString DocDevHelpPlugin::catalogTitle(const TQString& url)
 {
-    QFileInfo fi(url);
+    TQFileInfo fi(url);
     if (!fi.exists())
-        return QString::null;
+        return TQString::null;
 
-    QFile f(url);
+    TQFile f(url);
     if (!f.open(IO_ReadOnly))
-        return QString::null;
+        return TQString::null;
     
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f))
-        return QString::null;
+        return TQString::null;
     f.close();
 
-    QDomElement docEl = doc.documentElement();
+    TQDomElement docEl = doc.documentElement();
 
-    return docEl.attribute("title", QString::null);
+    return docEl.attribute("title", TQString::null);
 }
 
-QString DocDevHelpPlugin::pluginName() const
+TQString DocDevHelpPlugin::pluginName() const
 {
     return i18n("Devhelp Documentation Collection");
 }
 
-QStringList DocDevHelpPlugin::fullTextSearchLocations()
+TQStringList DocDevHelpPlugin::fullTextSearchLocations()
 {
-    QStringList locs;
+    TQStringList locs;
         
-    QMap entryMap = config->entryMap("Locations");
+    TQMap entryMap = config->entryMap("Locations");
 
-    for (QMap::const_iterator it = entryMap.begin();
+    for (TQMap::const_iterator it = entryMap.begin();
         it != entryMap.end(); ++it)
     {
         config->setGroup("Search Settings");
         if (config->readBoolEntry(it.key(), false))
         {
             config->setGroup("Locations");
-            QFileInfo fi(config->readPathEntry(it.key()));
+            TQFileInfo fi(config->readPathEntry(it.key()));
             locs << fi.dirPath(true);
         }
     }
@@ -147,9 +147,9 @@ bool DocDevHelpPlugin::needRefreshIndex(DocumentationCatalogItem* item)
     if (!dhItem)
         return false;
     
-    QFileInfo fi(dhItem->devHelpFile());
+    TQFileInfo fi(dhItem->devHelpFile());
     config->setGroup("Index");
-    if (fi.lastModified() > config->readDateTimeEntry(dhItem->text(0), new QDateTime()))
+    if (fi.lastModified() > config->readDateTimeEntry(dhItem->text(0), new TQDateTime()))
     {
         kdDebug() << "need rebuild index for " << dhItem->text(0) << endl;
         config->writeEntry(item->text(0), fi.lastModified());
@@ -161,16 +161,16 @@ bool DocDevHelpPlugin::needRefreshIndex(DocumentationCatalogItem* item)
 
 void DocDevHelpPlugin::autoSetupPlugin()
 {
-    QValueStack scanStack;
+    TQValueStack scanStack;
     
     pushToScanStack(scanStack, getenv("DEVHELP_SEARCH_PATH"));
-    pushToScanStack(scanStack, QString(getenv("HOME")) + "/.devhelp/books");
+    pushToScanStack(scanStack, TQString(getenv("HOME")) + "/.devhelp/books");
     
-    QString dhexepath = DocDevHelpPluginFactory::instance()->dirs()->findExe("devhelp");
+    TQString dhexepath = DocDevHelpPluginFactory::instance()->dirs()->findExe("devhelp");
     if (!dhexepath.isEmpty())
     {
-        QFileInfo fi(dhexepath);
-        QString path = KURL(fi.dirPath(true)).upURL().path(1);
+        TQFileInfo fi(dhexepath);
+        TQString path = KURL(fi.dirPath(true)).upURL().path(1);
         pushToScanStack(scanStack, path + "share/devhelp/books");
         pushToScanStack(scanStack, path + "share/gtk-doc/html");
     }
@@ -185,8 +185,8 @@ void DocDevHelpPlugin::autoSetupPlugin()
     pushToScanStack(scanStack, "/opt/gnome2/share/gtk-doc/html");
 
     //fill the list of scan dirs (with subdirectories)
-    QStringList scanList;
-    QDir dir;
+    TQStringList scanList;
+    TQDir dir;
     do 
     {
         dir.setPath(scanStack.pop());
@@ -196,13 +196,13 @@ void DocDevHelpPlugin::autoSetupPlugin()
 
         const QFileInfoList *dirEntries = dir.entryInfoList();
         if ( !dirEntries ) continue;
-        QPtrListIterator it(*dirEntries);
+        TQPtrListIterator it(*dirEntries);
         for (; it.current(); ++it) 
         {
-            QString fileName = it.current()->fileName();
+            TQString fileName = it.current()->fileName();
             if (fileName == "." || fileName == "..")
                 continue;
-            QString path = it.current()->absFilePath();
+            TQString path = it.current()->absFilePath();
             if (it.current()->isDir()) 
             {
                 scanStack.push(path);
@@ -210,23 +210,23 @@ void DocDevHelpPlugin::autoSetupPlugin()
         }
     } while (!scanStack.isEmpty());
 
-    for (QStringList::const_iterator it = scanList.begin(); it != scanList.end(); ++it)
+    for (TQStringList::const_iterator it = scanList.begin(); it != scanList.end(); ++it)
     {
         scanDevHelpDir(*it);
     }
 }
 
-void DocDevHelpPlugin::scanDevHelpDir(const QString &path)
+void DocDevHelpPlugin::scanDevHelpDir(const TQString &path)
 {
-    QDir d(path);
+    TQDir d(path);
     if (! d.exists() || !d.isReadable())
         return;
     
-    d.setFilter(QDir::Files);
+    d.setFilter(TQDir::Files);
     //scan for *.devhelp files
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );
-    QFileInfo *fi;
+    TQFileInfo *fi;
     while ( (fi = it.current()) != 0 ) 
     {
         if (fi->extension() == "devhelp")
@@ -238,7 +238,7 @@ void DocDevHelpPlugin::scanDevHelpDir(const QString &path)
     }
 }
 
-void DocDevHelpPlugin::pushToScanStack(QValueStack &stack, const QString &value)
+void DocDevHelpPlugin::pushToScanStack(TQValueStack &stack, const TQString &value)
 {
     if ( (!value.isEmpty()) && (!stack.contains(value)) )
     {
@@ -253,16 +253,16 @@ void DocDevHelpPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     if (!dhItem)
         return;
     
-    QFileInfo fi(dhItem->devHelpFile());
+    TQFileInfo fi(dhItem->devHelpFile());
 
-    QFile f(dhItem->devHelpFile());
+    TQFile f(dhItem->devHelpFile());
     if (!f.open(IO_ReadOnly))
     {
         kdDebug(9002) << "Could not read" << dhItem->devHelpFile() << endl;
         return;
     }
 
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f))
     {
         kdDebug() << "Not a valid devhelp file: " << dhItem->devHelpFile() << endl;
@@ -270,17 +270,17 @@ void DocDevHelpPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     }
     f.close();
     
-    QString baseUrl = KURL(dhItem->devHelpFile()).directory();
+    TQString baseUrl = KURL(dhItem->devHelpFile()).directory();
     
-    QDomElement docEl = doc.documentElement();
-    QDomElement chaptersEl = docEl.namedItem("functions").toElement();
-    QDomElement childEl = chaptersEl.firstChild().toElement();
+    TQDomElement docEl = doc.documentElement();
+    TQDomElement chaptersEl = docEl.namedItem("functions").toElement();
+    TQDomElement childEl = chaptersEl.firstChild().toElement();
     while (!childEl.isNull())
     {
         if (childEl.tagName() == "function")
         {
-            QString name = childEl.attribute("name");
-            QString url = childEl.attribute("link");
+            TQString name = childEl.attribute("name");
+            TQString url = childEl.attribute("link");
             
             IndexItemProto *ii = new IndexItemProto(this, item, index, name, item->text(0));
             ii->addURL(KURL(baseUrl+"/"+url));
@@ -295,16 +295,16 @@ void DocDevHelpPlugin::createTOC(DocumentationCatalogItem* item)
     if (!dhItem)
         return;
     
-    QFileInfo fi(dhItem->devHelpFile());
+    TQFileInfo fi(dhItem->devHelpFile());
 
-    QFile f(dhItem->devHelpFile());
+    TQFile f(dhItem->devHelpFile());
     if (!f.open(IO_ReadOnly))
     {
         kdDebug(9002) << "Could not read" << dhItem->devHelpFile() << endl;
         return;
     }
 
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f))
     {
         kdDebug() << "Not a valid devhelp file: " << dhItem->devHelpFile() << endl;
@@ -312,23 +312,23 @@ void DocDevHelpPlugin::createTOC(DocumentationCatalogItem* item)
     }
     f.close();
     
-    QDomElement docEl = doc.documentElement();
-    QDomElement chaptersEl = docEl.namedItem("chapters").toElement();
+    TQDomElement docEl = doc.documentElement();
+    TQDomElement chaptersEl = docEl.namedItem("chapters").toElement();
 
-    QDomElement childEl = chaptersEl.lastChild().toElement();
-    QString baseUrl = KURL(dhItem->devHelpFile()).directory();
+    TQDomElement childEl = chaptersEl.lastChild().toElement();
+    TQString baseUrl = KURL(dhItem->devHelpFile()).directory();
     addTocSect(dhItem, childEl, baseUrl, true);
 }
 
-void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, QDomElement childEl, 
-    QString baseUrl, bool book)
+void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, 
+    TQString baseUrl, bool book)
 {
     while (!childEl.isNull())
     {
         if ( (childEl.tagName() == "sub") || (childEl.tagName() == "chapter"))
         {
-            QString name = childEl.attribute("name");
-            QString url = childEl.attribute("link");
+            TQString name = childEl.attribute("name");
+            TQString url = childEl.attribute("link");
             
             if (name.isEmpty() && url.contains("ix"))
                 name = "Index";
@@ -337,7 +337,7 @@ void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, QDomElement childEl
                 book ? DocumentationItem::Book : DocumentationItem::Document, parent, name);
             item->setURL(KURL(baseUrl+"/"+url));
             
-            QDomElement grandchildEl = childEl.lastChild().toElement();
+            TQDomElement grandchildEl = childEl.lastChild().toElement();
             addTocSect(item, grandchildEl, baseUrl);
         }
         childEl = childEl.previousSibling().toElement();
@@ -350,15 +350,15 @@ void DocDevHelpPlugin::setCatalogURL(DocumentationCatalogItem* item)
     if (!dhItem)
         return;
     
-    QFileInfo fi(dhItem->devHelpFile());
+    TQFileInfo fi(dhItem->devHelpFile());
 
-    QFile f(dhItem->devHelpFile());
+    TQFile f(dhItem->devHelpFile());
     if (!f.open(IO_ReadOnly))
     {
         kdDebug(9002) << "Could not read" << dhItem->devHelpFile() << endl;
         return;
     }
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f))
     {
         kdDebug(9002) << "Not a valid Devhelp file: " << dhItem->devHelpFile() << endl;
@@ -366,12 +366,12 @@ void DocDevHelpPlugin::setCatalogURL(DocumentationCatalogItem* item)
     }
     f.close();
 
-    QDomElement docEl = doc.documentElement();
-    QDomElement titleEl = docEl.namedItem("book").toElement();
+    TQDomElement docEl = doc.documentElement();
+    TQDomElement titleEl = docEl.namedItem("book").toElement();
 
     if (item->url().isEmpty())
     {
-        KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", QString::null));
+        KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString::null));
         item->setURL(url);
     }
 }
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
index 3d73cb63..9e4df5c2 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
@@ -20,8 +20,8 @@
 #ifndef DOCDEVHELPPLUGIN_H
 #define DOCDEVHELPPLUGIN_H
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
@@ -29,32 +29,32 @@ class DocDevHelpPlugin: public DocumentationPlugin
 {
     Q_OBJECT
 public:
-    DocDevHelpPlugin(QObject* parent, const char* name, const QStringList args = QStringList());
+    DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~DocDevHelpPlugin();
 
-    virtual QString pluginName() const;
+    virtual TQString pluginName() const;
 
-    virtual QString catalogTitle(const QString& url);
+    virtual TQString catalogTitle(const TQString& url);
     virtual void setCatalogURL(DocumentationCatalogItem* item);
     
     virtual void createTOC(DocumentationCatalogItem* item);
     
-    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url);
+    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url);
 
     virtual bool needRefreshIndex(DocumentationCatalogItem* item);
     virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item);
         
-    virtual QStringList fullTextSearchLocations();
+    virtual TQStringList fullTextSearchLocations();
     virtual void autoSetupPlugin();
     
-    virtual QPair catalogLocatorProps();
+    virtual QPair catalogLocatorProps();
 
     virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type);
         
 protected:
-    void pushToScanStack(QValueStack &stack, const QString &value);
-    void scanDevHelpDir(const QString &path);
-    void addTocSect(DocumentationItem *parent, QDomElement childEl, QString baseUrl, bool book=false);
+    void pushToScanStack(TQValueStack &stack, const TQString &value);
+    void scanDevHelpDir(const TQString &path);
+    void addTocSect(DocumentationItem *parent, TQDomElement childEl, TQString baseUrl, bool book=false);
 };
 
 #endif
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index 2dcaae62..f9761155 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -31,7 +31,7 @@ static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plug
 typedef KDevGenericFactory DocDjvuPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) )
 
-DocDjvuPlugin::DocDjvuPlugin(QObject* parent, const char* name, const QStringList args)
+DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args)
     :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(CustomDocumentationTitles | ProjectUserManual);
@@ -47,31 +47,31 @@ bool DocDjvuPlugin::needRefreshIndex(DocumentationCatalogItem* item)
     return false;
 }
 
-QString DocDjvuPlugin::pluginName() const
+TQString DocDjvuPlugin::pluginName() const
 {
     return i18n("Djvu Documentation Collection");
 }
 
-DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, const QString& title, const QString& url)
+DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url)
 {
     DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title);
     item->setURL(KURL(url));
     return item;
 }
 
-QPair DocDjvuPlugin::catalogLocatorProps()
+QPair DocDjvuPlugin::catalogLocatorProps()
 {
-    return QPair(KFile::File, "all/allfiles");
+    return QPair(KFile::File, "all/allfiles");
 }
 
-QString DocDjvuPlugin::catalogTitle(const QString& /*url*/)
+TQString DocDjvuPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return QString::null;
+    return TQString::null;
 }
 
-QStringList DocDjvuPlugin::fullTextSearchLocations()
+TQStringList DocDjvuPlugin::fullTextSearchLocations()
 {
-    return QStringList();
+    return TQStringList();
 }
 
 
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h
index e9fdb30a..05689bd8 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.h
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.h
@@ -24,12 +24,12 @@
 
 class DocDjvuPlugin : public DocumentationPlugin {
 public:
-    DocDjvuPlugin(QObject* parent, const char* name, const QStringList args = QStringList());
+    DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~DocDjvuPlugin();
 
-    virtual QString pluginName() const;
+    virtual TQString pluginName() const;
     
-    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url);
+    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url);
 
     virtual void createTOC(DocumentationCatalogItem* item);
     virtual void setCatalogURL(DocumentationCatalogItem* item);
@@ -37,10 +37,10 @@ public:
     virtual bool needRefreshIndex(DocumentationCatalogItem* item);
     virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item);
 
-    virtual QStringList fullTextSearchLocations();
+    virtual TQStringList fullTextSearchLocations();
             
-    virtual QPair catalogLocatorProps();
-    virtual QString catalogTitle(const QString& url);
+    virtual QPair catalogLocatorProps();
+    virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
 
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index 3fa7d5cb..a92eb60f 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -21,12 +21,12 @@
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -43,20 +43,20 @@
 class DoxyDocumentationCatalogItem: public DocumentationCatalogItem
 {
 public:
-    DoxyDocumentationCatalogItem(const QString &origUrl, DocumentationPlugin* plugin,
-        KListView *parent, const QString &name)
+    DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin,
+        KListView *parent, const TQString &name)
         :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl)
     {
     }
-    DoxyDocumentationCatalogItem(const QString &origUrl, DocumentationPlugin* plugin,
-        DocumentationItem *parent, const QString &name)
+    DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin,
+        DocumentationItem *parent, const TQString &name)
         :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl)
     {
     }
-    QString origUrl() const { return m_origUrl; }
+    TQString origUrl() const { return m_origUrl; }
     
 private:
-    QString m_origUrl;
+    TQString m_origUrl;
 };
 
 
@@ -64,7 +64,7 @@ static const KDevPluginInfo data("docdoxygenplugin");
 typedef KDevGenericFactory DocDoxygenPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) )
 
-DocDoxygenPlugin::DocDoxygenPlugin(QObject* parent, const char* name, const QStringList)
+DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList)
     :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(Index | FullTextSearch | ProjectDocumentation | CustomDocumentationTitles );
@@ -75,71 +75,71 @@ DocDoxygenPlugin::~DocDoxygenPlugin()
 {
 }
 
-QPair DocDoxygenPlugin::catalogLocatorProps()
+QPair DocDoxygenPlugin::catalogLocatorProps()
 {
-    return QPair(KFile::File, "index.html *.tag");
+    return QPair(KFile::File, "index.html *.tag");
 }
 
-QString DocDoxygenPlugin::catalogTitle(const QString& url)
+TQString DocDoxygenPlugin::catalogTitle(const TQString& url)
 {
-    QFileInfo fi(url);
+    TQFileInfo fi(url);
     if (!fi.exists())
-        return QString::null;
+        return TQString::null;
     
     if (fi.extension(false) == "html")
     {
-        QFile f(url);
+        TQFile f(url);
         if (!f.open(IO_ReadOnly))
-            return QString::null;
+            return TQString::null;
         
-        QTextStream ts(&f);
-        QString contents = ts.read();
-        QRegExp re(".*(.*).*");
+        TQTextStream ts(&f);
+        TQString contents = ts.read();
+        TQRegExp re(".*(.*).*");
         re.setCaseSensitive(false);
         re.search(contents);
         return re.cap(1);   
     }
     else if (fi.extension(false) == "tag")
     {
-        QFile *f = 0;
-        QFile f1(fi.dirPath(true) + "/html/index.html");
+        TQFile *f = 0;
+        TQFile f1(fi.dirPath(true) + "/html/index.html");
         if (f1.open(IO_ReadOnly))
             f = &f1;
-        QFile f2(fi.dirPath(true) + "/index.html");
+        TQFile f2(fi.dirPath(true) + "/index.html");
         if (f2.open(IO_ReadOnly))
             f = &f2;
         if (f != 0)
         {
-            QTextStream ts(f);
-            QString contents = ts.read();
-            QRegExp re(".*(.*).*");
+            TQTextStream ts(f);
+            TQString contents = ts.read();
+            TQRegExp re(".*(.*).*");
             re.setCaseSensitive(false);
             re.search(contents);
             return re.cap(1);   
         }
     }
-    return QString::null;
+    return TQString::null;
 }
 
-QString DocDoxygenPlugin::pluginName() const
+TQString DocDoxygenPlugin::pluginName() const
 {
     return i18n("Doxygen Documentation Collection");
 }
 
-QStringList DocDoxygenPlugin::fullTextSearchLocations()
+TQStringList DocDoxygenPlugin::fullTextSearchLocations()
 {
-    QStringList locs;
+    TQStringList locs;
         
-    QMap entryMap = config->entryMap("Locations");
+    TQMap entryMap = config->entryMap("Locations");
 
-    for (QMap::const_iterator it = entryMap.begin();
+    for (TQMap::const_iterator it = entryMap.begin();
         it != entryMap.end(); ++it)
     {
         config->setGroup("Search Settings");
         if (config->readBoolEntry(it.key(), false))
         {
             config->setGroup("Locations");
-            QFileInfo fi(config->readPathEntry(it.key()));
+            TQFileInfo fi(config->readPathEntry(it.key()));
             locs << fi.dirPath(true);
         }
     }
@@ -151,13 +151,13 @@ void DocDoxygenPlugin::setCatalogURL(DocumentationCatalogItem* item)
 {
     if (item->url().url().endsWith("tag"))
     {
-        QFileInfo fi(item->url().directory(false) + "html/index.html");
+        TQFileInfo fi(item->url().directory(false) + "html/index.html");
         if (fi.exists())
         {
             item->setURL(KURL::fromPathOrURL(fi.absFilePath()));
             return;
         }
-        QFileInfo fi2(item->url().directory(false) + "index.html");
+        TQFileInfo fi2(item->url().directory(false) + "index.html");
         if (fi2.exists())
         {
             item->setURL(KURL::fromPathOrURL(fi2.absFilePath()));
@@ -173,9 +173,9 @@ bool DocDoxygenPlugin::needRefreshIndex(DocumentationCatalogItem* item)
     if (!doxyItem)
         return false;
     
-    QFileInfo fi(doxyItem->origUrl());
+    TQFileInfo fi(doxyItem->origUrl());
     config->setGroup("Index");
-    if (fi.lastModified() > config->readDateTimeEntry(item->text(0), new QDateTime()))
+    if (fi.lastModified() > config->readDateTimeEntry(item->text(0), new TQDateTime()))
     {
         kdDebug() << "need rebuild index for " << item->text(0) << endl;
         config->writeEntry(item->text(0), fi.lastModified());
@@ -192,19 +192,19 @@ void DocDoxygenPlugin::autoSetupPlugin()
     
 }
 
-void DocDoxygenPlugin::autoSetupDocs(const QString &defaultDir, const QString &searchDir,
-    const QString &name)
+void DocDoxygenPlugin::autoSetupDocs(const TQString &defaultDir, const TQString &searchDir,
+    const TQString &name)
 {
-    QString doxyDocDir(defaultDir);
+    TQString doxyDocDir(defaultDir);
     doxyDocDir = URLUtil::envExpand(doxyDocDir);
     if (doxyDocDir.isEmpty())
     {
-        QStringList apiDirs = DocDoxygenPluginFactory::instance()->dirs()->findDirs("html", searchDir);
-        for (QStringList::const_iterator it = apiDirs.begin(); it != apiDirs.end(); ++it )
+        TQStringList apiDirs = DocDoxygenPluginFactory::instance()->dirs()->findDirs("html", searchDir);
+        for (TQStringList::const_iterator it = apiDirs.begin(); it != apiDirs.end(); ++it )
         {
             doxyDocDir = *it;
-            QString indexFile = doxyDocDir + "index.html";
-            if (QFile::exists(indexFile))
+            TQString indexFile = doxyDocDir + "index.html";
+            if (TQFile::exists(indexFile))
             {
                 doxyDocDir = doxyDocDir + "/" + searchDir;
                 break;
@@ -219,13 +219,13 @@ void DocDoxygenPlugin::autoSetupDocs(const QString &defaultDir, const QString &s
         config->setGroup("Index Settings");
         config->writeEntry(name, true);
         config->setGroup("Locations");
-        config->writePathEntry(name, doxyDocDir + QString("/index.html"));
+        config->writePathEntry(name, doxyDocDir + TQString("/index.html"));
     }
 }
 
 void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item)
 {
-    QFileInfo fi(item->url().path());
+    TQFileInfo fi(item->url().path());
     if (!fi.exists())
         return;
 
@@ -236,11 +236,11 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     //doxygen documentation mode (if catalog points to a .tag)
     if (doxyItem->origUrl().endsWith("tag"))
     {
-        QString htmlUrl;
-        QFileInfo fi2(item->url().directory(false) + "index.html");
+        TQString htmlUrl;
+        TQFileInfo fi2(item->url().directory(false) + "index.html");
         if (fi2.exists())
             htmlUrl = fi2.dirPath(true) + "/";
-        QFileInfo fi(item->url().directory(false) + "html/index.html");
+        TQFileInfo fi(item->url().directory(false) + "html/index.html");
         if (fi.exists())
             htmlUrl = fi.dirPath(true) + "/";
         
@@ -248,8 +248,8 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     }
     
     //KDE doxygen documentation mode (if catalog points to a index.html)
-    QDir d;
-    QValueStack dirStack;
+    TQDir d;
+    TQValueStack dirStack;
     dirStack.push(fi.dirPath(true));
     do {
         d.setPath(dirStack.pop());
@@ -258,24 +258,24 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
 
         const QFileInfoList *dirEntries = d.entryInfoList();
         if (!dirEntries) continue;
-        QPtrListIterator it(*dirEntries);
+        TQPtrListIterator it(*dirEntries);
         for (; it.current(); ++it)
         {
-            QString fileName = it.current()->fileName();
+            TQString fileName = it.current()->fileName();
             if (fileName == "." || fileName == ".." || fileName == "common" || fileName == "html")
                 continue;
             if (it.current()->isDir())
                 dirStack.push(it.current()->absFilePath());
         }
 
-        if (QFile::exists(d.absPath() + "/html/index.html"))
+        if (TQFile::exists(d.absPath() + "/html/index.html"))
             createBookIndex(d.absPath() + "/" + d.dirName() + ".tag", index, item);
     } while (!dirStack.isEmpty());
 }
 
 void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item)
 {
-    QFileInfo fi(item->url().path());
+    TQFileInfo fi(item->url().path());
     if (!fi.exists())
         return;
     
@@ -286,11 +286,11 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item)
     //doxygen documentation mode (if catalog points to a .tag)
     if (doxyItem->origUrl().endsWith("tag"))
     {
-        QString htmlUrl;
-        QFileInfo fi2(item->url().directory(false) + "index.html");
+        TQString htmlUrl;
+        TQFileInfo fi2(item->url().directory(false) + "index.html");
         if (fi2.exists())
             htmlUrl = fi2.dirPath(true) + "/";
-        QFileInfo fi(item->url().directory(false) + "html/index.html");
+        TQFileInfo fi(item->url().directory(false) + "html/index.html");
         if (fi.exists())
             htmlUrl = fi.dirPath(true) + "/";
         if (!htmlUrl.isEmpty())
@@ -298,8 +298,8 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item)
     }
     
     //KDE doxygen documentation mode (if catalog points to a index.html)
-    QDir d;
-    QValueStack dirStack;
+    TQDir d;
+    TQValueStack dirStack;
     dirStack.push(fi.dirPath(true));
     do {
         d.setPath(dirStack.pop());
@@ -308,17 +308,17 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item)
 
         const QFileInfoList *dirEntries = d.entryInfoList();
         if (!dirEntries) continue;
-        QPtrListIterator it(*dirEntries);
+        TQPtrListIterator it(*dirEntries);
         for (; it.current(); ++it)
         {
-            QString fileName = it.current()->fileName();
+            TQString fileName = it.current()->fileName();
             if (fileName == "." || fileName == ".." || fileName == "common" || fileName == "html")
                 continue;
             if (it.current()->isDir())
                 dirStack.push(it.current()->absFilePath());
         }
 
-        if (QFile::exists(d.absPath() + "/html/index.html"))
+        if (TQFile::exists(d.absPath() + "/html/index.html"))
         {
             DocumentationItem *docItem = new DocumentationItem(DocumentationItem::Book, item, d.dirName());
             docItem->setURL(KURL(d.absPath() + "/html/index.html"));
@@ -328,7 +328,7 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item)
     } while (!dirStack.isEmpty());
 }
 
-DocumentationCatalogItem *DocDoxygenPlugin::createCatalog(KListView *contents, const QString &title, const QString &url)
+DocumentationCatalogItem *DocDoxygenPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url)
 {
     kdDebug() << "DocDoxygenPlugin::createCatalog: url=" << url << endl;
     DocumentationCatalogItem *item = new DoxyDocumentationCatalogItem(url, this, contents, title);
@@ -336,41 +336,41 @@ DocumentationCatalogItem *DocDoxygenPlugin::createCatalog(KListView *contents, c
     return item;
 }
 
-void DocDoxygenPlugin::createBookTOC(DocumentationItem *item, const QString &tagUrl, const QString &baseHtmlUrl)
+void DocDoxygenPlugin::createBookTOC(DocumentationItem *item, const TQString &tagUrl, const TQString &baseHtmlUrl)
 {
-    QString tagName;
+    TQString tagName;
     if (tagUrl.isEmpty())
         tagName = item->url().upURL().directory(false) + item->text(0) + ".tag";
     else
         tagName = tagUrl;
     
-    QString baseUrl;
+    TQString baseUrl;
     if (baseHtmlUrl.isEmpty())
         baseUrl = item->url().directory(false);
     else
         baseUrl = baseHtmlUrl;
             
     //@todo list html files in the directory if tag was not found
-    if (!QFile::exists(tagName))
+    if (!TQFile::exists(tagName))
         return;
 
-    QStringList tagFileList;
+    TQStringList tagFileList;
     if (tagName.endsWith(".tag"))
-        tagFileList = tagFiles(QFileInfo(tagName).dirPath() + "/");
+        tagFileList = tagFiles(TQFileInfo(tagName).dirPath() + "/");
     else
         tagFileList += tagName;
 
-    QStringList::ConstIterator end = tagFileList.constEnd();
-    for (QStringList::ConstIterator it = tagFileList.constBegin(); it != end; ++it)
+    TQStringList::ConstIterator end = tagFileList.constEnd();
+    for (TQStringList::ConstIterator it = tagFileList.constBegin(); it != end; ++it)
     {
-        QFile f(*it);
+        TQFile f(*it);
         if (!f.open(IO_ReadOnly))
         {
             kdDebug(9002) << "Could not open tag file: " << f.name() << endl;
             return;
         }
     
-        QDomDocument dom;
+        TQDomDocument dom;
         if (!dom.setContent(&f) || dom.documentElement().nodeName() != "tagfile")
         {
             kdDebug(9002) << "No valid tag file" << endl;
@@ -378,17 +378,17 @@ void DocDoxygenPlugin::createBookTOC(DocumentationItem *item, const QString &tag
         }
         f.close();
     
-        QDomElement docEl = dom.documentElement();
+        TQDomElement docEl = dom.documentElement();
     
-        QDomElement childEl = docEl.lastChild().toElement();
+        TQDomElement childEl = docEl.lastChild().toElement();
         while (!childEl.isNull())
         {
             if (childEl.tagName() == "compound" && childEl.attribute("kind") == "class")
             {
-                QString classname = childEl.namedItem("name").firstChild().toText().data();
-                QString filename = childEl.namedItem("filename").firstChild().toText().data();
+                TQString classname = childEl.namedItem("name").firstChild().toText().data();
+                TQString filename = childEl.namedItem("filename").firstChild().toText().data();
     
-                if (QFile::exists(baseUrl + filename))
+                if (TQFile::exists(baseUrl + filename))
                 {
                     DocumentationItem *docItem = new DocumentationItem(DocumentationItem::Document,
                         item, classname);
@@ -400,27 +400,27 @@ void DocDoxygenPlugin::createBookTOC(DocumentationItem *item, const QString &tag
     }
 }
 
-void DocDoxygenPlugin::createBookIndex(const QString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const QString &baseHtmlUrl)
+void DocDoxygenPlugin::createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl)
 {
-    QString tagName = tagfile;
+    TQString tagName = tagfile;
     kdDebug() << tagfile << endl;
-    if (!QFile::exists(tagName))
+    if (!TQFile::exists(tagName))
         return;
-    QString prefix = baseHtmlUrl.isEmpty() ? KURL(tagfile).directory(false) + "html/" : baseHtmlUrl;
+    TQString prefix = baseHtmlUrl.isEmpty() ? KURL(tagfile).directory(false) + "html/" : baseHtmlUrl;
     
-    QStringList tagFileList = tagFiles(QFileInfo(tagName).dirPath() + "/");
+    TQStringList tagFileList = tagFiles(TQFileInfo(tagName).dirPath() + "/");
 
-    QStringList::ConstIterator end = tagFileList.constEnd();
-    for (QStringList::ConstIterator it = tagFileList.constBegin(); it != end; ++it)
+    TQStringList::ConstIterator end = tagFileList.constEnd();
+    for (TQStringList::ConstIterator it = tagFileList.constBegin(); it != end; ++it)
     {
-        QFile f(*it);
+        TQFile f(*it);
         if (!f.open(IO_ReadOnly))
         {
             kdDebug(9002) << "Could not open tag file: " << f.name() << endl;
             return;
         }
 
-        QDomDocument dom;
+        TQDomDocument dom;
         if (!dom.setContent(&f) || dom.documentElement().nodeName() != "tagfile")
         {
             kdDebug(9002) << "No valid tag file" << endl;
@@ -428,17 +428,17 @@ void DocDoxygenPlugin::createBookIndex(const QString &tagfile, IndexBox* index,
         }
         f.close();
 
-        QDomElement docEl = dom.documentElement();
+        TQDomElement docEl = dom.documentElement();
         createIndexFromTag(dom, index, item, docEl, prefix);
   }
 }
 
-void DocDoxygenPlugin::createIndexFromTag(QDomDocument &dom, IndexBox *index,
-    DocumentationCatalogItem *item, QDomElement &parentEl, const QString &prefix)
+void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
+    DocumentationCatalogItem *item, TQDomElement &parentEl, const TQString &prefix)
 {
-    QDomElement docEl = parentEl;
+    TQDomElement docEl = parentEl;
 
-    QDomElement childEl = docEl.firstChild().toElement();
+    TQDomElement childEl = docEl.firstChild().toElement();
     while (!childEl.isNull())
     {
         if (childEl.tagName() == "compound" && 
@@ -446,8 +446,8 @@ void DocDoxygenPlugin::createIndexFromTag(QDomDocument &dom, IndexBox *index,
             || (childEl.attribute("kind") == "struct")
             || (childEl.attribute("kind") == "namespace") ))
         {
-            QString classname = childEl.namedItem("name").firstChild().toText().data();
-            QString filename = childEl.namedItem("filename").firstChild().toText().data();
+            TQString classname = childEl.namedItem("name").firstChild().toText().data();
+            TQString filename = childEl.namedItem("filename").firstChild().toText().data();
 
             IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname, 
             i18n("%1 Class Reference").arg(classname));
@@ -460,10 +460,10 @@ void DocDoxygenPlugin::createIndexFromTag(QDomDocument &dom, IndexBox *index,
             || (childEl.attribute("kind") == "slot")
             || (childEl.attribute("kind") == "signal") ))
         {
-            QString classname = parentEl.namedItem("name").firstChild().toText().data();
-            QString membername = childEl.namedItem("name").firstChild().toText().data();
-            QString anchor = childEl.namedItem("anchor").firstChild().toText().data();
-            QString arglist = childEl.namedItem("arglist").firstChild().toText().data();
+            TQString classname = parentEl.namedItem("name").firstChild().toText().data();
+            TQString membername = childEl.namedItem("name").firstChild().toText().data();
+            TQString anchor = childEl.namedItem("anchor").firstChild().toText().data();
+            TQString arglist = childEl.namedItem("arglist").firstChild().toText().data();
             
             if (classname != membername)
             {
@@ -482,44 +482,44 @@ ProjectDocumentationPlugin *DocDoxygenPlugin::projectDocumentationPlugin(Project
     return DocumentationPlugin::projectDocumentationPlugin(type);
 }
 
-QStringList DocDoxygenPlugin::tagFiles(const QString& path, int level)
+TQStringList DocDoxygenPlugin::tagFiles(const TQString& path, int level)
 {
-  QStringList r;
-  QDir dir(path);
+  TQStringList r;
+  TQDir dir(path);
   if (level > 10) return r;
   if (!dir.isReadable()) return r;
   if (!dir.exists()) return r;
 
-  QStringList  dirList;
-  QStringList  fileList;
-  QStringList::Iterator it;
+  TQStringList  dirList;
+  TQStringList  fileList;
+  TQStringList::Iterator it;
 
-  dir.setFilter ( QDir::Dirs);
+  dir.setFilter ( TQDir::Dirs);
   dirList = dir.entryList();
 
   dirList.remove(".");
   dirList.remove("..");
 
-  dir.setFilter(QDir::Files | QDir::Hidden | QDir::System);
+  dir.setFilter(TQDir::Files | TQDir::Hidden | TQDir::System);
   fileList = dir.entryList();
-  QStringList::Iterator end = dirList.end();
+  TQStringList::Iterator end = dirList.end();
   for ( it = dirList.begin(); it != end; ++it )
   {
-    QString name = *it;
-    if (QFileInfo( dir, *it ).isSymLink())
+    TQString name = *it;
+    if (TQFileInfo( dir, *it ).isSymLink())
       continue;
     r += tagFiles(path + name + "/", level + 1 );
   }
 
-  QStringList::Iterator fend = fileList.end();
+  TQStringList::Iterator fend = fileList.end();
   for ( it = fileList.begin(); it != fend; ++it )
   {
-    QString name = *it;
-    QFileInfo fi( dir, *it );
+    TQString name = *it;
+    TQFileInfo fi( dir, *it );
     if (fi.isSymLink() || !fi.isFile())
       continue;
 
-    if (QDir::match(QString("*.tag"), name))
+    if (TQDir::match(TQString("*.tag"), name))
       r += (path+name);
   }
 
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
index 75d36787..a272b8df 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
@@ -29,12 +29,12 @@ class DocDoxygenPlugin: public DocumentationPlugin
 {
     Q_OBJECT
 public:
-    DocDoxygenPlugin(QObject* parent, const char* name, const QStringList args = QStringList());
+    DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~DocDoxygenPlugin();
 
-    virtual QString pluginName() const;
+    virtual TQString pluginName() const;
 
-    virtual DocumentationCatalogItem *createCatalog(KListView *contents, const QString &title, const QString &url);
+    virtual DocumentationCatalogItem *createCatalog(KListView *contents, const TQString &title, const TQString &url);
     
     virtual void createTOC(DocumentationCatalogItem* item);
     virtual void setCatalogURL(DocumentationCatalogItem* item);
@@ -42,25 +42,25 @@ public:
     virtual bool needRefreshIndex(DocumentationCatalogItem* item);
     virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item);
 
-    virtual QStringList fullTextSearchLocations();
+    virtual TQStringList fullTextSearchLocations();
                     
-    virtual QPair catalogLocatorProps();
-    virtual QString catalogTitle(const QString& url);
+    virtual QPair catalogLocatorProps();
+    virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
 
     virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type);
         
 protected:
-    void createBookTOC(DocumentationItem* item, const QString &tagUrl = QString::null, 
-        const QString &baseHtmlUrl = QString::null);
-    void createBookIndex(const QString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const QString &baseHtmlUrl = QString::null);
+    void createBookTOC(DocumentationItem* item, const TQString &tagUrl = TQString::null, 
+        const TQString &baseHtmlUrl = TQString::null);
+    void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString::null);
     
-    void createIndexFromTag(QDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item,
-        QDomElement &parentEl, const QString &prefix);
+    void createIndexFromTag(TQDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item,
+        TQDomElement &parentEl, const TQString &prefix);
     
-    void autoSetupDocs(const QString &defaultDir, const QString &searchDir, 
-        const QString &name);
+    void autoSetupDocs(const TQString &defaultDir, const TQString &searchDir, 
+        const TQString &name);
 
     /**
      * Returns all the tag files from a directory and its subdirectories.
@@ -68,7 +68,7 @@ protected:
      * @param level the depth of the current search
      * @return a list with the absolute path to the ".tag" files in startDir
      */
-    QStringList tagFiles(const QString &startDir, int level = 0);    
+    TQStringList tagFiles(const TQString &startDir, int level = 0);    
 };
 
 
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index a4480cbf..6dd73707 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -21,10 +21,10 @@
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -42,20 +42,20 @@
 class TOCDocumentationCatalogItem: public DocumentationCatalogItem
 {
 public:
-    TOCDocumentationCatalogItem(const QString &tocFile, DocumentationPlugin* plugin,
-        KListView *parent, const QString &name)
+    TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin,
+        KListView *parent, const TQString &name)
         :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile)
     {
     }
-    TOCDocumentationCatalogItem(const QString &tocFile, DocumentationPlugin* plugin,
-        DocumentationItem *parent, const QString &name)
+    TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin,
+        DocumentationItem *parent, const TQString &name)
         :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile)
     {
     }
-    QString tocFile() const { return m_tocFile; }
+    TQString tocFile() const { return m_tocFile; }
     
 private:
-    QString m_tocFile;
+    TQString m_tocFile;
 };
 
 
@@ -63,8 +63,8 @@ static const KDevPluginInfo data("dockdevtocplugin");
 typedef KDevGenericFactory DocKDevTOCPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) )
 
-DocKDevTOCPlugin::DocKDevTOCPlugin(QObject* parent, const char* name,
-    const QStringList /*args*/)
+DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name,
+    const TQStringList /*args*/)
     :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(Index);
@@ -75,45 +75,45 @@ DocKDevTOCPlugin::~DocKDevTOCPlugin()
 {
 }
 
-QString DocKDevTOCPlugin::pluginName() const
+TQString DocKDevTOCPlugin::pluginName() const
 {
     return i18n("KDevelopTOC Documentation Collection");
 }
 
-DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, const QString& title, const QString& url)
+DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url)
 {
     return new TOCDocumentationCatalogItem(url, this, contents, title);
 }
 
-QPair DocKDevTOCPlugin::catalogLocatorProps()
+QPair DocKDevTOCPlugin::catalogLocatorProps()
 {
-    return QPair(KFile::File, "*.toc");
+    return QPair(KFile::File, "*.toc");
 }
 
-QString DocKDevTOCPlugin::catalogTitle(const QString& url)
+TQString DocKDevTOCPlugin::catalogTitle(const TQString& url)
 {
-    QFileInfo fi(url);
+    TQFileInfo fi(url);
     if (!fi.exists())
-        return QString::null;
+        return TQString::null;
 
-    QFile f(url);
+    TQFile f(url);
     if (!f.open(IO_ReadOnly))
-        return QString::null;
+        return TQString::null;
     
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f) || (doc.doctype().name() != "kdeveloptoc"))
-        return QString::null;
+        return TQString::null;
     f.close();
 
-    QDomElement titleEl = doc.documentElement().namedItem("title").toElement();
+    TQDomElement titleEl = doc.documentElement().namedItem("title").toElement();
 
     return titleEl.firstChild().toText().data();
 }
 
 
-QStringList DocKDevTOCPlugin::fullTextSearchLocations()
+TQStringList DocKDevTOCPlugin::fullTextSearchLocations()
 {
-    return QStringList();
+    return TQStringList();
 }
 
 bool DocKDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/)
@@ -123,9 +123,9 @@ bool DocKDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/)
 
 void DocKDevTOCPlugin::autoSetupPlugin()
 {
-    QStringList tocsDir = DocKDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "kdevdocumentation/tocs/*.toc");
+    TQStringList tocsDir = DocKDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "kdevdocumentation/tocs/*.toc");
     
-    for (QStringList::const_iterator it = tocsDir.begin(); it != tocsDir.end(); ++it)
+    for (TQStringList::const_iterator it = tocsDir.begin(); it != tocsDir.end(); ++it)
     {
         config->setGroup("Locations");
         config->writePathEntry(catalogTitle(*it), *it);
@@ -138,15 +138,15 @@ void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     if (!tocItem)
         return;
     
-    QFileInfo fi(tocItem->tocFile());
+    TQFileInfo fi(tocItem->tocFile());
 
-    QFile f(tocItem->tocFile());
+    TQFile f(tocItem->tocFile());
     if (!f.open(IO_ReadOnly))
     {
         kdDebug(9002) << "Could not read" << tocItem->tocFile() << endl;
         return;
     }
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f) || doc.doctype().name() != "kdeveloptoc")
     {
         kdDebug(9002) << "Not a valid kdeveloptoc file: " << tocItem->tocFile() << endl;
@@ -154,21 +154,21 @@ void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     }
     f.close();
 
-    QDomElement docEl = doc.documentElement();
-    QDomElement baseEl = docEl.namedItem("base").toElement();
+    TQDomElement docEl = doc.documentElement();
+    TQDomElement baseEl = docEl.namedItem("base").toElement();
     
-    QString base;
+    TQString base;
     if (!baseEl.isNull())
-        base = baseEl.attribute("href", QString::null);
+        base = baseEl.attribute("href", TQString::null);
     
-    QDomElement indexEl = docEl.namedItem("index").toElement();
-    QDomElement childEl = indexEl.firstChild().toElement();
+    TQDomElement indexEl = docEl.namedItem("index").toElement();
+    TQDomElement childEl = indexEl.firstChild().toElement();
     while (!childEl.isNull())
     {
         if (childEl.tagName() == "entry")
         {
-            QString name = childEl.attribute("name");
-            QString url = childEl.attribute("url");
+            TQString name = childEl.attribute("name");
+            TQString url = childEl.attribute("url");
             
             IndexItemProto *ii = new IndexItemProto(this, item, index, name, item->text(0));
             ii->addURL(KURL(constructURL(base, url)));
@@ -183,15 +183,15 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
     if (!tocItem)
         return;
     
-    QFileInfo fi(tocItem->tocFile());
+    TQFileInfo fi(tocItem->tocFile());
 
-    QFile f(tocItem->tocFile());
+    TQFile f(tocItem->tocFile());
     if (!f.open(IO_ReadOnly))
     {
         kdDebug(9002) << "Could not read" << tocItem->tocFile() << endl;
         return;
     }
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f) || doc.doctype().name() != "kdeveloptoc")
     {
         kdDebug(9002) << "Not a valid kdeveloptoc file: " << tocItem->tocFile() << endl;
@@ -199,30 +199,30 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
     }
     f.close();
 
-    QDomElement docEl = doc.documentElement();
-    QDomElement baseEl = docEl.namedItem("base").toElement();
+    TQDomElement docEl = doc.documentElement();
+    TQDomElement baseEl = docEl.namedItem("base").toElement();
     
-    QString base;
+    TQString base;
     if (!baseEl.isNull())
-        base = baseEl.attribute("href", QString::null);
+        base = baseEl.attribute("href", TQString::null);
     
-    QDomElement childEl = docEl.lastChild().toElement();
+    TQDomElement childEl = docEl.lastChild().toElement();
     addTocSect(tocItem, childEl, base, 1);
 }
 
-void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, QDomElement childEl, const QString &base, uint level)
+void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level)
 {
     while (!childEl.isNull())
     {
-        if (childEl.tagName() == QString("tocsect%1").arg(level))
+        if (childEl.tagName() == TQString("tocsect%1").arg(level))
         {
-            QString name = childEl.attribute("name");
-            QString url = childEl.attribute("url");
+            TQString name = childEl.attribute("name");
+            TQString url = childEl.attribute("url");
             
             DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, parent, name);
             item->setURL(KURL(constructURL(base, url)));
 
-            QDomElement grandchildEl = childEl.lastChild().toElement();
+            TQDomElement grandchildEl = childEl.lastChild().toElement();
             addTocSect(item, grandchildEl, base, level+1);
         }
         childEl = childEl.previousSibling().toElement();
@@ -235,15 +235,15 @@ void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
     if (!tocItem)
         return;
     
-    QFileInfo fi(tocItem->tocFile());
+    TQFileInfo fi(tocItem->tocFile());
 
-    QFile f(tocItem->tocFile());
+    TQFile f(tocItem->tocFile());
     if (!f.open(IO_ReadOnly))
     {
         kdDebug(9002) << "Could not read" << tocItem->tocFile() << endl;
         return;
     }
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f) || doc.doctype().name() != "kdeveloptoc")
     {
         kdDebug(9002) << "Not a valid kdeveloptoc file: " << tocItem->tocFile() << endl;
@@ -251,20 +251,20 @@ void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
     }
     f.close();
 
-    QDomElement docEl = doc.documentElement();
-    QDomElement baseEl = docEl.namedItem("base").toElement();
+    TQDomElement docEl = doc.documentElement();
+    TQDomElement baseEl = docEl.namedItem("base").toElement();
     
     if (item->url().isEmpty())
     {
         if (baseEl.isNull())
             item->setURL(KURL());
         else
-            item->setURL(KURL(constructURL(baseEl.attribute("href", QString::null),
-                baseEl.attribute("url", QString::null))));
+            item->setURL(KURL(constructURL(baseEl.attribute("href", TQString::null),
+                baseEl.attribute("url", TQString::null))));
     }
 }
 
-QString DocKDevTOCPlugin::constructURL(const QString &base, const QString &url)
+TQString DocKDevTOCPlugin::constructURL(const TQString &base, const TQString &url)
 {
     if (base.isEmpty() && !url.isEmpty())
         return url;
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
index 68bfd0e2..626848b9 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCKDEVTOCPLUGIN_H
 #define DOCKDEVTOCPLUGIN_H
 
-#include 
+#include 
 
 #include 
 
@@ -28,27 +28,27 @@ class DocKDevTOCPlugin : public DocumentationPlugin
 {
     Q_OBJECT
 public:
-    DocKDevTOCPlugin(QObject* parent, const char* name, const QStringList args = QStringList());
+    DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~DocKDevTOCPlugin();
 
-    virtual QString pluginName() const;
+    virtual TQString pluginName() const;
     
-    virtual QString catalogTitle(const QString& url);
-    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url);
+    virtual TQString catalogTitle(const TQString& url);
+    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url);
     virtual void createTOC(DocumentationCatalogItem* item);
     virtual void setCatalogURL(DocumentationCatalogItem* item);
     
     virtual bool needRefreshIndex(DocumentationCatalogItem* item);
     virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item);
     
-    virtual QStringList fullTextSearchLocations();
+    virtual TQStringList fullTextSearchLocations();
 
-    virtual QPair catalogLocatorProps();
+    virtual QPair catalogLocatorProps();
     virtual void autoSetupPlugin();
 
 protected:
-    void addTocSect(DocumentationItem *parent, QDomElement childEl, const QString &base, uint level);
-    static QString constructURL(const QString &base, const QString &url) ;
+    void addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level);
+    static TQString constructURL(const TQString &base, const TQString &url) ;
 };
 
 #endif
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index 901eeffe..8fdc4643 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -31,7 +31,7 @@ static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation pl
 typedef KDevGenericFactory DocPDBPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) )
 
-DocPDBPlugin::DocPDBPlugin(QObject* parent, const char* name, const QStringList args)
+DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args)
     :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(CustomDocumentationTitles | ProjectUserManual);
@@ -47,31 +47,31 @@ bool DocPDBPlugin::needRefreshIndex(DocumentationCatalogItem* item)
     return false;
 }
 
-QString DocPDBPlugin::pluginName() const
+TQString DocPDBPlugin::pluginName() const
 {
     return i18n("PalmDoc Documentation Collection");
 }
 
-DocumentationCatalogItem* DocPDBPlugin::createCatalog(KListView* contents, const QString& title, const QString& url)
+DocumentationCatalogItem* DocPDBPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url)
 {
     DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title);
     item->setURL(KURL(url));
     return item;
 }
 
-QPair DocPDBPlugin::catalogLocatorProps()
+QPair DocPDBPlugin::catalogLocatorProps()
 {
-    return QPair(KFile::File, "all/allfiles");
+    return QPair(KFile::File, "all/allfiles");
 }
 
-QString DocPDBPlugin::catalogTitle(const QString& /*url*/)
+TQString DocPDBPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return QString::null;
+    return TQString::null;
 }
 
-QStringList DocPDBPlugin::fullTextSearchLocations()
+TQStringList DocPDBPlugin::fullTextSearchLocations()
 {
-    return QStringList();
+    return TQStringList();
 }
 
 
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h
index f639e0cf..b9544a7b 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.h
+++ b/parts/documentation/plugins/pdb/docpdbplugin.h
@@ -24,12 +24,12 @@
 
 class DocPDBPlugin : public DocumentationPlugin {
 public:
-    DocPDBPlugin(QObject* parent, const char* name, const QStringList args = QStringList());
+    DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~DocPDBPlugin();
 
-    virtual QString pluginName() const;
+    virtual TQString pluginName() const;
     
-    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url);
+    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url);
 
     virtual void createTOC(DocumentationCatalogItem* item);
     virtual void setCatalogURL(DocumentationCatalogItem* item);
@@ -37,10 +37,10 @@ public:
     virtual bool needRefreshIndex(DocumentationCatalogItem* item);
     virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item);
 
-    virtual QStringList fullTextSearchLocations();
+    virtual TQStringList fullTextSearchLocations();
             
-    virtual QPair catalogLocatorProps();
-    virtual QString catalogTitle(const QString& url);
+    virtual QPair catalogLocatorProps();
+    virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
 
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index 5d8b7a78..79dab511 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -31,7 +31,7 @@ static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin
 typedef KDevGenericFactory DocPDFPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) )
 
-DocPDFPlugin::DocPDFPlugin(QObject* parent, const char* name, const QStringList args)
+DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args)
     :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(CustomDocumentationTitles | ProjectUserManual);
@@ -47,31 +47,31 @@ bool DocPDFPlugin::needRefreshIndex(DocumentationCatalogItem* item)
     return false;
 }
 
-QString DocPDFPlugin::pluginName() const
+TQString DocPDFPlugin::pluginName() const
 {
     return i18n("PDF Documentation Collection");
 }
 
-DocumentationCatalogItem* DocPDFPlugin::createCatalog(KListView* contents, const QString& title, const QString& url)
+DocumentationCatalogItem* DocPDFPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url)
 {
     DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title);
     item->setURL(KURL(url));
     return item;
 }
 
-QPair DocPDFPlugin::catalogLocatorProps()
+QPair DocPDFPlugin::catalogLocatorProps()
 {
-    return QPair(KFile::File, "*.pdf");
+    return QPair(KFile::File, "*.pdf");
 }
 
-QString DocPDFPlugin::catalogTitle(const QString& /*url*/)
+TQString DocPDFPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return QString::null;
+    return TQString::null;
 }
 
-QStringList DocPDFPlugin::fullTextSearchLocations()
+TQStringList DocPDFPlugin::fullTextSearchLocations()
 {
-    return QStringList();
+    return TQStringList();
 }
 
 
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h
index c78325d4..b7e8b26b 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.h
+++ b/parts/documentation/plugins/pdf/docpdfplugin.h
@@ -24,12 +24,12 @@
 
 class DocPDFPlugin : public DocumentationPlugin {
 public:
-    DocPDFPlugin(QObject* parent, const char* name, const QStringList args = QStringList());
+    DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~DocPDFPlugin();
 
-    virtual QString pluginName() const;
+    virtual TQString pluginName() const;
     
-    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const QString& title, const QString& url);
+    virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url);
 
     virtual void createTOC(DocumentationCatalogItem* item);
     virtual void setCatalogURL(DocumentationCatalogItem* item);
@@ -37,10 +37,10 @@ public:
     virtual bool needRefreshIndex(DocumentationCatalogItem* item);
     virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item);
 
-    virtual QStringList fullTextSearchLocations();
+    virtual TQStringList fullTextSearchLocations();
             
-    virtual QPair catalogLocatorProps();
-    virtual QString catalogTitle(const QString& url);
+    virtual QPair catalogLocatorProps();
+    virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
 
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 90237b7c..b4118f97 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -21,9 +21,9 @@
 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -40,27 +40,27 @@
 class QtDocumentationCatalogItem: public DocumentationCatalogItem
 {
 public:
-    QtDocumentationCatalogItem(const QString &dcfFile, DocumentationPlugin* plugin,
-        KListView *parent, const QString &name)
+    QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin,
+        KListView *parent, const TQString &name)
         :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile)
     {
     }
-    QtDocumentationCatalogItem(const QString &dcfFile, DocumentationPlugin* plugin,
-        DocumentationItem *parent, const QString &name)
+    QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin,
+        DocumentationItem *parent, const TQString &name)
         :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile)
     {
     }
-    QString dcfFile() const { return m_dcfFile; }
+    TQString dcfFile() const { return m_dcfFile; }
 
 private:
-    QString m_dcfFile;
+    TQString m_dcfFile;
 };
 
 static const KDevPluginInfo data("docqtplugin");
 typedef KDevGenericFactory DocQtPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) )
 
-DocQtPlugin::DocQtPlugin(QObject* parent, const char* name, const QStringList)
+DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList)
     :DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(Index | FullTextSearch | CustomDocumentationTitles);
@@ -77,15 +77,15 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item)
     if (!qtItem)
         return;
 
-    QFileInfo fi(qtItem->dcfFile());
+    TQFileInfo fi(qtItem->dcfFile());
 
-    QFile f(qtItem->dcfFile());
+    TQFile f(qtItem->dcfFile());
     if (!f.open(IO_ReadOnly))
     {
         kdDebug(9002) << "Could not read" << qtItem->dcfFile() << endl;
         return;
     }
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f) || doc.doctype().name() != "DCF")
     {
         kdDebug(9002) << "Not a valid DCF file: " << qtItem->dcfFile() << endl;
@@ -93,28 +93,28 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item)
     }
     f.close();
 
-    QDomElement docEl = doc.documentElement();
-    QDomElement titleEl = docEl.namedItem("DCF").toElement();
+    TQDomElement docEl = doc.documentElement();
+    TQDomElement titleEl = docEl.namedItem("DCF").toElement();
 
-    QDomElement childEl = docEl.lastChild().toElement();
+    TQDomElement childEl = docEl.lastChild().toElement();
     while (!childEl.isNull())
     {
         if (childEl.tagName() == "section")
         {
-            QString ref = childEl.attribute("ref");
-            QString title = childEl.attribute("title");
+            TQString ref = childEl.attribute("ref");
+            TQString title = childEl.attribute("title");
 
             DocumentationItem *sectionItem = new DocumentationItem(DocumentationItem::Book, item, title);
             KURL sectionUrl(fi.dirPath(true) + "/" + ref);
             sectionItem->setURL(sectionUrl);
 
-            QDomElement grandChild = childEl.lastChild().toElement();
+            TQDomElement grandChild = childEl.lastChild().toElement();
             while(!grandChild.isNull())
             {
                 if (grandChild.tagName() == "keyword")
                 {
-                    QString keyRef = grandChild.attribute("ref");
-                    QString keyTitle = grandChild.text();
+                    TQString keyRef = grandChild.attribute("ref");
+                    TQString keyTitle = grandChild.text();
 
                     DocumentationItem *keyItem = new DocumentationItem(DocumentationItem::Document, sectionItem, keyTitle);
                     KURL keyUrl(fi.dirPath(true) + "/" + keyRef);
@@ -122,8 +122,8 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item)
                 }
                 if (grandChild.tagName() == "section")
                 {
-                    QString keyRef = grandChild.attribute("ref");
-                    QString keyTitle = grandChild.attribute("title");
+                    TQString keyRef = grandChild.attribute("ref");
+                    TQString keyTitle = grandChild.attribute("title");
                     DocumentationItem *keyItem = new DocumentationItem(DocumentationItem::Book, sectionItem, keyTitle);
                     KURL keyUrl(fi.dirPath(true) + "/" + keyRef);
                     keyItem->setURL(keyUrl);
@@ -137,7 +137,7 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item)
 
 void DocQtPlugin::autoSetupPlugin()
 {
-    QString qtDocDir(QT_DOCDIR);
+    TQString qtDocDir(QT_DOCDIR);
     qtDocDir = URLUtil::envExpand(qtDocDir);
     if (qtDocDir.isEmpty())
     {
@@ -150,11 +150,11 @@ void DocQtPlugin::autoSetupPlugin()
         config->setGroup("Index Settings");
         config->writeEntry("Qt Reference Documentation", true);
         config->setGroup("Locations");
-        config->writePathEntry("Qt Reference Documentation", qtDocDir + QString("/qt.dcf"));
-        config->writePathEntry("Qt Assistant Manual", qtDocDir + QString("/assistant.dcf"));
-        config->writePathEntry("Qt Designer Manual", qtDocDir + QString("/designer.dcf"));
-        config->writePathEntry("Guide to the Qt Translation Tools", qtDocDir + QString("/linguist.dcf"));
-        config->writePathEntry("qmake User Guide", qtDocDir + QString("/qmake.dcf"));
+        config->writePathEntry("Qt Reference Documentation", qtDocDir + TQString("/qt.dcf"));
+        config->writePathEntry("Qt Assistant Manual", qtDocDir + TQString("/assistant.dcf"));
+        config->writePathEntry("Qt Designer Manual", qtDocDir + TQString("/designer.dcf"));
+        config->writePathEntry("Guide to the Qt Translation Tools", qtDocDir + TQString("/linguist.dcf"));
+        config->writePathEntry("qmake User Guide", qtDocDir + TQString("/qmake.dcf"));
     }
 }
 
@@ -164,15 +164,15 @@ void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
     if (!qtItem)
         return;
 
-    QFileInfo fi(qtItem->dcfFile());
+    TQFileInfo fi(qtItem->dcfFile());
 
-    QFile f(qtItem->dcfFile());
+    TQFile f(qtItem->dcfFile());
     if (!f.open(IO_ReadOnly))
     {
         kdDebug(9002) << "Could not read" << qtItem->dcfFile() << endl;
         return;
     }
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f) || doc.doctype().name() != "DCF")
     {
         kdDebug(9002) << "Not a valid DCF file: " << qtItem->dcfFile() << endl;
@@ -180,17 +180,17 @@ void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
     }
     f.close();
 
-    QDomElement docEl = doc.documentElement();
-    QDomElement titleEl = docEl.namedItem("DCF").toElement();
+    TQDomElement docEl = doc.documentElement();
+    TQDomElement titleEl = docEl.namedItem("DCF").toElement();
 
     if (item->url().isEmpty())
     {
-        KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", QString::null));
+        KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString::null));
         item->setURL(url);
     }
 }
 
-QString DocQtPlugin::pluginName() const
+TQString DocQtPlugin::pluginName() const
 {
     return i18n("Qt Documentation Collection");
 }
@@ -201,9 +201,9 @@ bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
     if (!qtItem)
         return false;
 
-    QFileInfo fi(qtItem->dcfFile());
+    TQFileInfo fi(qtItem->dcfFile());
     config->setGroup("Index");
-    if (fi.lastModified() > config->readDateTimeEntry(qtItem->text(0), new QDateTime()))
+    if (fi.lastModified() > config->readDateTimeEntry(qtItem->text(0), new TQDateTime()))
     {
         kdDebug() << "need rebuild index for " << qtItem->text(0) << endl;
         config->writeEntry(item->text(0), fi.lastModified());
@@ -219,15 +219,15 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
     if (!qtItem)
         return;
 
-    QFileInfo fi(qtItem->dcfFile());
+    TQFileInfo fi(qtItem->dcfFile());
 
-    QFile f(qtItem->dcfFile());
+    TQFile f(qtItem->dcfFile());
     if (!f.open(IO_ReadOnly))
     {
         kdDebug(9002) << "Could not read" << qtItem->dcfFile() << endl;
         return;
     }
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f) || doc.doctype().name() != "DCF")
     {
         kdDebug(9002) << "Not a valid DCF file: " << qtItem->dcfFile() << endl;
@@ -235,10 +235,10 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
     }
     f.close();
 
-    QDomElement docEl = doc.documentElement();
-    QDomElement titleEl = docEl.namedItem("DCF").toElement();
+    TQDomElement docEl = doc.documentElement();
+    TQDomElement titleEl = docEl.namedItem("DCF").toElement();
 
-    QDomElement childEl = docEl.firstChild().toElement();
+    TQDomElement childEl = docEl.firstChild().toElement();
     while (!childEl.isNull())
     {
         if (childEl.tagName() == "section")
@@ -249,26 +249,26 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
     }
 }
 
-void DocQtPlugin::createSectionIndex(QFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
-                                     QDomElement section)
+void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
+                                     TQDomElement section)
 {
     //adymo: do not load section to index for Qt reference documentation
-    QString title = section.attribute("title");
+    TQString title = section.attribute("title");
     if (fi.fileName() != "qt.dcf")
     {
-        QString ref = section.attribute("ref");
+        TQString ref = section.attribute("ref");
 
         IndexItemProto *ii = new IndexItemProto(this, item, index, title, item->text(0));
         ii->addURL(KURL(fi.dirPath(true) + "/" + ref));
     }
 
-    QDomElement grandChild = section.firstChild().toElement();
+    TQDomElement grandChild = section.firstChild().toElement();
     while(!grandChild.isNull())
     {
         if (grandChild.tagName() == "keyword")
         {
-            QString keyRef = grandChild.attribute("ref");
-            QString keyTitle = grandChild.text();
+            TQString keyRef = grandChild.attribute("ref");
+            TQString keyTitle = grandChild.text();
 
                     //adymo: a little hack to avoid unwanted elements
             if (keyRef != "qdir-example.html")
@@ -285,20 +285,20 @@ void DocQtPlugin::createSectionIndex(QFileInfo &fi, IndexBox *index, Documentati
     }
 }
 
-QStringList DocQtPlugin::fullTextSearchLocations()
+TQStringList DocQtPlugin::fullTextSearchLocations()
 {
-    QStringList locs;
+    TQStringList locs;
 
-    QMap entryMap = config->entryMap("Locations");
+    TQMap entryMap = config->entryMap("Locations");
 
-    for (QMap::const_iterator it = entryMap.begin();
+    for (TQMap::const_iterator it = entryMap.begin();
         it != entryMap.end(); ++it)
     {
         config->setGroup("Search Settings");
         if (config->readBoolEntry(it.key(), false))
         {
             config->setGroup("Locations");
-            QFileInfo fi(config->readPathEntry(it.key()));
+            TQFileInfo fi(config->readPathEntry(it.key()));
             locs << fi.dirPath(true);
         }
     }
@@ -306,32 +306,32 @@ QStringList DocQtPlugin::fullTextSearchLocations()
     return locs;
 }
 
-QPair DocQtPlugin::catalogLocatorProps()
+QPair DocQtPlugin::catalogLocatorProps()
 {
-    return QPair(KFile::File, "*.xml *.dcf");
+    return QPair(KFile::File, "*.xml *.dcf");
 }
 
-QString DocQtPlugin::catalogTitle(const QString &url)
+TQString DocQtPlugin::catalogTitle(const TQString &url)
 {
-    QFileInfo fi(url);
+    TQFileInfo fi(url);
     if (!fi.exists())
-        return QString::null;
+        return TQString::null;
 
-    QFile f(url);
+    TQFile f(url);
     if (!f.open(IO_ReadOnly))
-        return QString::null;
+        return TQString::null;
 
-    QDomDocument doc;
+    TQDomDocument doc;
     if (!doc.setContent(&f) || (doc.doctype().name() != "DCF"))
-        return QString::null;
+        return TQString::null;
     f.close();
 
-    QDomElement docEl = doc.documentElement();
+    TQDomElement docEl = doc.documentElement();
 
-    return docEl.attribute("title", QString::null);
+    return docEl.attribute("title", TQString::null);
 }
 
-DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const QString &title, const QString &url)
+DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url)
 {
     return new QtDocumentationCatalogItem(url, this, contents, title);
 }
diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h
index 551a6ac7..e09ce7a5 100644
--- a/parts/documentation/plugins/qt/docqtplugin.h
+++ b/parts/documentation/plugins/qt/docqtplugin.h
@@ -21,7 +21,7 @@
 #define DOCQTPLUGIN_H
 
 #include 
-#include 
+#include 
 
 class KConfig;
 
@@ -29,25 +29,25 @@ class DocQtPlugin : public DocumentationPlugin
 {
     Q_OBJECT
 public:
-    DocQtPlugin(QObject* parent, const char* name, const QStringList args = QStringList());
+    DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~DocQtPlugin();
 
-    virtual QString pluginName() const;
+    virtual TQString pluginName() const;
 
-    virtual DocumentationCatalogItem *createCatalog(KListView *contents, const QString &title, const QString &url);
+    virtual DocumentationCatalogItem *createCatalog(KListView *contents, const TQString &title, const TQString &url);
 
     virtual void createTOC(DocumentationCatalogItem *item);
     virtual void setCatalogURL(DocumentationCatalogItem *item);
 
     virtual bool needRefreshIndex(DocumentationCatalogItem *item);
     virtual void createIndex(IndexBox *index, DocumentationCatalogItem *item);
-    virtual void createSectionIndex(QFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
-        QDomElement section);
+    virtual void createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
+        TQDomElement section);
 
-    virtual QStringList fullTextSearchLocations();
+    virtual TQStringList fullTextSearchLocations();
 
-    virtual QPair catalogLocatorProps();
-    virtual QString catalogTitle(const QString &url);
+    virtual QPair catalogLocatorProps();
+    virtual TQString catalogTitle(const TQString &url);
 
     virtual void autoSetupPlugin();
 
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 4f9ecf73..1d7543c3 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -14,10 +14,10 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 #include 
@@ -58,7 +58,7 @@ extern "C"
     }
 }
 
-ChmProtocol::ChmProtocol(const QCString &pool_socket, const QCString &app_socket)
+ChmProtocol::ChmProtocol(const TQCString &pool_socket, const TQCString &app_socket)
 : SlaveBase("kio_chm", pool_socket, app_socket)
 {
     kdDebug() << "ChmProtocol::ChmProtocol()" << endl;
@@ -84,21 +84,21 @@ void ChmProtocol::get( const KURL& url )
 
     bool catalog = false;
     bool contents = false;
-    QString bigpath = url.path();
+    TQString bigpath = url.path();
 
     if(bigpath.endsWith(":catalog")) {
         catalog = true;
-        int len = QString(":catalog").length();
+        int len = TQString(":catalog").length();
         bigpath.remove(bigpath.length() - len, len);   ///strip :catalog from the end
     }
     
     if(bigpath.endsWith(":contents")) {
         contents = true;
-        int len = QString(":contents").length();
+        int len = TQString(":contents").length();
         bigpath.remove(bigpath.length() - len, len);   ///strip :catalog from the end
     }
     
-    QString path;
+    TQString path;
     if ( !checkNewFile( bigpath, path ) ) {
             error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
             return;
@@ -110,23 +110,23 @@ void ChmProtocol::get( const KURL& url )
         return;
     }
 
-    QByteArray theData;
+    TQByteArray theData;
 
     //init..
     //added by lucida lucida@users.sf.net
-    QString fname = QString();
-    QString chmpath = QString();
+    TQString fname = TQString();
+    TQString chmpath = TQString();
     KTempFile f("",".html");
     fname = f.name();
-    QTextStream *t = f.textStream();
-    QString firstPage = QString("");
-    QString m_strIndex = QString("");
-    QString tmpstr = QString("");
+    TQTextStream *t = f.textStream();
+    TQString firstPage = TQString("");
+    TQString m_strIndex = TQString("");
+    TQString tmpstr = TQString("");
     bool m_bIndex = 0;
 
     
     if(contents) {
-        QString output;
+        TQString output;
         KURL u = url;
         
         ChmDirectoryMap::Iterator it;
@@ -163,19 +163,19 @@ void ChmProtocol::get( const KURL& url )
         int offset = m_dirMap["/@contents"].offset;
         int length = m_dirMap["/@contents"].length;
         theData.setRawData(&m_contents[offset], length);
-        QString s(theData);
-        QString output;
+        TQString s(theData);
+        TQString output;
 
-        QRegExp object("(.*)", false);
+        TQRegExp object("(.*)", false);
         object.setMinimal(true);
 
-        QRegExp nameParam("", false);
+        TQRegExp nameParam("", false);
         nameParam.setMinimal(true);
 
-        QRegExp localParam("", false);
+        TQRegExp localParam("", false);
         localParam.setMinimal(true);
 
-        QRegExp mergeParam("", false);
+        TQRegExp mergeParam("", false);
         mergeParam.setMinimal(true);
 
         std::stack parents;
@@ -186,8 +186,8 @@ void ChmProtocol::get( const KURL& url )
         while ((pos = s.find(object, pos)) != -1) {
             if(htmlOutput) output += s.mid(old, pos - old);
             if(catalog) {
-                QRegExp ex("
      |
    ", false);    ex.setMinimal(true);
-                QString ms = s.mid(old, pos - old);
+                TQRegExp ex("
      |
    ", false);    ex.setMinimal(true);
+                TQString ms = s.mid(old, pos - old);
                 int pos = 0;
                 while( (pos = ms.find(ex, pos)) != -1) {
                     if(ms.mid(pos, 4) == "
      ") {
@@ -204,8 +204,8 @@ void ChmProtocol::get( const KURL& url )
             }
             pos += object.matchedLength();
             old = pos;
-            QString obj = object.cap(1);
-            QString name, local;
+            TQString obj = object.cap(1);
+            TQString name, local;
             if (obj.find(nameParam) != -1) {
                 name = nameParam.cap(1);
                 if (obj.find(localParam) != -1) {
@@ -220,12 +220,12 @@ void ChmProtocol::get( const KURL& url )
                             ++counter;
                             KURL u = url;
                             u.setPath(bigpath + local);
-                            QString str;
+                            TQString str;
                             output += str.sprintf("%i\n%i\n", parents.top(), current);
                             output += name + "\n" + u.prettyURL() + "\n";
                         }
                         m_bIndex = 1;
-                        if (firstPage == "") firstPage = url.url()+QString::fromLocal8Bit(local.latin1());
+                        if (firstPage == "") firstPage = url.url()+TQString::fromLocal8Bit(local.latin1());
                     }
                     else 
                         if(htmlOutput) output += name;
@@ -234,43 +234,43 @@ void ChmProtocol::get( const KURL& url )
                 }
             }
             if (obj.find(mergeParam) != -1 && htmlOutput) {
-                QString link = mergeParam.cap(1);
-                QString href = link.left(link.find("::"));
-                QString path = m_chmFile.left(m_chmFile.findRev("/") + 1);
+                TQString link = mergeParam.cap(1);
+                TQString href = link.left(link.find("::"));
+                TQString path = m_chmFile.left(m_chmFile.findRev("/") + 1);
                 //output += " (link)";
                 m_bIndex = 1;
                 output += " (link)";
-                if (firstPage == "") firstPage = url.url()+QString::fromLocal8Bit(local.latin1());
+                if (firstPage == "") firstPage = url.url()+TQString::fromLocal8Bit(local.latin1());
             }
         }
         if(htmlOutput) output += s.mid(old);
 
         //set left pane
         //added by lucida, lucida@users.sf.net
-        QString lframe = QString("\n");
+        TQString lframe = TQString("\n");
         lframe += "\n";
         if (!m_bIndex) {
             lframe = "";
-            firstPage = url.url() + QString::fromLocal8Bit(m_strIndex.latin1()); 
+            firstPage = url.url() + TQString::fromLocal8Bit(m_strIndex.latin1()); 
         }
         theData.resetRawData(&m_contents[offset], length);
         //KMimeMagicResult * result = KMimeMagic::self()->findBufferFileType( output, path );
         //kdDebug() << "Emitting mimetype " << result->mimeType() << endl;
         //mimeType( result->mimeType() );
-/*        QCString output1 = (QCString)(output.latin1()); 
+/*        TQCString output1 = (TQCString)(output.latin1()); 
         data(output1); 
         processedSize(output1.length());*/
         
         //construct the frame
         //added by lucida lucida@users.sf.net
-        QString framestr = QString("\n");
+        TQString framestr = TQString("\n");
         framestr += lframe;
         framestr += "\n";
         framestr += "\n";
         framestr += "";
         //write index file
         //added by lucida lucida@users.sf.net
-        *t << QString::fromLocal8Bit(output.latin1()) << endl;
+        *t << TQString::fromLocal8Bit(output.latin1()) << endl;
 
         if(catalog) {
             data(output.local8Bit());
@@ -297,11 +297,11 @@ void ChmProtocol::get( const KURL& url )
 }
 
 /* --------------------------------------------------------------------------- */
-bool ChmProtocol::checkNewFile( QString fullPath, QString& path )
+bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path )
 {
     //kdDebug() << "ChmProtocol::checkNewFile " << fullPath << endl;
 
-    fullPath = fullPath.replace(QRegExp("::"), "");
+    fullPath = fullPath.replace(TQRegExp("::"), "");
 
 	// Are we already looking at that file ?
     if ( !m_chmFile.isEmpty() && fullPath.startsWith(m_chmFile) )
@@ -316,7 +316,7 @@ bool ChmProtocol::checkNewFile( QString fullPath, QString& path )
 
     // Find where the chm file is in the full path
     int pos = 0;
-    QString chmFile;
+    TQString chmFile;
     path = "";
 
     int len = fullPath.length();
@@ -326,10 +326,10 @@ bool ChmProtocol::checkNewFile( QString fullPath, QString& path )
     //kdDebug() << "the full path is " << fullPath << endl;
     while ( (pos=fullPath.find( '/', pos+1 )) != -1 )
     {
-        QString tryPath = fullPath.left( pos );
+        TQString tryPath = fullPath.left( pos );
         //kdDebug() << fullPath << "  trying " << tryPath << endl;
         struct stat statbuf;
-        if ( ::stat( QFile::encodeName(tryPath), &statbuf ) == 0 && !S_ISDIR(statbuf.st_mode) )
+        if ( ::stat( TQFile::encodeName(tryPath), &statbuf ) == 0 && !S_ISDIR(statbuf.st_mode) )
         {
             chmFile = tryPath;
             path = fullPath.mid( pos ).lower();
@@ -342,7 +342,7 @@ bool ChmProtocol::checkNewFile( QString fullPath, QString& path )
             }
             else
             {
-                path = QString::fromLatin1("/");
+                path = TQString::fromLatin1("/");
             }
             kdDebug() << "Found. chmFile=" << chmFile << " path=" << path << endl;
             break;
diff --git a/parts/documentation/protocols/chm/chm.h b/parts/documentation/protocols/chm/chm.h
index ff4bb391..1a1e80ba 100644
--- a/parts/documentation/protocols/chm/chm.h
+++ b/parts/documentation/protocols/chm/chm.h
@@ -17,8 +17,8 @@
 #ifndef __chm_h__
 #define __chm_h__
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -29,16 +29,16 @@ class QCString;
 class ChmProtocol : public KIO::SlaveBase
 {
 public:
-    ChmProtocol( const QCString&, const QCString& );
+    ChmProtocol( const TQCString&, const TQCString& );
     ~ChmProtocol();
 
     void get( const KURL& );
 
 private:
-    bool checkNewFile( QString, QString& );
+    bool checkNewFile( TQString, TQString& );
     ChmDirectoryMap m_dirMap;
-    QByteArray      m_contents;
-    QString         m_chmFile;
+    TQByteArray      m_contents;
+    TQString         m_chmFile;
     Chm             m_chm;
 };
 
diff --git a/parts/documentation/protocols/chm/chmfile.cpp b/parts/documentation/protocols/chm/chmfile.cpp
index 6106d83d..43ae8877 100644
--- a/parts/documentation/protocols/chm/chmfile.cpp
+++ b/parts/documentation/protocols/chm/chmfile.cpp
@@ -14,11 +14,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include 
+#include 
 #include "chmfile.h"
 #include "decompress.h"
 
-uint Chm::getEncInt(QFile& f, uint &value) const
+uint Chm::getEncInt(TQFile& f, uint &value) const
 {
     int c;
     uint result = 0;
@@ -36,32 +36,32 @@ uint Chm::getEncInt(QFile& f, uint &value) const
     return count;
 }
 
-uint Chm::getName(QFile& f, QString& name) const
+uint Chm::getName(TQFile& f, TQString& name) const
 {
     int len = f.getch();
     char *buf = new char[len];
     f.readBlock(buf, len);
-    name = QString::fromUtf8(buf, len);
+    name = TQString::fromUtf8(buf, len);
     if (name.startsWith("/"))
         name = name.lower();
     delete [] buf;
     return len + 1;
 }
 
-uint Chm::getIntel32(QFile& f) const
+uint Chm::getIntel32(TQFile& f) const
 {
     uint value = f.getch() | f.getch() << 8 | f.getch() << 16 | f.getch() << 24;
     return value;
 }
 
-uint Chm::getIntel64(QFile& f) const
+uint Chm::getIntel64(TQFile& f) const
 {
     uint value = getIntel32(f);
     f.at(f.at() + 4);
     return value;
 }
 
-bool Chm::getChunk(QFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) const
+bool Chm::getChunk(TQFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) const
 {
     char tag[4];
     if (f.readBlock(tag, 4) != 4) return false;
@@ -75,7 +75,7 @@ bool Chm::getChunk(QFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) cons
         while (pos < chunkSize - quickref_length)
         {
             uint section, offset, length;
-            QString name;
+            TQString name;
             pos += getName(f, name);
             pos += getEncInt(f, section);
             pos += getEncInt(f, offset);
@@ -98,9 +98,9 @@ bool Chm::getChunk(QFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) cons
     }
 }
 
-bool Chm::read(const QString& fileSpec, ChmDirectoryMap& dirMap, QByteArray& contents) const
+bool Chm::read(const TQString& fileSpec, ChmDirectoryMap& dirMap, TQByteArray& contents) const
 {
-    QFile f(fileSpec);
+    TQFile f(fileSpec);
     if (!f.open(IO_ReadOnly)) return false;
 
     // read CHM file header
diff --git a/parts/documentation/protocols/chm/chmfile.h b/parts/documentation/protocols/chm/chmfile.h
index af89f55a..20e0ea67 100644
--- a/parts/documentation/protocols/chm/chmfile.h
+++ b/parts/documentation/protocols/chm/chmfile.h
@@ -18,8 +18,8 @@
 #define __chmfile_h__
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 class QFile;
 
@@ -34,19 +34,19 @@ struct ChmDirTableEntry
     uint length;
 };
 
-typedef QMap ChmDirectoryMap;
+typedef TQMap ChmDirectoryMap;
 
 class Chm
 {
 public:
-    bool read( const QString&, ChmDirectoryMap&, QByteArray& ) const;
+    bool read( const TQString&, ChmDirectoryMap&, TQByteArray& ) const;
 
 private:
-    bool getChunk( QFile&, uint, ChmDirectoryMap& ) const;
-    uint getEncInt( QFile&, uint& ) const;
-    uint getName( QFile&, QString& ) const;
-    uint getIntel32( QFile& ) const;
-    uint getIntel64( QFile& ) const;
+    bool getChunk( TQFile&, uint, ChmDirectoryMap& ) const;
+    uint getEncInt( TQFile&, uint& ) const;
+    uint getName( TQFile&, TQString& ) const;
+    uint getIntel32( TQFile& ) const;
+    uint getIntel64( TQFile& ) const;
 };
 
 #endif // __chmfile_h__
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index ff6dc9ba..b1d9d166 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "kchmpart.h"
-#include 
+#include 
 
 #include 
 #include 
@@ -35,7 +35,7 @@ extern "C"
 KInstance* KChmPartFactory::s_instance = 0L;
 KAboutData* KChmPartFactory::s_about = 0L;
 
-KChmPartFactory::KChmPartFactory( QObject* parent, const char* name )
+KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name )
    : KParts::Factory( parent, name )
 {
 }
@@ -47,8 +47,8 @@ KChmPartFactory::~KChmPartFactory()
    delete s_about;
 }
 
-KParts::Part* KChmPartFactory::createPartObject( QWidget *parentWidget, const char *, QObject *,
-                                 const char *name, const char *, const QStringList & )
+KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *,
+                                 const char *name, const char *, const TQStringList & )
 {
    KChmPart* part = new KChmPart( parentWidget, name );
    return part;
@@ -66,7 +66,7 @@ KInstance* KChmPartFactory::instance()
 }
 
 
-KChmPart::KChmPart( QWidget * parent, const char * name )
+KChmPart::KChmPart( TQWidget * parent, const char * name )
 	: KDevHTMLPart(  ), m_job(0)
 {
    KInstance * instance = new KInstance( "kchmpart" );
@@ -100,13 +100,13 @@ bool KChmPart::openFile()
 
    m_htmlData.truncate(0);
 
-   m_job = KIO::get( QString("chm:")+m_file+"/", true, false );
-   connect( m_job, SIGNAL( data( KIO::Job *, const QByteArray &) ), SLOT( readData( KIO::Job *, const QByteArray &) ) );
-   connect( m_job, SIGNAL( result( KIO::Job * ) ), SLOT( jobDone( KIO::Job * ) ) );
+   m_job = KIO::get( TQString("chm:")+m_file+"/", true, false );
+   connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( KIO::Job *, const TQByteArray &) ) );
+   connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( jobDone( KIO::Job * ) ) );
    return true;
 }
 
-void KChmPart::readData(KIO::Job * , const QByteArray & data)
+void KChmPart::readData(KIO::Job * , const TQByteArray & data)
 {
     m_htmlData += data;
 }
@@ -115,7 +115,7 @@ void KChmPart::jobDone( KIO::Job *)
 {
    m_job=0;
    begin();
-   write(QString::fromLocal8Bit(m_htmlData));
+   write(TQString::fromLocal8Bit(m_htmlData));
    end();
 }
 */
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 28041bc3..023f8ed9 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 class KInstance;
 class KAboutData;
@@ -34,13 +34,13 @@ class KChmPartFactory: public KParts::Factory
 {
    Q_OBJECT
    public:
-      KChmPartFactory( QObject *parent = 0, const char *name = 0 );
+      KChmPartFactory( TQObject *parent = 0, const char *name = 0 );
       virtual ~KChmPartFactory();
 
       virtual KParts::Part* createPartObject(
-		  QWidget *parentWidget, const char *widgetName,
-          QObject *parent, const char *name,
-		  const char *classname, const QStringList &args );
+		  TQWidget *parentWidget, const char *widgetName,
+          TQObject *parent, const char *name,
+		  const char *classname, const TQStringList &args );
 
       static KInstance *instance();
 
@@ -55,14 +55,14 @@ class KChmPart : public KDevHTMLPart
 {
    Q_OBJECT
    public:
-      KChmPart( QWidget *, const char * = 0 );
+      KChmPart( TQWidget *, const char * = 0 );
       KParts::BrowserExtension * extension() { return m_extension; }
 
    public slots:
       virtual bool openURL( const KURL & );
 /*
    protected slots:
-      void readData(KIO::Job * , const QByteArray & data);
+      void readData(KIO::Job * , const TQByteArray & data);
       void jobDone( KIO::Job *);
 */
    protected:
@@ -70,7 +70,7 @@ class KChmPart : public KDevHTMLPart
       KInstance *m_instance;
       KParts::BrowserExtension *m_extension;
       KIO::TransferJob *m_job;
-      QCString m_htmlData;
+      TQCString m_htmlData;
 
    protected slots:
       virtual void slotDuplicate();
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 66ac48f7..c7b2305a 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -23,12 +23,12 @@
  ***************************************************************************/
 #include "searchview.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -49,66 +49,66 @@
 #include "documentation_part.h"
 #include "docutils.h"
 
-SearchView::SearchView(DocumentationPart *part, QWidget *parent, const char *name)
-    :QWidget(parent, name), m_part(part)
+SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *name)
+    :TQWidget(parent, name), m_part(part)
 {
-    QVBoxLayout *l = new QVBoxLayout(this, 0, KDialog::spacingHint());
+    TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
-    QVBoxLayout *l2 = new QVBoxLayout(l, 0);
-    QLabel *editLabel = new QLabel(i18n("Wor&ds to search:"), this);
+    TQVBoxLayout *l2 = new TQVBoxLayout(l, 0);
+    TQLabel *editLabel = new TQLabel(i18n("Wor&ds to search:"), this);
     l2->addWidget(editLabel);
-    QHBoxLayout *l21 = new QHBoxLayout(l2, 0);
+    TQHBoxLayout *l21 = new TQHBoxLayout(l2, 0);
     m_edit = new KLineEdit(this);
     editLabel->setBuddy(m_edit);
     m_goSearchButton = new KPushButton(i18n("Se&arch"), this);
     l21->addWidget(m_edit);
     l21->addWidget(m_goSearchButton);
 
-    QGridLayout *l3 = new QGridLayout(l, 2, 2, 0);
+    TQGridLayout *l3 = new TQGridLayout(l, 2, 2, 0);
     m_searchMethodBox = new KComboBox(this);
     m_searchMethodBox->insertItem(i18n("and"));
     m_searchMethodBox->insertItem(i18n("or"));
-    QLabel *smLabel = new QLabel(m_searchMethodBox, i18n("&Method:"), this);
+    TQLabel *smLabel = new TQLabel(m_searchMethodBox, i18n("&Method:"), this);
     m_sortMethodBox = new KComboBox(this);
     m_sortMethodBox->insertItem(i18n("Score"));
     m_sortMethodBox->insertItem(i18n("Title"));
     m_sortMethodBox->insertItem(i18n("Date"));
-    QLabel *rmLabel = new QLabel(m_sortMethodBox, i18n("S&ort by:"), this);
+    TQLabel *rmLabel = new TQLabel(m_sortMethodBox, i18n("S&ort by:"), this);
     l3->addWidget(smLabel, 0, 0);
     l3->addWidget(m_searchMethodBox, 0, 1);
     l3->addWidget(rmLabel, 1, 0);
     l3->addWidget(m_sortMethodBox, 1, 1);
 
-    QVBoxLayout *l4 = new QVBoxLayout(l, 0);
+    TQVBoxLayout *l4 = new TQVBoxLayout(l, 0);
     m_view = new KListView(this);
-    QLabel *vLabel = new QLabel(m_view, i18n("Search &results:"), this);
+    TQLabel *vLabel = new TQLabel(m_view, i18n("Search &results:"), this);
     l4->addWidget(vLabel);
     l4->addWidget(m_view);
 
-    QHBoxLayout *l5 = new QHBoxLayout(l, KDialog::spacingHint());
+    TQHBoxLayout *l5 = new TQHBoxLayout(l, KDialog::spacingHint());
     m_configButton = new KPushButton(i18n("Update Config"), this);
     m_indexButton = new KPushButton(i18n("Update Index"), this);
     l5->addWidget(m_configButton);
     l5->addWidget(m_indexButton);
-    l5->addItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Fixed));
+    l5->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 
     l->addSpacing(2);
 
     m_view->setSorting(-1);
     m_view->addColumn(i18n("Relevance"));
     m_view->addColumn(i18n("Title"));
-    m_view->setColumnWidthMode(0, QListView::Maximum);
-    m_view->setColumnWidthMode(1, QListView::Maximum);
+    m_view->setColumnWidthMode(0, TQListView::Maximum);
+    m_view->setColumnWidthMode(1, TQListView::Maximum);
     m_view->setAllColumnsShowFocus(true);
-    m_view->setResizeMode( QListView::LastColumn );
-
-    connect(m_configButton, SIGNAL(clicked()), this, SLOT(updateConfig()));
-    connect(m_indexButton, SIGNAL(clicked()), this, SLOT(updateIndex()));
-    connect(m_edit, SIGNAL(returnPressed()), this, SLOT(search()));
-    connect(m_goSearchButton, SIGNAL(clicked()), this, SLOT(search()));
-    connect(m_view, SIGNAL(executed(QListViewItem*)), this, SLOT(executed(QListViewItem*)));
-    connect(m_view, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int )),
-        this, SLOT(itemMouseButtonPressed(int, QListViewItem*, const QPoint&, int )));
+    m_view->setResizeMode( TQListView::LastColumn );
+
+    connect(m_configButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateConfig()));
+    connect(m_indexButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateIndex()));
+    connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(search()));
+    connect(m_goSearchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(search()));
+    connect(m_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(executed(TQListViewItem*)));
+    connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )),
+        this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )));
 }
 
 SearchView::~SearchView()
@@ -129,15 +129,15 @@ void SearchView::updateIndex()
     config->sync();
 }
 
-void SearchView::runHtdig(const QString &arg)
+void SearchView::runHtdig(const TQString &arg)
 {
     KProcess proc;
     proc << "kdevelop-htdig" << arg;
     proc.start(KProcess::DontCare);
 }
 
-void qt_enter_modal(QWidget *widget);
-void qt_leave_modal(QWidget *widget);
+void qt_enter_modal(TQWidget *widget);
+void qt_leave_modal(TQWidget *widget);
 
 void SearchView::search()
 {
@@ -152,7 +152,7 @@ void SearchView::search()
         updateIndex();
         return;
     }
-    QString exe = config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch"));
+    TQString exe = config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch"));
     if (exe.isEmpty())
     {
         KMessageBox::error(this, i18n("Cannot find the htsearch executable.\nIt is part of the ht://Dig package that is used by KDevelop to perform full text search. Please install ht://Dig and use Documentation page in Configure KDevelop dialog to set the htsearch location."));
@@ -160,16 +160,16 @@ void SearchView::search()
         return;
     }
 
-    QString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
-    QDir d;
-    if (indexdir.isEmpty() || !QFile::exists(indexdir + "/htdig.conf"))
+    TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
+    TQDir d;
+    if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf"))
     {
-        if (QFile::exists("/var/lib/kdevelop3/helpindex/htdig.conf"))
+        if (TQFile::exists("/var/lib/kdevelop3/helpindex/htdig.conf"))
             indexdir = "/var/lib/kdevelop3/helpindex";
-        else if (QFile::exists("/var/lib/kdevelop/helpindex/htdig.conf"))
+        else if (TQFile::exists("/var/lib/kdevelop/helpindex/htdig.conf"))
             indexdir = "/var/lib/kdevelop/helpindex";
 
-        if (!QFile::exists(indexdir + "/htdig.conf"))
+        if (!TQFile::exists(indexdir + "/htdig.conf"))
         {
             KMessageBox::error(this, i18n("Cannot find the htdig configuration file."));
             kdDebug() << "Cannot find the htdig configuration file" << endl;
@@ -177,11 +177,11 @@ void SearchView::search()
         }
     }
 
-    QString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
+    TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
     if (!d.exists(savedir))
         d.mkdir(savedir);
 
-    QString query = QString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5")
+    TQString query = TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5")
         .arg(m_edit->text())
         .arg(m_searchMethodBox->currentItem()==1? "or" : "and")
         .arg(50)
@@ -191,14 +191,14 @@ void SearchView::search()
     kdDebug(9002) << "starting kprocess" << endl;
     kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query <<  endl;
     KProcess *proc = new KProcess;
-    QString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png");
+    TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png");
     proc->setEnvironment("PICDIR", picdir);
     *proc << exe << "-c" << (indexdir + "/htdig.conf") << query;
 
-    connect( proc, SIGNAL(receivedStdout(KProcess *,char*,int)),
-             this, SLOT(htsearchStdout(KProcess *,char*,int)) );
-    connect( proc, SIGNAL(processExited(KProcess *)),
-             this, SLOT(htsearchExited(KProcess *)) );
+    connect( proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
+             this, TQT_SLOT(htsearchStdout(KProcess *,char*,int)) );
+    connect( proc, TQT_SIGNAL(processExited(KProcess *)),
+             this, TQT_SLOT(htsearchExited(KProcess *)) );
 
     searchResult = "";
 
@@ -214,7 +214,7 @@ void SearchView::search()
     // to block the user interface, but still get repaint
     // events. Hack taken from NetAccess...
     kapp->setOverrideCursor(waitCursor);
-    QWidget blocker(0, 0, WType_Dialog | WShowModal);
+    TQWidget blocker(0, 0, WType_Dialog | WShowModal);
     qt_enter_modal(&blocker);
     kapp->enter_loop();
     qt_leave_modal(&blocker);
@@ -230,14 +230,14 @@ void SearchView::search()
     delete proc;
 
     // modify the search result
-    searchResult = searchResult.replace(QRegExp("http://localhost/"), "file:/");
-    searchResult = searchResult.replace(QRegExp("Content-type: text/html"), "");
+    searchResult = searchResult.replace(TQRegExp("http://localhost/"), "file:/");
+    searchResult = searchResult.replace(TQRegExp("Content-type: text/html"), "");
 
     // dump the search result
-    QFile f(savedir + "/results.html");
+    TQFile f(savedir + "/results.html");
     if (f.open(IO_WriteOnly))
     {
-        QTextStream ts(&f);
+        TQTextStream ts(&f);
         ts << searchResult << endl;
         f.close();
     }
@@ -249,7 +249,7 @@ void SearchView::search()
 
 void SearchView::htsearchStdout(KProcess *, char *buffer, int len)
 {
-    searchResult += QString::fromLocal8Bit(buffer, len);
+    searchResult += TQString::fromLocal8Bit(buffer, len);
 }
 
 void SearchView::htsearchExited(KProcess *)
@@ -260,23 +260,23 @@ void SearchView::htsearchExited(KProcess *)
 void SearchView::analyseSearchResults()
 {
     m_view->clear();
-    QTextStream str(searchResult, IO_ReadOnly);
+    TQTextStream str(searchResult, IO_ReadOnly);
     DocumentationItem *former = 0;
     while (!str.eof())
     {
-        QString line = str.readLine();
+        TQString line = str.readLine();
 
-        QRegExp starsExp("alt=\"\\*\"");
+        TQRegExp starsExp("alt=\"\\*\"");
         starsExp.setMinimal(true);
         int stars = line.contains(starsExp);
 
-        QRegExp urlExp("(.*)");
+        TQRegExp urlExp("(.*)");
         if (urlExp.search(line)==-1)
             continue;
-        QString url = urlExp.cap(1);
-        QString title = urlExp.cap(2);
+        TQString url = urlExp.cap(1);
+        TQString title = urlExp.cap(2);
 
-        QString starsStr;
+        TQString starsStr;
         for (int i = 0; i < stars; ++i)
             starsStr += "*";
 
@@ -291,7 +291,7 @@ void SearchView::analyseSearchResults()
     executed( m_view->firstChild() );
 }
 
-void SearchView::executed(QListViewItem *item)
+void SearchView::executed(TQListViewItem *item)
 {
     DocumentationItem *d = dynamic_cast(item);
     if (!d)
@@ -300,7 +300,7 @@ void SearchView::executed(QListViewItem *item)
     m_part->partController()->showDocument(d->url());
 }
 
-void SearchView::itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int // c
+void SearchView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c
                                         )
 {
     if ((button != Qt::RightButton) || (!item))
@@ -312,7 +312,7 @@ void SearchView::itemMouseButtonPressed(int button, QListViewItem *item, const Q
     DocUtils::docItemPopup(m_part, docItem, pos, true, false, 1);
 }
 
-void SearchView::setSearchTerm(const QString &term)
+void SearchView::setSearchTerm(const TQString &term)
 {
     m_edit->setText(term);
 }
@@ -322,7 +322,7 @@ void SearchView::askSearchTerm()
     m_edit->setFocus();
 }
 
-void SearchView::focusInEvent(QFocusEvent */*e*/)
+void SearchView::focusInEvent(TQFocusEvent */*e*/)
 {
     m_edit->setFocus();
 }
diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h
index a57ddd83..32b5f310 100644
--- a/parts/documentation/searchview.h
+++ b/parts/documentation/searchview.h
@@ -20,7 +20,7 @@
 #ifndef SEARCHVIEW_H
 #define SEARCHVIEW_H
 
-#include 
+#include 
 
 class DocumentationPart;
 class KLineEdit;
@@ -34,12 +34,12 @@ class SearchView: public QWidget
 {
     Q_OBJECT
 public:
-    SearchView(DocumentationPart *part, QWidget *parent = 0, const char *name = 0);
+    SearchView(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0);
     ~SearchView();
     
 public slots:
     void search();
-    void setSearchTerm(const QString &term);
+    void setSearchTerm(const TQString &term);
     void askSearchTerm();
     
 protected slots:
@@ -48,14 +48,14 @@ protected slots:
 
     void htsearchStdout(KProcess *, char *buffer, int len);
     void htsearchExited(KProcess *);
-    void executed(QListViewItem *item);
+    void executed(TQListViewItem *item);
     
-    void itemMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int c);
+    void itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int c);
 
 protected:
-    virtual void focusInEvent(QFocusEvent *e);
+    virtual void focusInEvent(TQFocusEvent *e);
     
-    void runHtdig(const QString &arg);
+    void runHtdig(const TQString &arg);
     void analyseSearchResults();
 
 private:
@@ -69,7 +69,7 @@ private:
     KPushButton *m_indexButton;
     KPushButton *m_goSearchButton;
     
-    QString searchResult;
+    TQString searchResult;
 };
 
 #endif
diff --git a/parts/documentation/selecttopic.cpp b/parts/documentation/selecttopic.cpp
index da3fd2e7..4dab4d83 100644
--- a/parts/documentation/selecttopic.cpp
+++ b/parts/documentation/selecttopic.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "selecttopic.h"
 
-SelectTopic::SelectTopic(IndexItem::List &urls, QWidget *parent, const char *name)
+SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *parent, const char *name)
     :SelectTopicBase(parent, name), m_urls(urls)
 {
     for (IndexItem::List::const_iterator it = m_urls.begin(); it != m_urls.end(); ++it)
@@ -36,7 +36,7 @@ void SelectTopic::accept()
     if (topicBox->currentItem() == -1)
         return;
     else
-        return QDialog::accept();
+        return TQDialog::accept();
 }
 
 KURL SelectTopic::selectedURL()
diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h
index ef66ccd7..fdddbf4c 100644
--- a/parts/documentation/selecttopic.h
+++ b/parts/documentation/selecttopic.h
@@ -27,7 +27,7 @@
 class SelectTopic: public SelectTopicBase{
 Q_OBJECT
 public:
-    SelectTopic(IndexItem::List &urls, QWidget *parent = 0, const char *name = 0);
+    SelectTopic(IndexItem::List &urls, TQWidget *parent = 0, const char *name = 0);
     KURL selectedURL();
 
 public slots:
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index 80161301..63e21888 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -16,13 +16,13 @@
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -39,14 +39,14 @@
 
 #define INDEXER
 
-ProgressDialog::ProgressDialog(bool index, QWidget *parent, const char *name)
+ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name)
     :KDialogBase(KDialogBase::Plain, i18n("Generating Search Index"), Cancel | Ok, Close,
     parent, name, false)
 {
     proc = 0;
 
     indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
-    QDir d; d.mkdir(indexdir);
+    TQDir d; d.mkdir(indexdir);
 
     KConfig config("kdevdocumentation", true);
     config.setGroup("htdig");
@@ -58,39 +58,39 @@ ProgressDialog::ProgressDialog(bool index, QWidget *parent, const char *name)
     d.mkdir( databaseDir );
 
     showButtonOK( false );
-    QGridLayout *grid = new QGridLayout(plainPage(), 5,3, spacingHint());
+    TQGridLayout *grid = new TQGridLayout(plainPage(), 5,3, spacingHint());
 
-    QLabel *l = new QLabel(i18n("Scanning for files"), plainPage());
+    TQLabel *l = new TQLabel(i18n("Scanning for files"), plainPage());
     grid->addMultiCellWidget(l, 0, 0, 1, 2);
 
-    filesLabel = new QLabel(plainPage());
+    filesLabel = new TQLabel(plainPage());
     grid->addWidget(filesLabel, 1, 2);
     setFilesScanned(0);
 
-    check1 = new QLabel(plainPage());
+    check1 = new TQLabel(plainPage());
     grid->addWidget(check1, 0, 0);
 
-    l = new QLabel(i18n("Extracting search terms"), plainPage());
+    l = new TQLabel(i18n("Extracting search terms"), plainPage());
     grid->addMultiCellWidget(l, 2,2, 1,2);
 
     bar = new KProgress(plainPage());
     grid->addWidget(bar, 3,2);
 
-    check2 = new QLabel(plainPage());
+    check2 = new TQLabel(plainPage());
     grid->addWidget(check2, 2,0);
 
-    l = new QLabel(i18n("Generating index..."), plainPage());
+    l = new TQLabel(i18n("Generating index..."), plainPage());
     grid->addMultiCellWidget(l, 4,4, 1,2);
 
-    check3 = new QLabel(plainPage());
+    check3 = new TQLabel(plainPage());
     grid->addWidget(check3, 4,0);
 
     setState(0);
 
     setMinimumWidth(300);
-    connect(this, SIGNAL(cancelClicked()), this, SLOT(cancelClicked()));
-    connect(this, SIGNAL(okClicked()), this, SLOT(okClicked()));
-    QTimer::singleShot(0, this, SLOT(slotDelayedStart()));
+    connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()));
+    connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
+    TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedStart()));
 }
 
 ProgressDialog::~ProgressDialog()
@@ -137,8 +137,8 @@ void ProgressDialog::setFilesDigged(int n)
 
 void ProgressDialog::setState(int n)
 {
-    QPixmap unchecked = QPixmap(locate("data", "kdevdocumentation/pics/unchecked.xpm"));
-    QPixmap checked = QPixmap(locate("data", "kdevdocumentation/pics/checked.xpm"));
+    TQPixmap unchecked = TQPixmap(locate("data", "kdevdocumentation/pics/unchecked.xpm"));
+    TQPixmap checked = TQPixmap(locate("data", "kdevdocumentation/pics/checked.xpm"));
 
     check1->setPixmap( n > 0 ? checked : unchecked);
     check2->setPixmap( n > 1 ? checked : unchecked);
@@ -146,13 +146,13 @@ void ProgressDialog::setState(int n)
 }
 
 
-void ProgressDialog::addDir(const QString &dir)
+void ProgressDialog::addDir(const TQString &dir)
 {
     kdDebug(9002) << "Add dir : " << dir << endl;
-    QDir d(dir, "*.html", QDir::Name|QDir::IgnoreCase, QDir::Files | QDir::Readable);
-    QStringList list = d.entryList();
+    TQDir d(dir, "*.html", TQDir::Name|TQDir::IgnoreCase, TQDir::Files | TQDir::Readable);
+    TQStringList list = d.entryList();
 
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for ( it=list.begin(); it!=list.end(); ++it )
     {
         if( (*it).right( 12 ).lower( ) == "-source.html" )
@@ -162,8 +162,8 @@ void ProgressDialog::addDir(const QString &dir)
         setFilesScanned(++filesScanned);
     }
 
-    QDir d2(dir, QString::null, QDir::Name|QDir::IgnoreCase, QDir::Dirs);
-    QStringList dlist = d2.entryList();
+    TQDir d2(dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs);
+    TQStringList dlist = d2.entryList();
 
     for ( it=dlist.begin(); it != dlist.end(); ++it )
     {
@@ -182,21 +182,21 @@ void ProgressDialog::addDir(const QString &dir)
 
 void ProgressDialog::scanDirectories()
 {
-    QString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
+    TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
 
-    QFile f(ftsLocationsFile);
+    TQFile f(ftsLocationsFile);
     if (!f.open(IO_ReadOnly))
         return;
-    QTextStream str(&f);
+    TQTextStream str(&f);
 
     filesScanned = 0;
 
     while (!str.eof())
     {
-        QString loc = str.readLine();
+        TQString loc = str.readLine();
         if (loc.isEmpty())
             continue;
-        QFileInfo fi(loc);
+        TQFileInfo fi(loc);
         if (fi.isDir())
             addDir(loc);
         else if (fi.isFile())
@@ -210,27 +210,27 @@ void ProgressDialog::scanDirectories()
 bool ProgressDialog::createConfig()
 {
     // locate the common dir
-    QString language = KGlobal::locale()->language();
+    TQString language = KGlobal::locale()->language();
     if (language == "C")
         language = "en";
 
-    QString wrapper = locate("data", QString("kdevdocumentation/%1/wrapper.html").arg(language));
+    TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language));
     if (wrapper.isEmpty())
-        wrapper = locate("data", QString("kdevdocumentation/en/wrapper.html"));
+        wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html"));
     if (wrapper.isEmpty())
         return false;
     wrapper = wrapper.left(wrapper.length()-12);
 
     // locate the image dir
-    QString images = locate("data", "kdevdocumentation/pics/star.png");
+    TQString images = locate("data", "kdevdocumentation/pics/star.png");
     if (images.isEmpty())
         return false;
     images = images.left(images.length()-8);
 
-    QFile f(indexdir + "/htdig.conf");
+    TQFile f(indexdir + "/htdig.conf");
     if (f.open(IO_WriteOnly))
     {
-        QTextStream ts(&f);
+        TQTextStream ts(&f);
 
         ts << "database_dir:\t\t" << databaseDir << endl;
         ts << "start_url:\t\t`" << indexdir << "/files`" << endl;
@@ -268,19 +268,19 @@ void ProgressDialog::startHtdigProcess(bool initial)
     if (initial) {
         *proc << "-i";
     }
-    connect(proc, SIGNAL(processExited(KProcess *)),
-            this, SLOT(htdigExited(KProcess *)));
+    connect(proc, TQT_SIGNAL(processExited(KProcess *)),
+            this, TQT_SLOT(htdigExited(KProcess *)));
 
     htdigRunning = true;
 
     // write out file
-    QFile f(indexdir+"/files");
+    TQFile f(indexdir+"/files");
     if (!f.open(IO_WriteOnly)) {
         kdDebug(9002) << "Could not open `files` for writing" << endl;
         done(1);
         return;
     }
-    QTextStream ts(&f);
+    TQTextStream ts(&f);
     for (int i=0; i= filesToDig) {
             procdone = true;
@@ -313,14 +313,14 @@ bool ProgressDialog::generateIndex()
     setFilesToDig(filesToDig);
     filesDigged = 0;
 
-    //    QDir d; d.mkdir(indexdir);
+    //    TQDir d; d.mkdir(indexdir);
     startHtdigProcess(true);
     return true;
 }
 
 void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len)
 {
-    QString line = QString(buffer).left(len);
+    TQString line = TQString(buffer).left(len);
 
     int cnt=0, index=-1;
     while ( (index = line.find("http://", index+1)) > 0)
@@ -387,8 +387,8 @@ void ProgressDialog::startHtmergeProcess()
 
     kdDebug(9002) << "Running htmerge" << endl;
 
-    connect(proc, SIGNAL(processExited(KProcess *)),
-            this, SLOT(htmergeExited(KProcess *)));
+    connect(proc, TQT_SIGNAL(processExited(KProcess *)),
+            this, TQT_SLOT(htmergeExited(KProcess *)));
 
     htmergeRunning = true;
 
diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h
index eec8b595..d9fc3232 100644
--- a/parts/documentation/tools/htdig/htdigindex.h
+++ b/parts/documentation/tools/htdig/htdigindex.h
@@ -26,10 +26,10 @@ class ProgressDialog : public KDialogBase
 {
     Q_OBJECT
 public:
-    ProgressDialog(bool index, QWidget *parent=0, const char *name=0);
+    ProgressDialog(bool index, TQWidget *parent=0, const char *name=0);
     ~ProgressDialog();
 
-    void addDir(const QString &dir);
+    void addDir(const TQString &dir);
     void scanDirectories();
     bool createConfig();
     bool generateIndex();
@@ -51,15 +51,15 @@ private:
     void startHtdigProcess(bool initial);
     void startHtmergeProcess();
 
-    QLabel *filesLabel, *check1, *check2, *check3;
+    TQLabel *filesLabel, *check1, *check2, *check3;
     KProgress *bar;
 
     int count;
     bool procdone;
-    QString databaseDir;
-    QString indexdir;
-    QString exe;
-    QStringList files;
+    TQString databaseDir;
+    TQString indexdir;
+    TQString exe;
+    TQStringList files;
     KProcess *proc;
     volatile int filesToDig, filesDigged, filesScanned;
     bool htdigRunning, htmergeRunning;
diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp
index a36cf682..de582013 100644
--- a/parts/doxygen/config.cpp
+++ b/parts/doxygen/config.cpp
@@ -547,12 +547,12 @@ char *yytext;
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
   
 #include "config.h"
 #include "version.h"
@@ -593,14 +593,14 @@ void config_warn(const char *fmt, ...)
 /* -----------------------------------------------------------------
  */
 
-QCString ConfigOption::convertToComment(const QCString &s)
+TQCString ConfigOption::convertToComment(const TQCString &s)
 {
-  QCString result;
+  TQCString result;
   if (s.isEmpty()) return result;
   else
   {
     result+="# ";
-    QCString tmp=s.stripWhiteSpace();
+    TQCString tmp=s.stripWhiteSpace();
     char *p=tmp.data();
     char c;
     while ((c=*p++))
@@ -613,17 +613,17 @@ QCString ConfigOption::convertToComment(const QCString &s)
   return result;
 }
 
-void ConfigOption::writeBoolValue(QTextStream &t,bool v)
+void ConfigOption::writeBoolValue(TQTextStream &t,bool v)
 {
   if (v) t << "YES"; else t << "NO";
 }
 
-void ConfigOption::writeIntValue(QTextStream &t,int i)
+void ConfigOption::writeIntValue(TQTextStream &t,int i)
 {
   t << i;
 }
 
-void ConfigOption::writeStringValue(QTextStream &t,QCString &s)
+void ConfigOption::writeStringValue(TQTextStream &t,TQCString &s)
 {
   const char *p=s.data();
   char c;
@@ -650,13 +650,13 @@ void ConfigOption::writeStringValue(QTextStream &t,QCString &s)
   }
 }
 
-void ConfigOption::writeStringList(QTextStream &t,QStrList &l)
+void ConfigOption::writeStringList(TQTextStream &t,TQStrList &l)
 {
   const char *p = l.first();
   bool first=TRUE;
   while (p)
   {
-    QCString s=p;
+    TQCString s=p;
     if (!first) t << "                         ";
     first=FALSE;
     writeStringValue(t,s);
@@ -687,7 +687,7 @@ void ConfigInt::convertStrToVal()
 
 void ConfigBool::convertStrToVal()
 {
-  QCString val = m_valueString.stripWhiteSpace().lower();
+  TQCString val = m_valueString.stripWhiteSpace().lower();
   if (!val.isEmpty())
   {
     if (val=="yes" || val=="true" || val=="1") 
@@ -706,7 +706,7 @@ void ConfigBool::convertStrToVal()
   }
 }
 
-QCString &Config::getString(const char *fileName,int num,const char *name) const
+TQCString &Config::getString(const char *fileName,int num,const char *name) const
 {
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
@@ -722,7 +722,7 @@ QCString &Config::getString(const char *fileName,int num,const char *name) const
   return *((ConfigString *)opt)->valueRef();
 }
 
-QStrList &Config::getList(const char *fileName,int num,const char *name) const
+TQStrList &Config::getList(const char *fileName,int num,const char *name) const
 {
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
@@ -738,7 +738,7 @@ QStrList &Config::getList(const char *fileName,int num,const char *name) const
   return *((ConfigList *)opt)->valueRef();
 }
 
-QCString &Config::getEnum(const char *fileName,int num,const char *name) const
+TQCString &Config::getEnum(const char *fileName,int num,const char *name) const
 {
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
@@ -797,31 +797,31 @@ struct ConfigFileState
   FILE *filePtr;
   YY_BUFFER_STATE oldState;
   YY_BUFFER_STATE newState;
-  QCString fileName;
+  TQCString fileName;
 };  
 
 static const char       *inputString;
 static int	         inputPosition;
 static int               yyLineNr;
-static QCString          yyFileName;
-static QCString          tmpString;
-static QCString         *s=0;
+static TQCString          yyFileName;
+static TQCString          tmpString;
+static TQCString         *s=0;
 static bool             *b=0;
-static QStrList         *l=0;
+static TQStrList         *l=0;
 static int               lastState;
-static QCString          elemStr;
-static QCString          includeName;
-static QStrList          includePathList;
-static QPtrStack includeStack;
+static TQCString          elemStr;
+static TQCString          includeName;
+static TQStrList          includePathList;
+static TQPtrStack includeStack;
 static int               includeDepth;
 
-static QCString     tabSizeString;
-static QCString     maxInitLinesString;
-static QCString     colsInAlphaIndexString;
-static QCString     enumValuesPerLineString;
-static QCString     treeViewWidthString;
-static QCString     maxDotGraphWidthString;
-static QCString     maxDotGraphHeightString;
+static TQCString     tabSizeString;
+static TQCString     maxInitLinesString;
+static TQCString     colsInAlphaIndexString;
+static TQCString     enumValuesPerLineString;
+static TQCString     treeViewWidthString;
+static TQCString     maxDotGraphWidthString;
+static TQCString     maxDotGraphHeightString;
 
 static Config      *config;
 
@@ -854,8 +854,8 @@ static int yyread(char *buf,int max_size)
 
 static FILE *tryPath(const char *path,const char *fileName)
 {
-  QCString absName=(path ? (QCString)path+"/"+fileName : (QCString)fileName);
-  QFileInfo fi(absName);
+  TQCString absName=(path ? (TQCString)path+"/"+fileName : (TQCString)fileName);
+  TQFileInfo fi(absName);
   if (fi.exists() && fi.isFile())
   {
     FILE *f=fopen(absName,"r");
@@ -865,8 +865,8 @@ static FILE *tryPath(const char *path,const char *fileName)
   return 0;
 }
 
-static void substEnvVarsInStrList(QStrList &sl);
-static void substEnvVarsInString(QCString &s);
+static void substEnvVarsInStrList(TQStrList &sl);
+static void substEnvVarsInString(TQCString &s);
 
 static bool isAbsolute(const char * fileName)
 {
@@ -909,7 +909,7 @@ static void readIncludeFile(const char *incName)
     exit(1);
   } 
 
-  QCString inc = incName;
+  TQCString inc = incName;
   substEnvVarsInString(inc);
   inc = inc.stripWhiteSpace();
   uint incLen = inc.length();
@@ -1217,7 +1217,7 @@ YY_RULE_SETUP
 case 3:
 YY_RULE_SETUP
 #line 429 "config.l"
-{ QCString cmd=yytext;
+{ TQCString cmd=yytext;
                                            cmd=cmd.left(cmd.length()-1).stripWhiteSpace(); 
 					   ConfigOption *option = config->get(cmd);
 					   if (option==0) // oops not known
@@ -1273,7 +1273,7 @@ YY_RULE_SETUP
 case 4:
 YY_RULE_SETUP
 #line 481 "config.l"
-{ QCString cmd=yytext;
+{ TQCString cmd=yytext;
                                           cmd=cmd.left(cmd.length()-2).stripWhiteSpace(); 
 					  ConfigOption *option = config->get(cmd);
 					  if (option==0) // oops not known
@@ -1446,7 +1446,7 @@ case 17:
 YY_RULE_SETUP
 #line 590 "config.l"
 { 
-  					  QCString bs=yytext; 
+  					  TQCString bs=yytext; 
   					  bs=bs.upper();
   					  if (bs=="YES" || bs=="1")
 					    *b=TRUE;
@@ -2388,17 +2388,17 @@ int main()
  */
 
 #if 0
-static void writeBoolValue(QTextStream &t,bool v)
+static void writeBoolValue(TQTextStream &t,bool v)
 {
   if (v) t << "YES"; else t << "NO";
 }
 
-static void writeIntValue(QTextStream &t,int i)
+static void writeIntValue(TQTextStream &t,int i)
 {
   t << i;
 }
 
-static void writeStringValue(QTextStream &t,QCString &s)
+static void writeStringValue(TQTextStream &t,TQCString &s)
 {
   const char *p=s.data();
   char c;
@@ -2413,7 +2413,7 @@ static void writeStringValue(QTextStream &t,QCString &s)
   }
 }
 
-static void writeStringList(QTextStream &t,QStrList &l)
+static void writeStringList(TQTextStream &t,TQStrList &l)
 {
   const char *p = l.first();
   bool first=TRUE;
@@ -2432,7 +2432,7 @@ static void writeStringList(QTextStream &t,QStrList &l)
 }
 #endif
 
-void Config::writeTemplate(QTextStream &t,bool sl,bool upd)
+void Config::writeTemplate(TQTextStream &t,bool sl,bool upd)
 {
   t << "# Doxyfile " << versionString << endl << endl;
   if (!sl)
@@ -2465,9 +2465,9 @@ void Config::convertStrToVal()
   }
 }
 
-static void substEnvVarsInString(QCString &s)
+static void substEnvVarsInString(TQCString &s)
 {
-  static QRegExp re("\\$\\([a-z_A-Z0-9]+\\)");
+  static TQRegExp re("\\$\\([a-z_A-Z0-9]+\\)");
   if (s.isEmpty()) return;
   int p=0;
   int i,l;
@@ -2476,7 +2476,7 @@ static void substEnvVarsInString(QCString &s)
   {
     l = re.matchedLength();
     //printf("Found environment var s.mid(%d,%d)=`%s'\n",i+2,l-3,s.mid(i+2,l-3).data());
-    QCString env=getenv(s.mid(i+2,l-3));
+    TQCString env=getenv(s.mid(i+2,l-3));
     substEnvVarsInString(env); // recursively expand variables if needed.
     s = s.left(i)+env+s.right(s.length()-i-l);
     p=i+env.length(); // next time start at the end of the expanded string
@@ -2486,12 +2486,12 @@ static void substEnvVarsInString(QCString &s)
   //printf("substEnvVarInString(%s) end\n",s.data());
 }
 
-static void substEnvVarsInStrList(QStrList &sl)
+static void substEnvVarsInStrList(TQStrList &sl)
 {
   char *s = sl.first();
   while (s)
   {
-    QCString result(s);
+    TQCString result(s);
     // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE.
     bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1);
     // here we strip the quote again
@@ -2605,7 +2605,7 @@ void Config::substituteEnvironmentVars()
   }
 }
 
-static void cleanUpPaths(QStrList &str)
+static void cleanUpPaths(TQStrList &str)
 {
   char *sfp = str.first();
   while (sfp)
@@ -2620,20 +2620,20 @@ static void cleanUpPaths(QStrList &str)
 	p++;
       }
     }
-    QCString path = sfp;
+    TQCString path = sfp;
     if ((path.at(0)!='/' && (path.length()<=2 || path.at(1)!=':')) ||
 	path.at(path.length()-1)!='/'
        )
     {
-      QFileInfo fi(path);
+      TQFileInfo fi(path);
       if (fi.exists() && fi.isDir())
       {
 	int i = str.at();
 	str.remove();
 	if (str.at()==i) // did not remove last item
-	  str.insert(i,QFile::encodeName(fi.absFilePath()+"/"));
+	  str.insert(i,TQFile::encodeName(fi.absFilePath()+"/"));
 	else
-	  str.append(QFile::encodeName(fi.absFilePath()+"/"));
+	  str.append(TQFile::encodeName(fi.absFilePath()+"/"));
       }
     }
     sfp = str.next();
@@ -2647,7 +2647,7 @@ void Config::check()
   //  projectName[0]=toupper(projectName[0]);
   //}
 
-  QCString &warnFormat = Config_getString("WARN_FORMAT");
+  TQCString &warnFormat = Config_getString("WARN_FORMAT");
   if (warnFormat.stripWhiteSpace().isEmpty())
   {
     warnFormat="$file:$line $text";
@@ -2668,7 +2668,7 @@ void Config::check()
     }
   }
 
-  QCString &manExtension = Config_getString("MAN_EXTENSION");
+  TQCString &manExtension = Config_getString("MAN_EXTENSION");
   
   // set default man page extension if non is given by the user
   if (manExtension.isEmpty())
@@ -2676,7 +2676,7 @@ void Config::check()
     manExtension=".3";
   }
   
-  QCString &paperType = Config_getEnum("PAPER_TYPE");
+  TQCString &paperType = Config_getEnum("PAPER_TYPE");
   paperType=paperType.lower().stripWhiteSpace(); 
   if (paperType.isEmpty())
   {
@@ -2688,14 +2688,14 @@ void Config::check()
     config_err("Error: Unknown page type specified");
   }
   
-  QCString &outputLanguage=Config_getEnum("OUTPUT_LANGUAGE");
+  TQCString &outputLanguage=Config_getEnum("OUTPUT_LANGUAGE");
   outputLanguage=outputLanguage.stripWhiteSpace();
   if (outputLanguage.isEmpty())
   {
     outputLanguage = "English";
   }
 
-  QCString &htmlFileExtension=Config_getString("HTML_FILE_EXTENSION");
+  TQCString &htmlFileExtension=Config_getString("HTML_FILE_EXTENSION");
   htmlFileExtension=htmlFileExtension.stripWhiteSpace();
   if (htmlFileExtension.isEmpty())
   {
@@ -2703,11 +2703,11 @@ void Config::check()
   }
   
   // expand the relative stripFromPath values
-  QStrList &stripFromPath = Config_getList("STRIP_FROM_PATH");
+  TQStrList &stripFromPath = Config_getList("STRIP_FROM_PATH");
   char *sfp = stripFromPath.first();
   if (sfp==0) // by default use the current path
   {
-    stripFromPath.append(QFile::encodeName(QDir::currentDirPath()+"/"));
+    stripFromPath.append(TQFile::encodeName(TQDir::currentDirPath()+"/"));
   }
   else
   {
@@ -2715,14 +2715,14 @@ void Config::check()
   }
 
   // expand the relative stripFromPath values
-  QStrList &stripFromIncPath = Config_getList("STRIP_FROM_INC_PATH");
+  TQStrList &stripFromIncPath = Config_getList("STRIP_FROM_INC_PATH");
   cleanUpPaths(stripFromIncPath);
   
   // Test to see if HTML header is valid
-  QCString &headerFile = Config_getString("HTML_HEADER");
+  TQCString &headerFile = Config_getString("HTML_HEADER");
   if (!headerFile.isEmpty())
   {
-    QFileInfo fi(headerFile);
+    TQFileInfo fi(headerFile);
     if (!fi.exists())
     {
       config_err("Error: tag HTML_HEADER: header file `%s' "
@@ -2731,10 +2731,10 @@ void Config::check()
     }
   }
   // Test to see if HTML footer is valid
-  QCString &footerFile = Config_getString("HTML_FOOTER");
+  TQCString &footerFile = Config_getString("HTML_FOOTER");
   if (!footerFile.isEmpty())
   {
-    QFileInfo fi(footerFile);
+    TQFileInfo fi(footerFile);
     if (!fi.exists())
     {
       config_err("Error: tag HTML_FOOTER: footer file `%s' "
@@ -2743,10 +2743,10 @@ void Config::check()
     }
   }
   // Test to see if LaTeX header is valid
-  QCString &latexHeaderFile = Config_getString("LATEX_HEADER");
+  TQCString &latexHeaderFile = Config_getString("LATEX_HEADER");
   if (!latexHeaderFile.isEmpty())
   {
-    QFileInfo fi(latexHeaderFile);
+    TQFileInfo fi(latexHeaderFile);
     if (!fi.exists())
     {
       config_err("Error: tag LATEX_HEADER: header file `%s' "
@@ -2755,24 +2755,24 @@ void Config::check()
     }
   }
   // check include path
-  QStrList &includePath = Config_getList("INCLUDE_PATH");
+  TQStrList &includePath = Config_getList("INCLUDE_PATH");
   char *s=includePath.first();
   while (s)
   {
-    QFileInfo fi(s);
+    TQFileInfo fi(s);
     if (!fi.exists()) config_err("Warning: tag INCLUDE_PATH: include path `%s' "
 	                  "does not exist\n",s);
     s=includePath.next();
   }
 
   // check aliases
-  QStrList &aliasList = Config_getList("ALIASES");
+  TQStrList &aliasList = Config_getList("ALIASES");
   s=aliasList.first();
   while (s)
   {
-    QRegExp re1("[a-z_A-Z][a-z_A-Z0-9]*[ \t]*=");         // alias without argument
-    QRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument
-    QCString alias=s;
+    TQRegExp re1("[a-z_A-Z][a-z_A-Z0-9]*[ \t]*=");         // alias without argument
+    TQRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument
+    TQCString alias=s;
     alias=alias.stripWhiteSpace();
     if (alias.find(re1)!=0 && alias.find(re2)!=0)
     {
@@ -2783,7 +2783,7 @@ void Config::check()
   }
 
   // check dot image format
-  QCString &dotImageFormat=Config_getEnum("DOT_IMAGE_FORMAT");
+  TQCString &dotImageFormat=Config_getEnum("DOT_IMAGE_FORMAT");
   dotImageFormat=dotImageFormat.stripWhiteSpace();
   if (dotImageFormat.isEmpty())
   {
@@ -2797,10 +2797,10 @@ void Config::check()
   
   
   // check dot path
-  QCString &dotPath = Config_getString("DOT_PATH");
+  TQCString &dotPath = Config_getString("DOT_PATH");
   if (!dotPath.isEmpty())
   {
-    QFileInfo dp(dotPath+"/dot"+portable_commandExtension());
+    TQFileInfo dp(dotPath+"/dot"+portable_commandExtension());
     if (!dp.exists() || !dp.isFile())
     {
       config_err("Warning: the dot tool could not be found at %s\n",dotPath.data());
@@ -2808,7 +2808,7 @@ void Config::check()
     }
     else
     {
-      dotPath=QFile::encodeName( dp.dirPath(TRUE)+"/" );
+      dotPath=TQFile::encodeName( dp.dirPath(TRUE)+"/" );
 #if defined(_WIN32) // convert slashes
       uint i=0,l=dotPath.length();
       for (i=0;i
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 /*! \brief Abstract base class for any configuration option.
  *
@@ -44,30 +44,30 @@ class ConfigOption
 
     /*! returns the kind of option this is. */
     OptionType kind() const { return m_kind; }
-    QCString name() const { return m_name; }
-    QCString docs() const { return m_doc; }
+    TQCString name() const { return m_name; }
+    TQCString docs() const { return m_doc; }
 
-    QCString dependsOn() const { return m_dependency; }
+    TQCString dependsOn() const { return m_dependency; }
     void addDependency(const char *dep) { m_dependency = dep; }
-    void setEncoding(const QCString &e) { m_encoding = e; }
+    void setEncoding(const TQCString &e) { m_encoding = e; }
 
   protected:
-    virtual void writeTemplate(QTextStream &t,bool sl,bool upd) = 0;
+    virtual void writeTemplate(TQTextStream &t,bool sl,bool upd) = 0;
     virtual void convertStrToVal() {}
     virtual void substEnvVars() = 0;
     virtual void init() {}
 
-    QCString convertToComment(const QCString &s);
-    void writeBoolValue(QTextStream &t,bool v);
-    void writeIntValue(QTextStream &t,int i);
-    void writeStringValue(QTextStream &t,QCString &s);
-    void writeStringList(QTextStream &t,QStrList &l);
-
-    QCString m_spaces;
-    QCString m_name;
-    QCString m_doc;
-    QCString m_dependency;
-    QCString m_encoding;
+    TQCString convertToComment(const TQCString &s);
+    void writeBoolValue(TQTextStream &t,bool v);
+    void writeIntValue(TQTextStream &t,int i);
+    void writeStringValue(TQTextStream &t,TQCString &s);
+    void writeStringList(TQTextStream &t,TQStrList &l);
+
+    TQCString m_spaces;
+    TQCString m_name;
+    TQCString m_doc;
+    TQCString m_dependency;
+    TQCString m_encoding;
     OptionType m_kind;
 };
 
@@ -83,7 +83,7 @@ class ConfigInfo : public ConfigOption
       m_name = name;
       m_doc = doc;
     }
-    void writeTemplate(QTextStream &t, bool sl,bool)
+    void writeTemplate(TQTextStream &t, bool sl,bool)
     {
       if (!sl)
       {
@@ -113,8 +113,8 @@ class ConfigList : public ConfigOption
     void addValue(const char *v) { m_value.append(v); }
     void setWidgetType(WidgetType w) { m_widgetType = w; }
     WidgetType widgetType() const { return m_widgetType; }
-    QStrList *valueRef() { return &m_value; }
-    void writeTemplate(QTextStream &t,bool sl,bool)
+    TQStrList *valueRef() { return &m_value; }
+    void writeTemplate(TQTextStream &t,bool sl,bool)
     {
       if (!sl)
       {
@@ -129,7 +129,7 @@ class ConfigList : public ConfigOption
     void substEnvVars();
     void init() { m_value.clear(); }
   private:
-    QStrList m_value;
+    TQStrList m_value;
     WidgetType m_widgetType;
 };
 
@@ -148,13 +148,13 @@ class ConfigEnum : public ConfigOption
       m_defValue = defVal;
     }
     void addValue(const char *v) { m_valueRange.append(v); }
-    QStrListIterator iterator() 
+    TQStrListIterator iterator() 
     {
-      return QStrListIterator(m_valueRange);
+      return TQStrListIterator(m_valueRange);
     }
-    QCString *valueRef() { return &m_value; }
+    TQCString *valueRef() { return &m_value; }
     void substEnvVars();
-    void writeTemplate(QTextStream &t,bool sl,bool)
+    void writeTemplate(TQTextStream &t,bool sl,bool)
     {
       if (!sl)
       {
@@ -169,9 +169,9 @@ class ConfigEnum : public ConfigOption
     void init() { m_value = m_defValue.copy(); }
 
   private:
-    QStrList m_valueRange;
-    QCString m_value;
-    QCString m_defValue;
+    TQStrList m_valueRange;
+    TQCString m_value;
+    TQCString m_defValue;
 };
 
 /*! \brief Option of the string type.
@@ -194,8 +194,8 @@ class ConfigString : public ConfigOption
     void setWidgetType(WidgetType w) { m_widgetType = w; }
     WidgetType widgetType() const { return m_widgetType; }
     void setDefaultValue(const char *v) { m_defValue = v; }
-    QCString *valueRef() { return &m_value; }
-    void writeTemplate(QTextStream &t,bool sl,bool)
+    TQCString *valueRef() { return &m_value; }
+    void writeTemplate(TQTextStream &t,bool sl,bool)
     {
       if (!sl)
       {
@@ -211,8 +211,8 @@ class ConfigString : public ConfigOption
     void init() { m_value = m_defValue.copy(); }
   
   private:
-    QCString m_value;
-    QCString m_defValue;
+    TQCString m_value;
+    TQCString m_defValue;
     WidgetType m_widgetType;
 };
 
@@ -232,13 +232,13 @@ class ConfigInt : public ConfigOption
       m_minVal = minVal;
       m_maxVal = maxVal;
     }
-    QCString *valueStringRef() { return &m_valueString; }
+    TQCString *valueStringRef() { return &m_valueString; }
     int *valueRef() { return &m_value; }
     int minVal() const { return m_minVal; }
     int maxVal() const { return m_maxVal; }
     void convertStrToVal();
     void substEnvVars();
-    void writeTemplate(QTextStream &t,bool sl,bool upd)
+    void writeTemplate(TQTextStream &t,bool sl,bool upd)
     {
       if (!sl)
       {
@@ -263,7 +263,7 @@ class ConfigInt : public ConfigOption
     int m_defValue;
     int m_minVal;
     int m_maxVal;
-    QCString m_valueString;
+    TQCString m_valueString;
 };
 
 /*! \brief Option of the boolean type.
@@ -280,12 +280,12 @@ class ConfigBool : public ConfigOption
       m_value = defVal;
       m_defValue = defVal;
     }
-    QCString *valueStringRef() { return &m_valueString; }
+    TQCString *valueStringRef() { return &m_valueString; }
     bool *valueRef() { return &m_value; }
     void convertStrToVal();
     void substEnvVars();
-    void setValueString(const QCString &v) { m_valueString = v; }
-    void writeTemplate(QTextStream &t,bool sl,bool upd)
+    void setValueString(const TQCString &v) { m_valueString = v; }
+    void writeTemplate(TQTextStream &t,bool sl,bool upd)
     {
       if (!sl)
       {
@@ -308,7 +308,7 @@ class ConfigBool : public ConfigOption
   private:
     bool m_value;
     bool m_defValue;
-    QCString m_valueString;
+    TQCString m_valueString;
 };
 
 /*! \brief Section marker for obsolete options
@@ -318,7 +318,7 @@ class ConfigObsolete : public ConfigOption
 {
   public:
     ConfigObsolete(OptionType t) : ConfigOption(t)  {}
-    void writeTemplate(QTextStream &,bool,bool) {}
+    void writeTemplate(TQTextStream &,bool,bool) {}
     void substEnvVars() {}
 };
 
@@ -364,9 +364,9 @@ class Config
     /*! Returns an iterator that can by used to iterate over the 
      *  configuration options.
      */
-    QPtrListIterator iterator()
+    TQPtrListIterator iterator()
     {
-      return QPtrListIterator(*m_options);
+      return TQPtrListIterator(*m_options);
     }
 
     /*! 
@@ -378,19 +378,19 @@ class Config
      *  The arguments \a num and \a name are for debugging purposes only.
      *  There is a convenience function Config_getString() for this.
      */
-    QCString &getString(const char *fileName,int num,const char *name) const;
+    TQCString &getString(const char *fileName,int num,const char *name) const;
 
     /*! Returns the value of the list option with name \a fileName. 
      *  The arguments \a num and \a name are for debugging purposes only.
      *  There is a convenience function Config_getList() for this.
      */
-    QStrList &getList(const char *fileName,int num,const char *name) const;
+    TQStrList &getList(const char *fileName,int num,const char *name) const;
 
     /*! Returns the value of the enum option with name \a fileName. 
      *  The arguments \a num and \a name are for debugging purposes only.
      *  There is a convenience function Config_getEnum() for this.
      */
-    QCString &getEnum(const char *fileName,int num,const char *name) const;
+    TQCString &getEnum(const char *fileName,int num,const char *name) const;
 
     /*! Returns the value of the integer option with name \a fileName. 
      *  The arguments \a num and \a name are for debugging purposes only.
@@ -508,7 +508,7 @@ class Config
      *  is \c TRUE the description of each configuration option will
      *  be omitted.
      */
-    void writeTemplate(QTextStream &t,bool shortIndex,bool updateOnly);
+    void writeTemplate(TQTextStream &t,bool shortIndex,bool updateOnly);
 
     /////////////////////////////
     // internal API
@@ -553,9 +553,9 @@ class Config
 
     Config()
     { 
-      m_options  = new QPtrList;
-      m_obsolete = new QPtrList;
-      m_dict     = new QDict(257);
+      m_options  = new TQPtrList;
+      m_obsolete = new TQPtrList;
+      m_dict     = new TQDict(257);
       m_options->setAutoDelete(TRUE);
       m_obsolete->setAutoDelete(TRUE);
       m_initialized = FALSE;
@@ -569,9 +569,9 @@ class Config
     }
 
   private:
-    QPtrList *m_options;
-    QPtrList *m_obsolete;
-    QDict *m_dict;
+    TQPtrList *m_options;
+    TQPtrList *m_obsolete;
+    TQDict *m_dict;
     static Config *m_instance;
     bool m_initialized;
 };
diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp
index 27f39863..8269bf0e 100644
--- a/parts/doxygen/doxygenconfigwidget.cpp
+++ b/parts/doxygen/doxygenconfigwidget.cpp
@@ -13,10 +13,10 @@
 
 #include "doxygenconfigwidget.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -27,30 +27,30 @@
 #include "messages.h"
 
 
-DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *parent, const char *name)
-    : QTabWidget(parent, name)
+DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *parent, const char *name)
+    : TQTabWidget(parent, name)
 {
     m_hasChanged = false;
-    m_dependencies = new QDict< QPtrList >(257);
+    m_dependencies = new TQDict< TQPtrList >(257);
     m_dependencies->setAutoDelete(true);
-    m_inputWidgets = new QDict< IInput >;
-    m_switches = new QDict< QObject >;
+    m_inputWidgets = new TQDict< IInput >;
+    m_switches = new TQDict< TQObject >;
    
-    QPtrListIterator options = Config::instance()->iterator();
-    QScrollView *page = 0;
-    QVBox *pagebox = 0;
+    TQPtrListIterator options = Config::instance()->iterator();
+    TQScrollView *page = 0;
+    TQVBox *pagebox = 0;
     ConfigOption *option = 0;
     for (options.toFirst(); (option=options.current()); ++options) {
         switch(option->kind())
             {
             case ConfigOption::O_Info:
-                page = new QScrollView(this, option->name());
+                page = new TQScrollView(this, option->name());
                 page->viewport()->setBackgroundMode(PaletteBackground);
-                pagebox = new QVBox(0);
+                pagebox = new TQVBox(0);
                 Q_ASSERT(pagebox!=0);
                 page->addChild(pagebox);
                 addTab(page, message(option->name()));
-                QWhatsThis::add(page, option->docs().simplifyWhiteSpace() );
+                TQWhatsThis::add(page, option->docs().simplifyWhiteSpace() );
                 break;
             case ConfigOption::O_String:
                 {
@@ -67,8 +67,8 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren
                           *((ConfigString *)option)->valueRef(), // variable 
                           sm                                     // type
                           );
-                    QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace());
-                    connect(inputString, SIGNAL(changed()), this, SLOT(changed()));
+                    TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace());
+                    connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
                     m_inputWidgets->insert(option->name(), inputString);
                     addDependency(m_switches, option->dependsOn(), option->name());
                 }
@@ -82,11 +82,11 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren
                           *((ConfigEnum *)option)->valueRef(),   // variable 
                           InputString::StringFixed               // type
                           );
-                    QStrListIterator sli=((ConfigEnum *)option)->iterator();
+                    TQStrListIterator sli=((ConfigEnum *)option)->iterator();
                     for (sli.toFirst(); sli.current(); ++sli)
                         inputString->addValue(sli.current());
-                    QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace());
-                    connect(inputString, SIGNAL(changed()), this, SLOT(changed()));
+                    TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace());
+                    connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
                     m_inputWidgets->insert(option->name(),inputString);
                     addDependency(m_switches, option->dependsOn(), option->name());
                 }
@@ -108,8 +108,8 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren
                           *((ConfigList *)option)->valueRef(),    // variable
                           lm                                      // type
                           );
-                    QWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace());
-                    connect(inputStrList, SIGNAL(changed()), this, SLOT(changed()));
+                    TQWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace());
+                    connect(inputStrList, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
                     m_inputWidgets->insert(option->name(),inputStrList);
                     addDependency(m_switches, option->dependsOn(), option->name());
                 }
@@ -123,8 +123,8 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren
                           pagebox,                                // widget
                           *((ConfigBool *)option)->valueRef()     // variable
                           );
-                    QWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace());
-                    connect(inputBool, SIGNAL(changed()), this, SLOT(changed()));
+                    TQWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace());
+                    connect(inputBool, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
                     m_inputWidgets->insert(option->name(), inputBool);
                     addDependency(m_switches, option->dependsOn(), option->name());
                 }
@@ -139,8 +139,8 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren
                           ((ConfigInt *)option)->minVal(),        // min value
                           ((ConfigInt *)option)->maxVal()         // max value
                           );
-                    QWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace());
-                    connect(inputInt, SIGNAL(changed()), this, SLOT(changed()));
+                    TQWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace());
+                    connect(inputInt, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
                     m_inputWidgets->insert(option->name(), inputInt);
                     addDependency(m_switches, option->dependsOn(), option->name());
                 }
@@ -150,10 +150,10 @@ DoxygenConfigWidget::DoxygenConfigWidget(const QString &fileName, QWidget *paren
             }
     }
     
-    QDictIterator di(*m_switches);
+    TQDictIterator di(*m_switches);
     for (; di.current(); ++di) {
-        QObject *obj = di.current();
-        connect(obj, SIGNAL(toggle(const QString&, bool)), this, SLOT(toggle(const QString&, bool)));
+        TQObject *obj = di.current();
+        connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool)));
         // UGLY HACK: assumes each item depends on a boolean without checking!
         emit toggle(di.currentKey(), ((InputBool *)obj)->getState());
     }
@@ -171,15 +171,15 @@ DoxygenConfigWidget::~DoxygenConfigWidget()
 }
 
 
-QSize DoxygenConfigWidget::sizeHint() const
+TQSize DoxygenConfigWidget::sizeHint() const
 {
     // without this the whole dialog becomes much too large
-    return QSize(QTabWidget::sizeHint().width(), 1);
+    return TQSize(TQTabWidget::sizeHint().width(), 1);
 }
 
 
-void DoxygenConfigWidget::addDependency(QDict *switches,
-                                        const QCString &dep, const QCString &name)
+void DoxygenConfigWidget::addDependency(TQDict *switches,
+                                        const TQCString &dep, const TQCString &name)
 {
     if (dep.isEmpty())
         return;
@@ -190,18 +190,18 @@ void DoxygenConfigWidget::addDependency(QDict *switches,
     Q_ASSERT(child!=0);
     if (!switches->find(dep))
         switches->insert(dep, parent->qobject());
-    QPtrList *list = m_dependencies->find(dep);
+    TQPtrList *list = m_dependencies->find(dep);
     if (!list) {
-        list = new QPtrList;
+        list = new TQPtrList;
         m_dependencies->insert(dep, list);
     }
     list->append(child);
 }
 
 
-void DoxygenConfigWidget::toggle(const QString &name, bool state)
+void DoxygenConfigWidget::toggle(const TQString &name, bool state)
 {
-    QPtrList *inputs = m_dependencies->find(name);
+    TQPtrList *inputs = m_dependencies->find(name);
     Q_ASSERT(inputs!=0);
     IInput *input = inputs->first();
     while (input) {
@@ -219,14 +219,14 @@ void DoxygenConfigWidget::changed()
 
 void DoxygenConfigWidget::init()
 {
-    QDictIterator di(*m_inputWidgets);
+    TQDictIterator di(*m_inputWidgets);
     for (; di.current(); ++di)
         di.current()->init();
     
-    QDictIterator dio(*m_switches);
+    TQDictIterator dio(*m_switches);
     for (; dio.current(); ++dio) {
-        QObject *obj = dio.current();
-        connect(obj, SIGNAL(toggle(const QString&, bool)), this, SLOT(toggle(const QString&, bool)));
+        TQObject *obj = dio.current();
+        connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool)));
         // UGLY HACK: assumes each item depends on a boolean without checking!
         emit toggle(dio.currentKey(), ((InputBool *)obj)->getState());
     }
@@ -237,11 +237,11 @@ void DoxygenConfigWidget::loadFile()
 {
     Config::instance()->init();
 
-    QFile f(m_fileName);
+    TQFile f(m_fileName);
     if (f.open(IO_ReadOnly)) {
-        QTextStream is(&f);
+        TQTextStream is(&f);
 
-        Config::instance()->parse(QFile::encodeName(m_fileName));
+        Config::instance()->parse(TQFile::encodeName(m_fileName));
         Config::instance()->convertStrToVal();
 
         f.close();
@@ -253,11 +253,11 @@ void DoxygenConfigWidget::loadFile()
 
 void DoxygenConfigWidget::saveFile()
 {
-    QFile f(m_fileName);
+    TQFile f(m_fileName);
     if (!f.open(IO_WriteOnly)) {
         KMessageBox::information(0, i18n("Cannot write Doxyfile."));
     } else {
-        QTextStream t(&f);
+        TQTextStream t(&f);
 
         Config::instance()->writeTemplate(t, true, false);
 
diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h
index be75e203..4dd68178 100644
--- a/parts/doxygen/doxygenconfigwidget.h
+++ b/parts/doxygen/doxygenconfigwidget.h
@@ -14,9 +14,9 @@
 #ifndef _DOXYGENCONFIGWIDGET_H_
 #define _DOXYGENCONFIGWIDGET_H_
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 class IInput;
 
@@ -26,29 +26,29 @@ class DoxygenConfigWidget : public QTabWidget
     Q_OBJECT
     
 public:
-    DoxygenConfigWidget( const QString &fileName, QWidget *parent=0, const char *name=0 );
+    DoxygenConfigWidget( const TQString &fileName, TQWidget *parent=0, const char *name=0 );
     ~DoxygenConfigWidget();
 
 public slots:
     void accept();
 
 private slots:
-    void toggle(const QString&, bool);
+    void toggle(const TQString&, bool);
     void changed();
 
 private:
-    QSize sizeHint() const;
+    TQSize sizeHint() const;
     void loadFile();
     void saveFile();
     void init();
-    void addDependency(QDict *switches,
-                       const QCString &dep, const QCString &name);
+    void addDependency(TQDict *switches,
+                       const TQCString &dep, const TQCString &name);
 
-    QString m_fileName;
+    TQString m_fileName;
     bool m_hasChanged;
-    QDict *m_inputWidgets;
-    QDict< QPtrList > *m_dependencies;
-    QDict *m_switches;
+    TQDict *m_inputWidgets;
+    TQDict< TQPtrList > *m_dependencies;
+    TQDict *m_switches;
 };
 
 #endif
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index 5582371b..833f4938 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -39,11 +39,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #define PROJECTOPTIONS 1
 
@@ -51,7 +51,7 @@ typedef KDevGenericFactory DoxygenFactory;
 static const KDevPluginInfo data("kdevdoxygen");
 K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) )
 
-DoxygenPart::DoxygenPart(QObject *parent, const char *name, const QStringList &)
+DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
 {
     setInstance(DoxygenFactory::instance());
@@ -59,44 +59,44 @@ DoxygenPart::DoxygenPart(QObject *parent, const char *name, const QStringList &)
 
     KAction *action;
     action = new KAction( i18n("Build API Documentation"), 0,
-                          this, SLOT(slotDoxygen()),
+                          this, TQT_SLOT(slotDoxygen()),
                           actionCollection(), "build_doxygen" );
     action->setToolTip(i18n("Build API documentation"));
     action->setWhatsThis(i18n("Build API documentation
      Runs doxygen on a project Doxyfile to generate API documentation. "
         "If the search engine is enabled in Doxyfile, this also runs doxytag to create it."));
 
     action = new KAction( i18n("Clean API Documentation"), 0,
-                          this, SLOT(slotDoxClean()),
+                          this, TQT_SLOT(slotDoxClean()),
                           actionCollection(), "clean_doxygen" );
     action->setToolTip(i18n("Clean API documentation"));
     action->setWhatsThis(i18n("Clean API documentation
      Removes all generated by doxygen files."));
 
-//    connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(projectConfigWidget(KDialogBase*)) );
+//    connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createProjectConfigPage( i18n("Doxygen"), PROJECTOPTIONS, info()->icon() );
-	connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )),
-		this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) );
+	connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
-    m_actionDocumentFunction = new KAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function");
+    m_actionDocumentFunction = new KAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQT_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function");
     m_actionDocumentFunction->setToolTip( i18n("Create a documentation template above a function"));
     m_actionDocumentFunction->setWhatsThis(i18n("Document Current Function
      Creates a documentation template according to a function's signature above a function definition/declaration."));
 
     m_tmpDir.setAutoDelete(true);
-    connect( partController(), SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(slotActivePartChanged(KParts::Part* )));
-    m_actionPreview = new KAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output");
+    connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* )));
+    m_actionPreview = new KAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQT_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output");
     m_actionPreview->setToolTip( i18n("Show a preview of the Doxygen output of this file") );
     m_actionPreview->setWhatsThis( i18n("Preview Doxygen output
      Runs Doxygen over the current file and shows the created index.html.") );
 
     //read Doxygen configuration, if none exists yet, create it with some defaults
     adjustDoxyfile();
-    QString fileName = project()->projectDirectory() + "/Doxyfile";
+    TQString fileName = project()->projectDirectory() + "/Doxyfile";
 
-    QFile file(fileName);
+    TQFile file(fileName);
     if (file.open(IO_ReadOnly)) {
-        QTextStream is(&file);
+        TQTextStream is(&file);
 
-        Config::instance()->parse(QFile::encodeName(fileName));
+        Config::instance()->parse(TQFile::encodeName(fileName));
         Config::instance()->convertStrToVal();
 
         file.close();
@@ -109,14 +109,14 @@ DoxygenPart::~DoxygenPart()
 	delete _configProxy;
 }
 
-void DoxygenPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber )
+void DoxygenPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber )
 {
 	if ( pagenumber == PROJECTOPTIONS )
 	{
 		adjustDoxyfile();
 
 		DoxygenConfigWidget *w = new DoxygenConfigWidget(project()->projectDirectory() + "/Doxyfile", page );
-		connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) );
+		connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 	}
 }
 
@@ -125,8 +125,8 @@ void DoxygenPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, u
   */
 void DoxygenPart::adjustDoxyfile()
 {
-  QString fileName = project()->projectDirectory() + "/Doxyfile";
-  if (QFile::exists(fileName))
+  TQString fileName = project()->projectDirectory() + "/Doxyfile";
+  if (TQFile::exists(fileName))
     return;
 
   // Initialize configuration
@@ -156,7 +156,7 @@ void DoxygenPart::adjustDoxyfile()
   if (input_files)
   {
     input_files->init();
-    input_files->addValue(QFile::encodeName(project()->projectDirectory()));
+    input_files->addValue(TQFile::encodeName(project()->projectDirectory()));
   }
 
   // insert file patterns into "Input/FILE_PATTERNS"
@@ -195,17 +195,17 @@ void DoxygenPart::adjustDoxyfile()
   ConfigString *gen_tag = dynamic_cast(Config::instance()->get("GENERATE_TAGFILE"));
   if (gen_tag)
   {
-    gen_tag->setDefaultValue(QString(project()->projectName()+".tag").latin1());
+    gen_tag->setDefaultValue(TQString(project()->projectName()+".tag").latin1());
     gen_tag->init();
   }
 
   // write doxy file
-  QFile f2(fileName);
+  TQFile f2(fileName);
   if (!f2.open(IO_WriteOnly))
     KMessageBox::information(mainWindow()->main(), i18n("Cannot write Doxyfile."));
   else
   {
-    QTextStream ts_file(&f2);
+    TQTextStream ts_file(&f2);
 
     Config::instance()->writeTemplate(ts_file, true, true);
 
@@ -219,21 +219,21 @@ void DoxygenPart::slotDoxygen()
     if ( !partController()->saveAllFiles() ) return;
 
     bool searchDatabase = false;
-    QString outputDirectory;
-    QString htmlDirectory;
+    TQString outputDirectory;
+    TQString htmlDirectory;
 
     adjustDoxyfile();
 
-    QString fileName = project()->projectDirectory() + "/Doxyfile";
+    TQString fileName = project()->projectDirectory() + "/Doxyfile";
 
     Config::instance()->init();
 
-    QFile f(fileName);
+    TQFile f(fileName);
     if (f.open(IO_ReadOnly))
     {
-      QTextStream is(&f);
+      TQTextStream is(&f);
 
-      Config::instance()->parse(QFile::encodeName(fileName));
+      Config::instance()->parse(TQFile::encodeName(fileName));
       Config::instance()->convertStrToVal();
 
       f.close();
@@ -258,8 +258,8 @@ void DoxygenPart::slotDoxygen()
       }
     }
 
-    QString dir = project()->projectDirectory();
-    QString cmdline = "cd ";
+    TQString dir = project()->projectDirectory();
+    TQString cmdline = "cd ";
     cmdline += KShellProcess::quote( dir );
     cmdline += " && doxygen Doxyfile";
     if (searchDatabase)
@@ -281,15 +281,15 @@ void DoxygenPart::slotDoxClean()
 {
     bool could_be_dirty = false;
 
-    QString outputDirectory = Config_getString("OUTPUT_DIRECTORY");
+    TQString outputDirectory = Config_getString("OUTPUT_DIRECTORY");
     if ( outputDirectory.isEmpty() )
         outputDirectory = project()->projectDirectory();
     if ( outputDirectory.right(1) != "/" )
         outputDirectory += "/";
-    QString cmdline = "cd " + KShellProcess::quote( outputDirectory );
+    TQString cmdline = "cd " + KShellProcess::quote( outputDirectory );
 
     if ( Config_getBool("GENERATE_HTML") ) {
-        QString htmlDirectory   = Config_getString("HTML_OUTPUT");
+        TQString htmlDirectory   = Config_getString("HTML_OUTPUT");
         if ( htmlDirectory.isEmpty() )
             htmlDirectory = "html";
         if ( htmlDirectory.right(1) != "/" )
@@ -299,7 +299,7 @@ void DoxygenPart::slotDoxClean()
     }
 
     if ( Config_getBool("GENERATE_LATEX") ) {
-        QString latexDirectory   = Config_getString("LATEX_OUTPUT");
+        TQString latexDirectory   = Config_getString("LATEX_OUTPUT");
         if ( latexDirectory.isEmpty() )
             latexDirectory = "latex";
         if ( latexDirectory.right(1) != "/" )
@@ -309,7 +309,7 @@ void DoxygenPart::slotDoxClean()
     }
 
     if ( Config_getBool("GENERATE_RTF") ) {
-        QString rtfDirectory   = Config_getString("RTF_OUTPUT");
+        TQString rtfDirectory   = Config_getString("RTF_OUTPUT");
         if ( rtfDirectory.isEmpty() )
             rtfDirectory = "rtf";
         if ( rtfDirectory.right(1) != "/" )
@@ -319,7 +319,7 @@ void DoxygenPart::slotDoxClean()
     }
 
     if ( Config_getBool("GENERATE_MAN") ) {
-        QString manDirectory   = Config_getString("MAN_OUTPUT");
+        TQString manDirectory   = Config_getString("MAN_OUTPUT");
         if ( manDirectory.isEmpty() )
             manDirectory = "man";
         if ( manDirectory.right(1) != "/" )
@@ -329,7 +329,7 @@ void DoxygenPart::slotDoxClean()
     }
 
     if ( Config_getBool("GENERATE_XML") ) {
-        QString xmlDirectory   = Config_getString("XML_OUTPUT");
+        TQString xmlDirectory   = Config_getString("XML_OUTPUT");
         if ( xmlDirectory.isEmpty() )
             xmlDirectory = "xml";
         if ( xmlDirectory.right(1) != "/" )
@@ -384,16 +384,16 @@ void DoxygenPart::slotRunPreview( )
     ConfigString* pStyle = dynamic_cast(config->get("HTML_STYLESHEET"));
 
     //store config values to restore them later | override config values to get only the current file processed
-    QCString dirVal;
+    TQCString dirVal;
     if (poDir != 0) {
         dirVal = *poDir->valueRef();
         *poDir->valueRef() = m_tmpDir.name().ascii();
     }
 
-   QStrList inputVal;
+   TQStrList inputVal;
     if (pInput != 0) {
         inputVal = *pInput->valueRef();
-         QStrList xl;
+         TQStrList xl;
          xl.append(m_file.ascii());
         *pInput->valueRef() = xl;
     } else {
@@ -402,44 +402,44 @@ void DoxygenPart::slotRunPreview( )
                                                      "# directories like \"/usr/src/myproject\". Separate the files or directories\n"
                                                      "# with spaces.");
         pInput = dynamic_cast(config->get("INPUT")); //pinput now has to be != 0
-        QStrList xl;
+        TQStrList xl;
          xl.append(m_file.ascii());
         *pInput->valueRef() = xl;
     }
 
-    QCString header;
-    QCString footer;
-    QCString stylesheet;
+    TQCString header;
+    TQCString footer;
+    TQCString stylesheet;
     //if header/footer/stylesheets are set, make sure they get found in the doxygen run
-    QString projectDir = project()->projectDirectory();
+    TQString projectDir = project()->projectDirectory();
     if (pHeader != 0 && !pHeader->valueRef()->isEmpty()){
         header = *pHeader->valueRef();
-        QFileInfo info (header);
+        TQFileInfo info (header);
         if (info.isRelative())
-            *pHeader->valueRef() = QString(projectDir + "/" + QString(header)).ascii();
+            *pHeader->valueRef() = TQString(projectDir + "/" + TQString(header)).ascii();
         else
             header = 0;
     }
 
     if (pFooter != 0 && !pFooter->valueRef()->isEmpty()){
         footer = *pFooter->valueRef();
-        QFileInfo info (footer);
+        TQFileInfo info (footer);
         if (info.isRelative())
-            *pFooter->valueRef() = QString(projectDir + "/" + QString(footer)).ascii();
+            *pFooter->valueRef() = TQString(projectDir + "/" + TQString(footer)).ascii();
         else
             footer = 0;
     }
 
     if (pStyle != 0 && !pStyle->valueRef()->isEmpty()){
         stylesheet = *pStyle->valueRef();
-        QFileInfo info (stylesheet);
+        TQFileInfo info (stylesheet);
         if (info.isRelative())
-            *pStyle->valueRef() = QString(projectDir +"/" + QString(stylesheet)).ascii();
+            *pStyle->valueRef() = TQString(projectDir +"/" + TQString(stylesheet)).ascii();
         else
             stylesheet = 0;
     }
 
-    QFile file(m_tmpDir.name() +"PreviewDoxyfile"); //file gets deleted automatically 'cause of tempdir
+    TQFile file(m_tmpDir.name() +"PreviewDoxyfile"); //file gets deleted automatically 'cause of tempdir
     if (!file.open(IO_WriteOnly)){
         //restore config values
         if (pInput != 0)
@@ -452,13 +452,13 @@ void DoxygenPart::slotRunPreview( )
         return;
     }
 
-    QTextStream ts_file(&file);
+    TQTextStream ts_file(&file);
 
     config->writeTemplate(ts_file, false, false);
     file.close();
 
     if (inputVal.count() == 0) //pInput is always != 0
-        *pInput->valueRef() = QStrList();
+        *pInput->valueRef() = TQStrList();
     else
         *pInput->valueRef() = inputVal;
 
@@ -474,7 +474,7 @@ void DoxygenPart::slotRunPreview( )
     if (pStyle != 0 && !stylesheet.isNull())
         *pStyle->valueRef() = stylesheet;
 
-    connect(appFrontend, SIGNAL(processExited()), this, SLOT(slotPreviewProcessExited()));
+    connect(appFrontend, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotPreviewProcessExited()));
     appFrontend->startAppCommand("", "doxygen \"" + file.name() + "\"", false);
 }
 
@@ -485,7 +485,7 @@ void DoxygenPart::slotActivePartChanged( KParts::Part * part )
 	if (doc != 0)
 		m_file = doc->url().path();
 	else
-		m_file = QString::null;
+		m_file = TQString::null;
 	// <-
     m_activeEditor = dynamic_cast(part);
     m_cursor = part ? dynamic_cast(part->widget()) : 0;
@@ -532,16 +532,16 @@ void DoxygenPart::slotDocumentFunction(){
                 functionDef->getStartPosition(&line, &col);
             else
                 return;
-            QString funcLine = m_activeEditor->textLine(line);
+            TQString funcLine = m_activeEditor->textLine(line);
             unsigned int pos = 0;
             unsigned int length = funcLine.length();
             while (pos < length && funcLine.at(pos).isSpace())
                 ++pos;
             //store chars used for indenting the line and put it in front of every created doc line
-            QString indentChars = funcLine.left(pos);
-            QString text = indentChars + "/**\n" + indentChars + " * \n";
+            TQString indentChars = funcLine.left(pos);
+            TQString text = indentChars + "/**\n" + indentChars + " * \n";
             ArgumentList args;
-            QString resultType;
+            TQString resultType;
             if (function != 0) {
                 args = function->argumentList();
                 resultType = function->resultType();
diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h
index 49fb87e8..4b2ed0bf 100644
--- a/parts/doxygen/doxygenpart.h
+++ b/parts/doxygen/doxygenpart.h
@@ -14,11 +14,11 @@
 #ifndef _DOXYGENPART_H_
 #define _DOXYGENPART_H_
 
-#include 
+#include 
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include "kdevplugin.h"
 
@@ -42,7 +42,7 @@ class DoxygenPart : public KDevPlugin
     Q_OBJECT
 
 public:
-    DoxygenPart( QObject *parent, const char *name, const QStringList & );
+    DoxygenPart( TQObject *parent, const char *name, const TQStringList & );
     ~DoxygenPart();
 
 private slots:
@@ -53,7 +53,7 @@ private slots:
      * in the project root.
      */
 //    void projectConfigWidget(KDialogBase *dlg);
-	void insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int );
+	void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int );
 
     /** run doxygen to generate API documentation */
     void slotDoxygen();
@@ -99,7 +99,7 @@ private:
 	ConfigWidgetProxy * _configProxy;
 
     //needed for doxygen preview
-    QString m_file;
+    TQString m_file;
     KTempDir m_tmpDir;
     KAction* m_action;
 
diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index d5745bad..e316d69e 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -11,13 +11,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -110,18 +110,18 @@ static const char* const update_xpm_data[] =
 const char **update_xpm = (const char **)update_xpm_data;
 
 
-InputBool::InputBool(const QCString &k, const QString &text, QWidget * parent, bool &flag)
-    : QWidget(parent), state(flag), key(k)
+InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag)
+    : TQWidget(parent), state(flag), key(k)
 {
-    QHBoxLayout *layout = new QHBoxLayout(this);
-    cb = new QCheckBox(text,this);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
+    cb = new TQCheckBox(text,this);
 
     init();
 
     layout->addWidget(cb);
     layout->addStretch(1);
     
-    connect( cb, SIGNAL(toggled(bool)), this, SLOT(valueChanged(bool)));
+    connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool)));
 }
 
 
@@ -151,13 +151,13 @@ void InputBool::setEnabled(bool b)
 }
 
 
-InputInt::InputInt(const QString &label, QWidget *parent, int &val, int minVal, int maxVal)
-    : QWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
+InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal)
+    : TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
 {
-    QHBoxLayout *layout = new QHBoxLayout(this, 5);
+    TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
     
-    sp = new QSpinBox(minVal, maxVal, 1, this);
-    lab = new QLabel(sp, label+":", this);
+    sp = new TQSpinBox(minVal, maxVal, 1, this);
+    lab = new TQLabel(sp, label+":", this);
     
     init();
   
@@ -165,7 +165,7 @@ InputInt::InputInt(const QString &label, QWidget *parent, int &val, int minVal,
     layout->addWidget(sp);
     layout->addStretch(1);
 
-    connect(sp, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int)));
+    connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
 }
 
 
@@ -196,43 +196,43 @@ void InputInt::setEnabled(bool state)
 }
 
 
-InputString::InputString(const QString & label, 
-                         QWidget *parent, QCString &s, StringMode m)
-    : QWidget(parent), str(s), sm(m), m_values(0), m_index(0)
+InputString::InputString(const TQString & label, 
+                         TQWidget *parent, TQCString &s, StringMode m)
+    : TQWidget(parent), str(s), sm(m), m_values(0), m_index(0)
 {
     le = 0; br = 0; com = 0;
     
     if (m == StringFixed) {
-        QHBoxLayout *layout = new QHBoxLayout(this, 5);
-        com = new QComboBox(this); 
-	lab = new QLabel(com,label+":", this);
+        TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
+        com = new TQComboBox(this); 
+	lab = new TQLabel(com,label+":", this);
 	layout->addWidget(lab);
         layout->addWidget(com);
         layout->addStretch(1);
     } else {
-        QGridLayout *layout = new QGridLayout(this, 1, m==StringFree? 1 : 3, 5);
+        TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
         le = new KLineEdit(this);
-	lab = new QLabel(le,label+":", this);
+	lab = new TQLabel(le,label+":", this);
 	layout->addWidget(lab, 0, 0);
         le->setText(s);
         layout->addWidget(le, 0, 1);
         
         if (m == StringFile || m == StringDir) {
-            br = new QPushButton(this);
+            br = new TQPushButton(this);
             br->setPixmap(SmallIcon(m==StringFile? "document" : "folder"));
-            QToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder"));
+            TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder"));
             layout->addWidget(br, 0, 2);
         }
     }
     
     if (le)
-        connect( le,   SIGNAL(textChanged(const QString&)), 
-                 this, SLOT(textChanged(const QString&)) );
+        connect( le,   TQT_SIGNAL(textChanged(const TQString&)), 
+                 this, TQT_SLOT(textChanged(const TQString&)) );
     if (br)
-        connect( br,   SIGNAL(clicked()), this, SLOT(browse()) );
+        connect( br,   TQT_SIGNAL(clicked()), this, TQT_SLOT(browse()) );
     if (com)
-        connect( com,  SIGNAL(activated(const QString &)), 
-                 this, SLOT(textChanged(const QString &)) );
+        connect( com,  TQT_SIGNAL(activated(const TQString &)), 
+                 this, TQT_SLOT(textChanged(const TQString &)) );
 }
 
 InputString::~InputString()
@@ -259,7 +259,7 @@ void InputString::addValue(const char *s)
 {
     if (sm == StringFixed) {
         if (!m_values)
-            m_values = new QDict;
+            m_values = new TQDict;
         m_values->setAutoDelete(true);
         m_values->insert(s, new int(m_index++));
         com->insertItem(s);
@@ -277,7 +277,7 @@ void InputString::clear()
 }
 
 
-void InputString::textChanged(const QString &s)
+void InputString::textChanged(const TQString &s)
 {
     if (str!=s.latin1()) {
         str = s.latin1();
@@ -300,7 +300,7 @@ void InputString::setEnabled(bool state)
 void InputString::browse()
 {
     if (sm == StringFile) {
-        QString fileName = KFileDialog::getOpenFileName();
+        TQString fileName = KFileDialog::getOpenFileName();
     
         if (!fileName.isNull()) {
             le->setText(fileName);
@@ -310,7 +310,7 @@ void InputString::browse()
             }
         }
     } else { // sm==StringDir
-        QString dirName = KFileDialog::getExistingDirectory();
+        TQString dirName = KFileDialog::getExistingDirectory();
 
         if (!dirName.isNull()) {
             le->setText( dirName ); 	
@@ -323,75 +323,75 @@ void InputString::browse()
 }
 
 
-InputStrList::InputStrList(const QString & label, 
-                           QWidget *parent, QStrList &sl, ListMode lm)
-    : QWidget(parent), strList(sl)
+InputStrList::InputStrList(const TQString & label, 
+                           TQWidget *parent, TQStrList &sl, ListMode lm)
+    : TQWidget(parent), strList(sl)
 {
-    QGridLayout *layout = new QGridLayout(this, 2, 2, 5);
+    TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5);
     
-    QWidget *dw = new QWidget(this); /* dummy widget used for layouting */
-    QHBoxLayout *boxlayout = new QHBoxLayout(dw, 0, 5);
+    TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */
+    TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5);
     le  = new KLineEdit(dw);
-    lab = new QLabel(le,label+":", this );
+    lab = new TQLabel(le,label+":", this );
     layout->addWidget(lab, 0, 0);
     boxlayout->addWidget(le, 1);
 
-    add = new QPushButton(dw);
-    add->setPixmap(QPixmap( add_xpm ));
-    QToolTip::add(add, i18n("Add item"));
+    add = new TQPushButton(dw);
+    add->setPixmap(TQPixmap( add_xpm ));
+    TQToolTip::add(add, i18n("Add item"));
     boxlayout->addWidget(add);
     
-    del = new QPushButton(dw);
-    del->setPixmap(QPixmap( del_xpm ));
-    QToolTip::add(del, i18n("Delete selected item"));
+    del = new TQPushButton(dw);
+    del->setPixmap(TQPixmap( del_xpm ));
+    TQToolTip::add(del, i18n("Delete selected item"));
     boxlayout->addWidget(del);
 
-    upd = new QPushButton(dw); 
-    upd->setPixmap(QPixmap( update_xpm ));
-    QToolTip::add(upd, i18n("Update selected item"));
+    upd = new TQPushButton(dw); 
+    upd->setPixmap(TQPixmap( update_xpm ));
+    TQToolTip::add(upd, i18n("Update selected item"));
     boxlayout->addWidget(upd);
     
-    lb  = new QListBox(this);
+    lb  = new TQListBox(this);
     lb->setMinimumSize(400, 100);
     init();
-    lb->setVScrollBarMode(QScrollView::Auto);
-    lb->setHScrollBarMode(QScrollView::Auto);
+    lb->setVScrollBarMode(TQScrollView::Auto);
+    lb->setHScrollBarMode(TQScrollView::Auto);
     
     brFile = 0;
     brDir = 0;
     if (lm != ListString) {
         if (lm & ListFile) {
-            brFile = new QPushButton(dw);
+            brFile = new TQPushButton(dw);
             brFile->setPixmap(SmallIcon("document"));
-            QToolTip::add(brFile, i18n("Browse to a file"));
+            TQToolTip::add(brFile, i18n("Browse to a file"));
             boxlayout->addWidget(brFile);
         } 
         if (lm & ListDir) {
-            brDir = new QPushButton(dw);
+            brDir = new TQPushButton(dw);
             brDir->setPixmap(SmallIcon("folder"));
-            QToolTip::add(brDir, i18n("Browse to a folder"));
+            TQToolTip::add(brDir, i18n("Browse to a folder"));
             boxlayout->addWidget(brDir);
         }
     }
     layout->addWidget(dw, 0, 1);
     layout->addWidget(lb, 1, 1);
     
-    connect( le,   SIGNAL(returnPressed()), 
-             this, SLOT(addString()) );
-    connect( add,  SIGNAL(clicked()), 
-             this, SLOT(addString()) );
-    connect( del,  SIGNAL(clicked()), 
-             this, SLOT(delString()) );
-    connect( upd,  SIGNAL(clicked()), 
-             this, SLOT(updateString()) );
+    connect( le,   TQT_SIGNAL(returnPressed()), 
+             this, TQT_SLOT(addString()) );
+    connect( add,  TQT_SIGNAL(clicked()), 
+             this, TQT_SLOT(addString()) );
+    connect( del,  TQT_SIGNAL(clicked()), 
+             this, TQT_SLOT(delString()) );
+    connect( upd,  TQT_SIGNAL(clicked()), 
+             this, TQT_SLOT(updateString()) );
     if (brFile) 
-        connect( brFile, SIGNAL(clicked()),
-                 this, SLOT(browseFiles()) );
+        connect( brFile, TQT_SIGNAL(clicked()),
+                 this, TQT_SLOT(browseFiles()) );
     if (brDir)
-        connect( brDir, SIGNAL(clicked()),
-                 this, SLOT(browseDir()) );
-    connect( lb,   SIGNAL(selected(const QString &)), 
-             this, SLOT(selectText(const QString &)) );
+        connect( brDir, TQT_SIGNAL(clicked()),
+                 this, TQT_SLOT(browseDir()) );
+    connect( lb,   TQT_SIGNAL(selected(const TQString &)), 
+             this, TQT_SLOT(selectText(const TQString &)) );
     
     strList = sl;
 }
@@ -446,7 +446,7 @@ void InputStrList::updateString()
 }
 
 
-void InputStrList::selectText(const QString &s)
+void InputStrList::selectText(const TQString &s)
 {
     le->setText(s);
 }
@@ -469,10 +469,10 @@ void InputStrList::setEnabled(bool state)
 
 void InputStrList::browseFiles()
 {
-    QStringList fileNames = KFileDialog::getOpenFileNames();	
+    TQStringList fileNames = KFileDialog::getOpenFileNames();	
     
     if (!fileNames.isEmpty()) {
-        QStringList::Iterator it;
+        TQStringList::Iterator it;
         for (it = fileNames.begin(); it != fileNames.end(); ++it) {
             lb->insertItem(*it);
             strList.append(( *it ).latin1());
@@ -485,7 +485,7 @@ void InputStrList::browseFiles()
 
 void InputStrList::browseDir()
 {	
-    QString dirName = KFileDialog::getExistingDirectory();	
+    TQString dirName = KFileDialog::getExistingDirectory();	
     
     if (!dirName.isNull()) {
         lb->insertItem(dirName);
diff --git a/parts/doxygen/input.h b/parts/doxygen/input.h
index 15c3a263..473d94dd 100644
--- a/parts/doxygen/input.h
+++ b/parts/doxygen/input.h
@@ -14,8 +14,8 @@
 #ifndef _INPUT_H
 #define _INPUT_H
  
-#include 
-#include 
+#include 
+#include 
 
 class QComboBox;
 class QLabel;
@@ -29,49 +29,49 @@ class IInput
   public:
     virtual void init() = 0;
     virtual void setEnabled(bool) = 0;
-    virtual QObject *qobject() = 0;
+    virtual TQObject *qobject() = 0;
 };
 
 
-class InputBool : public QWidget, public IInput
+class InputBool : public TQWidget, public IInput
 {
     Q_OBJECT
 
 public:
-    InputBool(const QCString &key, const QString &text, QWidget *parent, bool &flag);
+    InputBool(const TQCString &key, const TQString &text, TQWidget *parent, bool &flag);
     ~InputBool();
     
     void init();
     virtual void setEnabled(bool b);
-    virtual QObject *qobject() { return this; }
+    virtual TQObject *qobject() { return this; }
     virtual bool getState() const { return state; }
 
 signals:
     void changed();
-    void toggle(const QString &, bool);
+    void toggle(const TQString &, bool);
 
 private slots:
     void valueChanged(bool);
 
 private:
     bool &state;
-    QCString key;
-    QCheckBox *cb;
+    TQCString key;
+    TQCheckBox *cb;
 };
 
 
-class InputInt : public QWidget, public IInput
+class InputInt : public TQWidget, public IInput
 {
     Q_OBJECT
 
 public:
-    InputInt(const QString &text, QWidget *parent,
+    InputInt(const TQString &text, TQWidget *parent,
              int &val, int minVal, int maxVal);
     ~InputInt();
     
     void init();
     virtual void setEnabled(bool);
-    QObject *qobject() { return this; }
+    TQObject *qobject() { return this; }
 
 signals:
     void changed();
@@ -80,15 +80,15 @@ private slots:
     void valueChanged(int val); 
 
 private:
-    QLabel *lab;
-    QSpinBox *sp;
+    TQLabel *lab;
+    TQSpinBox *sp;
     int &m_val;
     int m_minVal;
     int m_maxVal;
 };
 
 
-class InputString : public QWidget, public IInput
+class InputString : public TQWidget, public IInput
 {
     Q_OBJECT
 
@@ -99,36 +99,36 @@ public:
                       StringFixed=3
                     };
 
-    InputString(const QString &text, QWidget *parent,
-                QCString &s, StringMode m=StringFree);
+    InputString(const TQString &text, TQWidget *parent,
+                TQCString &s, StringMode m=StringFree);
     ~InputString();
     
     void init();
     void addValue(const char *s);
     void setEnabled(bool);
-    QObject *qobject() { return this; }
+    TQObject *qobject() { return this; }
 
 signals:
     void changed();
 
 private slots:
-    void textChanged(const QString&);
+    void textChanged(const TQString&);
     void browse();
     void clear();
 
 private:
-    QLabel *lab;
+    TQLabel *lab;
     KLineEdit *le;
-    QPushButton *br;
-    QComboBox *com;
-    QCString &str;
+    TQPushButton *br;
+    TQComboBox *com;
+    TQCString &str;
     StringMode sm;
-    QDict *m_values;
+    TQDict *m_values;
     int m_index; 
 };
 
 
-class InputStrList : public QWidget, public IInput
+class InputStrList : public TQWidget, public IInput
 {
     Q_OBJECT
 
@@ -139,13 +139,13 @@ public:
                     ListFileDir=ListFile|ListDir 
                   };
     
-    InputStrList(const QString &text, QWidget *parent, 
-                 QStrList &sl, ListMode v=ListString);
+    InputStrList(const TQString &text, TQWidget *parent, 
+                 TQStrList &sl, ListMode v=ListString);
     ~InputStrList();
 
     void init();
     void setEnabled(bool);
-    QObject *qobject() { return this; }
+    TQObject *qobject() { return this; }
 
 signals:
     void changed();
@@ -154,20 +154,20 @@ private slots:
     void addString(); 
     void delString(); 
     void updateString(); 
-    void selectText(const QString &s);
+    void selectText(const TQString &s);
     void browseFiles();
     void browseDir();
 
 private:
-    QLabel *lab;
+    TQLabel *lab;
     KLineEdit *le;
-    QPushButton *add;
-    QPushButton *del;
-    QPushButton *upd;
-    QPushButton *brFile;
-    QPushButton *brDir;
-    QListBox *lb;
-    QStrList &strList;
+    TQPushButton *add;
+    TQPushButton *del;
+    TQPushButton *upd;
+    TQPushButton *brFile;
+    TQPushButton *brDir;
+    TQListBox *lb;
+    TQStrList &strList;
 };
 
 #endif
diff --git a/parts/doxygen/messages.cpp b/parts/doxygen/messages.cpp
index 050e1ba6..8819b109 100644
--- a/parts/doxygen/messages.cpp
+++ b/parts/doxygen/messages.cpp
@@ -1,23 +1,23 @@
-#include 
+#include 
 
 
 #include 
 #include 
 
 
-static QMap sMessages;
+static TQMap sMessages;
 
 
 // Note: this function seems to be completely unnecessary, but messages.insert
 // is a template function, so doing the template expansion just once reduced
 // the compile time of this trivial file from >5m to <30s on my machine. mhk.
-static void addMessage(const QCString key, const QString &message)
+static void addMessage(const TQCString key, const TQString &message)
 {
   sMessages.insert(key, message);
 }
 
 
-QString message(const QCString &key)
+TQString message(const TQCString &key)
 {
   static bool initialized = false;
 
diff --git a/parts/doxygen/messages.h b/parts/doxygen/messages.h
index 38ad6b84..ab8de52d 100644
--- a/parts/doxygen/messages.h
+++ b/parts/doxygen/messages.h
@@ -2,10 +2,10 @@
 #define __DOXYGEN_MESSAGES_H__
 
 
-#include 
+#include 
 
 
-QString message(const QCString &key);
+TQString message(const TQCString &key);
 
 
 #endif
diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp
index 0757d220..11a0f2a6 100644
--- a/parts/filecreate/addglobaldlg.cpp
+++ b/parts/filecreate/addglobaldlg.cpp
@@ -10,13 +10,13 @@
 
 #include "addglobaldlg.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -27,21 +27,21 @@
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-AddGlobalDlg::AddGlobalDlg( QWidget* parent, const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl )
+AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFlags fl )
+    : TQDialog( parent, name, modal, fl )
 
 {
     if ( !name )
 	setName( "AddGlobalDlg" );
     setSizeGripEnabled( TRUE );
-    AddGlobalDlgLayout = new QGridLayout( this, 1, 1, 11, 6, "AddGlobalDlgLayout");
+    AddGlobalDlgLayout = new TQGridLayout( this, 1, 1, 11, 6, "AddGlobalDlgLayout");
 
-    Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1");
+    Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1");
 
     buttonHelp = new KPushButton( this, "buttonHelp" );
     buttonHelp->setAutoDefault( TRUE );
     Layout1->addWidget( buttonHelp );
-    QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
+    TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
     Layout1->addItem( spacer );
 
     buttonOk = new KPushButton( this, "buttonOk" );
@@ -55,24 +55,24 @@ AddGlobalDlg::AddGlobalDlg( QWidget* parent, const char* name, bool modal, WFlag
 
     AddGlobalDlgLayout->addLayout( Layout1, 1, 0 );
 
-    fcglobal_view = new QListView( this, "fcglobal_view" );
+    fcglobal_view = new TQListView( this, "fcglobal_view" );
     fcglobal_view->addColumn( i18n( "Type Extension" ) );
     fcglobal_view->addColumn( i18n( "Type Name" ) );
     fcglobal_view->addColumn( i18n( "Template Location" ) );
     fcglobal_view->addColumn( i18n( "Icon" ) );
     fcglobal_view->addColumn( i18n( "Description" ) );
-    fcglobal_view->setResizePolicy( QListView::AutoOne );
+    fcglobal_view->setResizePolicy( TQListView::AutoOne );
     fcglobal_view->setAllColumnsShowFocus( TRUE );
     fcglobal_view->setRootIsDecorated( TRUE );
-    fcglobal_view->setResizeMode( QListView::AllColumns );
+    fcglobal_view->setResizeMode( TQListView::AllColumns );
 
     AddGlobalDlgLayout->addWidget( fcglobal_view, 0, 0 );
     languageChange();
-    resize( QSize(511, 282).expandedTo(minimumSizeHint()) );
+    resize( TQSize(511, 282).expandedTo(minimumSizeHint()) );
 
     // signals and slots connections
-    connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) );
-    connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
+    connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
+    connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
 }
 
 /*
@@ -91,11 +91,11 @@ void AddGlobalDlg::languageChange()
 {
     setCaption( i18n( "Select Global File Types" ) );
     buttonHelp->setGuiItem( KStdGuiItem::help() );
-    buttonHelp->setAccel( QKeySequence( tr2i18n( "F1" ) ) );
+    buttonHelp->setAccel( TQKeySequence( tr2i18n( "F1" ) ) );
     buttonOk->setGuiItem( KStdGuiItem::ok() );
-    buttonOk->setAccel( QKeySequence( QString::null ) );
+    buttonOk->setAccel( TQKeySequence( TQString::null ) );
     buttonCancel->setGuiItem( KStdGuiItem::cancel() );
-    buttonCancel->setAccel( QKeySequence( QString::null ) );
+    buttonCancel->setAccel( TQKeySequence( TQString::null ) );
     fcglobal_view->header()->setLabel( 0, i18n( "Type extension:" ) );
     fcglobal_view->header()->setLabel( 1, i18n( "Type name:" ) );
     fcglobal_view->header()->setLabel( 2, i18n( "Template location:" ) );
diff --git a/parts/filecreate/addglobaldlg.h b/parts/filecreate/addglobaldlg.h
index 0ec8e588..55660853 100644
--- a/parts/filecreate/addglobaldlg.h
+++ b/parts/filecreate/addglobaldlg.h
@@ -10,8 +10,8 @@
 #ifndef ADDGLOBALDLG_H
 #define ADDGLOBALDLG_H
 
-#include 
-#include 
+#include 
+#include 
 
 class QVBoxLayout;
 class QHBoxLayout;
@@ -25,17 +25,17 @@ class AddGlobalDlg : public QDialog
     Q_OBJECT
 
 public:
-    AddGlobalDlg( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    AddGlobalDlg( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~AddGlobalDlg();
 
-    QPushButton* buttonHelp;
-    QPushButton* buttonOk;
-    QPushButton* buttonCancel;
-    QListView* fcglobal_view;
+    TQPushButton* buttonHelp;
+    TQPushButton* buttonOk;
+    TQPushButton* buttonCancel;
+    TQListView* fcglobal_view;
 
 protected:
-    QGridLayout* AddGlobalDlgLayout;
-    QHBoxLayout* Layout1;
+    TQGridLayout* AddGlobalDlgLayout;
+    TQHBoxLayout* Layout1;
 
 protected slots:
     virtual void languageChange();
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index 480d38e0..df4963fa 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -8,17 +8,17 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -39,7 +39,7 @@
 #include "kdevpartcontroller.h"
 
 
-FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, QWidget *parent, const char *name):
+FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name):
     FCConfigWidgetBase(parent, name), m_part(part), m_global(global)
 {
     fc_view->setSorting(-1, FALSE);
@@ -82,16 +82,16 @@ void FCConfigWidget::accept()
     m_part->m_filetypes.clear();
     m_part->slotProjectOpened();
 
-    for (QValueList::iterator it = urlsToEdit.begin(); it != urlsToEdit.end(); ++it )
+    for (TQValueList::iterator it = urlsToEdit.begin(); it != urlsToEdit.end(); ++it )
     {
         m_part->partController()->editDocument(*it);
     }
 }
 
-void FCConfigWidget::loadGlobalConfig(QListView *view, bool checkmarks)
+void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks)
 {
-    QString globalXMLFile = ::locate("data", "kdevfilecreate/template-info.xml");
-    QDomDocument globalDom;
+    TQString globalXMLFile = ::locate("data", "kdevfilecreate/template-info.xml");
+    TQDomDocument globalDom;
     if (!globalXMLFile.isNull() &&
         DomUtil::openDOMFile(globalDom,globalXMLFile)) {
         m_part->readTypes(globalDom, m_globalfiletypes, false);
@@ -102,55 +102,55 @@ void FCConfigWidget::loadGlobalConfig(QListView *view, bool checkmarks)
 
     if (checkmarks)
     {
-        QDomElement useGlobalTypes =
+        TQDomElement useGlobalTypes =
             DomUtil::elementByPath(*(m_part->projectDom()),"/kdevfilecreate/useglobaltypes");
-        for(QDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling())
+        for(TQDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling())
         {
             if (node.isElement() && node.nodeName()=="type")
             {
-                QDomElement element = node.toElement();
-                QString ext = element.attribute("ext");
-                QString subtyperef = element.attribute("subtyperef");
+                TQDomElement element = node.toElement();
+                TQString ext = element.attribute("ext");
+                TQString subtyperef = element.attribute("subtyperef");
                 if (subtyperef.isNull())
                 {
-                    QListViewItem *it = view->findItem(ext, 0);
+                    TQListViewItem *it = view->findItem(ext, 0);
                     if (it)
                     {
-                        ((QCheckListItem*)it)->setOn(true);
+                        ((TQCheckListItem*)it)->setOn(true);
 
-                        QListViewItem *lastChild = it->firstChild();
+                        TQListViewItem *lastChild = it->firstChild();
                         while ( lastChild )
                         {
-                            ((QCheckListItem*)lastChild)->setOn(true);
+                            ((TQCheckListItem*)lastChild)->setOn(true);
                             lastChild = lastChild->nextSibling();
                         }
                     }
                 }
                 else
                 {
-                    QListViewItem *it = view->findItem(subtyperef, 0);
+                    TQListViewItem *it = view->findItem(subtyperef, 0);
                     if (it)
-                        ((QCheckListItem*)it)->setOn(true);
+                        ((TQCheckListItem*)it)->setOn(true);
                 }
             }
         }
     }
 }
 
-void FCConfigWidget::loadProjectConfig(QListView *view)
+void FCConfigWidget::loadProjectConfig(TQListView *view)
 {
     m_part->readTypes( *(m_part->projectDom()), m_projectfiletypes, false );
     loadFileTypes(m_projectfiletypes, view, false);
 }
 
-void FCConfigWidget::loadProjectTemplates(QListView *view)
+void FCConfigWidget::loadProjectTemplates(TQListView *view)
 {
-    QDir templDir( m_part->project()->projectDirectory() + "/templates/" );
-    templDir.setFilter( QDir::Files );
+    TQDir templDir( m_part->project()->projectDirectory() + "/templates/" );
+    templDir.setFilter( TQDir::Files );
     const QFileInfoList * list = templDir.entryInfoList();
     if( list ){
       QFileInfoListIterator it( *list );
-      QFileInfo *fi;
+      TQFileInfo *fi;
       while ( (fi = it.current()) != 0 ) {
         FileType * filetype;
         filetype = new FileType;
@@ -168,19 +168,19 @@ void FCConfigWidget::loadProjectTemplates(QListView *view)
 
 void FCConfigWidget::saveGlobalConfig()
 {
-    QDomDocument globalDom;
-    QDomElement  element = globalDom.createElement("kdevelop" );
+    TQDomDocument globalDom;
+    TQDomElement  element = globalDom.createElement("kdevelop" );
     globalDom.appendChild(element);
-    QDomElement  apPart  = globalDom.createElement("kdevfilecreate");
+    TQDomElement  apPart  = globalDom.createElement("kdevfilecreate");
     element.appendChild(apPart);
-    QDomElement fileTypes = globalDom.createElement( "filetypes" );
+    TQDomElement fileTypes = globalDom.createElement( "filetypes" );
     apPart.appendChild( fileTypes );
 
     saveConfiguration(globalDom, fileTypes, true);
 
-    QFile config( KGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" );
+    TQFile config( KGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" );
     config.open(IO_WriteOnly | IO_Truncate);
-    QTextStream stream(&config);
+    TQTextStream stream(&config);
     stream << "";
     stream << globalDom.toString();
     config.close();
@@ -188,9 +188,9 @@ void FCConfigWidget::saveGlobalConfig()
 
 void FCConfigWidget::saveProjectConfig()
 {
-    QDomDocument dom     = *m_part->projectDom( );
-    QDomElement  element = dom.documentElement( );
-    QDomElement  apPart  = element.namedItem( "kdevfilecreate" ).toElement( );
+    TQDomDocument dom     = *m_part->projectDom( );
+    TQDomElement  element = dom.documentElement( );
+    TQDomElement  apPart  = element.namedItem( "kdevfilecreate" ).toElement( );
     if( apPart.isNull( ) )
     {
         apPart = dom.createElement( "kdevfilecreate" );
@@ -200,7 +200,7 @@ void FCConfigWidget::saveProjectConfig()
 
     // project template configuration
 
-    QDomElement projectTypes = apPart.namedItem( "filetypes" ).toElement( );
+    TQDomElement projectTypes = apPart.namedItem( "filetypes" ).toElement( );
     apPart.removeChild(projectTypes);
     projectTypes = dom.createElement( "filetypes" );
     apPart.appendChild( projectTypes );
@@ -210,32 +210,32 @@ void FCConfigWidget::saveProjectConfig()
 
     // global template usage
 
-    QDomElement globalTypes = apPart.namedItem( "useglobaltypes" ).toElement( );
+    TQDomElement globalTypes = apPart.namedItem( "useglobaltypes" ).toElement( );
     apPart.removeChild(globalTypes);
     globalTypes = dom.createElement( "useglobaltypes" );
     apPart.appendChild( globalTypes );
 
-    QListViewItemIterator it( fcglobal_view );
+    TQListViewItemIterator it( fcglobal_view );
     for( ; it.current( ); ++it ){
         if (!it.current()->parent())
         {
-            QCheckListItem *chit = dynamic_cast(it.current());
+            TQCheckListItem *chit = dynamic_cast(it.current());
             if ( !chit ) continue;
             if (chit->isOn())
             {
-                QDomElement type = dom.createElement( "type" );
+                TQDomElement type = dom.createElement( "type" );
                 type.setAttribute( "ext", chit->text(0) );
                 globalTypes.appendChild( type );
             }
             else
             {
-                QListViewItem *lastChild = chit->firstChild();
+                TQListViewItem *lastChild = chit->firstChild();
                 while ( lastChild )
                 {
-                    QCheckListItem *chsit = dynamic_cast(lastChild);
+                    TQCheckListItem *chsit = dynamic_cast(lastChild);
                     if ( (chsit) && (chsit->isOn()))
                     {
-                        QDomElement type = dom.createElement( "type" );
+                        TQDomElement type = dom.createElement( "type" );
                         type.setAttribute( "ext", chit->text(0) );
                         type.setAttribute( "subtyperef", chsit->text(0) );
                         globalTypes.appendChild( type );
@@ -251,15 +251,15 @@ void FCConfigWidget::saveProjectConfig()
     // project template files
 
     //check for new templates and those with location changed
-    QListViewItemIterator it2(fctemplates_view);
+    TQListViewItemIterator it2(fctemplates_view);
     while (it2.current())
     {
         if (!it2.current()->text(1).isEmpty())
         {
-            QString dest;
+            TQString dest;
             dest = m_part->project()->projectDirectory() + "/templates/";
             if (it2.current()->text(1) == "create")
-                copyTemplate(QString::null, dest, it2.current()->text(0));
+                copyTemplate(TQString::null, dest, it2.current()->text(0));
             else
                 copyTemplate(it2.current()->text(1), dest, it2.current()->text(0));
         }
@@ -267,13 +267,13 @@ void FCConfigWidget::saveProjectConfig()
     }
 }
 
-void FCConfigWidget::saveConfiguration(QDomDocument &dom, QDomElement &element, bool global)
+void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element, bool global)
 {
-    QListViewItemIterator it( fc_view );
+    TQListViewItemIterator it( fc_view );
     for( ; it.current( ); ++it ){
         if (!it.current()->parent())
         {
-            QDomElement type = dom.createElement( "type" );
+            TQDomElement type = dom.createElement( "type" );
             type.setAttribute( "ext", it.current()->text(0) );
             type.setAttribute( "name", it.current()->text(1) );
             if (it.current()->childCount() > 0)
@@ -282,47 +282,47 @@ void FCConfigWidget::saveConfiguration(QDomDocument &dom, QDomElement &element,
                 type.setAttribute( "create", "template");
             type.setAttribute( "icon", it.current()->text(2) );
 
-            QDomElement edescr = dom.createElement("descr");
+            TQDomElement edescr = dom.createElement("descr");
             type.appendChild(edescr);
-            QDomText descr = dom.createTextNode( it.current()->text(3) );
+            TQDomText descr = dom.createTextNode( it.current()->text(3) );
             edescr.appendChild(descr);
 
             if (!it.current()->text(4).isEmpty())
             {
-                QString dest;
+                TQString dest;
                 if (global)
                     dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
                 else
                     dest = m_part->project()->projectDirectory() + "/templates/";
                 if (it.current()->text(4) == "create")
-                    copyTemplate(QString::null, dest, it.current()->text(0));
+                    copyTemplate(TQString::null, dest, it.current()->text(0));
                 else
                     copyTemplate(it.current()->text(4), dest, it.current()->text(0));
             }
 
 
-            QListViewItem *lastChild = it.current()->firstChild();
+            TQListViewItem *lastChild = it.current()->firstChild();
             while ( lastChild )
             {
-                QDomElement subtype = dom.createElement( "subtype" );
+                TQDomElement subtype = dom.createElement( "subtype" );
                 subtype.setAttribute( "ref", lastChild->text(0) );
                 subtype.setAttribute( "name", lastChild->text(1) );
                 subtype.setAttribute( "icon", lastChild->text(2) );
 
-                QDomElement edescr = dom.createElement("descr");
+                TQDomElement edescr = dom.createElement("descr");
                 subtype.appendChild(edescr);
-                QDomText descr = dom.createTextNode( lastChild->text(3) );
+                TQDomText descr = dom.createTextNode( lastChild->text(3) );
                 edescr.appendChild(descr);
 
                 if (!lastChild->text(4).isEmpty())
                 {
-                    QString dest;
+                    TQString dest;
                     if (global)
                         dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
                     else
                         dest = m_part->project()->projectDirectory() + "/templates/";
                     if (lastChild->text(4) == "create")
-                        copyTemplate(QString::null, dest, it.current()->text(0) + "-" + lastChild->text(0));
+                        copyTemplate(TQString::null, dest, it.current()->text(0) + "-" + lastChild->text(0));
                     else
                         copyTemplate(lastChild->text(4), dest, it.current()->text(0) + "-" + lastChild->text(0));
                 }
@@ -336,15 +336,15 @@ void FCConfigWidget::saveConfiguration(QDomDocument &dom, QDomElement &element,
     }
 }
 
-void FCConfigWidget::copyTemplate(QString templateUrl, QString dest, QString destName)
+void FCConfigWidget::copyTemplate(TQString templateUrl, TQString dest, TQString destName)
 {
     if (templateUrl.isEmpty())
     {
-        QDir d(dest);
+        TQDir d(dest);
         if (!d.exists())
             d.mkdir(dest);
 
-        QFile f(dest + destName);
+        TQFile f(dest + destName);
         f.open(IO_WriteOnly);
         f.close();
     }
@@ -362,7 +362,7 @@ void FCConfigWidget::copyTemplate(QString templateUrl, QString dest, QString des
     }
 }
 
-void FCConfigWidget::loadFileTypes(QPtrList list, QListView *view, bool checkmarks)
+void FCConfigWidget::loadFileTypes(TQPtrList list, TQListView *view, bool checkmarks)
 {
     FileType *ft;
 
@@ -371,11 +371,11 @@ void FCConfigWidget::loadFileTypes(QPtrList list, QListVie
     {
         if ( (ft = list.at(i)) )
         {
-            QListViewItem *it;
+            TQListViewItem *it;
             if (!checkmarks)
-                it = new QListViewItem(view);
+                it = new TQListViewItem(view);
             else
-                it = new QCheckListItem(view, "", QCheckListItem::CheckBox);
+                it = new TQCheckListItem(view, "", TQCheckListItem::CheckBox);
 
             it->setText(0, ft->ext());
             it->setText(1, ft->name());
@@ -388,11 +388,11 @@ void FCConfigWidget::loadFileTypes(QPtrList list, QListVie
             {
                 if ( (sft = ft->subtypes().at(j)) )
                 {
-                    QListViewItem *sit;
+                    TQListViewItem *sit;
                     if (!checkmarks)
-                        sit = new QListViewItem(it);
+                        sit = new TQListViewItem(it);
                     else
-                        sit = new QCheckListItem(it, "", QCheckListItem::CheckBox);
+                        sit = new TQCheckListItem(it, "", TQCheckListItem::CheckBox);
 
                     sit->setText(0, sft->subtypeRef());
                     sit->setText(1, sft->name());
@@ -412,7 +412,7 @@ void FCConfigWidget::removetemplate_button_clicked( )
         KURL removedTemplate;
         removedTemplate.setPath(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0));
         KIO::NetAccess::del(removedTemplate);
-        QListViewItem *it = fctemplates_view->currentItem();
+        TQListViewItem *it = fctemplates_view->currentItem();
         if (it->itemBelow())
         {
             fc_view->setSelected(it->itemBelow(), true);
@@ -429,49 +429,49 @@ void FCConfigWidget::removetemplate_button_clicked( )
 
 void FCConfigWidget::copyToProject_button_clicked()
 {
-    QListViewItem *it = fcglobal_view->currentItem();
+    TQListViewItem *it = fcglobal_view->currentItem();
     if (it)
     {
-        QListViewItem *it_copy_parent = 0;
-        QString destParent;
+        TQListViewItem *it_copy_parent = 0;
+        TQString destParent;
         if (it->parent())
         {
-            it_copy_parent = new QListViewItem(fc_view, it->parent()->text(0),
+            it_copy_parent = new TQListViewItem(fc_view, it->parent()->text(0),
                 it->parent()->text(1),
                 it->parent()->text(2),
                 it->parent()->text(3),
                 locate("data", "kdevfilecreate/file-templates/"+ it->parent()->text(0)));
             destParent += it->parent()->text(0) + "-";
-            QCheckListItem *chk = dynamic_cast(it->parent());
+            TQCheckListItem *chk = dynamic_cast(it->parent());
             if (chk)
                 chk->setOn(false);
         }
-        QListViewItem *it_copy = 0;
+        TQListViewItem *it_copy = 0;
         if (it_copy_parent)
-            it_copy = new QListViewItem(it_copy_parent, it->text(0),
+            it_copy = new TQListViewItem(it_copy_parent, it->text(0),
                 it->text(1),
                 it->text(2),
                 it->text(3),
                 locate("data", "kdevfilecreate/file-templates/"+destParent + it->text(0)));
         else
-            it_copy = new QListViewItem(fc_view, it->text(0),
+            it_copy = new TQListViewItem(fc_view, it->text(0),
                 it->text(1),
                 it->text(2),
                 it->text(3),
                 locate("data", "kdevfilecreate/file-templates/" +destParent+ it->text(0)));
-        QCheckListItem *chk = dynamic_cast(it);
+        TQCheckListItem *chk = dynamic_cast(it);
         if (chk)
             chk->setOn(false);
         fc_view->setSelected(it_copy, true);
         fc_view->setCurrentItem(it_copy);
-        QListViewItem * it_child = it->firstChild();
+        TQListViewItem * it_child = it->firstChild();
         while( it_child ) {
-            new QListViewItem(it_copy, it_child->text(0),
+            new TQListViewItem(it_copy, it_child->text(0),
                 it_child->text(1),
                 it_child->text(2),
                 it_child->text(3),
                 locate("data", "kdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0)));
-            QCheckListItem *chk_child = dynamic_cast(it_child);
+            TQCheckListItem *chk_child = dynamic_cast(it_child);
             if (chk_child)
                 chk_child->setOn(false);
             it_child = it_child->nextSibling();
@@ -482,13 +482,13 @@ void FCConfigWidget::copyToProject_button_clicked()
 void FCConfigWidget::newtype_button_clicked()
 {
     FCTypeEdit *te = new FCTypeEdit();
-    if (te->exec() == QDialog::Accepted )
+    if (te->exec() == TQDialog::Accepted )
     {
-        QListViewItem *it = new QListViewItem(fc_view, te->typeext_edit->text(),
+        TQListViewItem *it = new TQListViewItem(fc_view, te->typeext_edit->text(),
             te->typename_edit->text(),
             te->icon_url->icon(),
             te->typedescr_edit->text(),
-            te->template_url->url().isEmpty() ? QString("create") : te->template_url->url());
+            te->template_url->url().isEmpty() ? TQString("create") : te->template_url->url());
         fc_view->setSelected(it, true);
         fc_view->setCurrentItem(it);
     }
@@ -500,14 +500,14 @@ void FCConfigWidget::newsubtype_button_clicked()
     if (fc_view->currentItem() && (!fc_view->currentItem()->parent()))
     {
         FCTypeEdit *te = new FCTypeEdit(this);
-        if (te->exec() == QDialog::Accepted )
+        if (te->exec() == TQDialog::Accepted )
         {
-            /*QListViewItem *it =*/(void) new QListViewItem(fc_view->currentItem(),
+            /*TQListViewItem *it =*/(void) new TQListViewItem(fc_view->currentItem(),
                 te->typeext_edit->text(),
                 te->typename_edit->text(),
                 te->icon_url->icon(),
                 te->typedescr_edit->text(),
-                te->template_url->url().isEmpty() ? QString("create") : te->template_url->url());
+                te->template_url->url().isEmpty() ? TQString("create") : te->template_url->url());
             fc_view->currentItem()->setOpen(true);
         }
         delete te;
@@ -518,7 +518,7 @@ void FCConfigWidget::remove_button_clicked()
 {
     if (fc_view->currentItem())
     {
-        QListViewItem *it = fc_view->currentItem();
+        TQListViewItem *it = fc_view->currentItem();
         if (it->itemBelow())
         {
             fc_view->setSelected(it->itemBelow(), true);
@@ -536,12 +536,12 @@ void FCConfigWidget::remove_button_clicked()
 
 void FCConfigWidget::moveup_button_clicked()
 {
-    QListViewItem *i = fc_view->currentItem();
+    TQListViewItem *i = fc_view->currentItem();
     if ( !i )
         return;
 
-    QListViewItemIterator it( i );
-    QListViewItem *parent = i->parent();
+    TQListViewItemIterator it( i );
+    TQListViewItem *parent = i->parent();
     --it;
     while ( it.current() ) {
         if ( it.current()->parent() == parent )
@@ -551,7 +551,7 @@ void FCConfigWidget::moveup_button_clicked()
 
     if ( !it.current() )
         return;
-    QListViewItem *other = it.current();
+    TQListViewItem *other = it.current();
 
     other->moveItem( i );
 }
@@ -559,12 +559,12 @@ void FCConfigWidget::moveup_button_clicked()
 
 void FCConfigWidget::movedown_button_clicked()
 {
-    QListViewItem *i = fc_view->currentItem();
+    TQListViewItem *i = fc_view->currentItem();
     if ( !i )
         return;
 
-    QListViewItemIterator it( i );
-    QListViewItem *parent = i->parent();
+    TQListViewItemIterator it( i );
+    TQListViewItem *parent = i->parent();
     it++;
     while ( it.current() ) {
         if ( it.current()->parent() == parent )
@@ -574,7 +574,7 @@ void FCConfigWidget::movedown_button_clicked()
 
     if ( !it.current() )
         return;
-    QListViewItem *other = it.current();
+    TQListViewItem *other = it.current();
 
     i->moveItem( other );
 }
@@ -582,7 +582,7 @@ void FCConfigWidget::movedown_button_clicked()
 
 void FCConfigWidget::edittype_button_clicked()
 {
-    QListViewItem *it = fc_view->currentItem();
+    TQListViewItem *it = fc_view->currentItem();
     if ( it )
     {
         FCTypeEdit *te = new FCTypeEdit(this);
@@ -594,7 +594,7 @@ void FCConfigWidget::edittype_button_clicked()
         if (it->text(4) != "create")
             te->template_url->setURL(it->text(4));
 
-        if (te->exec() == QDialog::Accepted )
+        if (te->exec() == TQDialog::Accepted )
         {
             it->setText(0, te->typeext_edit->text());
             it->setText(1, te->typename_edit->text());
@@ -612,23 +612,23 @@ void FCConfigWidget::edittype_button_clicked()
 void FCConfigWidget::newtemplate_button_clicked()
 {
     FCTemplateEdit *te = new FCTemplateEdit;
-    if (te->exec() == QDialog::Accepted)
+    if (te->exec() == TQDialog::Accepted)
     {
-        /*QListViewItem *it =*/(void) new QListViewItem(fctemplates_view, te->templatename_edit->text(),
-            te->template_url->url().isEmpty() ? QString("create") : te->template_url->url());
+        /*TQListViewItem *it =*/(void) new TQListViewItem(fctemplates_view, te->templatename_edit->text(),
+            te->template_url->url().isEmpty() ? TQString("create") : te->template_url->url());
     }
 }
 
 
 void FCConfigWidget::edittemplate_button_clicked()
 {
-    QListViewItem *it;
+    TQListViewItem *it;
     if ( (it = fctemplates_view->currentItem()) )
     {
         FCTemplateEdit *te = new FCTemplateEdit;
         te->templatename_edit->setText(it->text(0));
         te->templatename_edit->setEnabled(false);
-        if (te->exec() == QDialog::Accepted)
+        if (te->exec() == TQDialog::Accepted)
         {
             if ((te->template_url->url() == "") && ((it->text(1) == "create")))
                 it->setText(1, "create");
@@ -642,14 +642,14 @@ void FCConfigWidget::edit_template_content_button_clicked( )
 {
     if (fctemplates_view->currentItem())
     {
-        QFileInfo fi(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0));
+        TQFileInfo fi(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0));
         KURL content;
         content.setPath(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0));
         if (fi.exists())
             m_part->partController()->editDocument(content);
         else
         {
-            KMessageBox::information(this, i18n("Requested template does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit template content warning");
+            KMessageBox::information(this, i18n("Requested template does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit template content warning");
             fctemplates_view->currentItem()->setPixmap(0, SmallIcon("edit"));
             urlsToEdit.append(content);
         }
@@ -660,13 +660,13 @@ void FCConfigWidget::edit_type_content_button_clicked( )
 {
     if (!fc_view->currentItem())
         return;
-    QListViewItem *it = fc_view->currentItem();
-    QString type_name = it->text(0);
+    TQListViewItem *it = fc_view->currentItem();
+    TQString type_name = it->text(0);
     if (it->parent())
         type_name.prepend(it->parent()->text(0) + "-");
     if (!m_global)
     {
-        QString typePath = m_part->project()->projectDirectory() + "/templates/" + type_name;
+        TQString typePath = m_part->project()->projectDirectory() + "/templates/" + type_name;
         KURL content;
         content.setPath(typePath);
         if (it->text(4).isEmpty())
@@ -674,22 +674,22 @@ void FCConfigWidget::edit_type_content_button_clicked( )
         else
         {
             if (it->text(4) == "create")
-                KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit type template content warning");
+                KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit type template content warning");
             else
-                KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit type template content warning");
+                KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit type template content warning");
             fc_view->currentItem()->setPixmap(0, SmallIcon("edit"));
             urlsToEdit.append(content);
         }
     }
     else
     {
-        QString dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
-        QString typePath = dest + type_name;
+        TQString dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+        TQString typePath = dest + type_name;
         KURL content;
         content.setPath(typePath);
         if (it->text(4).isEmpty())
         {
-            QFileInfo fi(dest+type_name);
+            TQFileInfo fi(dest+type_name);
             if (!fi.exists())
                 copyTemplate(locate("data", "kdevfilecreate/file-templates/" + type_name), dest, type_name);
             m_part->partController()->editDocument(content);
@@ -697,9 +697,9 @@ void FCConfigWidget::edit_type_content_button_clicked( )
         else
         {
             if (it->text(4) == "create")
-                KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit global type template content warning");
+                KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit global type template content warning");
             else
-                KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), QString::null, "Edit global type template content warning");
+                KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit global type template content warning");
             fc_view->currentItem()->setPixmap(0, SmallIcon("edit"));
             urlsToEdit.append(content);
         }
diff --git a/parts/filecreate/fcconfigwidget.h b/parts/filecreate/fcconfigwidget.h
index 52acd29c..c3f5b2ab 100644
--- a/parts/filecreate/fcconfigwidget.h
+++ b/parts/filecreate/fcconfigwidget.h
@@ -11,8 +11,8 @@
 #ifndef FCCONFIGWIDGET_H
 #define FCCONFIGWIDGET_H
 
-#include 
-#include 
+#include 
+#include 
 #include 
 
 #include "fcconfigwidgetbase.h"
@@ -30,7 +30,7 @@ class FCConfigWidget : public FCConfigWidgetBase
 {
 Q_OBJECT
 public:
-    FCConfigWidget(FileCreatePart * part, bool global, QWidget *parent, const char *name);
+    FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name);
 
     ~FCConfigWidget();
 
@@ -50,23 +50,23 @@ public slots:
     void edit_type_content_button_clicked();
 
 protected:
-    void loadGlobalConfig(QListView *view, bool checkmarks = false);
-    void loadProjectConfig(QListView *view);
-    void loadProjectTemplates(QListView *view);
+    void loadGlobalConfig(TQListView *view, bool checkmarks = false);
+    void loadProjectConfig(TQListView *view);
+    void loadProjectTemplates(TQListView *view);
     void saveGlobalConfig();
     void saveProjectConfig();
-    void loadFileTypes(QPtrList list, QListView *view, bool checkmarks = false);
-    void copyTemplate(QString templateUrl, QString dest, QString destName);
-    void saveConfiguration(QDomDocument &dom, QDomElement &element, bool global);
+    void loadFileTypes(TQPtrList list, TQListView *view, bool checkmarks = false);
+    void copyTemplate(TQString templateUrl, TQString dest, TQString destName);
+    void saveConfiguration(TQDomDocument &dom, TQDomElement &element, bool global);
 
 private:
     FileCreatePart * m_part;
-    QPtrList m_globalfiletypes;
-    QPtrList m_projectfiletypes;
-    QPtrList m_projectfiletemplates;
+    TQPtrList m_globalfiletypes;
+    TQPtrList m_projectfiletypes;
+    TQPtrList m_projectfiletemplates;
     bool m_global;
 
-    QValueList urlsToEdit;
+    TQValueList urlsToEdit;
 };
 
 #endif
diff --git a/parts/filecreate/fctemplateedit.cpp b/parts/filecreate/fctemplateedit.cpp
index fc495fd5..b019ddb9 100644
--- a/parts/filecreate/fctemplateedit.cpp
+++ b/parts/filecreate/fctemplateedit.cpp
@@ -9,13 +9,13 @@
  ***************************************************************************/
 #include 
 #include "fctemplateedit.h"
-#include 
+#include 
 
-FCTemplateEdit::FCTemplateEdit(QWidget *parent, const char *name):
+FCTemplateEdit::FCTemplateEdit(TQWidget *parent, const char *name):
     FCTemplateEditBase(parent, name)
 {
-    connect( templatename_edit, SIGNAL(textChanged ( const QString & )),
-             this, SLOT( slotTemplateNameChanged( )));
+    connect( templatename_edit, TQT_SIGNAL(textChanged ( const TQString & )),
+             this, TQT_SLOT( slotTemplateNameChanged( )));
     slotTemplateNameChanged();
 }
 
diff --git a/parts/filecreate/fctemplateedit.h b/parts/filecreate/fctemplateedit.h
index 0209c3b0..8ecf7a81 100644
--- a/parts/filecreate/fctemplateedit.h
+++ b/parts/filecreate/fctemplateedit.h
@@ -11,14 +11,14 @@
 #ifndef FCTEMPLATEEDIT_H
 #define FCTEMPLATEEDIT_H
 
-#include 
+#include 
 #include "fctemplateeditbase.h"
 
 class FCTemplateEdit : public FCTemplateEditBase
 {
 Q_OBJECT
 public:
-    FCTemplateEdit(QWidget *parent=0, const char *name=0);
+    FCTemplateEdit(TQWidget *parent=0, const char *name=0);
 
     ~FCTemplateEdit();
 
diff --git a/parts/filecreate/fctemplateeditbase.ui.h b/parts/filecreate/fctemplateeditbase.ui.h
index 6f2b9223..f4fcfa05 100644
--- a/parts/filecreate/fctemplateeditbase.ui.h
+++ b/parts/filecreate/fctemplateeditbase.ui.h
@@ -17,10 +17,10 @@
 ** place of a destructor.
 *****************************************************************************/
 
-#include 
-#include 
+#include 
+#include 
 
 void FCTemplateEditBase::init()
 {
-    templatename_edit->setValidator(new QRegExpValidator(QRegExp("^\\S*$"), this));
+    templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this));
 }
diff --git a/parts/filecreate/fctypeedit.cpp b/parts/filecreate/fctypeedit.cpp
index 310453ea..5ee4eb0d 100644
--- a/parts/filecreate/fctypeedit.cpp
+++ b/parts/filecreate/fctypeedit.cpp
@@ -9,15 +9,15 @@
  ***************************************************************************/
 
 #include 
-#include 
+#include 
 #include "fctypeedit.h"
 
 
-FCTypeEdit::FCTypeEdit(QWidget *parent, char *name)
+FCTypeEdit::FCTypeEdit(TQWidget *parent, char *name)
  : FCTypeEditBase(parent, name)
 {
-    connect( typeext_edit, SIGNAL( textChanged ( const QString & )),this, SLOT( slotTypeEditTextChanged()));
-    connect( typename_edit, SIGNAL( textChanged ( const QString & )),this, SLOT( slotTypeEditTextChanged( )));
+    connect( typeext_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged()));
+    connect( typename_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged( )));
     slotTypeEditTextChanged( );
 }
 
diff --git a/parts/filecreate/fctypeedit.h b/parts/filecreate/fctypeedit.h
index 92c34e3f..f5a9bf7b 100644
--- a/parts/filecreate/fctypeedit.h
+++ b/parts/filecreate/fctypeedit.h
@@ -18,7 +18,7 @@ class FCTypeEdit : public FCTypeEditBase
 {
 Q_OBJECT
 public:
-    FCTypeEdit(QWidget *parent = 0, char *name = 0);
+    FCTypeEdit(TQWidget *parent = 0, char *name = 0);
 
     ~FCTypeEdit();
 
diff --git a/parts/filecreate/fctypeeditbase.ui.h b/parts/filecreate/fctypeeditbase.ui.h
index e65a2ba7..b9ec29b5 100644
--- a/parts/filecreate/fctypeeditbase.ui.h
+++ b/parts/filecreate/fctypeeditbase.ui.h
@@ -17,10 +17,10 @@
 ** place of a destructor.
 *****************************************************************************/
 
-#include 
-#include 
+#include 
+#include 
 
 void FCTypeEditBase::init()
 {
-    typeext_edit->setValidator(new QRegExpValidator(QRegExp("^\\S*$"), this));
+    typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this));
 }
diff --git a/parts/filecreate/filecreate_filedialog.cpp b/parts/filecreate/filecreate_filedialog.cpp
index 81d711cf..ecc8df42 100644
--- a/parts/filecreate/filecreate_filedialog.cpp
+++ b/parts/filecreate/filecreate_filedialog.cpp
@@ -10,7 +10,7 @@
 
 #include "filecreate_filedialog.h"
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -20,9 +20,9 @@
 
 namespace FileCreate {
 
-  FileDialog::FileDialog(const QString& startDir, const QString& filter,
-                         QWidget *parent, const char *name,
-                         bool modal, QWidget * extraWidget) :
+  FileDialog::FileDialog(const TQString& startDir, const TQString& filter,
+                         TQWidget *parent, const char *name,
+                         bool modal, TQWidget * extraWidget) :
     KFileDialog(startDir, filter, parent, name, modal, extraWidget) {
 
     setOperationMode(Saving);
@@ -30,8 +30,8 @@ namespace FileCreate {
     m_extraWidget = extraWidget;
     m_typeChooser = dynamic_cast(extraWidget);
 
-    connect(this, SIGNAL(filterChanged(const QString &)), this, SLOT(slotActionFilterChanged(const QString &)) );
-    connect(locationEdit, SIGNAL(textChanged(const QString &)), this, SLOT(slotActionTextChanged(const QString &)) );
+    connect(this, TQT_SIGNAL(filterChanged(const TQString &)), this, TQT_SLOT(slotActionFilterChanged(const TQString &)) );
+    connect(locationEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotActionTextChanged(const TQString &)) );
 
   }
 
@@ -43,13 +43,13 @@ namespace FileCreate {
     KFileDialog::initGUI();
   }
 
-  void FileDialog::slotActionFilterChanged(const QString & /*filter*/) {
+  void FileDialog::slotActionFilterChanged(const TQString & /*filter*/) {
   }
 
-  void FileDialog::slotActionTextChanged(const QString & text) {
+  void FileDialog::slotActionTextChanged(const TQString & text) {
     kdDebug(9034) << "slotActionTextChanged - " << text << endl;
     if (!m_typeChooser) return;
-    QString ext = QFileInfo(text).extension();
+    TQString ext = TQFileInfo(text).extension();
     kdDebug(9034) << "Extension is: " << ext << endl;
     FileType * filetype = m_typeChooser->part()->getType(ext);
     if (!filetype) return;
diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h
index 04e40111..b1523648 100644
--- a/parts/filecreate/filecreate_filedialog.h
+++ b/parts/filecreate/filecreate_filedialog.h
@@ -23,20 +23,20 @@ namespace FileCreate {
     Q_OBJECT
 
   public:
-    FileDialog(const QString& startDir, const QString& filter,
-               QWidget *parent, const char *name,
-               bool modal, QWidget * extraWidget);
+    FileDialog(const TQString& startDir, const TQString& filter,
+               TQWidget *parent, const char *name,
+               bool modal, TQWidget * extraWidget);
     virtual ~FileDialog();
 
     virtual void initGUI();
 
   protected:
-    QWidget * m_extraWidget;
+    TQWidget * m_extraWidget;
     TypeChooser * m_typeChooser;
     
   protected slots:
-    void slotActionFilterChanged(const QString & filter);
-    void slotActionTextChanged(const QString & text);
+    void slotActionFilterChanged(const TQString & filter);
+    void slotActionTextChanged(const TQString & text);
 
 
   };
diff --git a/parts/filecreate/filecreate_filetype.h b/parts/filecreate/filecreate_filetype.h
index 9b8e039c..4b050708 100644
--- a/parts/filecreate/filecreate_filetype.h
+++ b/parts/filecreate/filecreate_filetype.h
@@ -11,8 +11,8 @@
 #ifndef __FILECREATE_FILETYPE_H__
 #define __FILECREATE_FILETYPE_H__
 
-#include 
-#include 
+#include 
+#include 
 
 namespace FileCreate {
 
@@ -24,37 +24,37 @@ public:
     m_subtypes.setAutoDelete(true);
   }
 
-  void setName(const QString & name) { m_name = name; }
-  QString name() const { return m_name; }
-  void setExt(const QString & ext) { m_ext = ext; }
-  QString ext() const { return m_ext; }
-  void setCreateMethod(const QString & createMethod) { m_createMethod = createMethod; }
-  QString createMethod() const { return m_createMethod; }
-  void setSubtypeRef(const QString & subtypeRef) { m_subtypeRef = subtypeRef; }
-  QString subtypeRef() const { return m_subtypeRef; }
-  void setIcon(const QString & iconName) { m_iconName = iconName; }
-  QString icon() const { return m_iconName; }
-  void setDescr(const QString & descr) { m_descr = descr; }
-  QString descr() const { return m_descr; }
+  void setName(const TQString & name) { m_name = name; }
+  TQString name() const { return m_name; }
+  void setExt(const TQString & ext) { m_ext = ext; }
+  TQString ext() const { return m_ext; }
+  void setCreateMethod(const TQString & createMethod) { m_createMethod = createMethod; }
+  TQString createMethod() const { return m_createMethod; }
+  void setSubtypeRef(const TQString & subtypeRef) { m_subtypeRef = subtypeRef; }
+  TQString subtypeRef() const { return m_subtypeRef; }
+  void setIcon(const TQString & iconName) { m_iconName = iconName; }
+  TQString icon() const { return m_iconName; }
+  void setDescr(const TQString & descr) { m_descr = descr; }
+  TQString descr() const { return m_descr; }
   void setEnabled(bool on) { m_enabled = on; }
   bool enabled() const { return m_enabled; }
 
   void setSubtypesEnabled(bool enabled = true);
   
   void addSubtype(const FileType * subtype) { m_subtypes.append(subtype); }
-  QPtrList subtypes() const { return m_subtypes; }
+  TQPtrList subtypes() const { return m_subtypes; }
   
 private:
-  QString m_name;
-  QString m_ext;
-  QString m_createMethod;
-  QString m_subtypeRef;
-  QString m_iconName;
-  QString m_descr;
+  TQString m_name;
+  TQString m_ext;
+  TQString m_createMethod;
+  TQString m_subtypeRef;
+  TQString m_iconName;
+  TQString m_descr;
 
   bool m_enabled;
   
-  QPtrList m_subtypes;
+  TQPtrList m_subtypes;
 
 };
 
diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp
index 4b33514f..b6467505 100644
--- a/parts/filecreate/filecreate_listitem.cpp
+++ b/parts/filecreate/filecreate_listitem.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Julian Rockey                                   *
  *   linux@jrockey.com                                                     *
- *   thanks: Roberto Raggi for QSimpleRichText stuff                       *
+ *   thanks: Roberto Raggi for TQSimpleRichText stuff                       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -15,12 +15,12 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 namespace FileCreate {
 
-  ListItem::ListItem(QListView * listview, const FileType * filetype) :
+  ListItem::ListItem(TQListView * listview, const FileType * filetype) :
     KListViewItem(listview), m_filetype(filetype),
     m_filetypeRenderer(NULL)
   {
@@ -43,7 +43,7 @@ namespace FileCreate {
   void ListItem::setup()
   {
     if (m_filetypeRenderer) delete m_filetypeRenderer;
-    m_filetypeRenderer = new QSimpleRichText( text(1), listView()->font() );
+    m_filetypeRenderer = new TQSimpleRichText( text(1), listView()->font() );
     m_filetypeRenderer->setWidth(listView()->columnWidth(1));
     setHeight(m_filetypeRenderer->height());
     KListViewItem::setup();
@@ -61,15 +61,15 @@ namespace FileCreate {
     }
   }
 
-  void ListItem::paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align )
+  void ListItem::paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align )
   {
 
-    QBrush brush( isSelected() ? cg.highlight() : backgroundColor() );
+    TQBrush brush( isSelected() ? cg.highlight() : backgroundColor() );
 
     if( column == 1 ){
 //       m_filetypeRenderer->setWidth(width);
 //       setHeight(m_filetypeRenderer->height());
-      m_filetypeRenderer->draw( p, 0, 0, QRect(0, 0, width, height()), cg, &brush );
+      m_filetypeRenderer->draw( p, 0, 0, TQRect(0, 0, width, height()), cg, &brush );
       return;
     }
 
@@ -79,11 +79,11 @@ namespace FileCreate {
   void ListItem::init()
   {
     m_iconHeight = 0;
-    setText(0, m_filetype->ext()!="" ? QString("." + m_filetype->ext()) : QString("") );
+    setText(0, m_filetype->ext()!="" ? TQString("." + m_filetype->ext()) : TQString("") );
     setText(1, ""+m_filetype->name()+". " + m_filetype->descr() );
 
     KIconLoader * loader = KGlobal::iconLoader();
-    QPixmap iconPix = loader->loadIcon(m_filetype->icon(), KIcon::Desktop,
+    TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), KIcon::Desktop,
                                        KIcon::SizeMedium,
                                        KIcon::DefaultState, NULL,
                                        true);
diff --git a/parts/filecreate/filecreate_listitem.h b/parts/filecreate/filecreate_listitem.h
index 3b2702d3..41651850 100644
--- a/parts/filecreate/filecreate_listitem.h
+++ b/parts/filecreate/filecreate_listitem.h
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Julian Rockey                                   *
  *   linux@jrockey.com                                                     *
- *   thanks: Roberto Raggi for QSimpleRichText stuff                       *
+ *   thanks: Roberto Raggi for TQSimpleRichText stuff                       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -13,7 +13,7 @@
 #define __FILECREATE_LISTITEM_H__
 
 #include 
-#include 
+#include 
 
 #include "filecreate_filetype.h"
 
@@ -24,7 +24,7 @@ namespace FileCreate {
 class ListItem : public KListViewItem {
 
 public:
-  ListItem(QListView *listview, const FileType *filetype);
+  ListItem(TQListView *listview, const FileType *filetype);
   ListItem(ListItem *listitem, const FileType *filetype);
   virtual ~ListItem();
 
@@ -32,14 +32,14 @@ public:
 
   virtual void setup();
   virtual void setHeight( int height );
-  virtual void paintCell( QPainter* p, const QColorGroup& gc, int column, int width, int align );
+  virtual void paintCell( TQPainter* p, const TQColorGroup& gc, int column, int width, int align );
   virtual void prepareResize();
 
 private:
   const FileType *m_filetype;
   int m_iconHeight;
   void init();
-  QSimpleRichText *m_filetypeRenderer;
+  TQSimpleRichText *m_filetypeRenderer;
 
 };
 
diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp
index 2077556c..b4b84de1 100644
--- a/parts/filecreate/filecreate_newfile.cpp
+++ b/parts/filecreate/filecreate_newfile.cpp
@@ -12,13 +12,13 @@
 
 #include "filecreate_newfile.moc"
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -29,31 +29,31 @@
 
 namespace FileCreate {
 
-  NewFileChooser::NewFileChooser(QWidget * parent) :
+  NewFileChooser::NewFileChooser(TQWidget * parent) :
     KDialogBase(KDialogBase::Plain, i18n("New file dialog (title)", "New File"), KDialogBase::Ok|KDialogBase::Cancel,
                 KDialogBase::Ok, parent, "New file", true)
   {
-      QVBoxLayout* lay = new QVBoxLayout( plainPage(), 5, 5 );
+      TQVBoxLayout* lay = new TQVBoxLayout( plainPage(), 5, 5 );
 
-      lay->addWidget( new QLabel( i18n("New File Creation"), plainPage() ) );
+      lay->addWidget( new TQLabel( i18n("New File Creation"), plainPage() ) );
 
-      QGridLayout* grid = new QGridLayout(lay, 2, 2, 5 );
-      QLabel * l = new QLabel(i18n("&Directory:"), plainPage() );
+      TQGridLayout* grid = new TQGridLayout(lay, 2, 2, 5 );
+      TQLabel * l = new TQLabel(i18n("&Directory:"), plainPage() );
       grid->addWidget(l, 0, 0);
       m_urlreq = new KURLRequester( plainPage(), "url request" );
       grid->addWidget(m_urlreq, 0, 1);
       l->setBuddy(m_urlreq);
-      l = new QLabel(i18n("&File name:"), plainPage() );
+      l = new TQLabel(i18n("&File name:"), plainPage() );
       grid->addWidget(l, 1, 0);
       m_filename = new KLineEdit( plainPage() );
       grid->addWidget(m_filename, 1, 1);
       l->setBuddy(m_filename);
 //      lay->addWidget( grid );
 
-      QHBoxLayout* hbox = new QHBoxLayout( lay, 5 );
+      TQHBoxLayout* hbox = new TQHBoxLayout( lay, 5 );
       m_filetypes = new KComboBox( plainPage(), "combo" );
       hbox->addWidget(m_filetypes);
-      m_addToProject = new QCheckBox( i18n("Add to project (on checkbox)", "&Add to project"), plainPage(), "addproject" );
+      m_addToProject = new TQCheckBox( i18n("Add to project (on checkbox)", "&Add to project"), plainPage(), "addproject" );
       hbox->addWidget(m_addToProject);
 
       lay->addStretch(20);
@@ -62,19 +62,19 @@ namespace FileCreate {
       m_addToProject->setChecked( true );
 
       m_urlreq->setMode((int) KFile::Directory);
-      connect( m_filename,  SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotFileNameChanged(const QString & ) ) );
+      connect( m_filename,  TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotFileNameChanged(const TQString & ) ) );
       slotFileNameChanged( m_filename->text() );
   }
 
   NewFileChooser::~NewFileChooser() {
   }
 
-    void NewFileChooser::slotFileNameChanged(const QString & _text)
+    void NewFileChooser::slotFileNameChanged(const TQString & _text)
     {
         enableButtonOK( !_text.isEmpty() );
     }
 
-  void NewFileChooser::setFileTypes(QPtrList filetypes) {
+  void NewFileChooser::setFileTypes(TQPtrList filetypes) {
     for(FileType * filetype = filetypes.first();
 	filetype;
 	filetype=filetypes.next()) {
@@ -84,7 +84,7 @@ namespace FileCreate {
 	if (filetype->subtypes().count()==0)
           addType(filetype);
 
-	QPtrList subtypes = filetype->subtypes();
+	TQPtrList subtypes = filetype->subtypes();
 	for(FileType * subtype = subtypes.first();
 	    subtype;
 	    subtype=subtypes.next()) {
@@ -118,12 +118,12 @@ namespace FileCreate {
   void NewFileChooser::addType(const FileType * filetype) {
     m_typeInCombo[m_filetypes->count()]=filetype;
     m_filetypes->insertItem( filetype->name() +
-                             (filetype->ext()!="" ? QString(" (." + filetype->ext() + ")") : QString("") ) );
+                             (filetype->ext()!="" ? TQString(" (." + filetype->ext() + ")") : TQString("") ) );
   }
 
   void NewFileChooser::setCurrent(const FileType *filetype) {
     int changeToRow = -1;
-    QMap::Iterator it;
+    TQMap::Iterator it;
     for ( it = m_typeInCombo.begin(); it != m_typeInCombo.end() && changeToRow==-1; ++it ) {
       if (it.data()==filetype)
         changeToRow=it.key();
@@ -131,11 +131,11 @@ namespace FileCreate {
     if (changeToRow>-1) m_filetypes->setCurrentItem(changeToRow);
   }
 
-  void NewFileChooser::setDirectory(const QString & url) {
+  void NewFileChooser::setDirectory(const TQString & url) {
     m_urlreq->setURL(url);
   }
 
-  void NewFileChooser::setName(const QString & name) {
+  void NewFileChooser::setName(const TQString & name) {
     m_filename->setText(name);
   }
 
@@ -147,9 +147,9 @@ namespace FileCreate {
 
 	void NewFileChooser::accept()
 	{
-		QString fullPath = url().path();
+		TQString fullPath = url().path();
 		if ( !selectedType()->ext().isEmpty() && !fullPath.endsWith("." + selectedType()->ext())) fullPath+="." + selectedType()->ext();
-		QFileInfo file( fullPath );
+		TQFileInfo file( fullPath );
 		if ( file.exists() )
 		{
 			KMessageBox::sorry( this, i18n("A file with this name already exists"), i18n("File Exists") );
diff --git a/parts/filecreate/filecreate_newfile.h b/parts/filecreate/filecreate_newfile.h
index 5123c7d9..54a4462e 100644
--- a/parts/filecreate/filecreate_newfile.h
+++ b/parts/filecreate/filecreate_newfile.h
@@ -10,8 +10,8 @@
 #ifndef FILECREATE_NEWFILE_H
 #define FILECREATE_NEWFILE_H
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -27,30 +27,30 @@ namespace FileCreate {
   class NewFileChooser : public KDialogBase {
       Q_OBJECT
   public:
-    NewFileChooser(QWidget *parent=0);
+    NewFileChooser(TQWidget *parent=0);
     virtual ~NewFileChooser();
-    void setFileTypes(QPtrList typelist);
+    void setFileTypes(TQPtrList typelist);
     KURL url() const;
     bool addToProject() const;
     const FileType *selectedType() const;
     void setCurrent(const FileType *filetype);
-    void setDirectory(const QString & url);
-    void setName(const QString & name);
+    void setDirectory(const TQString & url);
+    void setName(const TQString & name);
     
     void setInProjectMode(bool m);
   private slots:
-      void slotFileNameChanged(const QString &);
+      void slotFileNameChanged(const TQString &);
   protected:
     void addType(const FileType * filetype);
 	void accept();
 
-    QGridLayout *m_grid;
+    TQGridLayout *m_grid;
     KURLRequester *m_urlreq;
     KComboBox *m_filetypes;
-    QCheckBox *m_addToProject;
+    TQCheckBox *m_addToProject;
     KLineEdit *m_filename;
 
-    QMap m_typeInCombo;
+    TQMap m_typeInCombo;
 
   };
 
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 3733753a..e07656b9 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -9,12 +9,12 @@
  ***************************************************************************/
 #include "filecreate_part.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -61,30 +61,30 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) )
 
 using namespace FileCreate;
 
-FileCreatePart::FileCreatePart(QObject *parent, const char *name, const QStringList & )
+FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & )
 //    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
     : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
 {
   setInstance(FileCreateFactory::instance());
   setXMLFile("kdevpart_filecreate.rc");
 
-  connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
-  connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) );
+  connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
+  connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createProjectConfigPage( i18n("File Templates"), PROJECTSETTINGSPAGE, info()->icon() );
 	_configProxy->createGlobalConfigPage( i18n("File Templates"), GLOBALSETTINGSPAGE, info()->icon() );
-	connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )),
-		this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) );
+	connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
 
-  KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+Qt::Key_N, this, SLOT(slotNewFile()), actionCollection(), "file_new");
+  KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+Qt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new");
   newAction->setWhatsThis( i18n("New file
      Creates a new file. Also adds it the project if the Add to project checkbox is turned on.") );
   newAction->setToolTip( i18n("Create a new file") );
   m_newPopupMenu = newAction->popupMenu();
-  connect(m_newPopupMenu, SIGNAL(aboutToShow()), this, SLOT(slotAboutToShowNewPopupMenu()));
+  connect(m_newPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowNewPopupMenu()));
 
-  QTimer::singleShot( 0, this, SLOT(slotGlobalInitialize()) );
+  TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) );
 }
 
 
@@ -96,7 +96,7 @@ FileCreatePart::~FileCreatePart()
   delete m_subPopups;
 }
 
-void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber )
+void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber )
 {
 	kdDebug() << k_funcinfo << endl;
 
@@ -105,14 +105,14 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, QWidget * page
 		case PROJECTSETTINGSPAGE:
 		{
 			FCConfigWidget* w = new FCConfigWidget( this, false, page, "filecreate config widget" );
-			connect( dlg, SIGNAL( okClicked( ) ), w, SLOT( accept( ) ) );
+			connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) );
 		}
 		break;
 
 		case GLOBALSETTINGSPAGE:
 		{
 			FCConfigWidget *w = new FCConfigWidget( this, true, page, "filecreate config widget" );
-			connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
+			connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
 		}
 		break;
 	}
@@ -132,26 +132,26 @@ void FileCreatePart::slotAboutToShowNewPopupMenu()
 		{
 			if (filetype->subtypes().count()==0)
 			{
-				QPixmap iconPix = m_iconLoader->loadIcon(
+				TQPixmap iconPix = m_iconLoader->loadIcon(
 					filetype->icon(), KIcon::Desktop, KIcon::SizeSmall,
 					KIcon::DefaultState, NULL, true);
 				m_newPopupMenu->insertItem(iconPix, filetype->name(), this,
-					SLOT(slotNewFilePopup(int)), 0, ++id );
+					TQT_SLOT(slotNewFilePopup(int)), 0, ++id );
 				m_newPopupMenu->setItemParameter( id, (long)filetype );
 			} else
 			{
 				KPopupMenu* subMenu = NULL;
-				QPtrList subtypes = filetype->subtypes();
+				TQPtrList subtypes = filetype->subtypes();
 				for(FileType * subtype = subtypes.first(); subtype; subtype=subtypes.next())
 				{
 					if (subtype->enabled()){
 						if( !subMenu )
 							subMenu = new KPopupMenu(0,0);
-						QPixmap iconPix = m_iconLoader->loadIcon(
+						TQPixmap iconPix = m_iconLoader->loadIcon(
 							subtype->icon(), KIcon::Desktop, KIcon::SizeSmall,
 							KIcon::DefaultState, NULL, true);
 						subMenu->insertItem(iconPix, subtype->name(), this,
-							SLOT(slotNewFilePopup(int)), 0, ++id );
+							TQT_SLOT(slotNewFilePopup(int)), 0, ++id );
 						subMenu->setItemParameter( id, (long)subtype );
 					}
 				}
@@ -159,7 +159,7 @@ void FileCreatePart::slotAboutToShowNewPopupMenu()
 				{
 					if( !m_subPopups )
 					{
-						m_subPopups = new QPtrList;
+						m_subPopups = new TQPtrList;
 						m_subPopups->setAutoDelete(true);
 					}
 					m_subPopups->append( subMenu );
@@ -187,10 +187,10 @@ void FileCreatePart::slotNewFile() {
 }
 
 void FileCreatePart::slotProjectOpened() {
-    QTimer::singleShot( 0, this, SLOT(slotInitialize()) );
+    TQTimer::singleShot( 0, this, TQT_SLOT(slotInitialize()) );
 }
 
-void FileCreatePart::addFileType(const QString & filename) {
+void FileCreatePart::addFileType(const TQString & filename) {
   FileType * filetype = getType(filename);
   if (!filetype) {
     filetype = new FileType;
@@ -204,14 +204,14 @@ void FileCreatePart::addFileType(const QString & filename) {
 
 void FileCreatePart::slotProjectClosed() {
   m_filetypes.clear();
-  QTimer::singleShot( 0, this, SLOT(slotGlobalInitialize()) );
+  TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) );
 }
 
 void FileCreatePart::slotFiletypeSelected(const FileType * filetype) {
 
   KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(),
-                                                          QString::null,
-                                                          QString::null,
+                                                          TQString::null,
+                                                          TQString::null,
                                                           filetype->subtypeRef());
 
   openCreatedFile(createdFile);
@@ -226,14 +226,14 @@ void FileCreatePart::openCreatedFile(const KDevCreateFile::CreatedFile & created
   }
 }
 
-int FileCreatePart::readTypes(const QDomDocument & dom, QPtrList &m_filetypes, bool enable) {
+int FileCreatePart::readTypes(const TQDomDocument & dom, TQPtrList &m_filetypes, bool enable) {
   int numRead = 0;
-  QDomElement fileTypes = DomUtil::elementByPath(dom,"/kdevfilecreate/filetypes");
+  TQDomElement fileTypes = DomUtil::elementByPath(dom,"/kdevfilecreate/filetypes");
   if (!fileTypes.isNull()) {
-    for(QDomNode node = fileTypes.firstChild();!node.isNull();node=node.nextSibling()) {
+    for(TQDomNode node = fileTypes.firstChild();!node.isNull();node=node.nextSibling()) {
 
       if (node.isElement() && node.nodeName()=="type") {
-        QDomElement element = node.toElement();
+        TQDomElement element = node.toElement();
         FileType * filetype = new FileType;
         filetype->setName( element.attribute("name") );
         filetype->setExt( element.attribute("ext") );
@@ -248,10 +248,10 @@ int FileCreatePart::readTypes(const QDomDocument & dom, QPtrList &m_fi
         kdDebug(9034) << "node: " << filetype->name().latin1() << endl;
 
         if (node.hasChildNodes()) {
-          for(QDomNode subnode = node.firstChild();!subnode.isNull();subnode=subnode.nextSibling()) {
+          for(TQDomNode subnode = node.firstChild();!subnode.isNull();subnode=subnode.nextSibling()) {
             kdDebug(9034) << "subnode: " << subnode.nodeName().latin1() << endl;
             if (subnode.isElement() && subnode.nodeName()=="subtype") {
-              QDomElement subelement = subnode.toElement();
+              TQDomElement subelement = subnode.toElement();
               FileType * subtype = new FileType;
               subtype->setExt( filetype->ext() );
               subtype->setCreateMethod( filetype->createMethod() );
@@ -270,23 +270,23 @@ int FileCreatePart::readTypes(const QDomDocument & dom, QPtrList &m_fi
   return numRead;
 }
 
-FileType * FileCreatePart::getType(const QString & ex, const QString subtRef) {
+FileType * FileCreatePart::getType(const TQString & ex, const TQString subtRef) {
 
-  QString subtypeRef = subtRef;
-  QString ext = ex;
+  TQString subtypeRef = subtRef;
+  TQString ext = ex;
   int dashPos = ext.find('-');
   if (dashPos>-1 && subtRef.isNull()) {
     ext = ex.left(dashPos);
     subtypeRef = ex.mid(dashPos+1);
   }
 
-  QPtrList filetypes = getFileTypes();
+  TQPtrList filetypes = getFileTypes();
   for(FileType * filetype = filetypes.first();
       filetype;
       filetype=filetypes.next()) {
     if (filetype->ext()==ext) {
       if (subtypeRef.isNull()) return filetype;
-      QPtrList subtypes = filetype->subtypes();
+      TQPtrList subtypes = filetype->subtypes();
       for(FileType * subtype = subtypes.first();
           subtype;
           subtype=subtypes.next()) {
@@ -297,23 +297,23 @@ FileType * FileCreatePart::getType(const QString & ex, const QString subtRef) {
   return NULL;
 }
 
-FileType * FileCreatePart::getEnabledType(const QString & ex, const QString subtRef) {
+FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString subtRef) {
 
-  QString subtypeRef = subtRef;
-  QString ext = ex;
+  TQString subtypeRef = subtRef;
+  TQString ext = ex;
   int dashPos = ext.find('-');
   if (dashPos>-1 && subtRef.isNull()) {
     ext = ex.left(dashPos);
     subtypeRef = ex.mid(dashPos+1);
   }
 
-  QPtrList filetypes = getFileTypes();
+  TQPtrList filetypes = getFileTypes();
   for(FileType * filetype = filetypes.first();
       filetype;
       filetype=filetypes.next()) {
     if (filetype->ext()==ext) {
       if ( (subtypeRef.isNull()) && (filetype->enabled()) ) return filetype;
-      QPtrList subtypes = filetype->subtypes();
+      TQPtrList subtypes = filetype->subtypes();
       for(FileType * subtype = subtypes.first();
           subtype;
           subtype=subtypes.next()) {
@@ -326,7 +326,7 @@ FileType * FileCreatePart::getEnabledType(const QString & ex, const QString subt
 
 // KDevFileCreate interface
 
-KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString dir, QString name, QString subtype)
+KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype)
 {
   KDevCreateFile::CreatedFile result;
 
@@ -358,10 +358,10 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d
   if (!dir.isNull())
     dialog.setDirectory(dir);
   else if (!project())
-    dialog.setDirectory(QDir::currentDirPath());
+    dialog.setDirectory(TQDir::currentDirPath());
   else
   {
-    QString activeDir = project()->activeDirectory();
+    TQString activeDir = project()->activeDirectory();
     dialog.setDirectory( project()->projectDirectory() +
         ( activeDir[0] == '/' ? "" : "/" )
         + activeDir );
@@ -369,7 +369,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d
   if (!name.isNull()) dialog.setName(name);
   if (filetype) dialog.setCurrent(filetype);
 
-  dialog.setInitialSize(QSize(500, 200));
+  dialog.setInitialSize(TQSize(500, 200));
   int dialogResult = dialog.exec();
 
   if (dialogResult == KDialogBase::Rejected) {
@@ -393,11 +393,11 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d
     subtype = selectedFileType->subtypeRef();
   }
 
-  QString fullPath = selectedURL.path();
+  TQString fullPath = selectedURL.path();
   // add appropriate extension, if not already there
   if ( !ext.isEmpty() && !fullPath.endsWith("." + ext)) fullPath+="." + ext;
 
-  QString filename = URLUtil::filename(fullPath);
+  TQString filename = URLUtil::filename(fullPath);
   kdDebug(9034) << "full path = " << fullPath << endl;
 
   // add in subtype, if specified
@@ -410,7 +410,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d
       created = FileTemplate::copy(this, ext, fullPath);
   else {
       // no template, create a blank file instead
-      QFile f(fullPath);
+      TQFile f(fullPath);
       created = f.open( IO_WriteOnly );
       f.close();
   }
@@ -423,8 +423,8 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d
   if (dialog.addToProject())
   {
     // work out the path relative to the project directory
-//    QString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX );
-	  QString relToProj;
+//    TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX );
+	  TQString relToProj;
 	  if( project()->options() & KDevProject::UsesQMakeBuildSystem )
 	  {
 		relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath );
@@ -440,7 +440,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d
   url.setPath(fullPath);
   partController()->editDocument(url);
 
-  QString fileName = URLUtil::filename(fullPath);
+  TQString fileName = URLUtil::filename(fullPath);
   kdDebug(9034) << "file name = " << filename << endl;
 
   result.filename = fileName;
@@ -451,7 +451,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(QString ext, QString d
 }
 
 void FileCreatePart::slotNoteFiletype(const FileType * filetype) {
-  kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : QString::fromLatin1("Null") ) << endl;
+  kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::fromLatin1("Null") ) << endl;
   m_filedialogFiletype = filetype;
 }
 
@@ -463,15 +463,15 @@ void FileCreatePart::slotInitialize( )
   slotGlobalInitialize();
 
   // read in which global templates are to be used for this project
-  QDomElement useGlobalTypes =
+  TQDomElement useGlobalTypes =
     DomUtil::elementByPath(*projectDom(),"/kdevfilecreate/useglobaltypes");
-  for(QDomNode node = useGlobalTypes.firstChild();
+  for(TQDomNode node = useGlobalTypes.firstChild();
       !node.isNull();node=node.nextSibling()) {
 
     if (node.isElement() && node.nodeName()=="type") {
-      QDomElement element = node.toElement();
-      QString ext = element.attribute("ext");
-      QString subtyperef = element.attribute("subtyperef");
+      TQDomElement element = node.toElement();
+      TQString ext = element.attribute("ext");
+      TQString subtyperef = element.attribute("subtyperef");
       // if an extension has been specified as enabled, ensure it
       // and all its subtypes are enabled
       if (subtyperef.isNull()) {
@@ -498,13 +498,13 @@ void FileCreatePart::slotInitialize( )
   if ( project() && readTypes( *projectDom(), m_filetypes, true )==0  ) {
     // default by scanning the templates directory if no template info
     // found in project file
-    QDir templDir( project()->projectDirectory() + "/templates/" );
+    TQDir templDir( project()->projectDirectory() + "/templates/" );
     if (templDir.exists()) {
-      templDir.setFilter( QDir::Files );
+      templDir.setFilter( TQDir::Files );
       const QFileInfoList * list = templDir.entryInfoList();
       if( list ){
         QFileInfoListIterator it( *list );
-        QFileInfo *fi;
+        TQFileInfo *fi;
         while ( (fi = it.current()) != 0 ) {
           addFileType(fi->fileName());
           ++it;
@@ -520,16 +520,16 @@ void FileCreatePart::slotInitialize( )
   }
 }
 
-QString FileCreatePart::findGlobalXMLFile() const
+TQString FileCreatePart::findGlobalXMLFile() const
 {
   int version = 0;
-  QString filename;
-  QStringList filenames = KGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml");
-  for( QStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it )
+  TQString filename;
+  TQStringList filenames = KGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml");
+  for( TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it )
   {
-    QDomDocument globalDom;
+    TQDomDocument globalDom;
     DomUtil::openDOMFile(globalDom,*it);
-    QDomElement e = globalDom.documentElement();
+    TQDomElement e = globalDom.documentElement();
     if( !e.hasAttribute( "version" ) && e.attribute( "version" ).toInt() < version )
     {
       continue;
@@ -545,9 +545,9 @@ QString FileCreatePart::findGlobalXMLFile() const
 void FileCreatePart::slotGlobalInitialize( )
 {
   // read in global template information
-  QString globalXMLFile = findGlobalXMLFile();
+  TQString globalXMLFile = findGlobalXMLFile();
   kdDebug(9034) << "Found global template info info " << globalXMLFile << endl;
-  QDomDocument globalDom;
+  TQDomDocument globalDom;
   if (!globalXMLFile.isNull() && DomUtil::openDOMFile(globalDom,globalXMLFile))
   {
     kdDebug(9034) << "Reading global template info..." << endl;
diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h
index 3cbc9909..605f6fbf 100644
--- a/parts/filecreate/filecreate_part.h
+++ b/parts/filecreate/filecreate_part.h
@@ -14,10 +14,10 @@
 #define __KDEVPART_FILECREATE_H__
 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
+#include 
 #include 
 #include 
 
@@ -42,36 +42,36 @@ class FileCreatePart : public KDevCreateFile
 
   friend class FCConfigWidget;
 public:
-  FileCreatePart(QObject *parent, const char *name, const QStringList &);
+  FileCreatePart(TQObject *parent, const char *name, const TQStringList &);
   virtual ~FileCreatePart();
 
   /**
    * Returns the list of available file types.
    */
-  QPtrList getFileTypes() const { return m_filetypes; }
+  TQPtrList getFileTypes() const { return m_filetypes; }
 
   /**
    * Call this method to create a new file, within or without the project. Supply as
-   * much information as you know. Leave what you don't know as QString::null.
+   * much information as you know. Leave what you don't know as TQString::null.
    * The user will be prompted as necessary for the missing information, and the
    * file created, and added to the project as necessary.
    */
-  virtual KDevCreateFile::CreatedFile createNewFile(QString ext = QString::null,
-                     QString dir = QString::null,
-                     QString name = QString::null,
-                     QString subtype = QString::null);
+  virtual KDevCreateFile::CreatedFile createNewFile(TQString ext = TQString::null,
+                     TQString dir = TQString::null,
+                     TQString name = TQString::null,
+                     TQString subtype = TQString::null);
 
   /**
    * Finds the file type object for a given extension and optionally subtype.
    * You can omit the subtype and specify the extension as ext-subtype if you wish.
    */
-  FileType * getType(const QString & ext, const QString subtype = QString::null);
+  FileType * getType(const TQString & ext, const TQString subtype = TQString::null);
   /**
    * Finds the file type object for a given extension and optionally subtype.
    * You can omit the subtype and specify the extension as ext-subtype if you wish.
    * Returns only enabled type (i.e. used in the project).
    */
-  FileType * getEnabledType(const QString & ext, const QString subtype = QString::null);
+  FileType * getEnabledType(const TQString & ext, const TQString subtype = TQString::null);
 
 public slots:
 
@@ -99,7 +99,7 @@ public slots:
 protected slots:
   void slotNoteFiletype(const FileType * filetype);
   void slotAboutToShowNewPopupMenu();
-  void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int );
+  void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int );
 
 private:
   /**
@@ -112,22 +112,22 @@ private:
    * to the file type list. If enable is true, sets them all to
    * enabled=true by default.
    */
-  int readTypes(const QDomDocument & dom, QPtrList &m_filetypes, bool enable);
+  int readTypes(const TQDomDocument & dom, TQPtrList &m_filetypes, bool enable);
 
   /**
    * Add a file type
    */
-  void addFileType(const QString & filename);
+  void addFileType(const TQString & filename);
 
   /**
    * Finds the global XML file that has the same version as KDevelop
    */
-  QString findGlobalXMLFile() const;
+  TQString findGlobalXMLFile() const;
 
   /**
    * List of file types from which the user can choose
    */
-  QPtrList m_filetypes;
+  TQPtrList m_filetypes;
 
   /**
    * The file type selected by the new file dialog, if appropriate.
@@ -137,7 +137,7 @@ private:
   ConfigWidgetProxy * _configProxy;
 
   KPopupMenu* m_newPopupMenu;
-  QPtrList* m_subPopups;
+  TQPtrList* m_subPopups;
 };
 
 
diff --git a/parts/filecreate/filecreate_typechoosersig.h b/parts/filecreate/filecreate_typechoosersig.h
index 7f16208a..233afe70 100644
--- a/parts/filecreate/filecreate_typechoosersig.h
+++ b/parts/filecreate/filecreate_typechoosersig.h
@@ -1,17 +1,17 @@
 #ifndef __FILECREATE_TYPECHOOSERSIG_H__
 #define __FILECREATE_TYPECHOOSERSIG_H__
 
-#include 
+#include 
 
 namespace FileCreate {
 
 class FileType;
 
-class Signaller : public QObject {
+class Signaller : public TQObject {
   Q_OBJECT
 
 public:
-  Signaller() : QObject() { } 
+  Signaller() : TQObject() { } 
   virtual ~Signaller() { } 
 
   virtual void signal(const FileType * filetype ) {
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index c8e6d051..10816904 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -8,9 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -30,7 +30,7 @@
 namespace FileCreate {
 
   FriendlyWidget::FriendlyWidget(FileCreatePart *part)
-    : QTable(0,4,0), TypeChooser(part), m_selected(NULL)
+    : TQTable(0,4,0), TypeChooser(part), m_selected(NULL)
   {
 
     setReadOnly(true);
@@ -45,7 +45,7 @@ namespace FileCreate {
 
     m_iconLoader = KGlobal::iconLoader();
 
-    QWhatsThis::add(this, i18n("Use this to create new files within your project."));
+    TQWhatsThis::add(this, i18n("Use this to create new files within your project."));
 
     setDefaultColumnWidths();
 
@@ -58,7 +58,7 @@ namespace FileCreate {
 
   void FriendlyWidget::setCurrent(const FileType * current) {
     int changeToRow = -1;
-    QMap::Iterator it;
+    TQMap::Iterator it;
     kdDebug(9034) << "Checking " << current->descr() << " for matches in row..." << endl;
     for ( it = typeForRow.begin(); it != typeForRow.end() && changeToRow==-1; ++it ) {
       kdDebug(9034) << "Checking: " << it.data()->descr() << endl;
@@ -88,12 +88,12 @@ namespace FileCreate {
 
   void FriendlyWidget::refresh() {
 
-    disconnect( this, SIGNAL(currentChanged(int,int)), this, SLOT(slotCellSelected(int,int)) );
+    disconnect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) );
 
     empty();
 
     int row = 0;
-    QPtrList filetypes = m_part->getFileTypes();
+    TQPtrList filetypes = m_part->getFileTypes();
     for(FileType * filetype = filetypes.first();
 	filetype;
 	filetype=filetypes.next()) {
@@ -103,7 +103,7 @@ namespace FileCreate {
 	if (filetype->subtypes().count()==0)
 	  setRow(row++, filetype);
 
-	QPtrList subtypes = filetype->subtypes();
+	TQPtrList subtypes = filetype->subtypes();
 	for(FileType * subtype = subtypes.first();
 	    subtype;
 	    subtype=subtypes.next()) {
@@ -117,7 +117,7 @@ namespace FileCreate {
     resizeCells();
     if (currentSelection()>-1) removeSelection(currentSelection());
 
-    connect( this, SIGNAL(currentChanged(int,int)), this, SLOT(slotCellSelected(int,int)) );
+    connect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) );
 
 
   }
@@ -130,7 +130,7 @@ namespace FileCreate {
     item(row,1)->setWordWrap(true);
     item(row,3)->setWordWrap(true);
     //setRowStretchable(row,true);
-    QPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), KIcon::Desktop, KIcon::SizeMedium,
+    TQPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), KIcon::Desktop, KIcon::SizeMedium,
 					     KIcon::DefaultState, NULL,
 					     true);
     if (!iconPix.isNull()) {
@@ -165,7 +165,7 @@ namespace FileCreate {
     }
 
     m_selected = typeForRow.contains(row) ? typeForRow[row] : NULL;
-    QTimer::singleShot(0, this, SLOT(slotDoSelection()) );
+    TQTimer::singleShot(0, this, TQT_SLOT(slotDoSelection()) );
 
   }
 
@@ -187,11 +187,11 @@ namespace FileCreate {
     int maxHeight = 0;
 
     for(int c=0;csizeHint();
+      TQSize size = i->sizeHint();
       maxHeight = size.height()>maxHeight ? size.height() : maxHeight;
     }
     setRowHeight(row,maxHeight+2); // bit of extra room
@@ -202,11 +202,11 @@ namespace FileCreate {
     int maxWidth = 0;
     for(int r=0;rsizeHint();
+      TQSize size = item(r,col)->sizeHint();
       maxWidth = size.width()>maxWidth ? size.width() : maxWidth;
     }
     setColumnWidth(col,maxWidth+2); // bit of extra room
@@ -215,7 +215,7 @@ namespace FileCreate {
 #if QT_VERSION < 0x030100
   void FriendlyWidget::selectRow(int row) {
     if (numCols()>0 && row
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 //#include 
 
@@ -28,7 +28,7 @@ namespace FileCreate {
 
   class FileType;
 
-  class FriendlyWidget : public QTable, public TypeChooser
+  class FriendlyWidget : public TQTable, public TypeChooser
     {
       Q_OBJECT
 
@@ -86,7 +86,7 @@ namespace FileCreate {
 	/**
 	 * A mapping of each row number to a file type.
 	 */
-	QMap typeForRow;
+	TQMap typeForRow;
 	/**
 	 * The currently selected file type, or null if none.
 	 */
diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp
index f766cbcf..5d307bff 100644
--- a/parts/filecreate/filecreate_widget3.cpp
+++ b/parts/filecreate/filecreate_widget3.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Julian Rockey                                   *
  *   linux@jrockey.com                                                     *
- *   thanks: Roberto Raggi for QSimpleRichText stuff                       *
+ *   thanks: Roberto Raggi for TQSimpleRichText stuff                       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -9,8 +9,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -41,12 +41,12 @@ namespace FileCreate {
     addColumn("");
     addColumn("");
 
-    QWhatsThis::add(this, i18n("New file
      This part makes the creation of new files easier. Select a type in the list to create a file. "
+    TQWhatsThis::add(this, i18n("New file
      This part makes the creation of new files easier. Select a type in the list to create a file. "
         "The list of project file types can be configured in project settings dialog, New File Wizard tab. "
         "Globally available file types are listed and can be configured in KDevelop settings dialog, New File Wizard tab."));
 
 
-    connect( this, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotTypeSelected(QListViewItem*)) );
+    connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotTypeSelected(TQListViewItem*)) );
   }
 
 
@@ -57,7 +57,7 @@ namespace FileCreate {
   void ListWidget::setCurrent(const FileType * current) {
 
     bool found = false;
-    QListViewItem * lvi = firstChild();
+    TQListViewItem * lvi = firstChild();
     while(lvi && !found) {
       ListItem * li = dynamic_cast(lvi);
       if (li) {
@@ -76,7 +76,7 @@ namespace FileCreate {
 
   }
 
-  void ListWidget::resizeEvent(QResizeEvent *event) {
+  void ListWidget::resizeEvent(TQResizeEvent *event) {
     ListItem *li = dynamic_cast(firstChild());
     while(li) {
       li->prepareResize();
@@ -87,12 +87,12 @@ namespace FileCreate {
 
   void ListWidget::refresh() {
     clear();
-    QPtrList filetypes = m_part->getFileTypes();
+    TQPtrList filetypes = m_part->getFileTypes();
     for(FileType * filetype = filetypes.first();
 	filetype!=NULL;
 	filetype=filetypes.next()) {
       if (filetype->enabled()) {
-	QPtrList subtypes = filetype->subtypes();
+	TQPtrList subtypes = filetype->subtypes();
         if (subtypes.count()==0)
           new ListItem( this, filetype );
 	for(FileType * subtype = subtypes.first();
@@ -105,7 +105,7 @@ namespace FileCreate {
     }
   }
 
-  void ListWidget::slotTypeSelected(QListViewItem * item) {
+  void ListWidget::slotTypeSelected(TQListViewItem * item) {
     ListItem * fileitem = dynamic_cast(item);
     if (!fileitem) return;
 
diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h
index 58fc5129..cc2c836e 100644
--- a/parts/filecreate/filecreate_widget3.h
+++ b/parts/filecreate/filecreate_widget3.h
@@ -12,8 +12,8 @@
 #define __FILECREATE_WIDGET3_H__
 
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
@@ -38,10 +38,10 @@ namespace FileCreate {
 
 	virtual void refresh();
 	virtual void setCurrent(const FileType * current);
-        virtual void resizeEvent(QResizeEvent *event);
+        virtual void resizeEvent(TQResizeEvent *event);
 
       public slots:
-	void slotTypeSelected(QListViewItem * item);
+	void slotTypeSelected(TQListViewItem * item);
 
     };
 
diff --git a/parts/filelist/fileinfo.h b/parts/filelist/fileinfo.h
index 845e68e4..8c0e06d5 100644
--- a/parts/filelist/fileinfo.h
+++ b/parts/filelist/fileinfo.h
@@ -23,7 +23,7 @@
 struct FileInfo
 {
   FileInfo() {url = KURL(); line = -1; col = -1; encoding = "";};
-  FileInfo(const KURL & _url, int _line = -1, int _col = -1, QString _encoding = "")
+  FileInfo(const KURL & _url, int _line = -1, int _col = -1, TQString _encoding = "")
      {url = _url; line = _line; col = _col; encoding = _encoding;};
     
   bool operator==(const FileInfo & f) const {return (f.url == url) /*&& (f.line == line) && (f.col ==col)*/;};
@@ -31,7 +31,7 @@ struct FileInfo
   KURL url;
   int line;
   int col;
-  QString encoding;
+  TQString encoding;
 };
 
-typedef QValueList FileInfoList;
+typedef TQValueList FileInfoList;
diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp
index d528cc2c..07817479 100644
--- a/parts/filelist/filelist_item.cpp
+++ b/parts/filelist/filelist_item.cpp
@@ -10,8 +10,8 @@
  ***************************************************************************/
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include "filelist_item.h"
 
@@ -20,8 +20,8 @@
 
 FileListItem * FileListItem::s_activeItem = 0;
 
-FileListItem::FileListItem( QListView * parent, KURL const & url, DocumentState state )
-	: QListViewItem( parent, url.fileName() ),
+FileListItem::FileListItem( TQListView * parent, KURL const & url, DocumentState state )
+	: TQListViewItem( parent, url.fileName() ),
 	_url( url )
 
 {
@@ -64,19 +64,19 @@ void FileListItem::setState( DocumentState state )
 
 void FileListItem::setHeight( int )
 {
-	QListViewItem::setHeight( KIcon::SizeSmall > listView()->fontMetrics().height() ? KIcon::SizeSmall : listView()->fontMetrics().height() );
+	TQListViewItem::setHeight( KIcon::SizeSmall > listView()->fontMetrics().height() ? KIcon::SizeSmall : listView()->fontMetrics().height() );
 }
 
-void FileListItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align )
+void FileListItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align )
 {
-	QColorGroup mcg = cg;
+	TQColorGroup mcg = cg;
 
 	if ( isActive() )
 	{
-		mcg.setColor( QColorGroup::Base, Qt::yellow );
+		mcg.setColor( TQColorGroup::Base, Qt::yellow );
 	}
 
-	QListViewItem::paintCell( p, mcg, column, width, align );
+	TQListViewItem::paintCell( p, mcg, column, width, align );
 }
 
 bool FileListItem::isActive( )
@@ -90,10 +90,10 @@ void FileListItem::setActive( FileListItem * item )
 	s_activeItem = item;
 }
 
-int FileListItem::compare( QListViewItem * i, int col, bool ascending ) const
+int FileListItem::compare( TQListViewItem * i, int col, bool ascending ) const
 {
-	QFileInfo info1( key( col, ascending ) ); //this
-	QFileInfo info2( i->key( col, ascending ) ); //that
+	TQFileInfo info1( key( col, ascending ) ); //this
+	TQFileInfo info2( i->key( col, ascending ) ); //that
     int fileComp = info1.fileName().compare( info2.fileName() );
 	if ( fileComp != 0 )
 		return fileComp;
diff --git a/parts/filelist/filelist_item.h b/parts/filelist/filelist_item.h
index 2b4019b8..7f9f7965 100644
--- a/parts/filelist/filelist_item.h
+++ b/parts/filelist/filelist_item.h
@@ -13,8 +13,8 @@
 #define __FILELIST_ITEM_H__
 
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
@@ -23,7 +23,7 @@
 class FileListItem : public QListViewItem
 {
 public:
-	FileListItem( QListView * parent, KURL const & url, DocumentState = Clean );
+	FileListItem( TQListView * parent, KURL const & url, DocumentState = Clean );
 
 	KURL url();
 
@@ -33,14 +33,14 @@ public:
 	bool isActive();
 	static void setActive( FileListItem * item );
 
-	virtual int compare( QListViewItem * i, int col, bool ascending ) const;
+	virtual int compare( TQListViewItem * i, int col, bool ascending ) const;
 private:
-	virtual void setHeight( int );	// override of QListViewItem::setHeight()
-    virtual void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align ); 	// override of QListViewItem::paintCell()
+	virtual void setHeight( int );	// override of TQListViewItem::setHeight()
+    virtual void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); 	// override of TQListViewItem::paintCell()
 
 	KURL _url;
 	DocumentState _state;
-    QPixmap _icon;
+    TQPixmap _icon;
 
 	static FileListItem * s_activeItem;
 
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 2ef03968..6f494f93 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -11,8 +11,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -34,37 +34,37 @@
  * @param part 
  * @return 
  */
-FileListWidget::FileListWidget(ProjectviewPart *part, QWidget *parent)
- : KListView(parent), QToolTip( viewport() ), _part( part )
+FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *parent)
+ : KListView(parent), TQToolTip( viewport() ), _part( part )
 {
 	addColumn( "" );
 	header()->hide();
 	setRootIsDecorated( false );
-	setResizeMode( QListView::LastColumn );
+	setResizeMode( TQListView::LastColumn );
 	setAllColumnsShowFocus( true );
 
-	setSelectionMode( QListView::Extended );
+	setSelectionMode( TQListView::Extended );
 
-//	connect( _part->partController(), SIGNAL( partAdded(KParts::Part*) ), this, SLOT(partAdded(KParts::Part*)) );
-//	connect( _part->partController(), SIGNAL( partRemoved(KParts::Part*) ), this, SLOT(partRemoved()) );
-	connect( _part->partController(), SIGNAL( partAdded(KParts::Part*) ), this, SLOT(startRefreshTimer()) );
-	connect( _part->partController(), SIGNAL( partRemoved(KParts::Part*) ), this, SLOT(startRefreshTimer()) );
-	connect( _part->partController(), SIGNAL( activePartChanged(KParts::Part*) ), this, SLOT( activePartChanged(KParts::Part* )) );
+//	connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(partAdded(KParts::Part*)) );
+//	connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(partRemoved()) );
+	connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) );
+	connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) );
+	connect( _part->partController(), TQT_SIGNAL( activePartChanged(KParts::Part*) ), this, TQT_SLOT( activePartChanged(KParts::Part* )) );
 
-	connect( this, SIGNAL( executed( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) );
-	connect( this, SIGNAL( returnPressed( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) );
+	connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) );
+	connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) );
 
-	connect( this, SIGNAL( contextMenuRequested ( QListViewItem *, const QPoint & , int ) ),
-		this, SLOT( popupMenu(QListViewItem *, const QPoint & , int ) ) );
+	connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ),
+		this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) );
 
-	connect( _part->partController(), SIGNAL(documentChangedState(const KURL &, DocumentState)),
-		this, SLOT(documentChangedState(const KURL&, DocumentState )) );
+	connect( _part->partController(), TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)),
+		this, TQT_SLOT(documentChangedState(const KURL&, DocumentState )) );
 
-	connect( _part->partController(), SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, SLOT(refreshFileList()) );
+	connect( _part->partController(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, TQT_SLOT(refreshFileList()) );
 
 	setItemMargin(10);
 	
-	connect( &m_refreshTimer, SIGNAL(timeout()), this, SLOT(refreshFileList()) );
+	connect( &m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refreshFileList()) );
 	
 	startRefreshTimer();
 }
@@ -78,17 +78,17 @@ void FileListWidget::startRefreshTimer( )
 	m_refreshTimer.start( 100, true );
 }
 
-void FileListWidget::maybeTip( QPoint const & p )
+void FileListWidget::maybeTip( TQPoint const & p )
 {
 	FileListItem * item = static_cast( itemAt( p ) );
-	QRect r = itemRect( item );
+	TQRect r = itemRect( item );
 
 	if ( item && r.isValid() )
 	{
-		const QPixmap * pixmap = item->pixmap(0);
+		const TQPixmap * pixmap = item->pixmap(0);
 		if ( pixmap && ( p.x() <= pixmap->width() ) )
 		{
-			QString message;
+			TQString message;
 			switch( item->state() )
 			{
 				case Modified:
@@ -129,13 +129,13 @@ FileListItem * FileListWidget::itemForURL( KURL const & url )
 
 void FileListWidget::refreshFileList( )
 {
-	QStringList selections = storeSelections();
+	TQStringList selections = storeSelections();
     int scrollbarPos = verticalScrollBar()->value();
 
 	KListView::clear();
 
 	KURL::List list = _part->partController()->openURLs();
-	QValueListIterator it = list.begin();
+	TQValueListIterator it = list.begin();
 	while ( it != list.end() )
 	{
 		FileListItem * item = new FileListItem( this, *it );
@@ -184,7 +184,7 @@ void FileListWidget::partRemoved()
 }
 */
 
-void FileListWidget::itemClicked( QListViewItem * item )
+void FileListWidget::itemClicked( TQListViewItem * item )
 {
 	if ( !item ) return;
 
@@ -220,15 +220,15 @@ void FileListWidget::documentChangedState( const KURL & url, DocumentState state
 	}
 }
 
-void FileListWidget::popupMenu( QListViewItem * item, const QPoint & p, int )
+void FileListWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int )
 {
 	if ( item )
 	{
 		KPopupMenu popup;
 		popup.insertTitle( i18n("File List") );
-		popup.insertItem( i18n("Close Selected"), this, SLOT(closeSelectedFiles()) );
-		popup.insertItem( i18n("Save Selected"), this, SLOT(saveSelectedFiles()) );
-		popup.insertItem( i18n("Reload Selected"), this, SLOT(reloadSelectedFiles()) );
+		popup.insertItem( i18n("Close Selected"), this, TQT_SLOT(closeSelectedFiles()) );
+		popup.insertItem( i18n("Save Selected"), this, TQT_SLOT(saveSelectedFiles()) );
+		popup.insertItem( i18n("Reload Selected"), this, TQT_SLOT(reloadSelectedFiles()) );
 
 		FileContext context( getSelectedURLs() );
         _part->core()->fillContextMenu( &popup, &context );
@@ -267,10 +267,10 @@ void FileListWidget::reloadSelectedFiles( )
 	_part->partController()->revertFiles( getSelectedURLs() );
 }
 
-QStringList FileListWidget::storeSelections()
+TQStringList FileListWidget::storeSelections()
 {
-	QStringList list;
-	QListViewItem  * item = firstChild();
+	TQStringList list;
+	TQListViewItem  * item = firstChild();
 	while ( item )
 	{
 		if ( item->isSelected()  )
@@ -282,9 +282,9 @@ QStringList FileListWidget::storeSelections()
 	return list;
 }
 
-void FileListWidget::restoreSelections(const QStringList & list)
+void FileListWidget::restoreSelections(const TQStringList & list)
 {
-	QListViewItem * item = firstChild();
+	TQListViewItem * item = firstChild();
 	while ( item )
 	{
 		if ( list.contains( item->text(0) ) )
diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h
index 5895103b..d30aa6f6 100644
--- a/parts/filelist/filelist_widget.h
+++ b/parts/filelist/filelist_widget.h
@@ -19,9 +19,9 @@
 #include 
 #include  // for DocumentState
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "projectviewpart.h"
 		 
@@ -36,32 +36,32 @@ class FileListWidget : public KListView, public QToolTip
     
 public:
 		  
-	FileListWidget(ProjectviewPart *part, QWidget *parent=0);
+	FileListWidget(ProjectviewPart *part, TQWidget *parent=0);
   	~FileListWidget();
 	
 protected:
-  	void maybeTip( QPoint const & );
+  	void maybeTip( TQPoint const & );
 
 private slots:
 //	void partAdded(KParts::Part*);
 //	void partRemoved();
 	void activePartChanged(KParts::Part*);
-	void itemClicked( QListViewItem * );
-	void popupMenu( QListViewItem * , const QPoint & , int );
+	void itemClicked( TQListViewItem * );
+	void popupMenu( TQListViewItem * , const TQPoint & , int );
 	void closeSelectedFiles();
 	void saveSelectedFiles();
 	void reloadSelectedFiles();
 	void documentChangedState( const KURL &, DocumentState );
 	void refreshFileList();
 	void startRefreshTimer();
-	QStringList storeSelections();
-	void restoreSelections( const QStringList & list );
+	TQStringList storeSelections();
+	void restoreSelections( const TQStringList & list );
 
 private:
 	KURL::List getSelectedURLs();
 	FileListItem * itemForURL( KURL const & url );
 
-	QTimer m_refreshTimer;
+	TQTimer m_refreshTimer;
 	ProjectviewPart * _part;
 
 };
diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp
index 2c1ca9b8..0f138e1a 100644
--- a/parts/filelist/projectviewconfig.cpp
+++ b/parts/filelist/projectviewconfig.cpp
@@ -19,13 +19,13 @@
  ***************************************************************************/
 #include "projectviewconfig.h"
 
-#include 
+#include 
 
 #include 
 #include 
 
 
-ProjectviewConfig::ProjectviewConfig(QWidget *parent, const char *name)
+ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name)
     : ProjectviewConfigBase(parent, name)
 {
   KConfig * config = kapp->config();
diff --git a/parts/filelist/projectviewconfig.h b/parts/filelist/projectviewconfig.h
index 447e645b..44195ab0 100644
--- a/parts/filelist/projectviewconfig.h
+++ b/parts/filelist/projectviewconfig.h
@@ -28,7 +28,7 @@ class ProjectviewConfig: public ProjectviewConfigBase
 {
     Q_OBJECT
 public:
-    ProjectviewConfig(QWidget *parent = 0, const char *name = 0);
+    ProjectviewConfig(TQWidget *parent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 9313e7ef..91b46b53 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -24,17 +24,17 @@
 #include "filelist_widget.h"
 #include "toolbarguibuilder.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -68,7 +68,7 @@ K_EXPORT_COMPONENT_FACTORY(libkdevfilelist, projectviewFactory(data))
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-ProjectviewPart::ProjectviewPart(QObject *parent, const char *name, const QStringList &/*args*/)
+ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
     : KDevPlugin(&data, parent, name ? name : "FileListPart")
 {
     setInstance(projectviewFactory::instance());
@@ -79,26 +79,26 @@ ProjectviewPart::ProjectviewPart(QObject *parent, const char *name, const QStrin
     m_configProxy->createGlobalConfigPage(i18n("File List"), GLOBALDOC_OPTIONS, info()->icon());
     m_configProxy->createProjectConfigPage(i18n("File List"), PROJECTDOC_OPTIONS, info()->icon());
 
-    connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int)),
-            this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int)));
+    connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)),
+            this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)));
     
-    connect(core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-            this, SLOT(contextMenu(QPopupMenu *, const Context *)));
+    connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+            this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
             
-    connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()));
-    connect(core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()));
+    connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
+    connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()));
   
     KConfig * config = kapp->config();
     config->setGroup("File List Plugin");
     if (config->readBoolEntry("ToolbarInToolview", true))
     {
-      m_toolbarWidget = new QVBox(0, "toolbarContainer");
+      m_toolbarWidget = new TQVBox(0, "toolbarContainer");
       m_toolbarWidget->setHidden(true);
       m_guibuilder = new ToolbarGUIBuilder(m_toolbarWidget, mainWindow()->main()); 
       setClientBuilder(m_guibuilder);
     }
     m_restored = false;
-    QTimer::singleShot(0, this, SLOT(init()));
+    TQTimer::singleShot(0, this, TQT_SLOT(init()));
 }
 
 ProjectviewPart::~ProjectviewPart()
@@ -111,7 +111,7 @@ ProjectviewPart::~ProjectviewPart()
   }
 }
 
-void ProjectviewPart::restorePartialProjectSession(const QDomElement * el)
+void ProjectviewPart::restorePartialProjectSession(const TQDomElement * el)
 {
     m_projectViews.clear(); // remove the global views
     m_restored = true;
@@ -120,7 +120,7 @@ void ProjectviewPart::restorePartialProjectSession(const QDomElement * el)
         return;
     }
     // get the base of the project
-    QString urlStr = project()->projectDirectory();
+    TQString urlStr = project()->projectDirectory();
     if (KURL::isRelativeURL(urlStr))
     {
         m_projectBase.setProtocol("file");
@@ -132,28 +132,28 @@ void ProjectviewPart::restorePartialProjectSession(const QDomElement * el)
     m_projectBase.adjustPath(+1);  // just in case
     
     // read all the views
-    QDomNodeList domList = el->elementsByTagName("projectview");
+    TQDomNodeList domList = el->elementsByTagName("projectview");
     
     uint len = domList.length();
     for (uint i = 0; i < len; ++i)
     {
-        const QDomElement viewEl = domList.item(i).toElement();
+        const TQDomElement viewEl = domList.item(i).toElement();
         if (viewEl.isNull())
         {
             continue;
         }
         FileInfoList urlList;
-        QDomNodeList fileList = viewEl.elementsByTagName("file");
+        TQDomNodeList fileList = viewEl.elementsByTagName("file");
 
         uint len2 = fileList.length();
         for (uint i2 = 0; i2 < len2; ++i2)
         {
-            const QDomElement fileEl = fileList.item(i2).toElement();
+            const TQDomElement fileEl = fileList.item(i2).toElement();
             if (!fileEl.isNull())
             {
                 bool ok;
                 int line = -1;
-                QString attr = fileEl.attribute("line");
+                TQString attr = fileEl.attribute("line");
                 if (! attr.isNull()) 
                 {
                     line = attr.toInt(&ok);
@@ -168,13 +168,13 @@ void ProjectviewPart::restorePartialProjectSession(const QDomElement * el)
                     if (!ok)
                         col = -1;
                 }
-                QString encoding = "";
+                TQString encoding = "";
                 attr = fileEl.attribute("encoding");
                 if (! attr.isNull())
                 {
                     encoding = attr;
                 }
-                QString urlStr = fileEl.attribute("url");
+                TQString urlStr = fileEl.attribute("url");
                 if (KURL::isRelativeURL(urlStr))
                 {
                     KURL url = m_projectBase;
@@ -201,13 +201,13 @@ void ProjectviewPart::restorePartialProjectSession(const QDomElement * el)
     }
 }
 
-void ProjectviewPart::savePartialProjectSession(QDomElement * el)
+void ProjectviewPart::savePartialProjectSession(TQDomElement * el)
 {
     if (!el || m_projectViews.empty())
     {
         return;
     }
-    QDomDocument domDoc = el->ownerDocument();
+    TQDomDocument domDoc = el->ownerDocument();
     if (domDoc.isNull())
     {
         return;
@@ -217,12 +217,12 @@ void ProjectviewPart::savePartialProjectSession(QDomElement * el)
     for (it = m_projectViews.constBegin(); it != m_projectViews.constEnd(); ++it)
     {
         // we create the view even if there is no file inside, might be wanted by the user
-        QDomElement viewEl = domDoc.createElement("projectview");
+        TQDomElement viewEl = domDoc.createElement("projectview");
         viewEl.setAttribute("name", it.key());
         el->appendChild(viewEl);
         for (FileInfoList::ConstIterator it2 = it.data().constBegin(); it2 != it.data().constEnd(); ++it2)
         {
-            QDomElement urlEl = domDoc.createElement("file");
+            TQDomElement urlEl = domDoc.createElement("file");
             
             if (m_projectBase.isParentOf((*it2).url))
                 urlEl.setAttribute("url", KURL::relativeURL(m_projectBase, (*it2).url));
@@ -235,7 +235,7 @@ void ProjectviewPart::savePartialProjectSession(QDomElement * el)
         }
     }
     // write the default view
-    QDomElement defaultEl = domDoc.createElement("defaultview");
+    TQDomElement defaultEl = domDoc.createElement("defaultview");
     defaultEl.setAttribute("name", m_defaultProjectView);
     el->appendChild(defaultEl);
 }
@@ -246,24 +246,24 @@ void ProjectviewPart::init()
   // delayed initialization stuff goes here
   
   // create the toolview
-  m_widget = new QWidget(0, "filelist widget");
+  m_widget = new TQWidget(0, "filelist widget");
   m_widget->setIcon( SmallIcon(info()->icon()) );
   m_widget->setCaption(i18n("File List"));
   
-  QBoxLayout * l = new QVBoxLayout(m_widget);
+  TQBoxLayout * l = new TQVBoxLayout(m_widget);
   
   // create the toolbar if needed
   if (m_guibuilder)
   {
-    m_toolbarWidget->reparent(m_widget, QPoint(0, 0), true);
+    m_toolbarWidget->reparent(m_widget, TQPoint(0, 0), true);
     l->addWidget(m_toolbarWidget);
-    QWhatsThis::add(m_toolbarWidget, i18n("View Session Toolbar
      This allows to create and work with view sessions. A view session is a set of open documents.
      "));
+    TQWhatsThis::add(m_toolbarWidget, i18n("View Session Toolbar
      This allows to create and work with view sessions. A view session is a set of open documents.
      "));
   }
   
   // create the listview 
-  QWidget * fileListWidget = new FileListWidget(this, m_widget);
+  TQWidget * fileListWidget = new FileListWidget(this, m_widget);
   fileListWidget->setCaption(i18n("File List"));
-  QWhatsThis::add(fileListWidget, i18n("File List
      This is the list of opened files.
      "));
+  TQWhatsThis::add(fileListWidget, i18n("File List
      This is the list of opened files.
      "));
   l->addWidget(fileListWidget);
   m_widget->setFocusProxy(fileListWidget);
   
@@ -277,28 +277,28 @@ void ProjectviewPart::setupActions()
 {
     m_openPrjViewAction = new KSelectAction(i18n("Open Session..."), 0, actionCollection(), "viewsession_open");
     
-    connect(m_openPrjViewAction, SIGNAL(activated(const QString &)), this, SLOT(slotOpenProjectView(const QString &)));
+    connect(m_openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotOpenProjectView(const TQString &)));
     
     m_openPrjViewAction->setToolTip(i18n("Open Session"));
     
-    m_savePrjViewAction = new KAction(i18n("Save Session"), "filesave", 0, this, SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save");
+    m_savePrjViewAction = new KAction(i18n("Save Session"), "filesave", 0, this, TQT_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save");
     
-    m_newPrjViewAction = new KAction(i18n("New Session..."), "filenew", 0, this, SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new");
+    m_newPrjViewAction = new KAction(i18n("New Session..."), "filenew", 0, this, TQT_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new");
     
     m_deletePrjViewAction = new KSelectAction(i18n("Delete Session"), "editdelete", 0, actionCollection(), "viewsession_delete");
     
-    connect(m_deletePrjViewAction, SIGNAL(activated(const QString &)), this, SLOT(slotDeleteProjectView(const QString &)));
+    connect(m_deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &)));
     
     m_deletePrjViewAction->setToolTip(i18n("Delete Session"));
     
-    m_deleteCurrentPrjViewAction = new KAction(i18n("Delete Session"), "editdelete", 0, this, SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent");
+    m_deleteCurrentPrjViewAction = new KAction(i18n("Delete Session"), "editdelete", 0, this, TQT_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent");
     
     m_deleteCurrentPrjViewAction->setToolTip(i18n("Delete Session"));
     
     adjustViewActions();
 }
 
-void ProjectviewPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo)
+void ProjectviewPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo)
 {
 // create configuraton dialogs here
     switch (pageNo)
@@ -306,19 +306,19 @@ void ProjectviewPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page,
         case PROJECTDOC_OPTIONS:
         {
             ProjectviewProjectConfig *w = new ProjectviewProjectConfig(this, page, "project config");
-            connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
+            connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
             break;
         }
         case GLOBALDOC_OPTIONS:
         {
             ProjectviewConfig *w = new ProjectviewConfig(page, "global config");
-            connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
+            connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
             break;
         }
     }
 }
 
-void ProjectviewPart::contextMenu(QPopupMenu */*popup*/, const Context */*context*/)
+void ProjectviewPart::contextMenu(TQPopupMenu */*popup*/, const Context */*context*/)
 {
 // put actions into the context menu here
 //     if (context->hasType(Context::EditorContext))
@@ -332,7 +332,7 @@ void ProjectviewPart::contextMenu(QPopupMenu */*popup*/, const Context */*contex
 //         // or create menu items on the fly
 //         // int id = -1;
 //         // id = popup->insertItem(i18n("Do Something Here"),
-//         //     this, SLOT(doSomething()));
+//         //     this, TQT_SLOT(doSomething()));
 //         // popup->setWhatsThis(id, i18n("Do something here
      Describe here what does this action do."
 //     }
 //     else if (context->hasType(Context::FileContext))
@@ -380,7 +380,7 @@ void ProjectviewPart::projectClosed()
     readConfig();  // read the global project views
 }
 
-void ProjectviewPart::slotOpenProjectView(const QString &view)
+void ProjectviewPart::slotOpenProjectView(const TQString &view)
 {
     KConfig * config = kapp->config();
     config->setGroup("File List Plugin");
@@ -435,7 +435,7 @@ void ProjectviewPart::slotSaveProjectView()
 
 void ProjectviewPart::adjustViewActions()
 {
-    QStringList viewList = getViewList();
+    TQStringList viewList = getViewList();
     
     m_openPrjViewAction->clear();
     m_openPrjViewAction->setItems(viewList);
@@ -462,7 +462,7 @@ void ProjectviewPart::slotDeleteProjectViewCurent()
     slotDeleteProjectView(m_currentProjectView);
 }
 
-void ProjectviewPart::slotDeleteProjectView(const QString& view)
+void ProjectviewPart::slotDeleteProjectView(const TQString& view)
 {
     m_projectViews.remove(view);
     
@@ -484,14 +484,14 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName)
     if (askForName)
     {
         bool ok;
-        QString newProjectView = KInputDialog::getText(i18n("Save View Session As"), i18n("Enter the name of the session:"), "", &ok, mainWindow()->main());
+        TQString newProjectView = KInputDialog::getText(i18n("Save View Session As"), i18n("Enter the name of the session:"), "", &ok, mainWindow()->main());
         if (!ok)
         {
             return;
         }
         newProjectView = newProjectView.remove("="); // we use this string in config files and = would confuse it
         if (m_projectViews.contains(newProjectView) > 0 &&
-            KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("A view session named %1 already exists.
      Do you want to overwrite it?      ").arg(newProjectView), QString::null, i18n("Overwrite")) != KMessageBox::Continue)
+            KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("A view session named %1 already exists.
      Do you want to overwrite it?      ").arg(newProjectView), TQString::null, i18n("Overwrite")) != KMessageBox::Continue)
         {
             return;
         }
@@ -509,10 +509,10 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName)
         KTextEditor::ViewCursorInterface* cursorIf = dynamic_cast(ro_part->widget());
         if (cursorIf)
         {
-            QString encoding;
+            TQString encoding;
             if ( KTextEditor::EncodingInterface * ei = dynamic_cast( ro_part ) )
             {
-                QString temp = ei->encoding();
+                TQString temp = ei->encoding();
                 if ( !temp.isNull() )
                 {
                     encoding = temp;
@@ -544,7 +544,7 @@ void ProjectviewPart::writeConfig()
   for (it = m_projectViews.constBegin(); it != m_projectViews.constEnd(); ++it)
   {
     // we create the view even if there is no file inside, might be wanted by the user
-    QStringList urls;
+    TQStringList urls;
     for (FileInfoList::ConstIterator it2 = it.data().constBegin(); it2 != it.data().constEnd(); ++it2)
     {
       if ((*it2).encoding.isEmpty())
@@ -560,18 +560,18 @@ void ProjectviewPart::writeConfig()
 void ProjectviewPart::readConfig()
 {
   KConfig * config = kapp->config();
-  QMap entries = config->entryMap("ProjectViews");
+  TQMap entries = config->entryMap("ProjectViews");
   
   m_projectViews.clear();
-  QMap::ConstIterator it;
+  TQMap::ConstIterator it;
   for (it = entries.constBegin(); it != entries.constEnd(); ++it)
   {
     FileInfoList urlList;
-    QStringList urls = QStringList::split(",", it.data());
-    for (QStringList::Iterator it2 = urls.begin(); it2 != urls.end(); ++it2 )
+    TQStringList urls = TQStringList::split(",", it.data());
+    for (TQStringList::Iterator it2 = urls.begin(); it2 != urls.end(); ++it2 )
     {
       // search the encoding. The entry can be like: fileURL;encoding
-      QStringList file = QStringList::split(";", *it2);
+      TQStringList file = TQStringList::split(";", *it2);
       if (file.count() == 1)
         urlList.append(FileInfo(KURL::fromPathOrURL(*it2)));
       else
diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h
index dd928f8b..741c4534 100644
--- a/parts/filelist/projectviewpart.h
+++ b/parts/filelist/projectviewpart.h
@@ -23,9 +23,9 @@
 
 #include "fileinfo.h" 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -58,40 +58,40 @@ class ProjectviewPart: public KDevPlugin
   Q_OBJECT
 public:
  
-  typedef QMap ViewMap;
-//   typedef QMap FileInfoMap;
+  typedef TQMap ViewMap;
+//   typedef TQMap FileInfoMap;
   
   
-  ProjectviewPart(QObject *parent, const char *name, const QStringList &args);
+  ProjectviewPart(TQObject *parent, const char *name, const TQStringList &args);
   ~ProjectviewPart();
   
   // reimplemented from KDevPlugin
-  void restorePartialProjectSession(const QDomElement * el);
-  void savePartialProjectSession(QDomElement * el);
+  void restorePartialProjectSession(const TQDomElement * el);
+  void savePartialProjectSession(TQDomElement * el);
   
   /**
   * 
   * @return the current defaut view
   */
-  inline QString getDefaultView() const {return m_defaultProjectView;};
+  inline TQString getDefaultView() const {return m_defaultProjectView;};
   
   /**
   * 
   * @param view new default view
   */
-  inline void setDefaultView(const QString& view) {m_defaultProjectView = view;};
+  inline void setDefaultView(const TQString& view) {m_defaultProjectView = view;};
   
   /**
   * get all current views
-  * @return QStringList of defined views
+  * @return TQStringList of defined views
   */
-  inline QStringList getViewList() const {return m_projectViews.keys();};
+  inline TQStringList getViewList() const {return m_projectViews.keys();};
 
 private slots:
   void init();
   
-  void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo);
-  void contextMenu(QPopupMenu *popup, const Context *context);
+  void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo);
+  void contextMenu(TQPopupMenu *popup, const Context *context);
   void projectOpened();
   void projectClosed();
   
@@ -99,7 +99,7 @@ private slots:
     *
     * @param view name of the project view
     */
-  void slotDeleteProjectView(const QString &view);
+  void slotDeleteProjectView(const TQString &view);
   
   /**
     * Deletes the current project view
@@ -121,7 +121,7 @@ private slots:
     *
     * @param view name of the project view
     */
-  void slotOpenProjectView(const QString &view);
+  void slotOpenProjectView(const TQString &view);
   
 private:
   /**
@@ -152,15 +152,15 @@ private:
   KSelectAction *m_openPrjViewAction;
   KSelectAction *m_deletePrjViewAction;
   
-  QString m_currentProjectView;
-  QString m_defaultProjectView;  // load this after project loaded
+  TQString m_currentProjectView;
+  TQString m_defaultProjectView;  // load this after project loaded
   
   KURL m_projectBase;  // project base folder
   ConfigWidgetProxy *m_configProxy;
 
-  QGuardedPtr m_widget;
-  QGuardedPtr m_guibuilder;
-  QWidget * m_toolbarWidget;
+  TQGuardedPtr m_widget;
+  TQGuardedPtr m_guibuilder;
+  TQWidget * m_toolbarWidget;
   
   bool m_restored;
 };
diff --git a/parts/filelist/projectviewprojectconfig.cpp b/parts/filelist/projectviewprojectconfig.cpp
index 5bcd2427..b411dbbd 100644
--- a/parts/filelist/projectviewprojectconfig.cpp
+++ b/parts/filelist/projectviewprojectconfig.cpp
@@ -24,7 +24,7 @@
 
 #include "projectviewpart.h"
 
-ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, QWidget *parent, const char *name)
+ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent, const char *name)
     : ProjectviewProjectConfigBase(parent, name), m_part(part)
 {
   kComboDefault->clear();
diff --git a/parts/filelist/projectviewprojectconfig.h b/parts/filelist/projectviewprojectconfig.h
index 848f4673..0c36db2f 100644
--- a/parts/filelist/projectviewprojectconfig.h
+++ b/parts/filelist/projectviewprojectconfig.h
@@ -29,7 +29,7 @@ class ProjectviewProjectConfig: public ProjectviewProjectConfigBase
 {
     Q_OBJECT
 public:
-    ProjectviewProjectConfig(ProjectviewPart *part, QWidget *parent = 0, const char *name = 0);
+    ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/parts/filelist/toolbarguibuilder.cpp b/parts/filelist/toolbarguibuilder.cpp
index c48e7496..b4e1a993 100644
--- a/parts/filelist/toolbarguibuilder.cpp
+++ b/parts/filelist/toolbarguibuilder.cpp
@@ -22,7 +22,7 @@
 
 #include 
 
-ToolbarGUIBuilder::ToolbarGUIBuilder(QWidget *parent, QWidget *widget)
+ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget)
   : KXMLGUIBuilder(widget), KToolBar(parent, "ToolbarGUIbuilder"), m_parent(parent)
 {
 //   setHidden(true);
@@ -34,11 +34,11 @@ ToolbarGUIBuilder::~ToolbarGUIBuilder()
 {
 }
 
-QWidget * ToolbarGUIBuilder::createContainer(QWidget *parent, int index, const QDomElement &element, int &id)
+TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id)
 {
   if (element.tagName().lower() == "toolbar")
   {
-    reparent(m_parent, QPoint(0, 0), true);
+    reparent(m_parent, TQPoint(0, 0), true);
     return this;
   } else
   {
@@ -46,12 +46,12 @@ QWidget * ToolbarGUIBuilder::createContainer(QWidget *parent, int index, const Q
   }
 }
 
-void ToolbarGUIBuilder::removeContainer(QWidget *container, QWidget *parent, QDomElement &element, int id)
+void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id)
 {
   if (container == this)
   {
     // i need to reparent to prevent a crash
-    reparent(0, QPoint(0, 0));
+    reparent(0, TQPoint(0, 0));
   }
   else
     KXMLGUIBuilder::removeContainer(container, parent, element, id);
diff --git a/parts/filelist/toolbarguibuilder.h b/parts/filelist/toolbarguibuilder.h
index 183389dc..ec02c371 100644
--- a/parts/filelist/toolbarguibuilder.h
+++ b/parts/filelist/toolbarguibuilder.h
@@ -34,23 +34,23 @@
 class ToolbarGUIBuilder : public KXMLGUIBuilder, public KToolBar
 {
 public:
-  ToolbarGUIBuilder(QWidget *parent, QWidget *widget);
+  ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget);
 
   virtual ~ToolbarGUIBuilder();
   
   /**
   * Called when a new XML gui client is added to the gui factory. 
   */
-  virtual QWidget *createContainer(QWidget *parent, int index, const QDomElement &element, int &id);
+  virtual TQWidget *createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id);
   
   /**
    * Called when a XML gui client is removed the gui factory. 
    * Reimplemented from KXMLGUIBuilder in order to remove our custom toolbar.
    */
-  virtual void removeContainer(QWidget *container, QWidget *parent, QDomElement &element, int id);
+  virtual void removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id);
   
 private:
-  QWidget * m_parent;
+  TQWidget * m_parent;
 };
 
 
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index 20a3d27a..4e30fe50 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -1,10 +1,10 @@
 #include "fileselector_part.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -34,27 +34,27 @@ typedef KDevGenericFactory FileSelectorFactory;
 static const KDevPluginInfo data("kdevfileselector");
 K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) )
 
-FileSelectorPart::FileSelectorPart(QObject *parent, const char *name, const QStringList &)
+FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevPlugin(&data, parent, name ? name : "FileSelectorPart")
 {
     setInstance(FileSelectorFactory::instance());
 
     m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" );
 
-    connect( m_filetree->dirOperator(), SIGNAL(fileSelected(const KFileItem*)),
-	     this, SLOT(fileSelected(const KFileItem*)));
-    connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
+    connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)),
+	     this, TQT_SLOT(fileSelected(const KFileItem*)));
+    connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
 
-    connect( core(), SIGNAL(configWidget(KDialogBase*)), this, SLOT(slotConfigWidget(KDialogBase*)) );
+    connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget(KDialogBase*)) );
 
     m_filetree->setCaption( i18n("File Selector") );
 	m_filetree->setIcon( SmallIcon( info()->icon() ) );
     mainWindow()->embedSelectView( m_filetree, i18n("File Selector"), i18n("File selector") );
-    QWhatsThis::add(m_filetree, i18n("File selector
      This file selector lists directory contents and provides some file management functions."));
+    TQWhatsThis::add(m_filetree, i18n("File selector
      This file selector lists directory contents and provides some file management functions."));
 
     m_filetree->readConfig( instance()->config(), "fileselector" );
 
-    m_newFileAction = new KAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, SLOT(newFile()), this);
+    m_newFileAction = new KAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this);
 }
 
 FileSelectorPart::~FileSelectorPart()
@@ -82,9 +82,9 @@ void FileSelectorPart::slotProjectOpened()
 
 void FileSelectorPart::slotConfigWidget( KDialogBase * dlg )
 {
-	QVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), KIcon::SizeMedium) );
+	TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), KIcon::SizeMedium) );
     KFSConfigPage* page = new KFSConfigPage( vbox, 0, m_filetree );
-    connect( dlg, SIGNAL( okClicked( ) ), page, SLOT( apply( ) ) );
+    connect( dlg, TQT_SIGNAL( okClicked( ) ), page, TQT_SLOT( apply( ) ) );
     // ### implement reload
 }
 
diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h
index d12befb2..ae8012ea 100644
--- a/parts/fileselector/fileselector_part.h
+++ b/parts/fileselector/fileselector_part.h
@@ -6,7 +6,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 class KDevFileSelector;
 class KDialogBase;
@@ -15,7 +15,7 @@ class FileSelectorPart : public KDevPlugin
 {
     Q_OBJECT
 public:
-    FileSelectorPart(QObject *parent, const char *name, const QStringList &);
+    FileSelectorPart(TQObject *parent, const char *name, const TQStringList &);
     virtual ~FileSelectorPart();
 
     KAction *newFileAction() const { return m_newFileAction; }
@@ -32,7 +32,7 @@ private slots:
     void slotConfigWidget( KDialogBase * );
 
 private:
-    QGuardedPtr m_filetree;
+    TQGuardedPtr m_filetree;
     KAction *m_newFileAction;
 };
 
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 8996a0d1..804270e1 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -30,23 +30,23 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -62,7 +62,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -76,7 +76,7 @@ static void silenceQToolBar(QtMsgType, const char *)
 {}
 
 
-KDevFileSelectorToolBar::KDevFileSelectorToolBar(QWidget *parent)
+KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent)
         : KToolBar( parent, "KDev FileSelector Toolbar", true )
 {
     setMinimumWidth(10);
@@ -91,8 +91,8 @@ void KDevFileSelectorToolBar::setMovingEnabled( bool)
 }
 
 
-KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(QWidget *parent)
-        :QFrame(parent),m_tb(0)
+KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent)
+        :TQFrame(parent),m_tb(0)
 {}
 KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent()
 {}
@@ -101,7 +101,7 @@ void KDevFileSelectorToolBarParent::setToolBar(KDevFileSelectorToolBar *tb)
     m_tb=tb;
 }
 
-void KDevFileSelectorToolBarParent::resizeEvent ( QResizeEvent * )
+void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 {
     if (m_tb)
     {
@@ -115,15 +115,15 @@ void KDevFileSelectorToolBarParent::resizeEvent ( QResizeEvent * )
 
 KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow,
                                     KDevPartController *partController,
-                                    QWidget * parent, const char * name )
-        : QWidget(parent, name),
+                                    TQWidget * parent, const char * name )
+        : TQWidget(parent, name),
         m_part(part),
         mainwin(mainWindow),
         partController(partController)
 {
     mActionCollection = new KActionCollection( this );
 
-    QVBoxLayout* lo = new QVBoxLayout(this);
+    TQVBoxLayout* lo = new TQVBoxLayout(this);
 
     QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
 
@@ -136,7 +136,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
     qInstallMsgHandler( oldHandler );
 
     cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
-    cmbPath->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
+    cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
     KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
     cmbPath->setCompletionObject( cmpl );
     lo->addWidget(cmbPath);
@@ -165,65 +165,65 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
 
     bookmarkHandler = new KBookmarkHandler( this, acmBookmarks->popupMenu() );
 
-    QHBox* filterBox = new QHBox(this);
+    TQHBox* filterBox = new TQHBox(this);
 
-    btnFilter = new QToolButton( filterBox );
+    btnFilter = new TQToolButton( filterBox );
     btnFilter->setIconSet( SmallIconSet("filter" ) );
     btnFilter->setToggleButton( true );
     filter = new KHistoryCombo( true, filterBox, "filter");
-    filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
+    filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
     filterBox->setStretchFactor(filter, 2);
-    connect( btnFilter, SIGNAL( clicked() ), this, SLOT( btnFilterClick() ) );
+    connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
     lo->addWidget(filterBox);
 
-    connect( filter, SIGNAL( activated(const QString&) ),
-             SLOT( slotFilterChange(const QString&) ) );
+    connect( filter, TQT_SIGNAL( activated(const TQString&) ),
+             TQT_SLOT( slotFilterChange(const TQString&) ) );
 
-    connect( filter, SIGNAL( textChanged(const QString&) ),
-             SLOT( slotFilterChange(const QString&) ) );
-    connect( filter, SIGNAL( returnPressed(const QString&) ),
-             filter, SLOT( addToHistory(const QString&) ) );
+    connect( filter, TQT_SIGNAL( textChanged(const TQString&) ),
+             TQT_SLOT( slotFilterChange(const TQString&) ) );
+    connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),
+             filter, TQT_SLOT( addToHistory(const TQString&) ) );
 
     // kaction for the dir sync method
     acSyncDir = new KAction( i18n("Current Document Directory"), "dirsynch", 0,
-                             this, SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
+                             this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
     toolbar->setIconText( KToolBar::IconOnly );
     toolbar->setIconSize( 16 );
     toolbar->setEnableContextMenu( false );
 
-    connect( cmbPath, SIGNAL( urlActivated( const KURL&  )),
-             this,  SLOT( cmbPathActivated( const KURL& ) ));
-    connect( cmbPath, SIGNAL( returnPressed( const QString&  )),
-             this,  SLOT( cmbPathReturnPressed( const QString& ) ));
-    connect(dir, SIGNAL(urlEntered(const KURL&)),
-            this, SLOT(dirUrlEntered(const KURL&)) );
+    connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL&  )),
+             this,  TQT_SLOT( cmbPathActivated( const KURL& ) ));
+    connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString&  )),
+             this,  TQT_SLOT( cmbPathReturnPressed( const TQString& ) ));
+    connect(dir, TQT_SIGNAL(urlEntered(const KURL&)),
+            this, TQT_SLOT(dirUrlEntered(const KURL&)) );
 
-    connect(dir, SIGNAL(finishedLoading()),
-            this, SLOT(dirFinishedLoading()) );
+    connect(dir, TQT_SIGNAL(finishedLoading()),
+            this, TQT_SLOT(dirFinishedLoading()) );
 
     // enable dir sync button if current doc has a valid URL
-    connect ( partController, SIGNAL(activePartChanged(KParts::Part*) ),
-              this, SLOT(viewChanged() ) );
+    connect ( partController, TQT_SIGNAL(activePartChanged(KParts::Part*) ),
+              this, TQT_SLOT(viewChanged() ) );
 
     // Connect the bookmark handler
-    connect( bookmarkHandler, SIGNAL( openURL( const QString& )),
-             this, SLOT( setDir( const QString& ) ) );
+    connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
+             this, TQT_SLOT( setDir( const TQString& ) ) );
 
-    waitingUrl = QString::null;
+    waitingUrl = TQString::null;
 
     // whatsthis help
-    QWhatsThis::add
+    TQWhatsThis::add
         ( cmbPath,
                 i18n("
      Here you can enter a path for a directory to display."
                      "
      To go to a directory previously entered, press the arrow on "
                      "the right and choose one. 
      The entry has directory "
                      "completion. Right-click to choose how completion should behave.") );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( filter,
                 i18n("
      Here you can enter a name filter to limit which files are displayed."
                      "
      To clear the filter, toggle off the filter button to the left."
                      "
      To reapply the last filter used, toggle on the filter button." ) );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( btnFilter,
                 i18n("
      This button clears the name filter when toggled off, or "
                      "reapplies the last filter used when toggled on.") );
@@ -237,7 +237,7 @@ KDevFileSelector::~KDevFileSelector()
 
 //BEGIN Public Methods
 
-void KDevFileSelector::readConfig(KConfig *config, const QString & name)
+void KDevFileSelector::readConfig(KConfig *config, const TQString & name)
 {
     dir->readConfig(config, name + ":dir");
     dir->setView( KFile::Default );
@@ -252,11 +252,11 @@ void KDevFileSelector::readConfig(KConfig *config, const QString & name)
     // if we restore history
     if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() )
     {
-        QString loc( config->readPathEntry( "location" ) );
+        TQString loc( config->readPathEntry( "location" ) );
         if ( ! loc.isEmpty() )
         {
             waitingDir = loc;
-            QTimer::singleShot(0, this, SLOT(initialDirChangeHack()));
+            TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack()));
         }
     }
 
@@ -265,7 +265,7 @@ void KDevFileSelector::readConfig(KConfig *config, const QString & name)
     filter->setMaxCount( config->readNumEntry( "filter history len", 9 ) );
     filter->setHistoryItems( config->readListEntry("filter history"), true );
     lastFilter = config->readEntry( "last filter" );
-    QString flt("");
+    TQString flt("");
     if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() )
         flt = config->readEntry("current filter");
     filter->lineEdit()->setText( flt );
@@ -275,11 +275,11 @@ void KDevFileSelector::readConfig(KConfig *config, const QString & name)
     // connect events as needed
     /// @todo - solve startup problem: no need to set location for each doc opened!
     if ( autoSyncEvents & DocumentChanged )
-        connect( partController, SIGNAL( viewChanged() ), this, SLOT( autoSync() ) );
+        connect( partController, TQT_SIGNAL( viewChanged() ), this, TQT_SLOT( autoSync() ) );
 
     if ( autoSyncEvents & DocumentOpened )
-        connect( partController, SIGNAL( partAdded(KParts::Part*) ),
-                 this, SLOT( autoSync(KParts::Part*) ) );
+        connect( partController, TQT_SIGNAL( partAdded(KParts::Part*) ),
+                 this, TQT_SLOT( autoSync(KParts::Part*) ) );
 
 }
 
@@ -291,7 +291,7 @@ void KDevFileSelector::initialDirChangeHack()
 void KDevFileSelector::setupToolbar( KConfig *config )
 {
     toolbar->clear();
-    QStringList tbactions = config->readListEntry( "toolbar actions", ',' );
+    TQStringList tbactions = config->readListEntry( "toolbar actions", ',' );
     if ( tbactions.isEmpty() )
     {
         // resonable collection for default toolbar
@@ -300,7 +300,7 @@ void KDevFileSelector::setupToolbar( KConfig *config )
         "bookmarks" << "sync_dir";
     }
     KAction *ac;
-    for ( QStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it )
+    for ( TQStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it )
     {
         if ( *it == "bookmarks" || *it == "sync_dir" )
             ac = mActionCollection->action( (*it).latin1() );
@@ -311,13 +311,13 @@ void KDevFileSelector::setupToolbar( KConfig *config )
     }
 }
 
-void KDevFileSelector::writeConfig(KConfig *config, const QString & name)
+void KDevFileSelector::writeConfig(KConfig *config, const TQString & name)
 {
     dir->writeConfig(config,name + ":dir");
 
     config->setGroup( name );
     config->writeEntry( "pathcombo history len", cmbPath->maxItems() );
-    QStringList l;
+    TQStringList l;
     for (int i = 0; i < cmbPath->count(); i++)
     {
         l.append( cmbPath->text( i ) );
@@ -341,18 +341,18 @@ void KDevFileSelector::setView(KFile::FileView view)
 
 //BEGIN Public Slots
 
-void KDevFileSelector::slotFilterChange( const QString & nf )
+void KDevFileSelector::slotFilterChange( const TQString & nf )
 {
-    QToolTip::remove( btnFilter );
-    QString f = nf.stripWhiteSpace();
+    TQToolTip::remove( btnFilter );
+    TQString f = nf.stripWhiteSpace();
     bool empty = f.isEmpty() || f == "*";
     if ( empty )
     {
         dir->clearFilter();
-        filter->lineEdit()->setText( QString::null );
-        QToolTip::add
+        filter->lineEdit()->setText( TQString::null );
+        TQToolTip::add
             ( btnFilter,
-                    QString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) );
+                    TQString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) );
     }
     else
     {
@@ -362,7 +362,7 @@ void KDevFileSelector::slotFilterChange( const QString & nf )
             f.append( '*' );
         dir->setNameFilter( f );
         lastFilter = f;
-        QToolTip::add
+        TQToolTip::add
             ( btnFilter, i18n("Clear filter") );
     }
     btnFilter->setOn( !empty );
@@ -385,9 +385,9 @@ void KDevFileSelector::cmbPathActivated( const KURL& u )
     cmbPathReturnPressed( u.url() );
 }
 
-void KDevFileSelector::cmbPathReturnPressed( const QString& u )
+void KDevFileSelector::cmbPathReturnPressed( const TQString& u )
 {
-    QStringList urls = cmbPath->urls();
+    TQStringList urls = cmbPath->urls();
     urls.remove( u );
     urls.prepend( u );
     cmbPath->setURLs( urls, KURLComboBox::RemoveBottom );
@@ -415,7 +415,7 @@ void KDevFileSelector::btnFilterClick()
 {
     if ( !btnFilter->isOn() )
     {
-        slotFilterChange( QString::null );
+        slotFilterChange( TQString::null );
     }
     else
     {
@@ -432,7 +432,7 @@ void KDevFileSelector::autoSync()
     if ( isVisible() )
     {
         setActiveDocumentDir();
-        waitingUrl = QString::null;
+        waitingUrl = TQString::null;
     }
     // else set waiting url
     else
@@ -454,13 +454,13 @@ void KDevFileSelector::autoSync( KParts::Part *part )
     KURL u ( doc->url() );
     if ( u.isEmpty() )
     {
-        waitingUrl = QString::null;
+        waitingUrl = TQString::null;
         return;
     }
     if ( isVisible() )
     {
         setDir( u.directory() );
-        waitingUrl = QString::null;
+        waitingUrl = TQString::null;
     }
     else
     {
@@ -487,39 +487,39 @@ void KDevFileSelector::viewChanged()
 
 //BEGIN Protected
 
-void KDevFileSelector::focusInEvent( QFocusEvent * )
+void KDevFileSelector::focusInEvent( TQFocusEvent * )
 {
     dir->setFocus();
 }
 
-void KDevFileSelector::showEvent( QShowEvent * )
+void KDevFileSelector::showEvent( TQShowEvent * )
 {
     // sync if we should
     if ( autoSyncEvents & GotVisible )
     {
         kdDebug()<<"syncing fs on show"<setVariableWidth() does not yeld a
         satisfying result, something is wrong with the handling of the sizehint.
         And the popup is rather useless, if the paths are only partly visible.
     */
-    QListBox *lb = cmbPath->listBox();
-    if ( o == lb && e->type() == QEvent::Show )
+    TQListBox *lb = cmbPath->listBox();
+    if ( o == lb && e->type() == TQEvent::Show )
     {
         int add
             = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
@@ -530,7 +530,7 @@ bool KDevFileSelector::eventFilter( QObject* o, QEvent *e )
         ///        are changed.
     }
     /// @todo - same thing for the completion popup?
-    return QWidget::eventFilter( o, e );
+    return TQWidget::eventFilter( o, e );
 }
 
 //END Protected
@@ -543,20 +543,20 @@ bool KDevFileSelector::eventFilter( QObject* o, QEvent *e )
 class ActionLBItem : public QListBoxPixmap
 {
 public:
-    ActionLBItem( QListBox *lb=0,
-                  const QPixmap &pm = QPixmap(),
-                  const QString &text=QString::null,
-                  const QString &str=QString::null ) :
-            QListBoxPixmap( lb, pm, text ),
+    ActionLBItem( TQListBox *lb=0,
+                  const TQPixmap &pm = TQPixmap(),
+                  const TQString &text=TQString::null,
+                  const TQString &str=TQString::null ) :
+            TQListBoxPixmap( lb, pm, text ),
             _str(str)
     {}
     ;
-    QString idstring()
+    TQString idstring()
     {
         return _str;
     };
 private:
-    QString _str;
+    TQString _str;
 };
 
 KURL KDevFileSelector::activeDocumentUrl( )
@@ -575,88 +575,88 @@ KURL KDevFileSelector::activeDocumentUrl( )
 ////////////////////////////////////////////////////////////////////////////////
 // KFSConfigPage implementation
 ////////////////////////////////////////////////////////////////////////////////
-KFSConfigPage::KFSConfigPage( QWidget *parent, const char *name, KDevFileSelector *kfs )
-        : QWidget( parent, name ),
+KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs )
+        : TQWidget( parent, name ),
         fileSelector( kfs ),
         bDirty( false )
 {
-    QVBoxLayout *lo = new QVBoxLayout( this );
+    TQVBoxLayout *lo = new TQVBoxLayout( this );
     int spacing = KDialog::spacingHint();
     lo->setSpacing( spacing );
 
     // Toolbar - a lot for a little...
-    QGroupBox *gbToolbar = new QGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this );
+    TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this );
     acSel = new KActionSelector( gbToolbar );
     acSel->setAvailableLabel( i18n("A&vailable actions:") );
     acSel->setSelectedLabel( i18n("S&elected actions:") );
     lo->addWidget( gbToolbar );
-    connect( acSel, SIGNAL( added( QListBoxItem * ) ), this, SLOT( slotChanged() ) );
-    connect( acSel, SIGNAL( removed( QListBoxItem * ) ), this, SLOT( slotChanged() ) );
-    connect( acSel, SIGNAL( movedUp( QListBoxItem * ) ), this, SLOT( slotChanged() ) );
-    connect( acSel, SIGNAL( movedDown( QListBoxItem * ) ), this, SLOT( slotChanged() ) );
+    connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) );
+    connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) );
+    connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) );
+    connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) );
 
     // Sync
-    QGroupBox *gbSync = new QGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this );
-    cbSyncActive = new QCheckBox( i18n("When a docu&ment becomes active"), gbSync );
-    cbSyncOpen = new QCheckBox( i18n("When a document is o&pened"), gbSync );
-    cbSyncShow = new QCheckBox( i18n("When the file selector becomes visible"), gbSync );
+    TQGroupBox *gbSync = new TQGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this );
+    cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync );
+    cbSyncOpen = new TQCheckBox( i18n("When a document is o&pened"), gbSync );
+    cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync );
     lo->addWidget( gbSync );
-    connect( cbSyncActive, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-    connect( cbSyncOpen, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-    connect( cbSyncShow, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
+    connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+    connect( cbSyncOpen, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+    connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
 
     // Histories
-    QHBox *hbPathHist = new QHBox ( this );
-    QLabel *lbPathHist = new QLabel( i18n("Remember &locations:"), hbPathHist );
-    sbPathHistLength = new QSpinBox( hbPathHist );
+    TQHBox *hbPathHist = new TQHBox ( this );
+    TQLabel *lbPathHist = new TQLabel( i18n("Remember &locations:"), hbPathHist );
+    sbPathHistLength = new TQSpinBox( hbPathHist );
     lbPathHist->setBuddy( sbPathHistLength );
     lo->addWidget( hbPathHist );
-    connect( sbPathHistLength, SIGNAL( valueChanged ( int ) ), this, SLOT( slotChanged() ) );
+    connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
 
-    QHBox *hbFilterHist = new QHBox ( this );
-    QLabel *lbFilterHist = new QLabel( i18n("Remember &filters:"), hbFilterHist );
-    sbFilterHistLength = new QSpinBox( hbFilterHist );
+    TQHBox *hbFilterHist = new TQHBox ( this );
+    TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist );
+    sbFilterHistLength = new TQSpinBox( hbFilterHist );
     lbFilterHist->setBuddy( sbFilterHistLength );
     lo->addWidget( hbFilterHist );
-    connect( sbFilterHistLength, SIGNAL( valueChanged ( int ) ), this, SLOT( slotChanged() ) );
+    connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
 
     // Session
-    QGroupBox *gbSession = new QGroupBox( 1, Qt::Horizontal, i18n("Session"), this );
-    cbSesLocation = new QCheckBox( i18n("Restore loca&tion"), gbSession );
-    cbSesFilter = new QCheckBox( i18n("Restore last f&ilter"), gbSession );
+    TQGroupBox *gbSession = new TQGroupBox( 1, Qt::Horizontal, i18n("Session"), this );
+    cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession );
+    cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession );
     lo->addWidget( gbSession );
-    connect( cbSesLocation, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-    connect( cbSesFilter, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
+    connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+    connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
 
     // make it look nice
     lo->addStretch( 1 );
 
     // be helpfull
     /*
-    QWhatsThis::add( lbAvailableActions, i18n(
+    TQWhatsThis::add( lbAvailableActions, i18n(
           "
      Available actions for the toolbar. To add an action, select it here "
           "and press the add (->) button" ) );
-    QWhatsThis::add( lbUsedActions, i18n(
+    TQWhatsThis::add( lbUsedActions, i18n(
           "
      Actions used in the toolbar. To remove an action, select it and "
           "press the remove (<-) button."
           "
      To change the order of the actions, use the Up and Down buttons to "
           "move the selected action.") );
     */
-    QString lhwt( i18n(
+    TQString lhwt( i18n(
                       "
      Decides how many locations to keep in the history of the location "
                       "combo box") );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( lbPathHist, lhwt );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( sbPathHistLength, lhwt );
-    QString fhwt( i18n(
+    TQString fhwt( i18n(
                       "
      Decides how many filters to keep in the history of the filter "
                       "combo box") );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( lbFilterHist, fhwt );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( sbFilterHistLength, fhwt );
-    QString synwt( i18n(
+    TQString synwt( i18n(
                        "
      These options allow you to have the File Selector automatically "
                        "change location to the directory of the active document on certain "
                        "events."
@@ -664,14 +664,14 @@ KFSConfigPage::KFSConfigPage( QWidget *parent, const char *name, KDevFileSelecto
                        "effect until the file selector is visible."
                        "
      None of these are enabled by default, but you can always sync the "
                        "location by pressing the sync button in the toolbar.") );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( gbSync, synwt );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( cbSesLocation, i18n(
                     "
      If this option is enabled (default), the location will be restored "
                     "when you start KDev.
      Note that if the session is "
                     "handled by the KDE session manager, the location is always restored.") );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( cbSesFilter, i18n(
                     "
      If this option is enabled (default), the current filter will be "
                     "restored when you start KDev.
      Note that if the "
@@ -689,8 +689,8 @@ void KFSConfigPage::apply()
     KConfig *config = fileSelector->m_part->instance()->config();
     config->setGroup( "fileselector" );
     // toolbar
-    QStringList l;
-    QListBoxItem *item = acSel->selectedListBox()->firstItem();
+    TQStringList l;
+    TQListBoxItem *item = acSel->selectedListBox()->firstItem();
     ActionLBItem *aItem;
     while ( item )
     {
@@ -713,16 +713,16 @@ void KFSConfigPage::apply()
         s |= KDevFileSelector::GotVisible;
     fileSelector->autoSyncEvents = s;
     // reset connections
-    disconnect( fileSelector->partController, 0, fileSelector, SLOT( autoSync() ) );
+    disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) );
     disconnect( fileSelector->partController, 0,
-                fileSelector, SLOT( autoSync( KParts::Part *) ) );
+                fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) );
     if ( s & KDevFileSelector::DocumentChanged )
-        connect( fileSelector->partController, SIGNAL( viewChanged() ),
-                 fileSelector, SLOT( autoSync() ) );
+        connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ),
+                 fileSelector, TQT_SLOT( autoSync() ) );
     if ( s & KDevFileSelector::DocumentOpened )
         connect( fileSelector->partController,
-                 SIGNAL( partAdded(KParts::Part *) ),
-                 fileSelector, SLOT( autoSync(KParts::Part *) ) );
+                 TQT_SIGNAL( partAdded(KParts::Part *) ),
+                 fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) );
 
     // histories
     fileSelector->cmbPath->setMaxItems( sbPathHistLength->value() );
@@ -744,23 +744,23 @@ void KFSConfigPage::init()
     KConfig *config = fileSelector->m_part->instance()->config();
     config->setGroup( "fileselector" );
     // toolbar
-    QStringList l = config->readListEntry( "toolbar actions", ',' );
+    TQStringList l = config->readListEntry( "toolbar actions", ',' );
     if ( l.isEmpty() ) // default toolbar
         l << "up" << "back" << "forward" << "home" <<
         "short view" << "detailed view" <<
         "bookmarks" << "sync_dir";
 
     // actions from diroperator + two of our own
-    QStringList allActions;
+    TQStringList allActions;
     allActions << "up" << "back" << "forward" << "home" <<
     "reload" << "mkdir" << "delete" <<
     "short view" << "detailed view" /*<< "view menu" <<
                       "show hidden" << "properties"*/ <<
     "bookmarks" << "sync_dir";
-    QRegExp re("&(?=[^&])");
+    TQRegExp re("&(?=[^&])");
     KAction *ac;
-    QListBox *lb;
-    for ( QStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it )
+    TQListBox *lb;
+    for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it )
     {
         lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
         if ( *it == "bookmarks" || *it == "sync_dir" )
@@ -793,7 +793,7 @@ void KFSConfigPage::slotChanged()
 
 //BEGIN KDevDirOperator
 
-void KDevDirOperator::activatedMenu( const KFileItem *fi, const QPoint & pos )
+void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
 {
     setupMenu();
     updateSelectionDependentActions();
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index d39fd25d..4811c398 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -22,11 +22,11 @@
 #ifndef FILESELECTOR_WIDGET_H
 #define FILESELECTOR_WIDGET_H
 
-#include 
+#include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 class KDevMainWindow;
@@ -61,7 +61,7 @@ class KDevFileSelectorToolBar: public KToolBar
 {
     Q_OBJECT
 public:
-    KDevFileSelectorToolBar(QWidget *parent);
+    KDevFileSelectorToolBar(TQWidget *parent);
     virtual ~KDevFileSelectorToolBar();
 
     virtual void setMovingEnabled( bool b );
@@ -71,7 +71,7 @@ class KDevFileSelectorToolBarParent: public QFrame
 {
     Q_OBJECT
 public:
-    KDevFileSelectorToolBarParent(QWidget *parent);
+    KDevFileSelectorToolBarParent(TQWidget *parent);
     ~KDevFileSelectorToolBarParent();
     void setToolBar(KDevFileSelectorToolBar *tb);
 
@@ -79,20 +79,20 @@ private:
     KDevFileSelectorToolBar *m_tb;
 
 protected:
-    virtual void resizeEvent ( QResizeEvent * );
+    virtual void resizeEvent ( TQResizeEvent * );
 };
 
 class KDevDirOperator: public KDirOperator
 {
     Q_OBJECT
 public:
-    KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), QWidget *parent=0, const char *name=0)
+    KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0)
         :KDirOperator(urlName, parent, name), m_part(part)
     {
     }
 
 protected slots:
-    virtual void activatedMenu (const KFileItem *fi, const QPoint &pos);
+    virtual void activatedMenu (const KFileItem *fi, const TQPoint &pos);
 
 private:
     FileSelectorPart *m_part;
@@ -109,24 +109,24 @@ public:
     enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 };
 
     KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0,
-                      QWidget * parent = 0, const char * name = 0 );
+                      TQWidget * parent = 0, const char * name = 0 );
     ~KDevFileSelector();
 
-    void readConfig( KConfig *, const QString & );
-    void writeConfig( KConfig *, const QString & );
+    void readConfig( KConfig *, const TQString & );
+    void writeConfig( KConfig *, const TQString & );
     void setupToolbar( KConfig * );
     void setView( KFile::FileView );
     KDevDirOperator *dirOperator(){ return dir; }
     KActionCollection *actionCollection() { return mActionCollection; };
 
 public slots:
-    void slotFilterChange(const QString&);
+    void slotFilterChange(const TQString&);
     void setDir(KURL);
-    void setDir( const QString& url ) { setDir( KURL( url ) ); };
+    void setDir( const TQString& url ) { setDir( KURL( url ) ); };
 
 private slots:
     void cmbPathActivated( const KURL& u );
-    void cmbPathReturnPressed( const QString& u );
+    void cmbPathReturnPressed( const TQString& u );
     void dirUrlEntered( const KURL& u );
     void dirFinishedLoading();
     void setActiveDocumentDir();
@@ -136,9 +136,9 @@ private slots:
     void autoSync( KParts::Part * );
 	void initialDirChangeHack();
 protected:
-    void focusInEvent( QFocusEvent * );
-    void showEvent( QShowEvent * );
-    bool eventFilter( QObject *, QEvent * );
+    void focusInEvent( TQFocusEvent * );
+    void showEvent( TQShowEvent * );
+    bool eventFilter( TQObject *, TQEvent * );
     KURL activeDocumentUrl();
 
 private:
@@ -149,16 +149,16 @@ private:
     KDevDirOperator * dir;
     class KAction *acSyncDir;
     KHistoryCombo * filter;
-    class QToolButton *btnFilter;
+    class TQToolButton *btnFilter;
 
     FileSelectorPart *m_part;
     KDevMainWindow *mainwin;
     KDevPartController *partController;
 
-    QString lastFilter;
+    TQString lastFilter;
     int autoSyncEvents; // enabled autosync events
-    QString waitingUrl; // maybe display when we gets visible
-    QString waitingDir;
+    TQString waitingUrl; // maybe display when we gets visible
+    TQString waitingDir;
 };
 
 /*  @todo anders
@@ -178,7 +178,7 @@ class KFSConfigPage : public QWidget
 {
     Q_OBJECT
 public:
-    KFSConfigPage( QWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0);
+    KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0);
     virtual ~KFSConfigPage() {};
 
 public slots:
@@ -191,11 +191,11 @@ private:
 
     KDevFileSelector *fileSelector;
     bool bDirty;
-    //class QListBox *lbAvailableActions, *lbUsedActions;
+    //class TQListBox *lbAvailableActions, *lbUsedActions;
     KActionSelector *acSel;
-    class QSpinBox *sbPathHistLength, *sbFilterHistLength;
-    class QCheckBox *cbSyncOpen, *cbSyncActive, *cbSyncShow;
-    class QCheckBox *cbSesLocation, *cbSesFilter;
+    class TQSpinBox *sbPathHistLength, *sbFilterHistLength;
+    class TQCheckBox *cbSyncOpen, *cbSyncActive, *cbSyncShow;
+    class TQCheckBox *cbSesLocation, *cbSesFilter;
 };
 
 
diff --git a/parts/fileselector/kactionselector.cpp b/parts/fileselector/kactionselector.cpp
index eec95a6d..a3c4034d 100644
--- a/parts/fileselector/kactionselector.cpp
+++ b/parts/fileselector/kactionselector.cpp
@@ -23,38 +23,38 @@
 #include 
 #include  // for spacingHint()
 #include 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 class KActionSelectorPrivate {
   public:
-  QListBox *availableListBox, *selectedListBox;
-  QToolButton *btnAdd, *btnRemove, *btnUp, *btnDown;
-  QLabel *lAvailable, *lSelected;
+  TQListBox *availableListBox, *selectedListBox;
+  TQToolButton *btnAdd, *btnRemove, *btnUp, *btnDown;
+  TQLabel *lAvailable, *lSelected;
   bool moveOnDoubleClick, keyboardEnabled;
   KActionSelector::ButtonIconSize iconSize;
-  QString addIcon, removeIcon, upIcon, downIcon;
+  TQString addIcon, removeIcon, upIcon, downIcon;
   KActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy;
   bool showUpDownButtons;
 };
 
 //BEGIN Constructor/destructor
 
-KActionSelector::KActionSelector( QWidget *parent, const char *name )
-  : QWidget( parent, name )
+KActionSelector::KActionSelector( TQWidget *parent, const char *name )
+  : TQWidget( parent, name )
 {
   d = new KActionSelectorPrivate();
   d->moveOnDoubleClick = true;
   d->keyboardEnabled = true;
   d->iconSize = SmallIcon;
-  d->addIcon = QApplication::reverseLayout() ? "back" : "forward";
-  d->removeIcon = QApplication::reverseLayout() ? "forward" : "back";
+  d->addIcon = TQApplication::reverseLayout() ? "back" : "forward";
+  d->removeIcon = TQApplication::reverseLayout() ? "forward" : "back";
   d->upIcon = "up";
   d->downIcon = "down";
   d->availableInsertionPolicy = Sorted;
@@ -63,53 +63,53 @@ KActionSelector::KActionSelector( QWidget *parent, const char *name )
 
   //int isz = IconSize( KIcon::Small );
 
-  QHBoxLayout *lo = new QHBoxLayout( this );
+  TQHBoxLayout *lo = new TQHBoxLayout( this );
   lo->setSpacing( KDialog::spacingHint() );
 
-  QVBoxLayout *loAv = new QVBoxLayout( lo );
-  d->lAvailable = new QLabel( i18n("&Available:"), this );
+  TQVBoxLayout *loAv = new TQVBoxLayout( lo );
+  d->lAvailable = new TQLabel( i18n("&Available:"), this );
   loAv->addWidget( d->lAvailable );
-  d->availableListBox = new QListBox( this );
+  d->availableListBox = new TQListBox( this );
   loAv->addWidget( d->availableListBox );
   d->lAvailable->setBuddy( d->availableListBox );
 
-  QVBoxLayout *loHBtns = new QVBoxLayout( lo );
+  TQVBoxLayout *loHBtns = new TQVBoxLayout( lo );
   loHBtns->addStretch( 1 );
-  d->btnAdd = new QToolButton( this );
+  d->btnAdd = new TQToolButton( this );
   loHBtns->addWidget( d->btnAdd );
-  d->btnRemove = new QToolButton( this );
+  d->btnRemove = new TQToolButton( this );
   loHBtns->addWidget( d->btnRemove );
   loHBtns->addStretch( 1 );
 
-  QVBoxLayout *loS = new QVBoxLayout( lo );
-  d->lSelected = new QLabel( i18n("&Selected:"), this );
+  TQVBoxLayout *loS = new TQVBoxLayout( lo );
+  d->lSelected = new TQLabel( i18n("&Selected:"), this );
   loS->addWidget( d->lSelected );
-  d->selectedListBox = new QListBox( this );
+  d->selectedListBox = new TQListBox( this );
   loS->addWidget( d->selectedListBox );
   d->lSelected->setBuddy( d->selectedListBox );
 
-  QVBoxLayout *loVBtns = new QVBoxLayout( lo );
+  TQVBoxLayout *loVBtns = new TQVBoxLayout( lo );
   loVBtns->addStretch( 1 );
-  d->btnUp = new QToolButton( this );
+  d->btnUp = new TQToolButton( this );
   loVBtns->addWidget( d->btnUp );
-  d->btnDown = new QToolButton( this );
+  d->btnDown = new TQToolButton( this );
   loVBtns->addWidget( d->btnDown );
   loVBtns->addStretch( 1 );
 
   loadIcons();
 
-  connect( d->btnAdd, SIGNAL(clicked()), this, SLOT(buttonAddClicked()) );
-  connect( d->btnRemove, SIGNAL(clicked()), this, SLOT(buttonRemoveClicked()) );
-  connect( d->btnUp, SIGNAL(clicked()), this, SLOT(buttonUpClicked()) );
-  connect( d->btnDown, SIGNAL(clicked()), this, SLOT(buttonDownClicked()) );
-  connect( d->availableListBox, SIGNAL(doubleClicked(QListBoxItem*)),
-           this, SLOT(itemDoubleClicked(QListBoxItem*)) );
-  connect( d->selectedListBox, SIGNAL(doubleClicked(QListBoxItem*)),
-           this, SLOT(itemDoubleClicked(QListBoxItem*)) );
-  connect( d->availableListBox, SIGNAL(currentChanged(QListBoxItem*)),
-           this, SLOT(slotCurrentChanged(QListBoxItem *)) );
-  connect( d->selectedListBox, SIGNAL(currentChanged(QListBoxItem*)),
-           this, SLOT(slotCurrentChanged(QListBoxItem *)) );
+  connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) );
+  connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) );
+  connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) );
+  connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) );
+  connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
+           this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) );
+  connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
+           this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) );
+  connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)),
+           this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) );
+  connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)),
+           this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) );
 
   d->availableListBox->installEventFilter( this );
   d->selectedListBox->installEventFilter( this );
@@ -124,17 +124,17 @@ KActionSelector::~KActionSelector()
 
 //BEGIN Public Methods
 
-QListBox *KActionSelector::availableListBox()
+TQListBox *KActionSelector::availableListBox()
 {
   return d->availableListBox;
 }
 
-QListBox *KActionSelector::selectedListBox()
+TQListBox *KActionSelector::selectedListBox()
 {
   return d->selectedListBox;
 }
 
-void KActionSelector::setButtonIcon( const QString &icon, MoveButton button )
+void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
 {
   switch ( button )
   {
@@ -159,7 +159,7 @@ void KActionSelector::setButtonIcon( const QString &icon, MoveButton button )
   }
 }
 
-void KActionSelector::setButtonIconSet( const QIconSet &iconset, MoveButton button )
+void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button )
 {
   switch ( button )
   {
@@ -180,7 +180,7 @@ void KActionSelector::setButtonIconSet( const QIconSet &iconset, MoveButton butt
   }
 }
 
-void KActionSelector::setButtonTooltip( const QString &tip, MoveButton button )
+void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
 {
   switch ( button )
   {
@@ -201,21 +201,21 @@ void KActionSelector::setButtonTooltip( const QString &tip, MoveButton button )
   }
 }
 
-void KActionSelector::setButtonWhatsThis( const QString &text, MoveButton button )
+void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button )
 {
   switch ( button )
   {
     case ButtonAdd:
-    QWhatsThis::add( d->btnAdd, text );
+    TQWhatsThis::add( d->btnAdd, text );
     break;
     case ButtonRemove:
-    QWhatsThis::add( d->btnRemove, text );
+    TQWhatsThis::add( d->btnRemove, text );
     break;
     case ButtonUp:
-    QWhatsThis::add( d->btnUp, text );
+    TQWhatsThis::add( d->btnUp, text );
     break;
     case ButtonDown:
-    QWhatsThis::add( d->btnDown, text );
+    TQWhatsThis::add( d->btnDown, text );
     break;
     default:
     kdDebug()<<"KActionSelector::setButtonWhatsThis: DAINBREAD!"<keyboardEnabled = b;
 }
 
-QString KActionSelector::availableLabel() const
+TQString KActionSelector::availableLabel() const
 {
   return d->lAvailable->text();
 }
 
-void KActionSelector::setAvailableLabel( const QString &text )
+void KActionSelector::setAvailableLabel( const TQString &text )
 {
   d->lAvailable->setText( text );
 }
 
-QString KActionSelector::selectedLabel() const
+TQString KActionSelector::selectedLabel() const
 {
   return d->lSelected->text();
 }
 
-void KActionSelector::setSelectedLabel( const QString &text )
+void KActionSelector::setSelectedLabel( const TQString &text )
 {
   d->lSelected->setText( text );
 }
@@ -339,7 +339,7 @@ void KActionSelector::polish()
 //END Public Slots
 
 //BEGIN Protected
-void KActionSelector::keyPressEvent( QKeyEvent *e )
+void KActionSelector::keyPressEvent( TQKeyEvent *e )
 {
   if ( ! d->keyboardEnabled ) return;
   if ( (e->state() & Qt::ControlButton) )
@@ -365,13 +365,13 @@ void KActionSelector::keyPressEvent( QKeyEvent *e )
   }
 }
 
-bool KActionSelector::eventFilter( QObject *o, QEvent *e )
+bool KActionSelector::eventFilter( TQObject *o, TQEvent *e )
 {
-  if ( d->keyboardEnabled && e->type() == QEvent::KeyPress )
+  if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress )
   {
-    if  ( (((QKeyEvent*)e)->state() & Qt::ControlButton) )
+    if  ( (((TQKeyEvent*)e)->state() & Qt::ControlButton) )
     {
-      switch ( ((QKeyEvent*)e)->key() )
+      switch ( ((TQKeyEvent*)e)->key() )
       {
         case Key_Right:
         buttonAddClicked();
@@ -386,18 +386,18 @@ bool KActionSelector::eventFilter( QObject *o, QEvent *e )
         buttonDownClicked();
         break;
         default:
-        return QWidget::eventFilter( o, e );
+        return TQWidget::eventFilter( o, e );
         break;
       }
       return true;
     }
-    else if ( o->inherits( "QListBox" ) )
+    else if ( o->inherits( "TQListBox" ) )
     {
-      switch ( ((QKeyEvent*)e)->key() )
+      switch ( ((TQKeyEvent*)e)->key() )
       {
         case Key_Return:
         case Key_Enter:
-        QListBox *lb = (QListBox*)o;
+        TQListBox *lb = (TQListBox*)o;
         int index = lb->currentItem();
         if ( index < 0 ) break;
         moveItem( lb->item( index ) );
@@ -405,7 +405,7 @@ bool KActionSelector::eventFilter( QObject *o, QEvent *e )
       }
     }
   }
-  return QWidget::eventFilter( o, e );
+  return TQWidget::eventFilter( o, e );
 }
 
 //END Protected
@@ -415,7 +415,7 @@ bool KActionSelector::eventFilter( QObject *o, QEvent *e )
 void KActionSelector::buttonAddClicked()
 {
   // move all selected items from available to selected listbox
-  QListBoxItem *item = d->availableListBox->firstItem();
+  TQListBoxItem *item = d->availableListBox->firstItem();
   while ( item ) {
     if ( item->isSelected() ) {
       d->availableListBox->takeItem( item );
@@ -433,7 +433,7 @@ void KActionSelector::buttonAddClicked()
 void KActionSelector::buttonRemoveClicked()
 {
   // move all selected items from selected to available listbox
-  QListBoxItem *item = d->selectedListBox->firstItem();
+  TQListBoxItem *item = d->selectedListBox->firstItem();
   while ( item ) {
     if ( item->isSelected() ) {
       d->selectedListBox->takeItem( item );
@@ -452,7 +452,7 @@ void KActionSelector::buttonUpClicked()
 {
   int c = d->selectedListBox->currentItem();
   if ( c < 0 ) return;
-  QListBoxItem *item = d->selectedListBox->item( c );
+  TQListBoxItem *item = d->selectedListBox->item( c );
   d->selectedListBox->takeItem( item );
   d->selectedListBox->insertItem( item, c-1 );
   d->selectedListBox->setCurrentItem( item );
@@ -463,14 +463,14 @@ void KActionSelector::buttonDownClicked()
 {
   int c = d->selectedListBox->currentItem();
   if ( c < 0 ) return;
-  QListBoxItem *item = d->selectedListBox->item( c );
+  TQListBoxItem *item = d->selectedListBox->item( c );
   d->selectedListBox->takeItem( item );
   d->selectedListBox->insertItem( item, c+1 );
   d->selectedListBox->setCurrentItem( item );
   emit movedDown( item );
 }
 
-void KActionSelector::itemDoubleClicked( QListBoxItem *item )
+void KActionSelector::itemDoubleClicked( TQListBoxItem *item )
 {
   if ( d->moveOnDoubleClick )
     moveItem( item );
@@ -488,10 +488,10 @@ void KActionSelector::loadIcons()
   d->btnDown->setIconSet( SmallIconSet( d->downIcon, d->iconSize ) );
 }
 
-void KActionSelector::moveItem( QListBoxItem *item )
+void KActionSelector::moveItem( TQListBoxItem *item )
 {
-  QListBox *lbFrom = item->listBox();
-  QListBox *lbTo;
+  TQListBox *lbFrom = item->listBox();
+  TQListBox *lbTo;
   if ( lbFrom == d->availableListBox )
     lbTo = d->selectedListBox;
   else if ( lbFrom == d->selectedListBox )
@@ -515,7 +515,7 @@ void KActionSelector::moveItem( QListBoxItem *item )
     emit removed( item );
 }
 
-int KActionSelector::insertionIndex( QListBox *lb, InsertionPolicy policy )
+int KActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
 {
   int index;
   switch ( policy )
diff --git a/parts/fileselector/kactionselector.h b/parts/fileselector/kactionselector.h
index b8d54e97..74e6575d 100644
--- a/parts/fileselector/kactionselector.h
+++ b/parts/fileselector/kactionselector.h
@@ -19,7 +19,7 @@
 #ifndef _KACTION_SELECTOR_H_
 #define _KACTION_SELECTOR_H_
 
-#include 
+#include 
 
 class QListBox;
 class QListBoxItem;
@@ -45,13 +45,13 @@ class KActionSelectorPrivate;
     see keyboardEnabled.
     
     Note that this may conflist with keyboard selection in the selected list box, 
-    if you set that to anything else than QListBox::Single (which is the default).
+    if you set that to anything else than TQListBox::Single (which is the default).
     
     To use it, simply construct an instance and then add items to the two listboxes,
     available through lbAvailable() and lbSelected(). Whenever you want, you can retrieve
-    the selected options using QListBox methods on lbSelected().
+    the selected options using TQListBox methods on lbSelected().
     
-    This way, you can use your own QListBoxItem class, allowing you to easily
+    This way, you can use your own TQListBoxItem class, allowing you to easily
     store object data in those.
     
     When an item is moved to a listbox, it is placed below the current item
@@ -73,31 +73,31 @@ class KActionSelectorPrivate;
     @author Anders Lund 
 */
 
-class KActionSelector : public QWidget {
+class KActionSelector : public TQWidget {
   Q_OBJECT
   Q_ENUMS( ButtonIconSize InsertionPolicy )
   Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
   Q_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled )
-  Q_PROPERTY( QString availableLabel READ availableLabel WRITE setAvailableLabel )
-  Q_PROPERTY( QString selectedLabel READ selectedLabel WRITE setSelectedLabel )
+  Q_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel )
+  Q_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel )
   Q_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize )
   Q_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy )
   Q_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy )
   Q_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons )
 
 public:
-  KActionSelector( QWidget *parent=0, const char *name=0 );
+  KActionSelector( TQWidget *parent=0, const char *name=0 );
   ~KActionSelector();
     
   /**
-     @return The QListBox holding the available actions
+     @return The TQListBox holding the available actions
   */
-  QListBox *availableListBox(); 
+  TQListBox *availableListBox(); 
   
   /**
-     @return The QListBox holding the selected actions
+     @return The TQListBox holding the selected actions
   */
-  QListBox *selectedListBox();
+  TQListBox *selectedListBox();
 
   /**
     This enum indentifies the moving buttons
@@ -190,7 +190,7 @@ public:
   /**
     @return The text of the label for the available items listbox.
   */
-  QString availableLabel() const;
+  TQString availableLabel() const;
   
   /**
     Sets the label for the available items listbox to @p text.
@@ -198,12 +198,12 @@ public:
     if you have a single ampersand in the text, the following character
     will become the accellerator to focus te listbox.
   */
-  void setAvailableLabel( const QString & text );
+  void setAvailableLabel( const TQString & text );
   
   /**
     @return the label of the selected items listbox.
   */
-  QString selectedLabel() const;
+  TQString selectedLabel() const;
   
   /**
     Sets the label for the selected items listbox to @p text.
@@ -211,7 +211,7 @@ public:
     if you have a single ampersand in the text, the following character
     will become the accellerator to focus te listbox.
   */
-  void setSelectedLabel( const QString & text );
+  void setSelectedLabel( const TQString & text );
     
   /**
     @return the current ButtonIconSize.
@@ -265,25 +265,25 @@ public:
     Sets the pixmap of the button @p button to @p icon.
     It calls SmallIconSet(pm) to generate the icon set.
   */
-  void setButtonIcon( const QString &icon, MoveButton button );
+  void setButtonIcon( const TQString &icon, MoveButton button );
   
   /**
     Sets the iconset for button @p button to @p iconset.
     You can use this method to et a costum icon set. Either
-    created by @ref QIconSet, or use the application instance of
+    created by @ref TQIconSet, or use the application instance of
     @ref KIconLoader (recommended).
   */
-  void setButtonIconSet( const QIconSet &iconset, MoveButton button );
+  void setButtonIconSet( const TQIconSet &iconset, MoveButton button );
   
   /**
     Sets the tooltip for the button @p button to @p tip.
   */
-  void setButtonTooltip( const QString &tip, MoveButton button );
+  void setButtonTooltip( const TQString &tip, MoveButton button );
   
   /**
     Sets the whatsthis help for button @p button to @p text.
   */
-  void setButtonWhatsThis( const QString &text, MoveButton button );
+  void setButtonWhatsThis( const TQString &text, MoveButton button );
 
   /**
      Sets the enabled state of all moving buttons to reflect the current
@@ -298,27 +298,27 @@ signals:
   /**
     Emitted when an item is moved to the "selected" listbox.
   */
-  void added( QListBoxItem *item );
+  void added( TQListBoxItem *item );
 
   /**
     Emitted when an item is moved out of the "selected" listbox.
   */
-  void removed( QListBoxItem *item );
+  void removed( TQListBoxItem *item );
 
   /**
     Emitted when an item is moved upwards in the "selected" listbox.
   */
-  void movedUp( QListBoxItem *item );
+  void movedUp( TQListBoxItem *item );
 
   /**
     Emitted when an item is moved downwards in the "selected" listbox.
   */
-  void movedDown( QListBoxItem *item );
+  void movedDown( TQListBoxItem *item );
 
   /**
     Emitted when an item is moved to the "selected" listbox.
   */
-//  void addedToSelection( QListBoxItem *item );
+//  void addedToSelection( TQListBoxItem *item );
 
 public slots:
   /**
@@ -331,12 +331,12 @@ protected:
   /**
     Reimplamented for internal reasons.
   */
-  void keyPressEvent( QKeyEvent * );
+  void keyPressEvent( TQKeyEvent * );
   
   /**
     Reimplemented for internal reasons.
   */
-  bool eventFilter( QObject *, QEvent * );
+  bool eventFilter( TQObject *, TQEvent * );
   
 private slots:
   /** 
@@ -362,19 +362,19 @@ private slots:
   /**
     Moves the item @p item to the other listbox if moveOnDoubleClick is enabled.
   */
-  void  itemDoubleClicked( QListBoxItem *item );
+  void  itemDoubleClicked( TQListBoxItem *item );
   
   /**
     connected to both list boxes to set the buttons enabled
   */
-  void slotCurrentChanged( QListBoxItem * ) { setButtonsEnabled(); };
+  void slotCurrentChanged( TQListBoxItem * ) { setButtonsEnabled(); };
   
 private:
   
   /**
     Move item @p item to the other listbox
   */
-  void moveItem( QListBoxItem *item );
+  void moveItem( TQListBoxItem *item );
   
   /**
     loads the icons for the move buttons.
@@ -388,7 +388,7 @@ private:
     Note that if policy is Sorted, this will return -1.
     Sort the listbox after inserting the item in that case.
   */
-  int insertionIndex( QListBox *lb, InsertionPolicy policy );
+  int insertionIndex( TQListBox *lb, InsertionPolicy policy );
   
   /**
     Private data storage 
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index d4fbc4ee..6467b83f 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -21,7 +21,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include 
 #include 
@@ -36,7 +36,7 @@
 
 
 KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopupmenu )
-    : QObject( parent, "KBookmarkHandler" ),
+    : TQObject( parent, "KBookmarkHandler" ),
       KBookmarkOwner(),
       mParent( parent ),
       m_menu( kpopupmenu ),
@@ -45,7 +45,7 @@ KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopup
     if (!m_menu)
       m_menu = new KPopupMenu( parent, "bookmark menu" );
 
-    QString file = locate( "data", "kdevfileselector/fsbookmarks.xml" );
+    TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" );
     if ( file.isEmpty() )
         file = locateLocal( "data", "kdevfileselector/fsbookmarks.xml" );
 
@@ -61,24 +61,24 @@ KBookmarkHandler::~KBookmarkHandler()
     //     delete m_bookmarkMenu; ###
 }
 
-QString KBookmarkHandler::currentURL() const
+TQString KBookmarkHandler::currentURL() const
 {
     return mParent->dirOperator()->url().url();
 }
 
 
-void KBookmarkHandler::slotNewBookmark( const QString& text,
-                                            const QCString& url,
-                                            const QString& additionalInfo )
+void KBookmarkHandler::slotNewBookmark( const TQString& text,
+                                            const TQCString& url,
+                                            const TQString& additionalInfo )
 {
     Q_UNUSED( text );
     *m_importStream << "\n";
-    *m_importStream << "" << (additionalInfo.isEmpty() ? QString::fromUtf8(url) : additionalInfo) << "\n\n";
+    *m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n";
+    *m_importStream << "" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "\n\n";
 }
 
-void KBookmarkHandler::slotNewFolder( const QString& text, bool /*open*/,
-                                          const QString& /*additionalInfo*/ )
+void KBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/,
+                                          const TQString& /*additionalInfo*/ )
 {
     *m_importStream << "\n\n";
diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h
index e0a16c60..9b8f5042 100644
--- a/parts/fileselector/kbookmarkhandler.h
+++ b/parts/fileselector/kbookmarkhandler.h
@@ -28,7 +28,7 @@ class QTextStream;
 class KPopupMenu;
 class KActionMenu;
 
-class KBookmarkHandler : public QObject, public KBookmarkOwner
+class KBookmarkHandler : public TQObject, public KBookmarkOwner
 {
     Q_OBJECT
 
@@ -37,19 +37,19 @@ public:
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:
-    virtual void openBookmarkURL( const QString& url ) { emit openURL( url ); }
-    virtual QString currentURL() const;
+    virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); }
+    virtual TQString currentURL() const;
 
     KPopupMenu *menu() const { return m_menu; }
 
 signals:
-    void openURL( const QString& url );
+    void openURL( const TQString& url );
 
 private slots:
-    void slotNewBookmark( const QString& text, const QCString& url,
-                          const QString& additionalInfo );
-    void slotNewFolder( const QString& text, bool open,
-                        const QString& additionalInfo );
+    void slotNewBookmark( const TQString& text, const TQCString& url,
+                          const TQString& additionalInfo );
+    void slotNewFolder( const TQString& text, bool open,
+                        const TQString& additionalInfo );
     void newSeparator();
     void endFolder();
 
@@ -61,7 +61,7 @@ private:
     KPopupMenu *m_menu;
     KBookmarkMenu *m_bookmarkMenu;
 
-    QTextStream *m_importStream;
+    TQTextStream *m_importStream;
 
     //class KBookmarkHandlerPrivate *d;
 };
diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp
index ef194da1..b59f2ad2 100644
--- a/parts/fileview/addfilegroupdlg.cpp
+++ b/parts/fileview/addfilegroupdlg.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -20,42 +20,42 @@
 #include "addfilegroupdlg.h"
 
 
-AddFileGroupDialog::AddFileGroupDialog(const QString& old_title, const QString& old_pattern, QWidget *parent, const char *name)
-    : QDialog(parent, name, true)
+AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *parent, const char *name)
+    : TQDialog(parent, name, true)
 {
-    QLabel *title_label = new QLabel(i18n("&Title:"), this);
+    TQLabel *title_label = new TQLabel(i18n("&Title:"), this);
     title_edit = new KLineEdit(old_title, this);
     title_edit->setFocus();
     title_label->setBuddy(title_edit);
-    connect( title_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) );
+    connect( title_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
 
-    QLabel *pattern_label = new QLabel(i18n("&Pattern:"), this);
+    TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this);
     pattern_edit = new KLineEdit(old_pattern, this);
     pattern_label->setBuddy(pattern_edit);
-    QFontMetrics fm(pattern_edit->fontMetrics());
+    TQFontMetrics fm(pattern_edit->fontMetrics());
     pattern_edit->setMinimumWidth(fm.width('X')*35);
-    connect( pattern_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) );
-    QVBoxLayout *layout = new QVBoxLayout(this, 10);
+    connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
 
-    QGridLayout *grid = new QGridLayout(2, 2);
+    TQGridLayout *grid = new TQGridLayout(2, 2);
     layout->addLayout(grid);
     grid->addWidget(title_label, 0, 0);
     grid->addWidget(title_edit, 0, 1);
     grid->addWidget(pattern_label, 1, 0);
     grid->addWidget(pattern_edit, 1, 1);
 
-    QFrame *frame = new QFrame(this);
-    frame->setFrameStyle(QFrame::HLine | QFrame::Sunken);
+    TQFrame *frame = new TQFrame(this);
+    frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
     layout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
     m_pOk = buttonbox->addButton(KStdGuiItem::ok());
-    QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel());
+    TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel());
 
     m_pOk->setDefault(true);
-    connect( m_pOk, SIGNAL(clicked()), this, SLOT(accept()) );
-    connect( cancel, SIGNAL(clicked()), this, SLOT(reject()) );
+    connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
+    connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
     buttonbox->layout();
     layout->addWidget(buttonbox, 0);
     slotTextChanged();
diff --git a/parts/fileview/addfilegroupdlg.h b/parts/fileview/addfilegroupdlg.h
index f72a2007..fbc0f6ab 100644
--- a/parts/fileview/addfilegroupdlg.h
+++ b/parts/fileview/addfilegroupdlg.h
@@ -12,7 +12,7 @@
 #ifndef _ADDFILEGROUPDLG_H_
 #define _ADDFILEGROUPDLG_H_
 
-#include 
+#include 
 #include 
 class QPushButton;
 
@@ -21,19 +21,19 @@ class AddFileGroupDialog : public QDialog
     Q_OBJECT
 
 public:
-    AddFileGroupDialog( const QString& old_title="", const QString& old_pattern="", QWidget *parent=0, const char *name=0 );
+    AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *parent=0, const char *name=0 );
     ~AddFileGroupDialog();
 
-    QString title() const
+    TQString title() const
         { return title_edit->text(); }
-    QString pattern() const
+    TQString pattern() const
         { return pattern_edit->text(); }
  private slots:
     void slotTextChanged();
 private:
     KLineEdit *title_edit;
     KLineEdit *pattern_edit;
-    QPushButton *m_pOk;
+    TQPushButton *m_pOk;
 };
 
 #endif
diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp
index 28a0441b..c1a4f5bc 100644
--- a/parts/fileview/filegroupsconfigwidget.cpp
+++ b/parts/fileview/filegroupsconfigwidget.cpp
@@ -11,7 +11,7 @@
 
 #include "filegroupsconfigwidget.h"
 
-#include 
+#include 
 #include 
 #include 
 
@@ -21,7 +21,7 @@
 
 
 FileGroupsConfigWidget::FileGroupsConfigWidget(FileGroupsPart *part,
-                                               QWidget *parent, const char *name)
+                                               TQWidget *parent, const char *name)
     : FileGroupsConfigWidgetBase(parent, name)
 {
     m_part = part;
@@ -38,15 +38,15 @@ FileGroupsConfigWidget::~FileGroupsConfigWidget()
 
 void FileGroupsConfigWidget::readConfig()
 {
-    QDomDocument &dom = *m_part->projectDom();
+    TQDomDocument &dom = *m_part->projectDom();
     DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/kdevfileview/groups",
                                                         "group", "name", "pattern");
 
-    QListViewItem *lastItem = 0;
+    TQListViewItem *lastItem = 0;
 
     DomUtil::PairList::ConstIterator it;
     for (it = list.begin(); it != list.end(); ++it) {
-        QListViewItem *newItem = new QListViewItem(listview, (*it).first, (*it).second);
+        TQListViewItem *newItem = new TQListViewItem(listview, (*it).first, (*it).second);
         if (lastItem)
             newItem->moveItem(lastItem);
         lastItem = newItem;
@@ -58,7 +58,7 @@ void FileGroupsConfigWidget::storeConfig()
 {
     DomUtil::PairList list;
     
-    QListViewItem *item = listview->firstChild();
+    TQListViewItem *item = listview->firstChild();
     while (item) {
         list << DomUtil::Pair(item->text(0), item->text(1));
         item = item->nextSibling();
@@ -76,7 +76,7 @@ void FileGroupsConfigWidget::addGroup()
     if (!dlg.exec())
         return;
 
-    (void) new QListViewItem(listview, dlg.title(), dlg.pattern());
+    (void) new TQListViewItem(listview, dlg.title(), dlg.pattern());
 }
 
 
@@ -106,7 +106,7 @@ void FileGroupsConfigWidget::moveUp()
         return;
     }
 
-    QListViewItem *item = listview->firstChild();
+    TQListViewItem *item = listview->firstChild();
     while (item->nextSibling() != listview->currentItem())
         item = item->nextSibling();
     item->moveItem(listview->currentItem());
diff --git a/parts/fileview/filegroupsconfigwidget.h b/parts/fileview/filegroupsconfigwidget.h
index b9b5c574..7c2759cb 100644
--- a/parts/fileview/filegroupsconfigwidget.h
+++ b/parts/fileview/filegroupsconfigwidget.h
@@ -22,7 +22,7 @@ class FileGroupsConfigWidget : public FileGroupsConfigWidgetBase
     Q_OBJECT
 
 public:
-    FileGroupsConfigWidget( FileGroupsPart *widget, QWidget *parent, const char *name=0 );
+    FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *parent, const char *name=0 );
     ~FileGroupsConfigWidget();
 
 public slots:
diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
index 1c6a5abf..4451ff2a 100644
--- a/parts/fileview/filegroupspart.cpp
+++ b/parts/fileview/filegroupspart.cpp
@@ -12,9 +12,9 @@
 #include "filegroupspart.h"
 #include "filegroupspart.moc"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -36,7 +36,7 @@ typedef KDevGenericFactory FileGroupsFactory;
 static const KDevPluginInfo data("kdevfilegroups");
 K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) )
 
-FileGroupsPart::FileGroupsPart(QObject *parent, const char *name, const QStringList &)
+FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevPlugin(&data, parent, name ? name : "FileGroupsPart")
 {
     deleteRequested = false;
@@ -45,26 +45,26 @@ FileGroupsPart::FileGroupsPart(QObject *parent, const char *name, const QStringL
     m_filegroups = new FileGroupsWidget(this);
     m_filegroups->setCaption(i18n("File Group View"));
 	m_filegroups->setIcon(SmallIcon( info()->icon() ) );
-    QWhatsThis::add(m_filegroups, i18n("File group view
      "
+    TQWhatsThis::add(m_filegroups, i18n("File group view
      "
                                        "The file group viewer shows all files of the project, "
                                        "in groups which can be configured in project settings dialog, File Groups tab."));
     mainWindow()->embedSelectView(m_filegroups, i18n("File Groups"), i18n("File groups in the project directory"));
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createProjectConfigPage( i18n("File Groups"), FILEGROUPS_OPTIONS, info()->icon() );
-	connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )), 
-		this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) );
+	connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), 
+		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
 
     // File groups
-    connect( project(), SIGNAL(addedFilesToProject(const QStringList&)),
-             m_filegroups, SLOT(addFiles(const QStringList&)) );
-    connect( project(), SIGNAL(removedFilesFromProject(const QStringList&)),
-             m_filegroups, SLOT(removeFiles(const QStringList&)) );
-/*    connect( project(), SIGNAL(addedFileToProject(const QString&)),
-             m_filegroups, SLOT(addFile(const QString&)) );
-    connect( project(), SIGNAL(removedFileFromProject(const QString&)),
-             m_filegroups, SLOT(removeFile(const QString&)) );*/
+    connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)),
+             m_filegroups, TQT_SLOT(addFiles(const TQStringList&)) );
+    connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)),
+             m_filegroups, TQT_SLOT(removeFiles(const TQStringList&)) );
+/*    connect( project(), TQT_SIGNAL(addedFileToProject(const TQString&)),
+             m_filegroups, TQT_SLOT(addFile(const TQString&)) );
+    connect( project(), TQT_SIGNAL(removedFileFromProject(const TQString&)),
+             m_filegroups, TQT_SLOT(removeFile(const TQString&)) );*/
     m_filegroups->refresh();
 }
 
@@ -84,14 +84,14 @@ void FileGroupsPart::refresh()
     // This method may be called from m_filetree's slot,
     // so we make sure not to modify the list view during
     // the execution of the slot
-    QTimer::singleShot(0, m_filegroups, SLOT(refresh()));
+    TQTimer::singleShot(0, m_filegroups, TQT_SLOT(refresh()));
 }
 
-void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber )
+void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber )
 {
 	if ( pagenumber == FILEGROUPS_OPTIONS )
 	{
 		FileGroupsConfigWidget *w = new FileGroupsConfigWidget(this, page, "file groups config widget");
-		connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) );
+		connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 	}
 }
diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h
index 8e712b4b..22cb055e 100644
--- a/parts/fileview/filegroupspart.h
+++ b/parts/fileview/filegroupspart.h
@@ -12,7 +12,7 @@
 #ifndef _FILEGROUPSPART_H_
 #define _FILEGROUPSPART_H_
 
-#include 
+#include 
 //#include 
 #include 
 #include "kdevplugin.h"
@@ -25,17 +25,17 @@ class FileGroupsPart : public KDevPlugin
     Q_OBJECT
 
 public:
-    FileGroupsPart( QObject *parent, const char *name, const QStringList & );
+    FileGroupsPart( TQObject *parent, const char *name, const TQStringList & );
     ~FileGroupsPart();
 
 public slots:
     void refresh();
 
 private slots:
-	void insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int );
+	void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int );
 
 private:
-    QGuardedPtr m_filegroups;
+    TQGuardedPtr m_filegroups;
     bool deleteRequested;
 	ConfigWidgetProxy * _configProxy;
 };
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 9f32460d..a31cb963 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -11,12 +11,12 @@
 
 #include "filegroupswidget.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -49,53 +49,53 @@ class FileComparator {
 public:
 	virtual ~FileComparator(){
 	};
-	virtual bool matches(const QString& name) const = 0;
+	virtual bool matches(const TQString& name) const = 0;
 };
 
 class RegExpComparator : public FileComparator {
 public:
-	RegExpComparator(const QString& pattern) : m_exp(pattern, true, true){
+	RegExpComparator(const TQString& pattern) : m_exp(pattern, true, true){
 	}
-	bool matches(const QString& name) const{
+	bool matches(const TQString& name) const{
 		return m_exp.exactMatch(name);
 	}
 private:
-	const QRegExp m_exp;
+	const TQRegExp m_exp;
 };
 
 class EndingComparator : public FileComparator {
 public:
-	EndingComparator(const QString& pattern) : m_pattern ( pattern){
+	EndingComparator(const TQString& pattern) : m_pattern ( pattern){
 	}
-	bool matches(const QString& name) const{
+	bool matches(const TQString& name) const{
 		return name.endsWith(m_pattern);
 	}
 private:
-	const QString m_pattern;
+	const TQString m_pattern;
 };
 
 class FileViewFolderItem : public QListViewItem
 {
 public:
-    FileViewFolderItem(QListView *parent, const QString &name, const QString &pattern);
-    bool matches(const QString &fileName);
+    FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern);
+    bool matches(const TQString &fileName);
 
 private:
-    QPtrList m_patterns;
+    TQPtrList m_patterns;
 };
 
 
-FileViewFolderItem::FileViewFolderItem(QListView *parent, const QString &name, const QString &pattern)
-    : QListViewItem(parent, name)
+FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern)
+    : TQListViewItem(parent, name)
 {
     setPixmap(0, SmallIcon("folder"));
     m_patterns.setAutoDelete(true);
-    QStringList patternstring = QStringList::split(';', pattern);
-    QStringList::ConstIterator theend = patternstring.end();
-    for (QStringList::ConstIterator ci = patternstring.begin(); ci != theend; ++ci)
+    TQStringList patternstring = TQStringList::split(';', pattern);
+    TQStringList::ConstIterator theend = patternstring.end();
+    for (TQStringList::ConstIterator ci = patternstring.begin(); ci != theend; ++ci)
 	{
-		QString pattern = *ci;
-		QString tail = pattern.right( pattern.length() - 1 );
+		TQString pattern = *ci;
+		TQString tail = pattern.right( pattern.length() - 1 );
 
 		if ( (tail).contains('*') || pattern.contains('?') || pattern.contains('[') || pattern.contains(']') )
 		{
@@ -116,13 +116,13 @@ FileViewFolderItem::FileViewFolderItem(QListView *parent, const QString &name, c
 }
 
 
-bool FileViewFolderItem::matches(const QString &fileName)
+bool FileViewFolderItem::matches(const TQString &fileName)
 {
     // Test with the file path, so that "*ClientServer/*.h" patterns work
-    QString fName = QFileInfo(fileName).filePath();
+    TQString fName = TQFileInfo(fileName).filePath();
 
-    QPtrList::ConstIterator theend = m_patterns.end();
-    for (QPtrList::ConstIterator ci = m_patterns.begin(); ci != theend; ++ci)
+    TQPtrList::ConstIterator theend = m_patterns.end();
+    for (TQPtrList::ConstIterator ci = m_patterns.begin(); ci != theend; ++ci)
     	if ((*ci)->matches(fName))
 		return true;
 
@@ -133,20 +133,20 @@ bool FileViewFolderItem::matches(const QString &fileName)
 class FileGroupsFileItem : public QListViewItem
 {
 public:
-    FileGroupsFileItem(QListViewItem *parent, const QString &fileName);
-    QString fileName() const
+    FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName);
+    TQString fileName() const
     { return fullname; }
 
 private:
-    QString fullname;
+    TQString fullname;
 };
 
 
-FileGroupsFileItem::FileGroupsFileItem(QListViewItem *parent, const QString &fileName)
-    : QListViewItem(parent), fullname(fileName)
+FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName)
+    : TQListViewItem(parent), fullname(fileName)
 {
     setPixmap(0, SmallIcon("document"));
-    QFileInfo fi(fileName);
+    TQFileInfo fi(fileName);
     setText(0, fi.fileName());
     setText(1, "./" + fi.dirPath());
 }
@@ -164,33 +164,33 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part)
 
     setFocusPolicy(ClickFocus);
     setRootIsDecorated(true);
-    setResizeMode(QListView::LastColumn);
+    setResizeMode(TQListView::LastColumn);
     setSorting(-1);
     addColumn(i18n("Name"));
 	setAllColumnsShowFocus( true );
 
 //    addColumn(i18n("Location"));
 
-    connect( this, SIGNAL(executed(QListViewItem*)),
-             this, SLOT(slotItemExecuted(QListViewItem*)) );
-    connect( this, SIGNAL(returnPressed(QListViewItem*)),
-             this, SLOT(slotItemExecuted(QListViewItem*)) );
-    connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-             this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) );
+    connect( this, TQT_SIGNAL(executed(TQListViewItem*)),
+             this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)),
+             this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
+             this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) );
 
     m_actionToggleShowNonProjectFiles = new KToggleAction( i18n("Show Non Project Files"), KShortcut(),
-	this, SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" );
+	this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" );
     m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files"));
     m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("Show non project files
      Shows files that do not belong to a project in a file tree."));
 
     m_actionToggleDisplayLocation = new KToggleAction( i18n("Display Location Column"), KShortcut(),
-        this, SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" );
+        this, TQT_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" );
     m_actionToggleDisplayLocation->setWhatsThis(i18n("Display the Location Column
      Displays a column with the location of the files."));
 
     m_part = part;
     (void) translations; // supress compiler warning
 
-    QDomDocument &dom = *m_part->projectDom();
+    TQDomDocument &dom = *m_part->projectDom();
     m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonprojectfiles") );
     m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonlocation") );
 }
@@ -198,13 +198,13 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part)
 
 FileGroupsWidget::~FileGroupsWidget()
 {
-    QDomDocument &dom = *m_part->projectDom();
+    TQDomDocument &dom = *m_part->projectDom();
     DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() );
     DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() );
 }
 
 
-void FileGroupsWidget::slotItemExecuted(QListViewItem *item)
+void FileGroupsWidget::slotItemExecuted(TQListViewItem *item)
 {
     if (!item)
         return;
@@ -222,7 +222,7 @@ void FileGroupsWidget::slotItemExecuted(QListViewItem *item)
 }
 
 
-void FileGroupsWidget::slotContextMenu(KListView *, QListViewItem *item, const QPoint &p)
+void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p)
 {
     KPopupMenu popup(i18n("File Groups"), this);
     /// @todo Add, remove groups
@@ -232,15 +232,15 @@ void FileGroupsWidget::slotContextMenu(KListView *, QListViewItem *item, const Q
     if (item->parent()) {
         // Not for group items
         FileGroupsFileItem *fvfitem = static_cast(item);
-        QString pathName = m_part->project()->projectDirectory() + QDir::separator() + fvfitem->fileName();
+        TQString pathName = m_part->project()->projectDirectory() + TQDir::separator() + fvfitem->fileName();
         KURL::List urls;
         urls.append(pathName);
         FileContext context(urls);
         m_part->core()->fillContextMenu(&popup, &context);
     }
     else{
-        QStringList file_list;
-        QListViewItem* i = item->firstChild();
+        TQStringList file_list;
+        TQListViewItem* i = item->firstChild();
         while(i){
             FileGroupsFileItem *fvgitem = static_cast(i);
             file_list << fvgitem->fileName();
@@ -258,21 +258,21 @@ void FileGroupsWidget::slotContextMenu(KListView *, QListViewItem *item, const Q
         KDialogBase dlg(KDialogBase::TreeList, i18n("Customize File Groups"),
                         KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, this,
                         "customization dialog");
-        QVBox *vbox = dlg.addVBoxPage(i18n("File Groups"));
+        TQVBox *vbox = dlg.addVBoxPage(i18n("File Groups"));
         FileGroupsConfigWidget *w = new FileGroupsConfigWidget(m_part, vbox, "file groups config widget");
-        connect(&dlg, SIGNAL(okClicked()), w, SLOT(accept()));
+        connect(&dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
         dlg.exec();
     }
 }
 
-QStringList FileGroupsWidget::allFilesRecursively( QString const & dir )
+TQStringList FileGroupsWidget::allFilesRecursively( TQString const & dir )
 {
-	QStringList filelist;
-	QString reldir = dir.mid( m_part->project()->projectDirectory().length() +1 );
+	TQStringList filelist;
+	TQString reldir = dir.mid( m_part->project()->projectDirectory().length() +1 );
 
 	// recursively fetch all files in subdirectories
-	QStringList subdirs = QDir( dir ).entryList( QDir::Dirs );
-	QValueListIterator it = subdirs.begin();
+	TQStringList subdirs = TQDir( dir ).entryList( TQDir::Dirs );
+	TQValueListIterator it = subdirs.begin();
 	while ( it != subdirs.end() )
 	{
 		if ( *it != "." && *it != ".." )
@@ -283,8 +283,8 @@ QStringList FileGroupsWidget::allFilesRecursively( QString const & dir )
 	}
 
 	// append the project relative directory path to all files in the current directory
-	QStringList dirlist = QDir( dir ).entryList( QDir::Files );
-	QValueListIterator itt = dirlist.begin();
+	TQStringList dirlist = TQDir( dir ).entryList( TQDir::Files );
+	TQValueListIterator itt = dirlist.begin();
 	while ( itt != dirlist.end() )
 	{
 		if ( reldir.isEmpty() )
@@ -316,7 +316,7 @@ void FileGroupsWidget::refresh()
 	if (LocationID!=-1)
 	    removeColumn(LocationID);
     }
-    QDomDocument &dom = *m_part->projectDom();
+    TQDomDocument &dom = *m_part->projectDom();
     DomUtil::PairList list =
         DomUtil::readPairListEntry(dom, "/kdevfileview/groups", "group", "name", "pattern");
 
@@ -330,7 +330,7 @@ void FileGroupsWidget::refresh()
         lastGroup = newItem;
     }
 
-    QStringList allFiles;
+    TQStringList allFiles;
     if (m_actionToggleShowNonProjectFiles->isChecked()) {
         // get all files in the project directory
         allFiles = allFilesRecursively( m_part->project()->projectDirectory() );
@@ -339,9 +339,9 @@ void FileGroupsWidget::refresh()
         // get all project files
         allFiles = m_part->project()->allFiles();
     }
-    QStringList::ConstIterator fit;
+    TQStringList::ConstIterator fit;
     for (fit = allFiles.begin(); fit != allFiles.end(); ++fit) {
-        QListViewItem *item = firstChild();
+        TQListViewItem *item = firstChild();
         while (item) {
             FileViewFolderItem *fvgitem = static_cast(item);
             if (fvgitem->matches(*fit)) {
@@ -352,7 +352,7 @@ void FileGroupsWidget::refresh()
         }
     }
 
-    QListViewItem *item = firstChild();
+    TQListViewItem *item = firstChild();
     while (item) {
         item->sortChildItems(0, true);
         item = item->nextSibling();
@@ -360,16 +360,16 @@ void FileGroupsWidget::refresh()
 }
 
 
-void FileGroupsWidget::addFile(const QString &fileName)
+void FileGroupsWidget::addFile(const TQString &fileName)
 {
     kdDebug(9017) << "FileView add " << fileName << endl;
 
-    QListViewItem *item = firstChild();
+    TQListViewItem *item = firstChild();
     while (item) {
         FileViewFolderItem *fvgitem = static_cast(item);
         if (fvgitem->matches(fileName))
         {
-            QString f = fileName;
+            TQString f = fileName;
             if (fileName.contains(m_part->project()->projectDirectory()))
                 f = fileName.mid(m_part->project()->projectDirectory().length()+1);
             (void) new FileGroupsFileItem(fvgitem, f);
@@ -380,9 +380,9 @@ void FileGroupsWidget::addFile(const QString &fileName)
     }
 }
 
-void FileGroupsWidget::addFiles ( const QStringList& fileList )
+void FileGroupsWidget::addFiles ( const TQStringList& fileList )
 {
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
 
     for ( it = fileList.begin(); it != fileList.end(); ++it )
     {
@@ -391,15 +391,15 @@ void FileGroupsWidget::addFiles ( const QStringList& fileList )
     sort();
 }
 
-void FileGroupsWidget::removeFile(const QString &fileName)
+void FileGroupsWidget::removeFile(const TQString &fileName)
 {
     kdDebug(9017) << "FileView remove " << fileName << endl;
 
-    QListViewItem *item = firstChild();
+    TQListViewItem *item = firstChild();
     while (item)
     {
         FileViewFolderItem *fvgitem = static_cast(item);
-        QListViewItem *childItem = fvgitem->firstChild();
+        TQListViewItem *childItem = fvgitem->firstChild();
         while (childItem)
         {
             FileGroupsFileItem *fgfitem = static_cast(childItem);
@@ -417,9 +417,9 @@ void FileGroupsWidget::removeFile(const QString &fileName)
     }
 }
 
-void FileGroupsWidget::removeFiles ( const QStringList& fileList )
+void FileGroupsWidget::removeFiles ( const TQStringList& fileList )
 {
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
 
     for ( it = fileList.begin(); it != fileList.end(); ++it )
     {
diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h
index 7bdbf78b..cd7b2f63 100644
--- a/parts/fileview/filegroupswidget.h
+++ b/parts/fileview/filegroupswidget.h
@@ -28,21 +28,21 @@ public:
     
 public slots:
     void refresh();
-    void addFiles ( const QStringList& fileList );
-    void removeFiles ( const QStringList& fileList );
+    void addFiles ( const TQStringList& fileList );
+    void removeFiles ( const TQStringList& fileList );
 
 private slots:
-    void slotItemExecuted(QListViewItem *item);
-    void slotContextMenu(KListView *, QListViewItem *item, const QPoint &p);
+    void slotItemExecuted(TQListViewItem *item);
+    void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p);
     void slotToggleShowNonProjectFiles();
     void slotToggleDisplayLocation();
     
 protected:
-    void addFile(const QString &fileName);
-    void removeFile(const QString &fileName);
+    void addFile(const TQString &fileName);
+    void removeFile(const TQString &fileName);
 
 private:
-    QStringList allFilesRecursively( QString const & );
+    TQStringList allFilesRecursively( TQString const & );
     FileGroupsPart *m_part;
 
     class KToggleAction *m_actionToggleShowNonProjectFiles;
diff --git a/parts/fileview/fileitemfactory.cpp b/parts/fileview/fileitemfactory.cpp
index 614f535c..3ccf5921 100644
--- a/parts/fileview/fileitemfactory.cpp
+++ b/parts/fileview/fileitemfactory.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
+#include 
 #include 
 
 #include "filetreewidget.h"
@@ -23,7 +23,7 @@ using namespace filetreeview;
 
 FileTreeWidget* FileTreeViewItem::listView() const
 {
-    return static_cast( QListViewItem::listView() );
+    return static_cast( TQListViewItem::listView() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -41,7 +41,7 @@ void FileTreeViewItem::hideOrShow()
     }
 }
 
-bool FileTreeViewItem::changeActiveDir( const QString& olddir, const QString& newdir, bool foundolddir, bool foundnewdir )
+bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString& newdir, bool foundolddir, bool foundnewdir )
 {
     kdDebug( 9017 ) << "FileTreeViewItem::changeActiveDir(): " + olddir << " new: " << newdir << " for: " << path() << endl;
 
@@ -77,7 +77,7 @@ bool FileTreeViewItem::changeActiveDir( const QString& olddir, const QString& ne
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool FileTreeViewItem::setProjectFile( QString const & path, bool pf )
+bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf )
 {
 
     if ( this->path() == path && isProjectFile() != pf )
@@ -102,30 +102,30 @@ bool FileTreeViewItem::setProjectFile( QString const & path, bool pf )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void FileTreeViewItem::paintCell(QPainter *p, const QColorGroup &cg,
+void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
     int column, int width, int alignment)
 {
     if ( listView()->showNonProjectFiles() && isProjectFile() )
     {
-        QFont font( p->font() );
+        TQFont font( p->font() );
         font.setBold( true );
         p->setFont( font );
     }
 
     if( isActiveDir() )
     {
-        QFont font( p->font() );
+        TQFont font( p->font() );
         font.setItalic( true );
         p->setFont( font );
     }
 
-    QListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
-int FileTreeViewItem::compare( QListViewItem *i, int col, bool ascending ) const
+int FileTreeViewItem::compare( TQListViewItem *i, int col, bool ascending ) const
 {
     KFileTreeViewItem* rhs = dynamic_cast( i );
     if (rhs)
@@ -137,7 +137,7 @@ int FileTreeViewItem::compare( QListViewItem *i, int col, bool ascending ) const
                 return (ascending) ? -1 : 1;
     }
 
-    return QListViewItem::compare( i, col, ascending );
+    return TQListViewItem::compare( i, col, ascending );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h
index f87ae39a..065591d7 100644
--- a/parts/fileview/fileitemfactory.h
+++ b/parts/fileview/fileitemfactory.h
@@ -41,16 +41,16 @@ namespace filetreeview
         virtual ~FileTreeViewItem() {}
 
     public:
-        virtual void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment );
+        virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment );
         FileTreeWidget* listView() const;
         void hideOrShow();
         bool isProjectFile() const { return m_isProjectFile; }
-        bool setProjectFile( QString const &path, bool pf );
+        bool setProjectFile( TQString const &path, bool pf );
         bool isActiveDir() const { return m_isActiveDir; }
-        bool changeActiveDir( const QString &, const QString&, bool foundolddir = false, bool foundnewdir = false );
+        bool changeActiveDir( const TQString &, const TQString&, bool foundolddir = false, bool foundnewdir = false );
 
     protected:
-        virtual int compare( QListViewItem *i, int col, bool ascending ) const;
+        virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
 
     private:
         bool m_isProjectFile;
@@ -63,7 +63,7 @@ namespace filetreeview
     class FileTreeBranchItem : public KFileTreeBranch
     {
     protected:
-        FileTreeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix )
+        FileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix )
         : KFileTreeBranch( view, url, name, pix, false,
             new FileTreeViewItem( view, new KFileItem( url, "inode/directory", S_IFDIR ), this ) )
         {
@@ -82,7 +82,7 @@ namespace filetreeview
     class BranchItemFactory
     {
     public:
-        virtual FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix ) = 0;
+        virtual FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) = 0;
     };
 }
 
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index 9e40a3bb..02b7be86 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -31,19 +31,19 @@ using namespace filetreeview;
 ///////////////////////////////////////////////////////////////////////////////
 
 FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name )
-    : QObject( parent, name ), m_branchItemFactory( 0 ),
+    : TQObject( parent, name ), m_branchItemFactory( 0 ),
     m_part( parent->part() ), m_isReloadingTree( false )
 {
     kdDebug(9017) << "FileTreeViewWidgetImpl::FileTreeViewWidgetImpl()" << endl;
 
     // Actions
     m_actionToggleShowNonProjectFiles = new KToggleAction( i18n("Show Non Project Files"), KShortcut(),
-        this, SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" );
+        this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" );
     m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files"));
     m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("Show non project files
      Shows files that do not belong to a project in a file tree."));
 
     // Reload good ol' settings
-    QDomDocument &dom = *m_part->projectDom();
+    TQDomDocument &dom = *m_part->projectDom();
     m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/tree/hidenonprojectfiles") );
 }
 
@@ -55,7 +55,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl()
 
     delete m_branchItemFactory;
 
-    QDomDocument &dom = *m_part->projectDom();
+    TQDomDocument &dom = *m_part->projectDom();
     DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() );
 }
 
@@ -68,14 +68,14 @@ FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QDomDocument &FileTreeViewWidgetImpl::projectDom() const
+TQDomDocument &FileTreeViewWidgetImpl::projectDom() const
 {
     return *part()->projectDom();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString FileTreeViewWidgetImpl::projectDirectory() const
+TQString FileTreeViewWidgetImpl::projectDirectory() const
 {
     return part()->project()->projectDirectory();
 }
@@ -89,14 +89,14 @@ bool FileTreeViewWidgetImpl::showNonProjectFiles() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void FileTreeViewWidgetImpl::fillPopupMenu( QPopupMenu *popupMenu, QListViewItem *item ) const
+void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewItem *item ) const
 {
     // Show the "reload tree" menu-item only if it is requested for the root object
     // and we don't have a sync-with-repository operation pending (which otherwise will
     // kill the call-back's from working)
     if (item == fileTree()->firstChild() && canReloadTree())
     {
-        int id = popupMenu->insertItem( i18n( "Reload Tree"), this, SLOT( slotReloadTree() ) );
+        int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) );
         popupMenu->setWhatsThis( id, i18n("Reload tree
      Reloads the project files tree.") );
     }
 
@@ -111,8 +111,8 @@ KURL::List FileTreeViewWidgetImpl::selectedPathUrls()
 
 	KURL::List urlList;
 
-	QValueList list = allSelectedItems( fileTree()->firstChild() );
-	QValueList::Iterator it = list.begin();
+	TQValueList list = allSelectedItems( fileTree()->firstChild() );
+	TQValueList::Iterator it = list.begin();
 	while( it != list.end() )
 	{
 		FileTreeViewItem * item = static_cast( *it );
@@ -130,9 +130,9 @@ KURL::List FileTreeViewWidgetImpl::selectedPathUrls()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QValueList FileTreeViewWidgetImpl::allSelectedItems( QListViewItem * item ) const
+TQValueList FileTreeViewWidgetImpl::allSelectedItems( TQListViewItem * item ) const
 {
-	QValueList list;
+	TQValueList list;
 
 	if ( item )
 	{
@@ -141,7 +141,7 @@ QValueList FileTreeViewWidgetImpl::allSelectedItems( QListViewIt
 			list << item;
 		}
 
-		QListViewItem * it = item->firstChild();
+		TQListViewItem * it = item->firstChild();
 		while( it  )
 		{
 			list += allSelectedItems( it );
diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h
index fae4b248..52a95fc1 100644
--- a/parts/fileview/filetreeviewwidgetimpl.h
+++ b/parts/fileview/filetreeviewwidgetimpl.h
@@ -12,10 +12,10 @@
 #ifndef FILETREEVIEWWIDGETIMPL_H
 #define FILETREEVIEWWIDGETIMPL_H
 
-#include 
-#include 
+#include 
+#include 
 #include 
-#include 
+#include 
 
 #include "fileitemfactory.h"
 
@@ -47,8 +47,8 @@ public:
     KURL::List selectedPathUrls();
     // shortcuts
     FileTreeWidget *fileTree() const;
-    QDomDocument &projectDom() const;
-    QHeader *header() const { return fileTree()->header(); }
+    TQDomDocument &projectDom() const;
+    TQHeader *header() const { return fileTree()->header(); }
     void setColumnWidth( int column, int w ) { fileTree()->setColumnWidth( column, w ); }
     int contentsWidth() const { return fileTree()->contentsWidth(); }
     void triggerUpdate() { fileTree()->triggerUpdate(); }
@@ -68,9 +68,9 @@ public:
     * Here the popup menu is filled: by standard only the "reload tree" (only if the above function
     * returns true) and "show project files" options are added
     * @param popupMenu the menu to fill
-    * @param item the QListViewItem which this menu has been requested upon
+    * @param item the TQListViewItem which this menu has been requested upon
     */
-    virtual void fillPopupMenu( QPopupMenu *popupMenu, QListViewItem *item ) const;
+    virtual void fillPopupMenu( TQPopupMenu *popupMenu, TQListViewItem *item ) const;
     /**
     * @return true if non project files are to be shown, false otherwise
     */
@@ -89,10 +89,10 @@ private slots:
 
 protected:
     void setBranchItemFactory( filetreeview::BranchItemFactory *aFactory ) { m_branchItemFactory = aFactory; }
-    QString projectDirectory() const;
+    TQString projectDirectory() const;
 
 private:
-	QValueList allSelectedItems( QListViewItem * item ) const;
+	TQValueList allSelectedItems( TQListViewItem * item ) const;
     filetreeview::BranchItemFactory *m_branchItemFactory;
 
     FileViewPart *m_part;
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index e0d7538b..6f049370 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -13,11 +13,11 @@
 
 #include "filetreewidget.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -51,7 +51,7 @@ using namespace filetreeview;
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-FileTreeWidget::FileTreeWidget( FileViewPart *part, QWidget *parent, KDevVCSFileInfoProvider *infoProvider )
+FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider )
     : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 )
 {
     kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl;
@@ -63,32 +63,32 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, QWidget *parent, KDevVCSFile
     else
         m_impl = new StdFileTreeWidgetImpl( this );
 
-    //setResizeMode( QListView::LastColumn );
+    //setResizeMode( TQListView::LastColumn );
     setSorting( 0 );
     setAllColumnsShowFocus( true );
-    setSelectionMode( QListView::Extended ); // Enable multiple items selection by use of Ctrl/Shift
+    setSelectionMode( TQListView::Extended ); // Enable multiple items selection by use of Ctrl/Shift
     setDragEnabled( false );
 
     // Slot connections
-    connect( this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotItemExecuted(QListViewItem*)) );
-    connect( this, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(slotItemExecuted(QListViewItem*)) );
-    connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-             this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) );
+    connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
+             this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) );
     // Intercepts KDevelop core signals and VCS notifications (if available)
-    connect( m_part->project(), SIGNAL( activeDirectoryChanged( const QString&, const QString& ) ),
-             this, SLOT( changeActiveDirectory( const QString&, const QString& ) ) );
-    connect( m_part->project(), SIGNAL( addedFilesToProject( const QStringList & ) ),
-             this, SLOT( addProjectFiles( const QStringList & ) ) );
-    connect( m_part->project(), SIGNAL( removedFilesFromProject( const QStringList & ) ),
-             this, SLOT( removeProjectFiles( const QStringList & ) ) );
+    connect( m_part->project(), TQT_SIGNAL( activeDirectoryChanged( const TQString&, const TQString& ) ),
+             this, TQT_SLOT( changeActiveDirectory( const TQString&, const TQString& ) ) );
+    connect( m_part->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ),
+             this, TQT_SLOT( addProjectFiles( const TQStringList & ) ) );
+    connect( m_part->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ),
+             this, TQT_SLOT( removeProjectFiles( const TQStringList & ) ) );
     // Safeguard against VCS plug-in unloading at run-time
-    connect( m_impl, SIGNAL(implementationInvalidated()), this, SLOT(slotImplementationInvalidated()) );
+    connect( m_impl, TQT_SIGNAL(implementationInvalidated()), this, TQT_SLOT(slotImplementationInvalidated()) );
 
     // Hide pattern for files
-    QDomDocument &dom = *m_part->projectDom();
-    QString defaultHidePattern = "*.o,*.lo,CVS";
-    QString hidePattern = DomUtil::readEntry( dom, "/kdevfileview/tree/hidepatterns", defaultHidePattern );
-    m_hidePatterns = QStringList::split( ",", hidePattern );
+    TQDomDocument &dom = *m_part->projectDom();
+    TQString defaultHidePattern = "*.o,*.lo,CVS";
+    TQString hidePattern = DomUtil::readEntry( dom, "/kdevfileview/tree/hidepatterns", defaultHidePattern );
+    m_hidePatterns = TQStringList::split( ",", hidePattern );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -97,7 +97,7 @@ FileTreeWidget::~FileTreeWidget()
 {
     kdDebug(9017) << "FileTreeWidget::~FileTreeWidget()" << endl;
 
-    QDomDocument &dom = *m_part->projectDom();
+    TQDomDocument &dom = *m_part->projectDom();
     DomUtil::writeEntry( dom, "/kdevfileview/tree/hidepatterns", hidePatterns() );
 
 //    delete m_impl;
@@ -105,14 +105,14 @@ FileTreeWidget::~FileTreeWidget()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void FileTreeWidget::openDirectory( const QString& dirName )
+void FileTreeWidget::openDirectory( const TQString& dirName )
 {
     kdDebug(9017) << "FileTreeWidget::openDirectory(): " + dirName << endl;
 
     // if we're reloading
     if (m_rootBranch)
     {
-        disconnect( m_rootBranch, SIGNAL(populateFinished(KFileTreeViewItem*)), this, SLOT(finishPopulate(KFileTreeViewItem*)) );
+        disconnect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) );
         removeBranch( m_rootBranch );
         m_projectFiles.clear();
     }
@@ -120,7 +120,7 @@ void FileTreeWidget::openDirectory( const QString& dirName )
     addProjectFiles( m_part->project()->allFiles(), true );
 
     KURL url = KURL::fromPathOrURL( dirName );
-    const QPixmap& pix = KMimeType::mimeType("inode/directory")->pixmap( KIcon::Small );
+    const TQPixmap& pix = KMimeType::mimeType("inode/directory")->pixmap( KIcon::Small );
 
     // this is a bit odd, but the order of these calls seems to be important
     //FileTreeBranch *b = new FileTreeBranch( this, url, url.prettyURL(), pix );
@@ -128,7 +128,7 @@ void FileTreeWidget::openDirectory( const QString& dirName )
     b->setChildRecurse( false );
     m_rootBranch = addBranch( b );
     m_rootBranch->setOpen( true );
-    connect( m_rootBranch, SIGNAL(populateFinished(KFileTreeViewItem*)), this, SLOT(finishPopulate(KFileTreeViewItem*)) );
+    connect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -142,11 +142,11 @@ bool FileTreeWidget::shouldBeShown( KFileTreeViewItem* item )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool FileTreeWidget::matchesHidePattern(const QString &fileName)
+bool FileTreeWidget::matchesHidePattern(const TQString &fileName)
 {
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for (it = m_hidePatterns.begin(); it != m_hidePatterns.end(); ++it) {
-        QRegExp re(*it, true, true);
+        TQRegExp re(*it, true, true);
         if (re.search(fileName) == 0 && (uint)re.matchedLength() == fileName.length())
             return true;
     }
@@ -184,7 +184,7 @@ void FileTreeWidget::finishPopulate(KFileTreeViewItem* item)
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void FileTreeWidget::slotItemExecuted( QListViewItem* item )
+void FileTreeWidget::slotItemExecuted( TQListViewItem* item )
 {
     if (!item)
         return;
@@ -199,7 +199,7 @@ void FileTreeWidget::slotItemExecuted( QListViewItem* item )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void FileTreeWidget::slotContextMenu( KListView *, QListViewItem* item, const QPoint &p )
+void FileTreeWidget::slotContextMenu( KListView *, TQListViewItem* item, const TQPoint &p )
 {
     kdDebug(9017) << "FileTreeWidget::slotContextMenu(...)" << endl;
 
@@ -219,7 +219,7 @@ void FileTreeWidget::slotContextMenu( KListView *, QListViewItem* item, const QP
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString FileTreeWidget::projectDirectory()
+TQString FileTreeWidget::projectDirectory()
 {
     return m_part->project()->projectDirectory();
 }
@@ -231,7 +231,7 @@ QString FileTreeWidget::projectDirectory()
  *
  * @param fileName or directory to test for presence.
  */
-bool FileTreeWidget::isInProject(const QString &fileName) const
+bool FileTreeWidget::isInProject(const TQString &fileName) const
 {
     return m_projectFiles.contains(fileName);
 }
@@ -250,22 +250,22 @@ bool FileTreeWidget::isInProject(const QString &fileName) const
  *
  * @see m_projectFiles
  */
-void FileTreeWidget::addProjectFiles( QStringList const & fileList, bool constructing )
+void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constructing )
 {
     kdDebug(9017) << "files added to project: " << fileList << endl;
 
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for ( it = fileList.begin(); it != fileList.end(); ++it )
     {
         if( (*it).isEmpty() )
             continue;
         kdDebug(9017) << "adding file: " << *it << endl;
-        const QString file = projectDirectory() + "/" + ( *it );
+        const TQString file = projectDirectory() + "/" + ( *it );
         if ( !m_projectFiles.contains( file ) )
         {
             // We got a new file to add to this project.
             // Ensure all the parent directories are part of the project set, too.
-            QStringList paths = QStringList::split( "/", *it);
+            TQStringList paths = TQStringList::split( "/", *it);
             paths.pop_back();
             while( !paths.isEmpty() )
             {
@@ -274,7 +274,7 @@ void FileTreeWidget::addProjectFiles( QStringList const & fileList, bool constru
                 // Whenever we find out that a directory is already recorded as part of our project,
                 // we may stop adding, because its parent directories were already added -
                 // in some previous addition.
-                QString joinedPaths = paths.join("/");
+                TQString joinedPaths = paths.join("/");
                 if( m_projectFiles.contains( joinedPaths ) )
                     break;
                 m_projectFiles.insert( projectDirectory() + "/" + joinedPaths, true );
@@ -297,14 +297,14 @@ void FileTreeWidget::addProjectFiles( QStringList const & fileList, bool constru
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void FileTreeWidget::removeProjectFiles( QStringList const & fileList )
+void FileTreeWidget::removeProjectFiles( TQStringList const & fileList )
 {
     kdDebug(9017) << "files removed from project: " << fileList.count() << endl;
 
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for ( it = fileList.begin(); it != fileList.end(); ++it )
     {
-        QString file = m_part->project()->projectDirectory() + "/" + ( *it );
+        TQString file = m_part->project()->projectDirectory() + "/" + ( *it );
         m_projectFiles.remove( file );
         kdDebug(9017) << "file removed: " << file << endl;
 
@@ -316,7 +316,7 @@ void FileTreeWidget::removeProjectFiles( QStringList const & fileList )
     }
 }
 
-void FileTreeWidget::changeActiveDirectory( const QString& olddir, const QString& newdir )
+void FileTreeWidget::changeActiveDirectory( const TQString& olddir, const TQString& newdir )
 {
     FileTreeViewItem* item = static_cast(firstChild());
     if( item )
@@ -327,15 +327,15 @@ void FileTreeWidget::changeActiveDirectory( const QString& olddir, const QString
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void FileTreeWidget::applyHidePatterns( const QString &hidePatterns )
+void FileTreeWidget::applyHidePatterns( const TQString &hidePatterns )
 {
-    m_hidePatterns = QStringList::split( ",", hidePatterns );
+    m_hidePatterns = TQStringList::split( ",", hidePatterns );
     hideOrShow();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString FileTreeWidget::hidePatterns() const
+TQString FileTreeWidget::hidePatterns() const
 {
     return m_hidePatterns.join( "," );
 }
diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h
index 53dc77d3..f9608029 100644
--- a/parts/fileview/filetreewidget.h
+++ b/parts/fileview/filetreewidget.h
@@ -14,7 +14,7 @@
 #ifndef _FILETREEWIDGET_H_
 #define _FILETREEWIDGET_H_
 
-#include 
+#include 
 #include 
 
 #include 
@@ -48,20 +48,20 @@ class FileTreeWidget : public KFileTreeView
 {
     Q_OBJECT
 public:
-    FileTreeWidget( FileViewPart *part, QWidget *parent, KDevVCSFileInfoProvider *infoProvider );
+    FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider );
     virtual ~FileTreeWidget();
 
-    void openDirectory(const QString &dirName);
+    void openDirectory(const TQString &dirName);
     bool shouldBeShown( KFileTreeViewItem* item );
 
-    QString projectDirectory();
-    bool isInProject(const QString &fileName) const;
+    TQString projectDirectory();
+    bool isInProject(const TQString &fileName) const;
 
     FileViewPart *part() const { return m_part; }
 
     //KDevVCSFileInfoProvider *vcsFileInfoProvider() const;
-    void applyHidePatterns( const QString &hidePatterns );
-    QString hidePatterns() const;
+    void applyHidePatterns( const TQString &hidePatterns );
+    TQString hidePatterns() const;
 
     bool showNonProjectFiles() const;
 
@@ -70,23 +70,23 @@ public slots:
 
 
 private slots:
-    void slotItemExecuted(QListViewItem *item);
-    void slotContextMenu(KListView *, QListViewItem *item, const QPoint &p);
+    void slotItemExecuted(TQListViewItem *item);
+    void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p);
 
-    void changeActiveDirectory( const QString&, const QString& );
+    void changeActiveDirectory( const TQString&, const TQString& );
     void finishPopulate(KFileTreeViewItem* item);
 
-    void addProjectFiles( QStringList const & fileList, bool constructing = false );
-    void removeProjectFiles( QStringList const & fileList );
+    void addProjectFiles( TQStringList const & fileList, bool constructing = false );
+    void removeProjectFiles( TQStringList const & fileList );
     //! We must guard against unloading the used VCS plug-in when using it: we
     //! fall back to the implementation (a file view without VCS fields, only filenames)
     void slotImplementationInvalidated();
 
 private:
-    bool matchesHidePattern(const QString &fileName);
+    bool matchesHidePattern(const TQString &fileName);
     KDevVersionControl *versionControl() const;
 
-    QStringList m_hidePatterns;
+    TQStringList m_hidePatterns;
     /**
      * @brief Set of all the files in this project.
      *
@@ -99,13 +99,13 @@ private:
      * but rather a map with next-to-useless element value,
      * keyed by names of files.
      * QT3 does not seem to have a set datatype,
-     * thus we use the QMap type instead.
+     * thus we use the TQMap type instead.
      */
-    QMap m_projectFiles;
+    TQMap m_projectFiles;
 
     FileViewPart *m_part;
     KFileTreeBranch *m_rootBranch;
-    QGuardedPtr m_impl;
+    TQGuardedPtr m_impl;
 };
 
 #endif
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index d6d6691d..0e3758c9 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -13,12 +13,12 @@
 
 #include "fileviewpart.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) )
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-FileViewPart::FileViewPart(QObject *parent, const char *name, const QStringList &)
+FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &)
 	: KDevPlugin(&data, parent, name ? name : "FileViewPart"),
     m_widget( 0 )
 {
@@ -66,10 +66,10 @@ FileViewPart::FileViewPart(QObject *parent, const char *name, const QStringList
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createProjectConfigPage( i18n("File Tree"), FILETREE_OPTIONS, info()->icon() );
-	connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )),
-		this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) );
+	connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
-	QTimer::singleShot( 1000, this, SLOT(init()) );
+	TQTimer::singleShot( 1000, this, TQT_SLOT(init()) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -102,15 +102,15 @@ FileViewPart::~FileViewPart()
 
 void FileViewPart::loadSettings()
 {
-    const QColor added = QColor( "#CCFF99" ),
-        updated = QColor( "#FFFFCC" ),
-        modified = QColor( "#CCCCFF" ),
-        conflict = QColor( "#FF6666" ),
-        sticky = QColor( "#FFCCCC" ),
-        needsPatch = QColor( "#FFCCFF" ),
-        needsCheckout = QColor( "#FFCCFF" ),
-        unknown = QColor( white ),
-        defaultColor = QColor( white );
+    const TQColor added = TQColor( "#CCFF99" ),
+        updated = TQColor( "#FFFFCC" ),
+        modified = TQColor( "#CCCCFF" ),
+        conflict = TQColor( "#FF6666" ),
+        sticky = TQColor( "#FFCCCC" ),
+        needsPatch = TQColor( "#FFCCFF" ),
+        needsCheckout = TQColor( "#FFCCFF" ),
+        unknown = TQColor( white ),
+        defaultColor = TQColor( white );
 
     KConfig *cfg = instance()->config();
 
@@ -144,12 +144,12 @@ void FileViewPart::storeSettings()
     cfg->writeEntry( "DefaultColor", vcsColors.defaultColor );
 }
 
-void FileViewPart::insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int pagenumber )
+void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int pagenumber )
 {
 	if ( pagenumber == FILETREE_OPTIONS )
 	{
 		VCSColorsConfigWidget *w = new VCSColorsConfigWidget( this, vcsColors, page, "vcscolorsconfigwidget" );
-		connect( dlg, SIGNAL(okClicked()), w, SLOT(slotAccept()) );
+		connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) );
 	}
 }
 
diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h
index 9c9a03da..01f84d32 100644
--- a/parts/fileview/fileviewpart.h
+++ b/parts/fileview/fileviewpart.h
@@ -12,7 +12,7 @@
 #ifndef _FILEVIEWPART_H_
 #define _FILEVIEWPART_H_
 
-#include 
+#include 
 #include 
 #include "kdevplugin.h"
 #include "vcscolorsconfigwidget.h"
@@ -26,7 +26,7 @@ class FileViewPart : public KDevPlugin
     Q_OBJECT
 
 public:
-    FileViewPart( QObject *parent, const char *name, const QStringList & );
+    FileViewPart( TQObject *parent, const char *name, const TQStringList & );
     virtual ~FileViewPart();
 
     //! Colors to use for VCS visual feed-back
@@ -35,14 +35,14 @@ public:
     KDevVersionControl *versionControl();
 
 private slots:
-	void insertConfigWidget( const KDialogBase* dlg, QWidget * page, unsigned int );
+	void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int );
     void init();
 
 private:
     void loadSettings();
     void storeSettings();
 
-    QGuardedPtr m_widget;
+    TQGuardedPtr m_widget;
 	ConfigWidgetProxy * _configProxy;
 };
 
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index b3f9baf0..db921fb1 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -10,11 +10,11 @@
  ***************************************************************************/
 #include "partwidget.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -34,8 +34,8 @@
 // class PartWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-PartWidget::PartWidget( FileViewPart *part, QWidget *parent )
-    : QVBox( parent, "fileviewpartwidget" ), m_filetree( 0 ),
+PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
+    : TQVBox( parent, "fileviewpartwidget" ), m_filetree( 0 ),
     m_filter( 0 ), m_btnFilter( 0 ), m_part( part )
 {
     Q_ASSERT( part && parent );
@@ -48,29 +48,29 @@ PartWidget::PartWidget( FileViewPart *part, QWidget *parent )
     setCaption(i18n("File Tree"));
     m_filetree->setCaption(i18n("File Tree"));
     m_filetree->setIcon(SmallIcon("folder"));
-    QWhatsThis::add(m_filetree, i18n("File tree
      "
+    TQWhatsThis::add(m_filetree, i18n("File tree
      "
                                     "The file viewer shows all files of the project "
                                     "in a tree layout."));
 
-    QHBox* filterBox = new QHBox( this );
-    m_btnFilter = new QToolButton( filterBox );
+    TQHBox* filterBox = new TQHBox( this );
+    m_btnFilter = new TQToolButton( filterBox );
     m_btnFilter->setIconSet( SmallIconSet("filter" ) );
     m_btnFilter->setToggleButton( true );
     m_filter = new KHistoryCombo( true, filterBox, "filter");
-    m_filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
+    m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
     filterBox->setStretchFactor(m_filter, 2);
 
-    connect( m_btnFilter, SIGNAL( clicked() ), this, SLOT( slotBtnFilterClick() ) );
-    connect( m_filter, SIGNAL( activated(const QString&) ), this, SLOT( slotFilterChange(const QString&) ) );
-    connect( m_filter, SIGNAL( returnPressed(const QString&) ),
-             m_filter, SLOT( addToHistory(const QString&) ) );
+    connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) );
+    connect( m_filter, TQT_SIGNAL( activated(const TQString&) ), this, TQT_SLOT( slotFilterChange(const TQString&) ) );
+    connect( m_filter, TQT_SIGNAL( returnPressed(const TQString&) ),
+             m_filter, TQT_SLOT( addToHistory(const TQString&) ) );
 
-    QWhatsThis::add
+    TQWhatsThis::add
         ( m_filter,
                 i18n("
      Here you can enter a name filter to limit which files are not displayed."
                      "
      To clear the filter, toggle off the filter button to the left."
                      "
      To reapply the last filter used, toggle on the filter button." ) );
-    QWhatsThis::add
+    TQWhatsThis::add
         ( m_btnFilter,
                 i18n("
      This button clears the name filter when toggled off, or "
                      "reapplies the last filter used when toggled on.") );
@@ -94,19 +94,19 @@ void PartWidget::showProjectFiles()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void PartWidget::slotFilterChange( const QString & nf )
+void PartWidget::slotFilterChange( const TQString & nf )
 {
-    QString f = nf.stripWhiteSpace();
+    TQString f = nf.stripWhiteSpace();
     bool empty = f.isEmpty() || f == "*";
     if ( empty )
     {
-        m_filter->lineEdit()->setText( QString::null );
-        QToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) );
+        m_filter->lineEdit()->setText( TQString::null );
+        TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) );
     }
     else
     {
         m_lastFilter = f;
-        QToolTip::add( m_btnFilter, i18n("Clear filter") );
+        TQToolTip::add( m_btnFilter, i18n("Clear filter") );
     }
     m_btnFilter->setOn( !empty );
     // this will be never true after the m_filter has been used;)
@@ -127,7 +127,7 @@ void PartWidget::slotBtnFilterClick()
 {
     if ( !m_btnFilter->isOn() )
     {
-        slotFilterChange( QString::null );
+        slotFilterChange( TQString::null );
     }
     else
     {
@@ -136,7 +136,7 @@ void PartWidget::slotBtnFilterClick()
     }
 }
 
-void PartWidget::focusInEvent( QFocusEvent * )
+void PartWidget::focusInEvent( TQFocusEvent * )
 {
     m_filetree->setFocus();
 }
diff --git a/parts/fileview/partwidget.h b/parts/fileview/partwidget.h
index e9d62665..03090e2b 100644
--- a/parts/fileview/partwidget.h
+++ b/parts/fileview/partwidget.h
@@ -12,7 +12,7 @@
 #ifndef _FILEVIEWPARTWIDGET_H_
 #define _FILEVIEWPARTWIDGET_H_
 
-#include 
+#include 
 
 class FileViewPart;
 
@@ -20,26 +20,26 @@ class PartWidget : public QVBox
 {
     Q_OBJECT
 public:
-    PartWidget( FileViewPart *part, QWidget *parent = 0 );
+    PartWidget( FileViewPart *part, TQWidget *parent = 0 );
     virtual ~PartWidget();
 
     class FileTreeWidget *m_filetree;
     // Support for filters
     class KHistoryCombo *m_filter;
-    class QToolButton *m_btnFilter;
+    class TQToolButton *m_btnFilter;
 
     void showProjectFiles();
 
 protected:
-    virtual void focusInEvent( QFocusEvent * );
+    virtual void focusInEvent( TQFocusEvent * );
 
 private slots:
-    void slotFilterChange( const QString & nf );
+    void slotFilterChange( const TQString & nf );
     void slotBtnFilterClick();
 
 private:
     FileViewPart *m_part;
-    QString m_lastFilter;
+    TQString m_lastFilter;
 };
 
 #endif
diff --git a/parts/fileview/stdfiletreewidgetimpl.cpp b/parts/fileview/stdfiletreewidgetimpl.cpp
index b680f2a8..67a8da28 100644
--- a/parts/fileview/stdfiletreewidgetimpl.cpp
+++ b/parts/fileview/stdfiletreewidgetimpl.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
- #include 
+ #include 
  #include 
 
 #include "fileitemfactory.h"
@@ -36,7 +36,7 @@ public:
 class StdFileTreeBranchItem : public filetreeview::FileTreeBranchItem
 {
 public:
-    StdFileTreeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix )
+    StdFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix )
         : FileTreeBranchItem( view, url, name, pix ) {}
     virtual ~StdFileTreeBranchItem() {}
     virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem );
@@ -64,7 +64,7 @@ KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem*
 class StdBranchItemFactory : public filetreeview::BranchItemFactory
 {
 public:
-    virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix )
+    virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix )
     {
         return new StdFileTreeBranchItem( view, url, name, pix );
     }
@@ -81,7 +81,7 @@ StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *parent )
 
     setBranchItemFactory( new StdBranchItemFactory );
 
-    parent->addColumn( QString::null );
+    parent->addColumn( TQString::null );
     header()->hide();
 }
 
diff --git a/parts/fileview/vcscolorsconfigwidget.cpp b/parts/fileview/vcscolorsconfigwidget.cpp
index 29de36fe..63067c04 100644
--- a/parts/fileview/vcscolorsconfigwidget.cpp
+++ b/parts/fileview/vcscolorsconfigwidget.cpp
@@ -51,7 +51,7 @@ VCSColors &VCSColors::operator=( const VCSColors &others )
 ///////////////////////////////////////////////////////////////////////////////
 
 VCSColorsConfigWidget::VCSColorsConfigWidget(FileViewPart *part, const VCSColors &vcsColors,
-    QWidget* parent, const char* name, WFlags fl)
+    TQWidget* parent, const char* name, WFlags fl)
     : VCSColorsConfigWidgetBase( parent, name, fl ), m_part( part )
 {
     setColors( vcsColors );
diff --git a/parts/fileview/vcscolorsconfigwidget.h b/parts/fileview/vcscolorsconfigwidget.h
index 60cd4f52..b86038fa 100644
--- a/parts/fileview/vcscolorsconfigwidget.h
+++ b/parts/fileview/vcscolorsconfigwidget.h
@@ -12,7 +12,7 @@
 #ifndef VCSCOLORSCONFIGWIDGET_H
 #define VCSCOLORSCONFIGWIDGET_H
 
-#include 
+#include 
 #include "vcscolorsconfigwidgetbase.h"
 
 class FileViewPart;
@@ -23,15 +23,15 @@ struct VCSColors
     VCSColors( const VCSColors &others );
     VCSColors &operator=( const VCSColors &others );
 
-    QColor modified;
-    QColor added;
-    QColor updated;
-    QColor sticky;
-    QColor conflict;
-    QColor needsPatch;
-    QColor needsCheckout;
-    QColor unknown;
-    QColor defaultColor;
+    TQColor modified;
+    TQColor added;
+    TQColor updated;
+    TQColor sticky;
+    TQColor conflict;
+    TQColor needsPatch;
+    TQColor needsCheckout;
+    TQColor unknown;
+    TQColor defaultColor;
 };
 
 class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase
@@ -40,7 +40,7 @@ class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase
 
 public:
   VCSColorsConfigWidget( FileViewPart *part, const VCSColors &vcsColors,
-      QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+      TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   virtual ~VCSColorsConfigWidget();
   /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index 1db873ed..131c2b4f 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -46,26 +46,26 @@ public:
         : FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
     VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
         : FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
-    virtual void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment )
+    virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
     {
         // paint cell in a different color depending on VCS state
-        QColorGroup mycg( cg );
-        mycg.setColor( QColorGroup::Base, *m_statusColor );
+        TQColorGroup mycg( cg );
+        mycg.setColor( TQColorGroup::Base, *m_statusColor );
         FileTreeViewItem::paintCell( p, mycg, column, width, alignment );
     }
     void setVCSInfo( const VCSFileInfo &info );
 
-    QString fileName() const { return text( FILENAME_COLUMN ); }
-    QString workingRev() const { return text( WORKREVISION_COLUMN ); }
-    QString repositoryRev() const { return text( REPOREVISION_COLUMN ); }
-    QString status() const { return text( STATUS_COLUMN ); }
-    void setFileName( const QString &p ) { setText( FILENAME_COLUMN, p ); }
-    void setWorkingRev( const QString &p ) { setText( WORKREVISION_COLUMN, p ); }
-    void setRepositoryRev( const QString &p ) { setText( REPOREVISION_COLUMN, p ); }
+    TQString fileName() const { return text( FILENAME_COLUMN ); }
+    TQString workingRev() const { return text( WORKREVISION_COLUMN ); }
+    TQString repositoryRev() const { return text( REPOREVISION_COLUMN ); }
+    TQString status() const { return text( STATUS_COLUMN ); }
+    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 setStatus( const VCSFileInfo::FileState status );
 
 private:
-    QColor *m_statusColor; // cached
+    TQColor *m_statusColor; // cached
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -126,7 +126,7 @@ void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status )
 class VCSFileTreeBranchItem : public filetreeview::FileTreeBranchItem
 {
 public:
-    VCSFileTreeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix,
+    VCSFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix,
         KDevVCSFileInfoProvider *vcsInfoProvider )
         : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {}
 //    virtual ~VCSFileTreeBranchItem() {}
@@ -150,8 +150,8 @@ KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem*
 
     VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( parent, fileItem, this, isDirectory );
 
-//     QString fileName = fileURL.fileName();
-//     QString dirName = URLUtil::extractPathNameRelative( lv->projectDirectory(), fileURL.directory() );
+//     TQString fileName = fileURL.fileName();
+//     TQString dirName = URLUtil::extractPathNameRelative( lv->projectDirectory(), fileURL.directory() );
 
 //     const VCSFileInfoMap &vcsFiles = *m_vcsInfoProvider->status( dirName );
 //  kdDebug(9017) << "Dir has " << vcsFiles.count() << " registered files!" << endl;
@@ -170,7 +170,7 @@ class VCSBranchItemFactory : public filetreeview::BranchItemFactory
 {
 public:
     VCSBranchItemFactory( KDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {}
-    virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const QString& name, const QPixmap& pix )
+    virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix )
     {
         return new VCSFileTreeBranchItem( view, url, name, pix, m_vcsInfoProvider );
     }
@@ -198,27 +198,27 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil
     parent->addColumn( "Work" );
     parent->addColumn( "Repo" );
 
-    connect( m_vcsInfoProvider, SIGNAL(statusReady(const VCSFileInfoMap&, void *)),
-        this, SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) );
+    connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)),
+        this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) );
     // Harakiri itself if the infoProvider object is destroyed since we cannot work anymore :-(
-    connect( m_vcsInfoProvider, SIGNAL(destroyed()), SIGNAL(implementationInvalidated()) );
+    connect( m_vcsInfoProvider, TQT_SIGNAL(destroyed()), TQT_SIGNAL(implementationInvalidated()) );
 
     m_actionToggleShowVCSFields = new KToggleAction( i18n("Show VCS Fields"), KShortcut(),
         this, "actiontoggleshowvcsfieldstoggleaction" );
     m_actionToggleShowVCSFields->setCheckedState(i18n("Hide VCS Fields"));
-    QString aboutAction = i18n("Show VCS fields
      Shows Revision and Timestamp for each file contained in VCS repository.");
+    TQString aboutAction = i18n("Show VCS fields
      Shows Revision and Timestamp for each file contained in VCS repository.");
     m_actionToggleShowVCSFields->setWhatsThis( aboutAction );
-    connect( m_actionToggleShowVCSFields, SIGNAL(toggled(bool)), this, SLOT(slotToggleShowVCSFields(bool)) );
+    connect( m_actionToggleShowVCSFields, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleShowVCSFields(bool)) );
 
     m_actionSyncWithRepository = new KAction( i18n( "Sync with Repository"), KShortcut(),
-        this, SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" );
+        this, TQT_SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" );
     aboutAction = i18n("Sync with repository
      Synchronize file status with remote repository.");
     m_actionSyncWithRepository->setWhatsThis( aboutAction );
 
-    QDomDocument &dom = projectDom();
+    TQDomDocument &dom = projectDom();
     m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") );
     slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings
-    connect( parent, SIGNAL(expanded(QListViewItem*)), this, SLOT(slotDirectoryExpanded(QListViewItem*)));
+    connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*)));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -227,7 +227,7 @@ VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl()
 {
     kdDebug(9017) << "VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl()" << endl;
 
-    QDomDocument &dom = projectDom();
+    TQDomDocument &dom = projectDom();
     DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/showvcsfields", showVCSFields() );
 }
 
@@ -240,7 +240,7 @@ bool VCSFileTreeWidgetImpl::canReloadTree() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void VCSFileTreeWidgetImpl::fillPopupMenu( QPopupMenu *popupMenu, QListViewItem *item ) const
+void VCSFileTreeWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewItem *item ) const
 {
     FileTreeViewWidgetImpl::fillPopupMenu( popupMenu, item );
 
@@ -306,7 +306,7 @@ void VCSFileTreeWidgetImpl::vcsDirStatusReady( const VCSFileInfoMap &modifiedFil
     item = static_cast( item->firstChild() );
     while (item)
     {
-        const QString fileName = item->fileName();
+        const TQString fileName = item->fileName();
         kdDebug(9017) << "Widget item filename is: " << fileName << endl;
         if (modifiedFiles.contains( fileName ))
         {
@@ -329,7 +329,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository()
 {
     kdDebug(9017) << "VCSFileTreeWidgetImpl::slotSyncWithRepository()" << endl;
     const VCSFileTreeViewItem *myFileItem = static_cast( m_vcsStatusRequestedItem );
-    const QString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() );
+    const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() );
     kdDebug(9017) << "VCS Info requested for: " << relDirPath << endl;
     m_vcsInfoProvider->requestStatus( relDirPath, m_vcsStatusRequestedItem );
     m_isSyncingWithRepository = true;
@@ -337,12 +337,12 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void VCSFileTreeWidgetImpl::slotDirectoryExpanded( QListViewItem* aItem )
+void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem )
 {
     VCSFileTreeViewItem *item = static_cast( aItem );
     if( !item ) return;
 
-    const QString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() );
+    const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() );
     kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl;
     m_vcsInfoProvider->requestStatus( relDirPath, item, false, false );
 
diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h
index de4dc8c1..7a6761a9 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.h
+++ b/parts/fileview/vcsfiletreewidgetimpl.h
@@ -37,7 +37,7 @@ public:
     /*
     * Add "sync with repository" and "show VCS fields" options to the context menu.
     */
-    virtual void fillPopupMenu( QPopupMenu *popupMenu, QListViewItem *item ) const;
+    virtual void fillPopupMenu( TQPopupMenu *popupMenu, TQListViewItem *item ) const;
 
 private slots:
     //! show/hide the header and the additional fields (status and versions)
@@ -50,7 +50,7 @@ private slots:
     //! the items which are childs of the @see filetreeview::FileTreeViewItem stored in
     //! @p callerData.
     void vcsDirStatusReady( const VCSFileInfoMap &modifiedFiles, void *callerData );
-    void slotDirectoryExpanded( QListViewItem* );
+    void slotDirectoryExpanded( TQListViewItem* );
 
 private:
     bool showVCSFields() const;
diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index 8804e701..dbb0dfc6 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -29,7 +29,7 @@
 static const KDevPluginInfo data("kdevfilter");
 K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) )
 
-FilterPart::FilterPart(QObject *parent, const char *name, const QStringList &)
+FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevPlugin(&data, parent, name ? name : "FilterPart")
 {
     setInstance(FilterFactory::instance());
@@ -38,13 +38,13 @@ FilterPart::FilterPart(QObject *parent, const char *name, const QStringList &)
     KAction *action;
 
     action = new KAction( i18n("Execute Command..."), 0,
-                          this, SLOT(slotShellInsert()),
+                          this, TQT_SLOT(slotShellInsert()),
                           actionCollection(), "tools_insertshell" );
     action->setToolTip(i18n("Execute shell command"));
     action->setWhatsThis(i18n("Execute shell command
      Executes a shell command and outputs its result into the current document."));
 
     action = new KAction( i18n("Filter Selection Through Command..."), 0,
-                          this, SLOT(slotShellFilter()),
+                          this, TQT_SLOT(slotShellFilter()),
                           actionCollection(), "tools_filtershell" );
     action->setToolTip(i18n("Filter selection through a shell command"));
     action->setWhatsThis(i18n("Filter selection through shell command
      Filters selection through a shell command and outputs its result into the current document."));
@@ -70,7 +70,7 @@ void FilterPart::slotShellInsert()
 
     KParts::ReadWritePart *part
         = dynamic_cast(partController()->activePart());
-    QWidget *view = partController()->activeWidget();
+    TQWidget *view = partController()->activeWidget();
     if (!part || !view) {
         kdDebug(9029) << "no rw part" << endl;
         return;
@@ -109,7 +109,7 @@ void FilterPart::slotShellFilter()
 
     KParts::ReadWritePart *part
         = dynamic_cast(partController()->activePart());
-    QWidget *view = partController()->activeWidget();
+    TQWidget *view = partController()->activeWidget();
     if (!part || !view) {
         kdDebug(9029) << "no rw part" << endl;
         return;
diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h
index ec731f12..55b89dbc 100644
--- a/parts/filter/filterpart.h
+++ b/parts/filter/filterpart.h
@@ -24,7 +24,7 @@ class FilterPart : public KDevPlugin
     Q_OBJECT
 
 public:
-    FilterPart( QObject *parent, const char *name, const QStringList & );
+    FilterPart( TQObject *parent, const char *name, const TQStringList & );
     ~FilterPart();
 
 public slots:
diff --git a/parts/filter/kdevfilterIface.cpp b/parts/filter/kdevfilterIface.cpp
index 55a0421a..3df749a4 100644
--- a/parts/filter/kdevfilterIface.cpp
+++ b/parts/filter/kdevfilterIface.cpp
@@ -14,7 +14,7 @@
 #include "filterpart.h"
 
 KDevFilterIface::KDevFilterIface( FilterPart* part )
-    : QObject( part ), DCOPObject( "KDevFilter" ), m_part( part )
+    : TQObject( part ), DCOPObject( "KDevFilter" ), m_part( part )
 {
 }
 
diff --git a/parts/filter/kdevfilterIface.h b/parts/filter/kdevfilterIface.h
index 46a14277..d51acdbc 100644
--- a/parts/filter/kdevfilterIface.h
+++ b/parts/filter/kdevfilterIface.h
@@ -2,12 +2,12 @@
 #ifndef KDEVFILTERIFACE_H
 #define KDEVFILTERIFACE_H
 
-#include 
+#include 
 #include 
 
 class FilterPart;
 
-class KDevFilterIface : public QObject, public DCOPObject
+class KDevFilterIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
     K_DCOP
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 7e967cda..484cb4cc 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -11,9 +11,9 @@
 
 #include "shellfilterdlg.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -29,11 +29,11 @@
 
 
 ShellFilterDialog::ShellFilterDialog()
-    : QDialog(0, "shell filter dialog", true)
+    : TQDialog(0, "shell filter dialog", true)
 {
-    QVBoxLayout *layout = new QVBoxLayout(this, 10, 4);
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
 
-    combo = new QComboBox(true, this);
+    combo = new TQComboBox(true, this);
     combo->setDuplicatesEnabled(false);
     layout->addWidget(combo);
 
@@ -44,10 +44,10 @@ ShellFilterDialog::ShellFilterDialog()
     buttonbox->layout();
     layout->addWidget(buttonbox);
 
-    connect( start_button, SIGNAL(clicked()),
-             this, SLOT(slotStartClicked()) );
-    connect( cancel_button, SIGNAL(clicked()),
-             this, SLOT(reject()) );
+    connect( start_button, TQT_SIGNAL(clicked()),
+             this, TQT_SLOT(slotStartClicked()) );
+    connect( cancel_button, TQT_SIGNAL(clicked()),
+             this, TQT_SLOT(reject()) );
 
     m_proc = 0;
 
@@ -62,8 +62,8 @@ ShellFilterDialog::~ShellFilterDialog()
     kdDebug(9029) << "~ShellFilterDialog" << endl;
     delete m_proc;
 
-    // QComboBox API is a bit incomplete :-(
-    QStringList list;
+    // TQComboBox API is a bit incomplete :-(
+    TQStringList list;
     for (int i=0; i < combo->count(); ++i)
         list << combo->text(i);
 
@@ -76,17 +76,17 @@ ShellFilterDialog::~ShellFilterDialog()
 void ShellFilterDialog::slotStartClicked()
 {
     start_button->setEnabled(false);
-    m_outstr = QCString();
+    m_outstr = TQCString();
 
     delete m_proc;
     m_proc = new KShellProcess("/bin/sh");
     (*m_proc) << combo->currentText();
-    connect( m_proc, SIGNAL(receivedStdout(KProcess*, char *, int)),
-             this, SLOT(slotReceivedStdout(KProcess*, char *, int)) );
-    connect( m_proc, SIGNAL(wroteStdin(KProcess*)),
-             this, SLOT(slotWroteStdin(KProcess*)) );
-    connect( m_proc, SIGNAL(processExited(KProcess*)),
-             this, SLOT(slotProcessExited(KProcess*)) );
+    connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char *, int)),
+             this, TQT_SLOT(slotReceivedStdout(KProcess*, char *, int)) );
+    connect( m_proc, TQT_SIGNAL(wroteStdin(KProcess*)),
+             this, TQT_SLOT(slotWroteStdin(KProcess*)) );
+    connect( m_proc, TQT_SIGNAL(processExited(KProcess*)),
+             this, TQT_SLOT(slotProcessExited(KProcess*)) );
     m_proc->start(KProcess::NotifyOnExit, KProcess::All);
     m_proc->writeStdin(m_instr, m_instr.length());
 }
@@ -95,13 +95,13 @@ void ShellFilterDialog::slotStartClicked()
 int ShellFilterDialog::exec()
 {
     start_button->setEnabled(true);
-    return QDialog::exec();
+    return TQDialog::exec();
 }
 
 
 void ShellFilterDialog::slotReceivedStdout(KProcess *, char *text, int len)
 {
-    m_outstr += QString::fromLocal8Bit(text, len+1);
+    m_outstr += TQString::fromLocal8Bit(text, len+1);
     kdDebug(9029) << "outstr " << m_outstr << endl;
 }
 
diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h
index 3307c060..6642eb92 100644
--- a/parts/filter/shellfilterdlg.h
+++ b/parts/filter/shellfilterdlg.h
@@ -12,7 +12,7 @@
 #ifndef _SHELLFILTERDLG_H_
 #define _SHELLFILTERDLG_H_
 
-#include 
+#include 
 
 class QComboBox;
 class QPushButton;
@@ -30,9 +30,9 @@ public:
 
     virtual int exec();
 
-    void setText(const QString &str)
+    void setText(const TQString &str)
     { m_instr = str.local8Bit(); }
-    QString text() const
+    TQString text() const
     { return m_outstr; }
 
 private slots:
@@ -42,11 +42,11 @@ private slots:
     void slotProcessExited(KProcess *);
 
 private:
-    QPushButton *start_button, *cancel_button;
-    QComboBox *combo;
+    TQPushButton *start_button, *cancel_button;
+    TQComboBox *combo;
     KProcess *m_proc;
-    QCString m_instr;
-    QString m_outstr;
+    TQCString m_instr;
+    TQString m_outstr;
 };
 
 #endif
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index a1474ed2..e36278b5 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -11,9 +11,9 @@
 
 #include "shellinsertdlg.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -30,11 +30,11 @@
 
 
 ShellInsertDialog::ShellInsertDialog()
-    : QDialog(0, "shell filter dialog", true)
+    : TQDialog(0, "shell filter dialog", true)
 {
-    QVBoxLayout *layout = new QVBoxLayout(this, 10, 4);
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
 
-    combo = new QComboBox(true, this);
+    combo = new TQComboBox(true, this);
     combo->setDuplicatesEnabled(false);
     layout->addWidget(combo);
 
@@ -45,16 +45,16 @@ ShellInsertDialog::ShellInsertDialog()
     buttonbox->layout();
     layout->addWidget(buttonbox);
 
-    connect( start_button, SIGNAL(clicked()),
-             this, SLOT(slotStartClicked()) );
-    connect( cancel_button, SIGNAL(clicked()),
-             this, SLOT(reject()) );
-    connect( combo->lineEdit(), SIGNAL(textChanged( const QString &)), this, SLOT(executeTextChanged( const QString &)));
+    connect( start_button, TQT_SIGNAL(clicked()),
+             this, TQT_SLOT(slotStartClicked()) );
+    connect( cancel_button, TQT_SIGNAL(clicked()),
+             this, TQT_SLOT(reject()) );
+    connect( combo->lineEdit(), TQT_SIGNAL(textChanged( const TQString &)), this, TQT_SLOT(executeTextChanged( const TQString &)));
     m_proc = 0;
 
     KConfig *config = FilterFactory::instance()->config();
     config->setGroup("General");
-    QStringList items = config->readListEntry("InsertItems");
+    TQStringList items = config->readListEntry("InsertItems");
     combo->insertStringList(items);
     executeTextChanged( combo->lineEdit()->text());
 
@@ -66,8 +66,8 @@ ShellInsertDialog::~ShellInsertDialog()
     kdDebug(9029) << "~ShellInsertDialog" << endl;
     delete m_proc;
 
-    // QComboBox API is a bit incomplete :-(
-    QStringList list;
+    // TQComboBox API is a bit incomplete :-(
+    TQStringList list;
     for (int i=0; i < combo->count(); ++i)
         list << combo->text(i);
 
@@ -77,7 +77,7 @@ ShellInsertDialog::~ShellInsertDialog()
 }
 
 
-void ShellInsertDialog::executeTextChanged( const QString &text)
+void ShellInsertDialog::executeTextChanged( const TQString &text)
 {
     start_button->setEnabled(!text.isEmpty());
 }
@@ -85,29 +85,29 @@ void ShellInsertDialog::executeTextChanged( const QString &text)
 int ShellInsertDialog::exec()
 {
     start_button->setEnabled(true);
-    return QDialog::exec();
+    return TQDialog::exec();
 }
 
 
 void ShellInsertDialog::slotStartClicked()
 {
     start_button->setEnabled(false);
-    m_str = QCString();
+    m_str = TQCString();
 
     delete m_proc;
     m_proc = new KShellProcess("/bin/sh");
     (*m_proc) << combo->currentText();
-    connect( m_proc, SIGNAL(receivedStdout(KProcess*, char *, int)),
-             this, SLOT(slotReceivedStdout(KProcess*, char *, int)) );
-    connect( m_proc, SIGNAL(processExited(KProcess*)),
-             this, SLOT(slotProcessExited(KProcess*)) );
+    connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char *, int)),
+             this, TQT_SLOT(slotReceivedStdout(KProcess*, char *, int)) );
+    connect( m_proc, TQT_SIGNAL(processExited(KProcess*)),
+             this, TQT_SLOT(slotProcessExited(KProcess*)) );
     m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
 }
 
 
 void ShellInsertDialog::slotReceivedStdout(KProcess *, char *text, int len)
 {
-    m_str += QCString(text, len+1);
+    m_str += TQCString(text, len+1);
 }
 
 
diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h
index c6f0696b..cb0992c9 100644
--- a/parts/filter/shellinsertdlg.h
+++ b/parts/filter/shellinsertdlg.h
@@ -12,7 +12,7 @@
 #ifndef _SHELLINSERTDLG_H_
 #define _SHELLINSERTDLG_H_
 
-#include 
+#include 
 
 class QComboBox;
 class QPushButton;
@@ -30,20 +30,20 @@ public:
 
     virtual int exec();
 
-    QString text() const
-    { return QString::fromLocal8Bit(m_str); }
+    TQString text() const
+    { return TQString::fromLocal8Bit(m_str); }
     
 private slots:
     void slotStartClicked();
     void slotReceivedStdout(KProcess *, char *text, int len);
     void slotProcessExited(KProcess *);
-    void executeTextChanged( const QString &text);
+    void executeTextChanged( const TQString &text);
    
 private:
-    QPushButton *start_button, *cancel_button;
-    QComboBox *combo;
+    TQPushButton *start_button, *cancel_button;
+    TQComboBox *combo;
     KProcess *m_proc;
-    QCString m_str;
+    TQCString m_str;
 };
 
 #endif
diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
index 20e046f1..b3c2240f 100644
--- a/parts/fullscreen/fullscreen_part.cpp
+++ b/parts/fullscreen/fullscreen_part.cpp
@@ -27,7 +27,7 @@ static const KDevPluginInfo data("kdevfullscreen");
 typedef KDevGenericFactory FullScreenFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) )
 
-FullScreenPart::FullScreenPart(QObject *parent, const char *name, const QStringList& )
+FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& )
   : KDevPlugin(&data, parent, name ? name : "FullScreenPart" )
 {
   setInstance(FullScreenFactory::instance());
@@ -40,7 +40,7 @@ FullScreenPart::FullScreenPart(QObject *parent, const char *name, const QStringL
 
   m_bFullScreen = false;
 
-  m_pFullScreen = KStdAction::fullScreen(this, SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main());
+  m_pFullScreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main());
 }
 
 FullScreenPart::~FullScreenPart()
diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h
index a7ce3c0a..1b5fe53e 100644
--- a/parts/fullscreen/fullscreen_part.h
+++ b/parts/fullscreen/fullscreen_part.h
@@ -12,7 +12,7 @@
 #ifndef __KDEVPART_FULLSCREEN_H__
 #define __KDEVPART_FULLSCREEN_H__
 
-#include 
+#include 
 #include 
 
 class KAction;
@@ -21,7 +21,7 @@ class FullScreenPart : public KDevPlugin
 {
     Q_OBJECT
 public:
-    FullScreenPart(QObject *parent, const char *name, const QStringList &);
+    FullScreenPart(TQObject *parent, const char *name, const TQStringList &);
     virtual ~FullScreenPart();
 
 public slots:
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 9c62510e..80264a92 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -11,13 +11,13 @@
 
 #include "grepdlg.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -28,7 +28,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -80,32 +80,32 @@ const char *filepatterns[] = {
 };
 
 
-GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name )
-    : QDialog(parent, name, false), m_part( part )
+GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name )
+    : TQDialog(parent, name, false), m_part( part )
 {
     setCaption(i18n("Find in Files"));
 
     config = GrepViewFactory::instance()->config();
     config->setGroup("GrepDialog");
 
-    QGridLayout *layout = new QGridLayout(this, 9, 2, 10, 4);
+    TQGridLayout *layout = new TQGridLayout(this, 9, 2, 10, 4);
     layout->setColStretch(0, 0);
     layout->setColStretch(1, 20);
 
-    QLabel *pattern_label = new QLabel(i18n("&Pattern:"), this);
+    TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this);
     layout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter);
 
     pattern_combo = new KHistoryCombo(true, this);
     pattern_label->setBuddy(pattern_combo);
     pattern_combo->setFocus();
     pattern_combo->setHistoryItems(config->readListEntry("LastSearchItems"), true);
-    pattern_combo->setInsertionPolicy(QComboBox::NoInsertion);
+    pattern_combo->setInsertionPolicy(TQComboBox::NoInsertion);
     layout->addWidget(pattern_combo, 0, 1);
 
-    QLabel *template_label = new QLabel(i18n("&Template:"), this);
+    TQLabel *template_label = new TQLabel(i18n("&Template:"), this);
     layout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter);
 
-    QBoxLayout *template_layout = new QHBoxLayout(4);
+    TQBoxLayout *template_layout = new TQHBoxLayout(4);
     layout->addLayout(template_layout, 1, 1);
 
     template_edit = new KLineEdit(this);
@@ -117,28 +117,28 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name )
     template_combo->insertStrList(template_desc);
     template_layout->addWidget(template_combo, 0);
 
-    QBoxLayout *search_opts_layout = new QHBoxLayout(15);
+    TQBoxLayout *search_opts_layout = new TQHBoxLayout(15);
     layout->addLayout(search_opts_layout, 2, 1);
 
-    regexp_box = new QCheckBox(i18n("&Regular Expression"), this);
+    regexp_box = new TQCheckBox(i18n("&Regular Expression"), this);
     regexp_box->setChecked(config->readBoolEntry("regexp", false ));
     search_opts_layout->addWidget(regexp_box);
 
-    case_sens_box = new QCheckBox(i18n("C&ase sensitive"), this);
-    case_sens_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    case_sens_box = new TQCheckBox(i18n("C&ase sensitive"), this);
+    case_sens_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
     case_sens_box->setChecked(config->readBoolEntry("case_sens", true));
     search_opts_layout->addWidget(case_sens_box);
 
-    QLabel *dir_label = new QLabel(i18n("&Directory:"), this);
+    TQLabel *dir_label = new TQLabel(i18n("&Directory:"), this);
     layout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter);
 
-    QBoxLayout *dir_layout = new QHBoxLayout(4);
+    TQBoxLayout *dir_layout = new TQHBoxLayout(4);
     layout->addLayout(dir_layout, 3, 1);
 
     dir_combo = new KComboBox( true, this );
     dir_combo->insertStringList(config->readPathListEntry("LastSearchPaths"));
-    dir_combo->setInsertionPolicy(QComboBox::NoInsertion);
-    dir_combo->setEditText(QDir::homeDirPath());
+    dir_combo->setInsertionPolicy(TQComboBox::NoInsertion);
+    dir_combo->setEditText(TQDir::homeDirPath());
 
     url_requester = new KURLRequester( dir_combo, this );
     url_requester->completionObject()->setMode(KURLCompletion::DirCompletion);
@@ -149,27 +149,27 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name )
     dir_layout->addWidget( url_requester, 10 );
 
     synch_button = new KPushButton( this );
-    QIconSet set = SmallIconSet( "dirsynch" );
-    QPixmap pix = set.pixmap( QIconSet::Small, QIconSet::Normal );
+    TQIconSet set = SmallIconSet( "dirsynch" );
+    TQPixmap pix = set.pixmap( TQIconSet::Small, TQIconSet::Normal );
     synch_button->setFixedSize( pix.width()+8, pix.height()+8 );
     synch_button->setIconSet( set );
-    synch_button->setAccel( QKeySequence( "Alt+y") );
-    QToolTip::add( synch_button, i18n("Set directory to that of the current file (Alt+Y)") );
+    synch_button->setAccel( TQKeySequence( "Alt+y") );
+    TQToolTip::add( synch_button, i18n("Set directory to that of the current file (Alt+Y)") );
     dir_layout->addWidget( synch_button );
 
-    QBoxLayout *dir_opts_layout = new QHBoxLayout(15);
+    TQBoxLayout *dir_opts_layout = new TQHBoxLayout(15);
     layout->addLayout(dir_opts_layout, 4, 1);
 
-    recursive_box = new QCheckBox(i18n("Rec&ursive"), this);
+    recursive_box = new TQCheckBox(i18n("Rec&ursive"), this);
     recursive_box->setChecked(config->readBoolEntry("recursive", true));
     dir_opts_layout->addWidget(recursive_box);
 
-    use_project_box = new QCheckBox(i18n("Limit search to &project files"), this);
-    use_project_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    use_project_box = new TQCheckBox(i18n("Limit search to &project files"), this);
+    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);
 
-    QLabel *files_label = new QLabel(i18n("&Files:"), this);
+    TQLabel *files_label = new TQLabel(i18n("&Files:"), this);
     layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
 
     files_combo = new KComboBox(true, this);
@@ -177,10 +177,10 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name )
     files_combo->insertStrList(filepatterns);
     layout->addWidget(files_combo, 5, 1);
 
-    QLabel *exclude_label = new QLabel(i18n("&Exclude:"), this);
+    TQLabel *exclude_label = new TQLabel(i18n("&Exclude:"), this);
     layout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter);
 
-    QStringList exclude_list = config->readListEntry("exclude_patterns");
+    TQStringList exclude_list = config->readListEntry("exclude_patterns");
     exclude_combo = new KComboBox(true, this);
     exclude_label->setBuddy(files_combo->focusProxy());
     if (exclude_list.count()) {
@@ -193,19 +193,19 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name )
     }
     layout->addWidget(exclude_combo, 6, 1);
 
-    QBoxLayout *other_opts_layout = new QHBoxLayout(15);
+    TQBoxLayout *other_opts_layout = new TQHBoxLayout(15);
     layout->addLayout(other_opts_layout, 7, 1);
 
-    keep_output_box = new QCheckBox(i18n("New view"), this);
+    keep_output_box = new TQCheckBox(i18n("New view"), this);
     keep_output_box->setChecked(config->readBoolEntry("new_view", true));
     other_opts_layout->addWidget(keep_output_box);
 
-    no_find_err_box = new QCheckBox(i18n("&Suppress find errors"), this);
-    no_find_err_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    no_find_err_box = new TQCheckBox(i18n("&Suppress find errors"), this);
+    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);
 
-    QBoxLayout *button_layout = new QHBoxLayout(4);
+    TQBoxLayout *button_layout = new TQHBoxLayout(4);
     layout->addLayout(button_layout, 8, 1);
     search_button = new KPushButton(KGuiItem(i18n("Sea&rch"),"grep"), this);
     search_button->setDefault(true);
@@ -216,7 +216,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name )
 
     resize(sizeHint());
 
-    QWhatsThis::add(pattern_combo,
+    TQWhatsThis::add(pattern_combo,
 		    i18n("Enter the regular expression you want to search for here.
      "
 			 "Possible meta characters are:"
                          "
        "
@@ -240,31 +240,31 @@ GrepDialog::GrepDialog( GrepViewPart * part, QWidget *parent, const char *name )
 			 "Furthermore, backreferences to bracketed subexpressions are "
 			 "available via the notation \\n."
 			 ));
-    QWhatsThis::add(files_combo,
+    TQWhatsThis::add(files_combo,
 		    i18n("Enter the file name pattern of the files to search here. "
 			 "You may give several patterns separated by commas"));
-    QWhatsThis::add(template_edit,
+    TQWhatsThis::add(template_edit,
 		    i18n("You can choose a template for the pattern from the combo box "
 			 "and edit it here. The string %s in the template is replaced "
 			 "by the pattern input field, resulting in the regular expression "
 			 "to search for."));
 
-    connect( template_combo, SIGNAL(activated(int)),
-	     SLOT(templateActivated(int)) );
-    connect( search_button, SIGNAL(clicked()),
-	     SLOT(slotSearchClicked()) );
-    connect( done_button, SIGNAL(clicked()),
-	     SLOT(hide()) );
-    connect( pattern_combo->lineEdit(), SIGNAL( textChanged ( const QString & ) ),
-             SLOT( slotPatternChanged( const QString & ) ) );
-	connect( synch_button, SIGNAL(clicked()), this, SLOT(slotSynchDirectory()) );
+    connect( template_combo, TQT_SIGNAL(activated(int)),
+	     TQT_SLOT(templateActivated(int)) );
+    connect( search_button, TQT_SIGNAL(clicked()),
+	     TQT_SLOT(slotSearchClicked()) );
+    connect( done_button, TQT_SIGNAL(clicked()),
+	     TQT_SLOT(hide()) );
+    connect( pattern_combo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ),
+             TQT_SLOT( slotPatternChanged( const TQString & ) ) );
+	connect( synch_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSynchDirectory()) );
     slotPatternChanged( pattern_combo->currentText() );
 }
 
-// Returns the contents of a QComboBox as a QStringList
-static QStringList qCombo2StringList( QComboBox* combo )
+// Returns the contents of a TQComboBox as a QStringList
+static TQStringList qCombo2StringList( TQComboBox* combo )
 {
-    QStringList list;
+    TQStringList list;
     if (!combo)
 	return list;
     for (int i = 0; i < combo->count(); ++i ) {
@@ -288,7 +288,7 @@ GrepDialog::~GrepDialog()
 	config->writeEntry("exclude_patterns", qCombo2StringList(exclude_combo));
 }
 
-void GrepDialog::slotPatternChanged( const QString & _text )
+void GrepDialog::slotPatternChanged( const TQString & _text )
 {
     search_button->setEnabled( !_text.isEmpty() );
 }
@@ -299,7 +299,7 @@ void GrepDialog::templateActivated(int index)
 }
 
 // Find out whether the string s is already contained in combo
-static bool qComboContains( const QString& s, QComboBox* combo )
+static bool qComboContains( const TQString& s, TQComboBox* combo )
 {
     if (!combo)
 	return false;
@@ -348,15 +348,15 @@ void GrepDialog::show()
     // managers and Qt versions
     if (isVisible())
         hide();
-//         QDialog::hide();
-    QDialog::show();
+//         TQDialog::hide();
+    TQDialog::show();
     pattern_combo->setFocus();
 }
 
 void GrepDialog::hide()
 {
 	pattern_combo->setFocus();
-	QDialog::hide();
+	TQDialog::hide();
 }
 
 void GrepDialog::slotSynchDirectory( )
diff --git a/parts/grepview/grepdlg.h b/parts/grepview/grepdlg.h
index c24332bd..11b8d275 100644
--- a/parts/grepview/grepdlg.h
+++ b/parts/grepview/grepdlg.h
@@ -12,9 +12,9 @@
 #ifndef _GREPDLG_H_
 #define _GREPDLG_H_
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -30,24 +30,24 @@ class GrepDialog : public QDialog
     Q_OBJECT
 
 public:
-    GrepDialog( GrepViewPart * part, QWidget *parent=0, const char *name=0 );
+    GrepDialog( GrepViewPart * part, TQWidget *parent=0, const char *name=0 );
     ~GrepDialog();
 
-    void setPattern(const QString &pattern)
+    void setPattern(const TQString &pattern)
 	{ pattern_combo->setEditText(pattern); }
-    void setDirectory(const QString &dir)
+    void setDirectory(const TQString &dir)
 	{ dir_combo->setEditText(dir); }
     void setEnableProjectBox(bool enable);
 
-    QString patternString() const
+    TQString patternString() const
 	{ return pattern_combo->currentText(); }
-    QString templateString() const
+    TQString templateString() const
 	{ return template_edit->text(); }
-    QString filesString() const
+    TQString filesString() const
 	{ return files_combo->currentText(); }
-    QString excludeString() const
+    TQString excludeString() const
 	{ return exclude_combo->currentText(); }
-    QString directoryString() const
+    TQString directoryString() const
 	{ return dir_combo->currentText(); }
 
 	bool useProjectFilesFlag() const
@@ -72,7 +72,7 @@ signals:
 private slots:
     void templateActivated(int index);
     void slotSearchClicked();
-    void slotPatternChanged( const QString &);
+    void slotPatternChanged( const TQString &);
 	void slotSynchDirectory();
 
 private:
@@ -83,15 +83,15 @@ private:
     KComboBox * dir_combo;
     KURLRequester * url_requester;
 
-    QCheckBox *regexp_box;
-    QCheckBox *recursive_box;
-    QCheckBox *use_project_box;
-    QCheckBox *no_find_err_box;
-    QCheckBox *case_sens_box;
-    QCheckBox *keep_output_box;
+    TQCheckBox *regexp_box;
+    TQCheckBox *recursive_box;
+    TQCheckBox *use_project_box;
+    TQCheckBox *no_find_err_box;
+    TQCheckBox *case_sens_box;
+    TQCheckBox *keep_output_box;
     KConfig* config;
-    QPushButton *search_button;
-	QPushButton *synch_button;
+    TQPushButton *search_button;
+	TQPushButton *synch_button;
 	GrepViewPart * m_part;
 };
 
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 7b1f75d9..6765f87f 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -11,9 +11,9 @@
 
 #include "grepviewpart.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -34,24 +34,24 @@ static const KDevPluginInfo data("kdevgrepview");
 
 K_EXPORT_COMPONENT_FACTORY(libkdevgrepview, GrepViewFactory(data))
 
-GrepViewPart::GrepViewPart( QObject *parent, const char *name, const QStringList & )
+GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringList & )
     : KDevPlugin( &data, parent, name ? name : "GrepViewPart" )
 {
     setInstance(GrepViewFactory::instance());
 
     setXMLFile("kdevgrepview.rc");
 
-    connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)),
-             this, SLOT(stopButtonClicked(KDevPlugin*)) );
-    connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) );
-    connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) );
-    connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-             this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+             this, TQT_SLOT(stopButtonClicked(KDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
+    connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
+    connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+             this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
     m_widget = new GrepViewWidget(this);
     m_widget->setIcon(SmallIcon("grep"));
     m_widget->setCaption(i18n("Grep Output"));
-    QWhatsThis::add(m_widget, i18n("Find in files
        "
+    TQWhatsThis::add(m_widget, i18n("Find in files
        "
                                    "This window contains the output of a grep "
                                    "command. Clicking on an item in the list "
                                    "will automatically open the corresponding "
@@ -63,7 +63,7 @@ GrepViewPart::GrepViewPart( QObject *parent, const char *name, const QStringList
     KAction *action;
 
     action = new KAction(i18n("Find in Fi&les..."), "grep", CTRL+ALT+Key_F,
-                         this, SLOT(slotGrep()),
+                         this, TQT_SLOT(slotGrep()),
                          actionCollection(), "edit_grep");
     action->setToolTip( i18n("Search for expressions over several files") );
     action->setWhatsThis( i18n("Find in files
        "
@@ -105,19 +105,19 @@ void GrepViewPart::projectClosed()
 }
 
 
-void GrepViewPart::contextMenu(QPopupMenu *popup, const Context *context)
+void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context)
 {
     kdDebug(9001) << "context in grepview" << endl;
     if (!context->hasType( Context::EditorContext ))
         return;
 
     const EditorContext *econtext = static_cast(context);
-    QString ident = econtext->currentWord();
+    TQString ident = econtext->currentWord();
     if (!ident.isEmpty()) {
         m_popupstr = ident;
-        QString squeezed = KStringHandler::csqueeze(ident, 30);
+        TQString squeezed = KStringHandler::csqueeze(ident, 30);
         int id = popup->insertItem( i18n("Grep: %1").arg(squeezed),
-                           this, SLOT(slotContextGrep()) );
+                           this, TQT_SLOT(slotContextGrep()) );
         popup->setWhatsThis(id, i18n("Grep
        Opens the find in files dialog "
                                "and sets the pattern to the text under the cursor."));
         popup->insertSeparator();
@@ -129,7 +129,7 @@ void GrepViewPart::slotGrep()
 {
 	if ( !m_widget->isRunning() )
 	{
-		QString contextString = KDevEditorUtil::currentSelection( dynamic_cast( partController()->activePart() ) );
+		TQString contextString = KDevEditorUtil::currentSelection( dynamic_cast( partController()->activePart() ) );
 		if ( contextString.isEmpty() )
 		{
 			contextString = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) );
diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h
index c6031a3b..256b44d0 100644
--- a/parts/grepview/grepviewpart.h
+++ b/parts/grepview/grepviewpart.h
@@ -12,7 +12,7 @@
 #ifndef _GREPVIEWPART_H_
 #define _GREPVIEWPART_H_
 
-#include 
+#include 
 #include 
 #include "kdevplugin.h"
 
@@ -27,21 +27,21 @@ class GrepViewPart : public KDevPlugin
     Q_OBJECT
 
 public:
-    GrepViewPart( QObject *parent, const char *name, const QStringList & );
+    GrepViewPart( TQObject *parent, const char *name, const TQStringList & );
     ~GrepViewPart();
 
 private slots:
     void stopButtonClicked(KDevPlugin *which);
     void projectOpened();
     void projectClosed();
-    void contextMenu(QPopupMenu *popup, const Context *context);
+    void contextMenu(TQPopupMenu *popup, const Context *context);
 
     void slotGrep();
     void slotContextGrep();
 
 private:
-    QGuardedPtr m_widget;
-    QString m_popupstr;
+    TQGuardedPtr m_widget;
+    TQString m_popupstr;
     friend class GrepViewWidget;
 };
 
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index 326e2897..78aa4224 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -40,26 +40,26 @@ using namespace KTextEditor;
 class GrepListBoxItem : public ProcessListBoxItem
 {
 public:
-	GrepListBoxItem(const QString &fileName, const QString &lineNumber, const QString &text, bool showFilename);
-	QString filename()
+	GrepListBoxItem(const TQString &fileName, const TQString &lineNumber, const TQString &text, bool showFilename);
+	TQString filename()
 	{ return fileName; }
 	int linenumber()
 	{ return lineNumber.toInt(); }
 	virtual bool isCustomItem();
 
 private:
-	virtual void paint(QPainter *p);
-	QString fileName, lineNumber, text;
+	virtual void paint(TQPainter *p);
+	TQString fileName, lineNumber, text;
 	bool show;
 };
 
 
-GrepListBoxItem::GrepListBoxItem(const QString &fileName, const QString &lineNumber, const QString &text, bool showFilename)
-		: ProcessListBoxItem( QString::null, Normal),
+GrepListBoxItem::GrepListBoxItem(const TQString &fileName, const TQString &lineNumber, const TQString &text, bool showFilename)
+		: ProcessListBoxItem( TQString::null, Normal),
 		fileName(fileName), lineNumber(lineNumber), text(text.stripWhiteSpace()),
 		show(showFilename)
 {
-	this->text.replace( QChar('\t'), QString("  ") );
+	this->text.replace( TQChar('\t'), TQString("  ") );
 }
 
 
@@ -69,11 +69,11 @@ bool GrepListBoxItem::isCustomItem()
 }
 
 
-void GrepListBoxItem::paint(QPainter *p)
+void GrepListBoxItem::paint(TQPainter *p)
 {
-	QColor base, dim, result, bkground;
+	TQColor base, dim, result, bkground;
 	if (listBox()) {
-		const QColorGroup& group = listBox()->palette().active();
+		const TQColorGroup& group = listBox()->palette().active();
 		if (isSelected()) {
 			bkground = group.button();
 			base = group.buttonText();
@@ -96,11 +96,11 @@ void GrepListBoxItem::paint(QPainter *p)
 		else
 			bkground = Qt::white;
 	}
-	QFontMetrics fm = p->fontMetrics();
-	QString stx = lineNumber + ":  ";
+	TQFontMetrics fm = p->fontMetrics();
+	TQString stx = lineNumber + ":  ";
 	int y = fm.ascent()+fm.leading()/2;
 	int x = 3;
-	p->fillRect(p->window(), QBrush(bkground));
+	p->fillRect(p->window(), TQBrush(bkground));
 	if (show)
 	{
 		p->setPen(dim);
@@ -110,8 +110,8 @@ void GrepListBoxItem::paint(QPainter *p)
 	else
 	{
 		p->setPen(base);
-		QFont font1(p->font());
-		QFont font2(font1);
+		TQFont font1(p->font());
+		TQFont font2(font1);
 		font2.setBold(true);
 		p->setFont(font2);
 		p->drawText(x, y, stx);
@@ -124,9 +124,9 @@ void GrepListBoxItem::paint(QPainter *p)
 }
 
 
-GrepViewWidget::GrepViewWidget(GrepViewPart *part) :  QWidget(0, "grepview widget")
+GrepViewWidget::GrepViewWidget(GrepViewPart *part) :  TQWidget(0, "grepview widget")
 {
-	m_layout = new QHBoxLayout(this, 0, -1, "greplayout");
+	m_layout = new TQHBoxLayout(this, 0, -1, "greplayout");
 
 	m_tabWidget = new KTabWidget(this);
 
@@ -137,25 +137,25 @@ GrepViewWidget::GrepViewWidget(GrepViewPart *part) :  QWidget(0, "grepview widge
 	m_tabWidget->addTab(m_curOutput, i18n("Search Results"));
 
 	grepdlg = new GrepDialog( part, this, "grep widget");
-	connect( grepdlg, SIGNAL(searchClicked()), this, SLOT(searchActivated()) );
-	connect( m_curOutput, SIGNAL(processExited(KProcess* )), this, SLOT(slotSearchProcessExited()) );
+	connect( grepdlg, TQT_SIGNAL(searchClicked()), this, TQT_SLOT(searchActivated()) );
+	connect( m_curOutput, TQT_SIGNAL(processExited(KProcess* )), this, TQT_SLOT(slotSearchProcessExited()) );
 
-	connect( m_tabWidget, SIGNAL(currentChanged(QWidget*)), this, SLOT(slotOutputTabChanged()) );
+	connect( m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotOutputTabChanged()) );
 
-	connect( m_curOutput, SIGNAL(clicked(QListBoxItem*)),
-	         this, SLOT(slotExecuted(QListBoxItem*)) );
-	connect( m_curOutput, SIGNAL(returnPressed(QListBoxItem*)),
-	         this, SLOT(slotExecuted(QListBoxItem*)) );
+	connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)),
+	         this, TQT_SLOT(slotExecuted(TQListBoxItem*)) );
+	connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)),
+	         this, TQT_SLOT(slotExecuted(TQListBoxItem*)) );
 
 
-	connect( m_curOutput, SIGNAL(contextMenuRequested( QListBoxItem*, const QPoint&)), this, SLOT(popupMenu(QListBoxItem*, const QPoint&)));
+	connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&)));
 	m_part = part;
 
-	m_closeButton = new QToolButton(m_tabWidget);//@todo change text/icon
+	m_closeButton = new TQToolButton(m_tabWidget);//@todo change text/icon
 	m_closeButton->setIconSet(SmallIconSet("tab_remove"));
 	m_closeButton->setEnabled(false);
 
-	connect (m_closeButton, SIGNAL(clicked()), this, SLOT(slotCloseCurrentOutput()));
+	connect (m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseCurrentOutput()));
 	m_tabWidget->setCornerWidget(m_closeButton);
 }
 
@@ -173,7 +173,7 @@ void GrepViewWidget::showDialog()
 		SelectionInterface *selectIface = dynamic_cast(ro_part);
 		if(selectIface && selectIface->hasSelection())
 		{
-			QString selText = selectIface->selection();
+			TQString selText = selectIface->selection();
 			if(!selText.contains('\n'))
 			{
 				grepdlg->setPattern(selText);
@@ -194,10 +194,10 @@ void GrepViewWidget::showDialog()
 }
 
 // @todo - put this somewhere common - or just use Qt if possible
-static QString escape(const QString &str)
+static TQString escape(const TQString &str)
 {
-	QString escaped("[]{}()\\^$?.+-*|");
-	QString res;
+	TQString escaped("[]{}()\\^$?.+-*|");
+	TQString res;
 
 	for (uint i=0; i < str.length(); ++i)
 	{
@@ -210,7 +210,7 @@ static QString escape(const QString &str)
 }
 
 
-void GrepViewWidget::showDialogWithPattern(QString pattern)
+void GrepViewWidget::showDialogWithPattern(TQString pattern)
 {
 	// Before anything, this removes line feeds from the
 	// beginning and the end.
@@ -248,47 +248,47 @@ void GrepViewWidget::searchActivated()
 	m_curOutput->setLastFileName("");
 	m_curOutput->setMatchCount( 0 );
 
-	QString command, files;
+	TQString command, files;
 
 	// waba: code below breaks on filenames containing a ',' !!!
-	QStringList filelist = QStringList::split(",", grepdlg->filesString());
+	TQStringList filelist = TQStringList::split(",", grepdlg->filesString());
 
 	if (grepdlg->useProjectFilesFlag())
 	{
 		KDevProject *openProject = m_part->project();
 		if (openProject)
 		{
-			QString tmpFilePath;
-			QStringList projectFiles = openProject->allFiles();
+			TQString tmpFilePath;
+			TQStringList projectFiles = openProject->allFiles();
 			if (!projectFiles.isEmpty())
 			{
-				tmpFilePath = openProject->projectDirectory() + QChar(QDir::separator()) + ".grep.tmp";
-				QString dir = grepdlg->directoryString(), file;
-				QValueList regExpList;
+				tmpFilePath = openProject->projectDirectory() + TQChar(TQDir::separator()) + ".grep.tmp";
+				TQString dir = grepdlg->directoryString(), file;
+				TQValueList regExpList;
 
-				if (dir.endsWith(QChar(QDir::separator())))
+				if (dir.endsWith(TQChar(TQDir::separator())))
 					dir.truncate(dir.length() - 1);
 
 				if (!filelist.isEmpty())
 				{
-					for (QStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it)
-						regExpList.append(QRegExp(*it, true, true));
+					for (TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it)
+						regExpList.append(TQRegExp(*it, true, true));
 				}
 
 				m_tempFile.setName(tmpFilePath);
 				if (m_tempFile.open(IO_WriteOnly))
 				{
-					QTextStream out(&m_tempFile);
-					for (QStringList::Iterator it = projectFiles.begin(); it != projectFiles.end(); ++it)
+					TQTextStream out(&m_tempFile);
+					for (TQStringList::Iterator it = projectFiles.begin(); it != projectFiles.end(); ++it)
 					{
-						file = QDir::cleanDirPath(openProject->projectDirectory() + QChar(QDir::separator()) + *it);
+						file = TQDir::cleanDirPath(openProject->projectDirectory() + TQChar(TQDir::separator()) + *it);
 
-						QFileInfo info(file);
+						TQFileInfo info(file);
 						if (grepdlg->recursiveFlag() && !info.dirPath(true).startsWith(dir)) continue;
 						if (!grepdlg->recursiveFlag() && info.dirPath(true) != dir) continue;
 
 						bool matchOne = regExpList.count() == 0;
-						for (QValueList::Iterator it2 = regExpList.begin(); it2 != regExpList.end() && !matchOne; ++it2)
+						for (TQValueList::Iterator it2 = regExpList.begin(); it2 != regExpList.end() && !matchOne; ++it2)
 							matchOne = (*it2).exactMatch(file);
 
 						if (matchOne)
@@ -312,14 +312,14 @@ void GrepViewWidget::searchActivated()
 	{
 		if (!filelist.isEmpty())
 		{
-			QStringList::Iterator it(filelist.begin());
+			TQStringList::Iterator it(filelist.begin());
 			files = KShellProcess::quote(*it);
 			++it;
 			for (; it != filelist.end(); ++it)
 				files += " -o -name " + KShellProcess::quote(*it);
 		}
 
-		QString filepattern = "find ";
+		TQString filepattern = "find ";
 		filepattern += KShellProcess::quote(grepdlg->directoryString());
 		if (!grepdlg->recursiveFlag())
 			filepattern += " -maxdepth 1";
@@ -332,10 +332,10 @@ void GrepViewWidget::searchActivated()
 		command = filepattern + " " ;
 	}
 
-	QStringList excludelist = QStringList::split(",", grepdlg->excludeString());
+	TQStringList excludelist = TQStringList::split(",", grepdlg->excludeString());
 	if (!excludelist.isEmpty())
 	{
-		QStringList::Iterator it(excludelist.begin());
+		TQStringList::Iterator it(excludelist.begin());
 		command += "| grep -v ";
 		for (; it != excludelist.end(); ++it)
 			command += "-e " + KShellProcess::quote(*it) + " ";
@@ -364,11 +364,11 @@ void GrepViewWidget::searchActivated()
 	command += "-e ";
 
 	m_lastPattern = grepdlg->patternString();
-	QString pattern = grepdlg->templateString();
+	TQString pattern = grepdlg->templateString();
 	if (grepdlg->regexpFlag())
-		pattern.replace(QRegExp("%s"), grepdlg->patternString());
+		pattern.replace(TQRegExp("%s"), grepdlg->patternString());
 	else
-		pattern.replace(QRegExp("%s"), escape( grepdlg->patternString() ) );
+		pattern.replace(TQRegExp("%s"), escape( grepdlg->patternString() ) );
 	command += KShellProcess::quote(pattern);
 	m_curOutput->startJob("", command);
 
@@ -377,7 +377,7 @@ void GrepViewWidget::searchActivated()
 }
 
 
-void GrepViewWidget::slotExecuted(QListBoxItem* item)
+void GrepViewWidget::slotExecuted(TQListBoxItem* item)
 {
 	ProcessListBoxItem *i = static_cast(item);
 	if (!i || !i->isCustomItem())
@@ -388,19 +388,19 @@ void GrepViewWidget::slotExecuted(QListBoxItem* item)
 }
 
 
-void GrepViewProcessWidget::insertStdoutLine(const QCString &line)
+void GrepViewProcessWidget::insertStdoutLine(const TQCString &line)
 {
 	int pos;
-	QString filename, linenumber, rest;
+	TQString filename, linenumber, rest;
 
-	QString str;
+	TQString str;
         if( !grepbuf.isEmpty() )
         {
-            str = QString::fromLocal8Bit( grepbuf+line );
+            str = TQString::fromLocal8Bit( grepbuf+line );
             grepbuf.truncate( 0 );
         }else
         {
-            str = QString::fromLocal8Bit( line );
+            str = TQString::fromLocal8Bit( line );
         }
 	if ( (pos = str.find(':')) != -1)
 	{
@@ -432,11 +432,11 @@ void GrepViewProcessWidget::insertStdoutLine(const QCString &line)
 
 void GrepViewWidget::projectChanged(KDevProject *project)
 {
-	QString dir = project? project->projectDirectory() : QDir::homeDirPath();
+	TQString dir = project? project->projectDirectory() : TQDir::homeDirPath();
 	grepdlg->setDirectory(dir);
 }
 
-void GrepViewWidget::popupMenu(QListBoxItem*, const QPoint& p)
+void GrepViewWidget::popupMenu(TQListBoxItem*, const TQPoint& p)
 {
 	if(m_curOutput->isRunning()) return;
 
@@ -452,17 +452,17 @@ void GrepViewWidget::popupMenu(QListBoxItem*, const QPoint& p)
 
 void GrepViewWidget::slotKeepOutput( )
 {
-	if ( m_lastPattern == QString::null ) return;
+	if ( m_lastPattern == TQString::null ) return;
 
 	m_tabWidget->changeTab(m_curOutput, m_lastPattern);
 
 	m_curOutput = new GrepViewProcessWidget(m_tabWidget);
 	m_tabWidget->insertTab(m_curOutput, i18n("Search Results"), 0);
 
-	connect( m_curOutput, SIGNAL(clicked(QListBoxItem*)), this, SLOT(slotExecuted(QListBoxItem*)) );
-	connect( m_curOutput, SIGNAL(returnPressed(QListBoxItem*)), this, SLOT(slotExecuted(QListBoxItem*)) );
-	connect( m_curOutput, SIGNAL(processExited(KProcess* )), this, SLOT(slotSearchProcessExited()) );
-	connect( m_curOutput, SIGNAL(contextMenuRequested( QListBoxItem*, const QPoint&)), this, SLOT(popupMenu(QListBoxItem*, const QPoint&)));
+	connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) );
+	connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) );
+	connect( m_curOutput, TQT_SIGNAL(processExited(KProcess* )), this, TQT_SLOT(slotSearchProcessExited()) );
+	connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&)));
 }
 
 void GrepViewWidget::slotCloseCurrentOutput( )
@@ -526,7 +526,7 @@ void GrepViewProcessWidget::childFinished( bool normal, int status )
 	ProcessWidget::childFinished(normal, status);
 }
 
-void GrepViewProcessWidget::addPartialStdoutLine(const QCString & line)
+void GrepViewProcessWidget::addPartialStdoutLine(const TQCString & line)
 {
     grepbuf += line;
 }
diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h
index bf3fca4b..04206973 100644
--- a/parts/grepview/grepviewwidget.h
+++ b/parts/grepview/grepviewwidget.h
@@ -13,8 +13,8 @@
 #define _GREPVIEWWIDGET_H_
 
 #include "processwidget.h"
-#include 
-#include 
+#include 
+#include 
 
 class GrepDialog;
 class GrepViewPart;
@@ -26,7 +26,7 @@ class GrepViewProcessWidget : public ProcessWidget
 {
 	Q_OBJECT
 public:
-	GrepViewProcessWidget(QWidget* parent) : ProcessWidget(parent) {};
+	GrepViewProcessWidget(TQWidget* parent) : ProcessWidget(parent) {};
 	~GrepViewProcessWidget(){};
 	void setMatchCount(int newCount)
 	{
@@ -38,22 +38,22 @@ public:
 		m_matchCount += amount;
 	}
 
-	void setLastFileName(const QString& lastFileName)
+	void setLastFileName(const TQString& lastFileName)
 	{
 		_lastfilename = lastFileName;
 	}
 
 public slots:
-	virtual void insertStdoutLine(const QCString &line);
-        virtual void addPartialStdoutLine( const QCString &line );
+	virtual void insertStdoutLine(const TQCString &line);
+        virtual void addPartialStdoutLine( const TQCString &line );
 
 protected:
 	virtual void childFinished(bool normal, int status);
 
 private:
 	int m_matchCount;
-	QString _lastfilename;
-        QCString grepbuf;
+	TQString _lastfilename;
+        TQCString grepbuf;
 };
 
 class GrepViewWidget : public QWidget
@@ -70,7 +70,7 @@ public:
 
 public slots:
 	void showDialog();
-	void showDialogWithPattern(QString pattern);
+	void showDialogWithPattern(TQString pattern);
 
 private slots:
 	void searchActivated();
@@ -78,8 +78,8 @@ private slots:
 	 * If item is a valid result of a search run, it opens the file at the position, where the stuff was found.
 	 * @param item item containing filename and linenumber of the file to open.
 	 */
-	void slotExecuted(QListBoxItem *item);
-	void popupMenu(QListBoxItem*, const QPoint& p);
+	void slotExecuted(TQListBoxItem *item);
+	void popupMenu(TQListBoxItem*, const TQPoint& p);
 	/**
 	 * Creates a new tab containing the current output in the main tab and clears the main tab.
 	 */
@@ -98,14 +98,14 @@ private slots:
 
 private:
 
-	QHBoxLayout* m_layout;
+	TQHBoxLayout* m_layout;
 	KTabWidget* m_tabWidget;
 	GrepViewProcessWidget* m_curOutput;
 	GrepDialog *grepdlg;
 	GrepViewPart *m_part;
-	QToolButton* m_closeButton;
-	QString m_lastPattern;
-	QFile m_tempFile;
+	TQToolButton* m_closeButton;
+	TQString m_lastPattern;
+	TQFile m_tempFile;
 };
 
 #endif
diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp
index 8d7892a5..c103a3a8 100644
--- a/parts/konsole/konsoleviewpart.cpp
+++ b/parts/konsole/konsoleviewpart.cpp
@@ -11,7 +11,7 @@
 
 #include "konsoleviewpart.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -28,14 +28,14 @@ typedef KDevGenericFactory KonsoleViewFactory;
 static const KDevPluginInfo data("kdevkonsoleview");
 K_EXPORT_COMPONENT_FACTORY(libkdevkonsoleview, KonsoleViewFactory(data))
 
-KonsoleViewPart::KonsoleViewPart(QObject *parent, const char *name, const QStringList &)
+KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &)
   : KDevPlugin(&data, parent, name ? name : "KonsoleViewPart")
 {
     setInstance( KonsoleViewFactory::instance() );
 
     m_widget = new KDevShellWidget( 0, "konsole widget" );
 
-    QWhatsThis::add(m_widget, i18n("Konsole
        "
+    TQWhatsThis::add(m_widget, i18n("Konsole
        "
         "This window contains an embedded konsole window. It will try to follow you when "
         "you navigate in the source directories")
     );
@@ -48,7 +48,7 @@ KonsoleViewPart::KonsoleViewPart(QObject *parent, const char *name, const QStrin
 
     mainWindow()->embedOutputView(m_widget, i18n("Konsole"), i18n("Embedded console window"));
 
-    connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()));
+    connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
 }
 
 
@@ -61,7 +61,7 @@ KonsoleViewPart::~KonsoleViewPart()
 
 void KonsoleViewPart::projectOpened()
 {
-	QString cd_projectdir = QString("cd ") + project()->projectDirectory() + "\n";
+	TQString cd_projectdir = TQString("cd ") + project()->projectDirectory() + "\n";
 	m_widget->sendInput( cd_projectdir );	
 }
 
diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h
index b7cea9d8..89047a2d 100644
--- a/parts/konsole/konsoleviewpart.h
+++ b/parts/konsole/konsoleviewpart.h
@@ -13,7 +13,7 @@
 #define __KONSOLEVIEWPART_H__
 
 
-#include 
+#include 
 #include "kdevplugin.h"
 
 
@@ -23,14 +23,14 @@ class KonsoleViewPart : public KDevPlugin
 {
     Q_OBJECT
 public:
-    KonsoleViewPart(QObject *parent, const char *name, const QStringList &);
+    KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &);
     virtual ~KonsoleViewPart();
 
 private slots:
     void projectOpened();
 
 private:
-    QGuardedPtr m_widget;
+    TQGuardedPtr m_widget;
 };
 
 #endif
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index e7a84d94..1604a321 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -28,10 +28,10 @@
 #include "konsoleviewwidget.h"
 
 KonsoleViewWidget::KonsoleViewWidget(KonsoleViewPart *part)
- : QWidget(0, "konsole widget"), part(0), owner( part )
+ : TQWidget(0, "konsole widget"), part(0), owner( part )
 {
-    connect(part->partController(), SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(activePartChanged(KParts::Part*)));
-    vbox = new QVBoxLayout(this);
+    connect(part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*)));
+    vbox = new TQVBoxLayout(this);
 }
 
 KonsoleViewWidget::~KonsoleViewWidget()
@@ -41,7 +41,7 @@ KonsoleViewWidget::~KonsoleViewWidget()
 void KonsoleViewWidget::show()
 {
     activate();
-    QWidget::show();
+    TQWidget::show();
 }
 
 void KonsoleViewWidget::activate()
@@ -58,19 +58,19 @@ void KonsoleViewWidget::activate()
     if (!part)
         return;
 
-    part->widget()->setFocusPolicy(QWidget::WheelFocus);
+    part->widget()->setFocusPolicy(TQWidget::WheelFocus);
     setFocusProxy(part->widget());
     part->widget()->setFocus();
 
-    if (part->widget()->inherits("QFrame"))
-        ((QFrame*)part->widget())->setFrameStyle(QFrame::Panel|QFrame::Sunken);
+    if (part->widget()->inherits("TQFrame"))
+        ((TQFrame*)part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
 
     vbox->addWidget(part->widget());
 
 //    this->activePartChanged( owner->partController()->activePart() );
     part->widget()->show();
 
-    connect(part, SIGNAL(destroyed()), this, SLOT(partDestroyed()));
+    connect(part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()));
 }
 
 
@@ -84,7 +84,7 @@ void KonsoleViewWidget::activePartChanged(KParts::Part *activatedPart)
         kdDebug(9035) << k_funcinfo << "part is null or not local" << endl;
         return;
     }
-    QString dir;
+    TQString dir;
     if (ro_part)
         dir = ro_part->url().directory();
     else if (owner->project())
diff --git a/parts/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h
index 0236dee4..50e17ff5 100644
--- a/parts/konsole/konsoleviewwidget.h
+++ b/parts/konsole/konsoleviewwidget.h
@@ -13,8 +13,8 @@
 #define __KONSOLEVIEWWIDGET_H__
 
 
-#include 
-#include 
+#include 
+#include 
 
 
 class KDevProject;
@@ -47,7 +47,7 @@ private:
     void activate();
 
     KParts::ReadOnlyPart *part;
-    QVBoxLayout *vbox;
+    TQVBoxLayout *vbox;
     KonsoleViewPart *owner;
 };
 
diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp
index 4ff33ffb..2f45f867 100644
--- a/parts/openwith/openwithpart.cpp
+++ b/parts/openwith/openwithpart.cpp
@@ -1,6 +1,6 @@
 #include "openwithpart.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -21,13 +21,13 @@ typedef KDevGenericFactory OpenWithFactory;
 static const KDevPluginInfo data("kdevopenwith");
 K_EXPORT_COMPONENT_FACTORY(libkdevopenwith, OpenWithFactory(data))
 
-OpenWithPart::OpenWithPart(QObject *parent, const char *name, const QStringList &)
+OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringList &)
   : KDevPlugin(&data, parent, name ? name : "OpenWithPart")
 {
   setInstance( OpenWithFactory::instance() );
 
-  connect(core(), SIGNAL(contextMenu(QPopupMenu*,const Context *)),
-	  this, SLOT(fillContextMenu(QPopupMenu*,const Context *)));
+  connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu*,const Context *)),
+	  this, TQT_SLOT(fillContextMenu(TQPopupMenu*,const Context *)));
 }
 
 
@@ -36,7 +36,7 @@ OpenWithPart::~OpenWithPart()
 }
 
 
-void OpenWithPart::fillContextMenu(QPopupMenu *popup, const Context *context)
+void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context)
 {
 	if ( !context->hasType( Context::FileContext ) ) return;
 
@@ -45,20 +45,20 @@ void OpenWithPart::fillContextMenu(QPopupMenu *popup, const Context *context)
 
 	popup->insertSeparator();
 
-	popup->insertItem( i18n("Open as UTF-8"), this, SLOT(openAsUtf8()) );
+	popup->insertItem( i18n("Open as UTF-8"), this, TQT_SLOT(openAsUtf8()) );
 
 	KPopupMenu * openAsPopup = new KPopupMenu( popup );
 
 	int id = popup->insertItem( i18n("Open As"), openAsPopup );
 	popup->setWhatsThis(id, i18n("Open As
        Lists all encodings that can be used to open the selected file."));
 
-	QStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+	TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
 
 	int i = 0;
-	QStringList::const_iterator it = encodings.constBegin();
+	TQStringList::const_iterator it = encodings.constBegin();
 	while ( it != encodings.constEnd() )
 	{
-		openAsPopup->insertItem( *it, this, SLOT(openAsEncoding(int)), 0, i );
+		openAsPopup->insertItem( *it, this, TQT_SLOT(openAsEncoding(int)), 0, i );
 		++it;
 		i++;
 	}
@@ -66,15 +66,15 @@ void OpenWithPart::fillContextMenu(QPopupMenu *popup, const Context *context)
 	KPopupMenu * openWithPopup = new KPopupMenu( popup );
 
 	// hmmm.. what to do here? open every different mimetype seperately? Just go with the first for now..
-	QString mimeType = KMimeType::findByURL(m_urls.first(), 0, true, true)->name();
+	TQString mimeType = KMimeType::findByURL(m_urls.first(), 0, true, true)->name();
 	KTrader::OfferList offers = KTrader::self()->query(mimeType, "Type == 'Application'");
 	if (offers.count() > 0)
 	{
 		KTrader::OfferList::Iterator it;
 		for (it = offers.begin(); it != offers.end(); ++it)
 		{
-			KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, QFile::encodeName( (*it)->desktopEntryPath() ).data());
-			connect(action, SIGNAL(activated()), this, SLOT(openWithService()));
+			KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName( (*it)->desktopEntryPath() ).data());
+			connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(openWithService()));
 			action->plug( openWithPopup );
 		}
 	}
@@ -85,7 +85,7 @@ void OpenWithPart::fillContextMenu(QPopupMenu *popup, const Context *context)
 	openWithPopup->insertSeparator();
 
 	// make sure the generic "Open with ..." entry gets appended to the submenu
-	id = openWithPopup->insertItem(i18n("Open With..."), this, SLOT(openWithDialog()));
+	id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog()));
 	openWithPopup->setWhatsThis(id, i18n("Open With...
        Provides a dialog to choose the application to open the selected file."));
 }
 
@@ -108,8 +108,8 @@ void OpenWithPart::openWithDialog()
 
 void OpenWithPart::openAsEncoding( int id )
 {
-	QStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
-	QString encoding;
+	TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+	TQString encoding;
 	if ( id <= encodings.count() && id >= 0 )
 	{
 		encoding = KGlobal::charsets()->encodingForName( encodings[ id ] );
diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h
index c79ad164..74add82a 100644
--- a/parts/openwith/openwithpart.h
+++ b/parts/openwith/openwithpart.h
@@ -15,13 +15,13 @@ class OpenWithPart : public KDevPlugin
 
 public:
 
-	OpenWithPart(QObject *parent, const char *name, const QStringList &);
+	OpenWithPart(TQObject *parent, const char *name, const TQStringList &);
 	~OpenWithPart();
 
 
 private slots:
 
-	void fillContextMenu(QPopupMenu *popup, const Context *context);
+	void fillContextMenu(TQPopupMenu *popup, const Context *context);
 
 	void openWithService();
 	void openWithDialog();
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 79a62471..a21cf7db 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -11,8 +11,8 @@
 
 #include "appoutputviewpart.h"
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -33,7 +33,7 @@ static const KDevPluginInfo data("kdevappoutputview");
 typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) )
 
-AppOutputViewPart::AppOutputViewPart(QObject *parent, const char *name, const QStringList &)
+AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
 {
     setInstance(AppViewFactory::instance());
@@ -43,7 +43,7 @@ AppOutputViewPart::AppOutputViewPart(QObject *parent, const char *name, const QS
     m_widget = new AppOutputWidget(this);
     m_widget->setIcon( SmallIcon("openterm") );
     m_widget->setCaption(i18n("Application Output"));
-    QWhatsThis::add(m_widget, i18n("Application output
        "
+    TQWhatsThis::add(m_widget, i18n("Application output
        "
                                    "The stdout/stderr output window is a replacement for "
                                    "terminal-based application communication. Running terminal "
                                    "applications use this instead of a terminal window."));
@@ -51,10 +51,10 @@ AppOutputViewPart::AppOutputViewPart(QObject *parent, const char *name, const QS
     mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program"));
     hideView();
 
-    connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)),
-             this, SLOT(slotStopButtonClicked(KDevPlugin*)) );
-    connect(m_widget, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited()));
-    connect(m_widget, SIGNAL(processExited(KProcess*)), SIGNAL(processExited()));
+    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+             this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+    connect(m_widget, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited()));
+    connect(m_widget, TQT_SIGNAL(processExited(KProcess*)), TQT_SIGNAL(processExited()));
 }
 
 
@@ -92,15 +92,15 @@ void AppOutputViewPart::slotProcessExited()
   * If inTerminal is true, the program is started in an external
   * konsole.
   */
-void AppOutputViewPart::startAppCommand(const QString &directory, const QString &program, bool inTerminal)
+void AppOutputViewPart::startAppCommand(const TQString &directory, const TQString &program, bool inTerminal)
 {
-    QString cmd;
+    TQString cmd;
 
     if (inTerminal) {
         cmd = Settings::terminalEmulatorName( *kapp->config() );
         if ( cmd == "konsole" && !directory.isNull() ) {  // isn't setting the working directory below enough?
           // If a directory was specified, use it
-          cmd += QString(" --workdir '%1'").arg(directory);
+          cmd += TQString(" --workdir '%1'").arg(directory);
         }
         cmd += " -e /bin/sh -c '";
         cmd += program;
@@ -114,7 +114,7 @@ void AppOutputViewPart::startAppCommand(const QString &directory, const QString
 
     if ( directory.isNull() )
       // use the user's home directory
-      m_widget->startJob(QDir::homeDirPath(), cmd);
+      m_widget->startJob(TQDir::homeDirPath(), cmd);
     else
       // use the supplied directory
       m_widget->startJob(directory, cmd);
@@ -132,13 +132,13 @@ bool AppOutputViewPart::isRunning()
 }
 
 
-void AppOutputViewPart::insertStdoutLine(const QCString &line)
+void AppOutputViewPart::insertStdoutLine(const TQCString &line)
 {
     m_widget->insertStdoutLine(line);
 }
 
 
-void AppOutputViewPart::insertStderrLine(const QCString &line)
+void AppOutputViewPart::insertStderrLine(const TQCString &line)
 {
     m_widget->insertStderrLine(line);
 }
@@ -165,12 +165,12 @@ bool AppOutputViewPart::isViewVisible()
     return m_viewIsVisible;
 }
 
-void AppOutputViewPart::addPartialStderrLine(const QCString & line)
+void AppOutputViewPart::addPartialStderrLine(const TQCString & line)
 {
     m_widget->addPartialStderrLine(line);
 }
 
-void AppOutputViewPart::addPartialStdoutLine(const QCString & line)
+void AppOutputViewPart::addPartialStdoutLine(const TQCString & line)
 {
     m_widget->addPartialStdoutLine(line);
 }
diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h
index 76d708f9..b0b0982a 100644
--- a/parts/outputviews/appoutputviewpart.h
+++ b/parts/outputviews/appoutputviewpart.h
@@ -12,7 +12,7 @@
 #ifndef _APPOUTPUTVIEWSPART_H_
 #define _APPOUTPUTVIEWSPART_H_
 
-#include 
+#include 
 
 #include "kdevappfrontend.h"
 #include "KDevAppFrontendIface.h"
@@ -25,16 +25,16 @@ class AppOutputViewPart : public KDevAppFrontend
     Q_OBJECT
 
 public:
-    AppOutputViewPart( QObject *parent, const char *name, const QStringList & );
+    AppOutputViewPart( TQObject *parent, const char *name, const TQStringList & );
     ~AppOutputViewPart();
 
-    virtual void startAppCommand(const QString &directory, const QString &command, bool inTerminal);
+    virtual void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal);
     virtual void stopApplication();
     virtual bool isRunning();
-    virtual void insertStdoutLine(const QCString &line);
-    virtual void insertStderrLine(const QCString &line);
-    virtual void addPartialStdoutLine(const QCString &line);
-    virtual void addPartialStderrLine(const QCString &line);
+    virtual void insertStdoutLine(const TQCString &line);
+    virtual void insertStderrLine(const TQCString &line);
+    virtual void addPartialStdoutLine(const TQCString &line);
+    virtual void addPartialStderrLine(const TQCString &line);
     virtual void clearView();
     void hideView();
     void showView();
@@ -48,7 +48,7 @@ private slots:
     void slotProcessExited();
 
 private:
-    QGuardedPtr m_widget;
+    TQGuardedPtr m_widget;
     KDevAppFrontendIface *m_dcop;
     bool m_viewIsVisible;
 };
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index e3c3810a..c58065a2 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -14,13 +14,13 @@
 
 #include "appoutputwidget.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -40,13 +40,13 @@
 AppOutputWidget::AppOutputWidget(AppOutputViewPart* part)
     : ProcessWidget(0, "app output widget"), m_part(part)
 {
-	connect(this, SIGNAL(executed(QListBoxItem*)), SLOT(slotRowSelected(QListBoxItem*)));
-	connect(this, SIGNAL(rightButtonClicked( QListBoxItem *, const QPoint & )), 
-		SLOT(slotContextMenu( QListBoxItem *, const QPoint & )));
+	connect(this, TQT_SIGNAL(executed(TQListBoxItem*)), TQT_SLOT(slotRowSelected(TQListBoxItem*)));
+	connect(this, TQT_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), 
+		TQT_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & )));
 	KConfig *config = kapp->config();
 	config->setGroup("General Options");
 	setFont(config->readFontEntry("OutputViewFont"));
-  setSelectionMode(QListBox::Extended);
+  setSelectionMode(TQListBox::Extended);
 }
 
 void AppOutputWidget::clearViewAndContents()
@@ -70,11 +70,11 @@ void AppOutputWidget::childFinished(bool normal, int status)
 }
 
 
-void AppOutputWidget::slotRowSelected(QListBoxItem* row)
+void AppOutputWidget::slotRowSelected(TQListBoxItem* row)
 {
-	static QRegExp assertMatch("ASSERT: \\\"([^\\\"]+)\\\" in ([^\\( ]+) \\(([\\d]+)\\)");
-	static QRegExp lineInfoMatch("\\[([^:]+):([\\d]+)\\]");
-	static QRegExp rubyErrorMatch("([^:\\s]+\\.rb):([\\d]+):?.*$");
+	static TQRegExp assertMatch("ASSERT: \\\"([^\\\"]+)\\\" in ([^\\( ]+) \\(([\\d]+)\\)");
+	static TQRegExp lineInfoMatch("\\[([^:]+):([\\d]+)\\]");
+	static TQRegExp rubyErrorMatch("([^:\\s]+\\.rb):([\\d]+):?.*$");
 
 	if (row) {
 		if (assertMatch.exactMatch(row->text())) {
@@ -87,7 +87,7 @@ void AppOutputWidget::slotRowSelected(QListBoxItem* row)
 			m_part->mainWindow()->statusBar()->message(row->text(), 10000);
 			m_part->mainWindow()->lowerView(this);
 		} else if (rubyErrorMatch.search(row->text()) != -1) {
-			QString file;
+			TQString file;
 			if (rubyErrorMatch.cap(1).startsWith("/")) {
 				file = rubyErrorMatch.cap(1);
 			} else {
@@ -101,7 +101,7 @@ void AppOutputWidget::slotRowSelected(QListBoxItem* row)
 }
 
 
-void AppOutputWidget::insertStdoutLine(const QCString &line)
+void AppOutputWidget::insertStdoutLine(const TQCString &line)
 {
 // 	kdDebug(9004) << k_funcinfo << line << endl;
 
@@ -110,17 +110,17 @@ void AppOutputWidget::insertStdoutLine(const QCString &line)
 		m_part->showView();
 	}
 
-        QString sline;
+        TQString sline;
         if( !stdoutbuf.isEmpty() )
         {
-            sline = QString::fromLocal8Bit( stdoutbuf+line );
+            sline = TQString::fromLocal8Bit( stdoutbuf+line );
             stdoutbuf.truncate( 0 );
         }else
         {
-            sline = QString::fromLocal8Bit( line );
+            sline = TQString::fromLocal8Bit( line );
         }
 
-	m_contentList.append(QString("o-")+sline);
+	m_contentList.append(TQString("o-")+sline);
 	if ( filterSingleLine( sline ) )
 	{
             ProcessWidget::insertStdoutLine( sline.local8Bit() );
@@ -128,7 +128,7 @@ void AppOutputWidget::insertStdoutLine(const QCString &line)
 }
 
 
-void AppOutputWidget::insertStderrLine(const QCString &line)
+void AppOutputWidget::insertStderrLine(const TQCString &line)
 {
 // 	kdDebug(9004) << k_funcinfo << line << endl;
 
@@ -138,17 +138,17 @@ void AppOutputWidget::insertStderrLine(const QCString &line)
 	}
 
 
-        QString sline;
+        TQString sline;
         if( !stderrbuf.isEmpty() )
         {
-            sline = QString::fromLocal8Bit( stderrbuf+line );
+            sline = TQString::fromLocal8Bit( stderrbuf+line );
             stderrbuf.truncate( 0 );
         }else
         {
-            sline = QString::fromLocal8Bit( line );
+            sline = TQString::fromLocal8Bit( line );
         }
 
-	m_contentList.append(QString("e-")+sline);
+	m_contentList.append(TQString("e-")+sline);
 	if ( filterSingleLine( sline ) )
 	{
             ProcessWidget::insertStderrLine( sline.local8Bit() );
@@ -162,7 +162,7 @@ void AppOutputWidget::editFilter()
 	dlg.regularExpression->setChecked( m_filter.m_isRegExp );
 	dlg.filterString->setText( m_filter.m_filterString );
 
-	if ( dlg.exec() == QDialog::Accepted )
+	if ( dlg.exec() == TQDialog::Accepted )
 	{
 		m_filter.m_caseSensitive = dlg.caseSensitive->isChecked();
 		m_filter.m_isRegExp = dlg.regularExpression->isChecked();
@@ -174,13 +174,13 @@ void AppOutputWidget::editFilter()
 	}
 
 }
-bool AppOutputWidget::filterSingleLine(const QString & line)
+bool AppOutputWidget::filterSingleLine(const TQString & line)
 {
 	if ( !m_filter.m_isActive ) return true;
 
 	if ( m_filter.m_isRegExp )
 	{
-		return ( line.find( QRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
+		return ( line.find( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
 	}
 	else
 	{
@@ -192,7 +192,7 @@ void AppOutputWidget::reinsertAndFilter()
 {
 	//copy the first item from the listbox
 	//if a programm was started, this contains the issued command
-	QString issuedCommand;
+	TQString issuedCommand;
 	if ( count() > 0 ) 
 	{
 		setTopItem(0);
@@ -208,12 +208,12 @@ void AppOutputWidget::reinsertAndFilter()
 	}
 
 	//grep through the list for items matching the filter...
-	QStringList strListFound;
+	TQStringList strListFound;
 	if ( m_filter.m_isActive )
 	{	
 		if ( m_filter.m_isRegExp )
 		{
-			strListFound = m_contentList.grep( QRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) );
+			strListFound = m_contentList.grep( TQRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) );
 		}
 		else
 		{
@@ -226,7 +226,7 @@ void AppOutputWidget::reinsertAndFilter()
 	}
 
 	//... and reinsert the found items into the listbox
-	for ( QStringList::Iterator it = strListFound.begin(); it != strListFound.end(); ++it )
+	for ( TQStringList::Iterator it = strListFound.begin(); it != strListFound.end(); ++it )
 	{
 		if ((*it).startsWith("o-"))
 		 {
@@ -247,28 +247,28 @@ void AppOutputWidget::clearFilter()
 	reinsertAndFilter();
 }
 
-void AppOutputWidget::slotContextMenu( QListBoxItem *, const QPoint &p )
+void AppOutputWidget::slotContextMenu( TQListBoxItem *, const TQPoint &p )
 {
 	KPopupMenu popup(this, "filter output");
 
-	int id = popup.insertItem( i18n("Clear output"), this, SLOT(clearViewAndContents()) );
+	int id = popup.insertItem( i18n("Clear output"), this, TQT_SLOT(clearViewAndContents()) );
 	popup.setItemEnabled( id, m_contentList.size() > 0 );
 
-  popup.insertItem( i18n("Copy selected lines"), this, SLOT(copySelected()) );
+  popup.insertItem( i18n("Copy selected lines"), this, TQT_SLOT(copySelected()) );
   popup.insertSeparator();
 
-	popup.insertItem( i18n("Save unfiltered"), this, SLOT(saveAll()) );
-	id = popup.insertItem( i18n("Save filtered output"), this, SLOT(saveFiltered()) );
+	popup.insertItem( i18n("Save unfiltered"), this, TQT_SLOT(saveAll()) );
+	id = popup.insertItem( i18n("Save filtered output"), this, TQT_SLOT(saveFiltered()) );
 	popup.setItemEnabled( id, m_filter.m_isActive );
 	popup.insertSeparator();
 
-	id = popup.insertItem( i18n("Clear filter"), this, SLOT(clearFilter()) );
+	id = popup.insertItem( i18n("Clear filter"), this, TQT_SLOT(clearFilter()) );
 	popup.setItemEnabled( id, m_filter.m_isActive );
 
-	popup.insertItem( i18n("Edit filter"), this, SLOT(editFilter() ) );
+	popup.insertItem( i18n("Edit filter"), this, TQT_SLOT(editFilter() ) );
 
 	popup.insertSeparator();
-	popup.insertItem( i18n("Hide view"), this, SLOT(hideView()) );
+	popup.insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) );
 
 	popup.exec(p);
 }
@@ -290,16 +290,16 @@ void AppOutputWidget::saveFiltered()
 
 void AppOutputWidget::saveOutputToFile(bool useFilter)
 {
-	QString filename = KFileDialog::getSaveFileName();
+	TQString filename = KFileDialog::getSaveFileName();
 
 	if ( filename.isEmpty() ) return;
 
-	QStringList contents;
+	TQStringList contents;
 	if ( useFilter && m_filter.m_isActive )
 	{	
 		if ( m_filter.m_isRegExp )
 		{
-			contents = m_contentList.grep( QRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) );
+			contents = m_contentList.grep( TQRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) );
 		}
 		else
 		{
@@ -311,14 +311,14 @@ void AppOutputWidget::saveOutputToFile(bool useFilter)
 		contents = m_contentList;
 	}
 
-	QFile file( filename );
+	TQFile file( filename );
 	if ( file.open( IO_WriteOnly ) )
 	{
-		QTextStream ostream( &file );
-		QStringList::ConstIterator it = contents.begin();
+		TQTextStream ostream( &file );
+		TQStringList::ConstIterator it = contents.begin();
 		while( it != contents.end() )
 		{
-			QString line = *it;
+			TQString line = *it;
 			if ( line.startsWith("o-") || line.startsWith("e-") )
 			{
 				line.remove( 0, 2 );
@@ -333,7 +333,7 @@ void AppOutputWidget::saveOutputToFile(bool useFilter)
 void AppOutputWidget::copySelected()
 {
   uint n = count();
-  QString buffer;
+  TQString buffer;
   for (uint i = 0; i < n; i++)
   {
     if (isSelected(i))
@@ -342,12 +342,12 @@ void AppOutputWidget::copySelected()
   kapp->clipboard()->setText(buffer, QClipboard::Clipboard);
 }
 
-void AppOutputWidget::addPartialStderrLine(const QCString & line)
+void AppOutputWidget::addPartialStderrLine(const TQCString & line)
 {
     stderrbuf += line;
 }
 
-void AppOutputWidget::addPartialStdoutLine(const QCString & line)
+void AppOutputWidget::addPartialStdoutLine(const TQCString & line)
 {
     stdoutbuf += line;
 }
diff --git a/parts/outputviews/appoutputwidget.h b/parts/outputviews/appoutputwidget.h
index 9a0d1e71..0673f106 100644
--- a/parts/outputviews/appoutputwidget.h
+++ b/parts/outputviews/appoutputwidget.h
@@ -12,7 +12,7 @@
 #ifndef _APPOUTPUTWIDGET_H_
 #define _APPOUTPUTWIDGET_H_
 
-#include 
+#include 
 #include 
 
 #include "processwidget.h"
@@ -29,12 +29,12 @@ public:
     // clears our own store and the one of our base ProcessWidget
 
 public slots:
-	void slotRowSelected(QListBoxItem* row);
-	void insertStdoutLine(const QCString &line);
-        void insertStderrLine(const QCString &line);
-        void addPartialStdoutLine(const QCString &line);
-        void addPartialStderrLine(const QCString &line);
-	void slotContextMenu(QListBoxItem *, const QPoint &);
+	void slotRowSelected(TQListBoxItem* row);
+	void insertStdoutLine(const TQCString &line);
+        void insertStderrLine(const TQCString &line);
+        void addPartialStdoutLine(const TQCString &line);
+        void addPartialStderrLine(const TQCString &line);
+	void slotContextMenu(TQListBoxItem *, const TQPoint &);
 	void hideView();
 	void clearViewAndContents();
 	void clearFilter();
@@ -47,9 +47,9 @@ private:
 	virtual void childFinished(bool normal, int status);
 	void saveOutputToFile( bool useFilter );
 	void reinsertAndFilter();
-	bool filterSingleLine( const QString & line );
+	bool filterSingleLine( const TQString & line );
 
-	QStringList m_contentList;
+	TQStringList m_contentList;
 
 	struct OutputFilter
 	{
@@ -57,13 +57,13 @@ private:
 		bool m_isActive;
 		bool m_isRegExp;
 		bool m_caseSensitive;
-		QString m_filterString;
+		TQString m_filterString;
 	};
 
 	AppOutputViewPart* m_part;
 	OutputFilter m_filter;
-        QCString stdoutbuf;
-        QCString stderrbuf;
+        TQCString stdoutbuf;
+        TQCString stderrbuf;
 };
 
 #endif
diff --git a/parts/outputviews/commandcontinuationfilter.cpp b/parts/outputviews/commandcontinuationfilter.cpp
index 474cec15..e33a7a6a 100644
--- a/parts/outputviews/commandcontinuationfilter.cpp
+++ b/parts/outputviews/commandcontinuationfilter.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include "commandcontinuationfilter.h"
-#include 
+#include 
 #include 
 
 CommandContinuationFilter::CommandContinuationFilter( OutputFilter& next )
@@ -18,7 +18,7 @@ CommandContinuationFilter::CommandContinuationFilter( OutputFilter& next )
 {
 }
 
-void CommandContinuationFilter::processLine( const QString& line )
+void CommandContinuationFilter::processLine( const TQString& line )
 {
    int index=line.length()-1;
    while (index>=0)
diff --git a/parts/outputviews/commandcontinuationfilter.h b/parts/outputviews/commandcontinuationfilter.h
index d0239caf..fff8e5aa 100644
--- a/parts/outputviews/commandcontinuationfilter.h
+++ b/parts/outputviews/commandcontinuationfilter.h
@@ -13,17 +13,17 @@
 #define CommandContinuationFilter_h
 
 #include "outputfilter.h"
-#include 
+#include 
 
 class CommandContinuationFilter : public OutputFilter
 {
 public:
 	CommandContinuationFilter( OutputFilter& );
 
-	void processLine( const QString& line );
+	void processLine( const TQString& line );
 
 private:
-	QString m_text;
+	TQString m_text;
 };
 
 #endif
diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp
index f8246346..9d48f1c8 100644
--- a/parts/outputviews/compileerrorfilter.cpp
+++ b/parts/outputviews/compileerrorfilter.cpp
@@ -23,7 +23,7 @@ CompileErrorFilter::ErrorFormat::ErrorFormat( const char * regExp, int file, int
 {
 }
 
-CompileErrorFilter::ErrorFormat::ErrorFormat( const char * regExp, int file, int line, int text, QString comp )
+CompileErrorFilter::ErrorFormat::ErrorFormat( const char * regExp, int file, int line, int text, TQString comp )
 	: expression( regExp )
 	, fileGroup( file )
 	, lineGroup( line )
@@ -75,13 +75,13 @@ CompileErrorFilter::ErrorFormat* CompileErrorFilter::errorFormats()
 
 }
 
-void CompileErrorFilter::processLine( const QString& line )
+void CompileErrorFilter::processLine( const TQString& line )
 {
 	bool hasmatch = false;
-	QString file;
+	TQString file;
 	int lineNum = 0;
-	QString text;
-	QString compiler;
+	TQString text;
+	TQString compiler;
 	int i = 0;
 	bool isWarning = false;
 	bool isInstantiationInfo = false;
@@ -89,7 +89,7 @@ void CompileErrorFilter::processLine( const QString& line )
 	ErrorFormat* format = &errFormats[i];
 	while( !format->expression.isEmpty() )
 	{
-		QRegExp& regExp = format->expression;
+		TQRegExp& regExp = format->expression;
 
 		if ( regExp.search( line ) != -1 ) {
 			hasmatch = true;
@@ -97,7 +97,7 @@ void CompileErrorFilter::processLine( const QString& line )
 			lineNum = regExp.cap( format->lineGroup ).toInt() - 1;
 			text    = regExp.cap( format->textGroup );
 			compiler = format->compiler;
-			QString cap = regExp.cap(3);
+			TQString cap = regExp.cap(3);
 			if (cap.contains("warning:", false) || cap.contains("Warnung:", false))
 				isWarning = true;
 			if (regExp.cap(3).contains("instantiated from", false)) {
@@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const QString& line )
 	if( hasmatch )
 	{
 		// Add hacks for error strings you want excluded here
-		if( text.find( QString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0
-			|| text.find( QString::fromLatin1("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/compileerrorfilter.h b/parts/outputviews/compileerrorfilter.h
index d07495cf..2f67adaf 100644
--- a/parts/outputviews/compileerrorfilter.h
+++ b/parts/outputviews/compileerrorfilter.h
@@ -12,14 +12,14 @@
 #ifndef CompileErrorFilter_h
 #define CompileErrorFilter_h
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include "outputfilter.h"
 
 class MakeItem;
 
-class CompileErrorFilter : public QObject, public OutputFilter
+class CompileErrorFilter : public TQObject, public OutputFilter
 {
 Q_OBJECT
 
@@ -30,16 +30,16 @@ public:
 	{
 		ErrorFormat() {}
 		ErrorFormat( const char *, int, int, int );
-		ErrorFormat( const char *, int, int, int, QString );
-		QRegExp expression;
+		ErrorFormat( const char *, int, int, int, TQString );
+		TQRegExp expression;
 		int fileGroup;
 		int lineGroup;
 		int textGroup;
-		QString compiler;
+		TQString compiler;
 	};
 	static ErrorFormat* errorFormats();
 
-	void processLine( const QString& line );
+	void processLine( const TQString& line );
 
 signals:
 	void item( MakeItem* );
diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp
index 5738f41d..02629797 100644
--- a/parts/outputviews/directorystatusmessagefilter.cpp
+++ b/parts/outputviews/directorystatusmessagefilter.cpp
@@ -13,7 +13,7 @@
 #include "directorystatusmessagefilter.moc"
 #include "makeitem.h"
 
-#include 
+#include 
 #include 
 
 DirectoryStatusMessageFilter::DirectoryStatusMessageFilter( OutputFilter& next )
@@ -21,9 +21,9 @@ DirectoryStatusMessageFilter::DirectoryStatusMessageFilter( OutputFilter& next )
 {
 }
 
-void DirectoryStatusMessageFilter::processLine( const QString& line )
+void DirectoryStatusMessageFilter::processLine( const TQString& line )
 {
-       	QString dir;
+       	TQString dir;
 	if ( matchEnterDir( line, dir ) )
 	{
 		emit item( new EnteringDirectoryItem( dir, line ) );
@@ -40,7 +40,7 @@ void DirectoryStatusMessageFilter::processLine( const QString& line )
 
 // simple helper function - checks whether we entered a new directory
 // (locale and Utf8 aware)
-bool DirectoryStatusMessageFilter::matchEnterDir( const QString& line, QString& dir )
+bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString& dir )
 {
     // make outputs localised strings in Utf8 for entering/leaving directories...
     static const unsigned short fr_enter[] =
@@ -70,28 +70,28 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const QString& line, QString&
             0x412,0x445,0x43e,0x434,0x20,0x432,0x20,0x43a,0x430,0x442,0x430,0x43b,0x43e,0x433
         };
 
-    static const QString fr_e( (const QChar*)fr_enter, sizeof(fr_enter) / 2 );
-    static const QString pl_e( (const QChar*)pl_enter, sizeof(pl_enter) / 2 );
-    static const QString ja_e( (const QChar*)ja_enter, sizeof(ja_enter) / 2 );
-    static const QString ko_e( (const QChar*)ko_enter, sizeof(ko_enter) / 2 );
-    static const QString ko_b( (const QChar*)ko_behind, sizeof(ko_behind) / 2 );
-    static const QString pt_br_e( (const QChar*)pt_br_enter, sizeof(pt_br_enter) / 2 );
-    static const QString ru_e( (const QChar*)ru_enter, sizeof(ru_enter) / 2 );
-	static const QString en_e("Entering directory");
-	static const QString de_e1("Wechsel in das Verzeichnis Verzeichnis");
-	static const QString de_e2("Wechsel in das Verzeichnis");
-	static const QString es_e("Cambiando a directorio");
-	static const QString nl_e("Binnengaan van directory");
+    static const TQString fr_e( (const TQChar*)fr_enter, sizeof(fr_enter) / 2 );
+    static const TQString pl_e( (const TQChar*)pl_enter, sizeof(pl_enter) / 2 );
+    static const TQString ja_e( (const TQChar*)ja_enter, sizeof(ja_enter) / 2 );
+    static const TQString ko_e( (const TQChar*)ko_enter, sizeof(ko_enter) / 2 );
+    static const TQString ko_b( (const TQChar*)ko_behind, sizeof(ko_behind) / 2 );
+    static const TQString pt_br_e( (const TQChar*)pt_br_enter, sizeof(pt_br_enter) / 2 );
+    static const TQString ru_e( (const TQChar*)ru_enter, sizeof(ru_enter) / 2 );
+	static const TQString en_e("Entering directory");
+	static const TQString de_e1("Wechsel in das Verzeichnis Verzeichnis");
+	static const TQString de_e2("Wechsel in das Verzeichnis");
+	static const TQString es_e("Cambiando a directorio");
+	static const TQString nl_e("Binnengaan van directory");
 	//@todo: other translations!
 	
-	// we need a QRegExp because KRegExp is not Utf8 aware.
+	// we need a TQRegExp because KRegExp is not Utf8 aware.
     // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
     // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-    static QRegExp dirChange(QString::fromLatin1(".*: (.+) (`|") + QChar(0x00BB) + QString::fromLatin1(")(.*)('|") + QChar(0x00AB) + QString::fromLatin1(")(.*)"));
-	static QRegExp enEnter(QString::fromLatin1(".*: 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 QRegExp if possible. This regex performs VERY badly with large inputs,
+	// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
 	// and the input required is very short if these strings match.
 	if(line.find(en_e) > -1 ||
 	   line.find(fr_e) > -1 ||
@@ -118,7 +118,7 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const QString& line, QString&
 
 // simple helper function - checks whether we left a directory
 // (locale and Utf8 aware).
-bool DirectoryStatusMessageFilter::matchLeaveDir( const QString& line, QString& dir )
+bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString& dir )
 {
     static const unsigned short fr_leave[] =
         { 'Q','u','i','t','t','e',' ','l','e',' ','r',0xe9,'p','e','r','t','o','i','r','e'
@@ -143,26 +143,26 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const QString& line, QString&
             0x20,0xb514,0xb809,0xd1a0,0xb9ac
         };
 
-    static const QString fr_l( (const QChar*)fr_leave, sizeof(fr_leave) / 2 );
-    static const QString ja_l( (const QChar*)ja_leave, sizeof(ja_leave) / 2 );
-    static const QString ko_l( (const QChar*)ko_leave, sizeof(ko_leave) / 2 );
-    static const QString ko_b( (const QChar*)ko_behind, sizeof(ko_behind) / 2 );
-    static const QString pt_br_l( (const QChar*)pt_br_leave, sizeof(pt_br_leave) / 2 );
-    static const QString ru_l( (const QChar*)ru_leave, sizeof(ru_leave) / 2 );
-	static const QString en_l("Leaving directory");
-	static const QString de_l1("Verlassen des Verzeichnisses Verzeichnis");
-	static const QString de_l2("Verlassen des Verzeichnisses");
-	static const QString es_l("Saliendo directorio");
-	static const QString nl_l("Verdwijnen uit directory");
-	static const QString po_l("Opuszczam katalog");
+    static const TQString fr_l( (const TQChar*)fr_leave, sizeof(fr_leave) / 2 );
+    static const TQString ja_l( (const TQChar*)ja_leave, sizeof(ja_leave) / 2 );
+    static const TQString ko_l( (const TQChar*)ko_leave, sizeof(ko_leave) / 2 );
+    static const TQString ko_b( (const TQChar*)ko_behind, sizeof(ko_behind) / 2 );
+    static const TQString pt_br_l( (const TQChar*)pt_br_leave, sizeof(pt_br_leave) / 2 );
+    static const TQString ru_l( (const TQChar*)ru_leave, sizeof(ru_leave) / 2 );
+	static const TQString en_l("Leaving directory");
+	static const TQString de_l1("Verlassen des Verzeichnisses Verzeichnis");
+	static const TQString de_l2("Verlassen des Verzeichnisses");
+	static const TQString es_l("Saliendo directorio");
+	static const TQString nl_l("Verdwijnen uit directory");
+	static const TQString po_l("Opuszczam katalog");
 	
-    // we need a QRegExp because KRegExp is not Utf8 aware.
+    // we need a TQRegExp because KRegExp is not Utf8 aware.
     // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
     // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
 
-	static QRegExp dirChange(QString::fromLatin1(".*: (.+) (`|") + QChar(0x00BB) + QString::fromLatin1(")(.*)('|") + QChar(0x00AB) + QString::fromLatin1(")(.*)"));
+	static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
 
-	// avoid QRegExp if possible. This regex performs VERY badly with large inputs,
+	// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
 	// and the input required is very short if these strings match.
 	if(line.find(en_l) > -1 ||
 	   line.find(fr_l) > -1 ||
diff --git a/parts/outputviews/directorystatusmessagefilter.h b/parts/outputviews/directorystatusmessagefilter.h
index 18972487..0d57e52d 100644
--- a/parts/outputviews/directorystatusmessagefilter.h
+++ b/parts/outputviews/directorystatusmessagefilter.h
@@ -12,28 +12,28 @@
 #ifndef DirectoryStatusMessageFilter_h
 #define DirectoryStatusMessageFilter_h
 
-#include 
+#include 
 #include "outputfilter.h"
 
 class EnteringDirectoryItem;
 class ExitingDirectoryItem;
 
-class DirectoryStatusMessageFilter :  public QObject, public OutputFilter
+class DirectoryStatusMessageFilter :  public TQObject, public OutputFilter
 {
 Q_OBJECT
 
 public:
 	DirectoryStatusMessageFilter( OutputFilter& );
 
-	void processLine( const QString& line );
+	void processLine( const TQString& line );
 
 signals:
 	void item( EnteringDirectoryItem* );
 	void item( ExitingDirectoryItem*  );
 
 private:
-	bool matchEnterDir( const QString& line, QString& dir );
-	bool matchLeaveDir( const QString& line, QString& dir );
+	bool matchEnterDir( const TQString& line, TQString& dir );
+	bool matchLeaveDir( const TQString& line, TQString& dir );
 };
 
 #endif
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index bbcc61fb..4edaae2b 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
+#include 
 #include 
 
 #include "makeactionfilter.h"
@@ -20,7 +20,7 @@
 
 //#define DEBUG
 
-MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, const QString& _tool, const char * regExp, int file )
+MakeActionFilter::ActionFormat::ActionFormat( const TQString& _action, const TQString& _tool, const char * regExp, int file )
 	: m_action( _action )
 	, m_expression( regExp )
 	, m_tool( _tool )
@@ -29,7 +29,7 @@ MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, const QStr
 {
 }
 
-MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, int tool, int file, const char * regExp)
+MakeActionFilter::ActionFormat::ActionFormat( const TQString& _action, int tool, int file, const char * regExp)
 	: m_action( _action )
 	, m_expression( regExp )
 	, m_tool()
@@ -38,19 +38,19 @@ MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, int tool,
 {
 }
 
-QString MakeActionFilter::ActionFormat::tool()
+TQString MakeActionFilter::ActionFormat::tool()
 {
    if (m_toolGroup==-1)
       return m_tool;
    return m_expression.cap(m_toolGroup);
 }
 
-QString MakeActionFilter::ActionFormat::file()
+TQString MakeActionFilter::ActionFormat::file()
 {
    return m_expression.cap(m_fileGroup);
 }
 
-bool MakeActionFilter::ActionFormat::matches(const QString& line)
+bool MakeActionFilter::ActionFormat::matches(const TQString& line)
 {
    return ( m_expression.search( line ) != -1 );
 }
@@ -96,13 +96,13 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats()
 		ActionFormat( i18n("compiling"), "dcopidl2cpp", "dcopidl2cpp (?:\\S* )*([^\\s;]+)", 1 ),
 		ActionFormat( i18n("installing"), 1, 1, "-- Installing (.*)" ), //cmake
 
-		ActionFormat( QString::null, QString::null, 0, 0 )
+		ActionFormat( TQString::null, TQString::null, 0, 0 )
 	};
 
 	return formats;
 }
 
-void MakeActionFilter::processLine( const QString& line )
+void MakeActionFilter::processLine( const TQString& line )
 {
 	ActionItem* actionItem = matchLine( line );
 	if ( actionItem != NULL )
@@ -115,10 +115,10 @@ void MakeActionFilter::processLine( const QString& line )
 	}
 }
 
-ActionItem* MakeActionFilter::matchLine( const QString& line )
+ActionItem* MakeActionFilter::matchLine( const TQString& line )
 {
 #ifdef DEBUG
-	QTime t;
+	TQTime t;
 	t.start();
 #endif
 	/// \FIXME This is very slow, possibly due to the regexr matching. It can take
@@ -148,23 +148,23 @@ ActionItem* MakeActionFilter::matchLine( const QString& line )
 struct TestItem
 {
 	TestItem() {}
-	TestItem( const QString& _line, const QString& _action, const QString& _tool, const QString& _file )
+	TestItem( const TQString& _line, const TQString& _action, const TQString& _tool, const TQString& _file )
 		: line( _line )
 		, action( _action )
 		, tool( _tool )
 		, file( _file )
 	{}
-	QString line;
-	QString action;
-	QString tool;
-	QString file;
+	TQString line;
+	TQString action;
+	TQString tool;
+	TQString file;
 };
 
 #ifdef DEBUG
 
 void MakeActionFilter::test()
 {
-	static QValueList testItems = QValueList()
+	static TQValueList testItems = TQValueList()
 
 	<< TestItem( // simple qmake compile
 		"g++ -c -pipe -Wall -W -O2 -DQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
@@ -282,7 +282,7 @@ void MakeActionFilter::test()
 	"compiling", "g++", "quanta_init.cpp")
 	;
 
-	QValueList::const_iterator it = testItems.begin();
+	TQValueList::const_iterator it = testItems.begin();
 	for( ; it != testItems.end(); ++it )
 	{
 		ActionItem* actionItem = matchLine( (*it).line );
diff --git a/parts/outputviews/makeactionfilter.h b/parts/outputviews/makeactionfilter.h
index 66de7a3b..4f3a0e68 100644
--- a/parts/outputviews/makeactionfilter.h
+++ b/parts/outputviews/makeactionfilter.h
@@ -12,15 +12,15 @@
 #ifndef MakeActionFilter_h
 #define MakeActionFilter_h
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include "outputfilter.h"
 
 class MakeItem;
 class ActionItem;
 
-class MakeActionFilter : public QObject, public OutputFilter
+class MakeActionFilter : public TQObject, public OutputFilter
 {
 Q_OBJECT
 
@@ -35,28 +35,28 @@ public:
         {
            public:
                 ActionFormat():m_toolGroup(-1) {}
-		ActionFormat( const QString&, const QString&, const char * regExp, int file);
-		ActionFormat( const QString&, int tool, int file, const char * regExp);
-                QString tool();
-                QString file();
-                const QString& action() const     {return m_action;}
-                bool matches(const QString& line);
+		ActionFormat( const TQString&, const TQString&, const char * regExp, int file);
+		ActionFormat( const TQString&, int tool, int file, const char * regExp);
+                TQString tool();
+                TQString file();
+                const TQString& action() const     {return m_action;}
+                bool matches(const TQString& line);
            private:
-		QString m_action;
-		QRegExp m_expression;
-		QString m_tool;
+		TQString m_action;
+		TQRegExp m_expression;
+		TQString m_tool;
                 int m_toolGroup;
                 int m_fileGroup;
 	};
 	static ActionFormat* actionFormats();
 
-	void processLine( const QString& line );
+	void processLine( const TQString& line );
 
 signals:
 	void item( MakeItem* );
 
 private:
-	static ActionItem* matchLine( const QString& line );
+	static ActionItem* matchLine( const TQString& line );
 };
 
 #endif
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index c4d5a04c..218bb894 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -11,7 +11,7 @@
 
 #include "makeitem.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -22,7 +22,7 @@ MakeItem::MakeItem()
 {
 }
 
-MakeItem::MakeItem( const QString& text )
+MakeItem::MakeItem( const TQString& text )
 	: m_text( text )
 {
 }
@@ -31,7 +31,7 @@ MakeItem::~MakeItem()
 {
 }
 
-QString MakeItem::color( bool bright_bg )
+TQString MakeItem::color( bool bright_bg )
 {
 	switch ( type() )
 	{
@@ -46,7 +46,7 @@ QString MakeItem::color( bool bright_bg )
 	}
 }
 
-QString MakeItem::icon()
+TQString MakeItem::icon()
 {
 	switch ( type() )
 	{
@@ -60,14 +60,14 @@ QString MakeItem::icon()
 	}
 }
 
-QString MakeItem::text( EOutputLevel )
+TQString MakeItem::text( EOutputLevel )
 {
-	return QStyleSheet::escape( m_text );
+	return TQStyleSheet::escape( m_text );
 }
 
-QString MakeItem::formattedText( EOutputLevel level, bool bright_bg )
+TQString MakeItem::formattedText( EOutputLevel level, bool bright_bg )
 {
-  QString txt = text(level);
+  TQString txt = text(level);
 	if (txt.isEmpty())
 		return "
        ";
 	if ( level == eFull )
@@ -76,24 +76,24 @@ QString MakeItem::formattedText( EOutputLevel level, bool bright_bg )
 	}
 	else
 	{
-		return QString("")
+		return TQString("")
         .append( icon() ).append("")
         .append( txt ).append("").append( br() );
 	}
 }
 
-QString MakeItem::br()
+TQString MakeItem::br()
 {
     // Qt >= 3.1 doesn't need a 
        .
 #if QT_VERSION < 0x040000
-    static const QString br = QString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "
        ";
+    static const TQString br = TQString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "
        ";
 #else
-    static const QString br;
+    static const TQString br;
 #endif
     return br;
 }
 
-ErrorItem::ErrorItem( const QString& fn, int ln, const QString& tx, const QString& line, bool isWarning, bool isInstatiationInfo, const QString& compiler )
+ErrorItem::ErrorItem( const TQString& fn, int ln, const TQString& tx, const TQString& line, bool isWarning, bool isInstatiationInfo, const TQString& compiler )
 	: MakeItem( line )
 	, fileName(fn)
 	, lineNum(ln)
@@ -107,7 +107,7 @@ ErrorItem::~ErrorItem()
 {
 }
 
-bool ErrorItem::append( const QString& text )
+bool ErrorItem::append( const TQString& text )
 {
 	if ( !text.startsWith("   ") )
 		return false;
@@ -133,34 +133,34 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus )
 			m_text = i18n("*** Success ***");
 }
 
-QString ExitStatusItem::text( EOutputLevel )
+TQString ExitStatusItem::text( EOutputLevel )
 {
 	return m_text;	
 }
 
 bool DirectoryItem::m_showDirectoryMessages = true;
 
-QString EnteringDirectoryItem::text( EOutputLevel outputLevel )
+TQString EnteringDirectoryItem::text( EOutputLevel outputLevel )
 {
 	if ( outputLevel < eFull )
 		return i18n("Entering directory %1").arg( directory );
 	return m_text;
 }
 
-QString ExitingDirectoryItem::text( EOutputLevel outputLevel )
+TQString ExitingDirectoryItem::text( EOutputLevel outputLevel )
 {
 	if ( outputLevel < eFull )
 		return i18n("Leaving directory %1").arg( directory );
 	return m_text;
 }
 
-QString ActionItem::text( EOutputLevel outputLevel )
+TQString ActionItem::text( EOutputLevel outputLevel )
 {
 	if ( outputLevel < eFull )
 	{
 		if ( m_tool.isEmpty() )
-			return QString(m_action).append(" ").append(m_file).append("");
-		return QString(m_action).append(" ").append(m_file).append("").append(" (").append(m_tool).append(")");
+			return TQString(m_action).append(" ").append(m_file).append("");
+		return TQString(m_action).append(" ").append(m_file).append("").append(" (").append(m_tool).append(")");
 	}
 	return MakeItem::text( outputLevel );
 }
diff --git a/parts/outputviews/makeitem.h b/parts/outputviews/makeitem.h
index e95dd4df..94acc3e2 100644
--- a/parts/outputviews/makeitem.h
+++ b/parts/outputviews/makeitem.h
@@ -12,7 +12,7 @@
 #ifndef MakeItem_h
 #define MakeItem_h
 
-#include 
+#include 
 
 enum EOutputLevel
 {
@@ -27,7 +27,7 @@ class MakeItem
 public:
 	enum Type { Normal, Error, Warning, Diagnostic };
 	MakeItem();
-	MakeItem( const QString& text );
+	MakeItem( const TQString& text );
 	virtual ~MakeItem();
 
   enum DisplayModes
@@ -37,23 +37,23 @@ public:
     Append = 2          // item's text can be appended (append has been overloaded)
   };
   virtual int displayMode() const { return ImmDisplay; }
-	virtual bool append( const QString& ) { return false; }
+	virtual bool append( const TQString& ) { return false; }
 	virtual Type type() { return Diagnostic; }
 	virtual bool visible( EOutputLevel level ) { return level > eVeryShort; }
-	virtual QString text( EOutputLevel );
-	virtual QString formattedText( EOutputLevel, bool bright_bg );
-	QString icon();
-	QString color( bool bright_bg );
+	virtual TQString text( EOutputLevel );
+	virtual TQString formattedText( EOutputLevel, bool bright_bg );
+	TQString icon();
+	TQString color( bool bright_bg );
 
-	static QString br();
+	static TQString br();
 
-	QString m_text;
+	TQString m_text;
 };
 
 class CommandItem : public MakeItem
 {
 public:
-	CommandItem(const QString command)
+	CommandItem(const TQString command)
 		: MakeItem( command )
 	{}
 
@@ -68,7 +68,7 @@ public:
 
 	Type type() { return m_normalExit && m_exitStatus == 0 ? Diagnostic : Error; }
 	virtual bool visible( EOutputLevel ) { return true; }
-	QString text( EOutputLevel level );
+	TQString text( EOutputLevel level );
 
 private:
 	bool m_normalExit;
@@ -78,7 +78,7 @@ private:
 class DirectoryItem : public MakeItem
 {
 public:
-	DirectoryItem( const QString& dir, const QString& text )
+	DirectoryItem( const TQString& dir, const TQString& text )
 		: MakeItem( text )
 		, directory( dir )
 	{}
@@ -88,7 +88,7 @@ public:
 	static void setShowDirectoryMessages( bool show ) { m_showDirectoryMessages = show; }
 	static bool getShowDirectoryMessages() { return m_showDirectoryMessages; }
 
-	QString directory;
+	TQString directory;
 
 protected:
 	static bool m_showDirectoryMessages;
@@ -97,7 +97,7 @@ protected:
 class EnteringDirectoryItem : public DirectoryItem
 {
 public:
-	EnteringDirectoryItem( const QString& dir, const QString& text )
+	EnteringDirectoryItem( const TQString& dir, const TQString& text )
 		: DirectoryItem( dir, text )
 	{}
 	bool visible( EOutputLevel )
@@ -105,13 +105,13 @@ public:
 		return m_showDirectoryMessages;
 	}
 
-	virtual QString text( EOutputLevel );
+	virtual TQString text( EOutputLevel );
 };
 
 class ExitingDirectoryItem : public DirectoryItem
 {
 public:
-	ExitingDirectoryItem( const QString& dir, const QString& text )
+	ExitingDirectoryItem( const TQString& dir, const TQString& text )
 		: DirectoryItem( dir, text )
 	{}
 	bool visible( EOutputLevel level )
@@ -119,7 +119,7 @@ public:
 		return m_showDirectoryMessages && level > eVeryShort;
 	}
 
-	virtual QString text( EOutputLevel );
+	virtual TQString text( EOutputLevel );
 };
 
 namespace KTextEditor { class Cursor; class Document; }
@@ -127,26 +127,26 @@ namespace KTextEditor { class Cursor; class Document; }
 class ErrorItem : public MakeItem
 {
 public:
-	ErrorItem( const QString& fn, int ln, const QString& tx, const QString& line, bool isWarning, bool isInstatiationInfo, const QString& compiler );
+	ErrorItem( const TQString& fn, int ln, const TQString& tx, const TQString& line, bool isWarning, bool isInstatiationInfo, const TQString& compiler );
 	virtual ~ErrorItem();
 
-	virtual bool append( const QString& text );
+	virtual bool append( const TQString& text );
   virtual int displayMode() const { return DelayedDisplay | Append; }
 	Type type() { return m_isInstatiationInfo ? Diagnostic : (m_isWarning ? Warning : Error); }
 	virtual bool visible( EOutputLevel ) { return true; }
 
-	QString fileName;
+	TQString fileName;
 	int lineNum;
-	QString m_error;
+	TQString m_error;
 	bool m_isWarning;
 	bool m_isInstatiationInfo; ///this also implies isWarning
-	QString m_compiler;
+	TQString m_compiler;
 };
 
 class ActionItem : public MakeItem
 {
 public:
-	ActionItem( const QString& action, const QString& file, const QString& tool, const QString& line )
+	ActionItem( const TQString& action, const TQString& file, const TQString& tool, const TQString& line )
 		: MakeItem( line )
 		, m_action( action )
 		, m_file( file )
@@ -154,11 +154,11 @@ public:
 	{}
 
 	virtual bool visible( EOutputLevel ) { return true; }
-	virtual QString text( EOutputLevel level );
+	virtual TQString text( EOutputLevel level );
 
-	QString m_action;
-	QString m_file;
-	QString m_tool;
+	TQString m_action;
+	TQString m_file;
+	TQString m_tool;
 };
 
 #endif
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index 3f2ebbd8..7c9dcb79 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -11,8 +11,8 @@
 
 #include "makeviewpart.h"
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -30,7 +30,7 @@ static const KDevPluginInfo data("kdevmakeview");
 typedef KDevGenericFactory< MakeViewPart > MakeViewFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) )
 
-MakeViewPart::MakeViewPart(QObject *parent, const char *name, const QStringList &)
+MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevMakeFrontend(&data, parent, name)
 {
     setInstance(MakeViewFactory::instance());
@@ -42,7 +42,7 @@ MakeViewPart::MakeViewPart(QObject *parent, const char *name, const QStringList
     m_widget = new MakeWidget(this);
     m_widget->setIcon( SmallIcon("exec") );
     m_widget->setCaption(i18n("Messages Output"));
-    QWhatsThis::add(m_widget, i18n("Messages output
        "
+    TQWhatsThis::add(m_widget, i18n("Messages output
        "
                                    "The messages window shows the output of the compiler and "
                                    "used build tools like make, ant, uic, dcopidl etc. "
                                    "For compiler error messages, click on the error message. "
@@ -52,17 +52,17 @@ MakeViewPart::MakeViewPart(QObject *parent, const char *name, const QStringList
     mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages"));
 
     KAction *action;
-    action = new KAction( i18n("&Next Error"), Key_F4, m_widget, SLOT(nextError()),
+    action = new KAction( i18n("&Next Error"), Key_F4, m_widget, TQT_SLOT(nextError()),
                           actionCollection(), "view_next_error");
     action->setToolTip( i18n("Go to the next error") );
     action->setWhatsThis(i18n("Next error
        Switches to the file and line where the next error was reported from."));
-    action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, SLOT(prevError()),
+    action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQT_SLOT(prevError()),
                           actionCollection(), "view_previous_error");
     action->setToolTip( i18n("Go to the previous error") );
     action->setWhatsThis(i18n("Previous error
        Switches to the file and line where the previous error was reported from."));
 
-    connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)),
-             this, SLOT(slotStopButtonClicked(KDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+             this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
 }
 
 
@@ -81,7 +81,7 @@ void MakeViewPart::slotStopButtonClicked(KDevPlugin* which)
     m_widget->killJob();
 }
 
-void MakeViewPart::queueCommand(const QString &dir, const QString &command)
+void MakeViewPart::queueCommand(const TQString &dir, const TQString &command)
 {
     m_widget->queueJob(dir, command);
 }
@@ -92,7 +92,7 @@ bool MakeViewPart::isRunning()
     return m_widget->isRunning();
 }
 
-QWidget* MakeViewPart::widget()
+TQWidget* MakeViewPart::widget()
 {
     return m_widget.operator->();
 }
diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h
index 78f969ff..808a9208 100644
--- a/parts/outputviews/makeviewpart.h
+++ b/parts/outputviews/makeviewpart.h
@@ -12,7 +12,7 @@
 #ifndef _MAKEVIEWPART_H_
 #define _MAKEVIEWPART_H_
 
-#include 
+#include 
 
 #include "kdevmakefrontend.h"
 #include "KDevMakeFrontendIface.h"
@@ -25,20 +25,20 @@ class MakeViewPart : public KDevMakeFrontend
     Q_OBJECT
 
 public:
-    MakeViewPart( QObject *parent, const char *name, const QStringList & );
+    MakeViewPart( TQObject *parent, const char *name, const TQStringList & );
     ~MakeViewPart();
-    virtual QWidget* widget();
+    virtual TQWidget* widget();
     virtual void updateSettingsFromConfig();
 
 private slots:
     void slotStopButtonClicked(KDevPlugin*);
     
 protected:
-    virtual void queueCommand(const QString &dir, const QString &command);
+    virtual void queueCommand(const TQString &dir, const TQString &command);
     virtual bool isRunning();
 
 private:
-    QGuardedPtr m_widget;
+    TQGuardedPtr m_widget;
     KDevMakeFrontendIface *m_dcop;
     friend class MakeWidget;
 };
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 554713c4..3ccc4608 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -33,15 +33,15 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 #include 
@@ -116,7 +116,7 @@ static const char *const message_xpm[] =
 class SelectionPreserver
 {
 public:
-	SelectionPreserver( QTextEdit& textEdit, bool stayAtEnd )
+	SelectionPreserver( TQTextEdit& textEdit, bool stayAtEnd )
 		: m_textEdit( textEdit )
 		, m_atEnd( false )
 	{
@@ -136,18 +136,18 @@ public:
 
 		if ( m_atEnd )
 		{
-			m_textEdit.moveCursor(QTextEdit::MoveEnd, false);
-			m_textEdit.moveCursor(QTextEdit::MoveLineStart, false);//if linewrap is off we must avoid the jumping of the vertical scrollbar
+			m_textEdit.moveCursor(TQTextEdit::MoveEnd, false);
+			m_textEdit.moveCursor(TQTextEdit::MoveLineStart, false);//if linewrap is off we must avoid the jumping of the vertical scrollbar
 		}
 	}
 
-	QTextEdit& m_textEdit;
+	TQTextEdit& m_textEdit;
 	bool m_atEnd;
 	int paraFrom, indexFrom, paraTo, indexTo;
 };
 
 MakeWidget::MakeWidget(MakeViewPart *part)
-	: QTextEdit(0, "make widget")
+	: TQTextEdit(0, "make widget")
 	, m_directoryStatusFilter( m_errorFilter )
 	, m_errorFilter( m_continuationFilter )
 	, m_continuationFilter( m_actionFilter )
@@ -171,51 +171,51 @@ MakeWidget::MakeWidget(MakeViewPart *part)
 
 	setWrapPolicy(Anywhere);
 	setReadOnly(true);
-	setMimeSourceFactory(new QMimeSourceFactory);
-	mimeSourceFactory()->setImage("error", QImage((const char**)error_xpm));
-	mimeSourceFactory()->setImage("warning", QImage((const char**)warning_xpm));
-	mimeSourceFactory()->setImage("message", QImage((const char**)message_xpm));
+	setMimeSourceFactory(new TQMimeSourceFactory);
+	mimeSourceFactory()->setImage("error", TQImage((const char**)error_xpm));
+	mimeSourceFactory()->setImage("warning", TQImage((const char**)warning_xpm));
+	mimeSourceFactory()->setImage("message", TQImage((const char**)message_xpm));
 
         dirstack.setAutoDelete(true);
 
 	childproc = new KProcess(this);
 	procLineMaker = new ProcessLineMaker( childproc );
 
-	connect( procLineMaker, SIGNAL(receivedStdoutLine(const QCString&)),
-	         this, SLOT(insertStdoutLine(const QCString&) ));
-	connect( procLineMaker, SIGNAL(receivedStderrLine(const QCString&)),
-                 this, SLOT(insertStderrLine(const QCString&) ));
-        connect( procLineMaker, SIGNAL(receivedPartialStdoutLine(const QCString&)),
-                 this, SLOT(storePartialStdoutLine(const QCString&) ));
-        connect( procLineMaker, SIGNAL(receivedPartialStderrLine(const QCString&)),
-                 this, SLOT(storePartialStderrLine(const QCString&) ));
-
-	connect( childproc, SIGNAL(processExited(KProcess*)),
-	         this, SLOT(slotProcessExited(KProcess*) )) ;
-
-	connect( &m_directoryStatusFilter, SIGNAL(item(EnteringDirectoryItem*)),
-	         this, SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) );
-	connect( &m_directoryStatusFilter, SIGNAL(item(ExitingDirectoryItem*)),
-	         this, SLOT(slotExitedDirectory(ExitingDirectoryItem*)) );
-	connect( &m_errorFilter, SIGNAL(item(MakeItem*)),
-	         this, SLOT(insertItem(MakeItem*)) );
-	connect( &m_actionFilter, SIGNAL(item(MakeItem*)),
-	         this, SLOT(insertItem(MakeItem*)) );
-	connect( &m_otherFilter, SIGNAL(item(MakeItem*)),
-	         this, SLOT(insertItem(MakeItem*)) );
-
-	connect( verticalScrollBar(), SIGNAL(sliderPressed()),
-	         this, SLOT(verticScrollingOn()) );
-	connect( verticalScrollBar(), SIGNAL(sliderReleased()),
-	         this, SLOT(verticScrollingOff()) );
-	connect( horizontalScrollBar(), SIGNAL(sliderPressed()),
-	         this, SLOT(horizScrollingOn()) );
-	connect( horizontalScrollBar(), SIGNAL(sliderReleased()),
-	         this, SLOT(horizScrollingOff()) );
+	connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)),
+	         this, TQT_SLOT(insertStdoutLine(const TQCString&) ));
+	connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)),
+                 this, TQT_SLOT(insertStderrLine(const TQCString&) ));
+        connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)),
+                 this, TQT_SLOT(storePartialStdoutLine(const TQCString&) ));
+        connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)),
+                 this, TQT_SLOT(storePartialStderrLine(const TQCString&) ));
+
+	connect( childproc, TQT_SIGNAL(processExited(KProcess*)),
+	         this, TQT_SLOT(slotProcessExited(KProcess*) )) ;
+
+	connect( &m_directoryStatusFilter, TQT_SIGNAL(item(EnteringDirectoryItem*)),
+	         this, TQT_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) );
+	connect( &m_directoryStatusFilter, TQT_SIGNAL(item(ExitingDirectoryItem*)),
+	         this, TQT_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) );
+	connect( &m_errorFilter, TQT_SIGNAL(item(MakeItem*)),
+	         this, TQT_SLOT(insertItem(MakeItem*)) );
+	connect( &m_actionFilter, TQT_SIGNAL(item(MakeItem*)),
+	         this, TQT_SLOT(insertItem(MakeItem*)) );
+	connect( &m_otherFilter, TQT_SIGNAL(item(MakeItem*)),
+	         this, TQT_SLOT(insertItem(MakeItem*)) );
+
+	connect( verticalScrollBar(), TQT_SIGNAL(sliderPressed()),
+	         this, TQT_SLOT(verticScrollingOn()) );
+	connect( verticalScrollBar(), TQT_SIGNAL(sliderReleased()),
+	         this, TQT_SLOT(verticScrollingOff()) );
+	connect( horizontalScrollBar(), TQT_SIGNAL(sliderPressed()),
+	         this, TQT_SLOT(horizScrollingOn()) );
+	connect( horizontalScrollBar(), TQT_SIGNAL(sliderReleased()),
+	         this, TQT_SLOT(horizScrollingOff()) );
 
 // this slot doesn't exist anymore
-// 	connect( m_part->partController(), SIGNAL(loadedFile(const KURL&)),
-// 	         this, SLOT(slotDocumentOpened(const KURL&)) );
+// 	connect( m_part->partController(), TQT_SIGNAL(loadedFile(const KURL&)),
+// 	         this, TQT_SLOT(slotDocumentOpened(const KURL&)) );
 }
 
 MakeWidget::~MakeWidget()
@@ -225,7 +225,7 @@ MakeWidget::~MakeWidget()
 	delete procLineMaker;
 }
 
-void MakeWidget::queueJob(const QString &dir, const QString &command)
+void MakeWidget::queueJob(const TQString &dir, const TQString &command)
 {
 	commandList.append(command);
 	dirList.append(dir);
@@ -240,7 +240,7 @@ void MakeWidget::queueJob(const QString &dir, const QString &command)
 
 void MakeWidget::startNextJob()
 {
-	QStringList::Iterator it = commandList.begin();
+	TQStringList::Iterator it = commandList.begin();
 	if ( it == commandList.end() )
 		return;
 
@@ -254,7 +254,7 @@ void MakeWidget::startNextJob()
 		m_bCompiling = false;
 	else
 	{
-		QString s = currentCommand.right(currentCommand.length() - i);
+		TQString s = currentCommand.right(currentCommand.length() - i);
 		if ( s.contains("configure ")        ||
 		     s.contains(" Makefile.cvs")     ||
 		     s.contains(" clean")            ||
@@ -270,12 +270,12 @@ void MakeWidget::startNextJob()
 	}
 
 	it = dirList.begin();
-	QString dir = *it;
+	TQString dir = *it;
 	m_lastBuildDir = dir;
 	dirList.remove(it);
 
 	clear(); // clear the widget
-	for ( QValueVector::iterator it = m_items.begin(); it != m_items.end(); ++it )
+	for ( TQValueVector::iterator it = m_items.begin(); it != m_items.end(); ++it )
 		delete *it;
 	m_items.clear();
 	m_paragraphToItem.clear();
@@ -290,7 +290,7 @@ void MakeWidget::startNextJob()
 	childproc->start(KProcess::OwnGroup, KProcess::AllOutput);
 
 	dirstack.clear();
-	dirstack.push(new QString(dir));
+	dirstack.push(new TQString(dir));
 
 	m_part->mainWindow()->raiseView(this);
 	m_part->core()->running(m_part, true);
@@ -317,7 +317,7 @@ void MakeWidget::copy()
         return;
     }
 
-	QString selection;
+	TQString selection;
 	for(int i = parafrom; i<=parato; i++)
 	   selection += text(i) + "\n";
 
@@ -325,7 +325,7 @@ void MakeWidget::copy()
 	if(m_compilerOutputLevel == eShort ||
 	   m_compilerOutputLevel == eVeryShort )
 	{
-	   QRegExp regexp("<.*>");
+	   TQRegExp regexp("<.*>");
 	   regexp.setMinimal(true);
 	   selection.remove(regexp);
 	}
@@ -390,15 +390,15 @@ void MakeWidget::prevError()
             KNotifyClient::beep();
 }
 
-void MakeWidget::contentsMouseReleaseEvent( QMouseEvent* e )
+void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e )
 {
-	QTextEdit::contentsMouseReleaseEvent(e);
+	TQTextEdit::contentsMouseReleaseEvent(e);
 	if ( e->button() != LeftButton )
 		return;
 	searchItem(paragraphAt(e->pos()));
 }
 
-void MakeWidget::keyPressEvent(QKeyEvent *e)
+void MakeWidget::keyPressEvent(TQKeyEvent *e)
 {
 	if (e->key() == Key_Return || e->key() == Key_Enter)
 	{
@@ -407,15 +407,15 @@ void MakeWidget::keyPressEvent(QKeyEvent *e)
 		searchItem(parag);
 	}
 	else
-		QTextEdit::keyPressEvent(e);
+		TQTextEdit::keyPressEvent(e);
 }
 
 // returns the current directory for parag
-QString MakeWidget::directory(int parag) const
+TQString MakeWidget::directory(int parag) const
 {
-	QValueVector::const_iterator it = qFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] );
+	TQValueVector::const_iterator it = qFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] );
 	if ( it == m_items.end() )
-		return QString::null;
+		return TQString::null;
 	// run backwards over directories and figure out where we are
 	while ( it != m_items.begin() ) {
 		--it;
@@ -423,24 +423,24 @@ QString MakeWidget::directory(int parag) const
 		if ( edi )
 			return edi->directory + "/";
 	}
-	return QString::null;
+	return TQString::null;
 }
 
 // hackish function that will return true and put string "file" in "fName" if the file
 // exists
-static bool checkFileExists( const QString& file, QString& fName )
+static bool checkFileExists( const TQString& file, TQString& fName )
 {
-    if ( QFile::exists( file ) ) {
+    if ( TQFile::exists( file ) ) {
         fName = file;
         return true;
     }
     return false;
 }
 
-void MakeWidget::specialCheck( const QString& file, QString& fName ) const
+void MakeWidget::specialCheck( const TQString& file, TQString& fName ) const
 {
-    QString firstLine = text(0);
-    QRegExp rx("cd \\'(.*)\\'.*");
+    TQString firstLine = text(0);
+    TQRegExp rx("cd \\'(.*)\\'.*");
     if (rx.search(firstLine) != -1)
     {
         KURL url(rx.cap(1)+"/", file);
@@ -454,8 +454,8 @@ void MakeWidget::specialCheck( const QString& file, QString& fName ) const
     }
     // Ok the "worst case", lets see if we can find a file in the project that has the same name
     // obviously this will pick always the wrong file when you've got the same filename multiple times.
-    QStringList files = m_part->project()->allFiles();
-    for( QStringList::iterator it = files.begin() ; it != files.end(); ++it)
+    TQStringList files = m_part->project()->allFiles();
+    for( TQStringList::iterator it = files.begin() ; it != files.end(); ++it)
     {
         if( (*it).contains( file ) )
         {
@@ -464,13 +464,13 @@ void MakeWidget::specialCheck( const QString& file, QString& fName ) const
     }
 }
 
-QString MakeWidget::guessFileName( const QString& fName, int parag ) const
+TQString MakeWidget::guessFileName( const TQString& fName, int parag ) const
 {
     // pathological case
     if ( ! m_part->project() ) return fName;
 
-    QString name;
-    QString dir = directory( parag );
+    TQString name;
+    TQString dir = directory( parag );
 
     if ( fName.startsWith( "/" ) )
     {
@@ -497,12 +497,12 @@ QString MakeWidget::guessFileName( const QString& fName, int parag ) const
 
     // GNU make resolves symlinks. if "name" is a real path to a file the
     // project know by symlink path, we need to return the symlink path
-//    QStringList projectFiles = m_part->project()->allFiles();
-    QStringList projectFiles = m_part->project()->symlinkProjectFiles();
-    QStringList::iterator it = projectFiles.begin();
+//    TQStringList projectFiles = m_part->project()->allFiles();
+    TQStringList projectFiles = m_part->project()->symlinkProjectFiles();
+    TQStringList::iterator it = projectFiles.begin();
     while ( it != projectFiles.end() )
     {
-        QString file = m_part->project()->projectDirectory() + "/" + *it;
+        TQString file = m_part->project()->projectDirectory() + "/" + *it;
         if ( name == URLUtil::canonicalPath( file ) )
         {
             kdDebug(9004) << "Found file in project - " << file << " == " << name << endl;
@@ -528,31 +528,31 @@ void MakeWidget::searchItem(int parag)
 	}
 }
 
-void MakeWidget::insertStdoutLine( const QCString& line )
+void MakeWidget::insertStdoutLine( const TQCString& line )
 {
-    QString sline;
+    TQString sline;
     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
     
     if( forceCLocale )
-        sline = QString::fromAscii( stdoutbuf+line );
+        sline = TQString::fromAscii( stdoutbuf+line );
     else
-        sline = QString::fromLocal8Bit( stdoutbuf+line );
+        sline = TQString::fromLocal8Bit( stdoutbuf+line );
 
     if ( !appendToLastLine( sline ) )
         m_directoryStatusFilter.processLine( sline );
     stdoutbuf.truncate(0);
 }
 
-void MakeWidget::insertStderrLine( const QCString& line )
+void MakeWidget::insertStderrLine( const TQCString& line )
 {
-    QString sline;
+    TQString sline;
     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
     
     if( forceCLocale ) {
-        sline = QString( stderrbuf+line );
+        sline = TQString( stderrbuf+line );
     }
     else
-        sline = QString::fromLocal8Bit( stderrbuf+line );
+        sline = TQString::fromLocal8Bit( stderrbuf+line );
     
     if ( !appendToLastLine( sline ) )
         m_errorFilter.processLine( sline );
@@ -584,7 +584,7 @@ void MakeWidget::slotProcessExited(KProcess *)
 	insertItem( item );
         displayPendingItem();
 
-	m_part->mainWindow()->statusBar()->message( QString("%1: %2").arg(currentCommand).arg(item->m_text), 3000);
+	m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000);
 	m_part->core()->running(m_part, false);
 
 	// Defensive programming: We emit this with a single shot timer so that we go once again
@@ -592,7 +592,7 @@ void MakeWidget::slotProcessExited(KProcess *)
 	// and its KProcess object can be reused.
 	if (childproc->normalExit() && !childproc->exitStatus())
 	{
-		QTimer::singleShot(0, this, SLOT(startNextJob()));
+		TQTimer::singleShot(0, this, TQT_SLOT(startNextJob()));
 // 		if (commandList.isEmpty())
 			// The last command on the list was successful so restore the
 			// output view to what it had before the compilation process started
@@ -608,16 +608,16 @@ void MakeWidget::slotProcessExited(KProcess *)
 void MakeWidget::slotEnteredDirectory( EnteringDirectoryItem* item )
 {
 //	kdDebug(9004) << "Entering dir: " << item->directory << endl;
-	QString* dir = new QString( item->directory );
+	TQString* dir = new TQString( item->directory );
 	dirstack.push( dir );
 	insertItem( item );
 }
 
 void MakeWidget::slotExitedDirectory( ExitingDirectoryItem* item )
 {
-	QString eDir = item->directory;
+	TQString eDir = item->directory;
 //	kdDebug(9004) << "Leaving dir: " << eDir << endl;
-	QString *dir = dirstack.pop();
+	TQString *dir = dirstack.pop();
 	if (!dir)
 	{
 		kdWarning(9004) << "Left more directories than entered: " << eDir;
@@ -652,7 +652,7 @@ void MakeWidget::displayPendingItem()
   append( m_pendingItem->formattedText( m_compilerOutputLevel, brightBg() ) );
 }
 
-bool MakeWidget::appendToLastLine( const QString& text )
+bool MakeWidget::appendToLastLine( const TQString& text )
 {
 	if ( !m_pendingItem ) return false;
 	if ( !m_pendingItem->append( text ) )
@@ -696,29 +696,29 @@ bool MakeWidget::brightBg()
 	return (v > 127);
 }
 
-QPopupMenu* MakeWidget::createPopupMenu( const QPoint& pos )
+TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos )
 {
-	QPopupMenu* pMenu = QTextEdit::createPopupMenu(pos);
+	TQPopupMenu* pMenu = TQTextEdit::createPopupMenu(pos);
 	pMenu->setCheckable(true);
 
 	pMenu->insertSeparator();
-	int id = pMenu->insertItem(i18n("Line Wrapping"), this, SLOT(toggleLineWrapping()) );
+	int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) );
 	pMenu->setItemChecked(id, m_bLineWrapping);
     pMenu->setWhatsThis(id, i18n("Line wrapping
        Enables or disables wrapping of command lines displayed."));
 
 	pMenu->insertSeparator();
-	id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, SLOT(slotVeryShortCompilerOutput()) );
+	id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) );
     pMenu->setWhatsThis(id, i18n("Very short compiler output
        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, SLOT(slotShortCompilerOutput()) );
+	id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) );
     pMenu->setWhatsThis(id, i18n("Short compiler output
        Suppresses all the compiler flags and formats to something readable."));
 	pMenu->setItemChecked(id, m_compilerOutputLevel == eShort);
-	id = pMenu->insertItem(i18n("Full Compiler Output"), this, SLOT(slotFullCompilerOutput()) );
+	id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) );
     pMenu->setWhatsThis(id, i18n("Full compiler output
        Displays unmodified compiler output."));
 	pMenu->setItemChecked(id, m_compilerOutputLevel == eFull);
 
 	pMenu->insertSeparator();
-	id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, SLOT(toggleShowDirNavigMessages()));
+	id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages()));
     pMenu->setWhatsThis(id, i18n("Show directory navigation messages
        Shows cd commands that are executed while building."));
 	pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages());
 
@@ -784,7 +784,7 @@ void MakeWidget::updateSettingsFromConfig()
 {
 	KConfig *pConfig = kapp->config();
 	pConfig->setGroup("General Options");
-	QFont outputFont = pConfig->readFontEntry("OutputViewFont");
+	TQFont outputFont = pConfig->readFontEntry("OutputViewFont");
 	setFont(outputFont);
 	pConfig->setGroup("MakeOutputView");
 	m_bLineWrapping = pConfig->readBoolEntry("LineWrapping", true);
@@ -834,12 +834,12 @@ bool MakeWidget::scanErrorBackward( int parag )
 	return false;
 }
 
-void MakeWidget::storePartialStderrLine(const QCString & line)
+void MakeWidget::storePartialStderrLine(const TQCString & line)
 {
     stderrbuf += line;
 }
 
-void MakeWidget::storePartialStdoutLine(const QCString & line)
+void MakeWidget::storePartialStdoutLine(const TQCString & line)
 {
     stdoutbuf += line;
 }
diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h
index ff65eb5e..bdc7d451 100644
--- a/parts/outputviews/makewidget.h
+++ b/parts/outputviews/makewidget.h
@@ -12,11 +12,11 @@
 #ifndef _MAKEWIDGET_H_
 #define _MAKEWIDGET_H_
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "outputfilter.h"
 #include "directorystatusmessagefilter.h"
@@ -42,10 +42,10 @@ public:
     MakeWidget(MakeViewPart *part);
     ~MakeWidget();
 
-    void queueJob(const QString &dir, const QString &command);
+    void queueJob(const TQString &dir, const TQString &command);
     bool isRunning();
     void updateSettingsFromConfig();
-    void processLine( const QString& line );
+    void processLine( const TQString& line );
 
 public slots:
     void startNextJob();
@@ -55,14 +55,14 @@ public slots:
     void copy();
 
 protected:
-    virtual QPopupMenu *createPopupMenu( const QPoint& pos );
-    virtual void contentsMouseReleaseEvent( QMouseEvent* e );
+    virtual TQPopupMenu *createPopupMenu( const TQPoint& pos );
+    virtual void contentsMouseReleaseEvent( TQMouseEvent* e );
 
 private slots:
-    void insertStdoutLine(const QCString& line);
-    void insertStderrLine(const QCString& line);
-    void storePartialStdoutLine(const QCString& line);
-    void storePartialStderrLine(const QCString& line);
+    void insertStdoutLine(const TQCString& line);
+    void insertStderrLine(const TQCString& line);
+    void storePartialStdoutLine(const TQCString& line);
+    void storePartialStderrLine(const TQCString& line);
     void slotProcessExited(KProcess *);
     void verticScrollingOn() { m_vertScrolling = true; }
     void verticScrollingOff() { m_vertScrolling = false; }
@@ -78,11 +78,11 @@ private slots:
     void insertItem( MakeItem* );
 
 private:
-    void specialCheck( const QString& file, QString& fName ) const;
-    virtual void keyPressEvent(QKeyEvent *e);
+    void specialCheck( const TQString& file, TQString& fName ) const;
+    virtual void keyPressEvent(TQKeyEvent *e);
     void searchItem(int parag);
-    QString guessFileName( const QString& fName, int parag ) const;
-    QString directory(int parag) const;
+    TQString guessFileName( const TQString& fName, int parag ) const;
+    TQString directory(int parag) const;
     bool brightBg();
     void refill();
     void createCursor(ErrorItem* e, KTextEditor::Document* doc);
@@ -98,19 +98,19 @@ private:
 
     void setPendingItem(MakeItem* new_item);
     void displayPendingItem();
-	bool appendToLastLine( const QString& text );
+	bool appendToLastLine( const TQString& text );
 	void setCompilerOutputLevel(EOutputLevel level);
 
-    QStringList commandList;
-    QStringList dirList;
-    QString m_lastBuildDir; //stores directory of last build, for the case we don't have proper path information
-    QString currentCommand;
+    TQStringList commandList;
+    TQStringList dirList;
+    TQString m_lastBuildDir; //stores directory of last build, for the case we don't have proper path information
+    TQString currentCommand;
     KProcess *childproc;
     ProcessLineMaker* procLineMaker;
-    QPtrStack dirstack;
+    TQPtrStack dirstack;
     MakeItem* m_pendingItem;
-    QValueVector m_items;
-    QIntDict m_paragraphToItem;
+    TQValueVector m_items;
+    TQIntDict m_paragraphToItem;
     long m_paragraphs;
     int m_lastErrorSelected;
 
@@ -119,8 +119,8 @@ private:
     bool m_vertScrolling, m_horizScrolling;
     bool m_bCompiling;
 
-    QCString stderrbuf;
-    QCString stdoutbuf;
+    TQCString stderrbuf;
+    TQCString stdoutbuf;
 
     bool m_bLineWrapping;
     EOutputLevel m_compilerOutputLevel;
diff --git a/parts/outputviews/otherfilter.cpp b/parts/outputviews/otherfilter.cpp
index 5f14937c..cd3287c3 100644
--- a/parts/outputviews/otherfilter.cpp
+++ b/parts/outputviews/otherfilter.cpp
@@ -20,7 +20,7 @@ OtherFilter::OtherFilter()
 {
 }
 
-void OtherFilter::processLine( const QString& line )
+void OtherFilter::processLine( const TQString& line )
 {
   emit item( new MakeItem( line ) );
 }
diff --git a/parts/outputviews/otherfilter.h b/parts/outputviews/otherfilter.h
index 9a2c6c17..3494de84 100644
--- a/parts/outputviews/otherfilter.h
+++ b/parts/outputviews/otherfilter.h
@@ -14,18 +14,18 @@
 
 #include "outputfilter.h"
 
-#include 
+#include 
 
 class MakeItem;
 
-class OtherFilter : public QObject, public OutputFilter
+class OtherFilter : public TQObject, public OutputFilter
 {
 Q_OBJECT
 
 public:
 	OtherFilter();
 
-	virtual void processLine( const QString& line );
+	virtual void processLine( const TQString& line );
 
 signals:
 	void item( MakeItem* );
diff --git a/parts/outputviews/outputfilter.cpp b/parts/outputviews/outputfilter.cpp
index 5692efce..1ea92c5f 100644
--- a/parts/outputviews/outputfilter.cpp
+++ b/parts/outputviews/outputfilter.cpp
@@ -18,7 +18,7 @@ OutputFilter::OutputFilter( OutputFilter& next )
 {
 }
 
-void OutputFilter::processLine( const QString& line )
+void OutputFilter::processLine( const TQString& line )
 {
  m_next.processLine( line );
 }
diff --git a/parts/outputviews/outputfilter.h b/parts/outputviews/outputfilter.h
index dd84f7d7..227f793d 100644
--- a/parts/outputviews/outputfilter.h
+++ b/parts/outputviews/outputfilter.h
@@ -12,7 +12,7 @@
 #ifndef OutputFilter_h
 #define OutputFilter_h
 
-#include 
+#include 
 
 class OutputFilter
 {
@@ -20,7 +20,7 @@ public:
 	OutputFilter( OutputFilter& );
 	virtual ~OutputFilter() {}
 
-	virtual void processLine( const QString& line );
+	virtual void processLine( const TQString& line );
 
 private:
 	OutputFilter& m_next;
diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index 92aaf696..dbf2b554 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -28,7 +28,7 @@ static const KDevPluginInfo data("kdevpartexplorer");
 typedef KDevGenericFactory PartExplorerPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) )
 
-PartExplorerPlugin::PartExplorerPlugin(  QObject *parent, const char *name, const QStringList & )
+PartExplorerPlugin::PartExplorerPlugin(  TQObject *parent, const char *name, const TQStringList & )
     : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" )
 {
     // we need an instance
@@ -40,7 +40,7 @@ PartExplorerPlugin::PartExplorerPlugin(  QObject *parent, const char *name, cons
     m_widget = new PartExplorerForm( mainWindow()->main() );
 //    mainWindow()->embedSelectView( m_widget, i18n("PartExplorer"), i18n("Query system services"));
 
-    KAction *action = new KAction( i18n("&Part Explorer"), 0, this, SLOT(slotShowForm()),
+    KAction *action = new KAction( i18n("&Part Explorer"), 0, this, TQT_SLOT(slotShowForm()),
         actionCollection(), "show_partexplorerform" );
     action->setToolTip(i18n("KTrader query execution"));
     action->setWhatsThis(i18n("Part explorer
        Shows a dialog for KTrader query execution. Search your KDE documentation for more information about KDE services and KTrader."));
diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h
index 28f3cd95..8e2accbd 100644
--- a/parts/partexplorer/partexplorer_plugin.h
+++ b/parts/partexplorer/partexplorer_plugin.h
@@ -12,7 +12,7 @@
 #ifndef _PARTEXPLORERPLUGIN_H_
 #define _PARTEXPLORERPLUGIN_H_
 
-#include 
+#include 
 
 #include "kdevplugin.h"
 
@@ -28,7 +28,7 @@ public:
     /**
     * Default constructor
     */
-    PartExplorerPlugin(  QObject *parent, const char *name, const QStringList & );
+    PartExplorerPlugin(  TQObject *parent, const char *name, const TQStringList & );
 
     /**
     * Destructor
@@ -42,7 +42,7 @@ private:
     /**
     * The dialog for user interaction, so the plugin is usable too ;)
     */
-    QGuardedPtr m_widget;
+    TQGuardedPtr m_widget;
 };
 
 #endif // _PARTEXPLORERPLUGIN_H_
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index f3a1caad..f944b393 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -9,13 +9,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -35,8 +35,8 @@ namespace PartExplorer{
 class PropertyItem : public KListViewItem
 {
 public:
-    PropertyItem( KListViewItem *parent, const QString &propertyName,
-        const QString &propertyType, const QString &propertyValue )
+    PropertyItem( KListViewItem *parent, const TQString &propertyName,
+        const TQString &propertyType, const TQString &propertyValue )
         : KListViewItem( parent )
     {
         setText( 0, propertyName );
@@ -44,9 +44,9 @@ public:
         setText( 2, propertyValue );
     }
 
-    QString tipText() const
+    TQString tipText() const
     {
-        QString tip = i18n("Name: %1 | Type: %2 | Value: %3");
+        TQString tip = i18n("Name: %1 | Type: %2 | Value: %3");
         return tip.arg( text(0) ).arg( text(1) ).arg( text(2) );
     }
 };
@@ -62,7 +62,7 @@ class ResultsToolTip: public QToolTip
 {
 public:
     ResultsToolTip( ResultsList* parent );
-    virtual void maybeTip( const QPoint& p );
+    virtual void maybeTip( const TQPoint& p );
 
 private:
     ResultsList* m_resultsList;
@@ -71,7 +71,7 @@ private:
 class ResultsList : public KListView
 {
 public:
-    ResultsList( QWidget *parent )
+    ResultsList( TQWidget *parent )
         : KListView( parent, "resultslist" )
     {
         this->setShowToolTips( false );
@@ -87,16 +87,16 @@ public:
 };
 
 ResultsToolTip::ResultsToolTip( ResultsList* parent )
-    : QToolTip( parent->viewport() ), m_resultsList( parent )
+    : TQToolTip( parent->viewport() ), m_resultsList( parent )
 {
 }
 
-void ResultsToolTip::maybeTip( const QPoint& p )
+void ResultsToolTip::maybeTip( const TQPoint& p )
 {
     PartExplorer::PropertyItem *item = dynamic_cast( m_resultsList->itemAt( p ) );
     if ( item )
     {
-        QRect r = m_resultsList->itemRect( item );
+        TQRect r = m_resultsList->itemRect( item );
         if ( r.isValid() )
             tip( r, item->tipText() );
     }
@@ -107,7 +107,7 @@ void ResultsToolTip::maybeTip( const QPoint& p )
 // class PartExplorerForm
 ///////////////////////////////////////////////////////////////////////////////
 
-PartExplorerForm::PartExplorerForm( QWidget *parent )
+PartExplorerForm::PartExplorerForm( TQWidget *parent )
     : KDialogBase( parent, "parteplorerform", false,
         i18n("Part Explorer - A Services Lister"), User1 | Close, User1, true )
 {
@@ -116,10 +116,10 @@ PartExplorerForm::PartExplorerForm( QWidget *parent )
     m_resultsList->addColumn( i18n( "Property" ) );
     m_resultsList->addColumn( i18n( "Type" ) );
     m_resultsList->addColumn( i18n( "Value" ) );
-    m_resultsList->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3,
-        (QSizePolicy::SizeType)3, 0, 0,
+    m_resultsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3,
+        (TQSizePolicy::SizeType)3, 0, 0,
         m_resultsList->sizePolicy().hasHeightForWidth() ) );
-    QWhatsThis::add( m_resultsList, i18n("Matching services
        Results (if any) are shown grouped by matching service name.") );
+    TQWhatsThis::add( m_resultsList, i18n("Matching services
        Results (if any) are shown grouped by matching service name.") );
     m_base->resultsLabel->setBuddy(m_resultsList);
     m_base->layout()->add( m_resultsList );
     setMainWidget( m_base );
@@ -131,16 +131,16 @@ PartExplorerForm::PartExplorerForm( QWidget *parent )
     // Resize dialog
     resize( 480, 512 );
 
-//    connect( m_base->typeCombo->lineEdit(), SIGNAL(returnPressed()), this, SLOT(slotSearchRequested()) );
-//    connect( m_base->constraintsText, SIGNAL(returnPressed()), this, SLOT(slotSearchRequested()) );
+//    connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) );
+//    connect( m_base->constraintsText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) );
 
-    connect( actionButton(User1), SIGNAL(clicked()), this, SLOT(slotSearchRequested()) );
-//    connect( m_base->typeCombo->lineEdit(), SIGNAL( textChanged ( const QString & ) ), this,  SLOT( slotServicetypeChanged( const QString&  ) ) );
+    connect( actionButton(User1), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchRequested()) );
+//    connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this,  TQT_SLOT( slotServicetypeChanged( const TQString&  ) ) );
 //    slotServicetypeChanged( m_base->typeCombo->lineEdit()->text() );
 
 	// populating with all known servicetypes
 	KServiceType::List serviceList = KServiceType::allServiceTypes();
-	QStringList list;
+	TQStringList list;
 	KServiceType::List::Iterator it = serviceList.begin();
 	while( it != serviceList.end() )
 	{
@@ -161,8 +161,8 @@ PartExplorerForm::~PartExplorerForm()
 
 void PartExplorerForm::slotSearchRequested()
 {
-	QString serviceType = m_base->typeCombo->lineEdit()->text();
-	QString constraints = m_base->constraintsText->text();
+	TQString serviceType = m_base->typeCombo->lineEdit()->text();
+	TQString constraints = m_base->constraintsText->text();
 
     kdDebug(9000) << "===> PartExplorerForm::slotSearchRequested(): " <<
         " serviceType = " << serviceType << ", constraints = " << constraints << endl;
@@ -174,7 +174,7 @@ void PartExplorerForm::slotSearchRequested()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void PartExplorerForm::slotDisplayError( QString errorMessage )
+void PartExplorerForm::slotDisplayError( TQString errorMessage )
 {
     if (errorMessage.isEmpty())
     {
@@ -205,21 +205,21 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services )
         KService::Ptr service = (*it);
         KListViewItem *serviceItem = new KListViewItem( this->m_resultsList, rootItem, service->name() );
 
-        QStringList propertyNames = service->propertyNames();
-        for ( QStringList::const_iterator it = propertyNames.begin(); it != propertyNames.end(); ++it )
+        TQStringList propertyNames = service->propertyNames();
+        for ( TQStringList::const_iterator it = propertyNames.begin(); it != propertyNames.end(); ++it )
         {
-            QString propertyName = (*it);
-            QVariant property = service->property( propertyName );
-            QString propertyType = property.typeName();
-            QString propertyValue;
-            if (propertyType == "QStringList") {
+            TQString propertyName = (*it);
+            TQVariant property = service->property( propertyName );
+            TQString propertyType = property.typeName();
+            TQString propertyValue;
+            if (propertyType == "TQStringList") {
                 propertyValue = property.toStringList().join(", ");
             }
             else {
                 propertyValue = property.toString();
             }
 
-            QString dProperty = " *** Found property < %1, %2, %3 >";
+            TQString dProperty = " *** Found property < %1, %2, %3 >";
             dProperty = dProperty.arg( propertyName ).arg( propertyType ).arg( propertyValue );
             kdDebug( 9000 ) << dProperty << endl;
 
diff --git a/parts/partexplorer/partexplorerform.h b/parts/partexplorer/partexplorerform.h
index 21fe2fba..7ccc140d 100644
--- a/parts/partexplorer/partexplorerform.h
+++ b/parts/partexplorer/partexplorerform.h
@@ -27,7 +27,7 @@ class PartExplorerForm : public KDialogBase
 {
     Q_OBJECT
 public:
-    PartExplorerForm( QWidget *parent = 0 );
+    PartExplorerForm( TQWidget *parent = 0 );
     virtual ~PartExplorerForm();
 
     /**
@@ -36,7 +36,7 @@ public:
     void fillServiceList( const KTrader::OfferList &services );
 
 public slots:
-    void slotDisplayError( QString );
+    void slotDisplayError( TQString );
 
 protected slots:
     void slotSearchRequested();
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index 66b18df2..2c1de0ce 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -49,33 +49,33 @@ K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) )
 
 using namespace KTextEditor;
 
-QuickOpenPart::QuickOpenPart(QObject *parent, const char *name, const QStringList& )
+QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& )
     : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" )
 {
     setInstance(QuickOpenFactory::instance());
     setXMLFile("kdevpart_quickopen.rc");
 
     m_actionQuickOpen = new KAction( i18n("Quick Open File..."), CTRL + ALT + Key_O,
-				       this, SLOT(slotQuickFileOpen()),
+				       this, TQT_SLOT(slotQuickFileOpen()),
 				       actionCollection(), "quick_open" );
     m_actionQuickOpen->setToolTip(i18n("Quick open file in project"));
     m_actionQuickOpen->setWhatsThis(i18n("Quick open
        Provides a file name input form with completion listbox to quickly open file in a project."));
 
     m_actionQuickOpenClass = new KAction( i18n("Quick Open Class..."), CTRL + ALT + Key_C,
-				          this, SLOT(slotQuickOpenClass()),
+				          this, TQT_SLOT(slotQuickOpenClass()),
 				          actionCollection(), "quick_open_class" );
     m_actionQuickOpenClass->setToolTip(i18n("Find class in project"));
     m_actionQuickOpenClass->setWhatsThis(i18n("Find class
        Provides a class name input form with completion listbox to quickly open a file where the class is defined."));
 
-    m_actionFunctionOpen = new KAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" );
+    m_actionFunctionOpen = new KAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQT_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" );
     m_actionFunctionOpen->setToolTip(i18n("Quick open function in project"));
 
-    m_switchToAction = new KAction(i18n("Switch To..."), KShortcut("CTRL+/"), this, SLOT(slotSwitchTo()), actionCollection(), "file_switchto");
+    m_switchToAction = new KAction(i18n("Switch To..."), KShortcut("CTRL+/"), this, TQT_SLOT(slotSwitchTo()), actionCollection(), "file_switchto");
     m_switchToAction->setToolTip(i18n("Switch to"));
     m_switchToAction->setWhatsThis(i18n("Switch to
        Prompts to enter the name of previously opened file to switch to."));
 
-    connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
-    connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) );
+    connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
+    connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
 }
 
 
diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h
index 92dac902..19d92222 100644
--- a/parts/quickopen/quickopen_part.h
+++ b/parts/quickopen/quickopen_part.h
@@ -21,7 +21,7 @@
 #ifndef __KDEVPART_QUICKOPEN_H__
 #define __KDEVPART_QUICKOPEN_H__
 
-#include 
+#include 
 #include 
 #include 
 
@@ -31,7 +31,7 @@ class QuickOpenPart : public KDevQuickOpen
 {
     Q_OBJECT
 public:
-    QuickOpenPart(QObject *parent, const char *name, const QStringList &);
+    QuickOpenPart(TQObject *parent, const char *name, const TQStringList &);
     virtual ~QuickOpenPart();
 
     void selectItem( ItemDom item );
diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp
index 0d5b2251..b97e47a3 100644
--- a/parts/quickopen/quickopenclassdialog.cpp
+++ b/parts/quickopen/quickopenclassdialog.cpp
@@ -28,14 +28,14 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "quickopenclassdialog.h"
 #include "quickopen_part.h"
 #include "quickopenfunctionchooseform.h"
 
-QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, QWidget* parent, const char* name, bool modal, WFlags fl)
+QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl)
     : QuickOpenDialog( part, parent, name, modal, fl )
 {
     nameLabel->setText( i18n("Class &name:") );
@@ -54,14 +54,14 @@ QuickOpenClassDialog::~QuickOpenClassDialog()
 {
 }
 
-void QuickOpenClassDialog::slotExecuted( QListBoxItem* /*item*/ )
+void QuickOpenClassDialog::slotExecuted( TQListBoxItem* /*item*/ )
 {
     accept();
 }
 
 void QuickOpenClassDialog::accept()
 {
-    if( QListBoxItem* item = itemList->selectedItem() )
+    if( TQListBoxItem* item = itemList->selectedItem() )
     {
         ClassList klasses = findClass( item->text() );
         if( klasses.count() == 1 )
@@ -75,7 +75,7 @@ void QuickOpenClassDialog::accept()
         else if (klasses.count() > 1 )
         {
             //several classes with the same name found
-            QString fileStr;
+            TQString fileStr;
 
             QuickOpenFunctionChooseForm fdlg( this, "" );
             fdlg.setCaption(i18n("Select The Location of Class %1").arg(klasses.first()->name()));
@@ -85,7 +85,7 @@ void QuickOpenClassDialog::accept()
             {
                 ClassDom klass = *it;
                 //assemble class name to display (maybe with scope info and specialization)
-                QString classStr = m_part->languageSupport()->formatModelItem(klass);
+                TQString classStr = m_part->languageSupport()->formatModelItem(klass);
                 if(klass->hasSpecializationDeclaration())
                   classStr += klass->getSpecializationDeclaration();
                 if(!klass->scope().isEmpty())
@@ -106,14 +106,14 @@ void QuickOpenClassDialog::accept()
                     int line, col;
                     model->getStartPosition( &line, &col );
                     selectClassViewItem( ItemDom(&(*model)) );
-                    QString fileNameStr = model->fileName();
+                    TQString fileNameStr = model->fileName();
                     m_part->partController()->editDocument( KURL(fileNameStr), line );
                 }
             }
         }
     }
 
-    QDialog::accept();
+    TQDialog::accept();
 }
 
 void QuickOpenClassDialog::slotReturnPressed( )
@@ -122,14 +122,14 @@ void QuickOpenClassDialog::slotReturnPressed( )
     accept();
 }
 
-void QuickOpenClassDialog::findAllClasses( QStringList& lst )
+void QuickOpenClassDialog::findAllClasses( TQStringList& lst )
 {
     findAllClasses( lst, m_part->codeModel()->globalNamespace() );
 }
 
-void QuickOpenClassDialog::findAllClasses( QStringList& lst, const ClassDom klass )
+void QuickOpenClassDialog::findAllClasses( TQStringList& lst, const ClassDom klass )
 {
-    QStringList fullName = klass->scope();
+    TQStringList fullName = klass->scope();
     fullName << klass->name();
     lst << fullName.join( "::" );
 
@@ -138,7 +138,7 @@ void QuickOpenClassDialog::findAllClasses( QStringList& lst, const ClassDom klas
         findAllClasses( lst, *it );
 }
 
-void QuickOpenClassDialog::findAllClasses( QStringList& lst, const NamespaceDom ns )
+void QuickOpenClassDialog::findAllClasses( TQStringList& lst, const NamespaceDom ns )
 {
     const NamespaceList namespaceList = ns->namespaceList();
     for( NamespaceList::ConstIterator it=namespaceList.begin(); it!=namespaceList.end(); ++it )
@@ -149,19 +149,19 @@ void QuickOpenClassDialog::findAllClasses( QStringList& lst, const NamespaceDom
         findAllClasses( lst, *it );
 }
 
-ClassList QuickOpenClassDialog::findClass( const QString& name )
+ClassList QuickOpenClassDialog::findClass( const TQString& name )
 {
-    QStringList path = QStringList::split( "::", name );
+    TQStringList path = TQStringList::split( "::", name );
     return findClass( path, m_part->codeModel()->globalNamespace() );
 }
 
-ClassList QuickOpenClassDialog::findClass( QStringList& path, const NamespaceDom ns )
+ClassList QuickOpenClassDialog::findClass( TQStringList& path, const NamespaceDom ns )
 {
     ClassList list;
     if( path.isEmpty() )
         return list;
 
-    QString current = path.front();
+    TQString current = path.front();
     if( ns->hasNamespace(current) )
     {
         path.pop_front();
@@ -178,7 +178,7 @@ ClassList QuickOpenClassDialog::findClass( QStringList& path, const NamespaceDom
     return list;
 }
 
-ClassList QuickOpenClassDialog::findClass( QStringList& path, const ClassList klasses )
+ClassList QuickOpenClassDialog::findClass( TQStringList& path, const ClassList klasses )
 {
     ClassList list;
     if( path.isEmpty() )
@@ -195,7 +195,7 @@ ClassList QuickOpenClassDialog::findClass( QStringList& path, const ClassList kl
     return list;
 }
 
-ClassList QuickOpenClassDialog::findClass( QStringList &path, const ClassDom klass )
+ClassList QuickOpenClassDialog::findClass( TQStringList &path, const ClassDom klass )
 {
     ClassList list;
     if( path.isEmpty() )
@@ -204,7 +204,7 @@ ClassList QuickOpenClassDialog::findClass( QStringList &path, const ClassDom kla
         return list;
     }
 
-    QString current = path.front();
+    TQString current = path.front();
     if( klass->hasClass(current) )
     {
         path.pop_front();
diff --git a/parts/quickopen/quickopenclassdialog.h b/parts/quickopen/quickopenclassdialog.h
index a93125c4..fd01fe25 100644
--- a/parts/quickopen/quickopenclassdialog.h
+++ b/parts/quickopen/quickopenclassdialog.h
@@ -23,7 +23,7 @@
 
 #include "quickopendialog.h"
 #include 
-#include 
+#include 
 
 class QuickOpenPart;
 
@@ -31,22 +31,22 @@ class QuickOpenClassDialog : public QuickOpenDialog
 {
     Q_OBJECT
 public:
-    QuickOpenClassDialog(QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
+    QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
     virtual ~QuickOpenClassDialog();
 
 public slots:
-    virtual void slotExecuted( QListBoxItem* );
+    virtual void slotExecuted( TQListBoxItem* );
     virtual void slotReturnPressed();
 
 protected:
-    void findAllClasses( QStringList& classList );
-    void findAllClasses( QStringList& classList, const ClassDom klass );
-    void findAllClasses( QStringList& classList, const NamespaceDom ns );
-
-    ClassList findClass( const QString& name );
-    ClassList findClass( QStringList& path, const NamespaceDom ns );
-    ClassList findClass( QStringList& path, const ClassList klasses );
-    ClassList findClass( QStringList& path, const ClassDom klass );
+    void findAllClasses( TQStringList& classList );
+    void findAllClasses( TQStringList& classList, const ClassDom klass );
+    void findAllClasses( TQStringList& classList, const NamespaceDom ns );
+
+    ClassList findClass( const TQString& name );
+    ClassList findClass( TQStringList& path, const NamespaceDom ns );
+    ClassList findClass( TQStringList& path, const ClassList klasses );
+    ClassList findClass( TQStringList& path, const ClassDom klass );
 
 protected slots:
     virtual void accept();
diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp
index b18ab980..e0d40295 100644
--- a/parts/quickopen/quickopendialog.cpp
+++ b/parts/quickopen/quickopendialog.cpp
@@ -18,8 +18,8 @@
  *
  */
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -28,18 +28,18 @@
 #include "quickopendialog.h"
 #include "quickopen_part.h"
 
-QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, QWidget* parent, const char* name, bool modal, WFlags fl)
+QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl)
     : QuickOpenDialogBase( parent, name, modal, fl ), m_part( part )
 {
     nameEdit->installEventFilter(this);
-    connect( &m_typeTimeout, SIGNAL(timeout()), this, SLOT(slotTextChangedDelayed()) );
+    connect( &m_typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTextChangedDelayed()) );
 }
 
 QuickOpenDialog::~QuickOpenDialog()
 {
 }
 
-void QuickOpenDialog::slotTextChanged(const QString &)
+void QuickOpenDialog::slotTextChanged(const TQString &)
 {
     m_typeTimeout.start( 100, true );
 }
@@ -58,8 +58,8 @@ void QuickOpenDialog::setFirstItemSelected()
     itemList->setCurrentItem(0);
     // We are doing this indirectly because the event handler does things for multiple
     // selections we cannot do through the public interface.
-    QKeyEvent e(QEvent::KeyPress, Qt::Key_Home, 0, 0);
-    QApplication::sendEvent(itemList, &e);
+    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0);
+    TQApplication::sendEvent(itemList, &e);
 }
 
 void QuickOpenDialog::slotTextChangedDelayed()
@@ -69,38 +69,38 @@ void QuickOpenDialog::slotTextChangedDelayed()
     setFirstItemSelected();
 }
 
-bool QuickOpenDialog::eventFilter( QObject * watched, QEvent * e )
+bool QuickOpenDialog::eventFilter( TQObject * watched, TQEvent * e )
 {
     if (!watched || !e)
         return true;
 
-    if ((watched == nameEdit) && (e->type() == QEvent::KeyPress))
+    if ((watched == nameEdit) && (e->type() == TQEvent::KeyPress))
     {
-        QKeyEvent *ke = (QKeyEvent*)e;
+        TQKeyEvent *ke = (TQKeyEvent*)e;
         if (ke->key() == Key_Up)
         {
-            QApplication::sendEvent(itemList, e);
+            TQApplication::sendEvent(itemList, e);
             nameEdit->blockSignals(true);
             itemSelectionChanged();
             nameEdit->blockSignals(false);
             return true;
         } else if (ke->key() == Key_Down)
         {
-            QApplication::sendEvent(itemList, e);
+            TQApplication::sendEvent(itemList, e);
             nameEdit->blockSignals(true);
             itemSelectionChanged();
             nameEdit->blockSignals(false);
             return true;
         } else if ((ke->key() == Key_Next) || (ke->key() == Key_Prior))
         {
-            QApplication::sendEvent(itemList, e);
+            TQApplication::sendEvent(itemList, e);
             nameEdit->blockSignals(true);
             itemSelectionChanged();
             nameEdit->blockSignals(false);
         }
     }
 
-    return QWidget::eventFilter(watched, e);
+    return TQWidget::eventFilter(watched, e);
 }
 
 void QuickOpenDialog::selectClassViewItem(ItemDom item)
@@ -108,13 +108,13 @@ void QuickOpenDialog::selectClassViewItem(ItemDom item)
     m_part->selectItem( item );
 }
 
-QStringList QuickOpenDialog::wildCardCompletion(const QString & text)
+TQStringList QuickOpenDialog::wildCardCompletion(const TQString & text)
 {
     if ( text.isEmpty() ) return m_items;
 
-    QRegExp re( text, false, true );
-    QStringList matches;
-    QStringList::const_iterator it = m_items.begin();
+    TQRegExp re( text, false, true );
+    TQStringList matches;
+    TQStringList::const_iterator it = m_items.begin();
     while( it != m_items.end() )
     {
         if ( (*it).find( re ) != -1 )
@@ -127,14 +127,14 @@ QStringList QuickOpenDialog::wildCardCompletion(const QString & text)
     return matches;
 }
 
-void QuickOpenDialog::QStringList_unique( QStringList & list )
+void QuickOpenDialog::QStringList_unique( TQStringList & list )
 {
     if ( list.size() < 2 ) return;
 
     list.sort();
 
-    QStringList::iterator it = list.begin();
-    QStringList::iterator it2 = it;
+    TQStringList::iterator it = list.begin();
+    TQStringList::iterator it2 = it;
     while ( it2 != list.end() )
     {
         ++it2;
diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h
index 00149bc4..6d441684 100644
--- a/parts/quickopen/quickopendialog.h
+++ b/parts/quickopen/quickopendialog.h
@@ -21,8 +21,8 @@
 #ifndef QUICKOPENDIALOG_H
 #define QUICKOPENDIALOG_H
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
@@ -36,26 +36,26 @@ class QuickOpenDialog : public QuickOpenDialogBase
   Q_OBJECT
 
 public:
-  QuickOpenDialog(QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
+  QuickOpenDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
   virtual ~QuickOpenDialog();
 
-  virtual bool eventFilter(QObject *watched, QEvent *e);
+  virtual bool eventFilter(TQObject *watched, TQEvent *e);
 
   void selectClassViewItem(ItemDom item);
 
 public slots:
-  virtual void slotTextChanged(const QString&);
+  virtual void slotTextChanged(const TQString&);
   virtual void slotTextChangedDelayed();
 
 protected:
     void maybeUpdateSelection();
     void setFirstItemSelected();
     virtual void itemSelectionChanged();
-    void QStringList_unique( QStringList & list );
-    QStringList wildCardCompletion( const QString & text );
-    QStringList m_items;
+    void QStringList_unique( TQStringList & list );
+    TQStringList wildCardCompletion( const TQString & text );
+    TQStringList m_items;
     QuickOpenPart* m_part;
-    QTimer m_typeTimeout;
+    TQTimer m_typeTimeout;
 
 };
 
diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp
index a03236b4..adc4a919 100644
--- a/parts/quickopen/quickopenfiledialog.cpp
+++ b/parts/quickopen/quickopenfiledialog.cpp
@@ -29,13 +29,13 @@
 #include 
 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "quickopenfiledialog.h"
 #include "quickopen_part.h"
 
-QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, QWidget* parent, const char* name, bool modal, WFlags fl)
+QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl)
     : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( false )
 {
     nameLabel->setText( i18n("File &name:") );
@@ -45,12 +45,12 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, QWidget* parent, c
 
     nameEdit->setFocus();
 
-    itemList->setSelectionMode( QListBox::Extended );
+    itemList->setSelectionMode( TQListBox::Extended );
     itemList->insertStringList( m_items );
     setFirstItemSelected();
 }
 
-QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, QWidget* parent, const char* name, bool modal, WFlags fl)
+QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, TQWidget* parent, const char* name, bool modal, WFlags fl)
     : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( true )
 {
     nameLabel->setText( i18n("File &name:") );
@@ -63,8 +63,8 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &
     {
         for (unsigned int i = 0; i < m_items.count(); ++i)
         {
-            QString url = m_items[i];
-            QString projectUrl = "file://" + m_part->project()->projectDirectory();
+            TQString url = m_items[i];
+            TQString projectUrl = "file://" + m_part->project()->projectDirectory();
             if (url.startsWith(projectUrl))
                 m_items[i] = url.mid(projectUrl.length() + 1);
         }
@@ -72,7 +72,7 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &
 
     nameEdit->setFocus();
 
-    itemList->setSelectionMode( QListBox::Extended );
+    itemList->setSelectionMode( TQListBox::Extended );
     itemList->insertStringList( m_items );
     setFirstItemSelected();
 }
@@ -81,7 +81,7 @@ QuickOpenFileDialog::~QuickOpenFileDialog()
 {
 }
 
-void QuickOpenFileDialog::slotExecuted( QListBoxItem* item )
+void QuickOpenFileDialog::slotExecuted( TQListBoxItem* item )
 {
     if ( !item ) return;
 
diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h
index 105b5efd..852f0f5b 100644
--- a/parts/quickopen/quickopenfiledialog.h
+++ b/parts/quickopen/quickopenfiledialog.h
@@ -22,7 +22,7 @@
 #define QUICKOPENFILEDIALOG_H
 
 #include "quickopendialog.h"
-#include 
+#include 
 
 #include 
 
@@ -33,12 +33,12 @@ class QuickOpenFileDialog : public QuickOpenDialog
 {
     Q_OBJECT
 public:
-    QuickOpenFileDialog(QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
-    QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
+    QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
+    QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
     virtual ~QuickOpenFileDialog();
 
 public slots:
-    virtual void slotExecuted( QListBoxItem* );
+    virtual void slotExecuted( TQListBoxItem* );
     virtual void slotReturnPressed();
 
 private:
diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp
index a2c50776..a8853417 100644
--- a/parts/quickopen/quickopenfunctionchooseform.cpp
+++ b/parts/quickopen/quickopenfunctionchooseform.cpp
@@ -28,7 +28,7 @@
 
 #include "quickopenfunctionchooseform.h"
 
-QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(QWidget* parent, const char* name, bool modal, WFlags fl)
+QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl)
 : QuickOpenFunctionChooseFormBase(parent,name, modal,fl)
 {
 	setCaption( i18n("Select One Argument or File of Function %1").arg( name ) );
diff --git a/parts/quickopen/quickopenfunctionchooseform.h b/parts/quickopen/quickopenfunctionchooseform.h
index 9048c24f..b8d462a5 100644
--- a/parts/quickopen/quickopenfunctionchooseform.h
+++ b/parts/quickopen/quickopenfunctionchooseform.h
@@ -23,24 +23,24 @@
 
 #include "quickopenfunctionchooseformbase.h"
 
-#include 
+#include 
 
 class QuickOpenFunctionChooseForm : public QuickOpenFunctionChooseFormBase
 {
   Q_OBJECT
 
 public:
-  QuickOpenFunctionChooseForm(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  QuickOpenFunctionChooseForm(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~QuickOpenFunctionChooseForm();
 
-  void setRelativePath(int id, const QString &path) { m_relPaths[id] = path; }
+  void setRelativePath(int id, const TQString &path) { m_relPaths[id] = path; }
 
 public slots:
   virtual void slotArgsChange( int id );
   virtual void slotFileChange( int id );
 
 private:
-  QMap m_relPaths;
+  TQMap m_relPaths;
 
 };
 
diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp
index d8691d92..8b877b8b 100644
--- a/parts/quickopen/quickopenfunctiondialog.cpp
+++ b/parts/quickopen/quickopenfunctiondialog.cpp
@@ -19,8 +19,8 @@
  */
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -33,13 +33,13 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 
 #include "quickopenfunctionchooseform.h"
 #include "quickopenfunctiondialog.h"
 
-QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, QWidget* parent, const char* name, bool modal, WFlags fl)
+QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, TQWidget* parent, const char* name, bool modal, WFlags fl)
 : QuickOpenDialog(part, parent, name, modal, fl)
 {
         nameLabel->setText( i18n("Function &name:") );
@@ -81,7 +81,7 @@ QuickOpenFunctionDialog::~QuickOpenFunctionDialog()
 {
 }
 
-void QuickOpenFunctionDialog::gotoFile( QString name )
+void QuickOpenFunctionDialog::gotoFile( TQString name )
 {
         FunctionModel *fmodel;
         FunctionList funcList;
@@ -97,14 +97,14 @@ void QuickOpenFunctionDialog::gotoFile( QString name )
         if( funcList.count() == 1 ){
                 fdom = funcList.first();
                 fmodel = fdom.data();
-                QString fileNameStr = fmodel->fileName();
+                TQString fileNameStr = fmodel->fileName();
                 int startline, startcol;
                 fmodel->getStartPosition( &startline, &startcol );
                 m_part->partController()->editDocument( KURL( fileNameStr), startline, startcol );
                 selectClassViewItem( ItemDom(&(*fmodel)) );
 
         }else if( funcList.count() > 1 ){
-                QString fileStr;
+                TQString fileStr;
 
                 QuickOpenFunctionChooseForm fdlg( this, name.ascii() );
 
@@ -127,7 +127,7 @@ void QuickOpenFunctionDialog::gotoFile( QString name )
                                 int line, col;
                                 model->getStartPosition( &line, &col );
                                 selectClassViewItem( ItemDom(&(*model)) );
-                                QString fileNameStr = model->fileName();
+                                TQString fileNameStr = model->fileName();
                                 m_part->partController()->editDocument( KURL(fileNameStr), line );
                         }
                 }
@@ -139,21 +139,21 @@ void QuickOpenFunctionDialog::gotoFile( QString name )
         accept();
 }
 
-void QuickOpenFunctionDialog::slotExecuted(QListBoxItem* item)
+void QuickOpenFunctionDialog::slotExecuted(TQListBoxItem* item)
 {
         if( item ){
                 gotoFile( item->text() );
         }
 }
 
-void QuickOpenFunctionDialog::executed(QListBoxItem*)
+void QuickOpenFunctionDialog::executed(TQListBoxItem*)
 {
 }
 
 void QuickOpenFunctionDialog::itemSelectionChanged() {
-      QString text = nameEdit->text();
-      QString txt = text;
-      QStringList parts = QStringList::split("::", text);
+      TQString text = nameEdit->text();
+      TQString txt = text;
+      TQStringList parts = TQStringList::split("::", text);
       if( !text.endsWith( "::" ) && !parts.isEmpty() )
         parts.pop_back();
       parts << itemList->currentText();
@@ -161,21 +161,21 @@ void QuickOpenFunctionDialog::itemSelectionChanged() {
 }
 
 void QuickOpenFunctionDialog::slotTextChangedDelayed() {
-    QString text = nameEdit->text();
-    QString txt = text;
-    QStringList parts = QStringList::split("::", text);
+    TQString text = nameEdit->text();
+    TQString txt = text;
+    TQStringList parts = TQStringList::split("::", text);
     if(text.endsWith("::") || parts.isEmpty()) {
         txt = "";
     }else{
         txt = parts.back();
         parts.pop_back();
     }
-    QValueList regExpParts;
-    for( QStringList::const_iterator it = parts.begin(); it != parts.end(); ++it ) {
-      regExpParts << QRegExp( *it, false, true );
+    TQValueList regExpParts;
+    for( TQStringList::const_iterator it = parts.begin(); it != parts.end(); ++it ) {
+      regExpParts << TQRegExp( *it, false, true );
     }
 
-    QString scope = parts.join("::");
+    TQString scope = parts.join("::");
 
     if( m_scope != scope ) {
         if( !scope.startsWith(m_scope) ) { ///Not a specialization, so reload all function-definitions
@@ -184,12 +184,12 @@ void QuickOpenFunctionDialog::slotTextChangedDelayed() {
 
         if(!parts.isEmpty()) {
             FunctionList accepted;
-            QStringList acceptedItems;
+            TQStringList acceptedItems;
             FunctionList::iterator it = m_functionDefList.begin();
             while(it != m_functionDefList.end()) {
-                QStringList scope = (*it)->scope();
-                QValueList::iterator mit = regExpParts.begin();
-                QStringList::iterator sit = scope.begin();
+                TQStringList scope = (*it)->scope();
+                TQValueList::iterator mit = regExpParts.begin();
+                TQStringList::iterator sit = scope.begin();
                 bool fail = false;
                 while(mit != regExpParts.end()) {
                     while(sit != scope.end() && !(*mit).exactMatch( *sit ) ) ++sit;
@@ -221,7 +221,7 @@ void QuickOpenFunctionDialog::slotTextChangedDelayed() {
 void QuickOpenFunctionDialog::slotReturnPressed()
 {
         maybeUpdateSelection();
-        QListBoxItem *listboxItem = itemList->selectedItem();
+        TQListBoxItem *listboxItem = itemList->selectedItem();
         slotExecuted( listboxItem );
 }
 
diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h
index 93bb9b12..c02a9296 100644
--- a/parts/quickopen/quickopenfunctiondialog.h
+++ b/parts/quickopen/quickopenfunctiondialog.h
@@ -34,25 +34,25 @@ class QuickOpenFunctionDialog : public QuickOpenDialog
   Q_OBJECT
 
 public:
-  QuickOpenFunctionDialog( QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~QuickOpenFunctionDialog();
   
-  void gotoFile( QString name );
+  void gotoFile( TQString name );
   
   QuickOpenPart* part(){ return m_part; };
   
 public slots:
-  virtual void slotExecuted(QListBoxItem*);//itemList executed, returnPressed
-  virtual void executed(QListBoxItem*);	//
+  virtual void slotExecuted(TQListBoxItem*);//itemList executed, returnPressed
+  virtual void executed(TQListBoxItem*);	//
   virtual void slotReturnPressed();			//buttonOk clicked, nameEdit returnPressed
   virtual void slotTextChangedDelayed();
   virtual void itemSelectionChanged();
 
 protected:
     void fillItemList();
-    QString m_scope;
+    TQString m_scope;
     FunctionList m_functionDefList;
-    QStringList m_functionStrList;
+    TQStringList m_functionStrList;
 	
 };
 
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index a211a797..834b7a1e 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -15,11 +15,11 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -52,7 +52,7 @@ RegexpTestDialog::~RegexpTestDialog()
 {}
 
 
-void RegexpTestDialog::showEvent(QShowEvent *)
+void RegexpTestDialog::showEvent(TQShowEvent *)
 {
     KParts::ReadWritePart *rwpart = dynamic_cast
         (m_part->partController()->activePart());
@@ -75,7 +75,7 @@ void RegexpTestDialog::somethingChanged()
 
 void RegexpTestDialog::checkQRegExp()
 {
-    QRegExp rx( pattern_edit->text() );
+    TQRegExp rx( pattern_edit->text() );
     rx.setMinimal( qregexp_min_button->isChecked() );
     if ( !rx.isValid() ) {
 #if QT_VERSION >= 0x030100
@@ -96,7 +96,7 @@ void RegexpTestDialog::checkQRegExp()
     int numCaptures = 10;
 #endif
     for ( int i = 0; i < numCaptures; ++i ) {
-	new QListViewItem( subgroups_listview, QString::number( i ), rx.cap( i ) );
+	new TQListViewItem( subgroups_listview, TQString::number( i ), rx.cap( i ) );
     }
 }
 
@@ -115,7 +115,7 @@ void RegexpTestDialog::checkKRegExp()
     for ( int i = 0; i <= 9; ++i ) {
 	const char* grp = rx.group( i );
 	if ( grp )
-	    new QListViewItem( subgroups_listview, QString::number( i ), QString( grp ) );
+	    new TQListViewItem( subgroups_listview, TQString::number( i ), TQString( grp ) );
     }
 }
 
@@ -124,10 +124,10 @@ void RegexpTestDialog::checkPOSIX()
     regex_t compiledPattern;
     regmatch_t matches[20];
     int cflags = extendedposix_button->isChecked()? REG_EXTENDED : 0;
-    QCString regexp = pattern_edit->text().local8Bit();
+    TQCString regexp = pattern_edit->text().local8Bit();
     int res = regcomp(&compiledPattern, regexp, cflags);
     if (res != 0) {
-        QString regcompMessage;
+        TQString regcompMessage;
         switch (res)
             {
             case REG_BADRPT:
@@ -181,7 +181,7 @@ void RegexpTestDialog::checkPOSIX()
         matches[i].rm_eo = -1;
     }
 
-    QCString testString = teststring_edit->text().local8Bit();
+    TQCString testString = teststring_edit->text().local8Bit();
     res = regexec(&compiledPattern, testString, 20, matches, 0);
     if (res != 0) {
         success_label->setText(i18n("No match"));
@@ -194,8 +194,8 @@ void RegexpTestDialog::checkPOSIX()
         if (matches[i].rm_so >= 0 && matches[i].rm_so <= len &&
             matches[i].rm_eo >= 0 && matches[i].rm_eo <= len &&
             matches[i].rm_so <= matches[i].rm_eo) {
-            QCString subGroup = testString.mid(matches[i].rm_so, matches[i].rm_eo - matches[i].rm_so);
-            new QListViewItem(subgroups_listview, QString::number(i), subGroup);
+            TQCString subGroup = testString.mid(matches[i].rm_so, matches[i].rm_eo - matches[i].rm_so);
+            new TQListViewItem(subgroups_listview, TQString::number(i), subGroup);
         }
     }
     regfree(&compiledPattern);
@@ -204,13 +204,13 @@ void RegexpTestDialog::checkPOSIX()
 
 void RegexpTestDialog::insertQuoted()
 {
-    QString rawstr = pattern_edit->text();
+    TQString rawstr = pattern_edit->text();
 
-    QString str;
+    TQString str;
 
     int len = rawstr.length();
     for (int i=0; i < len; ++i) {
-        QChar ch = rawstr[i];
+        TQChar ch = rawstr[i];
         if (ch == '"')
             str += "\\\"";
         else if (ch == '\\')
@@ -221,7 +221,7 @@ void RegexpTestDialog::insertQuoted()
 
     KParts::ReadWritePart *rwpart
         = dynamic_cast(m_part->partController()->activePart());
-    QWidget *view = m_part->partController()->activeWidget();
+    TQWidget *view = m_part->partController()->activeWidget();
 
     KTextEditor::EditInterface *editiface
         = dynamic_cast(rwpart);
@@ -244,7 +244,7 @@ void RegexpTestDialog::insertQuoted()
 
 void RegexpTestDialog::showRegExpEditor( )
 {
-    _regexp_dialog = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor" );
+    _regexp_dialog = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor" );
 
     if ( _regexp_dialog )
     {
@@ -253,7 +253,7 @@ void RegexpTestDialog::showRegExpEditor( )
 
         editor->setRegExp( pattern_edit->text() );
 
-        if ( _regexp_dialog->exec() == QDialog::Accepted )
+        if ( _regexp_dialog->exec() == TQDialog::Accepted )
         {
             pattern_edit->setText( editor->regExp() );
         }
diff --git a/parts/regexptest/regexptestdlg.h b/parts/regexptest/regexptestdlg.h
index e1c1a4e3..6b02ea02 100644
--- a/parts/regexptest/regexptestdlg.h
+++ b/parts/regexptest/regexptestdlg.h
@@ -26,7 +26,7 @@ public:
     ~RegexpTestDialog();
 
 protected:
-    virtual void showEvent(QShowEvent *e);
+    virtual void showEvent(TQShowEvent *e);
 
 protected slots:
     void showRegExpEditor();
@@ -40,7 +40,7 @@ private:
 
     KDevPlugin *m_part;
 
-    QDialog * _regexp_dialog;
+    TQDialog * _regexp_dialog;
 };
 
 #endif
diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
index 7b6b5193..8a3c8bd5 100644
--- a/parts/regexptest/regexptestpart.cpp
+++ b/parts/regexptest/regexptestpart.cpp
@@ -24,7 +24,7 @@ static const KDevPluginInfo data("kdevregexptest");
 typedef KDevGenericFactory RegexpTestFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) )
 
-RegexpTestPart::RegexpTestPart(QObject *parent, const char *name, const QStringList &)
+RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevPlugin(&data, parent, name ? name : "RegexpTestPart")
 {
     setInstance(RegexpTestFactory::instance());
@@ -33,12 +33,12 @@ RegexpTestPart::RegexpTestPart(QObject *parent, const char *name, const QStringL
     KAction *action;
 
     action = new KAction( i18n("Debug Regular Expression..."), 0,
-                          this, SLOT(slotRegexpTest()),
+                          this, TQT_SLOT(slotRegexpTest()),
                           actionCollection(), "tools_regexptest" );
     action->setToolTip(i18n("Debug regular expression"));
     action->setWhatsThis(i18n("Debug regular expression
        Allows to enter a regular expression "
         "and validate it. It is possible to check syntax of basic POSIX, extended POSIX "
-        "regular expressions and also syntax allowed by QRegExp and KRegExp classes."));
+        "regular expressions and also syntax allowed by TQRegExp and KRegExp classes."));
 
     m_dialog = 0;
 }
diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h
index 7eabeffc..d0446cef 100644
--- a/parts/regexptest/regexptestpart.h
+++ b/parts/regexptest/regexptestpart.h
@@ -12,7 +12,7 @@
 #ifndef _REGEXPTESTPART_H_
 #define _REGEXPTESTPART_H_
 
-#include 
+#include 
 #include 
 #include "kdevplugin.h"
 
@@ -24,7 +24,7 @@ class RegexpTestPart : public KDevPlugin
     Q_OBJECT
 
 public:
-    RegexpTestPart( QObject *parent, const char *name, const QStringList & );
+    RegexpTestPart( TQObject *parent, const char *name, const TQStringList & );
     ~RegexpTestPart();
 
 private slots:
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index 6e1312ed..7a64cac8 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 #include "replace_part.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -29,7 +29,7 @@ static const KDevPluginInfo data("kdevreplace");
 typedef KDevGenericFactory ReplaceFactory;
 K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data))
 
-ReplacePart::ReplacePart(QObject *parent, const char *name, const QStringList& )
+ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& )
         : KDevPlugin( &data, parent, name ? name : "ReplacePart" )
 {
     setInstance(ReplaceFactory::instance());
@@ -39,7 +39,7 @@ ReplacePart::ReplacePart(QObject *parent, const char *name, const QStringList& )
     m_widget->setIcon( SmallIcon("filefind") );
     m_widget->setCaption(i18n("Replace"));
 
-    QWhatsThis::add
+    TQWhatsThis::add
         (m_widget, i18n("Replace
        "
                         "This window shows a preview of a string replace "
                         "operation. Uncheck a line to exclude that replacement. "
@@ -53,7 +53,7 @@ ReplacePart::ReplacePart(QObject *parent, const char *name, const QStringList& )
     mainWindow()->setViewAvailable( m_widget, false );
 
     action = new KAction(i18n("Find-Select-Replace..."), 0,
-                                   CTRL+SHIFT+Key_R, this, SLOT(slotReplace()), actionCollection(), "edit_replace_across");
+                                   CTRL+SHIFT+Key_R, this, TQT_SLOT(slotReplace()), actionCollection(), "edit_replace_across");
     action->setToolTip( i18n("Project wide string replacement") );
     action->setWhatsThis( i18n("Find-Select-Replace
        "
                                "Opens the project wide string replacement dialog. There you "
@@ -62,9 +62,9 @@ ReplacePart::ReplacePart(QObject *parent, const char *name, const QStringList& )
                                "you specify. Matches will be displayed in the Replace window, you "
                                "can replace them with the specified string, exclude them from replace operation or cancel the whole replace.") );
 
-	connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
-    connect( core(), SIGNAL(projectOpened()), this, SLOT(enableAction()));
-    connect( core(), SIGNAL(projectClosed()), this, SLOT(disableAction()));
+	connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+    connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(enableAction()));
+    connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(disableAction()));
 }
 
 void ReplacePart::enableAction()
@@ -89,18 +89,18 @@ void ReplacePart::slotReplace()
     m_widget->showDialog();
 }
 
-void ReplacePart::contextMenu(QPopupMenu *popup, const Context *context)
+void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context)
 {
     if (!context->hasType( Context::EditorContext ))
         return;
 
     const EditorContext *econtext = static_cast(context);
-    QString ident = econtext->currentWord();
+    TQString ident = econtext->currentWord();
     if (!ident.isEmpty()) {
         m_popupstr = ident;
-        QString squeezed = KStringHandler::csqueeze(ident, 30);
+        TQString squeezed = KStringHandler::csqueeze(ident, 30);
         int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed),
-                           this, SLOT(slotReplace()) );
+                           this, TQT_SLOT(slotReplace()) );
         popup->setWhatsThis(id, i18n("Replace Project Wide
        Opens the find in files dialog "
                                "and sets the pattern to the text under the cursor."));
         popup->insertSeparator();
diff --git a/parts/replace/replace_part.h b/parts/replace/replace_part.h
index 35a293ab..8fb6f5e3 100644
--- a/parts/replace/replace_part.h
+++ b/parts/replace/replace_part.h
@@ -13,9 +13,9 @@
 #define __KDEVPART_REPLACE_H__
 
 
-#include 
+#include 
 #include 
-#include 
+#include 
 
 
 class ReplaceWidget;
@@ -27,17 +27,17 @@ class ReplacePart : public KDevPlugin
     Q_OBJECT
 
 public:
-    ReplacePart(QObject *parent, const char *name, const QStringList &);
+    ReplacePart(TQObject *parent, const char *name, const TQStringList &);
     ~ReplacePart();
 
 public slots:
     void slotReplace();
-	void contextMenu(QPopupMenu *popup, const Context *context);
+	void contextMenu(TQPopupMenu *popup, const Context *context);
     void enableAction();
     void disableAction();
 private:
-    QGuardedPtr m_widget;
-	QString m_popupstr;
+    TQGuardedPtr m_widget;
+	TQString m_popupstr;
         KAction* action;
 
 };
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index 24078943..c20c3bbc 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -35,18 +35,18 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -60,13 +60,13 @@
 //END Includes
 
 ReplaceWidget::ReplaceWidget(ReplacePart *part)
-        : QWidget(0, "replace widget"), m_part( part ),
+        : TQWidget(0, "replace widget"), m_part( part ),
         m_dialog( new ReplaceDlgImpl( this, "replace widget" ) ),
         _terminateOperation( false )
 {
     // setup outputview
-    QVBoxLayout * layout = new QVBoxLayout( this );
-    QHBoxLayout * buttonlayout = new QHBoxLayout( layout );
+    TQVBoxLayout * layout = new TQVBoxLayout( this );
+    TQHBoxLayout * buttonlayout = new TQHBoxLayout( layout );
 
     _cancel = new KPushButton( KStdGuiItem::cancel(), this );
     _replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this );
@@ -81,13 +81,13 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
     layout->addWidget( _listview );
 
     //  setup signals
-    connect( m_dialog->find_button, SIGNAL( clicked() ), SLOT( find() ) );
+    connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) );
 
-    connect( _replace, SIGNAL( clicked() ), SLOT( replace() ) );
-    connect( _cancel, SIGNAL( clicked() ), SLOT( clear() ) );
-    connect( _listview, SIGNAL( editDocument( const QString &, int ) ), SLOT( editDocument( const QString &, int ) ) );
+    connect( _replace, TQT_SIGNAL( clicked() ), TQT_SLOT( replace() ) );
+    connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) );
+    connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) );
 
-    connect( m_part->core(), SIGNAL( stopButtonClicked( KDevPlugin * ) ), SLOT( stopButtonClicked( KDevPlugin * ) ) );
+    connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQT_SLOT( stopButtonClicked( KDevPlugin * ) ) );
 }
 
 //BEGIN Slots
@@ -97,7 +97,7 @@ void ReplaceWidget::showDialog()
 	if ( ! m_part->project() )
 		return; /// @todo feedback?
 
-	QString currentWord;
+	TQString currentWord;
 	KParts::ReadOnlyPart *part = dynamic_cast ( m_part->partController()->activePart() );
 	if ( part )
 	{
@@ -107,7 +107,7 @@ void ReplaceWidget::showDialog()
 			cursorPos ( part, &calledCol, &calledLine );
 
 			KTextEditor::EditInterface* editIface = dynamic_cast( m_part->partController()->activePart() );
-			QString str = editIface->textLine ( calledCol );
+			TQString str = editIface->textLine ( calledCol );
 
 			int i;
 			uint start, end;
@@ -179,7 +179,7 @@ void ReplaceWidget::clear()
     m_part->mainWindow()->setViewAvailable( this, false );
 }
 
-void ReplaceWidget::editDocument( QString const & file, int line )
+void ReplaceWidget::editDocument( TQString const & file, int line )
 {
     m_part->partController()->editDocument( KURL( file ), line );
 }
@@ -203,10 +203,10 @@ bool ReplaceWidget::showReplacements()
     bool completed = true;
     _terminateOperation = false;
 
-    QStringList files = workFiles();
-    QStringList openfiles = openProjectFiles();
+    TQStringList files = workFiles();
+    TQStringList openfiles = openProjectFiles();
 
-    QStringList::ConstIterator it = files.begin();
+    TQStringList::ConstIterator it = files.begin();
     while ( it != files.end() )
     {
         if ( shouldTerminate() )
@@ -219,17 +219,17 @@ bool ReplaceWidget::showReplacements()
         {
             if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( *it ) )
             {
-                QString buffer = ei->text();
-                QTextIStream stream( &buffer );
+                TQString buffer = ei->text();
+                TQTextIStream stream( &buffer );
                 _listview->showReplacementsForFile( stream, *it );
             }
         }
         else
         {
-            QFile file( *it );
+            TQFile file( *it );
             if ( file.open ( IO_ReadOnly ) )
             {
-                QTextStream stream( &file );
+                TQTextStream stream( &file );
                 _listview->showReplacementsForFile( stream, *it );
             }
         }
@@ -280,24 +280,24 @@ bool ReplaceWidget::makeReplacements()
     bool completed = true;
     _terminateOperation = false;
 
-    QStringList openfiles = openProjectFiles();
-    QStringList changedFiles;
+    TQStringList openfiles = openProjectFiles();
+    TQStringList changedFiles;
 
     ReplaceItem const * fileitem = _listview->firstChild();
     while ( fileitem )
     {
         if ( fileitem->isOn() )
         {
-            QString currentfile = fileitem->file();
+            TQString currentfile = fileitem->file();
 
             if ( openfiles.contains( currentfile ) )
             {
                 if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( currentfile ) )
                 {
-                    QString ibuffer = ei->text();
-                    QString obuffer;
-                    QTextStream istream( &ibuffer, IO_ReadOnly );
-                    QTextStream ostream( &obuffer, IO_WriteOnly );
+                    TQString ibuffer = ei->text();
+                    TQString obuffer;
+                    TQTextStream istream( &ibuffer, IO_ReadOnly );
+                    TQTextStream ostream( &obuffer, IO_WriteOnly );
 
                     _listview->makeReplacementsForFile( istream, ostream, fileitem );
 
@@ -306,13 +306,13 @@ bool ReplaceWidget::makeReplacements()
             }
             else
             {
-                QFile file( currentfile );
-                QString buffer;
+                TQFile file( currentfile );
+                TQString buffer;
 
                 if ( file.open( IO_ReadOnly ) )
                 {
-                    QTextStream istream( &file );
-                    QTextStream buffer_stream( &buffer, IO_WriteOnly );
+                    TQTextStream istream( &file );
+                    TQTextStream buffer_stream( &buffer, IO_WriteOnly );
 
                     _listview->makeReplacementsForFile( istream, buffer_stream, fileitem );
 
@@ -320,7 +320,7 @@ bool ReplaceWidget::makeReplacements()
 
                     if ( file.open( IO_WriteOnly ) )
                     {
-                        QTextStream ostream( &file );
+                        TQTextStream ostream( &file );
                         ostream << buffer;
                         file.close();
                     }
@@ -343,7 +343,7 @@ bool ReplaceWidget::makeReplacements()
 
     m_part->core()->running( m_part, false );
 
-    if ( calledUrl != QString::null )
+    if ( calledUrl != TQString::null )
     {
         m_part->partController()->editDocument( calledUrl, calledLine );
         setCursorPos( m_part->partController()->activePart(), calledCol, calledLine );
@@ -357,7 +357,7 @@ bool ReplaceWidget::makeReplacements()
 
 //BEGIN Helpers
 
-QStringList ReplaceWidget::workFiles()
+TQStringList ReplaceWidget::workFiles()
 {
     if ( m_dialog->files_all_radio->isChecked() )
     {
@@ -370,9 +370,9 @@ QStringList ReplaceWidget::workFiles()
     return subProjectFiles( m_dialog->path_urlreq->lineEdit()->text() );
 }
 
-QString ReplaceWidget::relativeProjectPath( QString path )
+TQString ReplaceWidget::relativeProjectPath( TQString path )
 {
-    QString project = m_part->project()->projectDirectory() + "/";
+    TQString project = m_part->project()->projectDirectory() + "/";
     if ( path.left( project.length() ) == project )
     {
         path = path.mid( project.length() );
@@ -380,9 +380,9 @@ QString ReplaceWidget::relativeProjectPath( QString path )
     return path;
 }
 
-QString ReplaceWidget::fullProjectPath( QString path )
+TQString ReplaceWidget::fullProjectPath( TQString path )
 {
-    QString project = m_part->project()->projectDirectory() + "/";
+    TQString project = m_part->project()->projectDirectory() + "/";
     if ( path.left( project.length() ) != project )
     {
         path = project + path;
@@ -391,11 +391,11 @@ QString ReplaceWidget::fullProjectPath( QString path )
 }
 
 
-QStringList ReplaceWidget::allProjectFiles()
+TQStringList ReplaceWidget::allProjectFiles()
 {
-    QStringList allfiles = m_part->project()->allFiles();
+    TQStringList allfiles = m_part->project()->allFiles();
 
-    QStringList::iterator it = allfiles.begin();
+    TQStringList::iterator it = allfiles.begin();
     while ( it != allfiles.end() )
     {
         *it = fullProjectPath( *it );
@@ -404,11 +404,11 @@ QStringList ReplaceWidget::allProjectFiles()
     return allfiles;
 }
 
-QStringList ReplaceWidget::subProjectFiles( QString const & subpath )
+TQStringList ReplaceWidget::subProjectFiles( TQString const & subpath )
 {
-    QStringList projectfiles = allProjectFiles();
+    TQStringList projectfiles = allProjectFiles();
 
-    QStringList::Iterator it = projectfiles.begin();
+    TQStringList::Iterator it = projectfiles.begin();
     while ( it != projectfiles.end() )
     {
         if ( (*it).left( subpath.length() ) != subpath)
@@ -423,20 +423,20 @@ QStringList ReplaceWidget::subProjectFiles( QString const & subpath )
     return projectfiles;
 }
 
-QStringList ReplaceWidget::openProjectFiles()
+TQStringList ReplaceWidget::openProjectFiles()
 {
-    QStringList projectfiles = allProjectFiles();
-    QStringList openfiles;
+    TQStringList projectfiles = allProjectFiles();
+    TQStringList openfiles;
 
-    if( const QPtrList * partlist = m_part->
+    if( const TQPtrList * partlist = m_part->
             partController()->parts() )
     {
-        QPtrListIterator it( *partlist );
+        TQPtrListIterator it( *partlist );
         while ( KParts::Part* part = it.current() )
         {
             if ( KTextEditor::Editor * ed = dynamic_cast( part ) )
             {
-                QString editorpath = ed->url().path();
+                TQString editorpath = ed->url().path();
                 if ( projectfiles.contains( editorpath ) )
                 {
                     openfiles.append( editorpath );
@@ -448,12 +448,12 @@ QStringList ReplaceWidget::openProjectFiles()
     return openfiles;
 }
 
-KTextEditor::EditInterface * ReplaceWidget::getEditInterfaceForFile( QString const & file )
+KTextEditor::EditInterface * ReplaceWidget::getEditInterfaceForFile( TQString const & file )
 {
-    if( const QPtrList * partlist = m_part->
+    if( const TQPtrList * partlist = m_part->
             partController()->parts() )
     {
-        QPtrListIterator it( *partlist );
+        TQPtrListIterator it( *partlist );
         while ( KParts::Part* part = it.current() )
         {
             if ( KTextEditor::Editor * ed = dynamic_cast( part ) )
@@ -476,7 +476,7 @@ bool ReplaceWidget::shouldTerminate()
     return b;
 }
 
-void ReplaceWidget::focusInEvent( QFocusEvent * /* e*/ )
+void ReplaceWidget::focusInEvent( TQFocusEvent * /* e*/ )
 {
     _listview->setFocus();
 }
diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h
index fa5809d5..bbadce37 100644
--- a/parts/replace/replace_widget.h
+++ b/parts/replace/replace_widget.h
@@ -14,8 +14,8 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 class QPushButton;
 class QListViewItem;
@@ -38,13 +38,13 @@ public slots:
     void stopButtonClicked( KDevPlugin * );
 
 protected:
-    virtual void focusInEvent(QFocusEvent *e);
+    virtual void focusInEvent(TQFocusEvent *e);
 
 private slots:
     void find();
     void replace();
     void clear();
-    void editDocument( const QString & ,int );
+    void editDocument( const TQString & ,int );
     void setCursorPos( KParts::Part *part, uint line, uint col );
     void cursorPos( KParts::Part *part, uint * line, uint * col );
 
@@ -53,26 +53,26 @@ private:
     bool makeReplacements();
     bool shouldTerminate();
 
-    QString relativeProjectPath( QString );
-    QString fullProjectPath( QString );
+    TQString relativeProjectPath( TQString );
+    TQString fullProjectPath( TQString );
 
-    QStringList workFiles();
-    QStringList allProjectFiles();
-    QStringList subProjectFiles( QString const & );
-    QStringList openProjectFiles();
+    TQStringList workFiles();
+    TQStringList allProjectFiles();
+    TQStringList subProjectFiles( TQString const & );
+    TQStringList openProjectFiles();
 
-    KTextEditor::EditInterface * getEditInterfaceForFile( QString const & file );
+    KTextEditor::EditInterface * getEditInterfaceForFile( TQString const & file );
 
     ReplacePart * m_part;
     ReplaceDlgImpl * m_dialog;
 
     ReplaceView * _listview;
-    QPushButton * _cancel;
-    QPushButton * _replace;
+    TQPushButton * _cancel;
+    TQPushButton * _replace;
 
     uint calledCol;
     uint calledLine;
-    QString calledUrl;
+    TQString calledUrl;
 
     bool _terminateOperation;
 };
diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp
index 59eee128..b0c5bffd 100644
--- a/parts/replace/replacedlgimpl.cpp
+++ b/parts/replace/replacedlgimpl.cpp
@@ -1,8 +1,8 @@
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -20,10 +20,10 @@ namespace
 /// @todo This is the same function as in ../grepview/grepviewwidget.cpp and
 /// should probably be placed in a common place. For now it seemed like too
 /// little code to bother with.
-QString escape(const QString &str)
+TQString escape(const TQString &str)
 {
-    QString escaped("[]{}()\\^$?.+-*");
-    QString res;
+    TQString escaped("[]{}()\\^$?.+-*");
+    TQString res;
 
     for (uint i=0; i < str.length(); ++i)
     {
@@ -37,17 +37,17 @@ QString escape(const QString &str)
 }
 
 
-ReplaceDlgImpl::ReplaceDlgImpl(QWidget* parent, const char* name, bool modal, WFlags fl)
+ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* parent, const char* name, bool modal, WFlags fl)
         : ReplaceDlg(parent,name, modal,fl), _regexp_dialog( 0 )
 
 {
-    connect( find_button, SIGNAL( clicked() ), SLOT( saveComboHistories() ) );
-    connect( regexp_button, SIGNAL( clicked() ), SLOT( showRegExpEditor() ) );
-    connect( find_combo, SIGNAL( textChanged( const QString & ) ),
-        SLOT( validateFind( const QString & ) ) );
-    connect( regexp_combo, SIGNAL( textChanged ( const QString & ) ),
-             SLOT( validateExpression( const QString & ) ) );
-    connect( strings_regexp_radio, SIGNAL( toggled( bool ) ), SLOT( toggleExpression( bool ) ) );
+    connect( find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( saveComboHistories() ) );
+    connect( regexp_button, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpEditor() ) );
+    connect( find_combo, TQT_SIGNAL( textChanged( const TQString & ) ),
+        TQT_SLOT( validateFind( const TQString & ) ) );
+    connect( regexp_combo, TQT_SIGNAL( textChanged ( const TQString & ) ),
+             TQT_SLOT( validateExpression( const TQString & ) ) );
+    connect( strings_regexp_radio, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleExpression( bool ) ) );
 
     // disable the editor button if the regexp editor isn't installed
     if ( KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
@@ -64,7 +64,7 @@ ReplaceDlgImpl::ReplaceDlgImpl(QWidget* parent, const char* name, bool modal, WF
 ReplaceDlgImpl::~ReplaceDlgImpl()
 {}
 
-void ReplaceDlgImpl::show( QString const & path )
+void ReplaceDlgImpl::show( TQString const & path )
 {
     path_urlreq->lineEdit()->setText( path );
 
@@ -77,13 +77,13 @@ void ReplaceDlgImpl::show( QString const & path )
     
     find_button->setEnabled( false );
 
-    QDialog::show();
+    TQDialog::show();
 }
 
 
 void ReplaceDlgImpl::showRegExpEditor()
 {
-    _regexp_dialog = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor" );
+    _regexp_dialog = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor" );
 
     if ( _regexp_dialog )
     {
@@ -92,14 +92,14 @@ void ReplaceDlgImpl::showRegExpEditor()
 
         editor->setRegExp( regexp_combo->currentText() );
 
-        if ( _regexp_dialog->exec() == QDialog::Accepted )
+        if ( _regexp_dialog->exec() == TQDialog::Accepted )
         {
             regexp_combo->setCurrentText( editor->regExp() );
         }
     }
 }
 
-void ReplaceDlgImpl::validateFind( const QString & )
+void ReplaceDlgImpl::validateFind( const TQString & )
 {
     //kdDebug(0) << "ReplaceWidget::validateFind()" << endl;
 
@@ -107,12 +107,12 @@ void ReplaceDlgImpl::validateFind( const QString & )
     find_button->setEnabled( !x );
 }
 
-void ReplaceDlgImpl::validateExpression( const QString & )
+void ReplaceDlgImpl::validateExpression( const TQString & )
 {
     //kdDebug(0) << "ReplaceWidget::validateExpression()" << endl;
 
-    QString pattern = regexp_combo->currentText();
-    QRegExp re( pattern );
+    TQString pattern = regexp_combo->currentText();
+    TQRegExp re( pattern );
 
     if ( pattern.isEmpty() || !re.isValid() )
     {
@@ -130,7 +130,7 @@ void ReplaceDlgImpl::toggleExpression( bool on )
 {
     if ( on )
     {
-        validateExpression( QString() );
+        validateExpression( TQString() );
     }
     else
     {
@@ -157,11 +157,11 @@ void ReplaceDlgImpl::saveComboHistories()
     }
 }
 
-QRegExp ReplaceDlgImpl::expressionPattern()
+TQRegExp ReplaceDlgImpl::expressionPattern()
 {
-    QString pattern = escape( find_combo->currentText() );
+    TQString pattern = escape( find_combo->currentText() );
 
-    QRegExp re;
+    TQRegExp re;
     re.setCaseSensitive( case_box->isChecked() );
     re.setMinimal( true );
 
@@ -179,7 +179,7 @@ QRegExp ReplaceDlgImpl::expressionPattern()
     return re;
 }
 
-QString ReplaceDlgImpl::replacementString()
+TQString ReplaceDlgImpl::replacementString()
 {
     return replacement_combo->currentText();
 }
diff --git a/parts/replace/replacedlgimpl.h b/parts/replace/replacedlgimpl.h
index 38938bed..d67908ff 100644
--- a/parts/replace/replacedlgimpl.h
+++ b/parts/replace/replacedlgimpl.h
@@ -11,26 +11,26 @@ class ReplaceDlgImpl : public ReplaceDlg
     Q_OBJECT
 
 public:
-    ReplaceDlgImpl(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    ReplaceDlgImpl(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~ReplaceDlgImpl();
 
-    QRegExp expressionPattern();
-    QString replacementString();
+    TQRegExp expressionPattern();
+    TQString replacementString();
 
 public slots:
-    void show( QString const & path );
+    void show( TQString const & path );
 
 protected:
 
 protected slots:
     void showRegExpEditor();
-    void validateExpression( const QString & );
-    void validateFind( const QString & );
+    void validateExpression( const TQString & );
+    void validateFind( const TQString & );
     void toggleExpression( bool );
     void saveComboHistories();
 
 private:
-    QDialog * _regexp_dialog;
+    TQDialog * _regexp_dialog;
 
 };
 
diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp
index bc33211f..d810e2ad 100644
--- a/parts/replace/replaceitem.cpp
+++ b/parts/replace/replaceitem.cpp
@@ -9,10 +9,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "replaceitem.h"
 
@@ -69,41 +69,41 @@ void ReplaceItem::setChecked( bool checked )
     }
 }
 
-// code mostly lifted from QCheckListItem::paintCell()
-void ReplaceItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align )
+// code mostly lifted from TQCheckListItem::paintCell()
+void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align )
 {
     if ( !p )
         return;
 
-    QListView *lvv = listView();
+    TQListView *lvv = listView();
     if ( !lvv )
         return;
 
     ReplaceView * lv = static_cast(lvv);
 
     const BackgroundMode bgmode = lv->viewport()->backgroundMode();
-    const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode( bgmode );
+    const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
 
     if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
         p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
     else
-        lv->paintEmptyArea( p, QRect( 0, 0, width, height() ) );
+        lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
 
-    QFontMetrics fm( lv->fontMetrics() );
-    int boxsize = lv->style().pixelMetric(QStyle::PM_CheckListButtonSize, lv);
+    TQFontMetrics fm( lv->fontMetrics() );
+    int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
     int marg = lv->itemMargin();
     int r = marg;
 
     // Draw controller / checkbox / radiobutton ---------------------
-    int styleflags = QStyle::Style_Default;
+    int styleflags = TQStyle::Style_Default;
     if ( isOn() )
-        styleflags |= QStyle::Style_On;
+        styleflags |= TQStyle::Style_On;
     else
-        styleflags |= QStyle::Style_Off;
+        styleflags |= TQStyle::Style_Off;
     if ( isSelected() )
-        styleflags |= QStyle::Style_Selected;
+        styleflags |= TQStyle::Style_Selected;
     if ( isEnabled() && lv->isEnabled() )
-        styleflags |= QStyle::Style_Enabled;
+        styleflags |= TQStyle::Style_Enabled;
 
     int x = 0;
     int y = 0;
@@ -116,30 +116,30 @@ void ReplaceItem::paintCell( QPainter * p, const QColorGroup & cg, int column, i
     else
         y = (fm.height() + 2 + marg - boxsize) / 2;
 
-    lv->style().drawPrimitive(QStyle::PE_CheckListIndicator, p,
-                              QRect(x, y, boxsize,
+    lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p,
+                              TQRect(x, y, boxsize,
                                     fm.height() + 2 + marg),
-                              cg, styleflags, QStyleOption(this));
+                              cg, styleflags, TQStyleOption(this));
 
     r += boxsize + 4;
 
     // Draw text ----------------------------------------------------
     p->translate( r, 0 );
-    p->setPen( QPen( cg.text() ) );
+    p->setPen( TQPen( cg.text() ) );
 
-    QColorGroup mcg = cg;
-    mcg.setColor( QColorGroup::Text, ( isFile() ? Qt::darkGreen : Qt::blue ) );
-    mcg.setColor( QColorGroup::HighlightedText, ( isFile() ? Qt::darkGreen : Qt::blue ) );
+    TQColorGroup mcg = cg;
+    mcg.setColor( TQColorGroup::Text, ( isFile() ? Qt::darkGreen : Qt::blue ) );
+    mcg.setColor( TQColorGroup::HighlightedText, ( isFile() ? Qt::darkGreen : Qt::blue ) );
 
-    QListViewItem::paintCell( p, mcg, column, width - r, align );
+    TQListViewItem::paintCell( p, mcg, column, width - r, align );
 }
 
-void ReplaceItem::activate( int, QPoint const & localPos )
+void ReplaceItem::activate( int, TQPoint const & localPos )
 {
-    QListView * lv = listView();
-    QCheckBox cb(0);
+    TQListView * lv = listView();
+    TQCheckBox cb(0);
     int boxsize = cb.sizeHint().width();
-//that's KDE-3.1 only    int boxsize = lv->style().pixelMetric(QStyle::PM_CheckListButtonSize, lv);
+//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/replaceitem.h b/parts/replace/replaceitem.h
index a6bc8ffb..4cea682c 100644
--- a/parts/replace/replaceitem.h
+++ b/parts/replace/replaceitem.h
@@ -22,10 +22,10 @@ class ReplaceItem : public QCheckListItem
 {
 public:
     // the file item
-    ReplaceItem( ReplaceView * parent, ReplaceItem * after, QString file ) :
-            QCheckListItem( parent,
+    ReplaceItem( ReplaceView * parent, ReplaceItem * after, TQString file ) :
+            TQCheckListItem( parent,
                             after,
-                            file, QCheckListItem::CheckBox ),
+                            file, TQCheckListItem::CheckBox ),
             _file( file ), _string( file ), _line( 0 ), _isfile( true ),
             _lineclicked( false ), _clicked( true )
     {
@@ -34,17 +34,17 @@ public:
     }
 
     // the line item
-    ReplaceItem( ReplaceItem * parent, ReplaceItem * after, QString file, QString string, int line ) :
-            QCheckListItem( parent,
+    ReplaceItem( ReplaceItem * parent, ReplaceItem * after, TQString file, TQString string, int line ) :
+            TQCheckListItem( parent,
                             after,
-                            QString::number( line + 1 ) + ": " + string, QCheckListItem::CheckBox ),
+                            TQString::number( line + 1 ) + ": " + string, TQCheckListItem::CheckBox ),
             _file( file ), _string( string ), _line( line ), _isfile( false ),
             _lineclicked( false ), _clicked( true )
     {
         setOn( true );
     }
 
-    QString const & file() const
+    TQString const & file() const
     {
         return _file;
     }
@@ -54,7 +54,7 @@ public:
         return _line;
     }
 
-    QString const & string() const
+    TQString const & string() const
     {
         return _string;
     }
@@ -78,31 +78,31 @@ public:
 
     ReplaceItem * parent() const
     {
-        return static_cast( QListViewItem::parent() );
+        return static_cast( TQListViewItem::parent() );
     }
 
     ReplaceItem * firstChild() const
     {
-        return static_cast( QListViewItem::firstChild() );
+        return static_cast( TQListViewItem::firstChild() );
     }
 
     ReplaceItem * nextSibling() const
     {
-        return static_cast( QListViewItem::nextSibling() );
+        return static_cast( TQListViewItem::nextSibling() );
     }
 
-    void activate( int column, QPoint const & localPos );
+    void activate( int column, TQPoint const & localPos );
     bool hasCheckedChildren() const;
     virtual void stateChange( bool state );
 
     static bool s_listview_done;
 
 private:
-    void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align );
     void setChecked( bool checked );
 
-    QString _file;
-    QString _string;
+    TQString _file;
+    TQString _string;
     int _line;
     bool const _isfile;
     bool _lineclicked;
diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp
index 7a7505d7..6730971a 100644
--- a/parts/replace/replaceview.cpp
+++ b/parts/replace/replaceview.cpp
@@ -9,12 +9,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "replaceitem.h"
 #include "replaceview.h"
@@ -23,29 +23,29 @@
 
 ReplaceItem * ReplaceView::firstChild() const
 {
-    return static_cast( QListView::firstChild() );
+    return static_cast( TQListView::firstChild() );
 }
 
 
-ReplaceView::ReplaceView( QWidget * parent ) : KListView( parent ), _latestfile( 0 )
+ReplaceView::ReplaceView( TQWidget * parent ) : KListView( parent ), _latestfile( 0 )
 {
     setSorting( -1 );
     addColumn( "" );
     header()->hide();
     setFullWidth(true);
 
-    QPalette pal = palette();
-    QColorGroup cg = pal.active();
-    cg.setColor( QColorGroup::Highlight, Qt::lightGray );
+    TQPalette pal = palette();
+    TQColorGroup cg = pal.active();
+    cg.setColor( TQColorGroup::Highlight, Qt::lightGray );
     pal.setActive( cg );
     setPalette( pal );
 
-    connect( this, SIGNAL( clicked( QListViewItem * ) ), SLOT( slotClicked( QListViewItem * ) ) );
-    connect( this, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint &, int) ),
-             SLOT( slotMousePressed(int, QListViewItem *, const QPoint &, int) ) );
+    connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), TQT_SLOT( slotClicked( TQListViewItem * ) ) );
+    connect( this, TQT_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ),
+             TQT_SLOT( slotMousePressed(int, TQListViewItem *, const TQPoint &, int) ) );
 }
 
-void ReplaceView::makeReplacementsForFile( QTextStream & istream, QTextStream & ostream, ReplaceItem const * fileitem )
+void ReplaceView::makeReplacementsForFile( TQTextStream & istream, TQTextStream & ostream, ReplaceItem const * fileitem )
 {
     int line = 0;
 
@@ -73,7 +73,7 @@ void ReplaceView::makeReplacementsForFile( QTextStream & istream, QTextStream &
     }
 }
 
-void ReplaceView::showReplacementsForFile( QTextStream & stream, QString const & file )
+void ReplaceView::showReplacementsForFile( TQTextStream & stream, TQString const & file )
 {
     ReplaceItem * latestitem = 0;
 
@@ -82,7 +82,7 @@ void ReplaceView::showReplacementsForFile( QTextStream & stream, QString const &
 
     while ( !stream.atEnd() )
     {
-        QString s = stream.readLine();
+        TQString s = stream.readLine();
 
         if ( s.contains( _regexp ) > 0 )
         {
@@ -100,13 +100,13 @@ void ReplaceView::showReplacementsForFile( QTextStream & stream, QString const &
     }
 }
 
-void ReplaceView::setReplacementData( QRegExp const & re, QString const & replacement )
+void ReplaceView::setReplacementData( TQRegExp const & re, TQString const & replacement )
 {
     _regexp = re;
     _replacement = replacement;
 }
 
-void ReplaceView::slotMousePressed(int btn, QListViewItem* i, const QPoint& pos, int col)
+void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int col)
 {
     kdDebug(0) << "ReplaceView::slotMousePressed()" << endl;
 
@@ -119,12 +119,12 @@ void ReplaceView::slotMousePressed(int btn, QListViewItem* i, const QPoint& pos,
         else if ( btn == Qt::LeftButton )
         {
             // map pos to item/column and call ReplacetItem::activate(pos)
-            item->activate( col, viewport()->mapFromGlobal( pos ) - QPoint( 0, itemRect(item).top() ) );
+            item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) );
         }
     }
 }
 
-void ReplaceView::slotClicked( QListViewItem * item )
+void ReplaceView::slotClicked( TQListViewItem * item )
 {
     kdDebug(0) << "ReplaceView::slotClicked()" << endl;
 
diff --git a/parts/replace/replaceview.h b/parts/replace/replaceview.h
index 02ba60c9..31dcc4cd 100644
--- a/parts/replace/replaceview.h
+++ b/parts/replace/replaceview.h
@@ -14,8 +14,8 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 class QTextStream;
 class QWidget;
@@ -26,22 +26,22 @@ class ReplaceView : public KListView
     Q_OBJECT
 
 signals:
-    void editDocument( const QString &, int );
+    void editDocument( const TQString &, int );
 
 public:
-    ReplaceView( QWidget *);
+    ReplaceView( TQWidget *);
     ReplaceItem * firstChild() const;
-    void setReplacementData( QRegExp const &, QString const & );
-    void showReplacementsForFile( QTextStream &, QString const & );
-    void makeReplacementsForFile( QTextStream & istream, QTextStream & ostream, ReplaceItem const * fileitem );
+    void setReplacementData( TQRegExp const &, TQString const & );
+    void showReplacementsForFile( TQTextStream &, TQString const & );
+    void makeReplacementsForFile( TQTextStream & istream, TQTextStream & ostream, ReplaceItem const * fileitem );
 
 private slots:
-    void slotMousePressed(int, QListViewItem *, const QPoint &, int);
-    void slotClicked( QListViewItem * );
+    void slotMousePressed(int, TQListViewItem *, const TQPoint &, int);
+    void slotClicked( TQListViewItem * );
 
 private:
-    QRegExp _regexp;
-    QString _replacement;
+    TQRegExp _regexp;
+    TQString _replacement;
     ReplaceItem * _latestfile;
 
 friend class ReplaceItem;
diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp
index e4076d15..78749465 100644
--- a/parts/scripting/scriptingglobalconfig.cpp
+++ b/parts/scripting/scriptingglobalconfig.cpp
@@ -24,12 +24,12 @@
 #include 
 #include 
 #include 
-scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, QWidget *parent, const char *name)
+scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *parent, const char *name)
     : scriptingGlobalConfigBase(parent, name), m_part(part)
 {
     // read kconfig and post list to the m_dirs
     KConfig *cfg = kapp->config();
-     QStringList searchDirs = cfg->readListEntry("SearchDirs");
+     TQStringList searchDirs = cfg->readListEntry("SearchDirs");
     m_dirs->clear();
     m_dirs->insertStringList(searchDirs);
 }
@@ -39,7 +39,7 @@ void scriptingGlobalConfig::accept()
     // read mdirs and save to kconfig
     KConfig *cfg = kapp->config();
     if( !m_dirs->isEnabled() )
-        cfg->writeEntry("SearchDirs", QStringList() );
+        cfg->writeEntry("SearchDirs", TQStringList() );
     else
         cfg->writeEntry("SearchDirs", m_dirs->items() );
     m_part->setupActions();
diff --git a/parts/scripting/scriptingglobalconfig.h b/parts/scripting/scriptingglobalconfig.h
index af6750d0..85343e33 100644
--- a/parts/scripting/scriptingglobalconfig.h
+++ b/parts/scripting/scriptingglobalconfig.h
@@ -29,7 +29,7 @@ class scriptingGlobalConfig: public scriptingGlobalConfigBase
 {
     Q_OBJECT
 public:
-    scriptingGlobalConfig(scriptingPart *part, QWidget *parent = 0, const char *name = 0);
+    scriptingGlobalConfig(scriptingPart *part, TQWidget *parent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index adc8f581..496746b2 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -20,9 +20,9 @@
 
 #include "scriptingpart.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) )
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-scriptingPart::scriptingPart(QObject *parent, const char *name, const QStringList &/*args*/)
+scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
     : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L)
 {
     setInstance(scriptingFactory::instance());
@@ -55,12 +55,12 @@ scriptingPart::scriptingPart(QObject *parent, const char *name, const QStringLis
 
     m_configProxy = new ConfigWidgetProxy(core());
     m_configProxy->createGlobalConfigPage(i18n("Scripting"), GLOBALDOC_OPTIONS, info()->icon());
-    connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )),
-        this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int)));
+    connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+        this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)));
 
   
         
-    QTimer::singleShot(0, this, SLOT(init()));
+    TQTimer::singleShot(0, this, TQT_SLOT(init()));
 }
 
 scriptingPart::~scriptingPart()
@@ -80,17 +80,17 @@ void scriptingPart::setupActions()
 {
     kdDebug() << "Load plugins" << endl;
     // Read KConfig and get the list of custom directories.
-    QStringList searchDirs;
+    TQStringList searchDirs;
     searchDirs += "kate/scripts";
     
     KConfig *cfg = kapp->config();
     searchDirs += cfg->readListEntry("SearchDirs");
     
-    unplugActionList(QString::fromLatin1( "script_actions" ));
-    plugActionList( QString::fromLatin1( "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, QWidget *page, unsigned int pageNo)
+void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo)
 {
 // create configuraton dialogs here
     switch (pageNo)
@@ -98,7 +98,7 @@ void scriptingPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, un
         case GLOBALDOC_OPTIONS:
         {
             scriptingGlobalConfig *w = new scriptingGlobalConfig(this, page, "global config");
-            connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
+            connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
             break;
         }
     }
diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h
index abfbde24..7f929891 100644
--- a/parts/scripting/scriptingpart.h
+++ b/parts/scripting/scriptingpart.h
@@ -23,7 +23,7 @@
 
 #include 
 
-#include 
+#include 
 
 class QPopupMenu;
 class KAction;
@@ -38,14 +38,14 @@ class scriptingPart: public KDevPlugin
 {
     Q_OBJECT
 public:
-    scriptingPart(QObject *parent, const char *name, const QStringList &args);
+    scriptingPart(TQObject *parent, const char *name, const TQStringList &args);
     ~scriptingPart();
 
     public slots:
         void setupActions();
 private slots:
     void init();
-    void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo);
+    void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo);
     
     
 
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index f7564109..eb1c47ac 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -7,17 +7,17 @@
  */
 #include "snippet_part.h"
 
-#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 #include 
 
 #include "kdevcore.h"
@@ -37,7 +37,7 @@ static const KDevPluginInfo data("kdevsnippet");
 typedef KDevGenericFactory snippetFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) )
 
-SnippetPart::SnippetPart(QObject *parent, const char *name, const QStringList& )
+SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& )
   : KDevPlugin(&data, parent, name ? name : "SnippetPart" )
 {
   setInstance(snippetFactory::instance());
@@ -47,16 +47,16 @@ SnippetPart::SnippetPart(QObject *parent, const char *name, const QStringList& )
   m_widget->setCaption(i18n("Code Snippets"));
   m_widget->setIcon(SmallIcon( info()->icon() ));
 
-  QWhatsThis::add(m_widget, i18n("Code Snippet
        This is a list of available snippets."));
+  TQWhatsThis::add(m_widget, i18n("Code Snippet
        This is a list of available snippets."));
 
   mainWindow()->embedSelectViewRight( m_widget, i18n("Code Snippets"), i18n("Insert a code snippet") );
 
-  connect( core(), SIGNAL( configWidget( KDialogBase * ) ), this, SLOT( slotConfigWidget( KDialogBase * ) ) );
+  connect( core(), TQT_SIGNAL( configWidget( KDialogBase * ) ), this, TQT_SLOT( slotConfigWidget( KDialogBase * ) ) );
   
   /*The next two connects are used to check if certain SnippetGroups need to be opened 
     according to the languages supported by this project*/
-  connect( core(), SIGNAL( projectOpened() ), m_widget, SLOT( languageChanged() ) );
-  connect( core(), SIGNAL( languageChanged() ), m_widget, SLOT( languageChanged() ) );
+  connect( core(), TQT_SIGNAL( projectOpened() ), m_widget, TQT_SLOT( languageChanged() ) );
+  connect( core(), TQT_SIGNAL( languageChanged() ), m_widget, TQT_SLOT( languageChanged() ) );
 
   setupActions();
 }
@@ -73,7 +73,7 @@ SnippetPart::~SnippetPart()
 
 void SnippetPart::setupActions()
 {
-  new KAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, SLOT(slotShowView()), actionCollection(), "snippet_showview");
+  new KAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQT_SLOT(slotShowView()), actionCollection(), "snippet_showview");
 }
 
 /*!
@@ -97,7 +97,7 @@ KAboutData* SnippetPart::aboutData()
  */
 void SnippetPart::slotConfigWidget( KDialogBase *dlg )
 {
-  QVBox *vbox = dlg->addVBoxPage( i18n("Code Snippets"), i18n("Code Snippets"), BarIcon( info()->icon(), KIcon::SizeMedium ) );
+  TQVBox *vbox = dlg->addVBoxPage( i18n("Code Snippets"), i18n("Code Snippets"), BarIcon( info()->icon(), KIcon::SizeMedium ) );
 
   SnippetSettings * w = new SnippetSettings( m_widget, vbox );
 
@@ -105,22 +105,22 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg )
   w->leDelimiter->setText(m_widget->getSnippetConfig()->getDelimiter());
   w->cbToolTip->setChecked(m_widget->getSnippetConfig()->useToolTips());
   w->btnGroupAutoOpen->setButton(m_widget->getSnippetConfig()->getAutoOpenGroups());
-  connect( dlg, SIGNAL(okClicked()), w, SLOT(slotOKClicked()) );
+  connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotOKClicked()) );
 }
 
 
-QStringList SnippetPart::getAllLanguages()
+TQStringList SnippetPart::getAllLanguages()
 {
     KTrader::OfferList languageSupportOffers =
-        KTrader::self()->query(QString::fromLatin1("KDevelop/LanguageSupport"),
-                               QString::fromLatin1("[X-KDevelop-Version] == %1"
+        KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
+                               TQString::fromLatin1("[X-KDevelop-Version] == %1"
                                ).arg( KDEVELOP_PLUGIN_VERSION ));
     
-    QStringList languages;
+    TQStringList languages;
 
     for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it)
     {
-        QString language = (*it)->property("X-KDevelop-Language").toString();
+        TQString language = (*it)->property("X-KDevelop-Language").toString();
         languages.append(language);
         
         kdDebug(9035) << "Found language: " << (*it)->property("X-KDevelop-Language").toString() << endl <<
@@ -132,13 +132,13 @@ QStringList SnippetPart::getAllLanguages()
 }
 
 
-QStringList SnippetPart::getProjectLanguages()
+TQStringList SnippetPart::getProjectLanguages()
 {
-    QStringList languages;
+    TQStringList languages;
     if (!projectDom())
         return languages;
 
-    QDomDocument m_projectDom = *projectDom();
+    TQDomDocument m_projectDom = *projectDom();
     
     if (m_widget->getSnippetConfig()->getAutoOpenGroups() == 1)
         languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language");
diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h
index 98c3b252..c62950fc 100644
--- a/parts/snippet/snippet_part.h
+++ b/parts/snippet/snippet_part.h
@@ -11,7 +11,7 @@
 #define __KDEVPART_SNIPPET_H__
 
 
-#include 
+#include 
 #include 
 
 
@@ -30,16 +30,16 @@ class SnippetPart : public KDevPlugin
 
 public:
 
-  SnippetPart(QObject *parent, const char *name, const QStringList &);
+  SnippetPart(TQObject *parent, const char *name, const TQStringList &);
   ~SnippetPart();
   KAboutData * aboutData();
-    QStringList getAllLanguages();
-    QStringList getProjectLanguages();
+    TQStringList getAllLanguages();
+    TQStringList getProjectLanguages();
 
 private:
   void setupActions();
 
-  QGuardedPtr m_widget;
+  TQGuardedPtr m_widget;
 
 public slots:
   void slotConfigWidget( KDialogBase *dlg );
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 98d61505..2c35d5c5 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -11,28 +11,28 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -47,7 +47,7 @@
 #include "snippet_widget.h"
 
 SnippetWidget::SnippetWidget(SnippetPart *part)
-		: KListView(0, "snippet widget"), QToolTip( viewport() ),
+		: KListView(0, "snippet widget"), TQToolTip( viewport() ),
 		m_part( part )
 {
     // init the QPtrList
@@ -64,20 +64,20 @@ SnippetWidget::SnippetWidget(SnippetPart *part)
     setRootIsDecorated(true);
 
     //connect the signals
-    connect( this, SIGNAL( contextMenuRequested ( QListViewItem *, const QPoint & , int ) ),
-             this, SLOT( showPopupMenu(QListViewItem *, const QPoint & , int ) ) );
+    connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ),
+             this, TQT_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) );
 
-    connect( this, SIGNAL( executed (QListViewItem *) ),
-             this, SLOT( slotExecuted( QListViewItem *) ) );
-    connect( this, SIGNAL( returnPressed (QListViewItem *) ),
-             this, SLOT( slotExecuted( QListViewItem *) ) );
+    connect( this, TQT_SIGNAL( executed (TQListViewItem *) ),
+             this, TQT_SLOT( slotExecuted( TQListViewItem *) ) );
+    connect( this, TQT_SIGNAL( returnPressed (TQListViewItem *) ),
+             this, TQT_SLOT( slotExecuted( TQListViewItem *) ) );
 
-    connect( this, SIGNAL( dropped(QDropEvent *, QListViewItem *) ),
-             this, SLOT( slotDropped(QDropEvent *, QListViewItem *) ) );
+    connect( this, TQT_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ),
+             this, TQT_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) );
 
     _cfg = 0;
 
-    QTimer::singleShot(0, this, SLOT(initConfig()));
+    TQTimer::singleShot(0, this, TQT_SLOT(initConfig()));
 }
 
 SnippetWidget::~SnippetWidget()
@@ -121,7 +121,7 @@ void SnippetWidget::slotAdd()
   }
   dlg.cbGroup->setCurrentText(group->getName());
 
-  if (dlg.exec() == QDialog::Accepted) {
+  if (dlg.exec() == TQDialog::Accepted) {
       group = dynamic_cast(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
       _list.append( new SnippetItem(group, dlg.snippetName->text(), dlg.snippetText->text()) );
   }
@@ -144,7 +144,7 @@ void SnippetWidget::slotAddGroup()
   dlg.cbGroup->setCurrentText(i18n("All"));
   dlg.textLabelGroup->setText(i18n("Language:"));
 
-  if (dlg.exec() == QDialog::Accepted) {
+  if (dlg.exec() == TQDialog::Accepted) {
     _list.append( new SnippetGroup(this, dlg.snippetName->text(), SnippetGroup::getMaxId(), dlg.cbGroup->currentText()) );
   }
 }
@@ -157,7 +157,7 @@ void SnippetWidget::slotAddGroup()
 void SnippetWidget::slotRemove()
 {
   //get current data
-  QListViewItem * item = currentItem();
+  TQListViewItem * item = currentItem();
   SnippetItem *snip = dynamic_cast( item );
   SnippetGroup *group = dynamic_cast( item );
   if (!snip)
@@ -165,7 +165,7 @@ void SnippetWidget::slotRemove()
 
   if (group) {
     if (group->childCount() > 0 &&
-        KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),QString::null,KStdGuiItem::del())
+        KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),TQString::null,KStdGuiItem::del())
         == KMessageBox::Cancel)
       return;
 
@@ -190,7 +190,7 @@ void SnippetWidget::slotRemove()
 void SnippetWidget::slotEdit()
 {
   //get current data
-  QListViewItem * item = currentItem();
+  TQListViewItem * item = currentItem();
 
   SnippetGroup *pGroup = dynamic_cast(item);
   SnippetItem *pSnippet = dynamic_cast( item );
@@ -212,7 +212,7 @@ void SnippetWidget::slotEdit()
   }
   dlg.cbGroup->setCurrentText(SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName());
 
-  if (dlg.exec() == QDialog::Accepted) {
+  if (dlg.exec() == TQDialog::Accepted) {
     //update the KListView and the SnippetItem
     item->setText( 0, dlg.snippetName->text() );
     pSnippet->setName( dlg.snippetName->text() );
@@ -237,7 +237,7 @@ void SnippetWidget::slotEdit()
 void SnippetWidget::slotEditGroup()
 {
   //get current data
-  QListViewItem * item = currentItem();
+  TQListViewItem * item = currentItem();
 
   SnippetGroup *pGroup = dynamic_cast( item );
   if (!pGroup) /*selected item MUST be a SnippetGroup*/
@@ -255,7 +255,7 @@ void SnippetWidget::slotEditGroup()
   dlg.cbGroup->setCurrentText(pGroup->getLanguage());
   dlg.textLabelGroup->setText(i18n("Language:"));
 
-  if (dlg.exec() == QDialog::Accepted) {
+  if (dlg.exec() == TQDialog::Accepted) {
     //update the KListView and the SnippetGroup
     item->setText( 0, dlg.snippetName->text() );
     pGroup->setName( dlg.snippetName->text() );
@@ -265,7 +265,7 @@ void SnippetWidget::slotEditGroup()
   }
 }
 
-void SnippetWidget::slotExecuted(QListViewItem * item)
+void SnippetWidget::slotExecuted(TQListViewItem * item)
 {
   SnippetItem *pSnippet = dynamic_cast( item );
   if (!pSnippet || dynamic_cast(item))
@@ -277,10 +277,10 @@ void SnippetWidget::slotExecuted(QListViewItem * item)
 
 
 /*!
-    \fn SnippetWidget::insertIntoActiveView(QString text)
+    \fn SnippetWidget::insertIntoActiveView(TQString text)
     Inserts the parameter text into the activ view
  */
-void SnippetWidget::insertIntoActiveView(QString text)
+void SnippetWidget::insertIntoActiveView(TQString text)
 {
   //get the interfaces for the KTexteditor parts
   KTextEditor::ViewCursorInterface *cursorIface
@@ -315,9 +315,9 @@ void SnippetWidget::writeConfig()
   _cfg->setGroup("SnippetPart");
 
   SnippetItem *item;
-  QString strKeyName="";
-  QString strKeyText="";
-  QString strKeyId="";
+  TQString strKeyName="";
+  TQString strKeyText="";
+  TQString strKeyId="";
 
   int iSnipCount = 0;
   int iGroupCount = 0;
@@ -327,9 +327,9 @@ void SnippetWidget::writeConfig()
     SnippetGroup * group = dynamic_cast(item);
     if (group) {
       kdDebug(9035) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl;
-      strKeyName=QString("snippetGroupName_%1").arg(iGroupCount);
-      strKeyId=QString("snippetGroupId_%1").arg(iGroupCount);
-      strKeyText=QString("snippetGroupLang_%1").arg(iGroupCount);
+      strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount);
+      strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount);
+      strKeyText=TQString("snippetGroupLang_%1").arg(iGroupCount);
 
       _cfg->writeEntry(strKeyName, group->getName());
       _cfg->writeEntry(strKeyId, group->getId());
@@ -337,9 +337,9 @@ void SnippetWidget::writeConfig()
       iGroupCount++;
     } else if (dynamic_cast(item)) {
       kdDebug(9035) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl;
-      strKeyName=QString("snippetName_%1").arg(iSnipCount);
-      strKeyText=QString("snippetText_%1").arg(iSnipCount);
-      strKeyId=QString("snippetParent_%1").arg(iSnipCount);
+      strKeyName=TQString("snippetName_%1").arg(iSnipCount);
+      strKeyText=TQString("snippetText_%1").arg(iSnipCount);
+      strKeyId=TQString("snippetParent_%1").arg(iSnipCount);
 
       _cfg->writeEntry(strKeyName, item->getName());
       _cfg->writeEntry(strKeyText, item->getText());
@@ -353,12 +353,12 @@ void SnippetWidget::writeConfig()
   _cfg->writeEntry("snippetGroupCount", iGroupCount);
 
   int iCount = 1;
-  QMap::Iterator it;
+  TQMap::Iterator it;
   for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) {  //write the saved variable values
     if (it.data().length()<=0) continue;  //is the saved value has no length -> no need to save it
 
-    strKeyName=QString("snippetSavedName_%1").arg(iCount);
-    strKeyText=QString("snippetSavedVal_%1").arg(iCount);
+    strKeyName=TQString("snippetSavedName_%1").arg(iCount);
+    strKeyText=TQString("snippetSavedVal_%1").arg(iCount);
 
     _cfg->writeEntry(strKeyName, it.key());
     _cfg->writeEntry(strKeyText, it.data());
@@ -391,14 +391,14 @@ void SnippetWidget::initConfigOldVersion(KConfig *cfg)
   _list.append(group);
 
   int iCount = cfg->readNumEntry("snippetCount", 0);
-  QString strKeyName="";
-  QString strKeyText="";
+  TQString strKeyName="";
+  TQString strKeyText="";
   for ( int i=0; ireadEntry(strKeyName, "");
     strTextVal = cfg->readEntry(strKeyText, "");
@@ -422,9 +422,9 @@ void SnippetWidget::initConfig()
 
   _cfg->setGroup("SnippetPart");
 
-  QString strKeyName="";
-  QString strKeyText="";
-  QString strKeyId="";
+  TQString strKeyName="";
+  TQString strKeyText="";
+  TQString strKeyId="";
   SnippetItem *item;
   SnippetGroup *group;
 
@@ -434,13 +434,13 @@ void SnippetWidget::initConfig()
   int iCount = _cfg->readNumEntry("snippetGroupCount", -1);
 
   for ( int i=0; ireadEntry(strKeyName, "");
     iIdVal = _cfg->readNumEntry(strKeyId, -1);
@@ -465,12 +465,12 @@ void SnippetWidget::initConfig()
   if (iCount != -1) {
     iCount = _cfg->readNumEntry("snippetCount", 0);
     for ( int i=0; ireadEntry(strKeyName, "");
@@ -492,11 +492,11 @@ void SnippetWidget::initConfig()
   iCount = _cfg->readNumEntry("snippetSavedCount", 0);
 
   for ( int i=1; i<=iCount; i++) {  //read the saved-values and store in QMap
-    strKeyName=QString("snippetSavedName_%1").arg(i);
-    strKeyText=QString("snippetSavedVal_%1").arg(i);
+    strKeyName=TQString("snippetSavedName_%1").arg(i);
+    strKeyText=TQString("snippetSavedVal_%1").arg(i);
 
-    QString strNameVal="";
-    QString strTextVal="";
+    TQString strNameVal="";
+    TQString strTextVal="";
 
     strNameVal = _cfg->readEntry(strKeyName, "");
     strTextVal = _cfg->readEntry(strKeyText, "");
@@ -517,16 +517,16 @@ void SnippetWidget::initConfig()
 }
 
 /*!
-    \fn SnippetWidget::maybeTip( const QPoint & p )
+    \fn SnippetWidget::maybeTip( const TQPoint & p )
     Shows the Snippet-Text as ToolTip
  */
-void SnippetWidget::maybeTip( const QPoint & p )
+void SnippetWidget::maybeTip( const TQPoint & p )
 {
 	SnippetItem * item = dynamic_cast( itemAt( p ) );
 	if (!item)
 	  return;
 
-	QRect r = itemRect( item );
+	TQRect r = itemRect( item );
 
 	if (r.isValid() &&
         _SnippetConfig.useToolTips() )
@@ -540,10 +540,10 @@ void SnippetWidget::maybeTip( const QPoint & p )
 }
 
 /*!
-    \fn SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int )
+    \fn SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int )
     Shows the Popup-Menu depending item is a valid pointer
 */
-void SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int )
+void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int )
 {
 	KPopupMenu popup;
 
@@ -551,45 +551,45 @@ void SnippetWidget::showPopupMenu( QListViewItem * item, const QPoint & p, int )
 	if ( item ) {
 		popup.insertTitle( selectedItem->getName() );
 
-		popup.insertItem( i18n("Add Item..."), this, SLOT( slotAdd() ) );
-		popup.insertItem( i18n("Add Group..."), this, SLOT( slotAddGroup() ) );
+		popup.insertItem( i18n("Add Item..."), this, TQT_SLOT( slotAdd() ) );
+		popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) );
         if (dynamic_cast(item)) {
-            popup.insertItem( i18n("Edit..."), this, SLOT( slotEditGroup() ) );
+            popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEditGroup() ) );
         } else {
-            popup.insertItem( i18n("Edit..."), this, SLOT( slotEdit() ) );
+            popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEdit() ) );
         }
-		popup.insertItem( i18n("Remove"), this, SLOT( slotRemove() ) );
+		popup.insertItem( i18n("Remove"), this, TQT_SLOT( slotRemove() ) );
 
 	} else {
 		popup.insertTitle(i18n("Code Snippets"));
 
-		popup.insertItem( i18n("Add Group..."), this, SLOT( slotAddGroup() ) );
+		popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) );
 	}
 
 	popup.exec(p);
 }
 
 
-//  fn SnippetWidget::parseText(QString text, QString del)
+//  fn SnippetWidget::parseText(TQString text, TQString del)
 /*!
-    This function is used to parse the given QString for variables. If found the user will be prompted
+    This function is used to parse the given TQString for variables. If found the user will be prompted
     for a replacement value. It returns the string text with all replacements made
  */
-QString SnippetWidget::parseText(QString text, QString del)
+TQString SnippetWidget::parseText(TQString text, TQString del)
 {
-  QString str = text;
-  QString strName = "";
-  QString strNew = "";
-  QString strMsg="";
+  TQString str = text;
+  TQString strName = "";
+  TQString strNew = "";
+  TQString strMsg="";
   int iFound = -1;
   int iEnd = -1;
-  QMap mapVar;
+  TQMap mapVar;
   int iInMeth = _SnippetConfig.getInputMethod();
-  QRect rSingle = _SnippetConfig.getSingleRect();
-  QRect rMulti = _SnippetConfig.getMultiRect();
+  TQRect rSingle = _SnippetConfig.getSingleRect();
+  TQRect rMulti = _SnippetConfig.getMultiRect();
 
   do {
-    iFound = text.find(QRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1);  //find the next variable by this QRegExp
+    iFound = text.find(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1);  //find the next variable by this QRegExp
     if (iFound >= 0) {
       iEnd = text.find(del, iFound+1)+1;
       strName = text.mid(iFound, iEnd-iFound);
@@ -625,7 +625,7 @@ QString SnippetWidget::parseText(QString text, QString del)
     bh = rMulti.height();
     oh = rMulti.top();
     if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) {  //generate and show the dialog
-      QMap::Iterator it;
+      TQMap::Iterator it;
       for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the replacement
         str.replace(it.key(), it.data());
       }
@@ -652,7 +652,7 @@ QString SnippetWidget::parseText(QString text, QString del)
     variable that is stored in the given map except the double-delimiter entry
     It return true if everything was ok and false if the user hit cancel
  */
-bool SnippetWidget::showMultiVarDialog(QMap * map, QMap * mapSave,
+bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMap * mapSave,
                                        int & iWidth, int & iBasicHeight, int & iOneHeight)
 {
   //if no var -> no need to show
@@ -660,28 +660,28 @@ bool SnippetWidget::showMultiVarDialog(QMap * map, QMap no need to show
-  QMap::Iterator it = map->begin();
+  TQMap::Iterator it = map->begin();
   if ( map->count() == 1 && it.data()==_SnippetConfig.getDelimiter()+_SnippetConfig.getDelimiter() )
     return true;
 
-  QMap mapVar2Te;  //this map will help keeping track which TEXTEDIT goes with which variable
-  QMap mapVar2Cb;  //this map will help keeping track which CHECKBOX goes with which variable
+  TQMap mapVar2Te;  //this map will help keeping track which TEXTEDIT goes with which variable
+  TQMap mapVar2Cb;  //this map will help keeping track which CHECKBOX goes with which variable
 
   // --BEGIN-- building a dynamic dialog
-  QDialog dlg(this);
+  TQDialog dlg(this);
   dlg.setCaption(i18n("Enter Values for Variables"));
 
-  QGridLayout * layout = new QGridLayout( &dlg, 1, 1, 11, 6, "layout");
-  QGridLayout * layoutTop = new QGridLayout( 0, 1, 1, 0, 6, "layoutTop");
-  QGridLayout * layoutVar = new QGridLayout( 0, 1, 1, 0, 6, "layoutVar");
-  QGridLayout * layoutBtn = new QGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
+  TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
+  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
+  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
+  TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
 
   KTextEdit *te = NULL;
-  QLabel * labTop = NULL;
-  QCheckBox * cb = NULL;
+  TQLabel * labTop = NULL;
+  TQCheckBox * cb = NULL;
 
-  labTop = new QLabel( &dlg, "label" );
-  labTop->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0,
+  labTop = new TQLabel( &dlg, "label" );
+  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);
@@ -693,7 +693,7 @@ bool SnippetWidget::showMultiVarDialog(QMap * map, QMapsetChecked( FALSE );
     cb->setText(it.key());
     layoutVar->addWidget( cb, i ,0, Qt::AlignTop );
@@ -709,8 +709,8 @@ bool SnippetWidget::showMultiVarDialog(QMap * map, QMap * map, QMapsetText(i18n("&Cancel"));
-  btn1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::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->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0,
+  btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn2->sizePolicy().hasHeightForWidth() ) );
   layoutBtn->addWidget( btn2, 0, 1 );
 
   layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
   // --END-- building a dynamic dialog
 
-  //connect the buttons to the QDialog default slots
-  connect(btn1, SIGNAL(clicked()), &dlg, SLOT(reject()) );
-  connect(btn2, SIGNAL(clicked()), &dlg, SLOT(accept()) );
+  //connect the buttons to the TQDialog default slots
+  connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) );
+  connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) );
 
   //prepare to execute the dialog
   bool bReturn = false;
   //resize the textedits
   if (iWidth > 1) {
-    QRect r = dlg.geometry();
+    TQRect r = dlg.geometry();
     r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
     r.setWidth(iWidth);
     dlg.setGeometry(r);
   }
   if ( i > 0 && // only if there are any variables
-    dlg.exec() == QDialog::Accepted ) {
+    dlg.exec() == TQDialog::Accepted ) {
 
-    QMap::Iterator it2;
+    TQMap::Iterator it2;
     for ( it2 = mapVar2Te.begin(); it2 != mapVar2Te.end(); ++it2 ) {
       if (it2.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
         continue;
@@ -769,11 +769,11 @@ bool SnippetWidget::showMultiVarDialog(QMap * map, QMap::Iterator it1;
+  TQMap::Iterator it1;
   for (it1 = mapVar2Te.begin(); it1 != mapVar2Te.end(); ++it1)
     delete it1.data();
   mapVar2Te.clear();
-  QMap::Iterator it2;
+  TQMap::Iterator it2;
   for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2)
     delete it2.data();
   mapVar2Cb.clear();
@@ -789,33 +789,33 @@ bool SnippetWidget::showMultiVarDialog(QMap * map, QMap * mapSave)
+//  fn SnippetWidget::showSingleVarDialog(TQString var, TQMap * mapSave)
 /*!
     This function constructs a dialog which contains a label and a linedit for the given variable
     It return either the entered value or an empty string if the user hit cancel
  */
-QString SnippetWidget::showSingleVarDialog(QString var, QMap * mapSave, QRect & dlgSize)
+TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap * mapSave, TQRect & dlgSize)
 {
   // --BEGIN-- building a dynamic dialog
-  QDialog dlg(this);
+  TQDialog dlg(this);
   dlg.setCaption(i18n("Enter Values for Variables"));
 
-  QGridLayout * layout = new QGridLayout( &dlg, 1, 1, 11, 6, "layout");
-  QGridLayout * layoutTop = new QGridLayout( 0, 1, 1, 0, 6, "layoutTop");
-  QGridLayout * layoutVar = new QGridLayout( 0, 1, 1, 0, 6, "layoutVar");
-  QGridLayout * layoutBtn = new QGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
+  TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
+  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
+  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
+  TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
 
   KTextEdit *te = NULL;
-  QLabel * labTop = NULL;
-  QCheckBox * cb = NULL;
+  TQLabel * labTop = NULL;
+  TQCheckBox * cb = NULL;
 
-  labTop = new QLabel( &dlg, "label" );
+  labTop = new TQLabel( &dlg, "label" );
   layoutTop->addWidget(labTop, 0, 0);
   labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
   layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
 
 
-  cb = new QCheckBox( &dlg, "cbVar" );
+  cb = new TQCheckBox( &dlg, "cbVar" );
   cb->setChecked( FALSE );
   cb->setText(i18n( "Make value &default" ));
 
@@ -827,8 +827,8 @@ QString SnippetWidget::showSingleVarDialog(QString var, QMap *
     te->setText((*mapSave)[var]);
   }
 
-  QToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") );
-  QWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. "
+  TQToolTip::add( cb, i18n("Enable this to save the value entered to the right as the default value for this variable") );
+  TQWhatsThis::add( cb, i18n("If you enable this option, the value entered to the right will be saved. "
                             "If you use the same variable later, even in another snippet, the value entered to the right "
                             "will be the default value for that variable.") );
 
@@ -847,15 +847,15 @@ QString SnippetWidget::showSingleVarDialog(QString var, QMap *
   te->setFocus();
   // --END-- building a dynamic dialog
 
-  //connect the buttons to the QDialog default slots
-  connect(btn1, SIGNAL(clicked()), &dlg, SLOT(reject()) );
-  connect(btn2, SIGNAL(clicked()), &dlg, SLOT(accept()) );
+  //connect the buttons to the TQDialog default slots
+  connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) );
+  connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) );
 
   //execute the dialog
-  QString strReturn = "";
+  TQString strReturn = "";
   if (dlgSize.isValid())
     dlg.setGeometry(dlgSize);
-  if ( dlg.exec() == QDialog::Accepted ) {
+  if ( dlg.exec() == TQDialog::Accepted ) {
     if (cb->isChecked())     //if the checkbox is on; save the values for later
       (*mapSave)[var] = te->text();
     else
@@ -880,21 +880,21 @@ QString SnippetWidget::showSingleVarDialog(QString var, QMap *
   return strReturn;
 }
 
-//  fn SnippetWidget::acceptDrag (QDropEvent *event) const
+//  fn SnippetWidget::acceptDrag (TQDropEvent *event) const
 /*!
     Reimplementation from KListView.
     Check here if the data the user is about to drop fits our restrictions.
     We only accept dropps of plaintext, because from the dropped text
     we will create a snippet.
  */
-bool SnippetWidget::acceptDrag (QDropEvent *event) const
+bool SnippetWidget::acceptDrag (TQDropEvent *event) const
 {
   kdDebug(9035) << "Format: " << event->format() << "" << event->pos() << endl;
 
-  QListViewItem * item = itemAt(event->pos());
+  TQListViewItem * item = itemAt(event->pos());
 
   if (item &&
-      QString(event->format()).startsWith("text/plain") &&
+      TQString(event->format()).startsWith("text/plain") &&
       static_cast(event->source()) != this) {
     kdDebug(9035) << "returning TRUE " << endl;
     return TRUE;
@@ -905,25 +905,25 @@ bool SnippetWidget::acceptDrag (QDropEvent *event) const
   }
 }
 
-//  fn SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *after)
+//  fn SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *after)
 /*!
     This slot is connected to the dropped signal.
     If it is emitted, we need to construct a new snippet entry with
     the data given
  */
-void SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *)
+void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *)
 {
-  QListViewItem * item2 = itemAt(e->pos());
+  TQListViewItem * item2 = itemAt(e->pos());
   
   SnippetGroup *group = dynamic_cast(item2);
   if (!group)
     group = dynamic_cast(item2->parent());
 
-  QCString dropped;
-  QByteArray data = e->encodedData("text/plain");
+  TQCString dropped;
+  TQByteArray data = e->encodedData("text/plain");
   if ( e->provides("text/plain") && data.size()>0 ) {
     //get the data from the event...
-    QString encData(data.data());
+    TQString encData(data.data());
     kdDebug(9035) << "encData: " << encData << endl;
 
     //... then fill the dialog with the given data
@@ -939,7 +939,7 @@ void SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *)
     }
     dlg.cbGroup->setCurrentText(group->getName());
 
-    if (dlg.exec() == QDialog::Accepted) {
+    if (dlg.exec() == TQDialog::Accepted) {
       /* get the group that the user selected with the combobox */
       group = dynamic_cast(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
       _list.append( new SnippetItem(group, dlg.snippetName->text(), dlg.snippetText->text()) );
@@ -953,7 +953,7 @@ void SnippetWidget::slotDropped(QDropEvent *e, QListViewItem *)
  */
 void SnippetWidget::languageChanged()
 {
-  QStringList langs = m_part->getProjectLanguages();
+  TQStringList langs = m_part->getProjectLanguages();
 
   for (SnippetItem *it=_list.first(); it; it=_list.next()) {
     SnippetGroup * group = dynamic_cast(it);
diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h
index 84df7a6f..d8cf7756 100644
--- a/parts/snippet/snippet_widget.h
+++ b/parts/snippet/snippet_widget.h
@@ -9,11 +9,11 @@
 #ifndef __SNIPPET_WIDGET_H__
 #define __SNIPPET_WIDGET_H__
 
-#include 
-#include 
+#include 
+#include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -33,7 +33,7 @@ class KConfig;
 
 /**
 This is the widget which gets added to the right TreeToolView.
-It inherits KListView and QToolTip which is needed for showing the
+It inherits KListView and TQToolTip which is needed for showing the
 tooltips which contains the text of the snippet
 @author Robert Gruber
 */
@@ -46,7 +46,7 @@ class SnippetWidget : public KListView, public QToolTip
 public:
     SnippetWidget(SnippetPart *part);
     ~SnippetWidget();
-    QPtrList * getList() { return (&_list); }
+    TQPtrList * getList() { return (&_list); }
     void writeConfig();
     void initConfigOldVersion(KConfig *cfg);
     SnippetConfig *  getSnippetConfig() { return (&_SnippetConfig); }
@@ -58,18 +58,18 @@ private slots:
 
 protected:
     SnippetPart * m_part;
-    void maybeTip( const QPoint & );
-    bool acceptDrag (QDropEvent *event) const;
+    void maybeTip( const TQPoint & );
+    bool acceptDrag (TQDropEvent *event) const;
 
 private:
-    void insertIntoActiveView(QString text);
-    QString parseText(QString text, QString del="$");
-    bool showMultiVarDialog(QMap * map, QMap * mapSave,
+    void insertIntoActiveView(TQString text);
+    TQString parseText(TQString text, TQString del="$");
+    bool showMultiVarDialog(TQMap * map, TQMap * mapSave,
                             int & iWidth, int & iBasicHeight, int & iOneHeight);
-    QString showSingleVarDialog(QString var, QMap * mapSave, QRect & dlgSize);
+    TQString showSingleVarDialog(TQString var, TQMap * mapSave, TQRect & dlgSize);
 
-    QPtrList _list;
-    QMap _mapSaved;
+    TQPtrList _list;
+    TQMap _mapSaved;
     KConfig * _cfg;
     SnippetConfig _SnippetConfig;
 
@@ -81,9 +81,9 @@ public slots:
     void slotAddGroup();
 
 protected slots:
-    void showPopupMenu( QListViewItem * item, const QPoint & p, int );
-    void slotExecuted(QListViewItem * item);
-    void slotDropped(QDropEvent *e, QListViewItem *after);
+    void showPopupMenu( TQListViewItem * item, const TQPoint & p, int );
+    void slotExecuted(TQListViewItem * item);
+    void slotDropped(TQDropEvent *e, TQListViewItem *after);
 };
 
 
diff --git a/parts/snippet/snippetconfig.h b/parts/snippet/snippetconfig.h
index 89fe00e0..b1f089f4 100644
--- a/parts/snippet/snippetconfig.h
+++ b/parts/snippet/snippetconfig.h
@@ -9,8 +9,8 @@
 #ifndef SNIPPETCONFIG_H
 #define SNIPPETCONFIG_H
 
-#include 
-#include 
+#include 
+#include 
 
 
 /**
@@ -26,28 +26,28 @@ public:
 
   bool useToolTips() { return (bToolTip); };
   int getInputMethod() { return (iInputMethod); };
-  QString getDelimiter() { return (strDelimiter); };
-  QRect getSingleRect() { return (rSingle); };
-  QRect getMultiRect() { return (rMulti); };
+  TQString getDelimiter() { return (strDelimiter); };
+  TQRect getSingleRect() { return (rSingle); };
+  TQRect getMultiRect() { return (rMulti); };
   int getAutoOpenGroups() { return iAutoOpenGroups; }
   
   void setToolTips(bool b) { bToolTip=b; };
   void setInputMethod(int i) { iInputMethod=i; };
-  void setDelimiter(QString s) { strDelimiter=s; };
-  void setSingleRect(QRect r) {
-    rSingle = (r.isValid())?r:QRect();
+  void setDelimiter(TQString s) { strDelimiter=s; };
+  void setSingleRect(TQRect r) {
+    rSingle = (r.isValid())?r:TQRect();
   }
-  void setMultiRect(QRect r) {
-    rMulti = (r.isValid())?r:QRect();
+  void setMultiRect(TQRect r) {
+    rMulti = (r.isValid())?r:TQRect();
   }
   void setAutoOpenGroups(int autoopen) { iAutoOpenGroups = autoopen; }
 
 protected:
     bool bToolTip;
     int iInputMethod;
-    QString strDelimiter;
-    QRect rSingle;
-    QRect rMulti;
+    TQString strDelimiter;
+    TQRect rSingle;
+    TQRect rMulti;
     int iMultiBasicHeight;
     int iMultiCount;
     int iAutoOpenGroups;
diff --git a/parts/snippet/snippetitem.cpp b/parts/snippet/snippetitem.cpp
index 7548ad16..e2f08a2b 100644
--- a/parts/snippet/snippetitem.cpp
+++ b/parts/snippet/snippetitem.cpp
@@ -6,21 +6,21 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
-#include 
+#include 
 
 
 #include "snippetitem.h"
 
-SnippetItem::SnippetItem(QListView * parent, QString name, QString text )
-			: QListViewItem( parent, name )
+SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text )
+			: TQListViewItem( parent, name )
 {
   strName = name;
   strText = text;
   iParent = -1;
 }
 
-SnippetItem::SnippetItem(QListViewItem * parent, QString name, QString text)
-			: QListViewItem( parent, name )
+SnippetItem::SnippetItem(TQListViewItem * parent, TQString name, TQString text)
+			: TQListViewItem( parent, name )
 {
   strName = name;
   strText = text;
@@ -35,7 +35,7 @@ SnippetItem::~SnippetItem()
 /*!
     \fn SnippetItem::getName()
  */
-QString SnippetItem::getName()
+TQString SnippetItem::getName()
 {
   return strName;
 }
@@ -44,25 +44,25 @@ QString SnippetItem::getName()
 /*!
     \fn SnippetItem::getText
  */
-QString SnippetItem::getText()
+TQString SnippetItem::getText()
 {
   return strText;
 }
 
 
 /*!
-    \fn SnippetItem::setText(QString text)
+    \fn SnippetItem::setText(TQString text)
  */
-void SnippetItem::setText(QString text)
+void SnippetItem::setText(TQString text)
 {
   strText = text;
 }
 
 
 /*!
-    \fn SnippetItem::setName(QString name)
+    \fn SnippetItem::setName(TQString name)
  */
-void SnippetItem::setName(QString name)
+void SnippetItem::setName(TQString name)
 {
   strName = name;
 }
@@ -74,7 +74,7 @@ void SnippetItem::resetParent()
     iParent = group->getId();
 }
 
-SnippetItem * SnippetItem::findItemByName(QString name, QPtrList &list)
+SnippetItem * SnippetItem::findItemByName(TQString name, TQPtrList &list)
 {
   for ( SnippetItem * item = list.first(); item; item = list.next() ) {  //write the snippet-list
     if (item->getName() == name)
@@ -83,7 +83,7 @@ SnippetItem * SnippetItem::findItemByName(QString name, QPtrList &l
   return NULL;
 }
 
-SnippetGroup * SnippetItem::findGroupById(int id, QPtrList &list)
+SnippetGroup * SnippetItem::findGroupById(int id, TQPtrList &list)
 {
   for ( SnippetItem * item = list.first(); item; item = list.next() ) {  //write the snippet-list
     SnippetGroup * group = dynamic_cast(item);
@@ -100,7 +100,7 @@ Deklaration for class SnippetGroup
 
 int SnippetGroup::iMaxId = 1;
 
-SnippetGroup::SnippetGroup(QListView * parent, QString name, int id, QString lang)
+SnippetGroup::SnippetGroup(TQListView * parent, TQString name, int id, TQString lang)
  : SnippetItem(parent, name, "GROUP")
 {
     if (id > 0) {
diff --git a/parts/snippet/snippetitem.h b/parts/snippet/snippetitem.h
index ac6fb416..9cfe2ccf 100644
--- a/parts/snippet/snippetitem.h
+++ b/parts/snippet/snippetitem.h
@@ -21,50 +21,50 @@ This class represents one CodeSnippet-Item in the listview.
 It also holds the needed data for one snippet.
 @author Robert Gruber
 */
-class SnippetItem : public QListViewItem {
+class SnippetItem : public TQListViewItem {
 friend class SnippetGroup;
 public:
-    SnippetItem(QListViewItem * parent, QString name, QString text);
+    SnippetItem(TQListViewItem * parent, TQString name, TQString text);
 
     ~SnippetItem();
-    QString getName();
-    QString getText();
+    TQString getName();
+    TQString getText();
     int getParent() { return iParent; }
     void resetParent();
-    void setText(QString text);
-    void setName(QString name);
-    static SnippetItem * findItemByName(QString name, QPtrList &list);
-    static SnippetGroup * findGroupById(int id, QPtrList &list);
+    void setText(TQString text);
+    void setName(TQString name);
+    static SnippetItem * findItemByName(TQString name, TQPtrList &list);
+    static SnippetGroup * findGroupById(int id, TQPtrList &list);
     
 private:
-  SnippetItem(QListView * parent, QString name, QString text);
-  QString strName;
-  QString strText;
+  SnippetItem(TQListView * parent, TQString name, TQString text);
+  TQString strName;
+  TQString strText;
   int iParent;
 };
 
 /**
 This class represents one group in the listview.
 It is derived from SnippetItem in order to allow storing 
-it in the main QPtrList.
+it in the main TQPtrList.
 @author Robert Gruber
 */
 class SnippetGroup : public SnippetItem {
 public:
-    SnippetGroup(QListView * parent, QString name, int id, QString lang=i18n("All"));
+    SnippetGroup(TQListView * parent, TQString name, int id, TQString lang=i18n("All"));
     ~SnippetGroup();
 
     int getId() { return iId; }
     static int getMaxId() { return iMaxId; }
-    QString getLanguage() { return strLanguage; }
+    TQString getLanguage() { return strLanguage; }
     
     void setId(int id);
-    void setLanguage(QString lang) { strLanguage = lang; }
+    void setLanguage(TQString lang) { strLanguage = lang; }
 
 private:
     static int iMaxId;
     int iId;
-    QString strLanguage;
+    TQString strLanguage;
 };
 
 #endif
diff --git a/parts/snippet/snippetsettings.cpp b/parts/snippet/snippetsettings.cpp
index f0f9348b..8e559ba5 100644
--- a/parts/snippet/snippetsettings.cpp
+++ b/parts/snippet/snippetsettings.cpp
@@ -6,22 +6,22 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
-#include 
+#include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include "snippetsettings.h"
 #include "snippet_widget.h"
 
 
-SnippetSettings::SnippetSettings(QWidget *parent, const char *name)
+SnippetSettings::SnippetSettings(TQWidget *parent, const char *name)
  : SnippetSettingsBase(parent, name)
 {
   _widget = NULL;
 }
 
-SnippetSettings::SnippetSettings(SnippetWidget * w, QWidget *parent, const char *name)
+SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name)
  : SnippetSettingsBase(parent, name)
 {
   _cfg = w->getSnippetConfig();
diff --git a/parts/snippet/snippetsettings.h b/parts/snippet/snippetsettings.h
index ef4a019a..2f51a823 100644
--- a/parts/snippet/snippetsettings.h
+++ b/parts/snippet/snippetsettings.h
@@ -25,8 +25,8 @@ class SnippetSettings : public SnippetSettingsBase
 {
 Q_OBJECT
 public:
-    SnippetSettings(QWidget *parent = 0, const char *name = 0);
-    SnippetSettings(SnippetWidget * w, QWidget *parent = 0, const char *name = 0);
+    SnippetSettings(TQWidget *parent = 0, const char *name = 0);
+    SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0);
 
     ~SnippetSettings();
 
diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
index 7eb439da..332d97e3 100644
--- a/parts/texttools/texttoolspart.cpp
+++ b/parts/texttools/texttoolspart.cpp
@@ -11,7 +11,7 @@
 
 #include "texttoolspart.h"
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -28,7 +28,7 @@ typedef KDevGenericFactory TextToolsFactory;
 static const KDevPluginInfo data("kdevtexttools");
 K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) )
 
-TextToolsPart::TextToolsPart(QObject *parent, const char *name, const QStringList &)
+TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &)
     : KDevPlugin(&data, parent, name ? name : "TextToolsPart")
 {
     setInstance(TextToolsFactory::instance());
@@ -36,8 +36,8 @@ TextToolsPart::TextToolsPart(QObject *parent, const char *name, const QStringLis
 
     m_widget = 0;
     
-    connect( partController(), SIGNAL(activePartChanged(KParts::Part*)),
-             this, SLOT(activePartChanged(KParts::Part*)) );
+    connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
+             this, TQT_SLOT(activePartChanged(KParts::Part*)) );
 }
 
 
@@ -59,7 +59,7 @@ void TextToolsPart::createWidget()
 
     m_widget = new TextToolsWidget(this);
     m_widget->setCaption(i18n("Text Structure"));
-    QWhatsThis::add(m_widget, i18n("Text Structure
        "
+    TQWhatsThis::add(m_widget, i18n("Text Structure
        "
                                      "This browser shows the structure of the text."));
     mainWindow()->embedSelectView(m_widget, i18n("Text Structure"), i18n("Text structure"));
 }
@@ -75,7 +75,7 @@ void TextToolsPart::activePartChanged(KParts::Part *part)
     KParts::ReadWritePart *rwpart = dynamic_cast(part);
     if (!rwpart)
         return;
-    QString url = rwpart->url().url();
+    TQString url = rwpart->url().url();
 
     if (url.endsWith(".html")) {
         kdDebug(9030) << "set mode html" << endl;
diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h
index 7e7bf9c5..ce348f6d 100644
--- a/parts/texttools/texttoolspart.h
+++ b/parts/texttools/texttoolspart.h
@@ -12,7 +12,7 @@
 #ifndef _TEXTTOOLSPART_H_
 #define _TEXTTOOLSPART_H_
 
-#include 
+#include 
 #include 
 #include "kdevplugin.h"
 
@@ -24,7 +24,7 @@ class TextToolsPart : public KDevPlugin
     Q_OBJECT
 
 public:
-    TextToolsPart( QObject *parent, const char *name, const QStringList & );
+    TextToolsPart( TQObject *parent, const char *name, const TQStringList & );
     ~TextToolsPart();
 
 private slots:
@@ -33,7 +33,7 @@ private slots:
 private:
     void createWidget();
     
-    QGuardedPtr m_widget;
+    TQGuardedPtr m_widget;
 };
 
 #endif
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index ff85d0f0..630609c5 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -11,9 +11,9 @@
 
 #include "texttoolswidget.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -30,52 +30,52 @@
 class TextStructItem : public QListViewItem
 {
 public:
-    TextStructItem(QListView *parent)
-        : QListViewItem(parent)
+    TextStructItem(TQListView *parent)
+        : TQListViewItem(parent)
     {}
-    TextStructItem(QListViewItem *parent)
-        : QListViewItem(parent)
+    TextStructItem(TQListViewItem *parent)
+        : TQListViewItem(parent)
     {
-        QListViewItem *item = this;
+        TQListViewItem *item = this;
         while (item->nextSibling())
             item = item->nextSibling();
         if (item != this)
             moveItem(item);
     }
     
-    QString text(int) const
+    TQString text(int) const
     {
-        return extra.isNull()? tag : QString("%1: %2").arg(tag).arg(extra);
+        return extra.isNull()? tag : TQString("%1: %2").arg(tag).arg(extra);
     }
     TextStructItem *parentStructItem()
     { return static_cast(parent()); }
     
-    QString tag;
-    QString extra;
+    TQString tag;
+    TQString extra;
     int pos;
     int endpos;
 };
 
 
-TextToolsWidget::TextToolsWidget(TextToolsPart *part, QWidget *parent, const char *name)
+TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const char *name)
     : KListView(parent, name)
 {
-    setResizeMode(QListView::LastColumn);
+    setResizeMode(TQListView::LastColumn);
     setSorting(-1);
     header()->hide();
-    addColumn(QString::null);
+    addColumn(TQString::null);
 
     m_part = part;
 
-    m_timer = new QTimer(this);
-    connect( this, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int)),
-             this, SLOT(slotItemPressed(int,QListViewItem*)) );
-    //    connect( this, SIGNAL(doubleClicked(QListViewItem*)),
-    //             this, SLOT(slotItemPressed(int,QListViewItem*)) );
-    connect( this, SIGNAL(returnPressed(QListViewItem*)),
-             this, SLOT(slotReturnPressed(QListViewItem*)) );
-    connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-             this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) );
+    m_timer = new TQTimer(this);
+    connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+             this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) );
+    //    connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
+    //             this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)),
+             this, TQT_SLOT(slotReturnPressed(TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
+             this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) );
 }
 
 
@@ -83,7 +83,7 @@ TextToolsWidget::~TextToolsWidget()
 {}
 
 
-void TextToolsWidget::slotItemPressed(int button, QListViewItem *item)
+void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item)
 {
     if (!item)
         return;
@@ -107,7 +107,7 @@ void TextToolsWidget::slotItemPressed(int button, QListViewItem *item)
         }
         if (pos == searchedEndpos)
             break;
-        QChar ch = m_cachedText[pos];
+        TQChar ch = m_cachedText[pos];
         if (ch == '\n') {
             ++endline;
             endcol = 0;
@@ -119,7 +119,7 @@ void TextToolsWidget::slotItemPressed(int button, QListViewItem *item)
 
     KParts::Part *rwpart
         = dynamic_cast(m_part->partController()->activePart());
-    QWidget *view = m_part->partController()->activeWidget();
+    TQWidget *view = m_part->partController()->activeWidget();
 
     KTextEditor::ViewCursorInterface *cursorIface
         = dynamic_cast(view);
@@ -142,13 +142,13 @@ void TextToolsWidget::slotItemPressed(int button, QListViewItem *item)
 }
 
 
-void TextToolsWidget::slotReturnPressed(QListViewItem *item)
+void TextToolsWidget::slotReturnPressed(TQListViewItem *item)
 {
     slotItemPressed(LeftButton, item);
 }
 
 
-void TextToolsWidget::slotContextMenu(KListView *, QListViewItem *item, const QPoint &)
+void TextToolsWidget::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &)
 {
     if (!item)
         return;
@@ -165,14 +165,14 @@ void TextToolsWidget::stop()
     disconnect( m_timer );
     m_relevantTags.clear();
     m_emptyTags.clear();
-    m_cachedText = QString::null;
+    m_cachedText = TQString::null;
 }
 
 
 void TextToolsWidget::setMode(Mode mode, KParts::Part *part)
 {
-    connect( part, SIGNAL(textChanged()),
-             this, SLOT(startTimer()) );
+    connect( part, TQT_SIGNAL(textChanged()),
+             this, TQT_SLOT(startTimer()) );
     m_editIface = dynamic_cast(part);
     
     switch (mode) {
@@ -181,18 +181,18 @@ void TextToolsWidget::setMode(Mode mode, KParts::Part *part)
                        << "table" << "tr";
         m_emptyTags << "br" << "hr" << "img" << "input" << "p" << "meta";
         
-        connect( m_timer, SIGNAL(timeout()),
-                 this, SLOT(parseXML()) );
+        connect( m_timer, TQT_SIGNAL(timeout()),
+                 this, TQT_SLOT(parseXML()) );
         break;
     case Docbook:
         m_relevantTags << "chapter" << "sect1" << "sect2"
                        << "para" << "formalpara";
-        connect( m_timer, SIGNAL(timeout()),
-                 this, SLOT(parseXML()) );
+        connect( m_timer, TQT_SIGNAL(timeout()),
+                 this, TQT_SLOT(parseXML()) );
         break;
     case LaTeX:
-        connect( m_timer, SIGNAL(timeout()),
-                 this, SLOT(parseLaTeX()) );
+        connect( m_timer, TQT_SIGNAL(timeout()),
+                 this, TQT_SLOT(parseLaTeX()) );
         break;
     default: ;
     }
@@ -212,7 +212,7 @@ void TextToolsWidget::parseXML()
 {
     kdDebug(9030) << "Starting to parse XML" << endl;
     clear();
-    QString text = m_editIface->text();
+    TQString text = m_editIface->text();
     m_cachedText = text;
 
     TextStructItem *currentItem = new TextStructItem(this);
@@ -222,18 +222,18 @@ void TextToolsWidget::parseXML()
     
     int len = text.length();
     for (int pos=0; pos+1 < len; ++pos) {
-        QChar ch1 = text[pos];
-        QChar ch2 = text[pos+1];
+        TQChar ch1 = text[pos];
+        TQChar ch2 = text[pos+1];
 
         if (ch1 == '<' && ch2 == '?') {
             
             // PHP and other similar stuff
-            QString tag;
+            TQString tag;
             int endpos = pos+2;
             bool foundspace = false;
             while (endpos+1 < len) {
-                QChar ch3 = text[endpos];
-                QChar ch4 = text[endpos+1];
+                TQChar ch3 = text[endpos];
+                TQChar ch4 = text[endpos+1];
                 if ((ch3 == ' ' || ch3 == '\t' || ch3 == '\n') && !foundspace) {
                     tag = text.mid(pos+2, endpos-pos-2).lower();
                     foundspace = true;
@@ -255,11 +255,11 @@ void TextToolsWidget::parseXML()
         } else  if (ch1 == '<' && ch2 == '!') {
             
             // Processing instructions like !DOCTYPE
-            QString tag;
+            TQString tag;
             int endpos = pos+2;
             bool foundspace = false;
             while (endpos+1 < len) {
-                QChar ch3 = text[endpos];
+                TQChar ch3 = text[endpos];
                 if ((ch3 == ' ' || ch3 == '\t' || ch3 == '\n') && !foundspace) {
                     tag = text.mid(pos+2, endpos-pos-2).lower();
                     foundspace = true;
@@ -280,10 +280,10 @@ void TextToolsWidget::parseXML()
             
         } else if (ch1 == '<' && ch2 == '/') {
 
-            QString tag;
+            TQString tag;
             int endpos = pos+2;
             while (endpos < len) {
-                QChar ch3 = text[endpos];
+                TQChar ch3 = text[endpos];
                 if (ch3 == '>') {
                     tag = text.mid(pos+2, endpos-pos-2).lower();
                     break;
@@ -310,11 +310,11 @@ void TextToolsWidget::parseXML()
             
         } else if (ch1 == '<') {
 
-            QString tag;
+            TQString tag;
             int endpos = pos+1;
             bool foundspace = false;
             while (endpos < len) {
-                QChar ch3 = text[endpos];
+                TQChar ch3 = text[endpos];
                 if ((ch3 == ' ' || ch3 == '\t' || ch3 == '\n') && !foundspace) {
                     tag = text.mid(pos+1, endpos-pos-1).lower();
                     foundspace = true;
@@ -347,7 +347,7 @@ void TextToolsWidget::parseXML()
     }
 
     //    firstChild()->setOpen(true);
-    QListViewItemIterator it(this);
+    TQListViewItemIterator it(this);
     for (; it.current(); ++it)
         it.current()->setOpen(true);
 }
@@ -357,7 +357,7 @@ void TextToolsWidget::parseLaTeX()
 {
     kdDebug(9030) << "Starting to parse LaTeX" << endl;
     clear();
-    QString text = m_editIface->text();
+    TQString text = m_editIface->text();
     m_cachedText = text;
 
     TextStructItem *currentItem = new TextStructItem(this);
@@ -365,16 +365,16 @@ void TextToolsWidget::parseLaTeX()
     currentItem->pos = -1;
     currentItem->endpos = -1;
 
-    QString hierarchyLevels = "Root,chapter,section,subsection,subsubsection";
-    QRegExp re("\n[ \t]*s*\\\\(chapter|section|subsection|subsubsection)\\{([^}]*)\\}");
+    TQString hierarchyLevels = "Root,chapter,section,subsection,subsubsection";
+    TQRegExp re("\n[ \t]*s*\\\\(chapter|section|subsection|subsubsection)\\{([^}]*)\\}");
     
     int pos=0;
     for (;;) {
         pos = re.search(text, pos);
         if (pos == -1)
             break;
-        QString tag = re.cap(1);
-        QString title = re.cap(2);
+        TQString tag = re.cap(1);
+        TQString title = re.cap(2);
         kdDebug(9030) << "Match with " << tag << " and title " << title << endl;
         int level = hierarchyLevels.find(tag);
         while (currentItem->parent() && level <= hierarchyLevels.find(currentItem->tag))
@@ -392,7 +392,7 @@ void TextToolsWidget::parseLaTeX()
         pos = pos+re.matchedLength();
     }
 
-    QListViewItemIterator it(this);
+    TQListViewItemIterator it(this);
     for (; it.current(); ++it)
         it.current()->setOpen(true);
 }
diff --git a/parts/texttools/texttoolswidget.h b/parts/texttools/texttoolswidget.h
index 680adb34..4db3d2fe 100644
--- a/parts/texttools/texttoolswidget.h
+++ b/parts/texttools/texttoolswidget.h
@@ -13,7 +13,7 @@
 #define _TEXTTOOLSWIDGET_H_
 
 #include 
-#include 
+#include 
 
 class TextToolsPart;
 class QTimer;
@@ -28,16 +28,16 @@ class TextToolsWidget : public KListView
 public:
     enum Mode { HTML, Docbook, LaTeX };
     
-    TextToolsWidget( TextToolsPart *part, QWidget *parent=0, const char *name=0 );
+    TextToolsWidget( TextToolsPart *part, TQWidget *parent=0, const char *name=0 );
     ~TextToolsWidget();
 
     void setMode(Mode mode, KParts::Part *part);
     void stop();
 
 private slots:
-    void slotItemPressed(int button, QListViewItem *item);
-    void slotReturnPressed(QListViewItem *item);
-    void slotContextMenu(KListView *, QListViewItem *item, const QPoint &p);
+    void slotItemPressed(int button, TQListViewItem *item);
+    void slotReturnPressed(TQListViewItem *item);
+    void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p);
 
     void startTimer();
     void parseXML();
@@ -45,10 +45,10 @@ private slots:
 
 private:
     TextToolsPart *m_part;
-    QTimer *m_timer;
-    QString m_cachedText;
+    TQTimer *m_timer;
+    TQString m_cachedText;
     KTextEditor::EditInterface *m_editIface;
-    QStringList m_relevantTags, m_emptyTags;
+    TQStringList m_relevantTags, m_emptyTags;
 };
 
 #endif
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index fefdcd39..e1de784a 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -1,8 +1,8 @@
 #include "tipofday_part.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -24,7 +24,7 @@ static const KDevPluginInfo data("kdevtipofday");
 typedef KDevGenericFactory TipOfDayFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) )
 
-TipOfDayPart::TipOfDayPart(QObject *parent, const char *name, const QStringList &)
+TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &)
   : KDevPlugin(&data, parent, name ? name : "TipOfDayPart")
 {
   setInstance(TipOfDayFactory::instance());
@@ -34,17 +34,17 @@ TipOfDayPart::TipOfDayPart(QObject *parent, const char *name, const QStringList
   KAction *action;
 
   action = new KAction(i18n("&Tip of the Day"), "idea", 0,
-                       this, SLOT(showTip()), actionCollection(), "help_tipofday");
+                       this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday");
   action->setToolTip(i18n("A tip how to use KDevelop"));
   action->setWhatsThis(i18n("Tip of the day
        "
                             "Will display another good tip \n"
                             "contributed by KDevelop users."));
 
-  connect(core(), SIGNAL(coreInitialized()), this, SLOT(showOnStart()));
+  connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(showOnStart()));
 }
 
 
-QString TipOfDayPart::getFilename()
+TQString TipOfDayPart::getFilename()
 {
   KConfig * config = KApplication::kApplication()->config();
   config->setGroup("Tip of day plugin");
diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h
index 50eedadd..a60856e8 100644
--- a/parts/tipofday/tipofday_part.h
+++ b/parts/tipofday/tipofday_part.h
@@ -16,7 +16,7 @@ class TipOfDayPart : public KDevPlugin
 
 public:
    
-  TipOfDayPart(QObject *parent, const char *name, const QStringList &);
+  TipOfDayPart(TQObject *parent, const char *name, const TQStringList &);
 
 
 public slots:
@@ -25,7 +25,7 @@ public slots:
   void showOnStart();
 
 private:
-  QString getFilename();
+  TQString getFilename();
 
 };
 
diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h
index d01c4da7..045e7809 100644
--- a/parts/tools/addtooldlg.ui.h
+++ b/parts/tools/addtooldlg.ui.h
@@ -6,22 +6,22 @@
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
 
-#include 
+#include 
 #include 
 #include "kapplicationtree.h"
 
 void AddToolDialog::init()
 {
-    connect( tree, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(treeSelectionChanged(QListViewItem*)) );
+    connect( tree, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(treeSelectionChanged(TQListViewItem*)) );
     tree->header()->hide();
 }
 
-QString AddToolDialog::getApp()
+TQString AddToolDialog::getApp()
 {
     return execEdit->url() + " " + paramEdit->text();
 }
 
-void AddToolDialog::treeSelectionChanged( QListViewItem * lvi )
+void AddToolDialog::treeSelectionChanged( TQListViewItem * lvi )
 {
     KDevAppTreeListItem* item = dynamic_cast ( lvi );
     if ( !item || item->isDirectory() )
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index cbe3f3b4..c6517d8f 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -21,17 +21,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -58,16 +58,16 @@
 
 #include "kapplicationtree.h"
 
-template class QPtrList;
+template class TQPtrList;
 
-#define SORT_SPEC (QDir::DirsFirst | QDir::Name | QDir::IgnoreCase)
+#define SORT_SPEC (TQDir::DirsFirst | TQDir::Name | TQDir::IgnoreCase)
 
 
 // ----------------------------------------------------------------------
 
-KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const QString & name,
-                                    const QPixmap& pixmap, bool parse, bool dir, const QString& p, const QString& c, const QString& dE )
-    : QListViewItem( parent, name )
+KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const TQString & name,
+                                    const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE )
+    : TQListViewItem( parent, name )
 {
     init(pixmap, parse, dir, p, c, dE);
 }
@@ -75,9 +75,9 @@ KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const QString & nam
 
 // ----------------------------------------------------------------------
 
-KDevAppTreeListItem::KDevAppTreeListItem( QListViewItem* parent, const QString & name,
-                                    const QPixmap& pixmap, bool parse, bool dir, const QString& p, const QString& c, const QString& dE )
-    : QListViewItem( parent, name )
+KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* parent, const TQString & name,
+                                    const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE )
+    : TQListViewItem( parent, name )
 {
     init(pixmap, parse, dir, p, c, dE);
 }
@@ -85,7 +85,7 @@ KDevAppTreeListItem::KDevAppTreeListItem( QListViewItem* parent, const QString &
 
 // ----------------------------------------------------------------------
 
-void KDevAppTreeListItem::init(const QPixmap& pixmap, bool parse, bool dir, const QString& _path, const QString& _exec, const QString& _dEntry)
+void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry)
 {
     setPixmap(0, pixmap);
     parsed = parse;
@@ -101,10 +101,10 @@ void KDevAppTreeListItem::init(const QPixmap& pixmap, bool parse, bool dir, cons
 // ----------------------------------------------------------------------
 // Ensure that dirs are sorted in front of files and case is ignored
 
-QString KDevAppTreeListItem::key(int column, bool /*ascending*/) const
+TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const
 {
     if (directory)
-        return QString::fromLatin1(" ") + text(column).upper();
+        return TQString::fromLatin1(" ") + text(column).upper();
     else
         return text(column).upper();
 }
@@ -121,7 +121,7 @@ void KDevAppTreeListItem::setOpen( bool o )
         ((KDevApplicationTree *) parent())->addDesktopGroup( path, this );
         parsed = true;
     }
-    QListViewItem::setOpen( o );
+    TQListViewItem::setOpen( o );
 }
 
 bool KDevAppTreeListItem::isDirectory()
@@ -131,16 +131,16 @@ bool KDevAppTreeListItem::isDirectory()
 
 // ----------------------------------------------------------------------
 
-KDevApplicationTree::KDevApplicationTree( QWidget *parent, const char* name )
+KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name )
     : KListView( parent, name ), currentitem(0)
 {
     addColumn( i18n("Known Applications") );
     setRootIsDecorated( true );
 
-    addDesktopGroup( QString::null );
+    addDesktopGroup( TQString::null );
 
-    connect( this, SIGNAL( currentChanged(QListViewItem*) ), SLOT( slotItemHighlighted(QListViewItem*) ) );
-    connect( this, SIGNAL( selectionChanged(QListViewItem*) ), SLOT( slotSelectionChanged(QListViewItem*) ) );
+    connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) );
+    connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) );
 }
 
 // ----------------------------------------------------------------------
@@ -153,7 +153,7 @@ bool KDevApplicationTree::isDirSel()
 
 // ----------------------------------------------------------------------
 
-void KDevApplicationTree::addDesktopGroup( QString relPath, KDevAppTreeListItem *item)
+void KDevApplicationTree::addDesktopGroup( TQString relPath, KDevAppTreeListItem *item)
 {
    KServiceGroup::Ptr root = KServiceGroup::group(relPath);
    KServiceGroup::List list = root->entries();
@@ -162,11 +162,11 @@ void KDevApplicationTree::addDesktopGroup( QString relPath, KDevAppTreeListItem
    for( KServiceGroup::List::ConstIterator it = list.begin();
        it != list.end(); it++)
    {
-      QString icon;
-      QString text;
-      QString relPath;
-      QString exec;
-      QString dEntry;
+      TQString icon;
+      TQString text;
+      TQString relPath;
+      TQString exec;
+      TQString dEntry;
       bool isDir = false;
       KSycocaEntry *p = (*it);
       if (p->isType(KST_KService))
@@ -197,7 +197,7 @@ void KDevApplicationTree::addDesktopGroup( QString relPath, KDevAppTreeListItem
          continue;
       }
 
-      QPixmap pixmap = SmallIcon( icon );
+      TQPixmap pixmap = SmallIcon( icon );
 
       if (item)
          newItem = new KDevAppTreeListItem( item, text, pixmap, false, isDir,
@@ -213,7 +213,7 @@ void KDevApplicationTree::addDesktopGroup( QString relPath, KDevAppTreeListItem
 
 // ----------------------------------------------------------------------
 
-void KDevApplicationTree::slotItemHighlighted(QListViewItem* i)
+void KDevApplicationTree::slotItemHighlighted(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
@@ -230,7 +230,7 @@ void KDevApplicationTree::slotItemHighlighted(QListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void KDevApplicationTree::slotSelectionChanged(QListViewItem* i)
+void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
@@ -246,9 +246,9 @@ void KDevApplicationTree::slotSelectionChanged(QListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void KDevApplicationTree::resizeEvent( QResizeEvent * e)
+void KDevApplicationTree::resizeEvent( TQResizeEvent * e)
 {
-    setColumnWidth(0, width()-QApplication::style().pixelMetric(QStyle::PM_ScrollBarExtent));
+    setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent));
     KListView::resizeEvent(e);
 }
 
diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h
index 2e376ba7..60a35ac6 100644
--- a/parts/tools/kapplicationtree.h
+++ b/parts/tools/kapplicationtree.h
@@ -40,24 +40,24 @@ class KDevAppTreeListItem : public QListViewItem
 {
     bool parsed;
     bool directory;
-    QString path;
-    QString exec;
-    QString dEntry;
+    TQString path;
+    TQString exec;
+    TQString dEntry;
 
 protected:
-    QString key(int column, bool ascending) const;
+    TQString key(int column, bool ascending) const;
 
-    void init(const QPixmap& pixmap, bool parse, bool dir, const QString& _path, const QString& _exec, const QString& _dEntry);
+    void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry);
 
 public:
-    KDevAppTreeListItem( KListView* parent, const QString & name, const QPixmap& pixmap,
-                      bool parse, bool dir, const QString& p, const QString& c, const QString& dE );
-    KDevAppTreeListItem( QListViewItem* parent, const QString & name, const QPixmap& pixmap,
-                      bool parse, bool dir, const QString& p, const QString& c, const QString& dE );
+    KDevAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap,
+                      bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE );
+    KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap,
+                      bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE );
     bool isDirectory();
 
-    QString desktopEntryPath() const { return dEntry; }
-    QString executable() const { return exec; }
+    TQString desktopEntryPath() const { return dEntry; }
+    TQString executable() const { return exec; }
 
 protected:
     virtual void activate();
@@ -75,26 +75,26 @@ class KDevApplicationTree : public KListView
 {
     Q_OBJECT
 public:
-    KDevApplicationTree( QWidget *parent, const char* name = 0 );
+    KDevApplicationTree( TQWidget *parent, const char* name = 0 );
 
     /**
      * Add a group of .desktop/.kdelnk entries
      */
-    void addDesktopGroup( QString relPath, KDevAppTreeListItem *item = 0 );
+    void addDesktopGroup( TQString relPath, KDevAppTreeListItem *item = 0 );
 
     bool isDirSel();
 
 protected:
-    void resizeEvent( QResizeEvent *_ev );
+    void resizeEvent( TQResizeEvent *_ev );
     KDevAppTreeListItem* currentitem;
 
 public slots:
-    void slotItemHighlighted(QListViewItem* i);
-    void slotSelectionChanged(QListViewItem* i);
+    void slotItemHighlighted(TQListViewItem* i);
+    void slotSelectionChanged(TQListViewItem* i);
 
 signals:
-    void selected( const QString& _name, const QString& _exec );
-    void highlighted( const QString& _name, const  QString& _exec );
+    void selected( const TQString& _name, const TQString& _exec );
+    void highlighted( const TQString& _name, const  TQString& _exec );
 };
 
 /* ------------------------------------------------------------------------- */
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index f4285546..f04e4ae3 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -1,11 +1,11 @@
 #include "tools_part.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -37,9 +37,9 @@
 static const KDevPluginInfo data("kdevtools");
 K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) )
 
-QMap externalToolMenuEntries;
+TQMap externalToolMenuEntries;
 
-ToolsPart::ToolsPart(QObject *parent, const char *name, const QStringList &)
+ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
 	: KDevPlugin( &data, parent, name ? name : "ToolsPart")
 {
   setInstance(ToolsFactory::instance());
@@ -49,17 +49,17 @@ ToolsPart::ToolsPart(QObject *parent, const char *name, const QStringList &)
 	m_configProxy = new ConfigWidgetProxy( core() );
 	m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() );
 	m_configProxy->createGlobalConfigPage( i18n("External Tools"), EXTRATOOLSSETTINGS, info()->icon() );
-	connect( m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )),
-		this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) );
+	connect( m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
-  connect(core(), SIGNAL(coreInitialized()), this, SLOT(updateMenu()));
+  connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(updateMenu()));
 
-  connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-           this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
+  connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+           this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
   // Apparently action lists can only be plugged after the
   // xmlgui client has been registered
-  QTimer::singleShot(0, this, SLOT(updateToolsMenu()));
+  TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu()));
 }
 
 
@@ -68,42 +68,42 @@ ToolsPart::~ToolsPart()
 	delete m_configProxy;
 }
 
-void ToolsPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber )
+void ToolsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber )
 {
 	if ( pagenumber == TOOLSSETTINGS )
 	{
 		ToolsConfig *w = new ToolsConfig( page, "tools config widget" );
-		connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
-		connect(dlg, SIGNAL(destroyed()), this, SLOT(updateMenu()));
+		connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
+		connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateMenu()));
 	}
 	else if ( pagenumber == EXTRATOOLSSETTINGS )
 	{
 		ToolsConfigWidget *w2 = new ToolsConfigWidget( page, "tools config widget" );
-		connect(dlg, SIGNAL(okClicked()), w2, SLOT(accept()));
-		connect(dlg, SIGNAL(destroyed()), this, SLOT(updateToolsMenu()));
+		connect(dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept()));
+		connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateToolsMenu()));
 	}
 }
 
 void ToolsPart::updateMenu()
 {
-  QPtrList actions;
+  TQPtrList actions;
 
   unplugActionList("tools_list");
 
   KConfig *config = ToolsFactory::instance()->config();
   config->setGroup("Tools");
 
-  QStringList list = config->readListEntry("Tools");
-  for (QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+  TQStringList list = config->readListEntry("Tools");
+  for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it)
 	{
-	  QString name = *it;
+	  TQString name = *it;
 
 	  KDesktopFile df(name, true);
 	  if (df.readName().isNull())
 		continue;
 
 	  KAction *action = new KAction(df.readName(), df.readIcon(), 0,
-                                        this, SLOT(slotToolActivated()), (QObject*)0, name.latin1());
+                                        this, TQT_SLOT(slotToolActivated()), (TQObject*)0, name.latin1());
 	  actions.append(action);
 	}
 
@@ -113,48 +113,48 @@ void ToolsPart::updateMenu()
 
 void ToolsPart::slotToolActivated()
 {
-  QString df = sender()->name();
+  TQString df = sender()->name();
   kapp->startServiceByDesktopPath(df);
 }
 
-void ToolsPart::startCommand(QString cmdline, bool captured, QString fileName)
+void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
 {
     KTextEditor::Document * doc = dynamic_cast( partController()->activePart() );
 
     if ( fileName.isNull() && doc )
         fileName = doc->url().path();
     
-    QString projectDirectory;
+    TQString projectDirectory;
     if (project())
         projectDirectory = project()->projectDirectory();
     
-    QString selection = KDevEditorUtil::currentSelection( doc );
+    TQString selection = KDevEditorUtil::currentSelection( doc );
     if ( !selection.isEmpty() )
         selection = KShellProcess::quote( selection );
 
-    QString word = KDevEditorUtil::currentWord( doc );
+    TQString word = KDevEditorUtil::currentWord( doc );
     
     // This should really be checked before inserting into the popup
     if (cmdline.contains("%D") && projectDirectory.isNull())
         return;
-    cmdline.replace(QRegExp("%D"), projectDirectory);
+    cmdline.replace(TQRegExp("%D"), projectDirectory);
     
     if (cmdline.contains("%S") && fileName.isNull())
         return;
-    cmdline.replace(QRegExp("%S"), fileName);
+    cmdline.replace(TQRegExp("%S"), fileName);
 
     if (cmdline.contains("%T") && selection.isNull())
         return;
-    cmdline.replace(QRegExp("%T"), selection);
+    cmdline.replace(TQRegExp("%T"), selection);
 
     if (cmdline.contains("%W") && word.isNull())
         return;
-    cmdline.replace(QRegExp("%W"), word);
+    cmdline.replace(TQRegExp("%W"), word);
 
     if (captured)
     {
        if (KDevAppFrontend *appFrontend = extension("KDevelop/AppFrontend"))
-            appFrontend->startAppCommand(QString::QString(), cmdline, false);
+            appFrontend->startAppCommand(TQString::TQString(), cmdline, false);
     }
     else 
     {
@@ -169,19 +169,19 @@ void ToolsPart::updateToolsMenu()
 {
     KConfig *config = ToolsFactory::instance()->config();
     config->setGroup("External Tools");
-    QStringList l = config->readListEntry("Tool Menu");
+    TQStringList l = config->readListEntry("Tool Menu");
 
 
-    QPtrList actions;
-    QStringList::ConstIterator it;
+    TQPtrList actions;
+    TQStringList::ConstIterator it;
     for (it = l.begin(); it != l.end(); ++it) {
-        QString menutext = *it;
+        TQString menutext = *it;
         KConfig *config = ToolsFactory::instance()->config();
         config->setGroup("Tool Menu " + menutext);
         bool isdesktopfile = config->readBoolEntry("DesktopFile");
         KAction *action = new KAction(*it, 0,
-                                      this, SLOT(toolsMenuActivated()),
-                                      (QObject*) 0, menutext.utf8());
+                                      this, TQT_SLOT(toolsMenuActivated()),
+                                      (TQObject*) 0, menutext.utf8());
         if (isdesktopfile) {
             KDesktopFile df(config->readPathEntry("CommandLine"));
             action->setIcon(df.readIcon());
@@ -194,7 +194,7 @@ void ToolsPart::updateToolsMenu()
 }
 
 
-void ToolsPart::contextMenu(QPopupMenu *popup, const Context *context)
+void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context)
 {
     if (!context->hasType( Context::FileContext ))
         return;
@@ -206,28 +206,28 @@ void ToolsPart::contextMenu(QPopupMenu *popup, const Context *context)
     
     KConfig *config = ToolsFactory::instance()->config();
     config->setGroup("External Tools");
-    QStringList filecontextList = config->readListEntry("File Context");
+    TQStringList filecontextList = config->readListEntry("File Context");
 
     if (URLUtil::isDirectory(m_contextFileName)) {
-        QStringList l = config->readListEntry("Dir Context");
-        QStringList::ConstIterator it;
+        TQStringList l = config->readListEntry("Dir Context");
+        TQStringList::ConstIterator it;
         for (it = l.begin(); it != l.end(); ++it)
-            externalToolMenuEntries.insert( popup->insertItem( (*it), this, SLOT(dirContextActivated(int)) ), (*it) );
+            externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(dirContextActivated(int)) ), (*it) );
     } else {
-        QStringList l = config->readListEntry("File Context");
-        QStringList::ConstIterator it;
+        TQStringList l = config->readListEntry("File Context");
+        TQStringList::ConstIterator it;
         for (it = l.begin(); it != l.end(); ++it)
-            externalToolMenuEntries.insert( popup->insertItem( (*it), this, SLOT(fileContextActivated(int))  ), (*it) );
+            externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(fileContextActivated(int))  ), (*it) );
     }
 }
 
 
 void ToolsPart::toolsMenuActivated()
 {
-    QString menutext = sender()->name();
+    TQString menutext = sender()->name();
     KConfig *config = ToolsFactory::instance()->config();
     config->setGroup("Tool Menu " + menutext);
-    QString cmdline = config->readPathEntry("CommandLine");
+    TQString cmdline = config->readPathEntry("CommandLine");
     bool isdesktopfile = config->readBoolEntry("DesktopFile");
     bool captured = config->readBoolEntry("Captured");
     kdDebug() << "tools:" << "activating " << menutext
@@ -236,17 +236,17 @@ void ToolsPart::toolsMenuActivated()
     if (isdesktopfile)
         kapp->startServiceByDesktopPath(cmdline);
     else
-        startCommand(cmdline, captured, QString::null);
+        startCommand(cmdline, captured, TQString::null);
 }
 
 
 void ToolsPart::fileContextActivated(int id)
 {
-    QString menutext = externalToolMenuEntries[ id ];
+    TQString menutext = externalToolMenuEntries[ id ];
 
     KConfig *config = ToolsFactory::instance()->config();
     config->setGroup("File Context " + menutext);
-    QString cmdline = config->readPathEntry("CommandLine");
+    TQString cmdline = config->readPathEntry("CommandLine");
     bool captured = config->readBoolEntry("Captured");
     kdDebug() << "filecontext:" << "activating " << menutext
               << " with cmdline " << cmdline
@@ -257,11 +257,11 @@ void ToolsPart::fileContextActivated(int id)
 
 void ToolsPart::dirContextActivated(int id)
 {
-    QString menutext = externalToolMenuEntries[ id ];
+    TQString menutext = externalToolMenuEntries[ id ];
 
     KConfig *config = ToolsFactory::instance()->config();
     config->setGroup("Dir Context " + menutext);
-    QString cmdline = config->readPathEntry("CommandLine");
+    TQString cmdline = config->readPathEntry("CommandLine");
     bool captured = config->readBoolEntry("Captured");
     kdDebug() << "dircontext:" << "activating " << menutext
               << "with cmdline " << cmdline
diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h
index b0d82c99..172b11b6 100644
--- a/parts/tools/tools_part.h
+++ b/parts/tools/tools_part.h
@@ -7,7 +7,7 @@
 #define __KDEVPART_TOOLS_H__
 
 
-#include 
+#include 
 #include 
 #include 
 
@@ -26,27 +26,27 @@ class ToolsPart : public KDevPlugin
 
 public:
 
-    ToolsPart( QObject *parent, const char *name, const QStringList & );
+    ToolsPart( TQObject *parent, const char *name, const TQStringList & );
     ~ToolsPart();
 
 
 private slots:
-	void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber );
+	void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber );
     void updateMenu();
 
 	void slotToolActivated();
 
-    void contextMenu(QPopupMenu *popup, const Context *context);
+    void contextMenu(TQPopupMenu *popup, const Context *context);
     void updateToolsMenu();
     void toolsMenuActivated();
     void fileContextActivated(int id);
     void dirContextActivated(int id);
       
 private:
-    void startCommand(QString cmdline, bool captured, QString fileName);
+    void startCommand(TQString cmdline, bool captured, TQString fileName);
 
-    QPopupMenu *m_contextPopup;
-    QString m_contextFileName;
+    TQPopupMenu *m_contextPopup;
+    TQString m_contextFileName;
 	ConfigWidgetProxy * m_configProxy;
   };
 
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index 523fe388..c8b4566f 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -1,11 +1,11 @@
 #include "toolsconfig.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -17,63 +17,63 @@
 #include "kapplicationtree.h"
 
 
-ToolsConfig::ToolsConfig(QWidget *parent, const char *name)
-    : QWidget(parent, name), _tree(0)
+ToolsConfig::ToolsConfig(TQWidget *parent, const char *name)
+    : TQWidget(parent, name), _tree(0)
 {
   _entries.setAutoDelete(true);
 }
 
 
-void ToolsConfig::showEvent(QShowEvent *e)
+void ToolsConfig::showEvent(TQShowEvent *e)
 {
-  QWidget::showEvent(e);
+  TQWidget::showEvent(e);
 
   if (!_tree)
     {
-      QApplication::setOverrideCursor(Qt::waitCursor);
+      TQApplication::setOverrideCursor(Qt::waitCursor);
 
-      QHBoxLayout *hbox = new QHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+      TQHBoxLayout *hbox = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-      QVBoxLayout *vbox = new QVBoxLayout(hbox);
+      TQVBoxLayout *vbox = new TQVBoxLayout(hbox);
       _tree = new KDevApplicationTree(this);
       _tree->header()->hide();
-      QLabel *l = new QLabel(_tree, i18n("&Applications:"), this);
+      TQLabel *l = new TQLabel(_tree, i18n("&Applications:"), this);
       l->show();
       _tree->show();
 
       vbox->addWidget(l);
       vbox->addWidget(_tree);
 
-      vbox = new QVBoxLayout(hbox);
+      vbox = new TQVBoxLayout(hbox);
 
-      _toList = new QPushButton(QApplication::reverseLayout() ? "<<" : ">>", this);
+      _toList = new TQPushButton(TQApplication::reverseLayout() ? "<<" : ">>", this);
       _toList->show();
       vbox->addWidget(_toList);
 
-      connect(_toList, SIGNAL(clicked()), this, SLOT(toList()));
+      connect(_toList, TQT_SIGNAL(clicked()), this, TQT_SLOT(toList()));
 
-      _toTree = new QPushButton(QApplication::reverseLayout() ? ">>" : "<<", this);
+      _toTree = new TQPushButton(TQApplication::reverseLayout() ? ">>" : "<<", this);
       _toTree->show();
       vbox->addWidget(_toTree);
 
-      connect(_toTree, SIGNAL(clicked()), this, SLOT(toTree()));
+      connect(_toTree, TQT_SIGNAL(clicked()), this, TQT_SLOT(toTree()));
 
-      vbox = new QVBoxLayout(hbox);
-      _list = new QListBox(this);
-      l = new QLabel(_list, i18n("&Tools menu:"), this);
+      vbox = new TQVBoxLayout(hbox);
+      _list = new TQListBox(this);
+      l = new TQLabel(_list, i18n("&Tools menu:"), this);
       l->show();
       _list->show();
       vbox->addWidget(l);
       vbox->addWidget(_list);
 
-      QApplication::restoreOverrideCursor();
+      TQApplication::restoreOverrideCursor();
     }
 
   fill();
   checkButtons();
 
-  connect(_tree, SIGNAL(selectionChanged()), this, SLOT(checkButtons()));
-  connect(_list, SIGNAL(selectionChanged()), this, SLOT(checkButtons()));
+  connect(_tree, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons()));
+  connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons()));
 }
 
 
@@ -91,14 +91,14 @@ void ToolsConfig::fill()
   KConfig *config = ToolsFactory::instance()->config();
   config->setGroup("Tools");
 
-  QStringList list = config->readListEntry("Tools");
+  TQStringList list = config->readListEntry("Tools");
 
-  for (QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+  for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it)
 	add(*it);
 }
 
 
-void ToolsConfig::add(const QString &desktopFile)
+void ToolsConfig::add(const TQString &desktopFile)
 {
   KDesktopFile df(desktopFile, true);
   if (df.readName().isEmpty())
@@ -141,8 +141,8 @@ void ToolsConfig::accept()
   KConfig *config = ToolsFactory::instance()->config();
   config->setGroup("Tools");
 
-  QStringList l;
-  QPtrListIterator it(_entries);
+  TQStringList l;
+  TQPtrListIterator it(_entries);
     for ( ; it.current(); ++it)
 	  l.append(it.current()->desktopFile);
 
@@ -157,7 +157,7 @@ void ToolsConfig::updateList()
 
   _list->clear();
 
-  QPtrListIterator it(_entries);
+  TQPtrListIterator it(_entries);
   for ( ; it.current(); ++it)
 	_list->insertItem(it.current()->icon, it.current()->name);
 
diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h
index 5dc87d70..46855256 100644
--- a/parts/tools/toolsconfig.h
+++ b/parts/tools/toolsconfig.h
@@ -2,9 +2,9 @@
 #define __TOOLS_CONFIG_H__
 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 
 class QListBox;
@@ -17,9 +17,9 @@ public:
 
   Entry() {};
 
-  QString name;
-  QString desktopFile;
-  QPixmap icon;
+  TQString name;
+  TQString desktopFile;
+  TQPixmap icon;
 
 };
 
@@ -30,7 +30,7 @@ class ToolsConfig : public QWidget
 
 public:
 
-    ToolsConfig(QWidget *parent = 0, const char *name = 0);
+    ToolsConfig(TQWidget *parent = 0, const char *name = 0);
 
 
 public slots:
@@ -40,11 +40,11 @@ public slots:
 
 protected:
 
-    void showEvent(QShowEvent *);
+    void showEvent(TQShowEvent *);
 
     void fill();
-    void add(const QString &desktopFile);
-    void remove(const QString &desktopFile);
+    void add(const TQString &desktopFile);
+    void remove(const TQString &desktopFile);
 
 
 private slots:
@@ -60,10 +60,10 @@ private slots:
 private:
 
     KDevApplicationTree *_tree;
-    QListBox *_list;
-    QPushButton *_toList, *_toTree;
+    TQListBox *_list;
+    TQPushButton *_toList, *_toTree;
 
-    QPtrList _entries;
+    TQPtrList _entries;
 
   };
 
diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp
index 72b102be..b4643b26 100644
--- a/parts/tools/toolsconfigwidget.cpp
+++ b/parts/tools/toolsconfigwidget.cpp
@@ -11,9 +11,9 @@
 
 #include "toolsconfigwidget.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -31,8 +31,8 @@
 
 struct ToolsConfigEntry
 {
-    QString menutext;
-    QString cmdline;
+    TQString menutext;
+    TQString cmdline;
     bool isdesktopfile;
     bool captured;
     bool isEmpty() const {
@@ -41,7 +41,7 @@ struct ToolsConfigEntry
 };
 
 
-ToolsConfigWidget::ToolsConfigWidget(QWidget *parent, const char *name)
+ToolsConfigWidget::ToolsConfigWidget(TQWidget *parent, const char *name)
     : ToolsConfigWidgetBase(parent, name)
 {
     m_toolsmenuEntries.setAutoDelete(true);
@@ -61,16 +61,16 @@ ToolsConfigWidget::~ToolsConfigWidget()
 {}
 
 
-void ToolsConfigWidget::readGroup(const QString &group, QDict *entryDict)
+void ToolsConfigWidget::readGroup(const TQString &group, TQDict *entryDict)
 {
     KConfig *config = ToolsFactory::instance()->config();
     config->setGroup("External Tools");
-    QStringList list = config->readListEntry(group);
+    TQStringList list = config->readListEntry(group);
 
-    QStringList::ConstIterator it;
+    TQStringList::ConstIterator it;
     for (it = list.begin(); it != list.end(); ++it) {
         config->setGroup(group + " " + (*it));
-        QString cmdline = config->readPathEntry("CommandLine");
+        TQString cmdline = config->readPathEntry("CommandLine");
         bool isdesktopfile = config->readBoolEntry("DesktopFile");
         bool captured = config->readBoolEntry("Captured");
         ToolsConfigEntry *entry = new ToolsConfigEntry;
@@ -83,13 +83,13 @@ void ToolsConfigWidget::readGroup(const QString &group, QDict
 }
 
 
-void ToolsConfigWidget::storeGroup(const QString &group, const QDict &entryDict)
+void ToolsConfigWidget::storeGroup(const TQString &group, const TQDict &entryDict)
 {
     KConfig *config = ToolsFactory::instance()->config();
 
-    QStringList list;
+    TQStringList list;
 
-    QDictIterator it(entryDict);
+    TQDictIterator it(entryDict);
     for (; it.current(); ++it) {
         ToolsConfigEntry *entry = it.current();
         list << entry->menutext;
@@ -105,11 +105,11 @@ void ToolsConfigWidget::storeGroup(const QString &group, const QDict &entryDict)
+void ToolsConfigWidget::fillListBox(TQListBox *lb, const TQDict &entryDict)
 {
     lb->clear();
 
-    QDictIterator it(entryDict);
+    TQDictIterator it(entryDict);
     for (; it.current(); ++it) {
         ToolsConfigEntry *entry = it.current();
         if (entry->isdesktopfile) {
@@ -122,9 +122,9 @@ void ToolsConfigWidget::fillListBox(QListBox *lb, const QDict
 }
 
 
-bool ToolsConfigWidget::addEntry(ToolsConfigEntry *entry, QDict *entryDict)
+bool ToolsConfigWidget::addEntry(ToolsConfigEntry *entry, TQDict *entryDict)
 {
-    QString menutext = entry->menutext;
+    TQString menutext = entry->menutext;
     if (entryDict->find(menutext)) {
         delete entry;
         KMessageBox::sorry(this, i18n("An entry with this title exists already."));
@@ -185,7 +185,7 @@ void ToolsConfigWidget::toolsmenuaddClicked()
 
 void ToolsConfigWidget::toolsmenuremoveClicked()
 {
-    QString menutext = toolsmenuBox->currentText();
+    TQString menutext = toolsmenuBox->currentText();
     m_toolsmenuEntries.remove(menutext);
     updateListBoxes();
 }
@@ -213,7 +213,7 @@ void ToolsConfigWidget::filecontextaddClicked()
 
 void ToolsConfigWidget::filecontextremoveClicked()
 {
-    QString menutext = filecontextBox->currentText();
+    TQString menutext = filecontextBox->currentText();
     m_filecontextEntries.remove(menutext);
     updateListBoxes();
 }
@@ -240,21 +240,21 @@ void ToolsConfigWidget::dircontextaddClicked()
 
 void ToolsConfigWidget::dircontextremoveClicked()
 {
-    QString menutext = dircontextBox->currentText();
+    TQString menutext = dircontextBox->currentText();
     m_dircontextEntries.remove(menutext);
     updateListBoxes();
 }
 
 
-bool ToolsConfigWidget::eventFilter(QObject *o, QEvent *e)
+bool ToolsConfigWidget::eventFilter(TQObject *o, TQEvent *e)
 {
-    if (e->type() == QEvent::DragEnter || e->type() == QEvent::DragMove) {
-        QDragMoveEvent *dme = static_cast(e);
+    if (e->type() == TQEvent::DragEnter || e->type() == TQEvent::DragMove) {
+        TQDragMoveEvent *dme = static_cast(e);
         if (KURLDrag::canDecode(dme))
             dme->accept();
         return true;
-    } else if (e->type() == QEvent::Drop) {
-        QDropEvent *de = static_cast(e);
+    } else if (e->type() == TQEvent::Drop) {
+        TQDropEvent *de = static_cast(e);
         KURL::List fileList;
         if (KURLDrag::decode(de, fileList)) {
             KURL::List::ConstIterator it;
diff --git a/parts/tools/toolsconfigwidget.h b/parts/tools/toolsconfigwidget.h
index 51e1b005..b58c9ea4 100644
--- a/parts/tools/toolsconfigwidget.h
+++ b/parts/tools/toolsconfigwidget.h
@@ -14,7 +14,7 @@
 
 #include "toolsconfigwidgetbase.h"
 #include "tools_part.h"
-#include 
+#include 
 
 
 struct ToolsConfigEntry;
@@ -25,7 +25,7 @@ class ToolsConfigWidget : public ToolsConfigWidgetBase
     Q_OBJECT
     
 public:
-    ToolsConfigWidget(QWidget *parent=0, const char *name=0);
+    ToolsConfigWidget(TQWidget *parent=0, const char *name=0);
     ~ToolsConfigWidget();
 
 public slots:
@@ -39,20 +39,20 @@ private:
     virtual void dircontextaddClicked();
     virtual void dircontextremoveClicked();
 
-    virtual bool eventFilter(QObject *o, QEvent *e);
+    virtual bool eventFilter(TQObject *o, TQEvent *e);
 
-    void readGroup(const QString &group, QDict *entryDict);
-    void storeGroup(const QString &group, const QDict &entryDict);
-    void fillListBox(QListBox *lb, const QDict &entryDict);
-    bool addEntry(ToolsConfigEntry *entry, QDict *entryDict);
+    void readGroup(const TQString &group, TQDict *entryDict);
+    void storeGroup(const TQString &group, const TQDict &entryDict);
+    void fillListBox(TQListBox *lb, const TQDict &entryDict);
+    bool addEntry(ToolsConfigEntry *entry, TQDict *entryDict);
 
     void readConfig();
     void storeConfig();
     void updateListBoxes();
     
-    QDict m_toolsmenuEntries;
-    QDict m_filecontextEntries;
-    QDict m_dircontextEntries;
+    TQDict m_toolsmenuEntries;
+    TQDict m_filecontextEntries;
+    TQDict m_dircontextEntries;
     
     ToolsPart *m_part;
 };
diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
index 914c03ba..855f4daf 100644
--- a/parts/uimode/uichooser_part.cpp
+++ b/parts/uimode/uichooser_part.cpp
@@ -1,6 +1,6 @@
 #include "uichooser_part.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -18,15 +18,15 @@ typedef KDevGenericFactory UIChooserFactory;
 static const KDevPluginInfo data("kdevuichooser");
 K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) )
 
-UIChooserPart::UIChooserPart(QObject *parent, const char *name, const QStringList &)
+UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &)
   : KDevPlugin( &data, parent, name ? name : "UIChooserPart")
 {
 	setInstance(UIChooserFactory::instance());
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createGlobalConfigPage( i18n("User Interface"), UICHOOSERSETTINGSPAGE, info()->icon() );
-	connect( _configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )),
-		this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )) );
+	connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 }
 
 
@@ -35,14 +35,14 @@ UIChooserPart::~UIChooserPart()
 	delete _configProxy;
 }
 
-void UIChooserPart::insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int pagenumber )
+void UIChooserPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber )
 {
 	kdDebug() << k_funcinfo << endl;
 
 	if ( pagenumber == UICHOOSERSETTINGSPAGE )
 	{
 		UIChooserWidget * w = new UIChooserWidget( this, page, "UIChooser widget" );
-		connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) );
+		connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 	}
 }
 
diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h
index e4633441..5f0826fa 100644
--- a/parts/uimode/uichooser_part.h
+++ b/parts/uimode/uichooser_part.h
@@ -17,11 +17,11 @@ class UIChooserPart : public KDevPlugin
   Q_OBJECT
 
 public:
-  UIChooserPart(QObject *parent, const char *name, const QStringList &);
+  UIChooserPart(TQObject *parent, const char *name, const TQStringList &);
   ~UIChooserPart();
   
 private slots:
-  void insertConfigWidget( const KDialogBase * dlg, QWidget * page, unsigned int );
+  void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int );
   
 private:
   ConfigWidgetProxy * _configProxy;
diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp
index 5e6ffbf7..2fe6b919 100644
--- a/parts/uimode/uichooser_widget.cpp
+++ b/parts/uimode/uichooser_widget.cpp
@@ -15,9 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -27,7 +27,7 @@
 #include "kdevmainwindow.h"
 #include "uichooser_widget.h"
 
-UIChooserWidget::UIChooserWidget( UIChooserPart * part, QWidget *parent, const char *name)
+UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name)
   : UIChooser(parent, name)
   ,m_part(part), _lastMode(0L)
 {
diff --git a/parts/uimode/uichooser_widget.h b/parts/uimode/uichooser_widget.h
index 5faba3af..e9f7a7ed 100644
--- a/parts/uimode/uichooser_widget.h
+++ b/parts/uimode/uichooser_widget.h
@@ -2,7 +2,7 @@
 #define __UICHOOSER_WIDGET_H__
 
 
-#include 
+#include 
 
 
 #include "uichooser.h"
@@ -20,7 +20,7 @@ public:
     _NeverShowTabs          = 2
   };
 
-  UIChooserWidget( UIChooserPart * part, QWidget *parent=0, const char *name=0 );
+  UIChooserWidget( UIChooserPart * part, TQWidget *parent=0, const char *name=0 );
 
 public slots:
   void accept();
@@ -35,7 +35,7 @@ private slots:
 
 private:
   UIChooserPart* m_part;
-  QWidget * _lastMode;
+  TQWidget * _lastMode;
 };
 
 
diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp
index 405d78dd..67c05c56 100644
--- a/parts/valgrind/valgrind_dialog.cpp
+++ b/parts/valgrind/valgrind_dialog.cpp
@@ -1,7 +1,7 @@
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -16,7 +16,7 @@
 #include "valgrind_dialog.moc"
 
 
-ValgrindDialog::ValgrindDialog( Type type, QWidget* parent )
+ValgrindDialog::ValgrindDialog( Type type, TQWidget* parent )
   : KDialogBase( parent, "valgrind dialog", true, i18n("Valgrind Memory Check"), Ok|Cancel ),
   m_type(type)
 {
@@ -25,10 +25,10 @@ ValgrindDialog::ValgrindDialog( Type type, QWidget* parent )
   w->executableEdit->setFocus();
   w->stack->raiseWidget(m_type);
   setMainWidget( w );
-  connect( w->executableEdit->lineEdit(),  SIGNAL( textChanged( const QString &)), this, SLOT( valgrindTextChanged()));
-  connect( w->valExecutableEdit->lineEdit(), SIGNAL( textChanged( const QString &)), this, SLOT( valgrindTextChanged()));
-  connect( w->ctExecutableEdit->lineEdit(),  SIGNAL( textChanged( const QString &)), this, SLOT( valgrindTextChanged()));
-  connect( w->kcExecutableEdit->lineEdit(), SIGNAL( textChanged( const QString &)), this, SLOT( valgrindTextChanged()));
+  connect( w->executableEdit->lineEdit(),  TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged()));
+  connect( w->valExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged()));
+  connect( w->ctExecutableEdit->lineEdit(),  TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged()));
+  connect( w->kcExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged()));
   enableButtonOK( false );
 }
 
@@ -45,34 +45,34 @@ void ValgrindDialog::valgrindTextChanged()
         enableButtonOK( !w->executableEdit->lineEdit()->text().isEmpty() &&  !w->ctExecutableEdit->lineEdit()->text().isEmpty() && !w->kcExecutableEdit->lineEdit()->text().isEmpty() );
 }
 
-QString ValgrindDialog::executableName() const
+TQString ValgrindDialog::executableName() const
 {
   return w->executableEdit->url();
 }
 
-void ValgrindDialog::setExecutable( const QString& url )
+void ValgrindDialog::setExecutable( const TQString& url )
 {
   w->executableEdit->setURL( url );
 }
 
-QString ValgrindDialog::valExecutable() const
+TQString ValgrindDialog::valExecutable() const
 {
   return w->valExecutableEdit->url();
 }
 
-QString ValgrindDialog::parameters() const
+TQString ValgrindDialog::parameters() const
 {
   return w->paramEdit->text();
 }
 
-void ValgrindDialog::setParameters( const QString& params )
+void ValgrindDialog::setParameters( const TQString& params )
 {
   w->paramEdit->setText( params );
 }
 
-void ValgrindDialog::setValExecutable( const QString& ve )
+void ValgrindDialog::setValExecutable( const TQString& ve )
 {
-  QString vUrl = ve;
+  TQString vUrl = ve;
   if ( vUrl.isEmpty() ) {
     vUrl = KStandardDirs::findExe( "valgrind" );
   }
@@ -86,14 +86,14 @@ void ValgrindDialog::setValExecutable( const QString& ve )
   }
 }
 
-static const QString memCheckParam( "--tool=memcheck" );
-static const QString leakCheckParam( "--leak-check=yes" );
-static const QString reachableParam( "--show-reachable=yes" );
-static const QString childrenParam( "--trace-children=yes" );
+static const TQString memCheckParam( "--tool=memcheck" );
+static const TQString leakCheckParam( "--leak-check=yes" );
+static const TQString reachableParam( "--show-reachable=yes" );
+static const TQString childrenParam( "--trace-children=yes" );
 
-QString ValgrindDialog::valParams() const
+TQString ValgrindDialog::valParams() const
 {
-  QString params = w->valParamEdit->text();
+  TQString params = w->valParamEdit->text();
   if (isNewValgrindVersion())
     params += " " + memCheckParam;
   if ( w->memleakBox->isChecked() )
@@ -106,9 +106,9 @@ QString ValgrindDialog::valParams() const
   return params;
 }
 
-void ValgrindDialog::setValParams( const QString& params )
+void ValgrindDialog::setValParams( const TQString& params )
 {
-  QString myParams = params;
+  TQString myParams = params;
   if ( myParams.contains( leakCheckParam ) )
     w->memleakBox->setChecked( true );
   if ( myParams.contains( reachableParam ) )
@@ -117,22 +117,22 @@ void ValgrindDialog::setValParams( const QString& params )
     w->childrenBox->setChecked( true );
   w->init();
 
-  myParams = myParams.replace( QRegExp( memCheckParam ), "" );
-  myParams = myParams.replace( QRegExp( leakCheckParam ), "" );
-  myParams = myParams.replace( QRegExp( reachableParam ), "" );
-  myParams = myParams.replace( QRegExp( childrenParam ), "" );
+  myParams = myParams.replace( TQRegExp( memCheckParam ), "" );
+  myParams = myParams.replace( TQRegExp( leakCheckParam ), "" );
+  myParams = myParams.replace( TQRegExp( reachableParam ), "" );
+  myParams = myParams.replace( TQRegExp( childrenParam ), "" );
   myParams = myParams.stripWhiteSpace();
   w->valParamEdit->setText( myParams );
 }
 
-QString ValgrindDialog::ctExecutable() const
+TQString ValgrindDialog::ctExecutable() const
 {
   return w->ctExecutableEdit->url();
 }
 
-void ValgrindDialog::setCtExecutable( const QString& ce )
+void ValgrindDialog::setCtExecutable( const TQString& ce )
 {
-  QString vUrl = ce;
+  TQString vUrl = ce;
   if ( vUrl.isEmpty() ) {
     vUrl = KStandardDirs::findExe( "valgrind" );
   }
@@ -146,18 +146,18 @@ void ValgrindDialog::setCtExecutable( const QString& ce )
   }
 }
 
-QString ValgrindDialog::ctParams() const
+TQString ValgrindDialog::ctParams() const
 {
-  QString params = w->ctParamEdit->text();
+  TQString params = w->ctParamEdit->text();
   if ( w->ctChildrenBox->isChecked() )
     params += " " + childrenParam;
 
   return params;
 }
 
-void ValgrindDialog::setCtParams( const QString& params )
+void ValgrindDialog::setCtParams( const TQString& params )
 {
-  QString myParams = params;
+  TQString myParams = params;
   //force --tool=callgrind if no params are given
   if (myParams.isEmpty())
     myParams = "--tool=callgrind";
@@ -165,19 +165,19 @@ void ValgrindDialog::setCtParams( const QString& params )
     w->ctChildrenBox->setChecked( true );
   w->init();
 
-  myParams = myParams.replace( QRegExp( childrenParam ), "" );
+  myParams = myParams.replace( TQRegExp( childrenParam ), "" );
   myParams = myParams.stripWhiteSpace();
   w->ctParamEdit->setText( myParams );
 }
 
-QString ValgrindDialog::kcExecutable( ) const
+TQString ValgrindDialog::kcExecutable( ) const
 {
   return w->kcExecutableEdit->url();
 }
 
-void ValgrindDialog::setKcExecutable( const QString& ke )
+void ValgrindDialog::setKcExecutable( const TQString& ke )
 {
-  QString vUrl = ke;
+  TQString vUrl = ke;
   if ( vUrl.isEmpty() ) {
     vUrl = KStandardDirs::findExe( "kcachegrind" );
   }
diff --git a/parts/valgrind/valgrind_dialog.h b/parts/valgrind/valgrind_dialog.h
index 41c25afc..a57d4529 100644
--- a/parts/valgrind/valgrind_dialog.h
+++ b/parts/valgrind/valgrind_dialog.h
@@ -17,36 +17,36 @@ class ValgrindDialog : public KDialogBase
 public:
   enum Type { Memcheck = 0, Calltree = 1 };
     
-  ValgrindDialog( Type type, QWidget* parent = 0 );
+  ValgrindDialog( Type type, TQWidget* parent = 0 );
   ~ValgrindDialog();
 
   // the app to check
-  QString executableName() const;
-  void setExecutable( const QString& url );
+  TQString executableName() const;
+  void setExecutable( const TQString& url );
 
   // command line parameters for the app
-  QString parameters() const;
-  void setParameters( const QString& params );
+  TQString parameters() const;
+  void setParameters( const TQString& params );
 
   // name and/or path to the valgrind executable
-  QString valExecutable() const;
-  void setValExecutable( const QString& ve );
+  TQString valExecutable() const;
+  void setValExecutable( const TQString& ve );
 
   // command line parameters for valgrind
-  QString valParams() const;
-  void setValParams( const QString& params );
+  TQString valParams() const;
+  void setValParams( const TQString& params );
   
   // name and/or path to the calltree executable
-  QString ctExecutable() const;
-  void setCtExecutable( const QString& ce );
+  TQString ctExecutable() const;
+  void setCtExecutable( const TQString& ce );
   
   // command line parameters for calltree
-  QString ctParams() const;
-  void setCtParams( const QString& params );
+  TQString ctParams() const;
+  void setCtParams( const TQString& params );
 
   // name and/or path to the kcachegrind executable
-  QString kcExecutable() const;
-  void setKcExecutable( const QString& ke );
+  TQString kcExecutable() const;
+  void setKcExecutable( const TQString& ke );
         
 protected:
   bool isNewValgrindVersion() const;
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index 868faf28..801d1c2a 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -1,8 +1,8 @@
 #include "valgrind_part.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -26,29 +26,29 @@ typedef KDevGenericFactory ValgrindFactory;
 static const KDevPluginInfo data("kdevvalgrind");
 K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) )
 
-ValgrindPart::ValgrindPart( QObject *parent, const char *name, const QStringList& )
+ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& )
   : KDevPlugin( &data, parent, name ? name : "ValgrindPart" )
 {
   setInstance( ValgrindFactory::instance() );
   setXMLFile( "kdevpart_valgrind.rc" );
 
   proc = new KShellProcess();
-  connect( proc, SIGNAL(receivedStdout( KProcess*, char*, int )),
-           this, SLOT(receivedStdout( KProcess*, char*, int )) );
-  connect( proc, SIGNAL(receivedStderr( KProcess*, char*, int )),
-           this, SLOT(receivedStderr( KProcess*, char*, int )) );
-  connect( proc, SIGNAL(processExited( KProcess* )),
-           this, SLOT(processExited( KProcess* )) );
-  connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)),
-           this, SLOT(slotStopButtonClicked(KDevPlugin*)) );
-  connect( core(), SIGNAL(projectOpened()),
-           this, SLOT(projectOpened()) );
+  connect( proc, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )),
+           this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) );
+  connect( proc, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )),
+           this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) );
+  connect( proc, TQT_SIGNAL(processExited( KProcess* )),
+           this, TQT_SLOT(processExited( KProcess* )) );
+  connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+           this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+  connect( core(), TQT_SIGNAL(projectOpened()),
+           this, TQT_SLOT(projectOpened()) );
 
   m_widget = new ValgrindWidget( this );
   m_widget->setIcon( SmallIcon("fork") );
   m_widget->setCaption(i18n("Valgrind Output"));
 
-  QWhatsThis::add( m_widget, i18n( "Valgrind
        Shows the output of the valgrind. Valgrind detects
        "
+  TQWhatsThis::add( m_widget, i18n( "Valgrind
        Shows the output of the valgrind. Valgrind detects
        "
     "use of uninitialized memory
        "
     "reading/writing memory after it has been free'd
        "
     "reading/writing off the end of malloc'd blocks
        "
@@ -59,12 +59,12 @@ ValgrindPart::ValgrindPart( QObject *parent, const char *name, const QStringList
     "some abuses of the POSIX pthread API." ) );
 
   KAction* action = new KAction( i18n("&Valgrind Memory Leak Check"), 0, this,
-	       SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" );
+	       TQT_SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" );
   action->setToolTip(i18n("Valgrind memory leak check"));
   action->setWhatsThis(i18n("Valgrind memory leak check
        Runs Valgrind - a tool to help you find memory-management problems in your programs."));
 
   action = new KAction( i18n("P&rofile with KCachegrind"), 0, this,
-	       SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" );
+	       TQT_SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" );
   action->setToolTip(i18n("Profile with KCachegrind"));
   action->setWhatsThis(i18n("Profile with KCachegrind
        Runs your program in calltree and then displays profiler information in KCachegrind."));
 
@@ -87,11 +87,11 @@ void ValgrindPart::projectOpened()
 
 void ValgrindPart::loadOutput()
 {
-  QString fName = KFileDialog::getOpenFileName(QString::null, "*", 0, i18n("Open Valgrind Output"));
+  TQString fName = KFileDialog::getOpenFileName(TQString::null, "*", 0, i18n("Open Valgrind Output"));
   if ( fName.isEmpty() )
     return;
 
-  QFile f( fName );
+  TQFile f( fName );
   if ( !f.open( IO_ReadOnly ) ) {
     KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").arg(fName) );
     return;
@@ -100,7 +100,7 @@ void ValgrindPart::loadOutput()
   clear();
   getActiveFiles();
 
-  QTextStream stream( &f );
+  TQTextStream stream( &f );
   while ( !stream.atEnd() ) {
     receivedString( stream.readLine() + "\n" );
   }
@@ -111,10 +111,10 @@ void ValgrindPart::getActiveFiles()
 {
   activeFiles.clear();
   if ( project() ) {
-    QStringList projectFiles = project()->allFiles();
-    QString projectDirectory = project()->projectDirectory();
+    TQStringList projectFiles = project()->allFiles();
+    TQString projectDirectory = project()->projectDirectory();
     KURL url;
-    for ( QStringList::Iterator it = projectFiles.begin(); it != projectFiles.end(); ++it ) {
+    for ( TQStringList::Iterator it = projectFiles.begin(); it != projectFiles.end(); ++it ) {
       KURL url( projectDirectory + "/" + (*it) );
       url.cleanPath( true );
       activeFiles += url.path();
@@ -123,13 +123,13 @@ void ValgrindPart::getActiveFiles()
   }
 }
 
-static void guessActiveItem( ValgrindItem& item, const QStringList activeFiles )
+static void guessActiveItem( ValgrindItem& item, const TQStringList activeFiles )
 {
   if ( activeFiles.isEmpty() && item.backtrace().isEmpty() )
     return;
   for ( ValgrindItem::BacktraceList::Iterator it = item.backtrace().begin(); it != item.backtrace().end(); ++it ) {
     // active: first line of backtrace that lies in project source file
-    for ( QStringList::ConstIterator it2 = activeFiles.begin(); it2 != activeFiles.end(); ++it2 ) {
+    for ( TQStringList::ConstIterator it2 = activeFiles.begin(); it2 != activeFiles.end(); ++it2 ) {
       if ( (*it).url() == (*it2) ) {
         (*it).setHighlighted( true );
         return;
@@ -138,7 +138,7 @@ static void guessActiveItem( ValgrindItem& item, const QStringList activeFiles )
   }
 }
 
-void ValgrindPart::appendMessage( const QString& message )
+void ValgrindPart::appendMessage( const TQString& message )
 {
   if ( message.isEmpty() )
     return;
@@ -162,7 +162,7 @@ void ValgrindPart::slotExecValgrind()
   kcInfo.runKc = false;
   _lastValExec = dlg->valExecutable();
   _lastValParams = dlg->valParams();
-  if ( dlg->exec() == QDialog::Accepted ) {
+  if ( dlg->exec() == TQDialog::Accepted ) {
     runValgrind( dlg->executableName(), dlg->parameters(), dlg->valExecutable(), dlg->valParams() );
   }
 }
@@ -182,7 +182,7 @@ void ValgrindPart::slotExecCalltree()
   kcInfo.runKc = true;
   kcInfo.kcPath = dlg->kcExecutable();
 //  kcInfo.kcWorkDir = KURL(dlg->executableName()).directory();
-  if ( dlg->exec() == QDialog::Accepted ) {
+  if ( dlg->exec() == TQDialog::Accepted ) {
     runValgrind( dlg->executableName(), dlg->parameters(), dlg->ctExecutable(), dlg->ctParams() );
   }
   _lastKcExec = dlg->kcExecutable();
@@ -206,12 +206,12 @@ void ValgrindPart::slotStopButtonClicked( KDevPlugin* which )
 void ValgrindPart::clear()
 {
   m_widget->clear();
-  currentMessage = QString::null;
+  currentMessage = TQString::null;
   currentPid = -1;
-  lastPiece = QString::null;
+  lastPiece = TQString::null;
 }
 
-void ValgrindPart::runValgrind( const QString& exec, const QString& params, const QString& valExec, const QString& valParams )
+void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, const TQString& valExec, const TQString& valParams )
 {
   if ( proc->isRunning() ) {
     KMessageBox::sorry( 0, i18n( "There is already an instance of valgrind running." ) );
@@ -230,11 +230,11 @@ void ValgrindPart::runValgrind( const QString& exec, const QString& params, cons
   if (project())
     run_envvars = project()->runEnvironmentVars();
 
-  QStringList envVarList;
+  TQStringList envVarList;
   DomUtil::PairList::ConstIterator it;
   for (it = run_envvars.begin(); it != run_envvars.end(); ++it)
   {
-    envVarList << QString("%1=\"%2\" ").arg((*it).first).arg((*it).second);
+    envVarList << TQString("%1=\"%2\" ").arg((*it).first).arg((*it).second);
   }
 
   *proc << envVarList.join("") << valExec << valParams << exec << params;
@@ -248,20 +248,20 @@ void ValgrindPart::runValgrind( const QString& exec, const QString& params, cons
 
 void ValgrindPart::receivedStdout( KProcess*, char* /* msg */, int /* len */ )
 {
-  //kdDebug() << "got StdOut: " <running( this, false );
 
     if (kcInfo.runKc)
@@ -312,49 +312,49 @@ void ValgrindPart::processExited( KProcess* p )
         KProcess *kcProc = new KProcess;
 //        kcProc->setWorkingDirectory(kcInfo.kcWorkDir);
         *kcProc << kcInfo.kcPath;
-        *kcProc << QString("callgrind.out.%1").arg(p->pid());
+        *kcProc << TQString("callgrind.out.%1").arg(p->pid());
         kcProc->start(KProcess::DontCare);
     }
   }
 }
 
-void ValgrindPart::restorePartialProjectSession( const QDomElement* el )
+void ValgrindPart::restorePartialProjectSession( const TQDomElement* el )
 {
-  QDomElement execElem = el->namedItem( "executable" ).toElement();
+  TQDomElement execElem = el->namedItem( "executable" ).toElement();
   _lastExec = execElem.attribute( "path", "" );
   _lastParams = execElem.attribute( "params", "" );
 
-  QDomElement valElem = el->namedItem( "valgrind" ).toElement();
+  TQDomElement valElem = el->namedItem( "valgrind" ).toElement();
   _lastValExec = valElem.attribute( "path", "" );
   _lastValParams = valElem.attribute( "params", "" );
 
-  QDomElement ctElem = el->namedItem( "calltree" ).toElement();
+  TQDomElement ctElem = el->namedItem( "calltree" ).toElement();
   _lastCtExec = ctElem.attribute( "path", "" );
   _lastCtParams = ctElem.attribute( "params", "" );
 
-  QDomElement kcElem = el->namedItem( "kcachegrind" ).toElement();
+  TQDomElement kcElem = el->namedItem( "kcachegrind" ).toElement();
   _lastKcExec = kcElem.attribute( "path", "" );
 }
 
-void ValgrindPart::savePartialProjectSession( QDomElement* el )
+void ValgrindPart::savePartialProjectSession( TQDomElement* el )
 {
-  QDomDocument domDoc = el->ownerDocument();
+  TQDomDocument domDoc = el->ownerDocument();
   if ( domDoc.isNull() )
     return;
 
-  QDomElement execElem = domDoc.createElement( "executable" );
+  TQDomElement execElem = domDoc.createElement( "executable" );
   execElem.setAttribute( "path", _lastExec );
   execElem.setAttribute( "params", _lastParams );
 
-  QDomElement valElem = domDoc.createElement( "valgrind" );
+  TQDomElement valElem = domDoc.createElement( "valgrind" );
   valElem.setAttribute( "path", _lastValExec );
   valElem.setAttribute( "params", _lastValParams );
 
-  QDomElement ctElem = domDoc.createElement( "calltree" );
+  TQDomElement ctElem = domDoc.createElement( "calltree" );
   ctElem.setAttribute( "path", _lastCtExec );
   ctElem.setAttribute( "params", _lastCtParams );
 
-  QDomElement kcElem = domDoc.createElement( "kcachegrind" );
+  TQDomElement kcElem = domDoc.createElement( "kcachegrind" );
   kcElem.setAttribute( "path", _lastKcExec );
 
   el->appendChild( execElem );
diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h
index 097eb8f8..6453dd8f 100644
--- a/parts/valgrind/valgrind_part.h
+++ b/parts/valgrind/valgrind_part.h
@@ -5,9 +5,9 @@
 #ifndef __KDEVPART_VALGRIND_H__
 #define __KDEVPART_VALGRIND_H__
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
 class ValgrindWidget;
@@ -18,13 +18,13 @@ class ValgrindPart : public KDevPlugin
   Q_OBJECT
 
 public:   
-  ValgrindPart( QObject *parent, const char *name, const QStringList & );
+  ValgrindPart( TQObject *parent, const char *name, const TQStringList & );
   ~ValgrindPart();
   
-  void runValgrind( const QString& exec, const QString& parameters, const QString& valExec, const QString& valParameters );
+  void runValgrind( const TQString& exec, const TQString& parameters, const TQString& valExec, const TQString& valParameters );
 
-  void savePartialProjectSession( QDomElement* el );
-  void restorePartialProjectSession( const QDomElement* el );
+  void savePartialProjectSession( TQDomElement* el );
+  void restorePartialProjectSession( const TQDomElement* el );
 
 private slots:
   void slotExecValgrind();
@@ -39,22 +39,22 @@ private slots:
   
 private:
   void getActiveFiles();
-  void appendMessage( const QString& message );
-  void appendMessages( const QStringList& lines );
-  void receivedString( const QString& str );
+  void appendMessage( const TQString& message );
+  void appendMessages( const TQStringList& lines );
+  void receivedString( const TQString& str );
   void clear();
-  QString _lastExec, _lastParams, _lastValExec, _lastValParams,
+  TQString _lastExec, _lastParams, _lastValExec, _lastValParams,
       _lastCtExec, _lastCtParams, _lastKcExec;
   KProcess* proc;
-  QString currentMessage;
-  QString lastPiece;
-  QStringList activeFiles;
+  TQString currentMessage;
+  TQString lastPiece;
+  TQStringList activeFiles;
   int currentPid;
-  QGuardedPtr m_widget;
+  TQGuardedPtr m_widget;
   struct {
       bool runKc;
-      QString kcPath;
-//      QString kcWorkDir;
+      TQString kcPath;
+//      TQString kcWorkDir;
   } kcInfo;
 };
 
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index 356d97bf..39c51094 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -1,6 +1,6 @@
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -24,16 +24,16 @@
 class ValListViewItem: public QListViewItem
 {
 public:
-  ValListViewItem( QListView* parent, int key, int pid, const QString& message ):
-    QListViewItem( parent, QString::number( key ), QString::number( pid ), message ),
+  ValListViewItem( TQListView* parent, int key, int pid, const TQString& message ):
+    TQListViewItem( parent, TQString::number( key ), TQString::number( pid ), message ),
     _key( key ), _pid ( pid ), backtrace( false ), _line( -1 ), _active( false ) {}
 
-  ValListViewItem( ValListViewItem* parent, int key, int pid, const QString& message, const QString& filename, int line, bool active ):
-    QListViewItem( parent, QString::number( key ), QString::null, message ),
+  ValListViewItem( ValListViewItem* parent, int key, int pid, const TQString& message, const TQString& filename, int line, bool active ):
+    TQListViewItem( parent, TQString::number( key ), TQString::null, message ),
     _key( key ), _pid( pid ), backtrace( true ), _filename( filename ), _line( line ), _active( active )
   {
     if ( parent->_pid != _pid && _pid > 0 )
-      setText( 1, QString::number( _pid ) );
+      setText( 1, TQString::number( _pid ) );
   }
 
   virtual ~ValListViewItem();
@@ -48,39 +48,39 @@ public:
       return 0;
   }
 
-  int compare( QListViewItem* i, int col, bool ascending ) const
+  int compare( TQListViewItem* i, int col, bool ascending ) const
   {
     if ( !i || i->rtti() != VALLISTVIEWITEMRTTI )
-      return QListViewItem::compare( i, col, ascending );
+      return TQListViewItem::compare( i, col, ascending );
     switch ( col ) {
       case 0 : return intCompare( ((ValListViewItem*)i)->_key, _key );
       case 1 : return intCompare( ((ValListViewItem*)i)->_pid, _pid );
-      default: return QListViewItem::compare( i, col, ascending );
+      default: return TQListViewItem::compare( i, col, ascending );
     }
   }
 
-  void paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align )
+  void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align )
   {
     if ( _active ) {
-      QFont fnt = p->font();
+      TQFont fnt = p->font();
       fnt.setBold( true );
       p->setFont( fnt );
     }
-    QListViewItem::paintCell( p, cg, column, width, align );
+    TQListViewItem::paintCell( p, cg, column, width, align );
   }
 
   int rtti() const { return VALLISTVIEWITEMRTTI; }
 
-  QString fileName() const { return _filename; }
+  TQString fileName() const { return _filename; }
   int line() const { return _line; }
-  QString message() const { return text( 2 ); }
+  TQString message() const { return text( 2 ); }
   bool isHighlighted() const { return _active; }
 
 private:
   int _key;
   int _pid;
   bool backtrace;
-  QString _filename;
+  TQString _filename;
   int _line;
   bool _active;
 };
@@ -88,9 +88,9 @@ private:
 ValListViewItem::~ValListViewItem() {}
 
 ValgrindWidget::ValgrindWidget( ValgrindPart *part )
- : QWidget(0, "valgrind widget"), _part( part )
+ : TQWidget(0, "valgrind widget"), _part( part )
 {
-  QVBoxLayout* vbl = new QVBoxLayout( this );
+  TQVBoxLayout* vbl = new TQVBoxLayout( this );
   lv = new KListView( this );
   lv->addColumn( i18n( "No." ) );
   lv->addColumn( i18n( "Thread" ) );
@@ -100,18 +100,18 @@ ValgrindWidget::ValgrindWidget( ValgrindPart *part )
   lv->setAllColumnsShowFocus( true );
   vbl->addWidget( lv );
 
-  popup = new QPopupMenu( lv, "valPopup" );
-  popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, SLOT(loadOutput()), 0, 0 );
+  popup = new TQPopupMenu( lv, "valPopup" );
+  popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, TQT_SLOT(loadOutput()), 0, 0 );
   popup->insertSeparator();
-  popup->insertItem( i18n( "Expand All Items" ), this, SLOT(expandAll()), 0, 2 );
-  popup->insertItem( i18n( "Collapse All Items" ), this, SLOT(collapseAll()), 0, 3 );
-
-  connect( popup, SIGNAL(aboutToShow()),
-           this, SLOT(aboutToShowPopup()) );
-  connect( lv, SIGNAL(executed(QListViewItem*)),
-           this, SLOT(executed(QListViewItem*)) );
-  connect( lv, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-           this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) );
+  popup->insertItem( i18n( "Expand All Items" ), this, TQT_SLOT(expandAll()), 0, 2 );
+  popup->insertItem( i18n( "Collapse All Items" ), this, TQT_SLOT(collapseAll()), 0, 3 );
+
+  connect( popup, TQT_SIGNAL(aboutToShow()),
+           this, TQT_SLOT(aboutToShowPopup()) );
+  connect( lv, TQT_SIGNAL(executed(TQListViewItem*)),
+           this, TQT_SLOT(executed(TQListViewItem*)) );
+  connect( lv, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
+           this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) );
 }
 
 
@@ -127,8 +127,8 @@ void ValgrindWidget::clear()
 
 void ValgrindWidget::addMessage( const ValgrindItem& vi )
 {
-  QStringList projectFiles;
-  QString projectDirectory;
+  TQStringList projectFiles;
+  TQString projectDirectory;
 
   ValListViewItem* lvi = new ValListViewItem( lv, msgNumber++, vi.pid(), vi.message() );
   lvi->setMultiLinesEnabled( true );
@@ -142,7 +142,7 @@ void ValgrindWidget::addMessage( const ValgrindItem& vi )
   }
 }
 
-void ValgrindWidget::executed( QListViewItem* lvi )
+void ValgrindWidget::executed( TQListViewItem* lvi )
 {
   Q_ASSERT( _part );
   Q_ASSERT( _part->partController() );
@@ -155,7 +155,7 @@ void ValgrindWidget::executed( QListViewItem* lvi )
     vli = (ValListViewItem*)lvi;
   } else if ( lvi->isExpandable() ) {
     // find the memleak position
-    QListViewItemIterator it( lv );
+    TQListViewItemIterator it( lv );
     while ( vli == 0 && it.current() ) {
       if ( it.current()->rtti() == VALLISTVIEWITEMRTTI && ((ValListViewItem*)it.current())->isHighlighted() )
           vli = (ValListViewItem*)it.current();
@@ -171,7 +171,7 @@ void ValgrindWidget::executed( QListViewItem* lvi )
 
 void ValgrindWidget::expandAll()
 {
-  QListViewItem* child = lv->firstChild();
+  TQListViewItem* child = lv->firstChild();
   while ( child ) {
     child->setOpen( true );
     child = child->nextSibling();
@@ -180,7 +180,7 @@ void ValgrindWidget::expandAll()
 
 void ValgrindWidget::collapseAll()
 {
-  QListViewItem* child = lv->firstChild();
+  TQListViewItem* child = lv->firstChild();
   while ( child ) {
     child->setOpen( false );
     child = child->nextSibling();
@@ -194,7 +194,7 @@ void ValgrindWidget::aboutToShowPopup()
   popup->setItemEnabled( 3, en );
 }
 
-void ValgrindWidget::slotContextMenu( KListView* l, QListViewItem* /*i*/, const QPoint& p )
+void ValgrindWidget::slotContextMenu( KListView* l, TQListViewItem* /*i*/, const TQPoint& p )
 {
   if ( l != lv )
     return;
diff --git a/parts/valgrind/valgrind_widget.h b/parts/valgrind/valgrind_widget.h
index 1777e183..e55e3a1c 100644
--- a/parts/valgrind/valgrind_widget.h
+++ b/parts/valgrind/valgrind_widget.h
@@ -1,9 +1,9 @@
 #ifndef __VALGRIND_WIDGET_H__
 #define __VALGRIND_WIDGET_H__
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "valgrinditem.h"
 
@@ -24,11 +24,11 @@ public:
   void clear();
 
 signals:
-  void jumpToFile( const QString& url, int line );
+  void jumpToFile( const TQString& url, int line );
   
 private slots:
-  void executed( QListViewItem* item );
-  void slotContextMenu( KListView* l, QListViewItem* i, const QPoint& p );
+  void executed( TQListViewItem* item );
+  void slotContextMenu( KListView* l, TQListViewItem* i, const TQPoint& p );
   void expandAll();
   void collapseAll();
   void aboutToShowPopup();
@@ -37,7 +37,7 @@ private:
   KListView* lv;
   int msgNumber;
   ValgrindPart* _part;
-  QPopupMenu* popup;
+  TQPopupMenu* popup;
 };
 
 
diff --git a/parts/valgrind/valgrinditem.cpp b/parts/valgrind/valgrinditem.cpp
index 318254d3..0ae6f1e0 100644
--- a/parts/valgrind/valgrinditem.cpp
+++ b/parts/valgrind/valgrinditem.cpp
@@ -1,15 +1,15 @@
 #include "valgrinditem.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
-ValgrindBacktraceItem::ValgrindBacktraceItem( const QString& rawOutput ): _rawOutput( rawOutput ), _highlight( false )
+ValgrindBacktraceItem::ValgrindBacktraceItem( const TQString& rawOutput ): _rawOutput( rawOutput ), _highlight( false )
 {
-  QRegExp re1( "^==(\\d+)==\\s+(by|at) (0x[\\dABCDEF]+): (.*) \\((.*):(\\d+)\\)$" );
-  QRegExp re2( "^==(\\d+)==\\s+(by|at) (0x[\\dABCDEF]+): (.*) \\(in (.*)\\)$" );
-  QRegExp valRe( "==(\\d+)== (.*)" );
+  TQRegExp re1( "^==(\\d+)==\\s+(by|at) (0x[\\dABCDEF]+): (.*) \\((.*):(\\d+)\\)$" );
+  TQRegExp re2( "^==(\\d+)==\\s+(by|at) (0x[\\dABCDEF]+): (.*) \\(in (.*)\\)$" );
+  TQRegExp valRe( "==(\\d+)== (.*)" );
   if ( valRe.search( _rawOutput ) >= 0 )
     _message = valRe.cap( 2 );
   if ( re1.search( _rawOutput ) >= 0 ) {
@@ -38,13 +38,13 @@ ValgrindBacktraceItem::~ValgrindBacktraceItem()
 }
 
 
-ValgrindItem::ValgrindItem( const QString& message ): _pid(-1)
+ValgrindItem::ValgrindItem( const TQString& message ): _pid(-1)
 {
-  QRegExp valRe( "==(\\d+)== (.*)" );
-  QStringList lines = QStringList::split( "\n", message );
-  QString curMsg;
+  TQRegExp valRe( "==(\\d+)== (.*)" );
+  TQStringList lines = TQStringList::split( "\n", message );
+  TQString curMsg;
   
-  for ( QStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it ) {
+  for ( TQStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it ) {
     if ( valRe.search( *it ) < 0 ) {
       kdDebug() << "ValgrindItem: got unrecognizable line '" << *it << "'" << endl;
       continue; // not of interest
diff --git a/parts/valgrind/valgrinditem.h b/parts/valgrind/valgrinditem.h
index 12784c42..14e3bb07 100644
--- a/parts/valgrind/valgrinditem.h
+++ b/parts/valgrind/valgrinditem.h
@@ -1,20 +1,20 @@
 #ifndef _VALGRINDITEM_H_
 #define _VALGRINDITEM_H_
 
-#include 
-#include 
+#include 
+#include 
 
 class ValgrindBacktraceItem
 {
 public:
   enum Type { Unknown, SourceCode, Library };
-  ValgrindBacktraceItem( const QString& rawOutput = QString::null );
+  ValgrindBacktraceItem( const TQString& rawOutput = TQString::null );
   ~ValgrindBacktraceItem();
 
-  QString message() const { return _message; }
-  QString address() const { return _address; }
-  QString url() const { return _url; }
-  QString function() const { return _function; }
+  TQString message() const { return _message; }
+  TQString address() const { return _address; }
+  TQString url() const { return _url; }
+  TQString function() const { return _function; }
   int line() const { return _line; }
   int pid() const { return _pid; }
   Type type() const { return _type; }
@@ -22,7 +22,7 @@ public:
   void setHighlighted( bool h ) { _highlight = h; }
   
 private:
-  QString _rawOutput, _address, _url, _function, _message;
+  TQString _rawOutput, _address, _url, _function, _message;
   int _line;
   int _pid;
   Type _type;
@@ -32,18 +32,18 @@ private:
 class ValgrindItem
 {
 public:
-  ValgrindItem( const QString& message );
+  ValgrindItem( const TQString& message );
   ~ValgrindItem();
 
-  typedef QValueList BacktraceList;  
+  typedef TQValueList BacktraceList;  
   BacktraceList& backtrace() { return _backtrace; }
   const BacktraceList& backtrace() const { return _backtrace; }
-  QString message() const { return _message; }
+  TQString message() const { return _message; }
   int pid() const { return _pid; }
   
 private:
   BacktraceList _backtrace;
-  QString _message;
+  TQString _message;
   int _pid;
 };
 
diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index a13239a4..58ef9444 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -20,9 +20,9 @@
 
 #include "vcsmanagerpart.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) )
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-VCSManagerPart::VCSManagerPart(QObject *parent, const char *name, const QStringList &/*args*/)
+VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
 	: KDevPlugin(&data, parent, name ? name : "VCSManagerPart")
 {
 	kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl;
@@ -58,10 +58,10 @@ VCSManagerPart::VCSManagerPart(QObject *parent, const char *name, const QStringL
 
 	m_configProxy = new ConfigWidgetProxy(core());
 	m_configProxy->createProjectConfigPage(i18n("Version Control"), PROJECTDOC_OPTIONS, info()->icon());
-	connect(m_configProxy, SIGNAL(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int )),
-		this, SLOT(insertConfigWidget(const KDialogBase*, QWidget*, unsigned int)));
+	connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)));
 
-	connect(core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()));
+	connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
 }
 
 VCSManagerPart::~VCSManagerPart()
@@ -69,14 +69,14 @@ VCSManagerPart::~VCSManagerPart()
 	delete m_configProxy;
 }
 
-void VCSManagerPart::insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo)
+void VCSManagerPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo)
 {
 	switch (pageNo)
 	{
 		case PROJECTDOC_OPTIONS:
 		{
 			VCSManagerProjectConfig *w = new VCSManagerProjectConfig(this, page, "project config");
-			connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
+			connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
 			break;
 		}
 	}
@@ -91,11 +91,11 @@ void VCSManagerPart::loadVCSPlugin()
 {
 	unloadVCSPlugin();
 
-	QDomDocument & dom = *projectDom();
+	TQDomDocument & dom = *projectDom();
 	m_vcsPluginName = DomUtil::readEntry( dom, "/general/versioncontrol" ).stripWhiteSpace();
 	if ( m_vcsPluginName.isEmpty() ) return;
 	
-	QString constraint = QString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName );
+	TQString constraint = TQString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName );
 	pluginController()->loadPlugin( "KDevelop/VersionControl", constraint );
 }
 
@@ -107,7 +107,7 @@ void VCSManagerPart::unloadVCSPlugin()
 	}
 }
 
-QString VCSManagerPart::vcsPlugin()
+TQString VCSManagerPart::vcsPlugin()
 {
 	return m_vcsPluginName;
 }
diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h
index 9570944c..eabff928 100644
--- a/parts/vcsmanager/vcsmanagerpart.h
+++ b/parts/vcsmanager/vcsmanagerpart.h
@@ -23,7 +23,7 @@
 
 #include 
 
-#include 
+#include 
 
 class QPopupMenu;
 class KAction;
@@ -39,18 +39,18 @@ class VCSManagerPart: public KDevPlugin
 {
 	Q_OBJECT
 public:
-	VCSManagerPart(QObject *parent, const char *name, const QStringList &args);
+	VCSManagerPart(TQObject *parent, const char *name, const TQStringList &args);
 	~VCSManagerPart();
-	QString vcsPlugin();
+	TQString vcsPlugin();
 	void loadVCSPlugin();
 	void unloadVCSPlugin();
 
 private slots:
-	void insertConfigWidget(const KDialogBase *dlg, QWidget *page, unsigned int pageNo);
+	void insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo);
 	void projectOpened();
 	
 private:
-	QString m_vcsPluginName;
+	TQString m_vcsPluginName;
 	ConfigWidgetProxy *m_configProxy;
 };
 
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
index a3dbeab2..9a081f3a 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -28,7 +28,7 @@
 #include "vcsmanagerprojectconfig.h"
 #include "vcsmanagerpart.h"
 
-VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, QWidget *parent, const char *name )
+VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent, const char *name )
 	: VCSManagerProjectConfigBase( parent, name ), m_part( part )
 {
 	setup();
@@ -36,9 +36,9 @@ VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, QWidget
 
 void VCSManagerProjectConfig::accept()
 {
-	QString vcsPluginName = *m_vcsPluginNames.at( vcsCombo->currentItem() );
+	TQString vcsPluginName = *m_vcsPluginNames.at( vcsCombo->currentItem() );
 	
-	QDomDocument & dom = *m_part->projectDom();
+	TQDomDocument & dom = *m_part->projectDom();
 	DomUtil::writeEntry( dom, "/general/versioncontrol", vcsPluginName );
 	
 	m_part->loadVCSPlugin();
@@ -51,7 +51,7 @@ void VCSManagerProjectConfig::setup( )
 	
 	int current = 0;
 
-	QString constraint = QString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+	TQString constraint = TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
 	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", constraint );
 	KTrader::OfferList::const_iterator it = offers.begin();
 	for ( int i = 1; it != offers.end(); ++it, ++i )
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.h b/parts/vcsmanager/vcsmanagerprojectconfig.h
index 50db9ce7..c452ac41 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.h
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.h
@@ -30,7 +30,7 @@ class VCSManagerProjectConfig: public VCSManagerProjectConfigBase
 {
 	Q_OBJECT
 public:
-	VCSManagerProjectConfig( VCSManagerPart *part, QWidget *parent = 0, const char *name = 0);
+	VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent = 0, const char *name = 0);
 
 public slots:
 	void accept();
@@ -39,7 +39,7 @@ private:
 	void setup();
 
 	VCSManagerPart * m_part;
-	QStringList m_vcsPluginNames;
+	TQStringList m_vcsPluginNames;
 };
 
 #endif
diff --git a/src/core.cpp b/src/core.cpp
index d7b6b285..c189fcf8 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -1,4 +1,4 @@
-#include 
+#include 
 
 
 #include 
@@ -31,18 +31,18 @@ Core *Core::getInstance()
 
 void Core::setupShourtcutTips(KXMLGUIClient * client)
 {
-  QPtrList clients;
+  TQPtrList clients;
   if (client != 0)
     clients.append(client);
   else
     clients = TopLevel::getInstance()->main()->guiFactory()->clients();
   
-  for( QPtrListIterator it(clients); it.current(); ++it ) {
+  for( TQPtrListIterator it(clients); it.current(); ++it ) {
     KActionCollection *actionCollection = (*it)->actionCollection();
     for (int i = 0; i < actionCollection->count(); i++) {
       KAction *action = actionCollection->action(i);
             
-      QString tooltip = action->toolTip();
+      TQString tooltip = action->toolTip();
       if (tooltip.isEmpty())
         tooltip = action->text().remove('&');
       else {
@@ -50,7 +50,7 @@ void Core::setupShourtcutTips(KXMLGUIClient * client)
         if (i > 0) tooltip = tooltip.left(i).stripWhiteSpace();
       }
 
-      QString shortcut = action->shortcutText();
+      TQString shortcut = action->shortcutText();
       if (!shortcut.isEmpty())
         tooltip += " (" + shortcut + ")";
         action->setToolTip(tooltip);
@@ -94,23 +94,23 @@ void Core::running(KDevPlugin * which, bool runs)
 }
 
 
-void Core::fillContextMenu(QPopupMenu *popup, const Context *context)
+void Core::fillContextMenu(TQPopupMenu *popup, const Context *context)
 {
   emit contextMenu(popup, context);
 }
 
 
-void Core::openProject(const QString& projectFileName)
+void Core::openProject(const TQString& projectFileName)
 {
   ProjectManager::getInstance()->loadProject(KURL( projectFileName ));
 }
 
 namespace MainWindowUtils{
-QString beautifyToolTip(const QString& text)
+TQString beautifyToolTip(const TQString& text)
 {
-    QString temp = text;
-    temp.replace(QRegExp("&"), "");
-    temp.replace(QRegExp("\\.\\.\\."), "");
+    TQString temp = text;
+    temp.replace(TQRegExp("&"), "");
+    temp.replace(TQRegExp("\\.\\.\\."), "");
     return temp;
 }
 }
diff --git a/src/core.h b/src/core.h
index e48eecda..a111f220 100644
--- a/src/core.h
+++ b/src/core.h
@@ -1,7 +1,7 @@
 #ifndef _CORE_H_
 #define _CORE_H_
 
-#include 
+#include 
 #include 
 
 #include 
@@ -11,7 +11,7 @@
 
 namespace MainWindowUtils{
 
-QString beautifyToolTip(const QString& text);
+TQString beautifyToolTip(const TQString& text);
 }
 
 /**
@@ -41,8 +41,8 @@ public:
   ~Core();
 
   virtual void running(KDevPlugin *which, bool runs);
-  virtual void fillContextMenu(QPopupMenu *popup, const Context *context);
-  virtual void openProject(const QString& projectFileName);
+  virtual void fillContextMenu(TQPopupMenu *popup, const Context *context);
+  virtual void openProject(const TQString& projectFileName);
 
   void doEmitProjectOpened() { emit projectOpened(); }
   void doEmitProjectClosed() { emit projectClosed(); }
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index b256491d..a0c42da3 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -1,6 +1,6 @@
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -37,16 +37,16 @@ EditorProxy *EditorProxy::s_instance = 0;
 
 
 EditorProxy::EditorProxy()
-  : QObject()
+  : TQObject()
 {
-	m_delayedLineTimer = new QTimer( this );
-	connect( m_delayedLineTimer,  SIGNAL( timeout() ), this, SLOT(setLineNumberDelayed()) );
+	m_delayedLineTimer = new TQTimer( this );
+	connect( m_delayedLineTimer,  TQT_SIGNAL( timeout() ), this, TQT_SLOT(setLineNumberDelayed()) );
 	KConfig *config = kapp->config();
 
 	m_delayedViewCreationCompatibleUI = true;
 
 	KAction *ac = new KAction( i18n("Show Context Menu"), 0, this,
-		SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" );
+		TQT_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" );
     KShortcut cut ;/*= KStdAccel::shortcut(KStdAccel::PopupMenuContext);*/
     cut.append(KKey(CTRL+Key_Return));
     ac->setShortcut(cut);
@@ -94,7 +94,7 @@ void EditorProxy::setLineNumber(KParts::Part *part, int lineNum, int col)
   }
   else {
     // Save the position for a rainy day (or when the view gets activated and wants its position)
-    for (QValueList::ConstIterator it = m_editorParts.begin(); it != m_editorParts.end(); ++it)
+    for (TQValueList::ConstIterator it = m_editorParts.begin(); it != m_editorParts.end(); ++it)
         if ((*it)->hasURL( url )) {
             (*it)->registerDelayedActivation( part, lineNum, col );
         return;
@@ -115,7 +115,7 @@ void EditorProxy::installPopup( KParts::Part * part )
 		{
 			KTextEditor::View * view = static_cast( part->widget() );
 
-			QPopupMenu * popup = static_cast( part->factory()->container("ktexteditor_popup", view ) );
+			TQPopupMenu * popup = static_cast( part->factory()->container("ktexteditor_popup", view ) );
 
 			if (!popup)
 			{
@@ -143,7 +143,7 @@ void EditorProxy::installPopup( KParts::Part * part )
 
 			iface->installPopup( popup );
 
-			connect(popup, SIGNAL(aboutToShow()), this, SLOT(popupAboutToShow()));
+			connect(popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(popupAboutToShow()));
 
 			// ugly hack: mark the "original" items
 			m_popupIds.resize(popup->count());
@@ -155,7 +155,7 @@ void EditorProxy::installPopup( KParts::Part * part )
 
 void EditorProxy::popupAboutToShow()
 {
-	QPopupMenu *popup = (QPopupMenu*)sender();
+	TQPopupMenu *popup = (TQPopupMenu*)sender();
 	if (!popup)
 	return;
 	
@@ -165,7 +165,7 @@ void EditorProxy::popupAboutToShow()
 		int id = popup->idAt(index);
 		if (m_popupIds.contains(id) == 0)
 		{
-			QMenuItem *item = popup->findItem(id);
+			TQMenuItem *item = popup->findItem(id);
 			if ( item && item->popup() )
 				delete item->popup();
 			else
@@ -180,8 +180,8 @@ void EditorProxy::popupAboutToShow()
 	unsigned int col;
 	if ( !KDevEditorUtil::currentPositionReal( &line, &col, doc ) ) return;
 
-	QString wordstr;
-	QString selection = KDevEditorUtil::currentSelection( doc );
+	TQString wordstr;
+	TQString selection = KDevEditorUtil::currentSelection( doc );
 	if ( !selection.isEmpty() && selection.contains('\n') != 0 )
 	{
 		wordstr = selection;
@@ -191,7 +191,7 @@ void EditorProxy::popupAboutToShow()
 		wordstr = KDevEditorUtil::currentWord( doc );
 	}
 
-	QString linestr = KDevEditorUtil::currentLine( doc );
+	TQString linestr = KDevEditorUtil::currentLine( doc );
 	
 	EditorContext context( doc->url(), line, col, linestr, wordstr );
 	Core::getInstance()->fillContextMenu( popup, &context );
@@ -225,7 +225,7 @@ void EditorProxy::showPopup( )
 		if ( iface )
 		{
 			KTextEditor::View * view = static_cast( part->widget() );
-			QPopupMenu * popup = static_cast( view->factory()->container("ktexteditor_popup", view ) );
+			TQPopupMenu * popup = static_cast( view->factory()->container("ktexteditor_popup", view ) );
 
 			if ( popup )
 			{
@@ -245,7 +245,7 @@ void EditorProxy::deregisterEditor(MultiBuffer* wrapper)
   m_editorParts.remove(wrapper);
 }
 
-QWidget * EditorProxy::widgetForPart( KParts::Part * part )
+TQWidget * EditorProxy::widgetForPart( KParts::Part * part )
 {
 	if ( !part ) return 0;
 
@@ -254,20 +254,20 @@ QWidget * EditorProxy::widgetForPart( KParts::Part * part )
 
     KURL url = dynamic_cast( part )->url();
 
-    for (QValueList::ConstIterator it = m_editorParts.begin(); it != m_editorParts.end(); ++it)
+    for (TQValueList::ConstIterator it = m_editorParts.begin(); it != m_editorParts.end(); ++it)
         if ((*it)->hasURL( url ))
 			return *it;
 
 	return 0L;
 }
 
-QWidget * EditorProxy::topWidgetForPart( KParts::Part * part )
+TQWidget * EditorProxy::topWidgetForPart( KParts::Part * part )
 {
 	if ( !part ) return 0;
 
     KURL url = dynamic_cast( part )->url();
 
-    for (QValueList::ConstIterator it = m_editorParts.begin(); it != m_editorParts.end(); ++it)
+    for (TQValueList::ConstIterator it = m_editorParts.begin(); it != m_editorParts.end(); ++it)
         if ((*it)->hasURL( url ))
 			return *it;
 
@@ -282,9 +282,9 @@ bool EditorProxy::isDelayedViewCapable( )
 	return m_delayedViewCreationCompatibleUI;
 }
 
-QWidget *EditorProxy::findPartWidget(KParts::Part *part)
+TQWidget *EditorProxy::findPartWidget(KParts::Part *part)
 {
-    for (QValueList::ConstIterator it = m_editorParts.begin(); it != m_editorParts.end(); ++it)
+    for (TQValueList::ConstIterator it = m_editorParts.begin(); it != m_editorParts.end(); ++it)
         if ((*it)->hasPart(part))
             return *it;
 
diff --git a/src/editorproxy.h b/src/editorproxy.h
index 51564dd1..51854e9f 100644
--- a/src/editorproxy.h
+++ b/src/editorproxy.h
@@ -2,9 +2,9 @@
 #define __EDITORPROXY_H__
 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 class QPopupMenu;
 class MultiBuffer;
@@ -30,12 +30,12 @@ public:
   void registerEditor(MultiBuffer* wrapper);
   void deregisterEditor(MultiBuffer* wrapper);
 
-  QWidget * widgetForPart( KParts::Part * part );
-  QWidget * topWidgetForPart( KParts::Part * part );
+  TQWidget * widgetForPart( KParts::Part * part );
+  TQWidget * topWidgetForPart( KParts::Part * part );
 
   bool isDelayedViewCapable();
 
-  QWidget * findPartWidget( KParts::Part * part );
+  TQWidget * findPartWidget( KParts::Part * part );
 
 public slots:
   void setLineNumberDelayed();
@@ -51,12 +51,12 @@ private:
 
   static EditorProxy *s_instance;
 
-  QMemArray m_popupIds;
+  TQMemArray m_popupIds;
 
   // This list is used to save line/col information for not yet activated editor views.
-  QValueList< MultiBuffer* > m_editorParts;
+  TQValueList< MultiBuffer* > m_editorParts;
 
-  QTimer* m_delayedLineTimer;
+  TQTimer* m_delayedLineTimer;
   bool m_delayedViewCreationCompatibleUI;
   KParts::Part *m_delayedPart;
   int m_delayedLine;
diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp
index e57dc41a..fdc53eff 100644
--- a/src/generalinfowidget.cpp
+++ b/src/generalinfowidget.cpp
@@ -9,17 +9,17 @@
  ***************************************************************************/
 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include "generalinfowidget.h"
@@ -27,15 +27,15 @@
 #include "domutil.h"
 #include "projectmanager.h"
 
-QString makeRelativePath(const QString& fromPath, const QString& toPath);
+TQString makeRelativePath(const TQString& fromPath, const TQString& toPath);
 
-GeneralInfoWidget::GeneralInfoWidget(QDomDocument &projectDom, QWidget *parent, const char *name)
+GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name)
         : GeneralInfoWidgetBase(parent, name), m_projectDom(projectDom) {
 
-    connect(project_directory_edit, SIGNAL(textChanged(const QString&)),
-            this, SLOT(slotProjectDirectoryChanged(const QString&)));
-    connect(project_directory_combo, SIGNAL(activated(int)),
-            this, SLOT(slotProjectDirectoryComboChanged()));
+    connect(project_directory_edit, TQT_SIGNAL(textChanged(const TQString&)),
+            this, TQT_SLOT(slotProjectDirectoryChanged(const TQString&)));
+    connect(project_directory_combo, TQT_SIGNAL(activated(int)),
+            this, TQT_SLOT(slotProjectDirectoryComboChanged()));
     readConfig();
 }
 
@@ -54,10 +54,10 @@ void GeneralInfoWidget::readConfig() {
     this->version_edit->setText(DomUtil::readEntry(m_projectDom,"/general/version"));
     this->description_edit->setText(DomUtil::readEntry(m_projectDom,"/general/description"));
 
-    QStringList encodings;
+    TQStringList encodings;
     encodings << i18n("Use global editor settings");
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
-    QStringList::const_iterator it = encodings.constBegin();
+    TQStringList::const_iterator it = encodings.constBegin();
     while ( it != encodings.constEnd() )
     {
         encoding_combo->insertItem( *it );
@@ -65,8 +65,8 @@ void GeneralInfoWidget::readConfig() {
     }
     encoding_combo->setCurrentItem( 0 );
 
-//    const QString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", QString::null ) );
-    const QString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", QString::null );
+//    const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString::null ) );
+    const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString::null );
     for ( int i = 0; i < encoding_combo->count(); i++ )
     {
         if ( KGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding )
@@ -87,40 +87,40 @@ void GeneralInfoWidget::readConfig() {
  * @param configureinpath Full path to configure.in file
  * @param newVersion The new version number or string
 */
-void GeneralInfoWidget::configureinUpdateVersion( QString configureinpath, QString newVersion )
+void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQString newVersion )
 {
-    QFile configurein(configureinpath);
+    TQFile configurein(configureinpath);
 
     if ( !configurein.open( IO_ReadOnly ) ){
         KMessageBox::error(this, i18n("Could not open %1 for reading.").arg(configureinpath));
         return;
     }
 
-    QTextStream stream( &configurein);
-    QStringList list;
+    TQTextStream stream( &configurein);
+    TQStringList list;
 
     // Options for version:
 
     // we ignore old AC_INIT that had no version..
     // only match the if there is a comma and at least two args..
     // AC_INIT (package, version, [bug-report], [tarname])
-    QRegExp ac_init("^AC_INIT\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)");
+    TQRegExp ac_init("^AC_INIT\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)");
 
     // AM_INIT_AUTOMAKE([OPTIONS])
     // example: AM_INIT_AUTOMAKE([gnits 1.5 no-define dist-bzip2])
-    QRegExp am_autoSpace("^AM_INIT_AUTOMAKE\\s{0,}\\(\\s{0,}([\\[\\s]{0,}[^\\s]+)\\s+([^\\s\\)\\]]+)(.*)");
+    TQRegExp am_autoSpace("^AM_INIT_AUTOMAKE\\s{0,}\\(\\s{0,}([\\[\\s]{0,}[^\\s]+)\\s+([^\\s\\)\\]]+)(.*)");
 
     // AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-    QRegExp am_autoComma("^AM_INIT_AUTOMAKE\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)");
+    TQRegExp am_autoComma("^AM_INIT_AUTOMAKE\\s*\\(\\s*([^,]+),([^,\\)]+)(.*)");
 
     // look for version in a define.
     // AC_DEFINE(VERSION, "5.6")
-    QRegExp ac_define("^AC_DEFINE\\s*\\(");
-    QRegExp version("(\\bversion\\b)");
+    TQRegExp ac_define("^AC_DEFINE\\s*\\(");
+    TQRegExp version("(\\bversion\\b)");
     version.setCaseSensitive(FALSE);
 
     while ( !stream.eof() ) {
-        QString line = stream.readLine();
+        TQString line = stream.readLine();
         if ( ac_init.search(line) >= 0){
             line = "AC_INIT(" + ac_init.cap(1).stripWhiteSpace();
             line += ", ";
@@ -150,13 +150,13 @@ void GeneralInfoWidget::configureinUpdateVersion( QString configureinpath, QStri
     configurein.close();
 
     // write our changes..
-    QFile configureout(configureinpath);
+    TQFile configureout(configureinpath);
     if ( !configureout.open( IO_WriteOnly ) ){
         KMessageBox::error(this, i18n("Could not open %1 for writing.").arg(configureinpath));
         return ;
     }
-    QTextStream output( &configureout);
-    for(QStringList::iterator iter = list.begin();iter!=list.end();iter++){
+    TQTextStream output( &configureout);
+    for(TQStringList::iterator iter = list.begin();iter!=list.end();iter++){
         output << (*iter) <<"\n";
     }
     configureout.close();
@@ -170,9 +170,9 @@ void GeneralInfoWidget::writeConfig() {
     DomUtil::writeEntry(m_projectDom,"/general/email",email_edit->text());
     if ( DomUtil::readEntry(m_projectDom,"/general/version") != version_edit->text() && !DomUtil::elementByPath( m_projectDom, "/kdevautoproject").isNull() ){
         // update the configure.in.in, configure.in or configure.ac file.
-		QFile inInFile(projectDirectory() + "/configure.in.in");
-        QFile inFile(projectDirectory() + "/configure.in");
-        QFile acFile(projectDirectory() + "/configure.ac");
+		TQFile inInFile(projectDirectory() + "/configure.in.in");
+        TQFile inFile(projectDirectory() + "/configure.in");
+        TQFile acFile(projectDirectory() + "/configure.ac");
 		if ( inInFile.exists()){
 			configureinUpdateVersion( inInFile.name(), version_edit->text() );
 		}
@@ -189,7 +189,7 @@ void GeneralInfoWidget::writeConfig() {
     DomUtil::writeEntry(m_projectDom,"/general/version",version_edit->text());
     DomUtil::writeEntry(m_projectDom,"/general/description",description_edit->text());
 
-    QString DefaultEncoding = QString::null;
+    TQString DefaultEncoding = TQString::null;
     if ( encoding_combo->currentItem() > 0 )
     {
         DefaultEncoding = KGlobal::charsets()->encodingForName( encoding_combo->currentText() );
@@ -205,11 +205,11 @@ bool GeneralInfoWidget::isProjectDirectoryAbsolute() {
     return project_directory_combo->currentItem() == 0;
 }
 
-QString GeneralInfoWidget::projectDirectory() {
+TQString GeneralInfoWidget::projectDirectory() {
     return ProjectManager::projectDirectory( project_directory_edit->text(), isProjectDirectoryAbsolute() );
 }
 
-void GeneralInfoWidget::slotProjectDirectoryChanged( const QString& text ) {
+void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) {
     if(text.isEmpty())
     {
        setProjectDirectoryError(i18n("Please enter a path."));
@@ -228,7 +228,7 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const QString& text ) {
     }
     else
     {
-        QFileInfo info(projectDirectory());
+        TQFileInfo info(projectDirectory());
         if(!info.exists())
            setProjectDirectoryError(
                i18n("'%1' does not exist.").arg(
@@ -243,7 +243,7 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const QString& text ) {
 }
 
 void GeneralInfoWidget::slotProjectDirectoryComboChanged() {
-    QString text = project_directory_edit->text();
+    TQString text = project_directory_edit->text();
     if(isProjectDirectoryAbsolute() && text[0] != '/' )
         project_directory_edit->setText(ProjectManager::projectDirectory(text,false));
     else if(!isProjectDirectoryAbsolute() && text[0] == '/')
@@ -252,7 +252,7 @@ void GeneralInfoWidget::slotProjectDirectoryComboChanged() {
     }
 }
 
-void GeneralInfoWidget::setProjectDirectoryError( const QString& error ) {
+void GeneralInfoWidget::setProjectDirectoryError( const TQString& error ) {
     project_directory_diagnostic_icon->setPixmap(SmallIcon("no"));
     project_directory_diagnostic_label->setText( error );
 }
@@ -267,17 +267,17 @@ void GeneralInfoWidget::setProjectDirectorySuccess() {
             i18n("'%1' is a valid project directory.").arg(projectDirectory()));
 }
 
-QString makeRelativePath(const QString& fromPath, const QString& toPath)
+TQString makeRelativePath(const TQString& fromPath, const TQString& toPath)
 {
     if ( fromPath == toPath )
         return ".";
 
-    QStringList fromDirs = QStringList::split( '/', fromPath );
-    QStringList toDirs   = QStringList::split( '/', toPath );
-    QStringList::iterator fromIt = fromDirs.begin();
-    QStringList::iterator toIt   = toDirs.begin();
+    TQStringList fromDirs = TQStringList::split( '/', fromPath );
+    TQStringList toDirs   = TQStringList::split( '/', toPath );
+    TQStringList::iterator fromIt = fromDirs.begin();
+    TQStringList::iterator toIt   = toDirs.begin();
 
-    QString relative;
+    TQString relative;
 
     for ( ; (*fromIt) == (*toIt); ++fromIt, ++toIt )
         ;
diff --git a/src/generalinfowidget.h b/src/generalinfowidget.h
index b6e3a85f..d1698f09 100644
--- a/src/generalinfowidget.h
+++ b/src/generalinfowidget.h
@@ -11,8 +11,8 @@
 #ifndef _GENERALINFOWIDGET_H_
 #define _GENERALINFOWIDGET_H_
 
-#include 
-#include 
+#include 
+#include 
 
 #include "generalinfowidgetbase.h"
 
@@ -26,28 +26,28 @@ class GeneralInfoWidget : public GeneralInfoWidgetBase {
 
 public:
 
-    GeneralInfoWidget(QDomDocument &projectDom, QWidget *parent=0, const char *name=0);
+    GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0);
     ~GeneralInfoWidget();
 
 public slots:
     void accept();
 
 private slots:
-    void slotProjectDirectoryChanged( const QString& text );
+    void slotProjectDirectoryChanged( const TQString& text );
     void slotProjectDirectoryComboChanged();
 
 private:
 
-    QDomDocument m_projectDom;
+    TQDomDocument m_projectDom;
 
     void readConfig();
     void writeConfig();
 
     bool isProjectDirectoryAbsolute();
-    QString projectDirectory();
-    void setProjectDirectoryError( const QString& error );
+    TQString projectDirectory();
+    void setProjectDirectoryError( const TQString& error );
     void setProjectDirectorySuccess();
-    void configureinUpdateVersion( QString configureinpath, QString newVersion );
+    void configureinUpdateVersion( TQString configureinpath, TQString newVersion );
 };
 
 #endif
diff --git a/src/kconf_update/kdev-gen-settings-kconf_update.cpp b/src/kconf_update/kdev-gen-settings-kconf_update.cpp
index 1f3c9740..b8da1f60 100644
--- a/src/kconf_update/kdev-gen-settings-kconf_update.cpp
+++ b/src/kconf_update/kdev-gen-settings-kconf_update.cpp
@@ -15,21 +15,21 @@
     *************************************************************************
 */
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
-static QTextStream qcin ( stdin,  IO_ReadOnly );
-static QTextStream qcout( stdout, IO_WriteOnly );
-static QTextStream qcerr( stderr, IO_WriteOnly );
+static TQTextStream qcin ( stdin,  IO_ReadOnly );
+static TQTextStream qcout( stdout, IO_WriteOnly );
+static TQTextStream qcerr( stderr, IO_WriteOnly );
 
 // Group cache. Yes, I know global vars are ugly :)
 bool needFlush = false;
-QString newKeyValue;
+TQString newKeyValue;
 int newDataValue;
 
-void parseKey( const QString &group, const QString &key,
-               const QString &value, const QString &rawLine )
+void parseKey( const TQString &group, const TQString &key,
+               const TQString &value, const TQString &rawLine )
 {
 
     //qcerr << "*** group='" << group << "'" << endl;
@@ -72,18 +72,18 @@ void parseKey( const QString &group, const QString &key,
 
 int main()
 {
-    qcin.setEncoding( QTextStream::UnicodeUTF8 );
-    qcout.setEncoding( QTextStream::UnicodeUTF8 );
+    qcin.setEncoding( TQTextStream::UnicodeUTF8 );
+    qcout.setEncoding( TQTextStream::UnicodeUTF8 );
 
-    QString curGroup;
+    TQString curGroup;
 
-    QRegExp groupRegExp( "^\\[(.*)\\]" );
-    QRegExp keyRegExp( "^([a-zA-Z0-9:, _-]*)\\s*=\\s*(.*)\\s*" );
-    QRegExp commentRegExp( "^(#.*)?$" );
+    TQRegExp groupRegExp( "^\\[(.*)\\]" );
+    TQRegExp keyRegExp( "^([a-zA-Z0-9:, _-]*)\\s*=\\s*(.*)\\s*" );
+    TQRegExp commentRegExp( "^(#.*)?$" );
 
     while ( !qcin.atEnd() )
     {
-        QString line = qcin.readLine();
+        TQString line = qcin.readLine();
 
         if ( commentRegExp.exactMatch( line ) )
         {
diff --git a/src/kdevassistantextension.cpp b/src/kdevassistantextension.cpp
index 85c8462a..ddbfb6bf 100644
--- a/src/kdevassistantextension.cpp
+++ b/src/kdevassistantextension.cpp
@@ -29,12 +29,12 @@ void KDevAssistantExtension::init()
     s_instance = new KDevAssistantExtension();
 }
 
-QString KDevAssistantExtension::xmlFile()
+TQString KDevAssistantExtension::xmlFile()
 {
     return "kdevassistantui.rc";
 }
 
-QString KDevAssistantExtension::defaultProfile()
+TQString KDevAssistantExtension::defaultProfile()
 {
     return "KDevAssistant";
 }
diff --git a/src/kdevassistantextension.h b/src/kdevassistantextension.h
index 062977ec..874cafbd 100644
--- a/src/kdevassistantextension.h
+++ b/src/kdevassistantextension.h
@@ -29,9 +29,9 @@ public:
     virtual void createGlobalSettingsPage(KDialogBase */*dlg*/) {};
     virtual void acceptGlobalSettingsPage(KDialogBase */*dlg*/) {};
 
-    virtual QString xmlFile();
+    virtual TQString xmlFile();
     
-    virtual QString defaultProfile();
+    virtual TQString defaultProfile();
         
 protected:
     KDevAssistantExtension();
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index 98e9e7e2..0c35de83 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -19,11 +19,11 @@
  ***************************************************************************/
 #include "kdevideextension.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 #include 
@@ -54,7 +54,7 @@ void KDevIDEExtension::init()
 void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
 {
     KConfig* config = kapp->config();
-    QVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("kdevelop", KIcon::SizeMedium) );
+    TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("kdevelop", KIcon::SizeMedium) );
     gsw = new SettingsWidget(vbox, "general settings widget");
 
     gsw->projectsURL->setMode((int)KFile::Directory);
@@ -70,16 +70,16 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
     gsw->userLocaleRadio->setChecked( !config->readBoolEntry( "ForceCLocale", true ) );
 
     config->setGroup("General Options");
-    gsw->projectsURL->setURL(config->readPathEntry("DefaultProjectsDir", QDir::homeDirPath()+"/"));
+    gsw->projectsURL->setURL(config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"));
     gsw->designerButtonGroup->setButton( config->readNumEntry( "DesignerApp", 0 ) );
 
-    QString DesignerSetting = config->readEntry( "DesignerSetting", "ExternalDesigner" );
+    TQString DesignerSetting = config->readEntry( "DesignerSetting", "ExternalDesigner" );
     gsw->qtDesignerRadioButton->setChecked( DesignerSetting == "ExternalDesigner" );
     gsw->seperateAppRadioButton->setChecked( DesignerSetting == "ExternalKDevDesigner" );
     gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedKDevDesigner" );
 
     config->setGroup("TerminalEmulator");
-    gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", QString::fromLatin1("konsole") ) );
+    gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::fromLatin1("konsole") ) );
     bool useKDESetting = config->readBoolEntry( "UseKDESetting", true );
     gsw->useKDETerminal->setChecked( useKDESetting );
     gsw->useOtherTerminal->setChecked( !useKDESetting );
@@ -95,7 +95,7 @@ void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
     config->writePathEntry("DefaultProjectsDir", gsw->projectsURL->url());
     config->writeEntry("OutputViewFont", gsw->outputFont->font());
 
-    QString DesignerSetting;
+    TQString DesignerSetting;
     if ( gsw->qtDesignerRadioButton->isChecked() ) DesignerSetting = "ExternalDesigner";
     if ( gsw->seperateAppRadioButton->isChecked() ) DesignerSetting = "ExternalKDevDesigner";
     if ( gsw->embeddedDesignerRadioButton->isChecked() ) DesignerSetting = "EmbeddedKDevDesigner";
@@ -118,12 +118,12 @@ void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
     config->writeEntry("TerminalApplication", gsw->terminalEdit->text().stripWhiteSpace() );
 }
 
-QString KDevIDEExtension::xmlFile()
+TQString KDevIDEExtension::xmlFile()
 {
     return "kdevelopui.rc";
 }
 
-QString KDevIDEExtension::defaultProfile()
+TQString KDevIDEExtension::defaultProfile()
 {
     return "IDE";
 }
diff --git a/src/kdevideextension.h b/src/kdevideextension.h
index e5e506e7..1e25da7e 100644
--- a/src/kdevideextension.h
+++ b/src/kdevideextension.h
@@ -31,9 +31,9 @@ public:
     virtual void createGlobalSettingsPage(KDialogBase *dlg);
     virtual void acceptGlobalSettingsPage(KDialogBase *dlg);
     
-    virtual QString xmlFile();
+    virtual TQString xmlFile();
     
-    virtual QString defaultProfile();
+    virtual TQString defaultProfile();
     
 protected:
     KDevIDEExtension();
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index 45922c2d..6c6bd357 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -9,15 +9,15 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -36,43 +36,43 @@ class LangPluginItem : public QCheckListItem
 {
 public:
     // name - "Name", label - "GenericName", info - "Comment"
-    LangPluginItem( QListView * parent, QString const & name, QString const & label,
-                QString const & info )
-        : QCheckListItem( parent, label, QCheckListItem::CheckBox),
+    LangPluginItem( TQListView * parent, TQString const & name, TQString const & label,
+                TQString const & info )
+        : TQCheckListItem( parent, label, TQCheckListItem::CheckBox),
         _name( name ), _info( info )
     {}
 
-    QString info() { return _info; }
-    QString name() { return _name; }
+    TQString info() { return _info; }
+    TQString name() { return _name; }
 
 private:
-    QString _name;
-    QString _info;
+    TQString _name;
+    TQString _info;
 };
 
 
-LanguageSelectWidget::LanguageSelectWidget(QDomDocument &projectDom,
-                                   QWidget *parent, const char *name)
-    : QWidget(parent, name), m_projectDom(projectDom)
+LanguageSelectWidget::LanguageSelectWidget(TQDomDocument &projectDom,
+                                   TQWidget *parent, const char *name)
+    : TQWidget(parent, name), m_projectDom(projectDom)
 {
     init();
 }
 
 void LanguageSelectWidget::init()
 {
-    QVBoxLayout *layout = new QVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
 
-    QGroupBox * groupBox1 = new QGroupBox( i18n("Additional Language Support"), this );
+    TQGroupBox * groupBox1 = new TQGroupBox( i18n("Additional Language Support"), this );
     groupBox1->setColumnLayout(0, Qt::Vertical );
     groupBox1->layout()->setSpacing( 6 );
     groupBox1->layout()->setMargin( 11 );
-    QVBoxLayout * groupBox1Layout = new QVBoxLayout( groupBox1->layout() );
+    TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->layout() );
     groupBox1Layout->setAlignment( Qt::AlignTop );
 
-    _currentLanguage = new QLabel( "", groupBox1 );
+    _currentLanguage = new TQLabel( "", groupBox1 );
 
-    _pluginList = new QListView( groupBox1 );
-    _pluginList->setResizeMode( QListView::LastColumn );
+    _pluginList = new TQListView( groupBox1 );
+    _pluginList->setResizeMode( TQListView::LastColumn );
     _pluginList->addColumn("");
     _pluginList->header()->hide();
 
@@ -80,21 +80,21 @@ void LanguageSelectWidget::init()
     groupBox1Layout->addWidget( _pluginList );
     layout->addWidget( groupBox1 );
 
-    QGroupBox * groupBox2 = new QGroupBox( i18n("Description"), this );
+    TQGroupBox * groupBox2 = new TQGroupBox( i18n("Description"), this );
     groupBox2->setColumnLayout(0, Qt::Vertical );
     groupBox2->layout()->setSpacing( 6 );
     groupBox2->layout()->setMargin( 11 );
-    QVBoxLayout * groupBox2Layout = new QVBoxLayout( groupBox2->layout() );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
     groupBox2Layout->setAlignment( Qt::AlignTop );
 
-    _pluginDescription = new QLabel( groupBox2 );
-    _pluginDescription->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) );
+    _pluginDescription = new TQLabel( groupBox2 );
+    _pluginDescription->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 
     groupBox2Layout->addWidget( _pluginDescription );
 
     layout->addWidget( groupBox2 );
 
-    connect( _pluginList, SIGNAL( selectionChanged( QListViewItem * ) ), this, SLOT( itemSelected( QListViewItem * ) ) );
+    connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) );
 
     readProjectConfig();
 }
@@ -106,30 +106,30 @@ LanguageSelectWidget::~LanguageSelectWidget()
 void LanguageSelectWidget::readProjectConfig()
 {
     KTrader::OfferList languageSupportOffers =
-        KTrader::self()->query(QString::fromLatin1("KDevelop/LanguageSupport"),
-                               QString::fromLatin1("[X-KDevelop-Version] == %1"
+        KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
+                               TQString::fromLatin1("[X-KDevelop-Version] == %1"
                                ).arg( KDEVELOP_PLUGIN_VERSION ));
 
-    QStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language");
-    QString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage");
+    TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language");
+    TQString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage");
     _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").arg(language));
 
     for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it)
     {
-        QString la = (*it)->property("X-KDevelop-Language").toString();
+        TQString la = (*it)->property("X-KDevelop-Language").toString();
         if (la == language)
             continue;
         LangPluginItem *item = new LangPluginItem( _pluginList, (*it)->property("X-KDevelop-Language").toString(), (*it)->genericName(), (*it)->comment() );
         item->setOn(languages.contains(la));
     }
 
-    QListViewItem * first = _pluginList->firstChild();
+    TQListViewItem * first = _pluginList->firstChild();
     if ( first ) {
         _pluginList->setSelected( first, true );
     }
 }
 
-void LanguageSelectWidget::itemSelected( QListViewItem * item )
+void LanguageSelectWidget::itemSelected( TQListViewItem * item )
 {
     if ( !item ) return;
 
@@ -139,9 +139,9 @@ void LanguageSelectWidget::itemSelected( QListViewItem * item )
 
 void LanguageSelectWidget::saveProjectConfig()
 {
-    QStringList languages;
+    TQStringList languages;
 
-    QListViewItemIterator it( _pluginList );
+    TQListViewItemIterator it( _pluginList );
     while ( it.current() )
     {
         LangPluginItem * item = static_cast( it.current() );
diff --git a/src/languageselectwidget.h b/src/languageselectwidget.h
index dcd063f0..7eeeb479 100644
--- a/src/languageselectwidget.h
+++ b/src/languageselectwidget.h
@@ -12,9 +12,9 @@
 #ifndef _LANGUAGESELECTWIDGET_H_
 #define _LANGUAGESELECTWIDGET_H_
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 class QListView;
 
@@ -24,7 +24,7 @@ class LanguageSelectWidget : public QWidget
 
 public:
     /* for selection of project parts */
-    LanguageSelectWidget( QDomDocument &projectDom, QWidget *parent=0, const char *name=0 );
+    LanguageSelectWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 );
     ~LanguageSelectWidget();
 
 public slots:
@@ -34,17 +34,17 @@ signals:
    void accepted();
 
 private slots:
-    void itemSelected( QListViewItem * );
+    void itemSelected( TQListViewItem * );
 
 private:
     void init();
     void readProjectConfig();
     void saveProjectConfig();
 
-    QDomDocument m_projectDom;
-    QListView * _pluginList;
-    QLabel * _pluginDescription;
-    QLabel * _currentLanguage;
+    TQDomDocument m_projectDom;
+    TQListView * _pluginList;
+    TQLabel * _pluginDescription;
+    TQLabel * _currentLanguage;
 
 };
 
diff --git a/src/main.cpp b/src/main.cpp
index 54d64b4c..467724d1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -9,7 +9,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "splashscreen.h"
 #include "toplevel.h"
@@ -89,10 +89,10 @@ int main(int argc, char *argv[])
   KDevIDEExtension::init();
 
   KDevSplashScreen *splash = 0;
-  QString splashFile = locate("appdata", "pics/kdevelop-splash.png");
+  TQString splashFile = locate("appdata", "pics/kdevelop-splash.png");
   if (!splashFile.isEmpty())
   {
-    QPixmap pm;
+    TQPixmap pm;
     pm.load(splashFile);
     splash = new KDevSplashScreen( pm );
   }
@@ -102,8 +102,8 @@ int main(int argc, char *argv[])
   if (splash) splash->message( i18n( "Loading Settings" ) );
   TopLevel::getInstance()->loadSettings();
 
-  QObject::connect(PluginController::getInstance(), SIGNAL(loadingPlugin(const QString &)),
-    splash, SLOT(message(const QString &)));
+  TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)),
+    splash, TQT_SLOT(message(const TQString &)));
   if (splash) splash->show();
 
   PluginController::getInstance()->loadInitialPlugins();
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
       openProject = true;
   } else if( args->count() > 0 ){
       KURL url = args->url( 0 );
-      QString ext = QFileInfo( url.fileName() ).extension();
+      TQString ext = TQFileInfo( url.fileName() ).extension();
       if( ext == "kdevelop" ){
 	  ProjectManager::getInstance()->loadProject( url );
 	  openProject = true;
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index 0eb80192..d851447f 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -9,7 +9,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "splashscreen.h"
 #include "toplevel.h"
@@ -83,10 +83,10 @@ int main(int argc, char *argv[])
   KDevAssistantExtension::init();
 
   KDevSplashScreen *splash = 0;
-  QString splashFile = locate("data", "kdevelop/pics/kdevassistant-splash.png");
+  TQString splashFile = locate("data", "kdevelop/pics/kdevassistant-splash.png");
   if (!splashFile.isEmpty())
   {
-    QPixmap pm;
+    TQPixmap pm;
     pm.load(splashFile);
     splash = new KDevSplashScreen( pm );
   }
@@ -94,8 +94,8 @@ int main(int argc, char *argv[])
 
   app.processEvents();
 
-  QObject::connect(PluginController::getInstance(), SIGNAL(loadingPlugin(const QString &)),
-		   splash, SLOT(showMessage(const QString &)));
+  TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)),
+		   splash, TQT_SLOT(showMessage(const TQString &)));
 
   if (splash) splash->message( i18n( "Loading Settings" ) );
   TopLevel::getInstance()->loadSettings();
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 4dcb17c9..b725db23 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -15,12 +15,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -67,8 +67,8 @@
 
 using namespace MainWindowUtils;
 
-MainWindowShare::MainWindowShare(QObject* pParent, const char* name)
-  :QObject(pParent, name)
+MainWindowShare::MainWindowShare(TQObject* pParent, const char* name)
+  :TQObject(pParent, name)
   ,m_toggleMainToolbar(0L)
   ,m_toggleBuildToolbar(0L)
   ,m_toggleViewToolbar(0L)
@@ -81,14 +81,14 @@ MainWindowShare::MainWindowShare(QObject* pParent, const char* name)
 
 void MainWindowShare::init()
 {
-  connect(Core::getInstance(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-          this, SLOT(contextMenu(QPopupMenu *, const Context *)));
+  connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+          this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
 
-  connect( m_pMainWnd->actionCollection(), SIGNAL( actionStatusText( const QString & ) ),
-        this, SLOT( slotActionStatusText( const QString & ) ) );
+  connect( m_pMainWnd->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ),
+        this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
 }
 
-void MainWindowShare::slotActionStatusText( const QString &text )
+void MainWindowShare::slotActionStatusText( const TQString &text )
 {
 //    kdDebug(9000) << "MainWindowShare::slotActionStatusText() - " << text << endl;
 
@@ -105,83 +105,83 @@ void MainWindowShare::createActions()
 {
   ProjectManager::getInstance()->createActions( m_pMainWnd->actionCollection() );
 
-  KStdAction::quit(this->parent(), SLOT(close()), m_pMainWnd->actionCollection());
+  KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection());
 
   KAction* action;
 
   m_stopProcesses = new KToolBarPopupAction( i18n( "&Stop" ), "stop",
-                                 Key_Escape, this, SLOT(slotStopButtonPressed()),
+                                 Key_Escape, this, TQT_SLOT(slotStopButtonPressed()),
                                  m_pMainWnd->actionCollection(), "stop_processes" );
   m_stopProcesses->setToolTip(i18n("Stop"));
   m_stopProcesses->setWhatsThis(i18n("Stop
        Stops all running processes (like building process, grep command, etc.). When placed onto a toolbar provides a popup menu to choose a process to stop."));
   m_stopProcesses->setEnabled( false );
-  connect(m_stopProcesses->popupMenu(), SIGNAL(aboutToShow()),
-         this, SLOT(slotStopMenuAboutToShow()));
-  connect(m_stopProcesses->popupMenu(), SIGNAL(activated(int)),
-         this, SLOT(slotStopPopupActivated(int)));
+  connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(aboutToShow()),
+         this, TQT_SLOT(slotStopMenuAboutToShow()));
+  connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(activated(int)),
+         this, TQT_SLOT(slotStopPopupActivated(int)));
 
-  connect( Core::getInstance(), SIGNAL(activeProcessChanged(KDevPlugin*, bool)),
-           this, SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) );
+  connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(KDevPlugin*, bool)),
+           this, TQT_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) );
 
   action = KStdAction::showMenubar(
-                this, SLOT(slotShowMenuBar()),
+                this, TQT_SLOT(slotShowMenuBar()),
                 m_pMainWnd->actionCollection(), "settings_show_menubar" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(QString("%1
        %2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off.")));
+  action->setWhatsThis(TQString("%1
        %2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off.")));
 
   action = KStdAction::keyBindings(
-                this, SLOT(slotKeyBindings()),
+                this, TQT_SLOT(slotKeyBindings()),
                 m_pMainWnd->actionCollection(), "settings_configure_shortcuts" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(QString("%1
        %2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys.")));
+  action->setWhatsThis(TQString("%1
        %2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys.")));
 
   action = KStdAction::configureToolbars(
-                this, SLOT(slotConfigureToolbars()),
+                this, TQT_SLOT(slotConfigureToolbars()),
                 m_pMainWnd->actionCollection(), "settings_configure_toolbars" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(QString("%1
        %2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars.")));
+  action->setWhatsThis(TQString("%1
        %2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars.")));
 
   action = KStdAction::configureNotifications(
-                this, SLOT(slotConfigureNotifications()),
+                this, TQT_SLOT(slotConfigureNotifications()),
                 m_pMainWnd->actionCollection(), "settings_configure_notifications" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(QString("%1
        %2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications.")));
+  action->setWhatsThis(TQString("%1
        %2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications.")));
 
-  action = KStdAction::preferences(this, SLOT(slotSettings()),
+  action = KStdAction::preferences(this, TQT_SLOT(slotSettings()),
                 m_pMainWnd->actionCollection(), "settings_configure" );
   action->setToolTip( i18n( "Configure KDevelop" ) );
-  action->setWhatsThis(QString("%1
        %2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop.")));
+  action->setWhatsThis(TQString("%1
        %2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop.")));
 
-  m_toggleStatusbar = KStdAction::showToolbar(this, SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar");
+  m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar");
   m_toggleStatusbar->setText(i18n("Show &Statusbar"));
   m_toggleStatusbar->setToolTip( i18n("Show statusbar") );
   m_toggleStatusbar->setWhatsThis(i18n("Show statusbar
        Hides or shows the statusbar."));
 
-  action = new KAction( i18n("&Next Window"), ALT+Key_Right, this, SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window");
+  action = new KAction( i18n("&Next Window"), ALT+Key_Right, this, TQT_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window");
   action->setToolTip( i18n("Next window") );
   action->setWhatsThis(i18n("Next window
        Switches to the next window."));
 
-  action = new KAction( i18n("&Previous Window"), ALT+Key_Left, this, SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window");
+  action = new KAction( i18n("&Previous Window"), ALT+Key_Left, this, TQT_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window");
   action->setToolTip( i18n("Previous window") );
   action->setWhatsThis(i18n("Previous window
        Switches to the previous window."));
 
-  action = new KAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window");
+  action = new KAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQT_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window");
   action->setToolTip( i18n("Last accessed window") );
   action->setWhatsThis(i18n("Last accessed window
        Switches to the last viewed window (Hold the Alt key pressed and walk on by repeating the Up key)."));
 
-  action = new KAction( i18n("&First Accessed Window"), ALT+Key_Down, this, SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window");
+  action = new KAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQT_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window");
   action->setToolTip( i18n("First accessed window") );
   action->setWhatsThis(i18n("First accessed window
        Switches to the first accessed window (Hold the Alt key pressed and walk on by repeating the Down key)."));
 
-  action = new KAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" );
+  action = new KAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQT_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" );
 
-  m_configureEditorAction = new KAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors");
+  m_configureEditorAction = new KAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQT_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors");
   m_configureEditorAction->setToolTip( i18n("Configure editor settings") );
   m_configureEditorAction->setWhatsThis(i18n("Configure editor
        Opens editor configuration dialog."));
   m_configureEditorAction->setEnabled( false );
 
   KDevPartController * partController = API::getInstance()->partController();
-  connect( partController, SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(slotActivePartChanged(KParts::Part* )) );
+  connect( partController, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* )) );
 }
 
 void MainWindowShare::slotReportBug()
@@ -257,7 +257,7 @@ void MainWindowShare::slotStopPopupActivated( int id )
     return;
   } else {
     // oops... list has changed in the meantime
-    QString str = m_stopProcesses->popupMenu()->text( id );
+    TQString str = m_stopProcesses->popupMenu()->text( id );
     for ( plugin = activeProcesses.first(); plugin; plugin = activeProcesses.next() ) {
       if ( plugin->info()->genericName() == str ) {
   Core::getInstance()->doEmitStopButtonPressed( plugin );
@@ -269,7 +269,7 @@ void MainWindowShare::slotStopPopupActivated( int id )
 
 void MainWindowShare::slotStopMenuAboutToShow()
 {
-  QPopupMenu* popup = m_stopProcesses->popupMenu();
+  TQPopupMenu* popup = m_stopProcesses->popupMenu();
   popup->clear();
 
   int i = 0;
@@ -317,7 +317,7 @@ void MainWindowShare::slotSettings()
     config->writeEntry( "Height", dlg.size().height() );
     config->writeEntry( "Width", dlg.size().width() );
 
-    if ( dlg.result() != QDialog::Rejected )
+    if ( dlg.result() != TQDialog::Rejected )
         ShellExtension::getInstance()->acceptGlobalSettingsPage(&dlg);
 }
 
@@ -367,15 +367,15 @@ void MainWindowShare::slotGUICreated( KParts::Part * part )
 	if ( KAction * action = part->action("file_save") )
 	{
 		kdDebug(9000) << " *** found \"file_save\" action - disconnecting" << endl;
-		disconnect( action, SIGNAL(activated()), 0, 0 );
-		connect( action, SIGNAL(activated()), PartController::getInstance(), SLOT(slotSave()) );
+		disconnect( action, TQT_SIGNAL(activated()), 0, 0 );
+		connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotSave()) );
 	}
 
 	if ( KAction * action = part->action("file_reload") )
 	{
 		kdDebug(9000) << " *** found \"file_reload\" action - disconnecting" << endl;
-		disconnect( action, SIGNAL(activated()), 0, 0 );
-		connect( action, SIGNAL(activated()), PartController::getInstance(), SLOT(slotReload()) );
+		disconnect( action, TQT_SIGNAL(activated()), 0, 0 );
+		connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotReload()) );
 	}
 }
 
@@ -392,8 +392,8 @@ void MainWindowShare::slotNewToolbarConfig()
 void MainWindowShare::slotKeyBindings()
 {
   KKeyDialog dlg( false, m_pMainWnd );
-  QPtrList clients = m_pMainWnd->guiFactory()->clients();
-  for( QPtrListIterator it( clients );
+  TQPtrList clients = m_pMainWnd->guiFactory()->clients();
+  for( TQPtrListIterator it( clients );
        it.current(); ++it ) {
     dlg.insert( (*it)->actionCollection() );
   }
@@ -401,17 +401,17 @@ void MainWindowShare::slotKeyBindings()
   {
   // this is needed for when we have multiple embedded kateparts and change one of them.
   // it also needs to be done to their views, as they too have actioncollections to update
-    if( const QPtrList * partlist = PartController::getInstance()->parts() )
+    if( const TQPtrList * partlist = PartController::getInstance()->parts() )
     {
-        QPtrListIterator it( *partlist );
+        TQPtrListIterator it( *partlist );
         while ( KParts::Part* part = it.current() )
         {
             if ( KTextEditor::Document * doc = dynamic_cast( part ) )
             {
                 doc->reloadXML();
 
-                QPtrList const & list = doc->views();
-                QPtrListIterator itt( list );
+                TQPtrList const & list = doc->views();
+                TQPtrListIterator itt( list );
                 while( KTextEditor::View * view = itt.current() )
                 {
                     view->reloadXML();
@@ -429,16 +429,16 @@ void MainWindowShare::slotConfigureToolbars()
 {
   m_pMainWnd->saveMainWindowSettings( KGlobal::config(), "Mainwindow" );
   KEditToolbar dlg( m_pMainWnd->factory() );
-  connect(&dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()));
+  connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()));
   dlg.exec();
 }
 
-void MainWindowShare::contextMenu(QPopupMenu* popup, const Context *)
+void MainWindowShare::contextMenu(TQPopupMenu* popup, const Context *)
 {
   if ( m_pMainWnd->menuBar()->isVisible() )
     return;
 
-  int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), SLOT(show()) );
+  int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQT_SLOT(show()) );
   popup->setWhatsThis(id, i18n("Show menubar
        Lets you switch the menubar on/off."));
 }
 
diff --git a/src/mainwindowshare.h b/src/mainwindowshare.h
index 6fba07a3..72a4b5ea 100644
--- a/src/mainwindowshare.h
+++ b/src/mainwindowshare.h
@@ -17,7 +17,7 @@
 #ifndef __MAINWINDOWSHARE_H__
 #define __MAINWINDOWSHARE_H__
 
-#include 
+#include 
 
 class KAction;
 class KToggleAction;
@@ -31,7 +31,7 @@ class MainWindowShare : public QObject
 {
   Q_OBJECT
 public:
-  MainWindowShare(QObject* pParent = 0L, const char* name = 0L);
+  MainWindowShare(TQObject* pParent = 0L, const char* name = 0L);
   ~MainWindowShare() {}
 
   void createActions();
@@ -60,7 +60,7 @@ private slots:
   void slotStopButtonPressed();
   void slotNewToolbarConfig();
   void slotShowMenuBar();
-  void slotActionStatusText( const QString &text );
+  void slotActionStatusText( const TQString &text );
 
   void slotToggleMainToolbar();
   void slotToggleBuildToolbar();
@@ -68,7 +68,7 @@ private slots:
   void slotToggleBrowserToolbar();
   void slotToggleStatusbar();
 
-  void contextMenu(QPopupMenu *, const Context *);
+  void contextMenu(TQPopupMenu *, const Context *);
 
 private:
   KToggleAction*   m_toggleMainToolbar;
@@ -82,7 +82,7 @@ private:
   KToolBarPopupAction*  m_stopProcesses;                 //!< Stops all running processes
 
   KParts::MainWindow*   m_pMainWnd;
-  QPtrList  activeProcesses;
+  TQPtrList  activeProcesses;
 };
 
 #endif // __MAINWINDOWSHARE_H__
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp
index cdbffe85..bd5942fc 100644
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@@ -45,8 +45,8 @@
 #include 
 #include 
 
-MultiBuffer::MultiBuffer( QWidget *parent )
-        : QSplitter( parent, "MultiBuffer" ),
+MultiBuffer::MultiBuffer( TQWidget *parent )
+        : TQSplitter( parent, "MultiBuffer" ),
         m_editorFactory( 0 ),
         m_delayActivate( false ),
         m_activated( false ),
@@ -57,8 +57,8 @@ MultiBuffer::MultiBuffer( QWidget *parent )
          API::getInstance() ->languageSupport() )
     {
         setOrientation( lang->splitOrientation() );
-        connect( lang, SIGNAL( splitOrientationChanged( Qt::Orientation ) ),
-                 this, SLOT( setOrientation( Qt::Orientation ) ) );
+        connect( lang, TQT_SIGNAL( splitOrientationChanged( Qt::Orientation ) ),
+                 this, TQT_SLOT( setOrientation( Qt::Orientation ) ) );
     }
     else
     {
@@ -150,10 +150,10 @@ void MultiBuffer::registerDelayedActivation( KParts::Part *part,
     m_delayedActivation[ part ] = qMakePair( line, col );
 }
 
-KParts::Part* MultiBuffer::createPart( const QString &mimeType,
-                                       const QString &partType,
-                                       const QString &className,
-                                       const QString &preferredName )
+KParts::Part* MultiBuffer::createPart( const TQString &mimeType,
+                                       const TQString &partType,
+                                       const TQString &className,
+                                       const TQString &preferredName )
 {
     m_editorFactory = PartController::getInstance() ->findPartFactory(
                           mimeType, partType, preferredName );
@@ -174,9 +174,9 @@ KParts::Part* MultiBuffer::createPart( const KURL &url )
 
     KMimeType::Ptr mimeType = KMimeType::findByURL( url );
 
-    QString className;
-    QString services[] = { "KParts/ReadWritePart", "KParts/ReadOnlyPart" };
-    QString classnames[] = { "KParts::ReadWritePart", "KParts::ReadOnlyPart" };
+    TQString className;
+    TQString services[] = { "KParts/ReadWritePart", "KParts/ReadOnlyPart" };
+    TQString classnames[] = { "KParts::ReadWritePart", "KParts::ReadOnlyPart" };
     for ( uint i = 0; i < 2; ++i )
     {
         m_editorFactory = PartController::getInstance() ->findPartFactory(
@@ -201,7 +201,7 @@ void MultiBuffer::show()
 {
     if ( !m_delayedActivation.count() || m_activated )
     {
-        QSplitter::show();
+        TQSplitter::show();
         return ;
     }
 
@@ -221,8 +221,8 @@ void MultiBuffer::show()
 
         // We're managing the view deletion by being its parent,
         // don't let the part self-destruct
-        disconnect( view, SIGNAL( destroyed() ),
-                    document, SLOT( slotWidgetDestroyed() ) );
+        disconnect( view, TQT_SIGNAL( destroyed() ),
+                    document, TQT_SLOT( slotWidgetDestroyed() ) );
 
         document->insertChildClient( view );
         PartController::getInstance() ->integrateTextEditorPart( document );
@@ -246,12 +246,12 @@ void MultiBuffer::show()
     }
 
     m_activated = true;
-    QSplitter::show();
+    TQSplitter::show();
 }
 
 void MultiBuffer::setOrientation( Qt::Orientation orientation )
 {
-    QSplitter::setOrientation( orientation );
+    TQSplitter::setOrientation( orientation );
 }
 
 void MultiBuffer::activePartChanged( const KURL &url )
@@ -263,12 +263,12 @@ void MultiBuffer::activePartChanged( const KURL &url )
     TopLevel::getInstance() ->setCurrentDocumentCaption( url.fileName() );
 }
 
-void MultiBuffer::focusInEvent( QFocusEvent *ev )
+void MultiBuffer::focusInEvent( TQFocusEvent *ev )
 {
     KParts::Part *active = activeBuffer();
     if (active && active->widget())
 	active->widget()->setFocus();
-    QSplitter::focusInEvent(ev);
+    TQSplitter::focusInEvent(ev);
 }
 
 bool MultiBuffer::hasPart( KParts::Part *part )
diff --git a/src/multibuffer.h b/src/multibuffer.h
index 3d04f256..a481574f 100644
--- a/src/multibuffer.h
+++ b/src/multibuffer.h
@@ -21,9 +21,9 @@
 #ifndef MULTIBUFFER_H
 #define MULTIBUFFER_H
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 namespace KParts
 {
@@ -34,14 +34,14 @@ class ReadOnlyPart;
 
 class KURL;
 
-typedef QMap< KURL, KParts::Part* > BufferMap;
-typedef QMap< KParts::Part*, QPair > ActivationMap;
+typedef TQMap< KURL, KParts::Part* > BufferMap;
+typedef TQMap< KParts::Part*, QPair > ActivationMap;
 
 class MultiBuffer : public QSplitter
 {
     Q_OBJECT
 public:
-    MultiBuffer( QWidget * parent = 0 );
+    MultiBuffer( TQWidget * parent = 0 );
     virtual ~MultiBuffer();
 
     KParts::Part *activeBuffer() const;
@@ -51,10 +51,10 @@ public:
     bool isActivated() const;
     void setDelayedActivation( bool delayed );
 
-    KParts::Part* createPart( const QString &mimeType,
-                              const QString &partType,
-                              const QString &className,
-                              const QString &preferredName = QString::null );
+    KParts::Part* createPart( const TQString &mimeType,
+                              const TQString &partType,
+                              const TQString &className,
+                              const TQString &preferredName = TQString::null );
 
     KParts::Part* openURL( const KURL &url );
     bool closeURL( const KURL &url );
@@ -70,18 +70,18 @@ public slots:
     void activePartChanged( const KURL &url );
 
 protected:
-    virtual void focusInEvent( QFocusEvent *ev );
+    virtual void focusInEvent( TQFocusEvent *ev );
 
 private:
     KParts::Part* createPart( const KURL &url );
 
 private:
     BufferMap m_buffers;
-    QGuardedPtr m_editorFactory;
+    TQGuardedPtr m_editorFactory;
     ActivationMap m_delayedActivation;
     bool m_delayActivate;
     bool m_activated;
-    QGuardedPtr m_activeBuffer;
+    TQGuardedPtr m_activeBuffer;
 };
 
 #endif
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index a0cdd246..0631510e 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -19,11 +19,11 @@
  ***************************************************************************/
 #include "button.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -39,9 +39,9 @@
 
 namespace Ideal {
 
-Button::Button(ButtonBar *parent, const QString text, const QIconSet &icon,
-    const QString &description)
-    :QPushButton(icon, text, parent), m_buttonBar(parent), m_description(description),
+Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
+    const TQString &description)
+    :TQPushButton(icon, text, parent), m_buttonBar(parent), m_description(description),
     m_place(parent->place()), m_realText(text), m_realIconSet(icon)
 {
     hide();
@@ -49,22 +49,22 @@ Button::Button(ButtonBar *parent, const QString text, const QIconSet &icon,
     setToggleButton(true);
     setFocusPolicy(NoFocus);
     setDescription(m_description);
-    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
     resize(sizeHint());
     fixDimensions(Ideal::Bottom);
 
-    QToolTip::add(this, m_realText);
+    TQToolTip::add(this, m_realText);
 
     m_assignAccelAction = new KAction(i18n("Assign Accelerator..."), 0,
-        this, SLOT(assignAccel()), this);
+        this, TQT_SLOT(assignAccel()), this);
     m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0,
-        this, SLOT(clearAccel()), this);
+        this, TQT_SLOT(clearAccel()), this);
 
     KConfig *config = kapp->config();
     config->setGroup("UI");
-    QString accel = config->readEntry(QString("button_%1").arg(text), "");
+    TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
     if (!accel.isEmpty())
-        setRealText(QString("&%1 %2").arg(accel).arg(m_realText));
+        setRealText(TQString("&%1 %2").arg(accel).arg(m_realText));
 }
 
 Button::~Button()
@@ -73,37 +73,37 @@ Button::~Button()
     KConfig *config = kapp->config();
     config->setGroup("UI");
 
-    QRegExp r("^&([0-9])\\s.*");
-    QRegExp r2("^&[0-9]\\s");
+    TQRegExp r("^&([0-9])\\s.*");
+    TQRegExp r2("^&[0-9]\\s");
     if (r.search(m_realText) > -1)
     {
-        QString text = m_realText;
+        TQString text = m_realText;
         if (text.contains(r2))
             text.remove(r2);
-        config->writeEntry(QString("button_%1").arg(text), r.cap(1));
+        config->writeEntry(TQString("button_%1").arg(text), r.cap(1));
     }
     else
     {
-        config->writeEntry(QString("button_%1").arg(m_realText), "");
+        config->writeEntry(TQString("button_%1").arg(m_realText), "");
     }
 }
 
-void Button::setDescription(const QString &description)
+void Button::setDescription(const TQString &description)
 {
     m_description = description;
-    QToolTip::remove(this);
-    QToolTip::add(this, m_description);
+    TQToolTip::remove(this);
+    TQToolTip::add(this, m_description);
 }
 
-QString Button::description() const
+TQString Button::description() const
 {
     return m_description;
 }
 
-void Button::drawButton(QPainter *p)
+void Button::drawButton(TQPainter *p)
 {
-    QRect r = rect();
-    QSize sh = r.size();
+    TQRect r = rect();
+    TQSize sh = r.size();
     switch (m_place)
     {
         case Ideal::Left:
@@ -113,29 +113,29 @@ void Button::drawButton(QPainter *p)
             break;
     }
 
-    QStyle::SFlags flags = QStyle::Style_Default;
+    TQStyle::SFlags flags = TQStyle::Style_Default;
     if (isEnabled())
-        flags |= QStyle::Style_Enabled;
+        flags |= TQStyle::Style_Enabled;
     if (hasFocus())
-        flags |= QStyle::Style_HasFocus;
+        flags |= TQStyle::Style_HasFocus;
     if (isDown())
-        flags |= QStyle::Style_Down;
+        flags |= TQStyle::Style_Down;
     if (isOn())
-        flags |= QStyle::Style_On;
+        flags |= TQStyle::Style_On;
     if (! isFlat() && ! isDown())
-        flags |= QStyle::Style_Raised;
+        flags |= TQStyle::Style_Raised;
     if (isDefault())
-        flags |= QStyle::Style_ButtonDefault;
+        flags |= TQStyle::Style_ButtonDefault;
 
-    QPixmap pm(sh.width(), sh.height());
+    TQPixmap pm(sh.width(), sh.height());
     pm.fill(eraseColor());
-    QPainter p2(&pm);
+    TQPainter p2(&pm);
 
-    style().drawControl(QStyle::CE_PushButton,&p2,this, QRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
+    style().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
 
-    style().drawControl(QStyle::CE_PushButtonLabel, &p2, this,
-                        QRect(0,0,pm.width(),pm.height()),
-                        colorGroup(), flags, QStyleOption());
+    style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
+                        TQRect(0,0,pm.width(),pm.height()),
+                        colorGroup(), flags, TQStyleOption());
 
     switch (m_place)
     {
@@ -153,7 +153,7 @@ void Button::drawButton(QPainter *p)
     }
 }
 
-void Button::drawButtonLabel(QPainter */*p*/)
+void Button::drawButtonLabel(TQPainter */*p*/)
 {
 }
 
@@ -194,43 +194,43 @@ void Button::fixDimensions(Place oldPlace)
     }
 }
 
-QSize Button::sizeHint() const
+TQSize Button::sizeHint() const
 {
     return sizeHint(text());
 }
 
-QSize Button::sizeHint(const QString &text) const
+TQSize Button::sizeHint(const TQString &text) const
 {
     constPolish();
     int w = 0, h = 0;
 
     if ( iconSet() && !iconSet()->isNull() && (m_buttonBar->mode() != Text) ) {
-        int iw = iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 4;
-        int ih = iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+        int iw = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
+        int ih = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height();
         w += iw;
         h = QMAX( h, ih );
     }
     if ( isMenuButton() )
-        w += style().pixelMetric(QStyle::PM_MenuButtonIndicator, this);
+        w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
     if ( pixmap() ) {
-        QPixmap *pm = (QPixmap *)pixmap();
+        TQPixmap *pm = (TQPixmap *)pixmap();
         w += pm->width();
         h += pm->height();
     } else if (m_buttonBar->mode() != Icons) {
-        QString s( text );
+        TQString s( text );
         bool empty = s.isEmpty();
         if ( empty )
-            s = QString::fromLatin1("XXXX");
-        QFontMetrics fm = fontMetrics();
-        QSize sz = fm.size( ShowPrefix, s );
+            s = TQString::fromLatin1("XXXX");
+        TQFontMetrics fm = fontMetrics();
+        TQSize sz = fm.size( ShowPrefix, s );
         if(!empty || !w)
             w += sz.width();
         if(!empty || !h)
             h = QMAX(h, sz.height());
     }
 
-    return (style().sizeFromContents(QStyle::CT_ToolButton, this, QSize(w, h)).
-            expandedTo(QApplication::globalStrut()));
+    return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+            expandedTo(TQApplication::globalStrut()));
 }
 
 void Button::updateSize()
@@ -249,7 +249,7 @@ void Button::updateSize()
     }
 }
 
-QString Button::realText() const
+TQString Button::realText() const
 {
     return m_realText;
 }
@@ -285,7 +285,7 @@ void Button::enableIconSet()
 
 void Button::disableIconSet()
 {
-    setIconSet(QIconSet());
+    setIconSet(TQIconSet());
 }
 
 void Button::disableText()
@@ -299,12 +299,12 @@ void Button::enableText()
     setText(m_realText);
 }
 
-void Button::contextMenuEvent(QContextMenuEvent *e)
+void Button::contextMenuEvent(TQContextMenuEvent *e)
 {
-    QPopupMenu menu;
+    TQPopupMenu menu;
 
     m_assignAccelAction->plug(&menu);
-    if (m_realText.contains(QRegExp("^&[0-9]\\s")))
+    if (m_realText.contains(TQRegExp("^&[0-9]\\s")))
         m_clearAccelAction->plug(&menu);
 
     emit contextMenu( &menu );
@@ -318,13 +318,13 @@ void Button::assignAccel()
     int num = KInputDialog::getInteger(i18n("Change Button Number"), i18n("New accelerator number:"), 1, 0, 10, 1, &ok, this);
     if (ok)
     {
-        QString text = realTextWithoutAccel();
-        text = QString("&%1 %2").arg(num).arg(text);
+        TQString text = realTextWithoutAccel();
+        text = TQString("&%1 %2").arg(num).arg(text);
         setRealText(text);
     }
 }
 
-void Button::setRealText(const QString &text)
+void Button::setRealText(const TQString &text)
 {
     m_realText = text;
     setText(text);
@@ -336,10 +336,10 @@ void Button::clearAccel()
     setRealText(realTextWithoutAccel());
 }
 
-QString Button::realTextWithoutAccel() const
+TQString Button::realTextWithoutAccel() const
 {
-    QString text = m_realText;
-    QRegExp r("^&[0-9]\\s");
+    TQString text = m_realText;
+    TQRegExp r("^&[0-9]\\s");
     if (text.contains(r))
         text.remove(r);
     return text;
diff --git a/src/newui/button.h b/src/newui/button.h
index bc61d9c5..86e7dbed 100644
--- a/src/newui/button.h
+++ b/src/newui/button.h
@@ -20,8 +20,8 @@
 #ifndef IDEALBUTTON_H
 #define IDEALBUTTON_H
 
-#include 
-#include 
+#include 
+#include 
 
 #include "comdefs.h"
 
@@ -34,50 +34,50 @@ class ButtonBar;
 /**
 @short A button to place onto the ButtonBar
 
-A QPushButton derivative with a size of a QToolBar. Button can be rotated
+A TQPushButton derivative with a size of a TQToolBar. Button can be rotated
 (placed onto different places in ideal mode).
 */
-class Button : public QPushButton {
+class Button : public TQPushButton {
     Q_OBJECT
 public:
-    Button(ButtonBar *parent, const QString text, const QIconSet &icon = QIconSet(),
-        const QString &description = QString::null);
+    Button(ButtonBar *parent, const TQString text, const TQIconSet &icon = TQIconSet(),
+        const TQString &description = TQString::null);
 
     /**Sets the description used as a tooltip.*/
-    void setDescription(const QString &description);
+    void setDescription(const TQString &description);
     /**Returns the description.*/
-    QString description() const;
+    TQString description() const;
 
     /**Sets the place of a button.*/
     void setPlace(Ideal::Place place);
     /**Sets the mode of a button.*/
     void setMode(Ideal::ButtonMode mode);
 
-    QSize sizeHint() const;
-    QSize sizeHint(const QString &text) const;
+    TQSize sizeHint() const;
+    TQSize sizeHint(const TQString &text) const;
 
     /**Updates size of a widget. Used after squeezing button's text.*/
     void updateSize();
 
     /**Returns the real (i.e. not squeezed) text of a button.*/
-    QString realText() const;
-    QString realTextWithoutAccel() const;
-    void setRealText(const QString &text);
+    TQString realText() const;
+    TQString realTextWithoutAccel() const;
+    void setRealText(const TQString &text);
 
 protected:
     ButtonMode mode();
 
-    virtual void drawButton(QPainter *p);
-    virtual void drawButtonLabel(QPainter *p);
+    virtual void drawButton(TQPainter *p);
+    virtual void drawButtonLabel(TQPainter *p);
 
-    virtual void contextMenuEvent(QContextMenuEvent *e);
+    virtual void contextMenuEvent(TQContextMenuEvent *e);
 
 protected slots:
     void assignAccel();
     void clearAccel();
 
 signals:
-    void contextMenu(QPopupMenu*);
+    void contextMenu(TQPopupMenu*);
 
 private:
     virtual ~Button();
@@ -91,11 +91,11 @@ private:
 
     ButtonBar *m_buttonBar;
 
-    QString m_description;
+    TQString m_description;
     Place m_place;
 
-    QString m_realText;
-    QIconSet m_realIconSet;
+    TQString m_realText;
+    TQIconSet m_realIconSet;
 
     KAction *m_assignAccelAction;
     KAction *m_clearAccelAction;
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index 52a20bf5..b2a3b47c 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "buttonbar.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -33,13 +33,13 @@ namespace Ideal {
 //ButtonLayout class
 
 ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spacing, const char *name)
-    :QBoxLayout(parent, d, margin, spacing, name), m_buttonBar(parent)
+    :TQBoxLayout(parent, d, margin, spacing, name), m_buttonBar(parent)
 {
 }
 
-QSize ButtonLayout::minimumSize() const
+TQSize ButtonLayout::minimumSize() const
 {
-    QSize size = QBoxLayout::minimumSize();
+    TQSize size = TQBoxLayout::minimumSize();
 
     if (!m_buttonBar->autoResize())
         return size;
@@ -48,13 +48,13 @@ QSize ButtonLayout::minimumSize() const
     {
         case Ideal::Left:
         case Ideal::Right:
-            return QSize(size.width(),0);
+            return TQSize(size.width(),0);
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            return QSize(0,size.height());
+            return TQSize(0,size.height());
     }
-    return QBoxLayout::minimumSize();
+    return TQBoxLayout::minimumSize();
 }
 
 
@@ -62,22 +62,22 @@ QSize ButtonLayout::minimumSize() const
 //ButtonBar class
 
 
-ButtonBar::ButtonBar(Place place, ButtonMode mode, QWidget *parent, const char *name)
-    :QWidget(parent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true)
+ButtonBar::ButtonBar(Place place, ButtonMode mode, TQWidget *parent, const char *name)
+    :TQWidget(parent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true)
 {
     switch (m_place)
     {
         case Ideal::Left:
         case Ideal::Right:
-           l = new ButtonLayout(this, QBoxLayout::TopToBottom, 0, 0);
+           l = new ButtonLayout(this, TQBoxLayout::TopToBottom, 0, 0);
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            l = new ButtonLayout(this, QBoxLayout::LeftToRight, 0, 0);
+            l = new ButtonLayout(this, TQBoxLayout::LeftToRight, 0, 0);
             break;
     }
 
-    l->setResizeMode(QLayout::Minimum);
+    l->setResizeMode(TQLayout::Minimum);
     setMode(mode);
 
     l->insertStretch(-1);
@@ -147,7 +147,7 @@ void ButtonBar::setButtonsPlace(Ideal::Place place)
         (*it)->setPlace(place);
 }
 
-void ButtonBar::resizeEvent(QResizeEvent *ev)
+void ButtonBar::resizeEvent(TQResizeEvent *ev)
 {
     int preferredDimension = 0;
     int actualDimension = 0;
@@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(QResizeEvent *ev)
     {
         case Ideal::Left:
         case Ideal::Right:
-            preferredDimension = l->QBoxLayout::minimumSize().height();
+            preferredDimension = l->TQBoxLayout::minimumSize().height();
             actualDimension = size().height();
             oldDimension = ev->oldSize().height();
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            preferredDimension = l->QBoxLayout::minimumSize().width();
+            preferredDimension = l->TQBoxLayout::minimumSize().width();
             actualDimension = size().width();
             oldDimension = ev->oldSize().width();
             break;
@@ -175,7 +175,7 @@ void ButtonBar::resizeEvent(QResizeEvent *ev)
     else if (m_shrinked && actualDimension > oldDimension)
         deshrink(preferredDimension, actualDimension);
 
-    QWidget::resizeEvent(ev);
+    TQWidget::resizeEvent(ev);
 }
 
 void ButtonBar::shrink(int preferredDimension, int actualDimension)
@@ -186,7 +186,7 @@ void ButtonBar::shrink(int preferredDimension, int actualDimension)
     m_shrinked = true;
 
     uint textLength = 0;
-    QValueList texts;
+    TQValueList texts;
     uint maxLength = 0;
     for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
     {
@@ -203,7 +203,7 @@ void ButtonBar::shrink(int preferredDimension, int actualDimension)
     do {
         newMaxLength -= 1;
         newTextLength = 0;
-        for (QValueList::iterator it = texts.begin(); it != texts.end(); ++it)
+        for (TQValueList::iterator it = texts.begin(); it != texts.end(); ++it)
         {
             if (*it > newMaxLength)
                 *it = newMaxLength;
@@ -227,7 +227,7 @@ void ButtonBar::deshrink(int preferredDimension, int actualDimension)
     m_shrinked = true;
 
     uint textLength = 0;
-    QValueList texts;
+    TQValueList texts;
     uint maxLength = 0;
     for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
     {
@@ -247,7 +247,7 @@ void ButtonBar::deshrink(int preferredDimension, int actualDimension)
     do {
         newTextLength = 0;
         int i = 0;
-        for (QValueList::iterator it = texts.begin(); it != texts.end(); ++it, i++)
+        for (TQValueList::iterator it = texts.begin(); it != texts.end(); ++it, i++)
         {
             if (m_buttons[i]->text().contains("..."))
                 (*it)++;
diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h
index f137c925..ad1cf5b6 100644
--- a/src/newui/buttonbar.h
+++ b/src/newui/buttonbar.h
@@ -20,12 +20,12 @@
 #ifndef IDEALBUTTONBAR_H
 #define IDEALBUTTONBAR_H
 
-#include 
-#include 
+#include 
+#include 
 
 #include "comdefs.h"
 
-#include 
+#include 
 
 namespace Ideal {
 
@@ -39,7 +39,7 @@ class ButtonLayout: public QBoxLayout{
 public:
     ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0);
 
-    virtual QSize minimumSize() const;
+    virtual TQSize minimumSize() const;
 
 private:
     ButtonBar *m_buttonBar;
@@ -51,11 +51,11 @@ private:
 Looks like a toolbar but has another behaviour. It is suitable for
 placing on the left(right, bottom, top) corners of a window as a bar with slider.
 */
-class ButtonBar : public QWidget {
+class ButtonBar : public TQWidget {
     Q_OBJECT
 public:
     ButtonBar(Place place, ButtonMode mode = IconsAndText,
-        QWidget *parent = 0, const char *name = 0);
+        TQWidget *parent = 0, const char *name = 0);
     virtual ~ButtonBar();
 
     /**Adds a button to the bar.*/
@@ -87,7 +87,7 @@ public:
     Button *prevTo(Button *button);
 
 protected:
-    virtual void resizeEvent ( QResizeEvent *ev );
+    virtual void resizeEvent ( TQResizeEvent *ev );
 
     int originalDimension();
 
@@ -95,7 +95,7 @@ private:
     void fixDimensions();
     void setButtonsPlace(Ideal::Place place);
 
-    typedef QValueList ButtonList;
+    typedef TQValueList ButtonList;
     ButtonList m_buttons;
 
     ButtonMode m_mode;
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 1676d48e..5f11425d 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -19,13 +19,13 @@
  ***************************************************************************/
 #include "ddockwindow.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -40,7 +40,7 @@
 #include "dmainwindow.h"
 
 DDockWindow::DDockWindow(DMainWindow *parent, Position position)
-    :QDockWindow(QDockWindow::InDock, parent), m_position(position), m_visible(false),
+    :TQDockWindow(TQDockWindow::InDock, parent), m_position(position), m_visible(false),
     m_mainWindow(parent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0)
 {
     setMovingEnabled(false);
@@ -51,20 +51,20 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
         case DDockWindow::Bottom:
             m_name = "BottomToolWindow";
             place = Ideal::Bottom;
-            m_internalLayout = new QVBoxLayout(boxLayout(), 0);
-            m_internalLayout->setDirection(QBoxLayout::BottomToTop);
+            m_internalLayout = new TQVBoxLayout(boxLayout(), 0);
+            m_internalLayout->setDirection(TQBoxLayout::BottomToTop);
             break;
         case DDockWindow::Left:
             m_name = "LeftToolWindow";
             place = Ideal::Left;
-            m_internalLayout = new QHBoxLayout(boxLayout(), 0);
-            m_internalLayout->setDirection(QBoxLayout::LeftToRight);
+            m_internalLayout = new TQHBoxLayout(boxLayout(), 0);
+            m_internalLayout->setDirection(TQBoxLayout::LeftToRight);
             break;
         case DDockWindow::Right:
             m_name = "RightToolWindow";
             place = Ideal::Right;
-            m_internalLayout = new QHBoxLayout(boxLayout(), 0);
-            m_internalLayout->setDirection(QBoxLayout::RightToLeft);
+            m_internalLayout = new TQHBoxLayout(boxLayout(), 0);
+            m_internalLayout->setDirection(TQBoxLayout::RightToLeft);
             break;
     }
 
@@ -82,12 +82,12 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
     m_bar = new Ideal::ButtonBar(place, buttonMode, this);
     m_internalLayout->addWidget(m_bar);
 
-    m_widgetStack = new QWidgetStack(this);
+    m_widgetStack = new TQWidgetStack(this);
     m_internalLayout->addWidget(m_widgetStack);
 
-    m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, this, SLOT(moveToDockLeft()), this );
-    m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, this, SLOT(moveToDockRight()), this );
-    m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, this, SLOT(moveToDockBottom()), this );
+    m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, this, TQT_SLOT(moveToDockLeft()), this );
+    m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, this, TQT_SLOT(moveToDockRight()), this );
+    m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, this, TQT_SLOT(moveToDockBottom()), this );
 
     setVisible(m_visible);
 
@@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v)
 {
     //write dock width to the config file
     KConfig *config = kapp->config();
-    QString group = QString("%1").arg(m_name);
+    TQString group = TQString("%1").arg(m_name);
     config->setGroup(group);
 
     if (m_visible)
@@ -148,7 +148,7 @@ void DDockWindow::loadSettings()
 void DDockWindow::saveSettings()
 {
     KConfig *config = kapp->config();
-    QString group = QString("%1").arg(m_name);
+    TQString group = TQString("%1").arg(m_name);
     int invisibleWidth = 0;
     config->setGroup(group);
     if (config->hasKey("ViewWidth"))
@@ -164,22 +164,22 @@ void DDockWindow::saveSettings()
         config->writeEntry("ViewWidth", invisibleWidth);
 }
 
-QWidget *DDockWindow::currentWidget() const
+TQWidget *DDockWindow::currentWidget() const
 {
     return m_widgetStack->visibleWidget();
 }
 
-void DDockWindow::addWidget(const QString &title, QWidget *widget, bool skipActivation)
+void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipActivation)
 {
     kdDebug(9000) << k_funcinfo << endl;
-    QPixmap *pm = const_cast(widget->icon());
+    TQPixmap *pm = const_cast(widget->icon());
     Ideal::Button *button;
     if (pm != 0)
     {
         //force 16pt for now
         if (pm->height() > 16)
         {
-            QImage img = pm->convertToImage();
+            TQImage img = pm->convertToImage();
             img = img.smoothScale(16, 16);
             pm->convertFromImage(img);
         }
@@ -192,15 +192,15 @@ void DDockWindow::addWidget(const QString &title, QWidget *widget, bool skipActi
     m_bar->addButton(button);
 
     m_widgetStack->addWidget(widget);
-    connect(button, SIGNAL(clicked()), this, SLOT(selectWidget()));
-    connect(button, SIGNAL(contextMenu(QPopupMenu*)), this, SLOT(contextMenu(QPopupMenu*)) );
+    connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget()));
+    connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) );
 
     if (!skipActivation)
     {
         //if the widget was selected last time the dock is deleted
         //we need to show it
         KConfig *config = kapp->config();
-        QString group = QString("%1").arg(m_name);
+        TQString group = TQString("%1").arg(m_name);
         config->setGroup(group);
         if (config->readEntry("ViewLastWidget") == title)
         {
@@ -211,7 +211,7 @@ void DDockWindow::addWidget(const QString &title, QWidget *widget, bool skipActi
     }
 }
 
-void DDockWindow::raiseWidget(QWidget *widget)
+void DDockWindow::raiseWidget(TQWidget *widget)
 {
     kdDebug(9000) << k_funcinfo << endl;
 
@@ -225,7 +225,7 @@ void DDockWindow::raiseWidget(QWidget *widget)
     }
 }
 
-void DDockWindow::lowerWidget(QWidget * widget)
+void DDockWindow::lowerWidget(TQWidget * widget)
 {
     kdDebug(9000) << k_funcinfo << endl;
 
@@ -239,7 +239,7 @@ void DDockWindow::lowerWidget(QWidget * widget)
     }
 }
 
-void DDockWindow::removeWidget(QWidget *widget)
+void DDockWindow::removeWidget(TQWidget *widget)
 {
     kdDebug(9000) << k_funcinfo << endl;
     if (m_widgetStack->id(widget) == -1)
@@ -297,7 +297,7 @@ void DDockWindow::selectWidget()
     selectWidget((Ideal::Button*)sender());
 }
 
-void DDockWindow::hideWidget(QWidget *widget)
+void DDockWindow::hideWidget(TQWidget *widget)
 {
     Ideal::Button *button = m_buttons[widget];
     if (button != 0)
@@ -310,7 +310,7 @@ void DDockWindow::hideWidget(QWidget *widget)
         setVisible(false);
 }
 
-void DDockWindow::showWidget(QWidget *widget)
+void DDockWindow::showWidget(TQWidget *widget)
 {
     Ideal::Button *button = m_buttons[widget];
     if (button != 0)
@@ -322,7 +322,7 @@ void DDockWindow::setMovingEnabled(bool)
 {
     //some operations on KMainWindow cause moving to be enabled
     //but we always don't want DDockWindow instances to be movable
-    QDockWindow::setMovingEnabled(false);
+    TQDockWindow::setMovingEnabled(false);
 }
 
 void DDockWindow::selectLastWidget()
@@ -338,16 +338,16 @@ bool DDockWindow::isActive()
 {
     if (m_toggledButton)
     {
-        QWidget *w = qApp->focusWidget();
+        TQWidget *w = qApp->focusWidget();
         if (!w)
             return false;
-        QWidget *toolWidget = m_widgets[m_toggledButton];
+        TQWidget *toolWidget = m_widgets[m_toggledButton];
         if (toolWidget == w)
             return true;
         else
         {
             do {
-                w = (QWidget*)w->parent();
+                w = (TQWidget*)w->parent();
                 if (w && (w == toolWidget)) return true;
             } while (w);
         }
@@ -373,9 +373,9 @@ void DDockWindow::selectPrevWidget()
         b->animateClick();
 }
 
-void DDockWindow::contextMenu(QPopupMenu * menu)
+void DDockWindow::contextMenu(TQPopupMenu * menu)
 {
-    m_lastContextMenuButton = static_cast( const_cast( sender() ) );
+    m_lastContextMenuButton = static_cast( const_cast( sender() ) );
 
     menu->insertSeparator();
 
diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h
index 06cf3eb1..f9abc93f 100644
--- a/src/newui/ddockwindow.h
+++ b/src/newui/ddockwindow.h
@@ -20,8 +20,8 @@
 #ifndef DDOCKWINDOW_H
 #define DDOCKWINDOW_H
 
-#include 
-#include 
+#include 
+#include 
 
 class QBoxLayout;
 class QToolButton;
@@ -38,7 +38,7 @@ namespace Ideal {
     class ButtonBar;
 }
 
-class DDockWindow : public QDockWindow {
+class DDockWindow : public TQDockWindow {
     Q_OBJECT
 public:
     enum Position { Bottom, Left, Right };
@@ -50,16 +50,16 @@ public:
     bool visible() const { return m_visible; }
     Position position() const { return m_position; }
 
-    virtual void addWidget(const QString &title, QWidget *widget, bool skipActivation = false);
-    virtual void raiseWidget(QWidget *widget);
-    virtual void lowerWidget(QWidget *widget);
+    virtual void addWidget(const TQString &title, TQWidget *widget, bool skipActivation = false);
+    virtual void raiseWidget(TQWidget *widget);
+    virtual void lowerWidget(TQWidget *widget);
     /**Removes the widget from dock. Does not delete it.*/
-    virtual void removeWidget(QWidget *widget);
+    virtual void removeWidget(TQWidget *widget);
 
-    virtual void hideWidget(QWidget *widget);
-    virtual void showWidget(QWidget *widget);
+    virtual void hideWidget(TQWidget *widget);
+    virtual void showWidget(TQWidget *widget);
 
-    virtual QWidget *currentWidget() const;
+    virtual TQWidget *currentWidget() const;
 
     virtual void setMovingEnabled(bool b);
 
@@ -79,7 +79,7 @@ signals:
 private slots:
     void selectWidget();
     void selectWidget(Ideal::Button *button);
-    void contextMenu(QPopupMenu*);
+    void contextMenu(TQPopupMenu*);
     void moveToDockLeft();
     void moveToDockRight();
     void moveToDockBottom();
@@ -89,21 +89,21 @@ protected:
     virtual void loadSettings();
 
     Ideal::ButtonBar *m_bar;
-    QWidgetStack *m_widgetStack;
+    TQWidgetStack *m_widgetStack;
 
-    QMap m_widgets;
-    QMap m_buttons;
+    TQMap m_widgets;
+    TQMap m_buttons;
 
 private:
     Position m_position;
     bool m_visible;
-    QString m_name;
+    TQString m_name;
     DMainWindow *m_mainWindow;
     bool m_doNotCloseActiveWidget;
 
     Ideal::Button *m_toggledButton;
     Ideal::Button *m_lastContextMenuButton;
-    QBoxLayout *m_internalLayout;
+    TQBoxLayout *m_internalLayout;
 
 
     KAction * m_moveToDockLeft;
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index 9d3801e3..6e6a63d4 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -24,12 +24,12 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "dtabwidget.h"
 #include "docksplitter.h"
 
-DMainWindow::DMainWindow(QWidget *parent, const char *name)
+DMainWindow::DMainWindow(TQWidget *parent, const char *name)
     :KParts::MainWindow(parent, name), m_firstRemoved(false), m_currentWidget(0)
 {
     loadSettings();
@@ -57,7 +57,7 @@ void DMainWindow::saveSettings()
 
 DMainWindow::~DMainWindow()
 {
-/*    for (QValueList::iterator it = m_widgets.begin(); it != m_widgets.end(); ++it)
+/*    for (TQValueList::iterator it = m_widgets.begin(); it != m_widgets.end(); ++it)
         removeWidget(*it);*/
 }
 
@@ -81,7 +81,7 @@ void DMainWindow::createToolWindows()
     moveDockWindow(m_rightDock, Qt::DockRight);
 }
 
-void DMainWindow::addWidget(QWidget *widget, const QString &title)
+void DMainWindow::addWidget(TQWidget *widget, const TQString &title)
 {
 //     invalidateActiveTabWidget();
     if (m_firstRemoved && m_activeTabWidget == m_tabs.first())
@@ -93,17 +93,17 @@ void DMainWindow::addWidget(QWidget *widget, const QString &title)
     addWidget(m_activeTabWidget, widget, title);
 }
 
-void DMainWindow::addWidget(DTabWidget *tab, QWidget *widget, const QString &title)
+void DMainWindow::addWidget(DTabWidget *tab, TQWidget *widget, const TQString &title)
 {
-    static QPixmap emptyPixmap;
+    static TQPixmap emptyPixmap;
 
     int idx = -1;
     if (m_openTabAfterCurrent && (tab->count() > 0))
         idx = tab->currentPageIndex() + 1;
     if (m_showIconsOnTabs)
     {
-        const QPixmap *pixmap = widget->icon();
-        const QIconSet &icons = (pixmap && (pixmap->size().height() <= 16)) ? *(pixmap) : SmallIcon("kdevelop");
+        const TQPixmap *pixmap = widget->icon();
+        const TQIconSet &icons = (pixmap && (pixmap->size().height() <= 16)) ? *(pixmap) : SmallIcon("kdevelop");
         tab->insertTab(widget, icons, title, idx);
     }
     else
@@ -114,7 +114,7 @@ void DMainWindow::addWidget(DTabWidget *tab, QWidget *widget, const QString &tit
     tab->showPage(widget);
 }
 
-void DMainWindow::removeWidget(QWidget *widget)
+void DMainWindow::removeWidget(TQWidget *widget)
 {
     if (!m_widgets.contains(widget))
         return; //not a widget in main window
@@ -125,7 +125,7 @@ void DMainWindow::removeWidget(QWidget *widget)
         if (tab->indexOf(widget) >= 0)
         {
             tab->removePage(widget);
-            widget->reparent(0,QPoint(0,0),false);
+            widget->reparent(0,TQPoint(0,0),false);
             if (tab->count() == 0)
             {
                 if (tab->closeButton())
@@ -161,8 +161,8 @@ void DMainWindow::removeWidget(QWidget *widget)
     if (m_activeTabWidget && m_activeTabWidget->currentPage())
     {
         //a hack to please multibuffer and actually switch the active part
-        QFocusEvent ev(QEvent::FocusIn);
-        QApplication::sendEvent(m_activeTabWidget->currentPage(), &ev);
+        TQFocusEvent ev(TQEvent::FocusIn);
+        TQApplication::sendEvent(m_activeTabWidget->currentPage(), &ev);
     }
 }
 
@@ -184,7 +184,7 @@ DTabWidget *DMainWindow::splitVertical()
 
 void DMainWindow::invalidateActiveTabWidget()
 {
-/*    QWidget *focused = m_central->focusWidget();
+/*    TQWidget *focused = m_central->focusWidget();
     kdDebug(9000) << "invalidate: " << focused << endl;
     if (focused == 0)
         return;
@@ -208,33 +208,33 @@ DTabWidget *DMainWindow::createTab()
     DTabWidget *tab = new DTabWidget(m_central);
     m_tabs.append(tab);
     if (tab->closeButton())
-        connect(tab->closeButton(), SIGNAL(clicked()), this, SLOT(closeTab()));
-    connect(tab, SIGNAL(closeRequest(QWidget*)), this, SLOT(closeTab(QWidget*)));
-    connect(tab, SIGNAL(contextMenu(QWidget*,const QPoint &)),
-        this, SLOT(tabContext(QWidget*,const QPoint &)));
+        connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab()));
+    connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*)));
+    connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)),
+        this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &)));
     return tab;
 }
 
-bool DMainWindow::eventFilter(QObject *obj, QEvent *ev)
+bool DMainWindow::eventFilter(TQObject *obj, TQEvent *ev)
 {
-    QWidget *w = (QWidget*)obj;
+    TQWidget *w = (TQWidget*)obj;
     if (!m_widgets.contains(w))
         return KParts::MainWindow::eventFilter(obj, ev);
 
-    if ((m_currentWidget != w) && (ev->type() == QEvent::FocusIn))
+    if ((m_currentWidget != w) && (ev->type() == TQEvent::FocusIn))
     {
         m_currentWidget = w;
         emit widgetChanged(w);
     }
-    else if (ev->type() == QEvent::IconChange)
+    else if (ev->type() == TQEvent::IconChange)
     {
         if (m_widgetTabs.contains(w))
         {
             DTabWidget *tab = m_widgetTabs[w];
-            tab->setTabIconSet(w, w->icon() ? (*(w->icon())) : QPixmap());
+            tab->setTabIconSet(w, w->icon() ? (*(w->icon())) : TQPixmap());
         }
     }
-    else if (ev->type() == QEvent::CaptionChange)
+    else if (ev->type() == TQEvent::CaptionChange)
     {
         kdDebug(9000) << "caption change" << endl;
         DTabWidget *tab = m_widgetTabs[w];
@@ -249,17 +249,17 @@ void DMainWindow::closeTab()
     //nothing to do here, should be reimplemented
 }
 
-void DMainWindow::tabContext(QWidget *, const QPoint &)
+void DMainWindow::tabContext(TQWidget *, const TQPoint &)
 {
     //nothing to do here, should be reimplemented
 }
 
-void DMainWindow::closeTab(QWidget *)
+void DMainWindow::closeTab(TQWidget *)
 {
     //nothing to do here, should be reimplemented
 }
 
-void DMainWindow::moveWidget(DDockWindow::Position position, QWidget * view, const QString & title)
+void DMainWindow::moveWidget(DDockWindow::Position position, TQWidget * view, const TQString & title)
 {
     if (m_docks.contains(view))
     {
@@ -270,32 +270,32 @@ void DMainWindow::moveWidget(DDockWindow::Position position, QWidget * view, con
     }
 }
 
-void DMainWindow::addDockWidget(DDockWindow::Position position, QWidget *view, const QString &title)
+void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view, const TQString &title)
 {
     toolWindow(position)->addWidget(title, view);
     m_docks[view] = position;
-    connect(view, SIGNAL(destroyed()), this, SLOT(widgetDestroyed()));
+    connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
 }
 
-void DMainWindow::removeDockWidget(QWidget *view)
+void DMainWindow::removeDockWidget(TQWidget *view)
 {
     toolWindow(m_docks[view])->removeWidget(view);
     m_docks.remove(view);
 }
 
-bool DMainWindow::hasDockWidget(QWidget *view)
+bool DMainWindow::hasDockWidget(TQWidget *view)
 {
     return m_docks.contains(view);
 }
 
-DDockWindow::Position DMainWindow::dockWidgetPosition(QWidget *view)
+DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view)
 {
     return m_docks[view];
 }
 
 void DMainWindow::widgetDestroyed()
 {
-    QWidget *w = static_cast(const_cast(sender()));
+    TQWidget *w = static_cast(const_cast(sender()));
 
     if (m_docks.contains(w))
     {
diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h
index 7a036665..ae757678 100644
--- a/src/newui/dmainwindow.h
+++ b/src/newui/dmainwindow.h
@@ -34,7 +34,7 @@ namespace Ideal {
 class DMainWindow: public KParts::MainWindow {
     Q_OBJECT
 public:
-    DMainWindow(QWidget *parent = 0, const char *name = 0);
+    DMainWindow(TQWidget *parent = 0, const char *name = 0);
     virtual ~DMainWindow();
 
     /**@return The tool window in given @p position.*/
@@ -42,22 +42,22 @@ public:
 
     /**Adds a tabbed widget into the active (focused) tab widget.
     If @p widget is null then only tab is created.*/
-    virtual void addWidget(QWidget *widget, const QString &title);
-    virtual void addWidget(DTabWidget *tab, QWidget *widget, const QString &title);
+    virtual void addWidget(TQWidget *widget, const TQString &title);
+    virtual void addWidget(DTabWidget *tab, TQWidget *widget, const TQString &title);
     /**Removes widget. Does not delete it.*/
-    virtual void removeWidget(QWidget *widget);
+    virtual void removeWidget(TQWidget *widget);
    /**Moves a widget from an existing dockposition to a new position**/
-    virtual void moveWidget(DDockWindow::Position newPosition, QWidget *widget, const QString & title);
+    virtual void moveWidget(DDockWindow::Position newPosition, TQWidget *widget, const TQString & title);
 
     /**Adds a dock widget into given position.*/
-    virtual void addDockWidget(DDockWindow::Position position, QWidget *view, const QString &title);
+    virtual void addDockWidget(DDockWindow::Position position, TQWidget *view, const TQString &title);
     /**Removes a dock widget.*/
-    virtual void removeDockWidget(QWidget *view);
+    virtual void removeDockWidget(TQWidget *view);
 
     virtual void saveSettings();
 
-    bool hasDockWidget(QWidget *view);
-    DDockWindow::Position dockWidgetPosition(QWidget *view);
+    bool hasDockWidget(TQWidget *view);
+    DDockWindow::Position dockWidgetPosition(TQWidget *view);
 
 public slots:
     DTabWidget *splitHorizontal();
@@ -69,17 +69,17 @@ protected slots:
     virtual void closeTab();
     /**This does nothing. Reimplement in subclass to close the tab
     when hover close button is pressed.*/
-    virtual void closeTab(QWidget*);
+    virtual void closeTab(TQWidget*);
     /**This does nothing. Reimplement in subclass to show tab context menu.*/
-    virtual void tabContext(QWidget*,const QPoint &);
+    virtual void tabContext(TQWidget*,const TQPoint &);
 
     void widgetDestroyed();
 
 signals:
-    void widgetChanged(QWidget *);
+    void widgetChanged(TQWidget *);
 
 protected:
-    bool eventFilter(QObject *obj, QEvent *ev);
+    bool eventFilter(TQObject *obj, TQEvent *ev);
 
     virtual void loadSettings();
 
@@ -90,20 +90,20 @@ protected:
     DDockWindow *m_rightDock;
     DDockWindow *m_bottomDock;
 
-    QMap m_docks;
+    TQMap m_docks;
 
     Ideal::DockSplitter *m_central;
     DTabWidget *m_activeTabWidget;
 
-    QValueList m_tabs;
+    TQValueList m_tabs;
 
     bool m_openTabAfterCurrent;
     bool m_showIconsOnTabs;
     bool m_firstRemoved;
 
-    QValueList m_widgets;
-    QMap m_widgetTabs;
-    QWidget *m_currentWidget;
+    TQValueList m_widgets;
+    TQMap m_widgetTabs;
+    TQWidget *m_currentWidget;
 
 private slots:
     void invalidateActiveTabWidget();
diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp
index eae4a3e3..0dc55453 100644
--- a/src/newui/docksplitter.cpp
+++ b/src/newui/docksplitter.cpp
@@ -23,8 +23,8 @@
 
 namespace Ideal {
 
-DockSplitter::DockSplitter(Orientation orientation, QWidget *parent, const char *name)
-    :QSplitter(parent, name), m_orientation(orientation)
+DockSplitter::DockSplitter(Orientation orientation, TQWidget *parent, const char *name)
+    :TQSplitter(parent, name), m_orientation(orientation)
 {
     switch (m_orientation)
     {
@@ -43,11 +43,11 @@ DockSplitter::~DockSplitter()
 {
 }
 
-void DockSplitter::addDock(uint row, uint col, QWidget *dock)
+void DockSplitter::addDock(uint row, uint col, TQWidget *dock)
 {
     if (m_docks.count() <= row)
         for (uint i = m_docks.count(); i <= row ; ++i)
-            m_docks.append(QValueList());
+            m_docks.append(TQValueList());
     
     if (m_docks[row].count() <= col)
     {
@@ -62,9 +62,9 @@ void DockSplitter::addDock(uint row, uint col, QWidget *dock)
     
     if (m_splitters.count() <= row)
         createSplitters(row);
-    QSplitter *splitter = m_splitters[row];
+    TQSplitter *splitter = m_splitters[row];
     
-    dock->reparent(splitter, QPoint(0,0), true);
+    dock->reparent(splitter, TQPoint(0,0), true);
     if (col < m_docks[row].count()-1)
         shiftWidgets(splitter, row, col+1);
 }
@@ -74,10 +74,10 @@ void DockSplitter::appendSplitter()
     switch (m_orientation)
     {
         case Horizontal:
-            m_splitters.append(new QSplitter(Horizontal, this));
+            m_splitters.append(new TQSplitter(Horizontal, this));
             break;
         case Vertical:
-            m_splitters.append(new QSplitter(Vertical, this));
+            m_splitters.append(new TQSplitter(Vertical, this));
             break;
     }
     m_splitters[m_splitters.size()-1]->setOpaqueResize(true);
@@ -99,7 +99,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete)
     if ((row >= m_docks.count()) || (col >= m_docks[row].count()))
         return;
     
-    QWidget *w = m_docks[row][col];
+    TQWidget *w = m_docks[row][col];
     m_docks[row].remove(m_docks[row].at(col));
     
     if (alsoDelete)
@@ -109,7 +109,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete)
     }
     else
     {
-        w->reparent(0, QPoint(0,0), false);
+        w->reparent(0, TQPoint(0,0), false);
         w->hide();
     }
 
@@ -134,7 +134,7 @@ bool DockSplitter::isRowEmpty(int row)
     return true;
 }
 
-void DockSplitter::shiftWidgets(QSplitter *splitter, uint row, uint fromCol)
+void DockSplitter::shiftWidgets(TQSplitter *splitter, uint row, uint fromCol)
 {
     kdDebug(9000) << "shiftWidgets: row=" << row << "  from col=" << fromCol << endl;
     kdDebug(9000) << "row size is: " << m_docks[row].count() << endl;
@@ -161,7 +161,7 @@ int DockSplitter::numCols(int row) const
     return 0;
 }
 
-QPair DockSplitter::indexOf(QWidget *dock)
+QPair DockSplitter::indexOf(TQWidget *dock)
 {
     for (uint i = 0; i < m_docks.count(); ++i)
         for (uint j = 0; j < m_docks[i].count(); ++j)
diff --git a/src/newui/docksplitter.h b/src/newui/docksplitter.h
index ce4a2e8e..c25dd495 100644
--- a/src/newui/docksplitter.h
+++ b/src/newui/docksplitter.h
@@ -20,8 +20,8 @@
 #ifndef IDEALDOCKSPLITTER_H
 #define IDEALDOCKSPLITTER_H
 
-#include 
-#include 
+#include 
+#include 
 
 namespace Ideal {
 
@@ -30,16 +30,16 @@ class DockWidget;
 /**
 @short Splitter for docks
 */
-class DockSplitter: public QSplitter {
+class DockSplitter: public TQSplitter {
     Q_OBJECT
 public:
-    DockSplitter(Orientation orientation, QWidget *parent = 0, const char *name = 0);
+    DockSplitter(Orientation orientation, TQWidget *parent = 0, const char *name = 0);
     ~DockSplitter();
     
-    void addDock(uint row, uint col, QWidget *dock);
+    void addDock(uint row, uint col, TQWidget *dock);
     void removeDock(uint row, uint col, bool alsoDelete = false);
     
-    QPair indexOf(QWidget *dock);
+    QPair indexOf(TQWidget *dock);
     
     int numRows() const;
     int numCols(int row) const;
@@ -47,14 +47,14 @@ public:
 protected:
     void appendSplitter();
     void createSplitters(uint index);
-    void shiftWidgets(QSplitter *splitter, uint row, uint fromCol);
+    void shiftWidgets(TQSplitter *splitter, uint row, uint fromCol);
     
     bool isRowEmpty(int row);
     
 private:
     Orientation m_orientation;
-    QValueList m_splitters;
-    QValueList > m_docks;
+    TQValueList m_splitters;
+    TQValueList > m_docks;
 };
 
 }
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index b9bf790a..db2e4c4e 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -19,14 +19,14 @@
  ***************************************************************************/
 #include "dtabwidget.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 
-DTabWidget::DTabWidget(QWidget *parent, const char *name)
+DTabWidget::DTabWidget(TQWidget *parent, const char *name)
     :KTabWidget(parent, name), m_closeButton(0)
 {
     setFocusPolicy(NoFocus);
@@ -37,7 +37,7 @@ DTabWidget::DTabWidget(QWidget *parent, const char *name)
     if (!m_tabBarShown)
         tabBar()->hide();
     else {
-        m_closeButton = new QToolButton(this);
+        m_closeButton = new TQToolButton(this);
         m_closeButton->setIconSet(SmallIcon("tab_remove"));
         m_closeButton->adjustSize();
         m_closeButton->hide();
@@ -49,8 +49,8 @@ DTabWidget::DTabWidget(QWidget *parent, const char *name)
         setTabReorderingEnabled(true);
     }
     
-    connect(this, SIGNAL(currentChanged(QWidget*)), this, SLOT(setFocus(QWidget*)));
-//    connect(this, SIGNAL(currentChanged(QWidget*)), this, SLOT(updateHistory(QWidget*)));
+    connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(setFocus(TQWidget*)));
+//    connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(updateHistory(TQWidget*)));
 }
 
 void DTabWidget::loadSettings()
@@ -69,18 +69,18 @@ void DTabWidget::saveSettings()
 {
 }
 
-QToolButton *DTabWidget::closeButton() const
+TQToolButton *DTabWidget::closeButton() const
 {
     return m_closeButton;
 }
 
-void DTabWidget::setFocus(QWidget *w)
+void DTabWidget::setFocus(TQWidget *w)
 {
     if (w)
         w->setFocus();
 }
 
-void DTabWidget::insertTab(QWidget *child, const QString &label, int index)
+void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index)
 {
     if (m_closeButton && m_closeButtonShown)
         m_closeButton->show();
@@ -88,8 +88,8 @@ void DTabWidget::insertTab(QWidget *child, const QString &label, int index)
     if (index != -1) tabBar()->repaint();
 }
 
-void DTabWidget::insertTab(QWidget *child, const QIconSet &iconset, 
-    const QString &label, int index)
+void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, 
+    const TQString &label, int index)
 {
     if (m_closeButton && m_closeButtonShown)
         m_closeButton->show();
@@ -97,7 +97,7 @@ void DTabWidget::insertTab(QWidget *child, const QIconSet &iconset,
     if (index != -1) tabBar()->repaint();
 }
 
-/*void DTabWidget::updateHistory(QWidget *w)
+/*void DTabWidget::updateHistory(TQWidget *w)
 {
     if (m_history.top() != w)
         m_history.push(w);
diff --git a/src/newui/dtabwidget.h b/src/newui/dtabwidget.h
index 9640d2cd..d3e5d9da 100644
--- a/src/newui/dtabwidget.h
+++ b/src/newui/dtabwidget.h
@@ -27,31 +27,31 @@ class QToolButton;
 class DTabWidget: public KTabWidget {
     Q_OBJECT
 public:
-    DTabWidget(QWidget *parent=0, const char *name=0);
+    DTabWidget(TQWidget *parent=0, const char *name=0);
     
     /**@return The close button at the top right corner. 
     May be 0 if the configuration do not allow close buttons or the tabbar.*/
-    QToolButton *closeButton() const;
+    TQToolButton *closeButton() const;
 
-    virtual void insertTab(QWidget *child, const QString &label, int index = -1 );
-    virtual void insertTab(QWidget *child, const QIconSet &iconset, 
-        const QString &label, int index = -1);
+    virtual void insertTab(TQWidget *child, const TQString &label, int index = -1 );
+    virtual void insertTab(TQWidget *child, const TQIconSet &iconset, 
+        const TQString &label, int index = -1);
     
 protected:
     virtual void loadSettings();
     virtual void saveSettings();
     
 private slots:
-    void setFocus(QWidget *w);
-//    void updateHistory(QWidget *w);
+    void setFocus(TQWidget *w);
+//    void updateHistory(TQWidget *w);
     
 private:
     bool m_tabBarShown;
     bool m_closeOnHover;
     bool m_closeButtonShown;
     
-    QToolButton *m_closeButton;
-//    QValueStack *m_history;
+    TQToolButton *m_closeButton;
+//    TQValueStack *m_history;
 
 };
 
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 1fb15445..67047af6 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -2,14 +2,14 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -76,9 +76,9 @@ using namespace MainWindowUtils;
 struct HistoryEntry
 {
     KURL url;
-    QString context;
+    TQString context;
 
-    HistoryEntry( const KURL& u, const QString& c ): url( u ), context( c ) {}
+    HistoryEntry( const KURL& u, const TQString& c ): url( u ), context( c ) {}
 };
 
 struct ModificationData
@@ -89,12 +89,12 @@ struct ModificationData
 };
 
 
-PartController::PartController(QWidget *parent)
+PartController::PartController(TQWidget *parent)
   : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false)
 {
-  connect(this, SIGNAL(partRemoved(KParts::Part*)), this, SLOT(slotPartRemoved(KParts::Part* )) );
-  connect(this, SIGNAL(partAdded(KParts::Part*)), this, SLOT(slotPartAdded(KParts::Part* )) );
-  connect(this, SIGNAL(activePartChanged(KParts::Part*)), this, SLOT(slotActivePartChanged(KParts::Part*)));
+  connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) );
+  connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) );
+  connect(this, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*)));
 
   setupActions();
 
@@ -109,7 +109,7 @@ PartController::~PartController()
 }
 
 
-void PartController::createInstance(QWidget *parent)
+void PartController::createInstance(TQWidget *parent)
 {
   if (!s_instance)
     s_instance = new PartController(parent);
@@ -126,62 +126,62 @@ void PartController::setupActions()
 {
   KActionCollection *ac = TopLevel::getInstance()->main()->actionCollection();
 
-  KAction* newAction = KStdAction::open(this, SLOT(slotOpenFile()), ac, "file_open");
+  KAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open");
   newAction->setToolTip( i18n("Open file") );
   newAction->setWhatsThis( i18n("Open file
        Opens an existing file without adding it to the project.
        ") );
 
-  m_openRecentAction = KStdAction::openRecent( this, SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" );
-  m_openRecentAction->setWhatsThis(QString("%1
        %2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file.")));
+  m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" );
+  m_openRecentAction->setWhatsThis(TQString("%1
        %2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file.")));
   m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" );
 
-  m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, SLOT(slotSaveAllFiles()), ac, "file_save_all");
+  m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all");
   m_saveAllFilesAction->setToolTip( i18n("Save all modified files") );
   m_saveAllFilesAction->setWhatsThis(i18n("Save all
        Saves all modified files."));
   m_saveAllFilesAction->setEnabled(false);
 
-  m_revertAllFilesAction = new KAction(i18n("Rever&t All"), 0, this, SLOT(slotRevertAllFiles()), ac, "file_revert_all");
+  m_revertAllFilesAction = new KAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all");
   m_revertAllFilesAction->setToolTip(i18n("Revert all changes"));
   m_revertAllFilesAction->setWhatsThis(i18n("Revert all
        Reverts all changes in opened files. Prompts to save changes so the reversion can be canceled for each modified file."));
   m_revertAllFilesAction->setEnabled(false);
 
-  m_closeWindowAction = KStdAction::close(this, SLOT(slotCloseWindow()), ac, "file_close");
+  m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close");
   m_closeWindowAction->setToolTip( i18n("Close current file") );
-  m_closeWindowAction->setWhatsThis(QString("%1
        %2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file.")));
+  m_closeWindowAction->setWhatsThis(TQString("%1
        %2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file.")));
   m_closeWindowAction->setEnabled(false);
 
-  m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, SLOT(slotCloseAllWindows()), ac, "file_close_all");
+  m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all");
   m_closeAllWindowsAction->setToolTip( i18n("Close all files") );
   m_closeAllWindowsAction->setWhatsThis(i18n("Close all
        Close all opened files."));
   m_closeAllWindowsAction->setEnabled(false);
 
-  m_closeOtherWindowsAction = new KAction(i18n("Close All Others"), 0, this, SLOT(slotCloseOtherWindows()), ac, "file_closeother");
+  m_closeOtherWindowsAction = new KAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother");
   m_closeOtherWindowsAction->setToolTip( i18n("Close other files") );
   m_closeOtherWindowsAction->setWhatsThis(i18n("Close all others
        Close all opened files except current."));
   m_closeOtherWindowsAction->setEnabled(false);
 
   new KActionSeparator(ac, "dummy_separator");
 
-  m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0, this, SLOT(slotBack()), ac, "history_back");
+  m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back");
   m_backAction->setEnabled( false );
   m_backAction->setToolTip(i18n("Back"));
   m_backAction->setWhatsThis(i18n("Back
        Moves backwards one step in the navigation history."));
-  connect(m_backAction->popupMenu(), SIGNAL(aboutToShow()), this, SLOT(slotBackAboutToShow()));
-  connect(m_backAction->popupMenu(), SIGNAL(activated(int)), this, SLOT(slotBackPopupActivated(int)));
+  connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBackAboutToShow()));
+  connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotBackPopupActivated(int)));
 
-  m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0, this, SLOT(slotForward()), ac, "history_forward");
+  m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward");
   m_forwardAction->setEnabled( false );
   m_forwardAction->setToolTip(i18n("Forward"));
   m_forwardAction->setWhatsThis(i18n("Forward
        Moves forward one step in the navigation history."));
-  connect(m_forwardAction->popupMenu(), SIGNAL(aboutToShow()), this, SLOT(slotForwardAboutToShow()));
-  connect(m_forwardAction->popupMenu(), SIGNAL(activated(int)), this, SLOT(slotForwardPopupActivated(int)));
+  connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotForwardAboutToShow()));
+  connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotForwardPopupActivated(int)));
 
-  m_gotoLastEditPosAction = new KAction( i18n("Goto Last Edit Position"), "bottom", 0, this, SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" );
+  m_gotoLastEditPosAction = new KAction( i18n("Goto Last Edit Position"), "bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" );
   m_gotoLastEditPosAction->setEnabled( false );
   m_gotoLastEditPosAction->setToolTip( i18n("Goto Last Edit Position") );
   m_gotoLastEditPosAction->setWhatsThis( i18n("Goto Last Edit Position
        Open the last edited file and position cursor at the point of edit") );
 }
 
-void PartController::setEncoding(const QString &encoding)
+void PartController::setEncoding(const TQString &encoding)
 {
   m_presetEncoding = encoding;
 }
@@ -208,13 +208,13 @@ KParts::Part* PartController::findOpenDocument(const KURL& url)
 
 KURL PartController::findURLInProject(const KURL& url)
 {
-  QStringList fileList = API::getInstance()->project()->allFiles();
+  TQStringList fileList = API::getInstance()->project()->allFiles();
 
   bool filenameOnly = (url.url().find('/') == -1);
-  QString filename = filenameOnly ? "/" : "";
+  TQString filename = filenameOnly ? "/" : "";
   filename += url.url();
 
-  for (QStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it) {
+  for (TQStringList::Iterator it = fileList.begin(); it != fileList.end(); ++it) {
     if ((*it).endsWith(filename)) {
       // Match! The first one is as good as any one, I guess...
       return KURL( API::getInstance()->project()->projectDirectory() + "/" + *it );
@@ -267,7 +267,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 			{
 				ei->setEncoding( m_presetEncoding );
 			}
-			m_presetEncoding = QString::null;
+			m_presetEncoding = TQString::null;
 		}
 
 		addHistoryEntry();
@@ -330,7 +330,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 	url.cleanPath(true);
 	if (url.isLocalFile())
 	{
-		QString path = url.path();
+		TQString path = url.path();
 		path = URLUtil::canonicalPath(path);
 		if ( !path.isEmpty() )
 			url.setPath(path);
@@ -388,10 +388,10 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 	// we don't trust KDE with designer files, let's handle it ourselves
 	if ( !m_openNextAsText && MimeType->is( "application/x-designer" ) )
 	{
-		QString DesignerSetting = config->readEntry( "DesignerSetting", "ExternalDesigner" );
-		QString designerExec = "designer";
-		QStringList designerPluginPaths;
-		QDomDocument* dom = API::getInstance()->projectDom();
+		TQString DesignerSetting = config->readEntry( "DesignerSetting", "ExternalDesigner" );
+		TQString designerExec = "designer";
+		TQStringList designerPluginPaths;
+		TQDomDocument* dom = API::getInstance()->projectDom();
 		if ( dom != 0 )
 		{
 			// The global option specifies a fallback if the project
@@ -419,7 +419,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 				designerPart->openURL(url);
 				return;
 			}
-			else if ( KParts::Factory * KDevDesignerFactory = static_cast( KLibLoader::self()->factory( QFile::encodeName( "libkdevdesignerpart" ) ) ) )
+			else if ( KParts::Factory * KDevDesignerFactory = static_cast( KLibLoader::self()->factory( TQFile::encodeName( "libkdevdesignerpart" ) ) ) )
 			{
 				KParts::ReadWritePart * kdevpart = static_cast( KDevDesignerFactory->createPart( TopLevel::getInstance()->main(), 0, 0, 0, "KParts::ReadWritePart"  ) );
 				kdevpart->openURL( url );
@@ -441,14 +441,14 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 
 	config->setGroup("General");
 
-	QStringList texttypeslist = config->readListEntry( "TextTypes" );
+	TQStringList texttypeslist = config->readListEntry( "TextTypes" );
 	if ( texttypeslist.contains( MimeType->name() ) )
 	{
 		m_openNextAsText = true;
 	}
 
 	bool isText = false;
-  	QVariant v = MimeType->property("X-KDE-text");
+  	TQVariant v = MimeType->property("X-KDE-text");
      	if (v.isValid())
            isText = v.toBool();
 	// is this regular text - open in editor
@@ -460,8 +460,8 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
         {
             if ( m_presetEncoding.isNull() && API::getInstance()->projectDom() )
             {
-                QDomDocument * projectDom = API::getInstance()->projectDom();
-                m_presetEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", QString::null );
+                TQDomDocument * projectDom = API::getInstance()->projectDom();
+                m_presetEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString::null );
             }
 
             if ( !m_presetEncoding.isNull() )
@@ -470,12 +470,12 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
                 {
                     ei->setEncoding( m_presetEncoding );
                 }
-                m_presetEncoding = QString::null;
+                m_presetEncoding = TQString::null;
             }
 
             addHistoryEntry();
 
-            QWidget * widget = EditorProxy::getInstance()->topWidgetForPart( editorpart );
+            TQWidget * widget = EditorProxy::getInstance()->topWidgetForPart( editorpart );
 
             integratePart(editorpart, url, widget, true, activate, addToCurrentBuffer);
             EditorProxy::getInstance()->setLineNumber(editorpart, lineNum, col);
@@ -492,10 +492,10 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 	// OK, it's not text and it's not a designer file.. let's see what else we can come up with..
 
 	KParts::Factory *factory = 0;
-	QString className;
+	TQString className;
 
-	QString services[] = { "KParts/ReadWritePart", "KParts/ReadOnlyPart" };
-	QString classnames[] = { "KParts::ReadWritePart", "KParts::ReadOnlyPart" };
+	TQString services[] = { "KParts/ReadWritePart", "KParts/ReadOnlyPart" };
+	TQString classnames[] = { "KParts::ReadWritePart", "KParts::ReadOnlyPart" };
 	for (uint i=0; i<2; ++i)
 	{
 		factory = findPartFactory( MimeType->name(), services[i] );
@@ -534,10 +534,10 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 	else
 	{
 		MimeWarningDialog dlg;
-		dlg.text2->setText( QString( "%1" ).arg(url.path()));
+		dlg.text2->setText( TQString( "%1" ).arg(url.path()));
 		dlg.text3->setText( dlg.text3->text().arg(MimeType->name()) );
 
-		if ( dlg.exec() == QDialog::Accepted )
+		if ( dlg.exec() == TQDialog::Accepted )
 		{
 			if ( dlg.open_with_kde->isChecked() )
 			{
@@ -549,7 +549,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 				{
 					KConfig *config = kapp->config();
 					config->setGroup("General");
-					QStringList texttypeslist = config->readListEntry( "TextTypes" );
+					TQStringList texttypeslist = config->readListEntry( "TextTypes" );
 					texttypeslist << MimeType->name();
 					config->writeEntry( "TextTypes", texttypeslist );
 				}
@@ -563,7 +563,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 
 void PartController::showDocument(const KURL &url, bool newWin)
 {
-  QString fixedPath = HTMLDocumentationPart::resolveEnvVarsInURL(url.url()); // possibly could env vars
+  TQString fixedPath = HTMLDocumentationPart::resolveEnvVarsInURL(url.url()); // possibly could env vars
   KURL docUrl(fixedPath);
   kdDebug(9000) << "SHOW: " << docUrl.url() << endl;
 
@@ -581,8 +581,8 @@ void PartController::showDocument(const KURL &url, bool newWin)
   {
     part = new HTMLDocumentationPart;
     integratePart(part,docUrl);
-    connect(part, SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )),
-        this, SIGNAL(partURLChanged(KParts::ReadOnlyPart* )));
+    connect(part, TQT_SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )),
+        this, TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart* )));
   }
   else
   {
@@ -591,9 +591,9 @@ void PartController::showDocument(const KURL &url, bool newWin)
   part->openURL(docUrl);
 }
 
-KParts::Factory *PartController::findPartFactory(const QString &mimeType, const QString &partType, const QString &preferredName)
+KParts::Factory *PartController::findPartFactory(const TQString &mimeType, const TQString &partType, const TQString &preferredName)
 {
-  KTrader::OfferList offers = KTrader::self()->query(mimeType, QString("'%1' in ServiceTypes").arg(partType));
+  KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").arg(partType));
 
   if (offers.count() > 0)
   {
@@ -611,7 +611,7 @@ KParts::Factory *PartController::findPartFactory(const QString &mimeType, const
     if ( !ptr ) {
       ptr = offers.first();
     }
-    return static_cast(KLibLoader::self()->factory(QFile::encodeName(ptr->library())));
+    return static_cast(KLibLoader::self()->factory(TQFile::encodeName(ptr->library())));
   }
 
   return 0;
@@ -639,7 +639,7 @@ KTextEditor::Editor * PartController::createEditorPart( bool activate,
     static bool alwaysActivate = true;
 
     kapp->config()->setGroup("Editor");
-    QString preferred = kapp->config()->readPathEntry("EmbeddedKTextEditor");
+    TQString preferred = kapp->config()->readPathEntry("EmbeddedKTextEditor");
     // If we are not using kyzis...
     // Don't create non-wrapped views for now,
     // avoid two paths (== two chances for bad bugs)
@@ -663,7 +663,7 @@ KTextEditor::Editor * PartController::createEditorPart( bool activate,
 }
 
 void PartController::integratePart(KParts::Part *part, const KURL &url,
-                                   QWidget* widget, bool isTextEditor,
+                                   TQWidget* widget, bool isTextEditor,
                                    bool activate, bool addToCurrentBuffer )
 {
   if (!widget) widget = part->widget();
@@ -685,14 +685,14 @@ void PartController::integratePart(KParts::Part *part, const KURL &url,
 
   emit loadedFile( ro_part->url() );
 
-  connect( part, SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) );
+  connect( part, TQT_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQT_SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) );
 
   // let's get notified when a document has been changed
-  connect(part, SIGNAL(completed()), this, SLOT(slotUploadFinished()));
+  connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotUploadFinished()));
 
   // yes, we're cheating again. this signal exists for katepart's
   // Document object and our HTMLDocumentationPart
-//  connect(part, SIGNAL(fileNameChanged()), this, SLOT(slotFileNameChanged()));
+//  connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged()));
 
   // Connect to the document's views newStatus() signal in order to keep track of the
   // modified-status of the document.
@@ -704,22 +704,22 @@ void PartController::integratePart(KParts::Part *part, const KURL &url,
   if (designerPart && API::getInstance()->languageSupport())
   {
       kdDebug() << "integrating designer part with language support" << endl;
-      connect(designerPart, SIGNAL(addedFunction(DesignerType, const QString&, Function )),
+      connect(designerPart, TQT_SIGNAL(addedFunction(DesignerType, const TQString&, Function )),
           API::getInstance()->languageSupport(),
-          SLOT(addFunction(DesignerType, const QString&, Function )));
-      connect(designerPart, SIGNAL(editedFunction(DesignerType, const QString&, Function, Function )), API::getInstance()->languageSupport(),
-      SLOT(editFunction(DesignerType, const QString&, Function, Function )));
-      connect(designerPart, SIGNAL(removedFunction(DesignerType, const QString&, Function )),
+          TQT_SLOT(addFunction(DesignerType, const TQString&, Function )));
+      connect(designerPart, TQT_SIGNAL(editedFunction(DesignerType, const TQString&, Function, Function )), API::getInstance()->languageSupport(),
+      TQT_SLOT(editFunction(DesignerType, const TQString&, Function, Function )));
+      connect(designerPart, TQT_SIGNAL(removedFunction(DesignerType, const TQString&, Function )),
           API::getInstance()->languageSupport(),
-          SLOT(removeFunction(DesignerType, const QString&, Function )));
-      connect(designerPart, SIGNAL(editFunction(DesignerType, const QString&, const QString& )),
+          TQT_SLOT(removeFunction(DesignerType, const TQString&, Function )));
+      connect(designerPart, TQT_SIGNAL(editFunction(DesignerType, const TQString&, const TQString& )),
           API::getInstance()->languageSupport(),
-          SLOT(openFunction(DesignerType, const QString&, const QString& )));
-      connect(designerPart, SIGNAL(editSource(DesignerType, const QString& )),
+          TQT_SLOT(openFunction(DesignerType, const TQString&, const TQString& )));
+      connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )),
           API::getInstance()->languageSupport(),
-          SLOT(openSource(DesignerType, const QString& )));
-      connect(designerPart, SIGNAL(newStatus(const QString &, int)),
-          this, SLOT(slotNewDesignerStatus(const QString &, int)));
+          TQT_SLOT(openSource(DesignerType, const TQString& )));
+      connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)),
+          this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int)));
   }
 }
 
@@ -740,14 +740,14 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc)
 
   if ( !doc ) return;
 
-  connect( doc, SIGNAL(textChanged()), this, SLOT(textChanged()) );
-  connect( doc, SIGNAL(fileNameChanged()),
-    this, SLOT(slotDocumentUrlChanged()));
+  connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(textChanged()) );
+  connect( doc, TQT_SIGNAL(fileNameChanged()),
+    this, TQT_SLOT(slotDocumentUrlChanged()));
 
   if( doc->widget() )
   {
-      connect( doc->widget(), SIGNAL(dropEventPass(QDropEvent *)),
-        TopLevel::getInstance()->main(), SLOT(slotDropEvent(QDropEvent *)) );
+      connect( doc->widget(), TQT_SIGNAL(dropEventPass(TQDropEvent *)),
+        TopLevel::getInstance()->main(), TQT_SLOT(slotDropEvent(TQDropEvent *)) );
   }
 
   if ( KTextEditor::View * view = dynamic_cast( doc->widget() ) )
@@ -783,11 +783,11 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc)
   // signals are dynamic, if we try to connect to an editorpart that lacks this signal,
   // all we get is a runtime warning. At this point in time we are only really supported
   // by katepart anyway so IMHO this hack is justified. //teatime
-  QPtrList list = doc->views();
-  QPtrListIterator it( list );
+  TQPtrList list = doc->views();
+  TQPtrListIterator it( list );
   while ( it.current() )
   {
-    connect( it, SIGNAL( newStatus() ), this, SLOT( slotNewStatus() ) );
+    connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) );
     ++it;
   }
 }
@@ -864,7 +864,7 @@ void PartController::slotUploadFinished()
 
 KParts::ReadOnlyPart *PartController::partForURL(const KURL &url)
 {
-	QPtrListIterator it(*parts());
+	TQPtrListIterator it(*parts());
 	for ( ; it.current(); ++it)
 	{
 		KParts::ReadOnlyPart *ro_part = dynamic_cast(it.current());
@@ -874,9 +874,9 @@ KParts::ReadOnlyPart *PartController::partForURL(const KURL &url)
 	return 0;
 }
 
-KParts::Part * PartController::partForWidget( const QWidget * widget )
+KParts::Part * PartController::partForWidget( const TQWidget * widget )
 {
-	QPtrListIterator it(*parts());
+	TQPtrListIterator it(*parts());
 	for ( ; it.current(); ++it)
 	{
 		if ( it.current()->widget() == widget )
@@ -892,7 +892,7 @@ void PartController::activatePart(KParts::Part *part)
 {
   if ( !part ) return;
 
-  QWidget * widget = EditorProxy::getInstance()->widgetForPart( part );
+  TQWidget * widget = EditorProxy::getInstance()->widgetForPart( part );
   if (widget)
   {
     TopLevel::getInstance()->raiseView( widget );
@@ -902,7 +902,7 @@ void PartController::activatePart(KParts::Part *part)
 
   setActivePart(part);
 
-  QWidget* w2 = EditorProxy::getInstance()->widgetForPart( part );
+  TQWidget* w2 = EditorProxy::getInstance()->widgetForPart( part );
   if (w2 != widget)
     w2->setFocus();
 }
@@ -916,7 +916,7 @@ bool PartController::closePart(KParts::Part *part)
 
     KURL url = ro_part->url();
 
-    if (QWidget* w = EditorProxy::getInstance()->topWidgetForPart( part ) )
+    if (TQWidget* w = EditorProxy::getInstance()->topWidgetForPart( part ) )
     {
         if ( MultiBuffer *multiBuffer = dynamic_cast( w ) )
         {
@@ -974,7 +974,7 @@ void PartController::updateMenuItems()
   bool hasWriteParts = false;
   bool hasReadOnlyParts = false;
 
-  QPtrListIterator it(*parts());
+  TQPtrListIterator it(*parts());
   for ( ; it.current(); ++it)
   {
     if (it.current()->inherits("KParts::ReadWritePart"))
@@ -1059,7 +1059,7 @@ KURL::List PartController::modifiedDocuments()
 {
 	KURL::List modFiles;
 
-	QPtrListIterator it( *parts() );
+	TQPtrListIterator it( *parts() );
 	while( it.current() )
 	{
 		KParts::ReadWritePart *rw_part = dynamic_cast(it.current());
@@ -1194,7 +1194,7 @@ bool PartController::saveFilesDialog( KURL::List const & ignoreList )
 	if ( modList.count() > 0 && modList != ignoreList )
 	{
 		KSaveSelectDialog dlg( modList, ignoreList, TopLevel::getInstance()->main() );
-		if ( dlg.exec() == QDialog::Accepted )
+		if ( dlg.exec() == TQDialog::Accepted )
 		{
 			saveFiles( dlg.filesToSave() );
 			clearModified( dlg.filesNotToSave() );
@@ -1211,8 +1211,8 @@ bool PartController::closeFilesDialog( KURL::List const & ignoreList )
 {
 	if ( !saveFilesDialog( ignoreList ) ) return false;
 
-	QPtrList partList( *parts() );
-	QPtrListIterator it( partList );
+	TQPtrList partList( *parts() );
+	TQPtrListIterator it( partList );
 	while ( KParts::Part* part = it.current() )
 	{
 		KParts::ReadOnlyPart * ro_part = dynamic_cast( part );
@@ -1273,10 +1273,10 @@ void PartController::slotCloseOtherWindows()
 
 void PartController::slotOpenFile()
 {
-	QString DefaultEncoding;
-	if ( QDomDocument * projectDom = API::getInstance()->projectDom() )
+	TQString DefaultEncoding;
+	if ( TQDomDocument * projectDom = API::getInstance()->projectDom() )
 	{
-		DefaultEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", QString::null );
+		DefaultEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString::null );
 	}
 
 	if ( DefaultEncoding.isEmpty() )
@@ -1284,11 +1284,11 @@ void PartController::slotOpenFile()
 		// have a peek at katepart's settings:
 		KConfig * config = kapp->config();
 		config->setGroup("Kate Document Defaults");
-		DefaultEncoding = config->readEntry("Encoding", QString::null );
+		DefaultEncoding = config->readEntry("Encoding", TQString::null );
 	}
 
-	KEncodingFileDialog::Result result = KEncodingFileDialog::getOpenURLsAndEncoding( DefaultEncoding, QString::null,
-		QString::null, TopLevel::getInstance()->main(), QString::null );
+	KEncodingFileDialog::Result result = KEncodingFileDialog::getOpenURLsAndEncoding( DefaultEncoding, TQString::null,
+		TQString::null, TopLevel::getInstance()->main(), TQString::null );
 
 	for ( KURL::List::Iterator it = result.URLs.begin(); it != result.URLs.end(); ++it )
 	{
@@ -1334,17 +1334,17 @@ void PartController::slotActivePartChanged( KParts::Part *part )
     }
 
     updateMenuItems();
-    QTimer::singleShot( 100, this, SLOT(slotWaitForFactoryHack()) );
+    TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) );
 }
 
-void PartController::showPart( KParts::Part* part, const QString& name, const QString& shortDescription )
+void PartController::showPart( KParts::Part* part, const TQString& name, const TQString& shortDescription )
 {
   if (!part->widget()) {
     /// @todo error handling
     return; // to avoid later crash
   }
 
-  QPtrListIterator it(*parts());
+  TQPtrListIterator it(*parts());
   for ( ; it.current(); ++it)
   {
     if( it.current() == part ){
@@ -1366,7 +1366,7 @@ void PartController::slotDocumentDirty( Kate::Document * d, bool isModified, uns
 	//	KTextEditor::Document * doc = reinterpret_cast( d ); // theoretically unsafe in MI scenario
 	KTextEditor::Document * doc = 0;
 
-	QPtrListIterator it( *parts() );
+	TQPtrListIterator it( *parts() );
 	while( it.current() )
 	{
 		if ( (void*)it.current() == (void*)d )
@@ -1386,7 +1386,7 @@ void PartController::slotDocumentDirty( Kate::Document * d, bool isModified, uns
 		p->doc = doc;
 		p->isModified = isModified;
 		p->reason = reason;
-		KDevJobTimer::singleShot( 0, this, SLOT(slotDocumentDirtyStepTwo(void*)), p );
+		KDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p );
 	}
 }
 
@@ -1399,9 +1399,9 @@ void PartController::slotDocumentDirtyStepTwo( void * payload )
 
 	// let's make sure the document is still loaded
 	bool haveDocument = false;
-	if( const QPtrList * partlist = parts() )
+	if( const TQPtrList * partlist = parts() )
 	{
-		QPtrListIterator it( *partlist );
+		TQPtrListIterator it( *partlist );
 		while ( KParts::Part * part = it.current() )
 		{
 			if ( p->doc == dynamic_cast( part ) )
@@ -1462,7 +1462,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 {
     KConfig *config = kapp->config();
     config->setGroup("Editor");
-	QString dirtyAction = config->readEntry( "DirtyAction" );
+	TQString dirtyAction = config->readEntry( "DirtyAction" );
 
 	if ( dirtyAction == "nothing" ) return false;
 
@@ -1511,7 +1511,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 	return true;
 }
 
-void PartController::slotNewDesignerStatus(const QString &formName, int status)
+void PartController::slotNewDesignerStatus(const TQString &formName, int status)
 {
 	kdDebug(9000) << k_funcinfo << endl;
 	kdDebug(9000) << " formName: " << formName << ", status: " << status << endl;
@@ -1522,7 +1522,7 @@ void PartController::slotNewStatus( )
 {
 	kdDebug(9000) << k_funcinfo << endl;
 
-	QObject * senderobj = const_cast( sender() );
+	TQObject * senderobj = const_cast( sender() );
 	KTextEditor::View * view = dynamic_cast( senderobj );
 	if ( view )
 	{
@@ -1564,7 +1564,7 @@ void PartController::doEmitState( KURL const & url )
 KURL::List PartController::openURLs( )
 {
 	KURL::List list;
-	QPtrListIterator it(*parts());
+	TQPtrListIterator it(*parts());
 	for ( ; it.current(); ++it)
 	{
 		if ( KParts::ReadOnlyPart *ro_part = dynamic_cast(it.current()) )
@@ -1582,7 +1582,7 @@ KURL::List PartController::openURLs( )
 PartController::HistoryEntry::HistoryEntry( const KURL & u, int l, int c)
 	: url(u), line(l), col(c)
 {
-	id = abs( QTime::currentTime().msecsTo( QTime() ) );	// should provide a reasonably unique number
+	id = abs( TQTime::currentTime().msecsTo( TQTime() ) );	// should provide a reasonably unique number
 }
 
 void PartController::slotBack()
@@ -1625,10 +1625,10 @@ void PartController::slotBackAboutToShow()
 	if ( m_backHistory.isEmpty()) return;
 
 	int i = 0;
-	QValueList::ConstIterator it = m_backHistory.begin();
+	TQValueList::ConstIterator it = m_backHistory.begin();
 	while( i < 10 && it != m_backHistory.end() )
 	{
-		popup->insertItem( (*it).url.fileName() + QString(" (%1)").arg( (*it).line +1), (*it).id );
+		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id );
 		++i;
 		++it;
 	}
@@ -1642,10 +1642,10 @@ void PartController::slotForwardAboutToShow( )
 	if ( m_forwardHistory.isEmpty() ) return;
 
 	int i = 0;
-	QValueList::ConstIterator it = m_forwardHistory.begin();
+	TQValueList::ConstIterator it = m_forwardHistory.begin();
 	while( i < 10 && it != m_forwardHistory.end() )
 	{
-		popup->insertItem( (*it).url.fileName() + QString(" (%1)").arg( (*it).line +1), (*it).id );
+		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id );
 		++i;
 		++it;
 	}
@@ -1653,7 +1653,7 @@ void PartController::slotForwardAboutToShow( )
 
 void PartController::slotBackPopupActivated( int id )
 {
-	QValueList::Iterator it = m_backHistory.begin();
+	TQValueList::Iterator it = m_backHistory.begin();
 	while( it != m_backHistory.end() )
 	{
 		if ( (*it).id == id )
@@ -1678,7 +1678,7 @@ void PartController::slotBackPopupActivated( int id )
 
 void PartController::slotForwardPopupActivated( int id )
 {
-	QValueList::Iterator it = m_forwardHistory.begin();
+	TQValueList::Iterator it = m_forwardHistory.begin();
 	while( it != m_forwardHistory.end() )
 	{
 		if ( (*it).id == id )
@@ -1761,7 +1761,7 @@ void PartController::slotWaitForFactoryHack( )
 	{
 		if ( !activePart()->factory() )
 		{
-			QTimer::singleShot( 100, this, SLOT(slotWaitForFactoryHack()) );
+			TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) );
     		return;
 		}
 		else
@@ -1785,7 +1785,7 @@ void PartController::slotWaitForFactoryHack( )
 
 KParts::ReadOnlyPart *PartController::qtDesignerPart()
 {
-	QPtrListIterator it(*parts());
+	TQPtrListIterator it(*parts());
 	for ( ; it.current(); ++it)
 	{
 		KInterfaceDesigner::Designer *des =  dynamic_cast(it.current());
@@ -1809,13 +1809,13 @@ KTextEditor::Editor *PartController::openTextDocument( bool activate )
             if ( extension )
             {
                 KParts::URLArgs args;
-                args.serviceType = QString( "text/plain;" ) + m_presetEncoding;
+                args.serviceType = TQString( "text/plain;" ) + m_presetEncoding;
                 extension->setURLArgs(args);
             }
-            m_presetEncoding = QString::null;
+            m_presetEncoding = TQString::null;
         }
 
-        QWidget * widget =
+        TQWidget * widget =
             EditorProxy::getInstance()->topWidgetForPart( editorpart );
 
         addHistoryEntry();
@@ -1848,7 +1848,7 @@ void PartController::gotoLastEditPos()
 
 void PartController::slotDocumentUrlChanged()
 {
-    QObject *obj = const_cast(sender());
+    TQObject *obj = const_cast(sender());
     KTextEditor::Document *doc = dynamic_cast( obj );
     if (!doc)
         return;
diff --git a/src/partcontroller.h b/src/partcontroller.h
index 9aa4e226..869ee5bf 100644
--- a/src/partcontroller.h
+++ b/src/partcontroller.h
@@ -3,13 +3,13 @@
 
 #include "kdevpartcontroller.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 namespace KParts
 {
@@ -46,13 +46,13 @@ class PartController : public KDevPartController
 
 public:
 
-  PartController(QWidget *toplevel);
-  static void createInstance(QWidget *parent);
+  PartController(TQWidget *toplevel);
+  static void createInstance(TQWidget *parent);
   static PartController *getInstance();
 
   ///// KDevPartController interface
 
-  void setEncoding(const QString &encoding);
+  void setEncoding(const TQString &encoding);
   void editDocument(const KURL &inputUrl, int lineNum=-1, int col=-1);
   void splitCurrentDocument(const KURL &inputUrl, int lineNum=-1, int col=-1);
   void scrollToLineColumn(const KURL &url, int lineNum=-1, int col=-1, bool storeHistory = false );
@@ -61,11 +61,11 @@ public:
   void integrateTextEditorPart(KTextEditor::Document* doc);
 
   void showDocument(const KURL &url, bool newWin = false);
-  void showPart( KParts::Part* part, const QString& name, const QString& shortDescription );
+  void showPart( KParts::Part* part, const TQString& name, const TQString& shortDescription );
 
   KParts::ReadOnlyPart *partForURL(const KURL &url);
   KParts::ReadOnlyPart *qtDesignerPart();
-  KParts::Part * partForWidget( const QWidget * widget );
+  KParts::Part * partForWidget( const TQWidget * widget );
 
   void activatePart( KParts::Part * part );
   bool closePart( KParts::Part * part );
@@ -95,9 +95,9 @@ public:
   void reloadFile( const KURL & url );
 
   KTextEditor::Editor *openTextDocument( bool activate = true );
-  KParts::Factory *findPartFactory(const QString &mimeType,
-                                   const QString &partType,
-                                   const QString &preferredName = QString::null );
+  KParts::Factory *findPartFactory(const TQString &mimeType,
+                                   const TQString &partType,
+                                   const TQString &preferredName = TQString::null );
 
 public slots:
 
@@ -141,7 +141,7 @@ private slots:
   void slotDocumentDirty( Kate::Document * doc, bool isModified, unsigned char reason );
   void slotDocumentDirtyStepTwo( void * );
   void slotNewStatus();
-  void slotNewDesignerStatus(const QString &formName, int status);
+  void slotNewDesignerStatus(const TQString &formName, int status);
   void textChanged();
   void gotoLastEditPos();
 
@@ -160,7 +160,7 @@ private:
                                           bool addToCurrentBuffer = false,
                                           const KURL &url = KURL() );
 
-  void integratePart(KParts::Part *part, const KURL &url, QWidget* widget = 0,
+  void integratePart(KParts::Part *part, const KURL &url, TQWidget* widget = 0,
                        bool isTextEditor=false, bool activate=true,
                        bool addToCurrentBuffer = false );
 
@@ -180,7 +180,7 @@ private:
   KAction *m_closeWindowAction, *m_saveAllFilesAction, *m_revertAllFilesAction;
   KAction *m_closeAllWindowsAction, *m_closeOtherWindowsAction;
   KRecentFilesAction *m_openRecentAction;
-  QString m_presetEncoding;
+  TQString m_presetEncoding;
 
   KToolBarPopupAction* m_backAction;
   KToolBarPopupAction* m_forwardAction;
@@ -188,11 +188,11 @@ private:
 
   bool m_openNextAsText;
 
-  QValueList _dirtyDocuments;
+  TQValueList _dirtyDocuments;
 
-  QMap< KParts::ReadOnlyPart*, KURL > _partURLMap;	// used to note when a URL changes (a file changes name)
+  TQMap< KParts::ReadOnlyPart*, KURL > _partURLMap;	// used to note when a URL changes (a file changes name)
 
-  QGuardedPtr _editorFactory;
+  TQGuardedPtr _editorFactory;
 
 	struct HistoryEntry
 	{
@@ -209,8 +209,8 @@ private:
         HistoryEntry createHistoryEntry( KParts::ReadOnlyPart * part = 0 );
 	void jumpTo( const HistoryEntry & );
 
-	QValueList m_backHistory;
-	QValueList m_forwardHistory;
+	TQValueList m_backHistory;
+	TQValueList m_forwardHistory;
 	bool m_isJumping;
 
 	struct LastEditPos
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 2dc01654..7b7ffac1 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -1,5 +1,5 @@
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -47,9 +47,9 @@
 namespace
 {
   template 
-  ComponentType *loadDefaultPart( const QString &serviceType )
+  ComponentType *loadDefaultPart( const TQString &serviceType )
   {
-    KTrader::OfferList offers = KTrader::self()->query(serviceType, QString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
+    KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
     KTrader::OfferList::ConstIterator serviceIt = offers.begin();
     for ( ; serviceIt != offers.end(); ++serviceIt ) {
       KService::Ptr service = *serviceIt;
@@ -79,14 +79,14 @@ PluginController *PluginController::getInstance()
 PluginController::PluginController()
   : KDevPluginController()
 {
-/*  m_defaultProfile = QString::fromLatin1( "FullIDE" );
+/*  m_defaultProfile = TQString::fromLatin1( "FullIDE" );
   m_defaultProfilePath = kapp->dirs()->localkdedir() + "/" +
 			 KStandardDirs::kde_default( "data" ) +
-			 QString::fromLatin1("/kdevelop/profiles/FullIDE");*/
+			 TQString::fromLatin1("/kdevelop/profiles/FullIDE");*/
 
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     if( args->isSet("profile") ){
-        m_profile = QString::fromLocal8Bit( args->getOption("profile") );
+        m_profile = TQString::fromLocal8Bit( args->getOption("profile") );
     } else {
         m_profile = ShellExtension::getInstance()->defaultProfile();
     }
@@ -98,7 +98,7 @@ void PluginController::loadInitialPlugins()
 {
 	loadCorePlugins();
 
-	QStringList disableList;
+	TQStringList disableList;
 	Profile * profile = engine().findProfile( currentProfile() );
 	if( profile )
 	{
@@ -123,25 +123,25 @@ void PluginController::loadCorePlugins()
   loadPlugins( coreOffers );
 }
 
-void PluginController::loadGlobalPlugins( const QStringList & ignorePlugins )
+void PluginController::loadGlobalPlugins( const TQStringList & ignorePlugins )
 {
   KTrader::OfferList globalOffers = m_engine.offers(m_profile, ProfileEngine::Global);
   loadPlugins( globalOffers, ignorePlugins );
 }
 
-void PluginController::loadProjectPlugins( const QStringList & ignorePlugins )
+void PluginController::loadProjectPlugins( const TQStringList & ignorePlugins )
 {
 	KTrader::OfferList projectOffers = m_engine.offers(m_profile, ProfileEngine::Project);
 	loadPlugins( projectOffers, ignorePlugins );
 }
 
-void PluginController::loadPlugins( KTrader::OfferList offers, const QStringList & ignorePlugins )
+void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringList & ignorePlugins )
 {
 
   TopLevel::getInstance()->main()->setFocus();
   for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
   {
-    QString name = (*it)->desktopEntryName();
+    TQString name = (*it)->desktopEntryName();
 
     // Check if it is already loaded or shouldn't be
     if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) )
@@ -160,7 +160,7 @@ void PluginController::loadPlugins( KTrader::OfferList offers, const QStringList
 
 void PluginController::unloadPlugins()
 {
-  for( QDictIterator it( m_parts ); !it.isEmpty(); )
+  for( TQDictIterator it( m_parts ); !it.isEmpty(); )
   {
     KDevPlugin* part = it.current();
     removePart( part );
@@ -178,7 +178,7 @@ void PluginController::unloadProjectPlugins( )
  	offers += m_engine.offers(m_profile, ProfileEngine::Project);
 	for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
 	{
-		QString name = (*it)->desktopEntryName();
+		TQString name = (*it)->desktopEntryName();
 
 		if ( KDevPlugin * plugin = m_parts[ name ] )
 		{
@@ -189,9 +189,9 @@ void PluginController::unloadProjectPlugins( )
 	}
 }
 
-void PluginController::unloadPlugins( QStringList const & unloadParts )
+void PluginController::unloadPlugins( TQStringList const & unloadParts )
 {
-	QStringList::ConstIterator it = unloadParts.begin();
+	TQStringList::ConstIterator it = unloadParts.begin();
 	while ( it != unloadParts.end() )
 	{
 		KDevPlugin* part = m_parts[ *it ];
@@ -226,15 +226,15 @@ KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service )
     return pl;
 }
 
-QStringList PluginController::argumentsFromService( const KService::Ptr &service )
+TQStringList PluginController::argumentsFromService( const KService::Ptr &service )
 {
-	QStringList args;
+	TQStringList args;
 	if ( !service )
 		// service is a reference to a pointer, so a check whether it is 0 is still required
 		return args;
-	QVariant prop = service->property( "X-KDevelop-Args" );
+	TQVariant prop = service->property( "X-KDevelop-Args" );
 	if ( prop.isValid() )
-		args = QStringList::split( " ", prop.toString() );
+		args = TQStringList::split( " ", prop.toString() );
 	return args;
 }
 
@@ -244,11 +244,11 @@ void PluginController::integratePart(KXMLGUIClient *part)
     Core::setupShourtcutTips(part);
     
     TopLevel::getInstance()->main()->guiFactory()->addClient(part);
-    connect( part->actionCollection(), SIGNAL( actionStatusText( const QString & ) ),
-        TopLevel::getInstance()->main()->actionCollection(), SIGNAL( actionStatusText( const QString & ) ) );
+    connect( part->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ),
+        TopLevel::getInstance()->main()->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ) );
 }
 
-void PluginController::integrateAndRememberPart(const QString &name, KDevPlugin *part)
+void PluginController::integrateAndRememberPart(const TQString &name, KDevPlugin *part)
 {
     m_parts.insert(name, part);
     integratePart(part);
@@ -260,17 +260,17 @@ void PluginController::removePart(KXMLGUIClient *part)
   TopLevel::getInstance()->main()->guiFactory()->removeClient(part);
 }
 
-void PluginController::removeAndForgetPart(const QString &name, KDevPlugin *part)
+void PluginController::removeAndForgetPart(const TQString &name, KDevPlugin *part)
 {
     kdDebug() << "removing: " << name << endl;
     m_parts.remove(name);
     removePart(part);
 }
 
-const QValueList PluginController::loadedPlugins()
+const TQValueList PluginController::loadedPlugins()
 {
-	QValueList plugins;
-	QDictIterator itt(m_parts);
+	TQValueList plugins;
+	TQDictIterator itt(m_parts);
 	while( itt.current() )
 	{
 		plugins.append( itt.current() );
@@ -279,7 +279,7 @@ const QValueList PluginController::loadedPlugins()
 	return plugins;
 }
 
-KDevPlugin * PluginController::extension( const QString & serviceType, const QString & constraint )
+KDevPlugin * PluginController::extension( const TQString & serviceType, const TQString & constraint )
 {
     KTrader::OfferList offers = KDevPluginController::query(serviceType, constraint);
     for (KTrader::OfferList::const_iterator it = offers.constBegin(); it != offers.end(); ++it)
@@ -290,13 +290,13 @@ KDevPlugin * PluginController::extension( const QString & serviceType, const QSt
     return 0;
 }
 
-KDevPlugin * PluginController::loadPlugin( const QString & serviceType, const QString & constraint )
+KDevPlugin * PluginController::loadPlugin( const TQString & serviceType, const TQString & constraint )
 {
 	KTrader::OfferList offers = KDevPluginController::query( serviceType, constraint );
 	if ( !offers.size() == 1 ) return 0;
 
 	KTrader::OfferList::const_iterator it = offers.constBegin();
-	QString name = (*it)->desktopEntryName();
+	TQString name = (*it)->desktopEntryName();
 
 	KDevPlugin * plugin = 0;
 	if ( plugin = m_parts[ name ] )
@@ -313,33 +313,33 @@ KDevPlugin * PluginController::loadPlugin( const QString & serviceType, const QS
 	return plugin;
 }
 
-void PluginController::unloadPlugin( const QString & plugin )
+void PluginController::unloadPlugin( const TQString & plugin )
 {
-	QStringList pluginList;
+	TQStringList pluginList;
 	pluginList << plugin;
 	unloadPlugins( pluginList );
 }
 
-KURL::List PluginController::profileResources(const QString &nameFilter)
+KURL::List PluginController::profileResources(const TQString &nameFilter)
 {
     return m_engine.resources(currentProfile(), nameFilter);
 }
 
-KURL::List PluginController::profileResourcesRecursive(const QString &nameFilter)
+KURL::List PluginController::profileResourcesRecursive(const TQString &nameFilter)
 {
     return m_engine.resourcesRecursive(currentProfile(), nameFilter);
 }
 
-QString PluginController::changeProfile(const QString &newProfile)
+TQString PluginController::changeProfile(const TQString &newProfile)
 {
     kdDebug() << "CHANGING PROFILE: from " << currentProfile() << " to " << newProfile << endl;
-    QStringList unload;
+    TQStringList unload;
     KTrader::OfferList coreLoad;
     KTrader::OfferList globalLoad;
     m_engine.diffProfiles(ProfileEngine::Core, currentProfile(), newProfile, unload, coreLoad);
     m_engine.diffProfiles(ProfileEngine::Global, currentProfile(), newProfile, unload, globalLoad);
 
-    QString oldProfile = m_profile;
+    TQString oldProfile = m_profile;
     m_profile = newProfile;
 
     unloadPlugins(unload);
@@ -354,9 +354,9 @@ void PluginController::selectPlugins( )
 	kdDebug(9000) << k_funcinfo << endl;
 
 	PluginSelectDialog dlg;
-	if ( dlg.exec() == QDialog::Accepted )
+	if ( dlg.exec() == TQDialog::Accepted )
 	{
-		QStringList unselectedPlugins = dlg.unselectedPluginNames();
+		TQStringList unselectedPlugins = dlg.unselectedPluginNames();
 
 	kdDebug(9000) << unselectedPlugins << endl;
 
diff --git a/src/plugincontroller.h b/src/plugincontroller.h
index 9b526e3e..7eae5bda 100644
--- a/src/plugincontroller.h
+++ b/src/plugincontroller.h
@@ -1,8 +1,8 @@
 #ifndef __PLUGINCONTROLLER_H__
 #define __PLUGINCONTROLLER_H__
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
@@ -29,47 +29,47 @@ public:
   ~PluginController();
 
   static PluginController *getInstance();
-  static QStringList argumentsFromService( const KService::Ptr &service );
+  static TQStringList argumentsFromService( const KService::Ptr &service );
 
 
-  virtual KDevPlugin * loadPlugin( const QString & serviceType, const QString & constraint );
-  virtual void unloadPlugin( const QString & plugin );
+  virtual KDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint );
+  virtual void unloadPlugin( const TQString & plugin );
 
-  QString currentProfile() const { return m_profile; }
+  TQString currentProfile() const { return m_profile; }
 
   void loadInitialPlugins();
 
-  void loadProjectPlugins( const QStringList & ignorePlugins );
+  void loadProjectPlugins( const TQStringList & ignorePlugins );
   void unloadProjectPlugins();
 
-  void loadGlobalPlugins( const QStringList & ignorePlugins = QStringList() );
+  void loadGlobalPlugins( const TQStringList & ignorePlugins = TQStringList() );
 
   //  KDevPlugin * getPlugin( const KService::Ptr &service );
 
-  virtual KDevPlugin *extension(const QString &serviceType, const QString &constraint = "");
+  virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "");
 
-  void unloadPlugins( QStringList const & );
+  void unloadPlugins( TQStringList const & );
 
   void integratePart(KXMLGUIClient *part);
-  void integrateAndRememberPart(const QString &name, KDevPlugin *part);
+  void integrateAndRememberPart(const TQString &name, KDevPlugin *part);
   void removePart(KXMLGUIClient* part);
-  void removeAndForgetPart(const QString &name, KDevPlugin* part);
+  void removeAndForgetPart(const TQString &name, KDevPlugin* part);
 
-  const QValueList loadedPlugins();
+  const TQValueList loadedPlugins();
 
   ProfileEngine &engine() { return m_engine; }
 
-  virtual KURL::List profileResources(const QString &nameFilter);
-  virtual KURL::List profileResourcesRecursive(const QString &nameFilter);
+  virtual KURL::List profileResources(const TQString &nameFilter);
+  virtual KURL::List profileResourcesRecursive(const TQString &nameFilter);
 
   //returns the name of an old profile that was unloaded
-  QString changeProfile(const QString &newProfile);
+  TQString changeProfile(const TQString &newProfile);
 
 public slots:
   void selectPlugins();
 
 signals:
-  void loadingPlugin(const QString &plugin);
+  void loadingPlugin(const TQString &plugin);
 
 protected:
   PluginController();
@@ -77,15 +77,15 @@ protected:
 private slots:
 //  void slotConfigWidget( KDialogBase* );
   void loadCorePlugins();
-  void loadPlugins( KTrader::OfferList offers, const QStringList & ignorePlugins = QStringList() );
+  void loadPlugins( KTrader::OfferList offers, const TQStringList & ignorePlugins = TQStringList() );
   void unloadPlugins();
 
 private:
 	static KDevPlugin *loadPlugin( const KService::Ptr &service );
 
 
-  QDict m_parts;
-  QString m_profile;
+  TQDict m_parts;
+  TQString m_profile;
 
   static PluginController *s_instance;
 
diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp
index de4a9e1e..0863791c 100644
--- a/src/pluginselectdialog.cpp
+++ b/src/pluginselectdialog.cpp
@@ -9,10 +9,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -27,32 +27,32 @@ class PluginItem : public QCheckListItem
 {
 public:
 	// name - "Name", label - "GenericName", info - "Comment"
-	PluginItem( QListView * parent, QString const & name, QString const & label,
-				QString const & info, QString const url = QString::null )
-		: QCheckListItem( parent, label, QCheckListItem::CheckBox),
+	PluginItem( TQListView * parent, TQString const & name, TQString const & label,
+				TQString const & info, TQString const url = TQString::null )
+		: TQCheckListItem( parent, label, TQCheckListItem::CheckBox),
 		_name( name ), _info( info ), _url( url )
 	{}
 
-	QString info() { return _info; }
-	QString name() { return _name; }
-	QString url()  { return _url; }
+	TQString info() { return _info; }
+	TQString name() { return _name; }
+	TQString url()  { return _url; }
 
 private:
-	QString _name;
-	QString _info;
-	QString _url;
+	TQString _name;
+	TQString _info;
+	TQString _url;
 };
 
 
-PluginSelectDialog::PluginSelectDialog(QWidget* parent, const char* name, bool modal, WFlags fl )
+PluginSelectDialog::PluginSelectDialog(TQWidget* parent, const char* name, bool modal, WFlags fl )
 	: PluginSelectDialogBase( parent,name, modal,fl )
 {
-	plugin_list->setResizeMode( QListView::LastColumn );
+	plugin_list->setResizeMode( TQListView::LastColumn );
 	plugin_list->addColumn("");
 	plugin_list->header()->hide();
 
-	connect( plugin_list, SIGNAL( selectionChanged( QListViewItem * ) ), this, SLOT( itemSelected( QListViewItem * ) ) );
-	connect( urllabel, SIGNAL( leftClickedURL( const QString & ) ), this, SLOT( openURL( const QString & ) ) );
+	connect( plugin_list, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) );
+	connect( urllabel, TQT_SIGNAL( leftClickedURL( const TQString & ) ), this, TQT_SLOT( openURL( const TQString & ) ) );
 
 	init();
 }
@@ -70,7 +70,7 @@ void PluginSelectDialog::saveAsDefault()
 
 	profile->clearList( Profile::ExplicitDisable );
 
-	QListViewItemIterator it( plugin_list );
+	TQListViewItemIterator it( plugin_list );
 	while ( it.current() )
 	{
 		PluginItem * item = static_cast( it.current() );
@@ -84,12 +84,12 @@ void PluginSelectDialog::saveAsDefault()
 	profile->save();
 }
 
-void PluginSelectDialog::openURL( const QString & url )
+void PluginSelectDialog::openURL( const TQString & url )
 {
 	kapp->invokeBrowser( url );
 }
 
-void PluginSelectDialog::itemSelected( QListViewItem * item )
+void PluginSelectDialog::itemSelected( TQListViewItem * item )
 {
     if ( ! item ) return;
 
@@ -109,9 +109,9 @@ void PluginSelectDialog::itemSelected( QListViewItem * item )
 
 void PluginSelectDialog::init( )
 {
-	const QValueList loadedPlugins = PluginController::getInstance()->loadedPlugins();
-	QStringList loadedPluginDesktopNames;
-	QValueList::ConstIterator it = loadedPlugins.begin();
+	const TQValueList loadedPlugins = PluginController::getInstance()->loadedPlugins();
+	TQStringList loadedPluginDesktopNames;
+	TQValueList::ConstIterator it = loadedPlugins.begin();
 	while( it != loadedPlugins.end() )
 	{
 		loadedPluginDesktopNames << (*it)->instance()->instanceName();
@@ -134,12 +134,12 @@ void PluginSelectDialog::init( )
 	for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
 	{
 		// parse out any existing url to make it clickable
-		QString Comment = (*it)->comment();
-		QRegExp re("\\bhttp://[\\S]*");
+		TQString Comment = (*it)->comment();
+		TQRegExp re("\\bhttp://[\\S]*");
 		re.search( Comment );
 		Comment.replace( re, "" );
 
-		QString url;
+		TQString url;
 		if ( re.pos() > -1 )
 		{
 			url = re.cap();
@@ -151,17 +151,17 @@ void PluginSelectDialog::init( )
 		kdDebug(9000) << (*it)->desktopEntryName() << " : " << (loadedPluginDesktopNames.contains( (*it)->desktopEntryName() ) ? "YES" : "NO" ) << endl;
 	}
 
-	QListViewItem * first = plugin_list->firstChild();
+	TQListViewItem * first = plugin_list->firstChild();
 	if ( first )
 	{
 		plugin_list->setSelected( first, true );
 	}
 }
 
-QStringList PluginSelectDialog::unselectedPluginNames( )
+TQStringList PluginSelectDialog::unselectedPluginNames( )
 {
-	QStringList unselectedPlugins;
-	QListViewItem * item = plugin_list->firstChild();
+	TQStringList unselectedPlugins;
+	TQListViewItem * item = plugin_list->firstChild();
 	while ( item )
 	{
 		PluginItem * pluginItem = static_cast( item );
diff --git a/src/pluginselectdialog.h b/src/pluginselectdialog.h
index 5925ad7a..e0289eb6 100644
--- a/src/pluginselectdialog.h
+++ b/src/pluginselectdialog.h
@@ -22,18 +22,18 @@ class PluginSelectDialog : public PluginSelectDialogBase
 	Q_OBJECT
 
 public:
-	PluginSelectDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	PluginSelectDialog( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~PluginSelectDialog();
 
-	QStringList unselectedPluginNames();
+	TQStringList unselectedPluginNames();
 
 private:
 	void init();
 
 protected slots:
 	virtual void saveAsDefault();
-    void itemSelected( QListViewItem * );
-    void openURL( const QString & );
+    void itemSelected( TQListViewItem * );
+    void openURL( const TQString & );
 
 };
 
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index 4e0a33ab..903403de 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -18,10 +18,10 @@
  ***************************************************************************/
 #include "profileeditor.h"
 
-#include 
+#include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -62,18 +62,18 @@ private:
 
 class EDListItem: public KListViewItem{
 public:
-    EDListItem(KListView *parent, const QString &text, bool derived)
+    EDListItem(KListView *parent, const TQString &text, bool derived)
         : KListViewItem(parent, text), m_derived(derived)
     {
     }
     
     bool isDerived() const { return m_derived; }
 
-    virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
     {
-        QColorGroup cgNew = cg;
+        TQColorGroup cgNew = cg;
         if (m_derived)
-            cgNew.setColor(QColorGroup::Text, KGlobalSettings::inactiveTextColor());
+            cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor());
         KListViewItem::paintCell(p, cgNew, column, width, alignment);
     }
     
@@ -92,7 +92,7 @@ public:
 };
 
 
-ProfileEditor::ProfileEditor(QWidget *parent, const char *name)
+ProfileEditor::ProfileEditor(TQWidget *parent, const char *name)
     :ProfileEditorBase(parent, name)
 {
     refresh();
@@ -115,12 +115,12 @@ void ProfileEditor::refresh()
 
 void ProfileEditor::refreshPropertyCombo()
 {
-    KTrader::OfferList list = KTrader::self()->query(QString::fromLatin1("KDevelop/Plugin"));
-    QStringList props;
+    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"));
+    TQStringList props;
     for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it)
     {
-        QStringList currProps = (*it)->property("X-KDevelop-Properties").toStringList();
-        for (QStringList::const_iterator p = currProps.constBegin(); 
+        TQStringList currProps = (*it)->property("X-KDevelop-Properties").toStringList();
+        for (TQStringList::const_iterator p = currProps.constBegin(); 
                 p != currProps.constEnd(); ++p)
             if (!props.contains(*p))
                 props.append(*p);
@@ -152,7 +152,7 @@ void ProfileEditor::refreshAvailableList()
         new KListViewItem(allProject, (*it)->desktopEntryName(), (*it)->genericName());
 }
 
-void ProfileEditor::profileExecuted(QListViewItem *item)
+void ProfileEditor::profileExecuted(TQListViewItem *item)
 {    
     if (!item || item->text(0) == "KDevelop")
         removeProfileButton->setEnabled(false);
@@ -224,7 +224,7 @@ void ProfileEditor::fillPluginsList(Profile *profile)
             (*it)->property("X-KDevelop-Properties").toStringList().join(", "));
 }
 
-void ProfileEditor::propertyExecuted(QListBoxItem *item)
+void ProfileEditor::propertyExecuted(TQListBoxItem *item)
 {
     removePropertyButton->setEnabled(item != 0);
 }
@@ -236,10 +236,10 @@ void ProfileEditor::addProfile()
     
     KDialogBase dlg(KDialogBase::Plain, i18n("Add Profile"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok);
     dlg.plainPage()->setMargin(0);
-    (new QVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true);
+    (new TQVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true);
     AddProfileWidget *prof = new AddProfileWidget(dlg.plainPage());
     prof->nameEdit->setFocus();
-    if (dlg.exec() == QDialog::Accepted)
+    if (dlg.exec() == TQDialog::Accepted)
     {
         Profile *profile = new Profile(currentProfile(), prof->nameEdit->text(), 
             prof->genericNameEdit->text(), 
@@ -257,7 +257,7 @@ void ProfileEditor::removeProfile()
         Profile *profile = currentProfile();
         if (profile->remove())
         {
-            QListViewItem *item = profilesList->currentItem();
+            TQListViewItem *item = profilesList->currentItem();
             profilesList->setCurrentItem(item->parent());
             profile->detachFromParent();
             delete profile;
@@ -309,7 +309,7 @@ void ProfileEditor::addEnabled()
 {
     if (!allList->currentItem() && allEdit->text().isEmpty())
         return;
-    QString text;
+    TQString text;
     if (!allEdit->text().isEmpty())
     {
         text = allEdit->text();
@@ -355,7 +355,7 @@ void ProfileEditor::addDisabled()
 {
     if (!allList->currentItem() && allEdit->text().isEmpty())
         return;
-    QString text;
+    TQString text;
     if (!allEdit->text().isEmpty())
     {
         text = allEdit->text();
diff --git a/src/profileengine/editor/profileeditor.h b/src/profileengine/editor/profileeditor.h
index 5ce014fd..3f4fff85 100644
--- a/src/profileengine/editor/profileeditor.h
+++ b/src/profileengine/editor/profileeditor.h
@@ -30,15 +30,15 @@ class KListViewItem;
 class ProfileEditor : public ProfileEditorBase {
     Q_OBJECT
 public:
-    ProfileEditor(QWidget *parent = 0, const char *name = 0);
+    ProfileEditor(TQWidget *parent = 0, const char *name = 0);
     
 public slots:
     virtual void removeProperty();
     virtual void addProperty();
     virtual void removeProfile();
     virtual void addProfile();
-    virtual void propertyExecuted(QListBoxItem *item);
-    virtual void profileExecuted(QListViewItem *item);
+    virtual void propertyExecuted(TQListBoxItem *item);
+    virtual void profileExecuted(TQListViewItem *item);
     
     virtual void delDisabled();
     virtual void addDisabled();
diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp
index 62a7c586..f07c6376 100644
--- a/src/profileengine/lib/profile.cpp
+++ b/src/profileengine/lib/profile.cpp
@@ -18,21 +18,21 @@
  ***************************************************************************/
 #include "profile.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
 
-Profile::Profile(Profile *parent, const QString &name)
+Profile::Profile(Profile *parent, const TQString &name)
     :m_parent(parent), m_name(name)
 {
     if (m_parent)
         m_parent->addChildProfile(this);
 
-    QString profileConfig = locate("data", "kdevelop/profiles" + dirName() + "/profile.config");
+    TQString profileConfig = locate("data", "kdevelop/profiles" + dirName() + "/profile.config");
     KConfig config(profileConfig);
 
     config.setGroup("Information");
@@ -49,7 +49,7 @@ Profile::Profile(Profile *parent, const QString &name)
     m_explicitDisable = config.readListEntry("List");
 }
 
-Profile::Profile(Profile *parent, const QString &name, const QString &genericName, const QString &description)
+Profile::Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description)
     :m_parent(parent), m_name(name), m_genericName(genericName), m_description(description)
 {
     if (m_parent)
@@ -59,7 +59,7 @@ Profile::Profile(Profile *parent, const QString &name, const QString &genericNam
 
 Profile::~Profile()
 {
-    for (QValueList::iterator it = m_children.begin(); it != m_children.end(); ++it)
+    for (TQValueList::iterator it = m_children.begin(); it != m_children.end(); ++it)
         delete *it;
 }
 
@@ -73,7 +73,7 @@ void Profile::removeChildProfile(Profile *profile)
     m_children.remove(profile);
 }
 
-QString Profile::dirName() const
+TQString Profile::dirName() const
 {
     if (m_parent)
         return m_parent->dirName() + "/" + m_name;
@@ -83,7 +83,7 @@ QString Profile::dirName() const
 
 void Profile::save()
 {
-    QString profileConfig = locateLocal("data", "kdevelop/profiles" + dirName() + "/profile.config");
+    TQString profileConfig = locateLocal("data", "kdevelop/profiles" + dirName() + "/profile.config");
     KConfig config(profileConfig);
 
     config.setGroup("Information");
@@ -110,22 +110,22 @@ Profile::EntryList Profile::list(List type)
     EntryList list = parentList;
     for (EntryList::iterator it = list.begin(); it != list.end(); ++it)
         (*it).derived = true;
-    QStringList &personalList = listByType(type);
-    for (QStringList::const_iterator it = personalList.begin(); it != personalList.end(); ++it)
+    TQStringList &personalList = listByType(type);
+    for (TQStringList::const_iterator it = personalList.begin(); it != personalList.end(); ++it)
         list.append(Entry(*it, false));
     return list;
 }
 
-void Profile::addEntry(List type, const QString &value)
+void Profile::addEntry(List type, const TQString &value)
 {
-    QStringList &list = listByType(type);
+    TQStringList &list = listByType(type);
     if (!list.contains(value))
         list.append(value);
 }
 
-void Profile::removeEntry(List type, const QString &value)
+void Profile::removeEntry(List type, const TQString &value)
 {
-    QStringList &list = listByType(type);
+    TQStringList &list = listByType(type);
     list.remove(value);
 }
 
@@ -142,7 +142,7 @@ void Profile::clearList( List type )
     }
 }
 
-QStringList &Profile::listByType(List type)
+TQStringList &Profile::listByType(List type)
 {
     switch (type) {
         case Properties:
@@ -155,7 +155,7 @@ QStringList &Profile::listByType(List type)
     }
 }
 
-bool Profile::hasInEntryList(EntryList &list, QString value)
+bool Profile::hasInEntryList(EntryList &list, TQString value)
 {
     for (EntryList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it)
         if ((*it).name == value)
@@ -165,8 +165,8 @@ bool Profile::hasInEntryList(EntryList &list, QString value)
 
 bool Profile::remove()
 {
-    QStringList dirs = KGlobal::dirs()->findDirs("data", "kdevelop/profiles" + dirName());
-    if ((dirs.count() == 1) && dirs[0].startsWith(QDir::homeDirPath()))
+    TQStringList dirs = KGlobal::dirs()->findDirs("data", "kdevelop/profiles" + dirName());
+    if ((dirs.count() == 1) && dirs[0].startsWith(TQDir::homeDirPath()))
         return KIO::NetAccess::del(KURL::fromPathOrURL(dirs[0]), 0);
     return false;
 }
@@ -177,17 +177,17 @@ void Profile::detachFromParent()
         m_parent->removeChildProfile(this);
 }
 
-KURL::List Profile::resources(const QString &nameFilter)
+KURL::List Profile::resources(const TQString &nameFilter)
 {
-    QStringList resources;
-    QStringList resourceDirs = KGlobal::dirs()->resourceDirs("data");
-    for (QStringList::const_iterator it = resourceDirs.begin(); it != resourceDirs.end(); ++it)
+    TQStringList resources;
+    TQStringList resourceDirs = KGlobal::dirs()->resourceDirs("data");
+    for (TQStringList::const_iterator it = resourceDirs.begin(); it != resourceDirs.end(); ++it)
     {
-        QString dir = *it;
+        TQString dir = *it;
         dir = dir + "kdevelop/profiles" + dirName();
 
-        QDir d(dir);
-        const QFileInfoList *infoList = d.entryInfoList(nameFilter, QDir::Files);
+        TQDir d(dir);
+        const QFileInfoList *infoList = d.entryInfoList(nameFilter, TQDir::Files);
         if (!infoList)
             continue;
         for (QFileInfoList::const_iterator infoIt = infoList->constBegin();
@@ -200,6 +200,6 @@ KURL::List Profile::resources(const QString &nameFilter)
 
 void Profile::addResource(const KURL &url)
 {
-    QString saveLocation = KGlobal::dirs()->saveLocation("data", "kdevelop/profiles"+dirName(), true);
+    TQString saveLocation = KGlobal::dirs()->saveLocation("data", "kdevelop/profiles"+dirName(), true);
     KIO::NetAccess::file_copy(url, KURL::fromPathOrURL(saveLocation), -1, true);
 }
diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h
index 9d467984..c81db7e3 100644
--- a/src/profileengine/lib/profile.h
+++ b/src/profileengine/lib/profile.h
@@ -20,7 +20,7 @@
 #define PROFILE_H
 
 #include 
-#include 
+#include 
 
 /**
 @short KDevelop profile
@@ -32,11 +32,11 @@ public:
     /**An entry in the lists that store profile information*/
     struct Entry {
         Entry() {}
-        Entry(const QString &_name, bool _derived): name(_name), derived(_derived) {}
-        QString name;
+        Entry(const TQString &_name, bool _derived): name(_name), derived(_derived) {}
+        TQString name;
         bool derived;
     };
-    typedef QValueList EntryList;
+    typedef TQValueList EntryList;
 
     /**Lists which are held by a profile.*/
     enum List {
@@ -45,29 +45,29 @@ public:
         ExplicitDisable   /** children() const { return m_children; }
+    TQValueList children() const { return m_children; }
     Profile *parent() const { return m_parent; }
 
     void save();
     bool remove();
 
-    QString name() const { return m_name; }
-    QString genericName() const { return m_genericName; }
-    QString description() const { return m_description; }
+    TQString name() const { return m_name; }
+    TQString genericName() const { return m_genericName; }
+    TQString description() const { return m_description; }
 
     EntryList list(List type);
 
-    void addEntry(List type, const QString &value);
-    void removeEntry(List type, const QString &value);
+    void addEntry(List type, const TQString &value);
+    void removeEntry(List type, const TQString &value);
     void clearList(List type);
 
-    bool hasInEntryList(EntryList &list, QString value);
+    bool hasInEntryList(EntryList &list, TQString value);
 
-    KURL::List resources(const QString &nameFilter);
+    KURL::List resources(const TQString &nameFilter);
     void addResource(const KURL &url);
 
     void detachFromParent();
@@ -75,22 +75,22 @@ public:
 protected:
     void addChildProfile(Profile *profile);
     void removeChildProfile(Profile *profile);
-    QString dirName() const;
+    TQString dirName() const;
 
-    QStringList &listByType(List type);
+    TQStringList &listByType(List type);
 
 private:
     Profile *m_parent;
-    QValueList m_children;
+    TQValueList m_children;
 
-    QString m_name;
+    TQString m_name;
 
-    QString m_genericName;
-    QString m_description;
+    TQString m_genericName;
+    TQString m_description;
 
-    QStringList m_properties;
-    QStringList m_explicitEnable;
-    QStringList m_explicitDisable;
+    TQStringList m_properties;
+    TQStringList m_explicitEnable;
+    TQStringList m_explicitDisable;
 };
 
 #endif
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index 199c8238..af8f2afe 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 #include "profileengine.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -29,14 +29,14 @@
 
 ProfileEngine::ProfileEngine()
 {
-    QStringList dirs = KGlobal::dirs()->findDirs("data", "kdevelop/profiles");
+    TQStringList dirs = KGlobal::dirs()->findDirs("data", "kdevelop/profiles");
 
     m_rootProfile = new Profile(0, "KDevelop");
 
-    QString currPath = "/";
-    QMap passedPaths;
+    TQString currPath = "/";
+    TQMap passedPaths;
 
-    for (QStringList::const_iterator it = dirs.constBegin(); it != dirs.constEnd(); ++it)
+    for (TQStringList::const_iterator it = dirs.constBegin(); it != dirs.constEnd(); ++it)
         processDir(*it, currPath, passedPaths, m_rootProfile);
 }
 
@@ -45,17 +45,17 @@ ProfileEngine::~ProfileEngine()
     delete m_rootProfile;
 }
 
-void ProfileEngine::processDir(const QString &dir, const QString &currPath, QMap &passedPaths, Profile *root)
+void ProfileEngine::processDir(const TQString &dir, const TQString &currPath, TQMap &passedPaths, Profile *root)
 {
 //     kdDebug() << "processDir: " << dir << " " << currPath << endl;
 
-    QDir qDir(dir);
-    QStringList entryList = qDir.entryList(QDir::Dirs);
-    for (QStringList::const_iterator eit = entryList.constBegin(); eit != entryList.constEnd(); ++eit)
+    TQDir qDir(dir);
+    TQStringList entryList = qDir.entryList(TQDir::Dirs);
+    for (TQStringList::const_iterator eit = entryList.constBegin(); eit != entryList.constEnd(); ++eit)
     {
         if ((*eit != "..") && (*eit != "."))
         {
-            QString dirName = *eit;
+            TQString dirName = *eit;
             Profile *profile = 0;
             if (passedPaths.contains(currPath + dirName))
                 profile = passedPaths[currPath + dirName];
@@ -69,7 +69,7 @@ void ProfileEngine::processDir(const QString &dir, const QString &currPath, QMap
     }
 }
 
-KTrader::OfferList ProfileEngine::offers(const QString &profileName, OfferType offerType)
+KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType offerType)
 {
     ProfileListing listing;
     Profile *profile = 0;
@@ -78,23 +78,23 @@ KTrader::OfferList ProfileEngine::offers(const QString &profileName, OfferType o
     if (!profile)
         return KTrader::OfferList();
 
-    QString constraint = QString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+    TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
     switch (offerType) {
         case Global:
-            constraint += QString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
             break;
         case Project:
-            constraint += QString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
             break;
         case Core:
-            constraint += QString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
             break;
     }
-    QString constraint_add = "";
+    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 += QString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
+        constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
             arg((i++)==0?"":"or").arg((*it).name);
     if (!constraint_add.isEmpty())
         constraint += " and ( " + constraint_add + " ) ";
@@ -106,15 +106,15 @@ KTrader::OfferList ProfileEngine::offers(const QString &profileName, OfferType o
         << "        " << constraint << endl << endl << endl;*/
 //END debug
 
-    KTrader::OfferList list = KTrader::self()->query(QString::fromLatin1("KDevelop/Plugin"), constraint);
-    QStringList names;
+    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
+    TQStringList names;
 
 /* Wrong, this is not what we want to do.
     Profile::EntryList disableList = profile->list(Profile::ExplicitDisable);
     KTrader::OfferList::iterator it = list.begin();
     while (it != list.end())
     {
-        QString name = (*it)->desktopEntryName();
+        TQString name = (*it)->desktopEntryName();
         names.append(name);
         if (profile->hasInEntryList(disableList, name))
         {
@@ -129,9 +129,9 @@ KTrader::OfferList ProfileEngine::offers(const QString &profileName, OfferType o
     {
         if (names.contains((*it).name))
             continue;
-        QString constraint = QString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
-        constraint += QString::fromLatin1("and [Name] == '%1'").arg((*it).name);
-        KTrader::OfferList enable = KTrader::self()->query(QString::fromLatin1("KDevelop/Plugin"), constraint);
+        TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+        constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name);
+        KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
         list += enable;
     }
 
@@ -149,23 +149,23 @@ KTrader::OfferList ProfileEngine::offers(const QString &profileName, OfferType o
 
 KTrader::OfferList ProfileEngine::allOffers(OfferType offerType)
 {
-    QString constraint = QString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+    TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
     switch (offerType) {
         case Global:
-            constraint += QString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
             break;
         case Project:
-            constraint += QString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
             break;
         case Core:
-            constraint += QString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
             break;
     }
-    return KTrader::self()->query(QString::fromLatin1("KDevelop/Plugin"), constraint);
+    return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
 }
 
 void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile,
-    const QString &profileName)
+    const TQString &profileName)
 {
     if (profileName == "KDevelop")
         *profile = m_rootProfile;
@@ -176,7 +176,7 @@ void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **pro
     }
 }
 
-KURL::List ProfileEngine::resources(const QString &profileName, const QString &nameFilter)
+KURL::List ProfileEngine::resources(const TQString &profileName, const TQString &nameFilter)
 {
     ProfileListing listing;
     Profile *profile = 0;
@@ -188,12 +188,12 @@ KURL::List ProfileEngine::resources(const QString &profileName, const QString &n
     return resources(profile, nameFilter);
 }
 
-KURL::List ProfileEngine::resources(Profile *profile, const QString &nameFilter)
+KURL::List ProfileEngine::resources(Profile *profile, const TQString &nameFilter)
 {
     return profile->resources(nameFilter);
 }
 
-KURL::List ProfileEngine::resourcesRecursive(const QString &profileName, const QString &nameFilter)
+KURL::List ProfileEngine::resourcesRecursive(const TQString &profileName, const TQString &nameFilter)
 {
     ProfileListing listing;
     Profile *profile = 0;
@@ -207,17 +207,17 @@ KURL::List ProfileEngine::resourcesRecursive(const QString &profileName, const Q
     return resources;
 }
 
-void ProfileEngine::diffProfiles(OfferType offerType, const QString &profile1,
-    const QString &profile2, QStringList &unload, KTrader::OfferList &load)
+void ProfileEngine::diffProfiles(OfferType offerType, const TQString &profile1,
+    const TQString &profile2, TQStringList &unload, KTrader::OfferList &load)
 {
     KTrader::OfferList offers1 = offers(profile1, offerType);
     KTrader::OfferList offers2 = offers(profile2, offerType);
 
-    QStringList offers1List;
+    TQStringList offers1List;
     for (KTrader::OfferList::const_iterator it = offers1.constBegin();
         it != offers1.constEnd(); ++it)
         offers1List.append((*it)->desktopEntryName());
-    QMap offers2List;
+    TQMap offers2List;
     for (KTrader::OfferList::const_iterator it = offers2.constBegin();
         it != offers2.constEnd(); ++it)
         offers2List[(*it)->desktopEntryName()] = *it;
@@ -225,7 +225,7 @@ void ProfileEngine::diffProfiles(OfferType offerType, const QString &profile1,
 //    kdDebug() << "OLD PROFILE: " << offers1List << endl;
 //    kdDebug() << "NEW PROFILE: " << offers2List << endl;
 
-    for (QStringList::const_iterator it = offers1List.constBegin();
+    for (TQStringList::const_iterator it = offers1List.constBegin();
         it != offers1List.constEnd(); ++it)
     {
 //         kdDebug() << "checking: " << *it << endl;
@@ -243,7 +243,7 @@ void ProfileEngine::diffProfiles(OfferType offerType, const QString &profile1,
     load = offers2;
 }
 
-Profile *ProfileEngine::findProfile(const QString & profileName)
+Profile *ProfileEngine::findProfile(const TQString & profileName)
 {
     Profile *profile;
     ProfileListing listing;
@@ -251,7 +251,7 @@ Profile *ProfileEngine::findProfile(const QString & profileName)
     return profile;
 }
 
-void ProfileEngine::addResource(const QString &profileName, const KURL &url)
+void ProfileEngine::addResource(const TQString &profileName, const KURL &url)
 {
     ProfileListing listing;
     Profile *profile = 0;
diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h
index 5128803d..e790dece 100644
--- a/src/profileengine/lib/profileengine.h
+++ b/src/profileengine/lib/profileengine.h
@@ -19,7 +19,7 @@
 #ifndef PROFILEENGINE_H
 #define PROFILEENGINE_H
 
-#include 
+#include 
 
 #include 
 
@@ -28,7 +28,7 @@
 /**
 Profile listing operation.
 Used to get a plain list of profiles
-and store it in the QMap.
+and store it in the TQMap.
 */
 class ProfileListing{
 public:
@@ -37,7 +37,7 @@ public:
         profiles[profile->name()] = profile;
     }
 
-    QMap profiles;
+    TQMap profiles;
 };
 
 /**Profile resource listing operation.
@@ -45,17 +45,17 @@ Used to get a list of urls to the profile resources.
 
 Resource urls can be filtered by an @p filter parameter
 passed to the constructor. Filter can have values
-as described in @ref QDir::setNameFilter function documentation.*/
+as described in @ref TQDir::setNameFilter function documentation.*/
 class ProfileListingEx {
 public:
-    ProfileListingEx(const QString &filter): m_filter(filter) {}
+    ProfileListingEx(const TQString &filter): m_filter(filter) {}
     void operator() (Profile *profile)
     {
         resourceList += profile->resources(m_filter);
     }
     
     KURL::List resourceList;
-    QString m_filter;
+    TQString m_filter;
 };
 
 /**
@@ -100,29 +100,29 @@ public:
     };
     
     /**@return The list of plugin offers for given profile and type.*/
-    KTrader::OfferList offers(const QString &profileName, OfferType offerType);
+    KTrader::OfferList offers(const TQString &profileName, OfferType offerType);
     /**@return The list of all plugin offers for given type.*/
     KTrader::OfferList allOffers(OfferType offerType);
     
     /**@return The list of URLs to the resources (files) with given @p extension.
     @param profileName A name of a profile to find resources in.
-    @param nameFilter Name filter for files. @see QDir::setNameFilter documentation
+    @param nameFilter Name filter for files. @see TQDir::setNameFilter documentation
     for name filters syntax.*/
-    KURL::List resources(const QString &profileName, const QString &nameFilter);
+    KURL::List resources(const TQString &profileName, const TQString &nameFilter);
     
     /**@return The list of URLs to the resources (files) with given @p extension.
     This list is obtained by a recursive search that process given profile
     and all it's subprofiles.
     @param profileName A name of a profile to find resources in.
-    @param nameFilter Name filter for files. @see QDir::setNameFilter documentation
+    @param nameFilter Name filter for files. @see TQDir::setNameFilter documentation
     for name filters syntax.*/
-    KURL::List resourcesRecursive(const QString &profileName, const QString &nameFilter);
+    KURL::List resourcesRecursive(const TQString &profileName, const TQString &nameFilter);
     
     /**Adds a resource for the profile. Resource will be copied to the user profile directory
     (like $HOME/.kde/share/apps/kdevelop/profiles/...).
     @param profileName A name of the profile.
     @param url The url to a file to copy as a profile resource.*/
-    void addResource(const QString &profileName, const KURL &url);
+    void addResource(const TQString &profileName, const KURL &url);
     
     /**Gets the difference between @p profile1 and @p profile2.
     Difference is calculated as two lists of plugins to be unloaded and loaded
@@ -134,8 +134,8 @@ public:
     @param load Will be filled with a list of plugins to load.
     @note Resulting lists are not cleared. Pass only clean lists in the
     common case.*/
-    void diffProfiles(OfferType offerType, const QString &profile1, const QString &profile2, 
-        QStringList &unload, KTrader::OfferList &load);
+    void diffProfiles(OfferType offerType, const TQString &profile1, const TQString &profile2, 
+        TQStringList &unload, KTrader::OfferList &load);
 
     /**@return The root profile. Root profile is always named "KDevelop" and it
     defines an empty list of plugins. Applications built on KDevelop platform
@@ -143,7 +143,7 @@ public:
     Profile *rootProfile() const { return m_rootProfile; }
     /**Finds a profile with given name.
     @return The profile found or 0 if it does not exist.*/
-    Profile *findProfile(const QString &profileName);
+    Profile *findProfile(const TQString &profileName);
     
     /**Walks profiles tree and applies operation @p op to each profile found 
     in the tree below @p root (@p root profile itself is not processed).
@@ -158,7 +158,7 @@ public:
             profiles[profile->name()] = profile;
         }
     
-        QMap profiles;
+        TQMap profiles;
     };
     @endcode
     Use case for such operation - building a list of all profiles:
@@ -177,8 +177,8 @@ public:
     template
     void walkProfiles(Operation &op, Profile *root)
     {
-        QValueList children = root->children();
-        for (QValueList::iterator it = children.begin(); it != children.end(); ++it)
+        TQValueList children = root->children();
+        for (TQValueList::iterator it = children.begin(); it != children.end(); ++it)
         {
             op(*it);
             walkProfiles(op, *it);
@@ -244,8 +244,8 @@ public:
     template
     void walkProfiles(Operation &op, Result *result, Profile *root)
     {
-        QValueList children = root->children();
-        for (QValueList::iterator it = children.begin(); it != children.end(); ++it)
+        TQValueList children = root->children();
+        for (TQValueList::iterator it = children.begin(); it != children.end(); ++it)
         {
             Result *newResult = op(result, *it);
             walkProfiles(op, newResult, *it);
@@ -253,9 +253,9 @@ public:
     }
 
 protected:
-    void processDir(const QString &dir, const QString &currPath, QMap &passedPaths, Profile *root);
+    void processDir(const TQString &dir, const TQString &currPath, TQMap &passedPaths, Profile *root);
 
-    KURL::List resources(Profile *profile, const QString &nameFilter);
+    KURL::List resources(Profile *profile, const TQString &nameFilter);
     
     /**Gets a complete listing of available profiles and looks for a profile.
     @param listing Profiles listing will be saved here.
@@ -263,7 +263,7 @@ protected:
     if no profile with that name is found.
     @param profileName The name of a profile to find.*/
     void getProfileWithListing(ProfileListing &listing, Profile **profile, 
-        const QString &profileName);
+        const TQString &profileName);
     
 private:
     Profile *m_rootProfile;
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 3b06340f..87893a50 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -1,12 +1,12 @@
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 class QDomDocument;
 
@@ -52,15 +52,15 @@ class QDomDocument;
 
 #include "projectmanager.h"
 
-QString ProjectInfo::sessionFile() const
+TQString ProjectInfo::sessionFile() const
 {
-    QString sf = m_projectURL.path(-1);
+    TQString sf = m_projectURL.path(-1);
     sf.truncate(sf.length() - 8); // without ".kdevelop"
     sf += "kdevses"; // suffix for a KDevelop session file
     return sf;
 }
 
-QString ProjectManager::projectDirectory( const QString& path, bool absolute ) {
+TQString ProjectManager::projectDirectory( const TQString& path, bool absolute ) {
     if(absolute)
         return path;
     KURL url(ProjectManager::getInstance()->projectFile(), path);
@@ -94,14 +94,14 @@ void ProjectManager::createActions( KActionCollection* ac )
   KAction *action;
 
   action = new KAction(i18n("&Open Project..."), "project_open", 0,
-                       this, SLOT(slotOpenProject()),
+                       this, TQT_SLOT(slotOpenProject()),
                        ac, "project_open");
   action->setToolTip( i18n("Open project"));
   action->setWhatsThis(i18n("Open project
        Opens a KDevelop3 or KDevelop2 project."));
 
   m_openRecentProjectAction =
     new KRecentFilesAction(i18n("Open &Recent Project"), 0,
-                          this, SLOT(loadProject(const KURL &)),
+                          this, TQT_SLOT(loadProject(const KURL &)),
                           ac, "project_open_recent");
   m_openRecentProjectAction->setToolTip(i18n("Open recent project"));
   m_openRecentProjectAction->setWhatsThis(i18n("Open recent project
        Opens recently opened project."));
@@ -109,14 +109,14 @@ void ProjectManager::createActions( KActionCollection* ac )
 
   m_closeProjectAction =
     new KAction(i18n("C&lose Project"), "fileclose",0,
-                this, SLOT(closeProject()),
+                this, TQT_SLOT(closeProject()),
                 ac, "project_close");
   m_closeProjectAction->setEnabled(false);
   m_closeProjectAction->setToolTip(i18n("Close project"));
   m_closeProjectAction->setWhatsThis(i18n("Close project
        Closes the current project."));
 
   m_projectOptionsAction = new KAction(i18n("Project &Options"), "configure", 0,
-                this, SLOT(slotProjectOptions()),
+                this, TQT_SLOT(slotProjectOptions()),
                 ac, "project_options" );
   m_projectOptionsAction->setToolTip(i18n("Project options"));
   m_projectOptionsAction->setWhatsThis(i18n("Project options
        Lets you customize project options."));
@@ -127,7 +127,7 @@ void ProjectManager::slotOpenProject()
 {
 	KConfig *config = kapp->config();
 	config->setGroup("General Options");
-	QString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", QDir::homeDirPath()+"/");
+	TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/");
 
   KURL url = KFileDialog::getOpenURL(defaultProjectsDir,
 		i18n("*.kdevelop|KDevelop 3 Project Files\n"
@@ -149,9 +149,9 @@ void ProjectManager::slotProjectOptions()
                   KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, TopLevel::getInstance()->main(),
                   "project options dialog");
 
-	QVBox *box = dlg.addVBoxPage( i18n("General"), i18n("General"), BarIcon( "kdevelop", KIcon::SizeMedium ) );
+	TQVBox *box = dlg.addVBoxPage( i18n("General"), i18n("General"), BarIcon( "kdevelop", KIcon::SizeMedium ) );
     GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget");
-    connect (&dlg, SIGNAL(okClicked()), g, SLOT(accept()));
+    connect (&dlg, TQT_SIGNAL(okClicked()), g, TQT_SLOT(accept()));
 
   KConfig *config = kapp->config();
   config->setGroup("Project Settings Dialog");
@@ -191,7 +191,7 @@ void ProjectManager::loadDefaultProject()
 {
   KConfig *config = kapp->config();
   config->setGroup("General Options");
-  QString project = config->readPathEntry("Last Project");
+  TQString project = config->readPathEntry("Last Project");
   bool readProject = config->readBoolEntry("Read Last Project On Startup", true);
   if (!project.isEmpty() && readProject)
   {
@@ -208,8 +208,8 @@ bool ProjectManager::loadProject(const KURL &projectURL)
 
   if (url.isLocalFile())
   {
-    QDir dir(url.path());
-    QString can_path = dir.canonicalPath();
+    TQDir dir(url.path());
+    TQString can_path = dir.canonicalPath();
                //if the directory doesn't exist, the returned string is null which confuses the user later on. so better short-cut here
     if(can_path.isNull())
       return false;
@@ -221,7 +221,7 @@ bool ProjectManager::loadProject(const KURL &projectURL)
   if( projectLoaded() && url.path() == projectFile().path() )
   {
     if (KMessageBox::questionYesNo(TopLevel::getInstance()->main(),
-        i18n("Are you sure you want to reopen the current project?"), QString::null, i18n("Reopen"), i18n("Do Not Reopen")) == KMessageBox::No)
+        i18n("Are you sure you want to reopen the current project?"), TQString::null, i18n("Reopen"), i18n("Do Not Reopen")) == KMessageBox::No)
       return false;
   }
 
@@ -239,7 +239,7 @@ bool ProjectManager::loadProject(const KURL &projectURL)
   m_info = new ProjectInfo;
   m_info->m_projectURL = url;
 
-  QTimer::singleShot( 0, this, SLOT(slotLoadProject()) );
+  TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadProject()) );
 
   // no one cares about this value
   return true;
@@ -352,14 +352,14 @@ bool ProjectManager::closeProject( bool exiting )
 
 bool ProjectManager::loadProjectFile()
 {
-  QString path;
+  TQString path;
   if (!KIO::NetAccess::download(m_info->m_projectURL, path, 0)) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL()));
     return false;
   }
 
-  QFile fin(path);
+  TQFile fin(path);
   if (!fin.open(IO_ReadOnly))
   {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
@@ -368,7 +368,7 @@ bool ProjectManager::loadProjectFile()
   }
 
   int errorLine, errorCol;
-  QString errorMsg;
+  TQString errorMsg;
   if (!m_info->m_document.setContent(&fin, &errorMsg, &errorLine, &errorCol))
   {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
@@ -401,17 +401,17 @@ bool ProjectManager::saveProjectFile()
   Q_ASSERT( API::getInstance()->projectDom() );
 
   if (m_info->m_projectURL.isLocalFile()) {
-    QFile fout(m_info->m_projectURL.path());
+    TQFile fout(m_info->m_projectURL.path());
     if( !fout.open(IO_WriteOnly) ) {
       KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file."));
       return false;
     }
 
-    QTextStream stream(&fout);
+    TQTextStream stream(&fout);
     API::getInstance()->projectDom()->save(stream, 2);
     fout.close();
   } else {
-    KTempFile fout(QString::fromLatin1("kdevelop3"));
+    KTempFile fout(TQString::fromLatin1("kdevelop3"));
     fout.setAutoDelete(true);
     if (fout.status() != 0) {
       KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file."));
@@ -425,18 +425,18 @@ bool ProjectManager::saveProjectFile()
   return true;
 }
 
-static QString getAttribute(QDomElement elem, QString attr)
+static TQString getAttribute(TQDomElement elem, TQString attr)
 {
-  QDomElement el = elem.namedItem(attr).toElement();
+  TQDomElement el = elem.namedItem(attr).toElement();
   return el.firstChild().toText().data();
 }
 
-static void getAttributeList(QDomElement elem, QString attr, QString tag, QStringList &list)
+static void getAttributeList(TQDomElement elem, TQString attr, TQString tag, TQStringList &list)
 {
   list.clear();
 
-  QDomElement el = elem.namedItem(attr).toElement();
-  QDomElement item = el.firstChild().toElement();
+  TQDomElement el = elem.namedItem(attr).toElement();
+  TQDomElement item = el.firstChild().toElement();
   while (!item.isNull())
   {
     if (item.tagName() == tag)
@@ -447,8 +447,8 @@ static void getAttributeList(QDomElement elem, QString attr, QString tag, QStrin
 
 void ProjectManager::getGeneralInfo()
 {
-  QDomElement docEl = m_info->m_document.documentElement();
-  QDomElement generalEl = docEl.namedItem("general").toElement();
+  TQDomElement docEl = m_info->m_document.documentElement();
+  TQDomElement generalEl = docEl.namedItem("general").toElement();
 
   m_info->m_projectPlugin = getAttribute(generalEl, "projectmanagement");
   m_info->m_vcsPlugin = getAttribute(generalEl, "versioncontrol");
@@ -457,8 +457,8 @@ void ProjectManager::getGeneralInfo()
   if( m_info->m_projectName.isEmpty() )
   {
     m_info->m_projectName = m_info->m_projectURL.filename();
-    m_info->m_projectName = m_info->m_projectName.left(m_info->m_projectName.length()-QString(".kdevelop").length());
-    QDomElement prjname = m_info->m_document.createElement("projectname");
+    m_info->m_projectName = m_info->m_projectName.left(m_info->m_projectName.length()-TQString(".kdevelop").length());
+    TQDomElement prjname = m_info->m_document.createElement("projectname");
     prjname.appendChild( m_info->m_document.createTextNode( m_info->m_projectName) );
     generalEl.appendChild( prjname );
   }
@@ -468,7 +468,7 @@ void ProjectManager::getGeneralInfo()
 
   //FIXME: adymo: workaround for those project templates without "profile" element
 //  m_info->m_profileName = getAttribute(generalEl, "profile");
-  QDomElement el = generalEl.namedItem("profile").toElement();
+  TQDomElement el = generalEl.namedItem("profile").toElement();
   if (el.isNull())
 //      m_info->m_profileName = profileByAttributes(m_info->m_language, m_info->m_keywords);
       m_info->m_profileName = Settings::profileByAttributes(m_info->m_language, m_info->m_keywords);
@@ -502,10 +502,10 @@ bool ProjectManager::loadProjectPart()
 
   API::getInstance()->setProject( projectPart );
 
-  QDomDocument& dom = *API::getInstance()->projectDom();
-  QString path = DomUtil::readEntry(dom,"/general/projectdirectory", ".");
+  TQDomDocument& dom = *API::getInstance()->projectDom();
+  TQString path = DomUtil::readEntry(dom,"/general/projectdirectory", ".");
   bool absolute = DomUtil::readBoolEntry(dom,"/general/absoluteprojectpath",false);
-  QString projectDir = projectDirectory( path, absolute );
+  TQString projectDir = projectDirectory( path, absolute );
   kdDebug(9000) << "projectDir: " << projectDir << "  projectName: " << m_info->m_projectName << endl;
 
   projectPart->openProject(projectDir, m_info->m_projectName);
@@ -525,7 +525,7 @@ void ProjectManager::unloadProjectPart()
   API::getInstance()->setProject(0);
 }
 
-bool ProjectManager::loadLanguageSupport(const QString& lang)
+bool ProjectManager::loadLanguageSupport(const TQString& lang)
 {
   kdDebug(9000) << "Looking for language support for " << lang << endl;
 
@@ -536,8 +536,8 @@ bool ProjectManager::loadLanguageSupport(const QString& lang)
   }
 
   KTrader::OfferList languageSupportOffers =
-    KTrader::self()->query(QString::fromLatin1("KDevelop/LanguageSupport"),
-                           QString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").arg(lang).arg(KDEVELOP_PLUGIN_VERSION));
+    KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
+                           TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").arg(lang).arg(KDEVELOP_PLUGIN_VERSION));
 
   if (languageSupportOffers.isEmpty()) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
@@ -594,9 +594,9 @@ KURL ProjectManager::projectFile() const
   return m_info->m_projectURL;
 }
 
-QString ProjectManager::projectName() const
+TQString ProjectManager::projectName() const
 {
-  if (!m_info) return QString();
+  if (!m_info) return TQString();
 
   return m_info->m_projectName;
 }
@@ -618,34 +618,34 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url )
         return false;
     }
 
-    QString cmd = KGlobal::dirs()->findExe( "kdevprj2kdevelop" );
+    TQString cmd = KGlobal::dirs()->findExe( "kdevprj2kdevelop" );
     if (cmd.isEmpty()) {
         KMessageBox::sorry(0, i18n("You do not have 'kdevprj2kdevelop' installed."));
         return false;
     }
 
-    QFileInfo fileInfo( url.path() );
+    TQFileInfo fileInfo( url.path() );
 
     KShellProcess proc( "/bin/sh" );
     proc.setWorkingDirectory( fileInfo.dirPath(true) );
     proc << "perl" << cmd << KShellProcess::quote( url.path() );
     proc.start( KProcess::Block );
 
-    QString projectFile = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".kdevelop";
+    TQString projectFile = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".kdevelop";
     return loadProject( KURL(projectFile) );
 }
 
-// QString ProjectManager::profileByAttributes(const QString &language, const QStringList &keywords)
+// TQString ProjectManager::profileByAttributes(const TQString &language, const TQStringList &keywords)
 // {
 //     KConfig config(locate("data", "kdevelop/profiles/projectprofiles"));
 //     config.setGroup(language);
 //
-//     QStringList profileKeywords = QStringList::split("/", "Empty");
+//     TQStringList profileKeywords = TQStringList::split("/", "Empty");
 //     if (config.hasKey("Keywords"))
 //         profileKeywords = config.readListEntry("Keywords");
 //
 //     int idx = 0;
-//     for (QStringList::const_iterator it = profileKeywords.constBegin();
+//     for (TQStringList::const_iterator it = profileKeywords.constBegin();
 //         it != profileKeywords.constEnd(); ++it)
 //     {
 //         if (keywords.contains(*it))
@@ -655,7 +655,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url )
 //         }
 //     }
 //
-//     QStringList profiles;
+//     TQStringList profiles;
 //     if (config.hasKey("Profiles"))
 //     {
 //         profiles = config.readListEntry("Profiles");
diff --git a/src/projectmanager.h b/src/projectmanager.h
index 1cfb07d6..15ac4644 100644
--- a/src/projectmanager.h
+++ b/src/projectmanager.h
@@ -2,9 +2,9 @@
 #define __PROJECTMANAGER_H__
 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 
 #include 
@@ -24,20 +24,20 @@ class ProjectInfo
 {
 public:
   KURL         m_projectURL;
-  QDomDocument m_document;
-  QString      m_profileName;
-  QString      m_projectName;
-  QString      m_projectPlugin, m_language, m_activeLanguage, m_vcsPlugin;
-  QStringList  m_ignoreParts, m_keywords;
+  TQDomDocument m_document;
+  TQString      m_profileName;
+  TQString      m_projectName;
+  TQString      m_projectPlugin, m_language, m_activeLanguage, m_vcsPlugin;
+  TQStringList  m_ignoreParts, m_keywords;
 
-  QString sessionFile() const;
+  TQString sessionFile() const;
 };
 
 /**
 Project manager.
 Loads and unloads projects.
 */
-class ProjectManager : public QObject, public KXMLGUIClient
+class ProjectManager : public TQObject, public KXMLGUIClient
 {
   Q_OBJECT
 
@@ -45,7 +45,7 @@ public:
 
   ~ProjectManager();
 
-  static QString projectDirectory( const QString& path, bool absolute );
+  static TQString projectDirectory( const TQString& path, bool absolute );
 
   static ProjectManager *getInstance();
 
@@ -56,7 +56,7 @@ public:
   bool projectLoaded() const;
 
   KURL projectFile() const;
-  QString projectName() const;
+  TQString projectName() const;
 
   void createActions( KActionCollection* ac );
 
@@ -87,10 +87,10 @@ private:
   bool loadProjectPart();
   void unloadProjectPart();
 
-  bool loadLanguageSupport(const QString& lang);
+  bool loadLanguageSupport(const TQString& lang);
   void unloadLanguageSupport();
 
-//   QString profileByAttributes(const QString &language, const QStringList &keywords);
+//   TQString profileByAttributes(const TQString &language, const TQStringList &keywords);
 
   ProjectInfo *m_info;
 
@@ -102,9 +102,9 @@ private:
   ProjectSession* m_pProjectSession;
 
   KDevPlugin *m_vcsPlugin;
-  QString m_vcsName;
+  TQString m_vcsName;
 
-  QString m_oldProfileName;
+  TQString m_oldProfileName;
 };
 
 
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index be3ec4a1..1b09ca71 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -58,21 +58,21 @@ void ProjectSession::initXMLTree()
   // or a new project gets generated (which doesn't have a kdevses file
   // either as the project has never been closed before opening it).
   domdoc.clear();
-  QDomDocument doc("KDevPrjSession");
+  TQDomDocument doc("KDevPrjSession");
   domdoc=doc;
   domdoc.appendChild( domdoc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
   // KDevPrjSession is the root element of the XML file
-  QDomElement session = domdoc.documentElement();
+  TQDomElement session = domdoc.documentElement();
   session = domdoc.createElement("KDevPrjSession");
   domdoc.appendChild( session);
 }
 
 //---------------------------------------------------------------------------
-bool ProjectSession::restoreFromFile( const QString & sessionFileName, const QValueList< KDevPlugin * > plugins )
+bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQValueList< KDevPlugin * > plugins )
 {
   bool bFileOpenOK = true;
 
-  QFile f(sessionFileName);
+  TQFile f(sessionFileName);
   if ( f.open(IO_ReadOnly) ) {  // file opened successfully
     bool ok = domdoc.setContent( &f);
     f.close();
@@ -96,7 +96,7 @@ bool ProjectSession::restoreFromFile( const QString & sessionFileName, const QVa
     return false;
   }
 
-  QDomElement session = domdoc.documentElement();
+  TQDomElement session = domdoc.documentElement();
 
   // read the information about the mainframe widget
   if (bFileOpenOK) {
@@ -104,13 +104,13 @@ bool ProjectSession::restoreFromFile( const QString & sessionFileName, const QVa
   }
 
 	// now also let the plugins load their session stuff
-	QDomElement pluginListEl = session.namedItem("pluginList").toElement();
-	QValueList::ConstIterator it = plugins.begin();
+	TQDomElement pluginListEl = session.namedItem("pluginList").toElement();
+	TQValueList::ConstIterator it = plugins.begin();
 	while( it != plugins.end() )
 	{
 		KDevPlugin* pPlugin = (*it);
-		QString pluginName = pPlugin->instance()->instanceName();
-		QDomElement pluginEl = pluginListEl.namedItem(pluginName).toElement();
+		TQString pluginName = pPlugin->instance()->instanceName();
+		TQDomElement pluginEl = pluginListEl.namedItem(pluginName).toElement();
 		if (!pluginEl.isNull()) {
 			// now plugin, load what you find!
 			pPlugin->restorePartialProjectSession(&pluginEl);
@@ -118,15 +118,15 @@ bool ProjectSession::restoreFromFile( const QString & sessionFileName, const QVa
 		++it;
 	}
 
-	QTimer::singleShot( 0, this, SLOT(loadDocument()) );
+	TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) );
 
   return true;
 }
 
 //---------------------------------------------------------------------------
-void ProjectSession::recreateDocs(QDomElement& el)
+void ProjectSession::recreateDocs(TQDomElement& el)
 {
-////  QDomElement mainframeEl = el.namedItem("Mainframe").toElement();
+////  TQDomElement mainframeEl = el.namedItem("Mainframe").toElement();
 ////  bool bMaxMode =initXMLTree() (bool) mainframeEl.attribute("MaximizeMode", "0").toInt();
 ////  QextMdiMainFrm* pMainWidget = (QextMdiMainFrm*) qApp->mainWidget();
 ////  pMainWidget->setEnableMaximizedChildFrmMode(bMaxMode);
@@ -134,17 +134,17 @@ void ProjectSession::recreateDocs(QDomElement& el)
 ////  pMainWidget->hideViewTaskBar();
 
   // read the information about the documents
-  QDomElement docsAndViewsEl = el.namedItem("DocsAndViews").toElement();
+  TQDomElement docsAndViewsEl = el.namedItem("DocsAndViews").toElement();
   int nNrOfDocs = docsAndViewsEl.attribute("NumberOfDocuments", "0").toInt();
   // loop over all docs
   int nDoc = 0;
-  QDomElement docEl;
+  TQDomElement docEl;
   for (docEl = docsAndViewsEl.firstChild().toElement(), nDoc = 0;
        nDoc < nNrOfDocs;
        nDoc++, docEl = docEl.nextSibling().toElement())
   {
     // read the document name and type
-    QString docName = docEl.attribute( "URL", "");
+    TQString docName = docEl.attribute( "URL", "");
     if (!docName.isEmpty() /* && URL::exists(docName)*/) {
       KURL url(docName);
       // create the views of this document, the first view creation will also create the document
@@ -163,7 +163,7 @@ void ProjectSession::recreateDocs(QDomElement& el)
 }
 
 //---------------------------------------------------------------------------
-void ProjectSession::recreateViews(KURL& url, QDomElement docEl, bool activate)
+void ProjectSession::recreateViews(KURL& url, TQDomElement docEl, bool activate)
 {
   // read information about the views
   int nNrOfViews = docEl.attribute( "NumberOfViews", "0").toInt();
@@ -173,7 +173,7 @@ void ProjectSession::recreateViews(KURL& url, QDomElement docEl, bool activate)
 
 	if ( nNrOfViews > 0 )
 	{
-		QDomElement viewEl = docEl.firstChild().toElement();
+		TQDomElement viewEl = docEl.firstChild().toElement();
 		DocumentData dd;
 		dd.type = viewEl.attribute("Type");
 		dd.line = viewEl.attribute("line", "0").toInt();
@@ -188,9 +188,9 @@ void ProjectSession::recreateViews(KURL& url, QDomElement docEl, bool activate)
   // loop over all views of this document
   int nView = 0;
 
-  QDomElement viewEl;
-  QString viewType;
-  QString context;
+  TQDomElement viewEl;
+  TQString viewType;
+  TQString context;
   if (docEl.hasAttribute("context")) {
     context = docEl.attribute("context");
   }
@@ -213,7 +213,7 @@ void ProjectSession::recreateViews(KURL& url, QDomElement docEl, bool activate)
     else {
       PartController::getInstance()->showDocument(url);
     }
-    QDomElement viewPropertiesEl = viewEl.namedItem("AdditionalSettings").toElement();
+    TQDomElement viewPropertiesEl = viewEl.namedItem("AdditionalSettings").toElement();
     if (!viewPropertiesEl.isNull()) {
       emit sig_restoreAdditionalViewProperties(url.url(), &viewPropertiesEl);
     }
@@ -230,16 +230,16 @@ void ProjectSession::recreateViews(KURL& url, QDomElement docEl, bool activate)
 }
 
 //---------------------------------------------------------------------------
-bool ProjectSession::saveToFile( const QString & sessionFileName, const QValueList< KDevPlugin * > plugins )
+bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValueList< KDevPlugin * > plugins )
 {
-  QString section, keyword;
-  QDomElement session = domdoc.documentElement();
+  TQString section, keyword;
+  TQDomElement session = domdoc.documentElement();
 
   int nDocs = 0;
-  QString docIdStr;
+  TQString docIdStr;
 
 ////  // read the information about the mainframe widget
-////  QDomElement mainframeEl = session.namedItem("Mainframe").toElement();
+////  TQDomElement mainframeEl = session.namedItem("Mainframe").toElement();
 ////  if(mainframeEl.isNull()){
 ////    mainframeEl=domdoc.createElement("Mainframe");
 ////    session.appendChild( mainframeEl);
@@ -249,22 +249,22 @@ bool ProjectSession::saveToFile( const QString & sessionFileName, const QValueLi
 
 
   // read the information about the documents
-  QDomElement docsAndViewsEl = session.namedItem("DocsAndViews").toElement();
+  TQDomElement docsAndViewsEl = session.namedItem("DocsAndViews").toElement();
   if (docsAndViewsEl.isNull()) {
     docsAndViewsEl = domdoc.createElement("DocsAndViews");
     session.appendChild( docsAndViewsEl);
   }
   else {
     // we need to remove the old ones before memorizing the current ones (to avoid merging)
-    QDomNode n = docsAndViewsEl.firstChild();
+    TQDomNode n = docsAndViewsEl.firstChild();
     while ( !n.isNull() ) {
-      QDomNode toBeRemoved = n;
+      TQDomNode toBeRemoved = n;
       n = n.nextSibling();
       docsAndViewsEl.removeChild(toBeRemoved);
     }
   }
 
-	QPtrListIterator it( *PartController::getInstance()->parts() );
+	TQPtrListIterator it( *PartController::getInstance()->parts() );
 	for ( ; it.current(); ++it )
 	{
 
@@ -272,16 +272,16 @@ bool ProjectSession::saveToFile( const QString & sessionFileName, const QValueLi
 		if (!pReadOnlyPart)
 			continue;
 
-		QString url = pReadOnlyPart->url().url();
+		TQString url = pReadOnlyPart->url().url();
 
 		docIdStr.setNum(nDocs);
-		QDomElement docEl = domdoc.createElement("Doc" + docIdStr);
+		TQDomElement docEl = domdoc.createElement("Doc" + docIdStr);
 		docEl.setAttribute( "URL", url);
 		docsAndViewsEl.appendChild( docEl);
 		nDocs++;
 		docEl.setAttribute( "NumberOfViews", 1);
 
-		QDomElement viewEl = domdoc.createElement( "View0");
+		TQDomElement viewEl = domdoc.createElement( "View0");
 		docEl.appendChild( viewEl);
 
 		if ( dynamic_cast(pReadOnlyPart) )
@@ -299,7 +299,7 @@ bool ProjectSession::saveToFile( const QString & sessionFileName, const QValueLi
 			}
 			if ( KTextEditor::EncodingInterface * ei = dynamic_cast( pReadOnlyPart ) )
 			{
-				QString encoding = ei->encoding();
+				TQString encoding = ei->encoding();
 				if ( !encoding.isNull() )
 				{
 					viewEl.setAttribute( "Encoding", encoding );
@@ -313,10 +313,10 @@ bool ProjectSession::saveToFile( const QString & sessionFileName, const QValueLi
 	}
 
 /*
-  QPtrListIterator it( *PartController::getInstance()->parts() );
+  TQPtrListIterator it( *PartController::getInstance()->parts() );
   for ( ; it.current(); ++it ) {
-////    QString partName = it.current()->name();
-////    QMessageBox::information(0L,"",partName);
+////    TQString partName = it.current()->name();
+////    TQMessageBox::information(0L,"",partName);
 
     KParts::ReadOnlyPart* pReadOnlyPart = dynamic_cast(it.current());
     if (!pReadOnlyPart)
@@ -325,34 +325,34 @@ bool ProjectSession::saveToFile( const QString & sessionFileName, const QValueLi
     HTMLDocumentationPart* pDocuPart = dynamic_cast(pReadOnlyPart);
 
     /// @todo Save relative path for project sharing?
-    QString url = pReadOnlyPart->url().url();
+    TQString url = pReadOnlyPart->url().url();
 
     docIdStr.setNum(nDocs);
-    QDomElement docEl = domdoc.createElement("Doc" + docIdStr);
+    TQDomElement docEl = domdoc.createElement("Doc" + docIdStr);
     docEl.setAttribute( "URL", url);
     docsAndViewsEl.appendChild( docEl);
     nDocs++;
 ////    docEl.setAttribute( "Type", "???");
 ////    // get the view list
-////    QPtrList viewList = pDoc->viewList();
+////    TQPtrList viewList = pDoc->viewList();
 ////    // write the number of views
 ////    docEl.setAttribute( "NumberOfViews", viewList.count());
     docEl.setAttribute( "NumberOfViews", 1);
     // loop over all views of this document
     int nView = 0;
 ////    KWriteView* pView = 0L;
-    QString viewIdStr;
+    TQString viewIdStr;
 ////    for (viewList.first(), nView = 0; viewList.current() != 0; viewList.next(), nView++) {
 ////      pView = viewList.current();
 ////      if (pView != 0L) {
         viewIdStr.setNum( nView);
-        QDomElement viewEl = domdoc.createElement( "View"+viewIdStr);
+        TQDomElement viewEl = domdoc.createElement( "View"+viewIdStr);
         docEl.appendChild( viewEl);
         // focus?
 ////        viewEl.setAttribute("Focus", (((CEditWidget*)pView->parentWidget()) == m_pDocViewMan->currentEditView()));
         viewEl.setAttribute("Type", "???");
 
-    QDomElement viewPropertiesEl = domdoc.createElement("AdditionalSettings");
+    TQDomElement viewPropertiesEl = domdoc.createElement("AdditionalSettings");
     viewEl.appendChild(viewPropertiesEl);
     emit sig_saveAdditionalViewProperties(url, &viewPropertiesEl);
 
@@ -375,27 +375,27 @@ bool ProjectSession::saveToFile( const QString & sessionFileName, const QValueLi
 
   // now also let the project-related plugins save their session stuff
   // read the information about the documents
-  QDomElement pluginListEl = session.namedItem("pluginList").toElement();
+  TQDomElement pluginListEl = session.namedItem("pluginList").toElement();
   if (pluginListEl.isNull()) {
     pluginListEl = domdoc.createElement("pluginList");
     session.appendChild( pluginListEl);
   }
   else {
     // we need to remove the old ones before memorizing the current ones (to avoid merging)
-    QDomNode n = pluginListEl.firstChild();
+    TQDomNode n = pluginListEl.firstChild();
     while ( !n.isNull() ) {
-      QDomNode toBeRemoved = n;
+      TQDomNode toBeRemoved = n;
       n = n.nextSibling();
       pluginListEl.removeChild(toBeRemoved);
     }
   }
 
-	QValueList::ConstIterator itt = plugins.begin();
+	TQValueList::ConstIterator itt = plugins.begin();
 	while( itt != plugins.end() )
 	{
 		KDevPlugin* pPlugin = (*itt);
-		QString pluginName = pPlugin->instance()->instanceName();
-		QDomElement pluginEl = domdoc.createElement(pluginName);
+		TQString pluginName = pPlugin->instance()->instanceName();
+		TQDomElement pluginEl = domdoc.createElement(pluginName);
 
 		// now plugin, save what you have!
 		pPlugin->savePartialProjectSession(&pluginEl);
@@ -409,9 +409,9 @@ bool ProjectSession::saveToFile( const QString & sessionFileName, const QValueLi
 	}
 
   // Write it out to the session file on disc
-  QFile f(sessionFileName);
+  TQFile f(sessionFileName);
   if ( f.open(IO_WriteOnly) ) {    // file opened successfully
-    QTextStream t( &f );        // use a text stream
+    TQTextStream t( &f );        // use a text stream
     t << domdoc.toCString();
     f.close();
   }
@@ -444,7 +444,7 @@ void ProjectSession::loadDocument( )
 		_docDataList.pop_front();
 
 		loadDocument();
-		//QTimer::singleShot( 0, this, SLOT(loadDocument()) );
+		//TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) );
 	}
 }
 
diff --git a/src/projectsession.h b/src/projectsession.h
index 60c0b732..38e24883 100644
--- a/src/projectsession.h
+++ b/src/projectsession.h
@@ -17,10 +17,10 @@
 #ifndef _PROJECTSESSION_H_
 #define _PROJECTSESSION_H_
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 class QWidget;
 class KURL;
@@ -41,17 +41,17 @@ public:
   virtual ~ProjectSession();
 
   /** Opens the .kdevses file and saves the project session in XML format to it. */
-  bool saveToFile(const QString& fileName, const QValueList plugins );
+  bool saveToFile(const TQString& fileName, const TQValueList plugins );
 
   /** Opens the .kdevses file and loads the project session from it. */
-  bool restoreFromFile(const QString& fileName, const QValueList plugins );
+  bool restoreFromFile(const TQString& fileName, const TQValueList plugins );
 
 signals:
-  void sig_restoreMainWindowProperties(const QDomElement* el);
-  void sig_saveMainWindowProperties(QDomElement* el);
+  void sig_restoreMainWindowProperties(const TQDomElement* el);
+  void sig_saveMainWindowProperties(TQDomElement* el);
 
-  void sig_restoreAdditionalViewProperties(const QString& viewName, const QDomElement* el);
-  void sig_saveAdditionalViewProperties(const QString& viewName, QDomElement* el);
+  void sig_restoreAdditionalViewProperties(const TQString& viewName, const TQDomElement* el);
+  void sig_saveAdditionalViewProperties(const TQString& viewName, TQDomElement* el);
 
 private slots:
   /**
@@ -61,28 +61,28 @@ private slots:
 
 private:
   /** Restores the part of the project session that concerns to the documents (files). */
-  void recreateDocs(QDomElement& el);
+  void recreateDocs(TQDomElement& el);
   /** recreates views and their properties of a certain document. */
-  void recreateViews(KURL& url, QDomElement docEl, bool activate);
+  void recreateViews(KURL& url, TQDomElement docEl, bool activate);
   /** setup a valid XML file. */
   void initXMLTree();
 
 // attributes
 private:
   /** the XML document object controlling the XML tree. */
-  QDomDocument domdoc;
+  TQDomDocument domdoc;
 
   struct DocumentData
   {
     DocumentData() : line(0) {}
     KURL url;
     int line;
-    QString type;
+    TQString type;
     bool activate;
-    QString encoding;
+    TQString encoding;
   };
 
-  QValueList _docDataList;
+  TQValueList _docDataList;
 
 };
 
diff --git a/src/shellextension.h b/src/shellextension.h
index 7f731c1d..1b791b21 100644
--- a/src/shellextension.h
+++ b/src/shellextension.h
@@ -20,7 +20,7 @@
 #ifndef SHELLEXTENSION_H
 #define SHELLEXTENSION_H
 
-#include 
+#include 
 
 class KDialogBase;
 
@@ -48,11 +48,11 @@ public:
     virtual void acceptGlobalSettingsPage(KDialogBase *dlg) = 0;
     
     /**Reimplement to return the name of KXMLGUI resource file for an application.*/
-    virtual QString xmlFile() = 0;
+    virtual TQString xmlFile() = 0;
     
     /**Reimplement to set a default profile for the shell. Default profile
     will be used by a shell if no --profile argument is specified.*/
-    virtual QString defaultProfile() = 0;
+    virtual TQString defaultProfile() = 0;
 
 protected:
     ShellExtension();
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 59c4d691..df720fa0 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "simplemainwindow.h"
 
-#include 
+#include 
 
 #include 
 #include 
@@ -57,15 +57,15 @@
 #include "editorproxy.h"
 #include "multibuffer.h"
 
-SimpleMainWindow::SimpleMainWindow(QWidget* parent, const char *name)
+SimpleMainWindow::SimpleMainWindow(TQWidget* parent, const char *name)
     :DMainWindow(parent, name)
 {
     resize(800, 600); // starts kdevelop at 800x600 the first time
     m_mainWindowShare = new MainWindowShare(this);
 
-    connect(m_bottomDock, SIGNAL(hidden()), this, SLOT(raiseEditor()));
-    connect(m_leftDock, SIGNAL(hidden()), this, SLOT(raiseEditor()));
-    connect(m_rightDock, SIGNAL(hidden()), this, SLOT(raiseEditor()));
+    connect(m_bottomDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor()));
+    connect(m_leftDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor()));
+    connect(m_rightDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor()));
 }
 
 SimpleMainWindow::~ SimpleMainWindow( )
@@ -105,34 +105,34 @@ void SimpleMainWindow::init()
             i18n("Could Not Find Plugins") );
     }
 
-    connect(Core::getInstance(), SIGNAL(coreInitialized()), this, SLOT(slotCoreInitialized()));
-    connect(Core::getInstance(), SIGNAL(projectOpened()), this, SLOT(projectOpened()));
-    connect(Core::getInstance(), SIGNAL(projectClosed()), this, SLOT(projectClosed()));
-    connect(Core::getInstance(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-        this, SLOT(contextMenu(QPopupMenu *, const Context *)));
-    connect(PartController::getInstance(), SIGNAL(partURLChanged(KParts::ReadOnlyPart *)),
-        this, SLOT(slotPartURLChanged(KParts::ReadOnlyPart * )));
-    connect(PartController::getInstance(), SIGNAL(activePartChanged(KParts::Part*)),
-        this, SLOT(activePartChanged(KParts::Part*)));
+    connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(slotCoreInitialized()));
+    connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
+    connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()));
+    connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+        this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
+    connect(PartController::getInstance(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)),
+        this, TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * )));
+    connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
+        this, TQT_SLOT(activePartChanged(KParts::Part*)));
 
     connect(PartController::getInstance(),
-        SIGNAL(documentChangedState(const KURL &, DocumentState)),
-        this, SLOT(documentChangedState(const KURL&, DocumentState)));
+        TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)),
+        this, TQT_SLOT(documentChangedState(const KURL&, DocumentState)));
 
     loadSettings();
 }
 
-void SimpleMainWindow::dragEnterEvent( QDragEnterEvent *event )
+void SimpleMainWindow::dragEnterEvent( TQDragEnterEvent *event )
 {
     event->accept(KURLDrag::canDecode(event));
 }
 
-void SimpleMainWindow::dropEvent( QDropEvent *event )
+void SimpleMainWindow::dropEvent( TQDropEvent *event )
 {
     slotDropEvent(event);
 }
 
-void SimpleMainWindow::slotDropEvent( QDropEvent *event )
+void SimpleMainWindow::slotDropEvent( TQDropEvent *event )
 {
     KURL::List list;
     if ( !KURLDrag::decode( event, list ) ) return;
@@ -146,14 +146,14 @@ void SimpleMainWindow::slotDropEvent( QDropEvent *event )
     }
 }
 
-void SimpleMainWindow::contextMenu(QPopupMenu *popupMenu, const Context *context)
+void SimpleMainWindow::contextMenu(TQPopupMenu *popupMenu, const Context *context)
 {
     int cont = context->type();
     m_splitURLs.clear();
     if (cont == Context::EditorContext)
     {
         KURL url = static_cast(context)->url();
-        QWidget *w = widgetForURL(url);
+        TQWidget *w = widgetForURL(url);
         if (w && m_widgetTabs[w] && m_widgetTabs[w]->count() > 1)
         {
             m_splitURLs.append(url);
@@ -210,35 +210,35 @@ void SimpleMainWindow::contextMenu(QPopupMenu *popupMenu, const Context *context
     }
 }
 
-void SimpleMainWindow::embedPartView(QWidget *view, const QString &title, const QString &/*toolTip*/)
+void SimpleMainWindow::embedPartView(TQWidget *view, const TQString &title, const TQString &/*toolTip*/)
 {
     kdDebug() << "SimpleMainWindow::embedPartView: " << view << endl;
     if (!view )
         return;
 
-    QString shortName = title;
+    TQString shortName = title;
     shortName = shortName.right( shortName.length() - (shortName.findRev('/') +1));
 
     addWidget(view, title);
     view->show();
 }
 
-void SimpleMainWindow::embedSelectView(QWidget *view, const QString &title, const QString &/*toolTip*/)
+void SimpleMainWindow::embedSelectView(TQWidget *view, const TQString &title, const TQString &/*toolTip*/)
 {
     embedView( DDockWindow::Left, view, title );
 }
 
-void SimpleMainWindow::embedOutputView(QWidget *view, const QString &title, const QString &/*toolTip*/)
+void SimpleMainWindow::embedOutputView(TQWidget *view, const TQString &title, const TQString &/*toolTip*/)
 {
     embedView( DDockWindow::Bottom, view, title );
 }
 
-void SimpleMainWindow::embedSelectViewRight(QWidget *view, const QString &title, const QString &/*toolTip*/)
+void SimpleMainWindow::embedSelectViewRight(TQWidget *view, const TQString &title, const TQString &/*toolTip*/)
 {
     embedView( DDockWindow::Right, view, title );
 }
 
-void SimpleMainWindow::embedView( DDockWindow::Position pos, QWidget * view, const QString & title )
+void SimpleMainWindow::embedView( DDockWindow::Position pos, TQWidget * view, const TQString & title )
 {
     if ( !hasDockWidget( view ) )
     {
@@ -247,12 +247,12 @@ void SimpleMainWindow::embedView( DDockWindow::Position pos, QWidget * view, con
     }
 }
 
-DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const QString & name, DDockWindow::Position defaultPos )
+DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & name, DDockWindow::Position defaultPos )
 {
     KConfig * config = kapp->config();
     config->setGroup( "DToolDockPosition" );
 
-    QString position = config->readEntry( name );
+    TQString position = config->readEntry( name );
 
     if ( name == "unknown" )
     {
@@ -266,12 +266,12 @@ DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const QString &
     return defaultPos;
 }
 
-void SimpleMainWindow::rememberToolViewPosition( const QString & name, DDockWindow::Position pos )
+void SimpleMainWindow::rememberToolViewPosition( const TQString & name, DDockWindow::Position pos )
 {
     KConfig * config = kapp->config();
     config->setGroup( "DToolDockPosition" );
 
-    QString position = "unknown";
+    TQString position = "unknown";
 
     switch( pos )
     {
@@ -291,7 +291,7 @@ void SimpleMainWindow::rememberToolViewPosition( const QString & name, DDockWind
 }
 
 
-void SimpleMainWindow::removeView(QWidget *view)
+void SimpleMainWindow::removeView(TQWidget *view)
 {
     if (!view)
         return;
@@ -307,7 +307,7 @@ void SimpleMainWindow::removeView(QWidget *view)
         removeWidget(view);
 }
 
-void SimpleMainWindow::setViewAvailable(QWidget *pView, bool bEnabled)
+void SimpleMainWindow::setViewAvailable(TQWidget *pView, bool bEnabled)
 {
     DDockWindow *dock;
     if (hasDockWidget(pView))
@@ -318,7 +318,7 @@ void SimpleMainWindow::setViewAvailable(QWidget *pView, bool bEnabled)
     bEnabled ? dock->showWidget(pView) : dock->hideWidget(pView);
 }
 
-void SimpleMainWindow::raiseView(QWidget *view)
+void SimpleMainWindow::raiseView(TQWidget *view)
 {
     //adymo: a workaround to make editor wrappers work:
     //editor view is passed to this function but the ui library knows only
@@ -330,7 +330,7 @@ void SimpleMainWindow::raiseView(QWidget *view)
     {
 //         kdDebug() << "parent is editor wrapper: " <<
 //             static_cast(view->parent()) << endl;
-        view = (QWidget*)view->parent();
+        view = (TQWidget*)view->parent();
     }
 
     if (hasDockWidget(view))
@@ -342,7 +342,7 @@ void SimpleMainWindow::raiseView(QWidget *view)
         m_widgetTabs[view]->showPage(view);
 }
 
-void SimpleMainWindow::lowerView(QWidget * view)
+void SimpleMainWindow::lowerView(TQWidget * view)
 {
     if (!hasDockWidget(view))
         return;
@@ -368,7 +368,7 @@ void SimpleMainWindow::saveSettings( )
     ProjectManager::getInstance()->saveSettings();
     saveMainWindowSettings(config, "SimpleMainWindow");
 
-    QMap::iterator it = m_docks.begin();
+    TQMap::iterator it = m_docks.begin();
     while ( it != m_docks.end() )
     {
         if ( !strcmp(it.key()->name(), "unnamed") )
@@ -383,11 +383,11 @@ void SimpleMainWindow::saveSettings( )
     DMainWindow::saveSettings();
 }
 
-void SimpleMainWindow::setCurrentDocumentCaption( const QString &caption )
+void SimpleMainWindow::setCurrentDocumentCaption( const TQString &caption )
 {
     if( !PartController::getInstance()->activePart() ) return;
 
-    if (QWidget *widget = EditorProxy::getInstance()->topWidgetForPart(PartController::getInstance()->activePart()))
+    if (TQWidget *widget = EditorProxy::getInstance()->topWidgetForPart(PartController::getInstance()->activePart()))
     {
         widget->setCaption(caption);
     }
@@ -402,65 +402,65 @@ void SimpleMainWindow::createFramework()
 {
     PartController::createInstance( this );
 
-    connect(PartController::getInstance(), SIGNAL(activePartChanged(KParts::Part*)),
-        this, SLOT(createGUI(KParts::Part*)));
+    connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
+        this, TQT_SLOT(createGUI(KParts::Part*)));
 }
 
 void SimpleMainWindow::createActions()
 {
     m_raiseEditor = new KAction(i18n("Raise &Editor"), ALT+Key_C,
-        this, SLOT(raiseEditor()), actionCollection(), "raise_editor");
+        this, TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor");
     m_raiseEditor->setToolTip(i18n("Raise editor"));
     m_raiseEditor->setWhatsThis(i18n("Raise editor
        Focuses the editor."));
 
     m_lowerAllDocks = new KAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C,
-        this, SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks");
+        this, TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks");
 
     new KAction(i18n("Switch to next TabWidget"), 0, this,
-        SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" );
+        TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" );
 
     m_splitHor = new KAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T,
-        this, SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h");
+        this, TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h");
     m_splitHor->setIcon("view_top_bottom");
 
     m_splitVer = new KAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L,
-        this, SLOT(slotSplitVerticalBase()), actionCollection(), "split_v");
+        this, TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v");
     m_splitVer->setIcon("view_left_right");
 
     m_splitHor1 = new KAction(i18n("Split &Horizontal"), 0,
-        this, SLOT(slotSplitHorizontal()), actionCollection(), "split_h1");
+        this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1");
     m_splitHor1->setIcon("view_top_bottom");
 
     m_splitVer1 = new KAction(i18n("Split &Vertical"), 0,
-        this, SLOT(slotSplitVertical()), actionCollection(), "split_v1");
+        this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1");
     m_splitVer1->setIcon("view_left_right");
 
     m_splitHor2 = new KAction(i18n("Split &Horizontal and Open"), 0,
-        this, SLOT(slotSplitHorizontal()), actionCollection(), "split_h2");
+        this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2");
     m_splitHor2->setIcon("view_top_bottom");
 
     m_splitVer2 = new KAction(i18n("Split &Vertical and Open"), 0,
-        this, SLOT(slotSplitVertical()), actionCollection(), "split_v2");
+        this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2");
     m_splitVer2->setIcon("view_left_right");
 
     m_raiseLeftDock = new KAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L,
-        this, SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock");
+        this, TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock");
 
     m_raiseRightDock = new KAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R,
-        this, SLOT(raiseRightDock()), actionCollection(), "switch_right_dock");
+        this, TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock");
 
     m_raiseBottomDock = new KAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B,
-        this, SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock");
+        this, TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock");
 
-    KStdAction::configureToolbars(this, SLOT(configureToolbars()),
+    KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars()),
         actionCollection(), "set_configure_toolbars");
 
     m_mainWindowShare->createActions();
 
-    connect(m_mainWindowShare, SIGNAL(gotoNextWindow()), this, SLOT(gotoNextWindow()));
-    connect(m_mainWindowShare, SIGNAL(gotoPreviousWindow()), this, SLOT(gotoPreviousWindow()));
-    connect(m_mainWindowShare, SIGNAL(gotoFirstWindow()), this, SLOT(gotoFirstWindow()));
-    connect(m_mainWindowShare, SIGNAL(gotoLastWindow()), this, SLOT(gotoLastWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), this, TQT_SLOT(gotoNextWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), this, TQT_SLOT(gotoPreviousWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), this, TQT_SLOT(gotoFirstWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), this, TQT_SLOT(gotoLastWindow()));
 }
 
 void SimpleMainWindow::raiseEditor()
@@ -522,12 +522,12 @@ void SimpleMainWindow::slotCoreInitialized()
 
 void SimpleMainWindow::projectOpened()
 {
-    setCaption(QString::null);
+    setCaption(TQString::null);
 }
 
 void SimpleMainWindow::slotPartURLChanged(KParts::ReadOnlyPart *part)
 {
-    if (QWidget *widget = EditorProxy::getInstance()->topWidgetForPart(part))
+    if (TQWidget *widget = EditorProxy::getInstance()->topWidgetForPart(part))
     {
         kdDebug() << "new caption for widget: " << part->url().fileName() << endl;
         widget->setCaption(part->url().fileName());
@@ -537,7 +537,7 @@ void SimpleMainWindow::slotPartURLChanged(KParts::ReadOnlyPart *part)
 
 void SimpleMainWindow::documentChangedState(const KURL &url, DocumentState state)
 {
-    QWidget * widget = EditorProxy::getInstance()->topWidgetForPart(
+    TQWidget * widget = EditorProxy::getInstance()->topWidgetForPart(
         PartController::getInstance()->partForURL(url));
     kdDebug() << "SimpleMainWindow::documentChangedState: " << widget << endl;
     if (widget)
@@ -558,7 +558,7 @@ void SimpleMainWindow::documentChangedState(const KURL &url, DocumentState state
                 if (m_showIconsOnTabs)
                     widget->setIcon(SmallIcon("kdevelop", isize));
                 else
-                    widget->setIcon(QPixmap());
+                    widget->setIcon(TQPixmap());
                 break;
             case Modified:
                 widget->setIcon(SmallIcon("filesave", isize));
@@ -577,7 +577,7 @@ void SimpleMainWindow::documentChangedState(const KURL &url, DocumentState state
 void SimpleMainWindow::closeTab()
 {
 //    actionCollection()->action("file_close")->activate();
-    if (sender()->isA("QToolButton") && sender()->parent()->isA("DTabWidget"))
+    if (sender()->isA("TQToolButton") && sender()->parent()->isA("DTabWidget"))
     {
         DTabWidget *tab = (DTabWidget*)sender()->parent();
         if (tab && tab->currentPage())
@@ -585,9 +585,9 @@ void SimpleMainWindow::closeTab()
     }
 }
 
-void SimpleMainWindow::tabContext(QWidget *w, const QPoint &p)
+void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p)
 {
-    DTabWidget *tabWidget = static_cast(const_cast(sender()));
+    DTabWidget *tabWidget = static_cast(const_cast(sender()));
     if (!tabWidget)
         return;
 
@@ -595,11 +595,11 @@ void SimpleMainWindow::tabContext(QWidget *w, const QPoint &p)
     tabMenu.insertTitle(tabWidget->tabLabel(w));
 
     //Find the document on whose tab the user clicked
-    m_currentTabURL = QString::null;
-    QPtrListIterator it(*PartController::getInstance()->parts());
+    m_currentTabURL = TQString::null;
+    TQPtrListIterator it(*PartController::getInstance()->parts());
     while (KParts::Part* part = it.current())
     {
-        QWidget *top_widget = EditorProxy::getInstance()->topWidgetForPart(part);
+        TQWidget *top_widget = EditorProxy::getInstance()->topWidgetForPart(part);
         if (top_widget == w)
         {
             if (KParts::ReadOnlyPart *ro_part = dynamic_cast(part))
@@ -633,7 +633,7 @@ void SimpleMainWindow::tabContext(QWidget *w, const QPoint &p)
         ++it;
     }
 
-    connect(&tabMenu, SIGNAL(activated(int)), this, SLOT(tabContextActivated(int)));
+    connect(&tabMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(tabContextActivated(int)));
     tabMenu.exec(p);
 }
 
@@ -668,7 +668,7 @@ void SimpleMainWindow::configureToolbars()
 {
     saveMainWindowSettings(KGlobal::config(), "SimpleMainWindow");
     KEditToolbar dlg(factory());
-    connect(&dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()));
+    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()));
     dlg.exec();
 }
 
@@ -693,13 +693,13 @@ bool SimpleMainWindow::queryExit()
 void SimpleMainWindow::setupWindowMenu()
 {
     // get the xmlgui created one instead
-    m_windowMenu = static_cast(main()->child("window", "KPopupMenu"));
+    m_windowMenu = static_cast(main()->child("window", "KPopupMenu"));
 
     if (!m_windowMenu)
     {
         kdDebug(9000) << "Couldn't find the XMLGUI window menu. Creating new." << endl;
 
-        m_windowMenu = new QPopupMenu(main(), "window");
+        m_windowMenu = new TQPopupMenu(main(), "window");
         menuBar()->insertItem(i18n("&Window"), m_windowMenu);
     }
 
@@ -707,13 +707,13 @@ void SimpleMainWindow::setupWindowMenu()
     actionCollection()->action("file_close_all")->plug(m_windowMenu);
     actionCollection()->action("file_closeother")->plug(m_windowMenu);
 
-    QObject::connect(m_windowMenu, SIGNAL(activated(int)), this, SLOT(openURL(int)));
-    QObject::connect(m_windowMenu, SIGNAL(aboutToShow()), this, SLOT(fillWindowMenu()));
+    TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openURL(int)));
+    TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu()));
 }
 
 void SimpleMainWindow::openURL(int w)
 {
-    QValueList >::ConstIterator it = m_windowList.begin();
+    TQValueList >::ConstIterator it = m_windowList.begin();
     while (it != m_windowList.end())
     {
         if ((*it).first == w)
@@ -732,7 +732,7 @@ void SimpleMainWindow::openURL(int w)
 void SimpleMainWindow::fillWindowMenu()
 {
     // clear menu
-    QValueList< QPair< int, KURL > >::ConstIterator it = m_windowList.begin();
+    TQValueList< QPair< int, KURL > >::ConstIterator it = m_windowList.begin();
     while (it != m_windowList.end())
     {
         m_windowMenu->removeItem( (*it).first );
@@ -741,8 +741,8 @@ void SimpleMainWindow::fillWindowMenu()
 
     int temp = 0;
 
-    QMap map;
-    QStringList string_list;
+    TQMap map;
+    TQStringList string_list;
     KURL::List list = PartController::getInstance()->openURLs();
     KURL::List::Iterator itt = list.begin();
     while (itt != list.end())
@@ -765,7 +765,7 @@ void SimpleMainWindow::fillWindowMenu()
 
     while (itt != list.end())
     {
-        temp = m_windowMenu->insertItem( i < 10 ? QString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() );
+        temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() );
         m_windowList << qMakePair(temp, *itt);
         ++i;
         ++itt;
@@ -824,11 +824,11 @@ void SimpleMainWindow::openDocumentsAfterSplit(DTabWidget *tab)
             else
             {
                 PartController::getInstance()->activatePart( part );
-                QWidget *inTab = widgetForURL(*it);
+                TQWidget *inTab = widgetForURL(*it);
                 if (inTab)
                 {
                     DTabWidget *oldTab = m_widgetTabs[inTab];
-                    QString title = oldTab->tabLabel(inTab);
+                    TQString title = oldTab->tabLabel(inTab);
                     removeWidget(inTab);
                     addWidget(tab, inTab, title);
                 }
@@ -838,34 +838,34 @@ void SimpleMainWindow::openDocumentsAfterSplit(DTabWidget *tab)
     }
 }
 
-QWidget *SimpleMainWindow::widgetForURL(KURL url)
+TQWidget *SimpleMainWindow::widgetForURL(KURL url)
 {
     KParts::ReadOnlyPart *part = PartController::getInstance()->partForURL(url);
     return widgetInTab( part ? part->widget() : 0 );
 }
 
-QWidget *SimpleMainWindow::widgetInTab(QWidget *w)
+TQWidget *SimpleMainWindow::widgetInTab(TQWidget *w)
 {
-    QWidget *inTab = 0;
+    TQWidget *inTab = 0;
     if (w && w->parent() && w->parent()->isA("EditorProxy"))
-        inTab = (QWidget*)w->parent();
+        inTab = (TQWidget*)w->parent();
     else if (w && w->parent() && w->parent()->isA("MultiBuffer")
         && w->parent()->parent() && w->parent()->parent()->isA("EditorProxy"))
-        inTab = (QWidget*)w->parent()->parent();
+        inTab = (TQWidget*)w->parent()->parent();
     else if (w && w->parent() && w->parent()->isA("MultiBuffer"))
-        inTab = (QWidget*)w->parent();
+        inTab = (TQWidget*)w->parent();
     else
         inTab = w;
     return inTab;
 }
 
-void SimpleMainWindow::closeTab(QWidget *w)
+void SimpleMainWindow::closeTab(TQWidget *w)
 {
-    const QPtrList *partlist = PartController::getInstance()->parts();
-    QPtrListIterator it(*partlist);
+    const TQPtrList *partlist = PartController::getInstance()->parts();
+    TQPtrListIterator it(*partlist);
     while (KParts::Part* part = it.current())
     {
-        QWidget *widget = EditorProxy::getInstance()->topWidgetForPart(part);
+        TQWidget *widget = EditorProxy::getInstance()->topWidgetForPart(part);
         if (widget && widget == w)
         {
             // weirdness beyond weirdness.. sometimes the active view is an embedded splitter with two files
@@ -888,9 +888,9 @@ void SimpleMainWindow::activePartChanged(KParts::Part *part)
 {
     if (!part)
         return;
-    QWidget *w = part->widget();
+    TQWidget *w = part->widget();
     kdDebug() << "active part widget is : " << w << endl;
-    QWidget *inTab = widgetInTab(w);
+    TQWidget *inTab = widgetInTab(w);
     if (m_widgetTabs[inTab] != 0)
     {
         kdDebug() << " setting m_activeTabWidget " << endl;
@@ -900,7 +900,7 @@ void SimpleMainWindow::activePartChanged(KParts::Part *part)
 
 void SimpleMainWindow::createGUI(KParts::Part *part) {
     if ( !part )
-        setCaption( QString::null );
+        setCaption( TQString::null );
     DMainWindow::createGUI(part);
 
     m_mainWindowShare->slotGUICreated( part );
@@ -935,12 +935,12 @@ void SimpleMainWindow::lowerAllDocks()
 
 void SimpleMainWindow::switchToNextTabWidget()
 {
-    QValueList tabWidgets = m_widgetTabs.values();
+    TQValueList tabWidgets = m_widgetTabs.values();
 
     if ( tabWidgets.count() < 2 ) return;
 
-    QValueList reduced;
-    QValueList::iterator it = tabWidgets.begin();
+    TQValueList reduced;
+    TQValueList::iterator it = tabWidgets.begin();
     while ( it != tabWidgets.end() )
     {
         if ( !reduced.contains( *it ) )
@@ -971,7 +971,7 @@ void SimpleMainWindow::switchToNextTabWidget()
     }
 }
 
-void SimpleMainWindow::setCaption(const QString &caption)
+void SimpleMainWindow::setCaption(const TQString &caption)
 {
     kdDebug(9000) << k_funcinfo << endl;
 
@@ -986,9 +986,9 @@ void SimpleMainWindow::setCaption(const QString &caption)
     KDevProject *project = API::getInstance()->project();
     if (project)
     {
-        QString projectname = project->projectName();
+        TQString projectname = project->projectName();
 
-        QString suffix(".kdevelop");
+        TQString suffix(".kdevelop");
         if (projectname.endsWith(suffix))
             projectname.truncate(projectname.length() - suffix.length());
 
@@ -1003,7 +1003,7 @@ void SimpleMainWindow::setCaption(const QString &caption)
 
 void SimpleMainWindow::projectClosed()
 {
-    DMainWindow::setCaption(QString::null);
+    DMainWindow::setCaption(TQString::null);
 }
 
 #include "simplemainwindow.moc"
diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h
index 39f23ff6..d809ddb1 100644
--- a/src/simplemainwindow.h
+++ b/src/simplemainwindow.h
@@ -37,30 +37,30 @@ namespace KParts {
 class SimpleMainWindow: public DMainWindow, public KDevMainWindow {
     Q_OBJECT
 public:
-    SimpleMainWindow(QWidget* parent = 0, const char *name = 0);
+    SimpleMainWindow(TQWidget* parent = 0, const char *name = 0);
     virtual ~SimpleMainWindow();
 
-    virtual void embedPartView(QWidget *view, const QString &title, const QString& toolTip = QString::null);
-    virtual void embedSelectView(QWidget *view, const QString &title, const QString &toolTip);
-    virtual void embedOutputView(QWidget *view, const QString &title, const QString &toolTip);
-    virtual void embedSelectViewRight(QWidget* view, const QString& title, const QString &toolTip);
+    virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString::null);
+    virtual void embedSelectView(TQWidget *view, const TQString &title, const TQString &toolTip);
+    virtual void embedOutputView(TQWidget *view, const TQString &title, const TQString &toolTip);
+    virtual void embedSelectViewRight(TQWidget* view, const TQString& title, const TQString &toolTip);
 
-    virtual void removeView(QWidget *view);
-    virtual void setViewAvailable(QWidget *pView, bool bEnabled);
-    virtual void raiseView(QWidget *view);
-    virtual void lowerView(QWidget *view);
+    virtual void removeView(TQWidget *view);
+    virtual void setViewAvailable(TQWidget *pView, bool bEnabled);
+    virtual void raiseView(TQWidget *view);
+    virtual void lowerView(TQWidget *view);
 
     virtual void loadSettings();
     virtual void saveSettings();
-    virtual void setCurrentDocumentCaption( const QString &caption );
+    virtual void setCurrentDocumentCaption( const TQString &caption );
 
     virtual KMainWindow *main();
 
     void init();
 
 public slots:
-    void slotDropEvent( QDropEvent *event );
-    void setCaption(const QString &);
+    void slotDropEvent( TQDropEvent *event );
+    void setCaption(const TQString &);
 
 protected:
     virtual bool queryClose();
@@ -68,9 +68,9 @@ protected:
 
 protected slots:
     virtual void closeTab();
-    virtual void closeTab(QWidget *w);
-    virtual void tabContext(QWidget *w, const QPoint &p);
-    void contextMenu(QPopupMenu *popupMenu, const Context *context);
+    virtual void closeTab(TQWidget *w);
+    virtual void tabContext(TQWidget *w, const TQPoint &p);
+    void contextMenu(TQPopupMenu *popupMenu, const Context *context);
 
 private slots:
     void gotoNextWindow();
@@ -105,15 +105,15 @@ private:
     void createFramework();
     void createActions();
     void setupWindowMenu();
-    void dragEnterEvent( QDragEnterEvent *event );
-    void dropEvent( QDropEvent *event );
+    void dragEnterEvent( TQDragEnterEvent *event );
+    void dropEvent( TQDropEvent *event );
     void openDocumentsAfterSplit(DTabWidget *tab);
-    QWidget *widgetForURL(KURL url);
-    QWidget *widgetInTab(QWidget *w);
+    TQWidget *widgetForURL(KURL url);
+    TQWidget *widgetInTab(TQWidget *w);
     KParts::ReadOnlyPart *activePartForSplitting();
-    void embedView( DDockWindow::Position position, QWidget *view, const QString & title );
-    DDockWindow::Position recallToolViewPosition( const QString & name, DDockWindow::Position defaultPos );
-    void rememberToolViewPosition( const QString & name, DDockWindow::Position pos );
+    void embedView( DDockWindow::Position position, TQWidget *view, const TQString & title );
+    DDockWindow::Position recallToolViewPosition( const TQString & name, DDockWindow::Position defaultPos );
+    void rememberToolViewPosition( const TQString & name, DDockWindow::Position pos );
 
     MainWindowShare *m_mainWindowShare;
 
@@ -129,8 +129,8 @@ private:
     KAction *m_raiseBottomDock;
     KAction *m_raiseLeftDock;
     KAction *m_raiseRightDock;
-    QPopupMenu *m_windowMenu;
-    QValueList > m_windowList;
+    TQPopupMenu *m_windowMenu;
+    TQValueList > m_windowList;
 
     KURL::List m_splitURLs;
 };
diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp
index 0c7ac7f2..25a4c811 100644
--- a/src/splashscreen.cpp
+++ b/src/splashscreen.cpp
@@ -4,16 +4,16 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
 
-KDevSplashScreen::KDevSplashScreen(const QPixmap& pixmap, WFlags f) : QSplashScreen(pixmap, f)
+KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f)
 {
-	QTimer *timer = new QTimer( this );
-	QObject::connect(timer, SIGNAL(timeout()), this, SLOT(animate()));
+	TQTimer *timer = new TQTimer( this );
+	TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate()));
     timer->start(150);
 
 	state = 0;
@@ -33,46 +33,46 @@ void KDevSplashScreen::animate()
 }
 
 
-void KDevSplashScreen::message( const QString &str, int flags, const QColor &color)
+void KDevSplashScreen::message( const TQString &str, int flags, const TQColor &color)
 {
-	QSplashScreen::message(str,flags,color);
+	TQSplashScreen::message(str,flags,color);
 	animate();
 	m_string = str;
 }
 
 
-void KDevSplashScreen::drawContents (QPainter* painter)
+void KDevSplashScreen::drawContents (TQPainter* painter)
 {
 	int position;
-	QColor base_color (201,229,165); // Base green color
+	TQColor base_color (201,229,165); // Base green color
 
 	// Draw background circles
 	painter->setPen(NoPen);
-	painter->setBrush(QColor(215,234,181));
+	painter->setBrush(TQColor(215,234,181));
 	painter->drawEllipse(51,7,9,9);
 	painter->drawEllipse(62,7,9,9);
 	painter->drawEllipse(73,7,9,9);
 
 	// Draw animated circles, increments are chosen
 	// to get close to background's color
-	// (didn't work well with QColor::light function)
+	// (didn't work well with TQColor::light function)
 	for (int i=0; i < progress_bar_size; i++)
 	{
 		position = (state+i)%(2*progress_bar_size-1);
-		painter->setBrush(QColor(base_color.red()-18*i,
+		painter->setBrush(TQColor(base_color.red()-18*i,
 								 base_color.green()-10*i,
 								 base_color.blue()-28*i));
 
 		if (position < 3) painter->drawEllipse(51+position*11,7,9,9);
 	}
 
-	painter->setPen(QColor(74,112,18));
-	QFont fnt(KGlobalSettings::generalFont());
+	painter->setPen(TQColor(74,112,18));
+	TQFont fnt(KGlobalSettings::generalFont());
 	fnt.setPointSize(8);
 	painter->setFont(fnt);
 
 	// Draw version number
-	QRect r = rect();
+	TQRect r = rect();
     r.setRect(r.x() + 5, r.y() + 5, r.width() - 10, r.height() - 10);
     painter->drawText(r, Qt::AlignRight, i18n("Version %1").arg( VERSION ));
 
diff --git a/src/splashscreen.h b/src/splashscreen.h
index 15114f3f..5fa6bc07 100644
--- a/src/splashscreen.h
+++ b/src/splashscreen.h
@@ -2,9 +2,9 @@
 #ifndef _SPLASHSCREEN_H_
 #define _SPLASHSCREEN_H_
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 class QPixmap;
 
@@ -16,21 +16,21 @@ class KDevSplashScreen : public QSplashScreen
 Q_OBJECT
 
 public:
-	KDevSplashScreen(const QPixmap& pixmap, WFlags f = 0);
+	KDevSplashScreen(const TQPixmap& pixmap, WFlags f = 0);
 	virtual ~KDevSplashScreen();
 
 protected:
-	void drawContents (QPainter * painter);
+	void drawContents (TQPainter * painter);
 
 public slots:
 	void animate();
-	void message( const QString &str, int flags = AlignLeft,
-		const QColor &color = black );
+	void message( const TQString &str, int flags = AlignLeft,
+		const TQColor &color = black );
 
 private:
 	int state;
 	int progress_bar_size;
-	QString m_string;
+	TQString m_string;
 
 };
 
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index cff28b3e..02031021 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -27,20 +27,20 @@
 #include "statusbar.h"
 #include "partcontroller.h"
 
-KDevStatusBar::KDevStatusBar(QWidget *parent, const char *name)
+KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name)
     : KStatusBar(parent, name), _cursorIface(0), _activePart(0)
 {
-	QWidget * w = new QWidget( this );
+	TQWidget * w = new TQWidget( this );
 	addWidget( w, 1, true );
 	w->hide();
 
-	_status = new QLabel( this );
+	_status = new TQLabel( this );
 	_status->setMinimumWidth(_status->fontMetrics().width("Line: XXXXX Col: XXX  OVR NORM * "));
-	_status->setAlignment(QWidget::AlignCenter);
+	_status->setAlignment(TQWidget::AlignCenter);
 	addWidget(_status, 0, true);
 
-	connect(PartController::getInstance(), SIGNAL(activePartChanged(KParts::Part*)),
-		this, SLOT(activePartChanged(KParts::Part*)));
+	connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
+		this, TQT_SLOT(activePartChanged(KParts::Part*)));
 }
 
 
@@ -60,14 +60,14 @@ void KDevStatusBar::activePartChanged(KParts::Part *part)
 	{
 		if ((_viewmsgIface = dynamic_cast(part->widget())))
 		{
-			connect( part->widget(), SIGNAL( viewStatusMsg( const QString & ) ),
-				this, SLOT( setStatus( const QString & ) ) );
+			connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
+				this, TQT_SLOT( setStatus( const TQString & ) ) );
 	
 			_status->show();
 		}
 		else if ((_cursorIface = dynamic_cast(part->widget())))
 		{
-			connect(part->widget(), SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChanged()));
+			connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged()));
 	
 			_status->show();
 			cursorPositionChanged();
@@ -90,7 +90,7 @@ void KDevStatusBar::cursorPositionChanged()
   }
 }
 
-void KDevStatusBar::setStatus(const QString &str)
+void KDevStatusBar::setStatus(const TQString &str)
 {
 	_status->setText(str);
 }
@@ -101,7 +101,7 @@ void KDevStatusBar::setCursorPosition(int line, int col)
 	_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col));
 }
 
-void KDevStatusBar::addWidget ( QWidget *widget, int stretch, bool permanent)
+void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
diff --git a/src/statusbar.h b/src/statusbar.h
index 30b80724..2e9fffaa 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -13,7 +13,7 @@
 #define _STATUSBAR_H_
 
 #include 
-#include 
+#include 
 
 class QLabel;
 
@@ -29,18 +29,18 @@ class KDevStatusBar : public KStatusBar
     Q_OBJECT
 
 public:
-    KDevStatusBar( QWidget *parent=0, const char *name=0 );
+    KDevStatusBar( TQWidget *parent=0, const char *name=0 );
     ~KDevStatusBar();
-    void addWidget ( QWidget *widget, int stretch = 0, bool permanent = FALSE );
+    void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = FALSE );
 
 private slots:
     void cursorPositionChanged();
     void activePartChanged(KParts::Part *part);
-    void setStatus(const QString &str);
+    void setStatus(const TQString &str);
     void setCursorPosition(int line, int col);
 
 private:
-    QLabel *_status;
+    TQLabel *_status;
 
 	KTextEditor::ViewCursorInterface * _cursorIface;
 	KTextEditor::ViewStatusMsgInterface * _viewmsgIface;
diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp
index 66dec0c8..8d43d48d 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.cpp
+++ b/vcs/clearcase/clearcasefileinfoprovider.cpp
@@ -14,14 +14,14 @@
 #include "kdevversioncontrol.h"
 
 #include 
-#include 
+#include 
 
 ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent)
 	: KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider")
 {
     vcsInfo_ = NULL;
 
-    connect(parent, SIGNAL(statusReady(const VCSFileInfoMap&, void*)), SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*)));
+    connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*)));
 
     kdevVCS_ = parent;
 }
@@ -32,7 +32,7 @@ ClearcaseFileinfoProvider::~ClearcaseFileinfoProvider()
 }
 
 
-const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const QString &dirPath ) {
+const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const TQString &dirPath ) {
 
     if (curDirPath_ == dirPath) return vcsInfo_;
 
@@ -45,7 +45,7 @@ const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const QString &dirPath
     return vcsInfo_;
 }
 
-bool ClearcaseFileinfoProvider::requestStatus( const QString &dirPath, void *callerData, bool recursive, bool checkRepos  ) {
+bool ClearcaseFileinfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos  ) {
  	
     VCSFileInfoMap* vcsDirInfos = ccManipulator_.retreiveFilesInfos(dirPath);
 
@@ -58,9 +58,9 @@ bool ClearcaseFileinfoProvider::requestStatus( const QString &dirPath, void *cal
 
 
 
-QStringList ClearcaseFileinfoProvider::registeredEntryList() const
+TQStringList ClearcaseFileinfoProvider::registeredEntryList() const
 {
-    QStringList l;
+    TQStringList l;
     return l;
 }
 
diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h
index b716d01b..24d38c2a 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.h
+++ b/vcs/clearcase/clearcasefileinfoprovider.h
@@ -28,20 +28,20 @@ public:
     virtual ~ClearcaseFileinfoProvider();
 
     // -- Sync interface
-    const VCSFileInfoMap *status( const QString &dirPath ) ;
+    const VCSFileInfoMap *status( const TQString &dirPath ) ;
 
     // -- Async interface for requesting data
-    bool requestStatus( const QString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+    bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
 
 
 private:
 
-    QStringList registeredEntryList() const;
+    TQStringList registeredEntryList() const;
 
 
 private:
     ClearcaseManipulator ccManipulator_;
-    QString curDirPath_;
+    TQString curDirPath_;
     VCSFileInfoMap* vcsInfo_;
     ClearcasePart* kdevVCS_;
 
diff --git a/vcs/clearcase/clearcasemanipulator.cpp b/vcs/clearcase/clearcasemanipulator.cpp
index c51436ba..5c9563f9 100644
--- a/vcs/clearcase/clearcasemanipulator.cpp
+++ b/vcs/clearcase/clearcasemanipulator.cpp
@@ -13,8 +13,8 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -78,15 +78,15 @@ ClearcaseManipulator::~ClearcaseManipulator()
 {}
 
 
-bool ClearcaseManipulator::isCCRepository( const QString & directory ) {
-  QString cmd;
+bool ClearcaseManipulator::isCCRepository( const TQString & directory ) {
+  TQString cmd;
   cmd = "cd " + directory + " && cleartool pwv -root";
   if ( system(cmd.ascii()) == 0 ) return true;
 
   return false;
 }
 
-VCSFileInfoMap* ClearcaseManipulator::retreiveFilesInfos(const QString& directory) {
+VCSFileInfoMap* ClearcaseManipulator::retreiveFilesInfos(const TQString& directory) {
 
 
   VCSFileInfoMap* fileInfoMap = new VCSFileInfoMap();
@@ -104,9 +104,9 @@ VCSFileInfoMap* ClearcaseManipulator::retreiveFilesInfos(const QString& director
       int pos = 0;
       int lastPos = -1;
 
-      QStringList outputList;
-      outputList = outputList.split(CT_DESC_SEPARATOR, QString(line), true );
-      outputList[Name] = QString(basename((char*)outputList[Name].ascii()));
+      TQStringList outputList;
+      outputList = outputList.split(CT_DESC_SEPARATOR, TQString(line), true );
+      outputList[Name] = TQString(basename((char*)outputList[Name].ascii()));
 
       VCSFileInfo::FileState state;
       if (outputList[ClearcaseManipulator::State] == "unreserved" || outputList[ClearcaseManipulator::State] == "reserved") {
diff --git a/vcs/clearcase/clearcasemanipulator.h b/vcs/clearcase/clearcasemanipulator.h
index baa7c17f..0cb795e3 100644
--- a/vcs/clearcase/clearcasemanipulator.h
+++ b/vcs/clearcase/clearcasemanipulator.h
@@ -16,7 +16,7 @@
 
 #include 
 
-#include 
+#include 
 
 #include 
 
@@ -29,9 +29,9 @@ class ClearcaseManipulator {
 
     ~ClearcaseManipulator();
 
-    static bool isCCRepository(const QString& directory);
+    static bool isCCRepository(const TQString& directory);
 
-    VCSFileInfoMap* retreiveFilesInfos(const QString& directory);
+    VCSFileInfoMap* retreiveFilesInfos(const TQString& directory);
 
   private:
     enum FileInfosFields {
diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index 6c11a4a6..198cc1db 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -12,8 +12,8 @@
 #include "clearcasepart.h"
 #include "commentdlg.h"
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -42,7 +42,7 @@ static const KDevPluginInfo data("kdevclearcase");
 typedef KDevGenericFactory ClearcaseFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) )
 
-ClearcasePart::ClearcasePart( QObject *parent, const char *name, const QStringList & )
+ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & )
         : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
           default_checkin(""),
           default_checkout(""),
@@ -60,8 +60,8 @@ ClearcasePart::ClearcasePart( QObject *parent, const char *name, const QStringLi
     fileInfoProvider_ = new ClearcaseFileinfoProvider(this);
 
     setInstance(ClearcaseFactory::instance());
-    connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-             this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
+    connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+             this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 }
 
 ClearcasePart::~ClearcasePart()
@@ -69,45 +69,45 @@ ClearcasePart::~ClearcasePart()
 
 
 
-bool ClearcasePart::isValidDirectory(const QString &dirPath) const {
+bool ClearcasePart::isValidDirectory(const TQString &dirPath) const {
     return isValidCCDirectory_;
 }
 
 
-void ClearcasePart::contextMenu(QPopupMenu *popup, const Context *context)
+void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context)
 {
 
     if (context->hasType( Context::FileContext )) {
         const FileContext *fcontext = static_cast(context);
         popupfile_ = fcontext->urls().first().path();
 
-        QFileInfo fi(popupfile_);
+        TQFileInfo fi(popupfile_);
         popup->insertSeparator();
 
         KPopupMenu *sub = new KPopupMenu(popup);
-        QString name = fi.fileName();
+        TQString name = fi.fileName();
         sub->insertTitle( i18n("Actions for %1").arg(name) );
         sub->insertItem( i18n("Checkin"),
-                         this, SLOT(slotCheckin()) );
+                         this, TQT_SLOT(slotCheckin()) );
         sub->insertItem( i18n("Checkout"),
-                         this, SLOT(slotCheckout()) );
+                         this, TQT_SLOT(slotCheckout()) );
         sub->insertItem( i18n("Uncheckout"),
-                         this, SLOT(slotUncheckout()) );
+                         this, TQT_SLOT(slotUncheckout()) );
         sub->insertSeparator();
         sub->insertItem( i18n("Create Element"),
-                         this, SLOT(slotCreate()) );
+                         this, TQT_SLOT(slotCreate()) );
         sub->insertItem( i18n("Remove Element"),
-                         this, SLOT(slotRemove()) );
+                         this, TQT_SLOT(slotRemove()) );
         sub->insertSeparator();
         sub->insertItem( i18n("History"),
-                         this, SLOT(slotListHistory()) );
+                         this, TQT_SLOT(slotListHistory()) );
         sub->insertSeparator();
         sub->insertItem( i18n("Diff"),
-                         this, SLOT(slotDiff()) );
+                         this, TQT_SLOT(slotDiff()) );
 
         sub->insertSeparator();
         sub->insertItem( i18n("List Checkouts"),
-                         this, SLOT(slotListCheckouts()) );
+                         this, TQT_SLOT(slotListCheckouts()) );
 
         popup->insertItem(i18n("Clearcase"), sub);
 
@@ -120,23 +120,23 @@ void ClearcasePart::contextMenu(QPopupMenu *popup, const Context *context)
 
 void ClearcasePart::slotCheckin()
 {
-    QString dir, name;
-    QFileInfo fi(popupfile_);
+    TQString dir, name;
+    TQFileInfo fi(popupfile_);
     dir = fi.dirPath();
     name = fi.fileName();
 
     CcaseCommentDlg dlg(FALSE);
-    if (dlg.exec() == QDialog::Rejected)
+    if (dlg.exec() == TQDialog::Rejected)
         return;
 
-    QDomDocument &dom = *this->projectDom();
-    QString message = DomUtil::readEntry(dom,"/kdevclearcase/checkin_options",default_checkin);
+    TQDomDocument &dom = *this->projectDom();
+    TQString message = DomUtil::readEntry(dom,"/kdevclearcase/checkin_options",default_checkin);
     if(dlg.logMessage().isEmpty())
         message += "-nc ";
     else
         message += "-c \"" + dlg.logMessage() + "\"";
 
-    QString command("cd ");
+    TQString command("cd ");
     command += KShellProcess::quote(dir);
     command += " && ";
     command += " cleartool checkin ";
@@ -151,17 +151,17 @@ void ClearcasePart::slotCheckin()
 
 void ClearcasePart::slotCheckout()
 {
-    QString dir, name;
-    QFileInfo fi(popupfile_);
+    TQString dir, name;
+    TQFileInfo fi(popupfile_);
     dir = fi.dirPath();
     name = fi.fileName();
 
     CcaseCommentDlg dlg(TRUE);
-    if (dlg.exec() == QDialog::Rejected)
+    if (dlg.exec() == TQDialog::Rejected)
         return;
 
-    QDomDocument &dom = *this->projectDom();
-    QString message = DomUtil::readEntry(dom,"/kdevclearcase/checkout_options",default_checkout);
+    TQDomDocument &dom = *this->projectDom();
+    TQString message = DomUtil::readEntry(dom,"/kdevclearcase/checkout_options",default_checkout);
     if(!dlg.isReserved())
        message += "-unres ";
     if(dlg.logMessage().isEmpty())
@@ -169,7 +169,7 @@ void ClearcasePart::slotCheckout()
     else
        message += "-c \"" + dlg.logMessage() + "\"";
 
-    QString command("cd ");
+    TQString command("cd ");
     command += KShellProcess::quote(dir);
     command += " && cleartool checkout ";
     command += message;
@@ -185,14 +185,14 @@ void ClearcasePart::slotCheckout()
 
 void ClearcasePart::slotUncheckout()
 {
-    QString dir, name;
-    QFileInfo fi(popupfile_);
+    TQString dir, name;
+    TQFileInfo fi(popupfile_);
     dir = fi.dirPath();
     name = fi.fileName();
 
-    QDomDocument &dom = *this->projectDom();
+    TQDomDocument &dom = *this->projectDom();
 
-    QString command("cd ");
+    TQString command("cd ");
     command += KShellProcess::quote(dir);
     command += " && cleartool uncheckout ";
     command += DomUtil::readEntry(dom,"/kdevclearcase/uncheckout_options",default_uncheckout);
@@ -207,16 +207,16 @@ void ClearcasePart::slotUncheckout()
 
 void ClearcasePart::slotCreate()
 {
-    QFileInfo fi(popupfile_);
-    QString dir = fi.dirPath();
-    QString name = fi.fileName();
+    TQFileInfo fi(popupfile_);
+    TQString dir = fi.dirPath();
+    TQString name = fi.fileName();
 
-    QDomDocument &dom = *this->projectDom();
+    TQDomDocument &dom = *this->projectDom();
 
     // Checking whether current directory is checked out or not is cumbersome so skip it for now
-    QString command("cd ");
+    TQString command("cd ");
     command += KShellProcess::quote(dir);
-    QFileInfo di(dir);
+    TQFileInfo di(dir);
     if(!di.isWritable()) { // Work-around to check if directory is checked out
         command += " && cleartool co -unres -nc ";
         command += KShellProcess::quote(dir);
@@ -237,15 +237,15 @@ void ClearcasePart::slotCreate()
 
 void ClearcasePart::slotRemove()
 {
-    QFileInfo fi(popupfile_);
-    QString dir = fi.dirPath();
-    QString name = fi.fileName();
+    TQFileInfo fi(popupfile_);
+    TQString dir = fi.dirPath();
+    TQString name = fi.fileName();
 
-    QDomDocument &dom = *this->projectDom();
+    TQDomDocument &dom = *this->projectDom();
 
-    QString command("cd ");
+    TQString command("cd ");
     command += KShellProcess::quote(dir);
-    QFileInfo di(dir);
+    TQFileInfo di(dir);
     if(!di.isWritable()) { // Work-around to check if directory is checked out
         command += " && cleartool co -unres -nc ";
         command += KShellProcess::quote(dir);
@@ -263,16 +263,16 @@ void ClearcasePart::slotRemove()
 
 void ClearcasePart::slotListHistory()
 {
-    QFileInfo fi(popupfile_);
-    QString dir = fi.dirPath();
-    QString name = fi.fileName();
-    QStringList args;
-    QStringList env;
-    QString str;
+    TQFileInfo fi(popupfile_);
+    TQString dir = fi.dirPath();
+    TQString name = fi.fileName();
+    TQStringList args;
+    TQStringList env;
+    TQString str;
 
-    QDomDocument &dom = *this->projectDom();
+    TQDomDocument &dom = *this->projectDom();
 
-    QString command("cd ");
+    TQString command("cd ");
     command += KShellProcess::quote(dir);
     command += " && cleartool lshistory ";
     command += DomUtil::readEntry(dom, "/kdevclearcase/lshistory_options", default_lshistory);
@@ -285,31 +285,31 @@ void ClearcasePart::slotListHistory()
 
 void ClearcasePart::slotDiff()
 {
-    QFileInfo fi(popupfile_);
-    QString dir = fi.dirPath();
-    QString name = fi.fileName();
-    QStringList args;
-    QStringList env;
-    QString str;
+    TQFileInfo fi(popupfile_);
+    TQString dir = fi.dirPath();
+    TQString name = fi.fileName();
+    TQStringList args;
+    TQStringList env;
+    TQString str;
 
-    QDomDocument &dom = *this->projectDom();
+    TQDomDocument &dom = *this->projectDom();
 
     args << "diff";
     str = DomUtil::readEntry(dom,"/kdevclearcase/diff_options",default_diff);
     if (str.length()) {
-        QStringList list = QStringList::split(' ',str);
-        for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) args << *it;
+        TQStringList list = TQStringList::split(' ',str);
+        for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) args << *it;
     }
 
     args << name;
 
     ExecCommand* cmv = new ExecCommand( "cleartool", args, dir, env, this );
-    connect( cmv, SIGNAL(finished( const QString&, const QString& )),
-             this, SLOT(slotDiffFinished( const QString&, const QString& )) );
+    connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )),
+             this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) );
 }
 
 
-void ClearcasePart::slotDiffFinished( const QString& diff, const QString& err )
+void ClearcasePart::slotDiffFinished( const TQString& diff, const TQString& err )
 {
     if ( diff.isNull() && err.isNull() ) {
         kdDebug(9000) << "clearcase diff canceled" << endl;
@@ -323,7 +323,7 @@ void ClearcasePart::slotDiffFinished( const QString& diff, const QString& err )
 
     if ( !err.isEmpty() ) {
         int s = KMessageBox::warningContinueCancelList( 0, i18n("Clearcase outputted errors during diff. Do you still want to continue?"),
-                QStringList::split( "\n", err, false ), i18n("Errors During Diff") );
+                TQStringList::split( "\n", err, false ), i18n("Errors During Diff") );
         if ( s != KMessageBox::Continue )
             return;
     }
@@ -339,17 +339,17 @@ void ClearcasePart::slotDiffFinished( const QString& diff, const QString& err )
 
 void ClearcasePart::slotListCheckouts()
 {
-    QString dir;
-    QFileInfo fi(popupfile_);
+    TQString dir;
+    TQFileInfo fi(popupfile_);
     if (fi.isDir()) {
         dir = fi.absFilePath();
     } else {
         dir = fi.dirPath();
     }
 
-    QDomDocument &dom = *this->projectDom();
+    TQDomDocument &dom = *this->projectDom();
 
-    QString command("cd ");
+    TQString command("cd ");
     command += KShellProcess::quote(dir);
     command += " && cleartool lsco ";
     command += DomUtil::readEntry(dom, "/kdevclearcase/lscheckout_options", default_lscheckout);
diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h
index 2f82b61d..f6d8cd39 100644
--- a/vcs/clearcase/clearcasepart.h
+++ b/vcs/clearcase/clearcasepart.h
@@ -21,25 +21,25 @@ class ClearcasePart : public KDevVersionControl {
     Q_OBJECT
 
 public:
-    ClearcasePart( QObject *parent, const char *name, const QStringList & );
+    ClearcasePart( TQObject *parent, const char *name, const TQStringList & );
     ~ClearcasePart();
 
-    const QString default_checkin;
-    const QString default_checkout;
-    const QString default_uncheckout;
-    const QString default_create;
-    const QString default_remove;
-    const QString default_lshistory;
-    const QString default_lscheckout;
-    const QString default_diff;
+    const TQString default_checkin;
+    const TQString default_checkout;
+    const TQString default_uncheckout;
+    const TQString default_create;
+    const TQString default_remove;
+    const TQString default_lshistory;
+    const TQString default_lscheckout;
+    const TQString default_diff;
 
-    virtual void createNewProject(const QString& dir) {}
+    virtual void createNewProject(const TQString& dir) {}
     virtual bool fetchFromRepository() { return true; }
     virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; }
-    virtual bool isValidDirectory(const QString &dirPath) const;
+    virtual bool isValidDirectory(const TQString &dirPath) const;
 
 private slots:
-    void contextMenu(QPopupMenu *popup, const Context *context);
+    void contextMenu(TQPopupMenu *popup, const Context *context);
 
     void slotCheckin();
     void slotCheckout();
@@ -48,7 +48,7 @@ private slots:
     void slotCreate();
     void slotRemove();
     void slotDiff();
-    void slotDiffFinished( const QString& diff, const QString& err );
+    void slotDiffFinished( const TQString& diff, const TQString& err );
     void slotListHistory();
     void slotListCheckouts();
 
@@ -56,8 +56,8 @@ private slots:
 private:
 
     bool isValidCCDirectory_;
-    QString popupfile_;
-    QString viewname;
+    TQString popupfile_;
+    TQString viewname;
 
     KDevVCSFileInfoProvider *fileInfoProvider_;
 };
diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp
index 36b3bc6f..df9fc10b 100644
--- a/vcs/clearcase/commentdlg.cpp
+++ b/vcs/clearcase/commentdlg.cpp
@@ -11,9 +11,9 @@
 
 #include "commentdlg.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -21,33 +21,33 @@
 #include 
 
 CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
-  : QDialog(0, "", true)
+  : TQDialog(0, "", true)
 {
   setCaption( i18n("Clearcase Comment") );
 
-  QBoxLayout *layout = new QVBoxLayout(this, 10);
+  TQBoxLayout *layout = new TQVBoxLayout(this, 10);
 
-  QLabel *messagelabel = new QLabel(i18n("Enter log message:"), this);
+  TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this);
   messagelabel->setMinimumSize(messagelabel->sizeHint());
   layout->addWidget(messagelabel, 0);
 
-  _edit = new QMultiLineEdit(this);
-  QFontMetrics fm(_edit->fontMetrics());
+  _edit = new TQMultiLineEdit(this);
+  TQFontMetrics fm(_edit->fontMetrics());
   _edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3);
   layout->addWidget(_edit, 10);
 
-  QBoxLayout *layout2 = new QHBoxLayout(layout);
+  TQBoxLayout *layout2 = new TQHBoxLayout(layout);
   if(bCheckin) {
-    _check = new QCheckBox(i18n("Reserve"), this);
+    _check = new TQCheckBox(i18n("Reserve"), this);
     layout2->addWidget(_check);
   }
 
   KButtonBox *buttonbox = new KButtonBox(this);
   buttonbox->addStretch();
-  QPushButton *ok = buttonbox->addButton(KStdGuiItem::ok());
-  QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel());
-  connect(ok, SIGNAL(clicked()), SLOT(accept()) );
-  connect(cancel, SIGNAL(clicked()), SLOT(reject()) );
+  TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok());
+  TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel());
+  connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+  connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
   ok->setDefault(true);
   buttonbox->layout();
   layout2->addWidget(buttonbox, 0);
diff --git a/vcs/clearcase/commentdlg.h b/vcs/clearcase/commentdlg.h
index 8ac50a38..953a9a4e 100644
--- a/vcs/clearcase/commentdlg.h
+++ b/vcs/clearcase/commentdlg.h
@@ -12,21 +12,21 @@
 #ifndef _CLEARCASECOMMENTDLG_H_
 #define _CLEARCASECOMMENTDLG_H_
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 class CcaseCommentDlg : public QDialog
 {
 Q_OBJECT
 public:
   CcaseCommentDlg(bool = FALSE);
-  QString logMessage() { return _edit->text(); };
+  TQString logMessage() { return _edit->text(); };
   bool isReserved() { return (_check) ?  _check->isChecked() : FALSE;  };
 
 private:
-  QMultiLineEdit *_edit;
-  QCheckBox* _check;
+  TQMultiLineEdit *_edit;
+  TQCheckBox* _check;
 };
 
 #endif
diff --git a/vcs/clearcase/integrator/ccintegratordlg.cpp b/vcs/clearcase/integrator/ccintegratordlg.cpp
index 51ab6f0d..8e89cf94 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.cpp
+++ b/vcs/clearcase/integrator/ccintegratordlg.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "ccintegratordlg.h"
 
-CCIntegratorDlg::CCIntegratorDlg(QWidget *parent, const char *name)
+CCIntegratorDlg::CCIntegratorDlg(TQWidget *parent, const char *name)
     :CCIntegratorDlgBase(parent, name)
 {
 }
@@ -28,11 +28,11 @@ void CCIntegratorDlg::accept()
 {
 }
 
-void CCIntegratorDlg::init(const QString &/*projectName*/, const QString &/*projectLocation*/)
+void CCIntegratorDlg::init(const TQString &/*projectName*/, const TQString &/*projectLocation*/)
 {
 }
 
-QWidget *CCIntegratorDlg::self()
+TQWidget *CCIntegratorDlg::self()
 {
     return const_cast(this);
 }
diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h
index 04cbb62b..bbb23955 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.h
+++ b/vcs/clearcase/integrator/ccintegratordlg.h
@@ -26,11 +26,11 @@
 class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
 public:
-    CCIntegratorDlg(QWidget *parent = 0, const char *name = 0);
+    CCIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
     
     virtual void accept();
-    virtual void init(const QString &projectName, const QString &projectLocation);
-    virtual QWidget *self();
+    virtual void init(const TQString &projectName, const TQString &projectLocation);
+    virtual TQWidget *self();
 };
 
 #endif
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp
index c99c5c3e..4e8c1a0b 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.cpp
+++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp
@@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevclearcaseintegrator");
 typedef KDevGenericFactory ClearcaseIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) )
 
-ClearcaseIntegrator::ClearcaseIntegrator(QObject* parent, const char* name,
-    const QStringList // args
+ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name,
+    const TQStringList // args
                                          )
     :KDevVCSIntegrator(parent, name)
 {
@@ -39,13 +39,13 @@ ClearcaseIntegrator::~ClearcaseIntegrator()
 {
 }
 
-VCSDialog* ClearcaseIntegrator::fetcher(QWidget* // parent
+VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // parent
                                         )
 {
     return 0;
 }
 
-VCSDialog* ClearcaseIntegrator::integrator(QWidget* parent)
+VCSDialog* ClearcaseIntegrator::integrator(TQWidget* parent)
 {
     CCIntegratorDlg *dlg = new CCIntegratorDlg(parent);
     return dlg;
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h
index a306bd70..385f1976 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.h
+++ b/vcs/clearcase/integrator/clearcaseintegrator.h
@@ -22,17 +22,17 @@
 
 #include 
 
-#include 
+#include 
 
 class ClearcaseIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
 public:
-    ClearcaseIntegrator(QObject* parent, const char* name, const QStringList args = QStringList());
+    ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~ClearcaseIntegrator();
 
-    virtual VCSDialog* fetcher(QWidget* parent);
-    virtual VCSDialog* integrator(QWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* parent);
+    virtual VCSDialog* integrator(TQWidget* parent);
 
 };
 
diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp
index 08d0f24f..2937b2bb 100644
--- a/vcs/cvsservice/annotatedialog.cpp
+++ b/vcs/cvsservice/annotatedialog.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -23,18 +23,18 @@
 #include "annotatedialog.h"
 #include "annotatepage.h"
 
-AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, QWidget *parent, const char *name, int )
+AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int )
     : KDialogBase( Tabbed, i18n("CVS Annotate Dialog"), Close, Close,
     parent, name? name : "annotateformdialog", false /*modal*/, true /*separator*/ ),
     m_cvsService( cvsService )
 {
     setWFlags( getWFlags() | WDestructiveClose );
 
-    QVBox *vbox = addVBoxPage( i18n("Annotate") );
+    TQVBox *vbox = addVBoxPage( i18n("Annotate") );
     m_cvsAnnotatePage = new AnnotatePage( m_cvsService, vbox );
 
-    connect( m_cvsAnnotatePage, SIGNAL(requestAnnotate(const QString)),
-             this, SLOT(slotAnnotate(const QString)) );
+    connect( m_cvsAnnotatePage, TQT_SIGNAL(requestAnnotate(const TQString)),
+             this, TQT_SLOT(slotAnnotate(const TQString)) );
 }
 
 AnnotateDialog::~AnnotateDialog()
@@ -42,7 +42,7 @@ AnnotateDialog::~AnnotateDialog()
     kdDebug(9006) << "AnnotateDialog::~AnnotateDialog()" << endl;
 }
 
-void AnnotateDialog::startFirstAnnotate( const QString pathName, const QString revision )
+void AnnotateDialog::startFirstAnnotate( const TQString pathName, const TQString revision )
 {
     kdDebug(9006) << "AnnotateDialog::startFirstAnnotate() pathName = " << pathName << 
             "revision = " << revision << endl;
@@ -53,16 +53,16 @@ void AnnotateDialog::startFirstAnnotate( const QString pathName, const QString r
     m_cvsAnnotatePage->startAnnotate( pathName, revision );
 }
 
-void AnnotateDialog::slotAnnotate(const QString rev)
+void AnnotateDialog::slotAnnotate(const TQString rev)
 {
-    kdDebug(9006) << "AnnotateDialog::slotAnnotate(QString) revision = " << rev << endl;
+    kdDebug(9006) << "AnnotateDialog::slotAnnotate(TQString) revision = " << rev << endl;
 
-    QVBox *vbox = addVBoxPage( i18n("Annotate")+" "+rev );
+    TQVBox *vbox = addVBoxPage( i18n("Annotate")+" "+rev );
     AnnotatePage * page = new AnnotatePage( m_cvsService, vbox );
     page->startAnnotate(m_pathName, rev);
 
-    connect( page, SIGNAL(requestAnnotate(const QString)),
-             this, SLOT(slotAnnotate(const QString)) );
+    connect( page, TQT_SIGNAL(requestAnnotate(const TQString)),
+             this, TQT_SLOT(slotAnnotate(const TQString)) );
 }
 
 #include "annotatedialog.moc"
diff --git a/vcs/cvsservice/annotatedialog.h b/vcs/cvsservice/annotatedialog.h
index 7fea14f1..c887264d 100644
--- a/vcs/cvsservice/annotatedialog.h
+++ b/vcs/cvsservice/annotatedialog.h
@@ -31,7 +31,7 @@ class AnnotateDialog : public KDialogBase
 {
     Q_OBJECT
 public:
-    AnnotateDialog( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 );
+    AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
     virtual ~AnnotateDialog();
 
     /**
@@ -45,7 +45,7 @@ public:
      *
      * @param pathName The file for which to run cvs annotate
      */
-    void startFirstAnnotate( const QString pathName, const QString revision = "" );
+    void startFirstAnnotate( const TQString pathName, const TQString revision = "" );
 
 private slots:
     /**
@@ -53,10 +53,10 @@ private slots:
      * The output gets shown in a new page.
      * @param rev The revision which will be annotated
      */
-    void slotAnnotate(const QString rev);
+    void slotAnnotate(const TQString rev);
 
 private:
-    QString m_pathName;
+    TQString m_pathName;
 
     AnnotatePage *m_cvsAnnotatePage;
     CvsService_stub *m_cvsService;
diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp
index fea16ece..71918304 100644
--- a/vcs/cvsservice/annotatepage.cpp
+++ b/vcs/cvsservice/annotatepage.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -32,20 +32,20 @@
 #include "annotatepage.h"
 #include "annotateview.h"
 
-AnnotatePage::AnnotatePage( CvsService_stub *cvsService, QWidget *parent, const char *name, int )
+AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int )
     : DCOPObject( "CvsAnnotatePageDCOPIface" ),
-    QWidget( parent, name? name : "annotateformpage" ),
+    TQWidget( parent, name? name : "annotateformpage" ),
     m_cvsService( cvsService ), m_cvsAnnotateJob( 0 )
 {
     kdDebug(9006) << "AnnotatePage::AnnotatePage()" << endl;
 
-    QLayout *dialogLayout = new QVBoxLayout( this );
+    TQLayout *dialogLayout = new TQVBoxLayout( this );
 
     //First create the top-line where user can choose a revision
-    QWidget * LayoutWidget = new QWidget( this );
-    QHBoxLayout * AnnotateLayout = new QHBoxLayout( LayoutWidget ); 
+    TQWidget * LayoutWidget = new TQWidget( this );
+    TQHBoxLayout * AnnotateLayout = new TQHBoxLayout( LayoutWidget ); 
 
-    QLabel * lblRevision = new QLabel( LayoutWidget );
+    TQLabel * lblRevision = new TQLabel( LayoutWidget );
     AnnotateLayout->addWidget( lblRevision );
     lblRevision->setText( tr( "Revision:" ) );
 
@@ -55,14 +55,14 @@ AnnotatePage::AnnotatePage( CvsService_stub *cvsService, QWidget *parent, const
     m_btnAnnotate = new KPushButton( LayoutWidget );
     AnnotateLayout->addWidget( m_btnAnnotate );
     m_btnAnnotate->setText( tr( "&Annotate" ) );
-    m_btnAnnotate->setAccel( QKeySequence( tr( "Alt+A" ) ) );
+    m_btnAnnotate->setAccel( TQKeySequence( tr( "Alt+A" ) ) );
 
     dialogLayout->add( LayoutWidget );
 
-    connect( m_btnAnnotate, SIGNAL(clicked()),
-             this, SLOT(slotNewAnnotate()) );
-    connect( m_leRevision, SIGNAL( returnPressed() ), 
-             m_btnAnnotate, SLOT( setFocus() ) );
+    connect( m_btnAnnotate, TQT_SIGNAL(clicked()),
+             this, TQT_SLOT(slotNewAnnotate()) );
+    connect( m_leRevision, TQT_SIGNAL( returnPressed() ), 
+             m_btnAnnotate, TQT_SLOT( setFocus() ) );
 
     //Nest create the AnnotateView; it will do the actual displaying
     m_annotateView = new AnnotateView(this, "annotateview");
@@ -76,7 +76,7 @@ AnnotatePage::~AnnotatePage()
     delete m_cvsAnnotateJob;
 }
 
-void AnnotatePage::startAnnotate( const QString pathName, const QString revision )
+void AnnotatePage::startAnnotate( const TQString pathName, const TQString revision )
 {
     kdDebug(9006) << "AnnotatePage::startAnnotate() pathName = " << pathName << 
         "revision = " << revision << endl;
@@ -90,7 +90,7 @@ void AnnotatePage::startAnnotate( const QString pathName, const QString revision
 
     // establish connections to the signals of the cvs m_job
     connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true );
-    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true );
+    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true );
 
     //clear both the outputbuffer and the AnnotateView
     m_output = "";
@@ -111,19 +111,19 @@ void AnnotatePage::slotJobExited( bool normalExit, int exitStatus )
     }
 
     //split the collected output and pass the lines to the parser function
-    QStringList lines = QStringList::split("\n", m_output);
+    TQStringList lines = TQStringList::split("\n", m_output);
     parseAnnotateOutput(lines);
 }
 
-void AnnotatePage::slotReceivedOutput( QString someOutput )
+void AnnotatePage::slotReceivedOutput( TQString someOutput )
 {
-    kdDebug(9006) << "AnnotatePage::slotReceivedOutput(QString)" << endl;
+    kdDebug(9006) << "AnnotatePage::slotReceivedOutput(TQString)" << endl;
     m_output += someOutput;
 }
 
-void AnnotatePage::slotReceivedErrors( QString )
+void AnnotatePage::slotReceivedErrors( TQString )
 {
-    kdDebug(9006) << "AnnotatePage::slotReceivedErrors(QString)" << endl;
+    kdDebug(9006) << "AnnotatePage::slotReceivedErrors(TQString)" << endl;
 }
 
 void AnnotatePage::cancel()
@@ -132,22 +132,22 @@ void AnnotatePage::cancel()
         m_cvsAnnotateJob->cancel();
 }
 
-void AnnotatePage::parseAnnotateOutput(QStringList& lines)
+void AnnotatePage::parseAnnotateOutput(TQStringList& lines)
 {
-    kdDebug(9006) << "AnnotatePage::parseAnnotateOutput(QStringList)" << endl;
+    kdDebug(9006) << "AnnotatePage::parseAnnotateOutput(TQStringList)" << endl;
 
     /**
      * First we need to parse the output of "cvs log" which the dcop-interface delivers
      * everytime annotate is requested.
-     * The QMap m_comments stores the revisions together with the matching comments.
+     * The TQMap m_comments stores the revisions together with the matching comments.
      * The comments will be passed to the AnnotateView in order to display them as QToolTip
      */
-    QString line, comment, rev;
+    TQString line, comment, rev;
 
     enum { Begin, Tags, Admin, Revision,
            Author, Branches, Comment, Finished } state;
 
-    QStringList::Iterator it = lines.begin();
+    TQStringList::Iterator it = lines.begin();
     state = Begin;
     do
     {
@@ -187,7 +187,7 @@ void AnnotatePage::parseAnnotateOutput(QStringList& lines)
                 else if( line == "=============================================================================" )
                     state = Finished;
                 if( state == Comment )
-                    comment += QString("\n") + line;
+                    comment += TQString("\n") + line;
                 else
                     m_comments[rev] = comment;
                 break;
@@ -214,18 +214,18 @@ void AnnotatePage::parseAnnotateOutput(QStringList& lines)
     }
     ++it;
 
-    QString author, content;
-    QString oldRevision = ""; //we always store the last revision to recognice...
+    TQString author, content;
+    TQString oldRevision = ""; //we always store the last revision to recognice...
     bool changeColor = false; //...when the AnnotateView needs to change the coloring
-    QDateTime logDate;
+    TQDateTime logDate;
 
     do
     {
         line  = *it;
 
         //the log date should be printed according to the user's global setting
-        //so we pass it as QDateTime to the AnnotateView below
-        QString dateString = line.mid(23, 9);
+        //so we pass it as TQDateTime to the AnnotateView below
+        TQString dateString = line.mid(23, 9);
         if( !dateString.isEmpty() )
             logDate.setTime_t(KRFCDate::parseDate(dateString), Qt::UTC);
 
diff --git a/vcs/cvsservice/annotatepage.h b/vcs/cvsservice/annotatepage.h
index 2a062804..b6a52b66 100644
--- a/vcs/cvsservice/annotatepage.h
+++ b/vcs/cvsservice/annotatepage.h
@@ -13,9 +13,9 @@
 #define ANNOTATEPAGE_H
 
 #include "cvsservicedcopIface.h"
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 class CvsJob_stub;
 class CvsService_stub;
@@ -34,7 +34,7 @@ class KPushButton;
  *
  * @author Robert Gruber 
  */
-class AnnotatePage : public QWidget, virtual public CVSServiceDCOPIface
+class AnnotatePage : public TQWidget, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
 
@@ -42,7 +42,7 @@ class AnnotatePage : public QWidget, virtual public CVSServiceDCOPIface
     friend class AnnotateView;
 
 public:
-    AnnotatePage( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 );
+    AnnotatePage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
     virtual ~AnnotatePage();
 
     /**
@@ -50,7 +50,7 @@ public:
      * @param pathName The filename to annotate
      * @param revision The CVS revision number
      */
-    void startAnnotate( const QString pathName, const QString revision="" );
+    void startAnnotate( const TQString pathName, const TQString revision="" );
 
     /**
      * Cancels the current operation if any
@@ -64,13 +64,13 @@ signals:
      * a new page with the annotate output for the given revision.
      * @param rev The revision for which a new annotate run is requested
      */
-    void requestAnnotate(const QString rev);
+    void requestAnnotate(const TQString rev);
 
 private slots:
     // DCOP Iface
     virtual void slotJobExited( bool normalExit, int exitStatus );
-    virtual void slotReceivedOutput( QString someOutput );
-    virtual void slotReceivedErrors( QString someErrors );
+    virtual void slotReceivedOutput( TQString someOutput );
+    virtual void slotReceivedErrors( TQString someErrors );
 
     /**
      * This slot is connected to the button next to m_leRevision.
@@ -84,7 +84,7 @@ private:
      * This method is executed after the cvs annotate job finished.
      * It parses the output and passes it to the AnnotateView
      */
-    void parseAnnotateOutput(QStringList& lines);
+    void parseAnnotateOutput(TQStringList& lines);
 
 
     /**
@@ -92,7 +92,7 @@ private:
      * Everytime slotReceivedOutput() is called by dcop
      * we append the gained data to this buffer.
      */
-    QString m_output;
+    TQString m_output;
     /**
      * This is the AnnotateView. It gets nested into this page.
      */
@@ -100,11 +100,11 @@ private:
     /**
      * The file for which this page holds the annotate output.
      */
-    QString m_pathName;
+    TQString m_pathName;
     /**
      * Maps the checkin comments to revision numbers
      */
-    QMap  m_comments;
+    TQMap  m_comments;
 
     /**
      * With this KLineEdit and the KPushButton next to it
diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp
index 93a2a46d..afc185cd 100644
--- a/vcs/cvsservice/annotateview.cpp
+++ b/vcs/cvsservice/annotateview.cpp
@@ -15,9 +15,9 @@
 
 #include "annotateview.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -32,21 +32,21 @@ class AnnotateViewItem : public QListViewItem
 public:
     enum { LineNumberColumn, AuthorColumn, DateColumn,ContentColumn };
 
-    AnnotateViewItem(AnnotateView *parent, QString rev, QString author, 
-            QDateTime date, QString content, QString comment, 
+    AnnotateViewItem(AnnotateView *parent, TQString rev, TQString author, 
+            TQDateTime date, TQString content, TQString comment, 
             bool odd, int linenumber);
 
-    virtual int compare(QListViewItem *item, int col, bool ascending) const;
-    virtual int width(const QFontMetrics &, const QListView *, int col) const;
-    virtual QString text(int col) const;
-    virtual void paintCell(QPainter *, const QColorGroup &, int, int, int);
+    virtual int compare(TQListViewItem *item, int col, bool ascending) const;
+    virtual int width(const TQFontMetrics &, const TQListView *, int col) const;
+    virtual TQString text(int col) const;
+    virtual void paintCell(TQPainter *, const TQColorGroup &, int, int, int);
 
 private:
-    QString m_revision;
-    QString m_author;
-    QString m_content;
-    QString m_comment;
-    QDateTime m_logDate;
+    TQString m_revision;
+    TQString m_author;
+    TQString m_content;
+    TQString m_comment;
+    TQDateTime m_logDate;
     bool m_odd;
     int m_lineNumber;
 
@@ -57,10 +57,10 @@ private:
 const int AnnotateViewItem::BORDER = 4;
 
 
-AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, QString rev, 
-    QString author, QDateTime date, QString content, QString comment, 
+AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, TQString rev, 
+    TQString author, TQDateTime date, TQString content, TQString comment, 
     bool odd, int linenumber)
-    : QListViewItem(parent)
+    : TQListViewItem(parent)
     , m_revision(rev)
     , m_author(author)
     , m_content(content)
@@ -71,7 +71,7 @@ AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, QString rev,
 {}
 
 
-int AnnotateViewItem::compare(QListViewItem *item, int, bool) const
+int AnnotateViewItem::compare(TQListViewItem *item, int, bool) const
 {
     int linenum1 = m_lineNumber;
     int linenum2 = static_cast(item)->m_lineNumber;
@@ -80,14 +80,14 @@ int AnnotateViewItem::compare(QListViewItem *item, int, bool) const
 }
 
 
-QString AnnotateViewItem::text(int col) const
+TQString AnnotateViewItem::text(int col) const
 {
     switch (col)
     {
     case LineNumberColumn:
-        return QString::number(m_lineNumber);
+        return TQString::number(m_lineNumber);
     case AuthorColumn:
-        return (m_revision + QChar(' ') + m_author);
+        return (m_revision + TQChar(' ') + m_author);
     case DateColumn:
         return KGlobal::locale()->formatDate(m_logDate.date(), true);
     case ContentColumn:
@@ -96,13 +96,13 @@ QString AnnotateViewItem::text(int col) const
         ;
     };
 
-    return QString::null;
+    return TQString::null;
 }
 
 
-void AnnotateViewItem::paintCell(QPainter *p, const QColorGroup &, int col, int width, int align)
+void AnnotateViewItem::paintCell(TQPainter *p, const TQColorGroup &, int col, int width, int align)
 {
-    QColor backgroundColor;
+    TQColor backgroundColor;
 
     switch (col)
     {
@@ -119,7 +119,7 @@ void AnnotateViewItem::paintCell(QPainter *p, const QColorGroup &, int col, int
 
     p->fillRect(0, 0, width, height(), backgroundColor);
 
-    QString str = text(col);
+    TQString str = text(col);
     if (str.isEmpty())
         return;
 
@@ -130,7 +130,7 @@ void AnnotateViewItem::paintCell(QPainter *p, const QColorGroup &, int col, int
 }
 
 
-int AnnotateViewItem::width(const QFontMetrics &fm, const QListView *, int col) const
+int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col) const
 {
     return fm.width(text(col)) + 2*BORDER;
 }
@@ -141,43 +141,43 @@ int AnnotateViewItem::width(const QFontMetrics &fm, const QListView *, int col)
 /******************************************************************************/
 
 AnnotateView::AnnotateView(AnnotatePage *parent, const char *name)
-    : KListView(parent, name), QToolTip( viewport() ), 
+    : KListView(parent, name), TQToolTip( viewport() ), 
     m_page(parent)
 {
-    setFrameStyle(QFrame::WinPanel | QFrame::Sunken);
+    setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
     setAllColumnsShowFocus(true);
     setShowToolTips(false);
     header()->hide();
 
-    addColumn(QString::null);
-    addColumn(QString::null);
-    addColumn(QString::null);
-    addColumn(QString::null);
+    addColumn(TQString::null);
+    addColumn(TQString::null);
+    addColumn(TQString::null);
+    addColumn(TQString::null);
 
     setSorting(AnnotateViewItem::LineNumberColumn);
     setColumnAlignment(AnnotateViewItem::LineNumberColumn, Qt::AlignRight);
 
-    connect( this, SIGNAL(executed(QListViewItem*)),
-             this, SLOT(itemClicked(QListViewItem*)) );
+    connect( this, TQT_SIGNAL(executed(TQListViewItem*)),
+             this, TQT_SLOT(itemClicked(TQListViewItem*)) );
 }
 
 
-void AnnotateView::addLine(QString rev, QString author, QDateTime date, 
-        QString content, QString comment, bool odd)
+void AnnotateView::addLine(TQString rev, TQString author, TQDateTime date, 
+        TQString content, TQString comment, bool odd)
 {
     new AnnotateViewItem(this, rev, author, date, content, comment, 
             odd, childCount()+1);
 }
 
 
-QSize AnnotateView::sizeHint() const
+TQSize AnnotateView::sizeHint() const
 {
-    QFontMetrics fm(fontMetrics());
-    return QSize(100 * fm.width("0"), 20 * fm.lineSpacing());
+    TQFontMetrics fm(fontMetrics());
+    return TQSize(100 * fm.width("0"), 20 * fm.lineSpacing());
 }
 
 
-void AnnotateView::maybeTip( const QPoint & p )
+void AnnotateView::maybeTip( const TQPoint & p )
 {
     AnnotateViewItem * item = dynamic_cast( itemAt( p ) );
     if (!item)
@@ -189,9 +189,9 @@ void AnnotateView::maybeTip( const QPoint & p )
         return;
     }
 
-    QRect r = itemRect( item );
+    TQRect r = itemRect( item );
     //get the dimension of the author + the date column
-    QRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn);
+    TQRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn);
     headerRect = headerRect.unite(header()->sectionRect(AnnotateViewItem::DateColumn));
 
     r.setLeft(headerRect.left());
@@ -205,7 +205,7 @@ void AnnotateView::maybeTip( const QPoint & p )
     }
 }
 
-void AnnotateView::itemClicked(QListViewItem *item)
+void AnnotateView::itemClicked(TQListViewItem *item)
 {
     kdDebug(9006) << "itemClicked()" << endl;
 
diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h
index 6c9cded9..4e05930b 100644
--- a/vcs/cvsservice/annotateview.h
+++ b/vcs/cvsservice/annotateview.h
@@ -18,7 +18,7 @@
 
 
 #include 
-#include 
+#include 
 
 class QDateTime;
 class AnnotatePage;
@@ -38,17 +38,17 @@ public:
 
     explicit AnnotateView(AnnotatePage *parent, const char *name=0 );
 
-    void addLine(QString rev, QString author, QDateTime date, QString content, 
-            QString comment, bool odd);
+    void addLine(TQString rev, TQString author, TQDateTime date, TQString content, 
+            TQString comment, bool odd);
 
-    virtual QSize sizeHint() const;
-    void maybeTip( const QPoint & p );
+    virtual TQSize sizeHint() const;
+    void maybeTip( const TQPoint & p );
 
 private:
     AnnotatePage * m_page;
 
 public slots:
-    void itemClicked(QListViewItem *item);
+    void itemClicked(TQListViewItem *item);
 };
 
 
diff --git a/vcs/cvsservice/bufferedstringreader.cpp b/vcs/cvsservice/bufferedstringreader.cpp
index 5c2151fc..bdaa26f3 100644
--- a/vcs/cvsservice/bufferedstringreader.cpp
+++ b/vcs/cvsservice/bufferedstringreader.cpp
@@ -27,16 +27,16 @@ BufferedStringReader::~BufferedStringReader()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QStringList BufferedStringReader::process( const QString &otherChars )
+TQStringList BufferedStringReader::process( const TQString &otherChars )
 {
     // Add to previous buffered chars
     m_stringBuffer += otherChars;
-    QStringList strings;
+    TQStringList strings;
     // Now find all the basic strings in the buffer
     int pos;
     while ( (pos = m_stringBuffer.find('\n')) != -1)
     {
-        QString line = m_stringBuffer.left( pos );
+        TQString line = m_stringBuffer.left( pos );
         if (!line.isEmpty())
         {
             strings.append( line );
diff --git a/vcs/cvsservice/bufferedstringreader.h b/vcs/cvsservice/bufferedstringreader.h
index 1f96c0d1..6f34ed4c 100644
--- a/vcs/cvsservice/bufferedstringreader.h
+++ b/vcs/cvsservice/bufferedstringreader.h
@@ -12,7 +12,7 @@
 #ifndef BUFFEREDSTRINGREADER_H
 #define BUFFEREDSTRINGREADER_H
 
-#include 
+#include 
 
 class CvsServicePart;
 class KConfig;
@@ -36,9 +36,9 @@ public:
     * as many '\n'-terminated strings as found.
     * @param otherChars additional chars to be added to the buffer
     */
-    QStringList process( const QString &otherChars );
+    TQStringList process( const TQString &otherChars );
 private:
-    QString m_stringBuffer;
+    TQString m_stringBuffer;
 };
 
 #endif  // BUFFEREDSTRINGREADER_H
diff --git a/vcs/cvsservice/changelog.cpp b/vcs/cvsservice/changelog.cpp
index a63a2b92..1e676f43 100644
--- a/vcs/cvsservice/changelog.cpp
+++ b/vcs/cvsservice/changelog.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -24,7 +24,7 @@ ChangeLogEntry::ChangeLogEntry()
     authorEmail = emailConfig.getSetting( KEMailSettings::EmailAddress );
     authorName = emailConfig.getSetting( KEMailSettings::RealName );
 
-    QDate currDate = QDate::currentDate();
+    TQDate currDate = TQDate::currentDate();
     date = currDate.toString( "yyyy-MM-dd" );
 }
 
@@ -32,38 +32,38 @@ ChangeLogEntry::~ChangeLogEntry()
 {
 }
 
-void ChangeLogEntry::addLine( const QString &aLine )
+void ChangeLogEntry::addLine( const TQString &aLine )
 {
     lines << aLine;
 }
 
-void ChangeLogEntry::addLines( const QStringList &someLines )
+void ChangeLogEntry::addLines( const TQStringList &someLines )
 {
     lines += someLines;
 }
 
-void streamCopy( QTextStream &is, QTextStream &os )
+void streamCopy( TQTextStream &is, TQTextStream &os )
 {
     while (!is.eof())
         os << is.readLine() << "\n";  // readLine() eats '\n' !!
 }
 
-void ChangeLogEntry::addToLog( const QString &logFilePath, const bool prepend, const QString &startLineString )
+void ChangeLogEntry::addToLog( const TQString &logFilePath, const bool prepend, const TQString &startLineString )
 {
     if (prepend) // add on head
     {
-        QString fakeLogFilePath = logFilePath + ".fake";
+        TQString fakeLogFilePath = logFilePath + ".fake";
 
-        QFile fakeFile( fakeLogFilePath );
-        QFile changeLogFile( logFilePath );
+        TQFile fakeFile( fakeLogFilePath );
+        TQFile changeLogFile( logFilePath );
         {
             if (!fakeFile.open( IO_WriteOnly | IO_Append))
                 return;
 
             if (changeLogFile.open( IO_ReadOnly )) // A Changelog already exist
             {
-                QTextStream is( &changeLogFile );
-                QTextStream os( &fakeFile );
+                TQTextStream is( &changeLogFile );
+                TQTextStream os( &fakeFile );
 
                 // Put current entry
                 os << toString( startLineString );
@@ -72,7 +72,7 @@ void ChangeLogEntry::addToLog( const QString &logFilePath, const bool prepend, c
             }
             else // ChangeLog doesn't exist: just write our entry
             {
-                QTextStream t( &fakeFile );
+                TQTextStream t( &fakeFile );
                 t << toString( startLineString );
             }
             fakeFile.close();
@@ -85,8 +85,8 @@ void ChangeLogEntry::addToLog( const QString &logFilePath, const bool prepend, c
 
         if (changeLogFile.open( IO_WriteOnly ))
         {
-            QTextStream os( &changeLogFile );
-            QTextStream is( &fakeFile );
+            TQTextStream os( &changeLogFile );
+            TQTextStream is( &fakeFile );
 
             // Write the rest of the change log file
             streamCopy( is, os );
@@ -97,18 +97,18 @@ void ChangeLogEntry::addToLog( const QString &logFilePath, const bool prepend, c
     }
     else // add on tail
     {
-        QFile f( logFilePath );
+        TQFile f( logFilePath );
         if (!f.open( IO_WriteOnly | IO_Append))
             return;
 
-        QTextStream t( &f );
+        TQTextStream t( &f );
         t << toString( startLineString );
     }
 }
 
-QString ChangeLogEntry::toString( const QString &startLineString ) const
+TQString ChangeLogEntry::toString( const TQString &startLineString ) const
 {
-    QString header = date + " " + authorName + " <" + authorEmail + ">\n";
+    TQString header = date + " " + authorName + " <" + authorEmail + ">\n";
 
     return header + startLineString + lines.join( "\n" + startLineString ) + "\n\n";
 }
diff --git a/vcs/cvsservice/changelog.h b/vcs/cvsservice/changelog.h
index 3d512f95..a1b50ffa 100644
--- a/vcs/cvsservice/changelog.h
+++ b/vcs/cvsservice/changelog.h
@@ -12,7 +12,7 @@
 #ifndef CHANGELOG_H
 #define CHANGELOG_H
 
-#include 
+#include 
 
 /**
 A class which abstracts the building of an entry in the ChangeLog file (it formats name, e-mail and text).
@@ -26,20 +26,20 @@ public:
     ~ChangeLogEntry();
 
     //! Add a single line to the lines for this entry
-    void addLine( const QString &aLine );
+    void addLine( const TQString &aLine );
     //! Add a bunch of lines for this entry
-    void addLines( const QStringList &someLines );
+    void addLines( const TQStringList &someLines );
     //! Pretty format for this entry: you may insert a line tag (such as tab ("\t") or 4 spaces ("    ")
     //! or whatever you want (such as "\t * ")
-    QString toString( const QString &startLineString = QString::null ) const;
+    TQString toString( const TQString &startLineString = TQString::null ) const;
     //! Once the entry is completed one would like to write on a file! (You may add on start of file
     //! prepend == true, or append on tail (prepend == false)
-    void addToLog( const QString &logFilePath, const bool prepend = true, const QString &startLineString = "\t" );
+    void addToLog( const TQString &logFilePath, const bool prepend = true, const TQString &startLineString = "\t" );
 
-    QString authorName,
+    TQString authorName,
         authorEmail,
         date;
-    QStringList lines;
+    TQStringList lines;
 };
 
 #endif
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp
index 7fb9455c..82c64052 100644
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -38,7 +38,7 @@
 // Constants
 ///////////////////////////////////////////////////////////////////////////////
 
-const QString SSS( ":" );  // Server String Separator :)
+const TQString SSS( ":" );  // Server String Separator :)
 
 ///////////////////////////////////////////////////////////////////////////////
 // class ModuleListViewItem
@@ -48,19 +48,19 @@ class ModuleListViewItem : public KListViewItem
 {
 public:
     ModuleListViewItem( KListView *listview,
-        const QString &moduleAlias, const QString &moduleRealPath )
+        const TQString &moduleAlias, const TQString &moduleRealPath )
         : KListViewItem( listview )
     {
         setAlias( moduleAlias );
         setRealPath( moduleRealPath );
     }
 
-    void setAlias( const QString &aName ) { setText( 0, aName); }
-    QString alias() const { return text(0); }
-    void setRealPath( const QString &aRealPath ) { setText(1, aRealPath); }
-    QString realPath() const { return text(1); }
+    void setAlias( const TQString &aName ) { setText( 0, aName); }
+    TQString alias() const { return text(0); }
+    void setRealPath( const TQString &aRealPath ) { setText(1, aRealPath); }
+    TQString realPath() const { return text(1); }
 
-//    virtual QString text() const { return name(); }
+//    virtual TQString text() const { return name(); }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -68,7 +68,7 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 
 CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService,
-    QWidget *parent, const char *name, WFlags ) :
+    TQWidget *parent, const char *name, WFlags ) :
     DCOPObject( "CheckoutDialogDCOPIface" ),
     KDialogBase( parent, name? name : "checkoutdialog", true, i18n("CVS Checkout"),
         Ok | Cancel, Ok, true ),
@@ -77,10 +77,10 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService,
     m_base = new CheckoutDialogBase( this, "checkoutdialogbase" );
     setMainWidget( m_base );
 
-    connect( m_base->fetchModulesButton, SIGNAL(clicked()),
-        this, SLOT(slotFetchModulesList()) );
-    connect( m_base->modulesListView, SIGNAL(executed(QListViewItem*)),
-        this, SLOT(slotModuleSelected(QListViewItem*)) );
+    connect( m_base->fetchModulesButton, TQT_SIGNAL(clicked()),
+        this, TQT_SLOT(slotFetchModulesList()) );
+    connect( m_base->modulesListView, TQT_SIGNAL(executed(TQListViewItem*)),
+        this, TQT_SLOT(slotModuleSelected(TQListViewItem*)) );
 
     // Avoid displaying 'file:/' when displaying the file
     m_base->workURLRequester->setShowLocalProtocol( false );
@@ -91,7 +91,7 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService,
 	// And suggest to use the default projects dir set in KDevelop's preferences
     KConfig *config = kapp->config();
 	config->setGroup("General Options");
-    QString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", QDir::homeDirPath()+"/");
+    TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/");
 	setWorkDir( defaultProjectsDir );
 }
 
@@ -104,28 +104,28 @@ CheckoutDialog::~CheckoutDialog()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CheckoutDialog::serverPath() const
+TQString CheckoutDialog::serverPath() const
 {
 	return m_base->serverPaths->currentText();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CheckoutDialog::fillServerPaths( const QStringList &serverPaths )
+void CheckoutDialog::fillServerPaths( const TQStringList &serverPaths )
 {
     m_base->serverPaths->insertStringList( serverPaths );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CheckoutDialog::workDir() const
+TQString CheckoutDialog::workDir() const
 {
     return m_base->workURLRequester->url();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CheckoutDialog::setWorkDir( const QString &aDir )
+void CheckoutDialog::setWorkDir( const TQString &aDir )
 {
     m_base->workURLRequester->setURL( aDir );
 }
@@ -139,14 +139,14 @@ bool CheckoutDialog::pruneDirs() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CheckoutDialog::tag() const
+TQString CheckoutDialog::tag() const
 {
     return m_base->tagEdit->text();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CheckoutDialog::module() const
+TQString CheckoutDialog::module() const
 {
     return m_base->moduleEdit->text();
 }
@@ -168,7 +168,7 @@ void CheckoutDialog::slotFetchModulesList()
     // We only need to know when it finishes and then will grab the output
     // by using m_job->output() :-)
     connectDCOPSignal( job.app(), job.obj(), "jobFinished(bool,int)", "slotJobExited(bool,int)", true );
-    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "receivedOutput(QString)", true );
+    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "receivedOutput(TQString)", true );
 
     kdDebug() << "Running: " << m_job->cvsCommand() << endl;
     m_job->execute();
@@ -187,35 +187,35 @@ void CheckoutDialog::slotJobExited( bool /*normalExit*/, int /*exitStatus*/ )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CheckoutDialog::slotReceivedOutput( QString someOutput )
+void CheckoutDialog::slotReceivedOutput( TQString someOutput )
 {
     kdDebug( 9006 ) << " Received output: " << someOutput << endl;
 
     setCursor( KCursor::arrowCursor() );
 
     // Fill the modules KListView if the list obtained is not empty
-    // QStringList modules = m_job->output();
-    QStringList modules = QStringList::split( "\n", someOutput );
+    // TQStringList modules = m_job->output();
+    TQStringList modules = TQStringList::split( "\n", someOutput );
     if (modules.count() <= 0)
         return;
 
-    QStringList::iterator it = modules.begin();
+    TQStringList::iterator it = modules.begin();
     for ( ; it != modules.end(); ++it )
     {
-        QStringList l = QStringList::split( " ", (*it) );
+        TQStringList l = TQStringList::split( " ", (*it) );
         // Now, l[0] is the module name, l[1] is ... another string ;-)
         new ModuleListViewItem( m_base->modulesListView, l[0], l[1] );
     }
 }
 
-void CheckoutDialog::slotReceivedErrors( QString someErrors )
+void CheckoutDialog::slotReceivedErrors( TQString someErrors )
 {
 	kdDebug( 9006 ) << " Received errors: " << someErrors << endl;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CheckoutDialog::slotModuleSelected( QListViewItem * )
+void CheckoutDialog::slotModuleSelected( TQListViewItem * )
 {
 	ModuleListViewItem *aModuleItem = static_cast(
 		m_base->modulesListView->selectedItem()
@@ -230,21 +230,21 @@ void CheckoutDialog::slotModuleSelected( QListViewItem * )
 
 void CheckoutDialog::fetchUserCvsRepositories()
 {
-	QStringList repositories;
+	TQStringList repositories;
 
-	QFile cvspass( QDir::homeDirPath() + QDir::separator() + ".cvspass" );
+	TQFile cvspass( TQDir::homeDirPath() + TQDir::separator() + ".cvspass" );
 	if (!cvspass.open( IO_ReadOnly ))
 		return;
-	QByteArray data = cvspass.readAll();
+	TQByteArray data = cvspass.readAll();
 	cvspass.close();
 
-	QTextIStream istream( data );
+	TQTextIStream istream( data );
 	// Entries are like:
 	// /1 :pserver:marios@cvs.kde.org:2401/home/kde Ahz:UIK?=d ?
 	// /1 :pserver:mario@xamel:2401/home/cvsroot aJT_d'K?=d ?
 	while (!istream.eof()) {
-		QString line = istream.readLine();
-		QStringList lineElements = QStringList::split( " ", line );
+		TQString line = istream.readLine();
+		TQStringList lineElements = TQStringList::split( " ", line );
 		if (lineElements.count() > 1) {
 			repositories << lineElements[ 1 ];
 		}
@@ -257,9 +257,9 @@ void CheckoutDialog::fetchUserCvsRepositories()
 
 void CheckoutDialog::slotOk()
 {
-	QString errorMessage = QString::null;
+	TQString errorMessage = TQString::null;
 
-	if (!(workDir().length() > 0) && QFile::exists( workDir() ))
+	if (!(workDir().length() > 0) && TQFile::exists( workDir() ))
 		errorMessage = i18n( "Please, choose a valid working directory" );
 	else if (!(serverPath().length() > 0))
 		errorMessage = i18n( "Please, choose a CVS server." );
diff --git a/vcs/cvsservice/checkoutdialog.h b/vcs/cvsservice/checkoutdialog.h
index 597a806a..a44ef397 100644
--- a/vcs/cvsservice/checkoutdialog.h
+++ b/vcs/cvsservice/checkoutdialog.h
@@ -31,7 +31,7 @@ class CheckoutDialog : public KDialogBase, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
 public:
-    CheckoutDialog( CvsService_stub *cvsService, QWidget *parent = 0,
+    CheckoutDialog( CvsService_stub *cvsService, TQWidget *parent = 0,
         const char *name = 0, WFlags f = 0 );
     virtual ~CheckoutDialog();
 
@@ -40,23 +40,23 @@ public:
     /**
     * @return a server path string (i.e. :pserver:marios@cvs.kde.org:/home/kde)
     */
-    QString serverPath() const;
+    TQString serverPath() const;
     /**
     * @param serverPaths a list of server location to use when filling the widget
     */
-	void fillServerPaths( const QStringList &serverPaths );
+	void fillServerPaths( const TQStringList &serverPaths );
     /**
     * @return the directory which the user has fetched the module in
     */
-    QString workDir() const;
+    TQString workDir() const;
     /**
     * @param aDir directory which fetched modules will be put in (ending with '/')
     */
-    void setWorkDir( const QString &aDir );
+    void setWorkDir( const TQString &aDir );
     /**
     * @return the module the user has chosen to check-out from repository
     */
-    QString module() const;
+    TQString module() const;
     /**
     * @return
     */
@@ -64,15 +64,15 @@ public:
     /**
     * @return
     */
-    QString tag() const;
+    TQString tag() const;
 
 private slots:
-    void slotModuleSelected( QListViewItem *item );
+    void slotModuleSelected( TQListViewItem *item );
     void slotFetchModulesList();
     // DCOP Iface
     virtual void slotJobExited( bool normalExit, int exitStatus );
-    virtual void slotReceivedOutput( QString someOutput );
-    virtual void slotReceivedErrors( QString someErrors );
+    virtual void slotReceivedOutput( TQString someOutput );
+    virtual void slotReceivedErrors( TQString someErrors );
 
 private:
 	/**
diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp
index 4c7eac97..a3988c06 100644
--- a/vcs/cvsservice/commitdlg.cpp
+++ b/vcs/cvsservice/commitdlg.cpp
@@ -11,11 +11,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -30,20 +30,20 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-CommitDialog::CommitDialog( const QString &changeLogfileNamePath,  QWidget *parent )
+CommitDialog::CommitDialog( const TQString &changeLogfileNamePath,  TQWidget *parent )
     : CommitDialogBase( parent, "commitdialog", true )
 {
-    connect( buttonOk, SIGNAL(clicked()), SLOT(accept()) );
-    connect( buttonCancel, SIGNAL(clicked()), SLOT(reject()) );
+    connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+    connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
 
     setChangeLogFileName( changeLogfileNamePath );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QStringList CommitDialog::logMessage() const
+TQStringList CommitDialog::logMessage() const
 {
-    QStringList textLines;
+    TQStringList textLines;
     for (int i=0; iparagraphs(); ++i)
     {
         textLines << textEdit->text( i );
@@ -72,19 +72,19 @@ void CommitDialog::accept()
             return;
         }
     }
-    QDialog::accept();
+    TQDialog::accept();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CommitDialog::setChangeLogFileName( const QString &fileName )
+void CommitDialog::setChangeLogFileName( const TQString &fileName )
 {
     changeLogNameEdit->setText( fileName );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CommitDialog::changeLogFileName() const
+TQString CommitDialog::changeLogFileName() const
 {
     return changeLogNameEdit->text();
 }
diff --git a/vcs/cvsservice/commitdlg.h b/vcs/cvsservice/commitdlg.h
index 3e98b269..e7ea4396 100644
--- a/vcs/cvsservice/commitdlg.h
+++ b/vcs/cvsservice/commitdlg.h
@@ -14,8 +14,8 @@
 #ifndef _COMMITDIALOG_H_
 #define _COMMITDIALOG_H_
 
-//#include 
-#include 
+//#include 
+#include 
 #include "commitdialogbase.h"
 
 class QTextEdit;
@@ -25,17 +25,17 @@ class CommitDialog : public CommitDialogBase
 {
     Q_OBJECT
 public:
-    CommitDialog( const QString &changeLogfileNamePath, QWidget *parent = 0 );
+    CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent = 0 );
 
     //! Returns the text of the log
-    QStringList logMessage() const;
+    TQStringList logMessage() const;
     //! Returns true if the user requests the log message to be added to the general
     //! Changelog file
     bool mustAddToChangeLog() const;
 
     //! We need to set it when showing the dialog and then when saving the file
-    void setChangeLogFileName( const QString &fileName );
-    QString changeLogFileName() const;
+    void setChangeLogFileName( const TQString &fileName );
+    TQString changeLogFileName() const;
 
 protected slots:
     //! Override: must check for message not being void.
diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp
index 12947b36..7777760a 100644
--- a/vcs/cvsservice/cvsdiffpage.cpp
+++ b/vcs/cvsservice/cvsdiffpage.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -33,15 +33,15 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 CVSDiffPage::CVSDiffPage( CvsService_stub *cvsService,
-    QWidget *parent, const char *name, int )
+    TQWidget *parent, const char *name, int )
 	// Leaving it anonymous let us to have multiple objects at the same time!
     : DCOPObject(), //  "CVSDiffPageDCOPIface"
-	QWidget( parent, name? name : "logformdialog" ),
+	TQWidget( parent, name? name : "logformdialog" ),
     m_diffText( 0 ), m_cvsService( cvsService ), m_cvsDiffJob( 0 )
 {
-    QLayout *thisLayout = new QVBoxLayout( this );
+    TQLayout *thisLayout = new TQVBoxLayout( this );
     // This should be replaced by the diff part
-//    m_diffText = new QTextEdit( this, "difftextedit" );
+//    m_diffText = new TQTextEdit( this, "difftextedit" );
 //    m_diffText->setReadOnly( true );
     m_diffText = new DiffWidget( this, "difftextedit" );
 
@@ -59,7 +59,7 @@ CVSDiffPage::~CVSDiffPage()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSDiffPage::startDiff( const QString &fileName, const QString &v1, const QString &v2 )
+void CVSDiffPage::startDiff( const TQString &fileName, const TQString &v1, const TQString &v2 )
 {
     kdDebug(9006) << "CVSDiffPage::startDiff()" << endl;
 
@@ -75,7 +75,7 @@ void CVSDiffPage::startDiff( const QString &fileName, const QString &v1, const Q
 
     kdDebug(9006) << "Running command : " << m_cvsDiffJob->cvsCommand() << endl;
     connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true );
-    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true );
+    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true );
     bool success = m_cvsDiffJob->execute();
     if (!success)
     {
@@ -91,7 +91,7 @@ void CVSDiffPage::slotJobExited( bool normalExit, int /*exitStatus*/ )
 
     if (normalExit)
     {
-        QString diffText = m_cvsDiffJob->output().join( "\n" );
+        TQString diffText = m_cvsDiffJob->output().join( "\n" );
         kdDebug(9006) << "*** Received: " << diffText << endl;
 //        m_diffText->setText( diffText );
         m_diffText->setDiff( m_diffString );
@@ -104,20 +104,20 @@ void CVSDiffPage::slotJobExited( bool normalExit, int /*exitStatus*/ )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSDiffPage::slotReceivedOutput( QString someOutput )
+void CVSDiffPage::slotReceivedOutput( TQString someOutput )
 {
-    kdDebug(9006) << "CVSDiffPage::slotReceivedOutput(QString)" << endl;
+    kdDebug(9006) << "CVSDiffPage::slotReceivedOutput(TQString)" << endl;
     kdDebug(9006) << "OUTPUT: " << someOutput << endl;
     
-    QStringList strings = m_outputBuffer.process(someOutput);
+    TQStringList strings = m_outputBuffer.process(someOutput);
     m_diffString += strings.join("\n");
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSDiffPage::slotReceivedErrors( QString someErrors )
+void CVSDiffPage::slotReceivedErrors( TQString someErrors )
 {
-    kdDebug(9006) << "CVSDiffPage::slotReceivedErrors(QString)" << endl;
+    kdDebug(9006) << "CVSDiffPage::slotReceivedErrors(TQString)" << endl;
     kdDebug(9006) << "ERRORS: " << someErrors << endl;
 }
 
diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h
index 16a6fec6..d9bbf36d 100644
--- a/vcs/cvsservice/cvsdiffpage.h
+++ b/vcs/cvsservice/cvsdiffpage.h
@@ -13,7 +13,7 @@
 #define CVSDIFFPAGE_H
 
 #include "cvsservicedcopIface.h"
-#include 
+#include 
 #include "bufferedstringreader.h"
 
 class CvsJob_stub;
@@ -26,27 +26,27 @@ Implementation for the form displaying 'cvs diff' output.
 
 @author KDevelop Authors
 */
-class CVSDiffPage : public QWidget, virtual public CVSServiceDCOPIface
+class CVSDiffPage : public TQWidget, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
 public:
-    CVSDiffPage( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 );
+    CVSDiffPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
     virtual ~CVSDiffPage();
 
-    void startDiff( const QString &fileName, const QString &v1, const QString &v2 );
+    void startDiff( const TQString &fileName, const TQString &v1, const TQString &v2 );
     void cancel();
 
 //private slots:
     // DCOP Iface
     virtual void slotJobExited( bool normalExit, int exitStatus );
-    virtual void slotReceivedOutput( QString someOutput );
-    virtual void slotReceivedErrors( QString someErrors );
+    virtual void slotReceivedOutput( TQString someOutput );
+    virtual void slotReceivedErrors( TQString someErrors );
 
 private:
-    //QTextEdit *m_diffText;
+    //TQTextEdit *m_diffText;
     DiffWidget *m_diffText;
     BufferedStringReader m_outputBuffer;
-    QString m_diffString;
+    TQString m_diffString;
 
     CvsService_stub *m_cvsService;
     CvsJob_stub *m_cvsDiffJob;
diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp
index 2b7602e6..28a4b566 100644
--- a/vcs/cvsservice/cvsdir.cpp
+++ b/vcs/cvsservice/cvsdir.cpp
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
+#include 
+#include 
 
 #include "cvsdir.h"
 
@@ -18,19 +18,19 @@
 // class CVSDir
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSDir::CVSDir() : QDir()
+CVSDir::CVSDir() : TQDir()
 {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSDir::CVSDir( const QDir &dir )
-    : QDir( dir )
+CVSDir::CVSDir( const TQDir &dir )
+    : TQDir( dir )
 {
     // We deal with absolute paths only
     convertToAbs();
 
-    m_cvsDir = absPath() + QDir::separator() + "CVS";
+    m_cvsDir = absPath() + TQDir::separator() + "CVS";
 
     if (isValid())
         refreshEntriesCache();
@@ -39,7 +39,7 @@ CVSDir::CVSDir( const QDir &dir )
 ///////////////////////////////////////////////////////////////////////////////
 
 CVSDir::CVSDir( const CVSDir &aCvsDir )
-    : QDir( aCvsDir )
+    : TQDir( aCvsDir )
 {
     *this = aCvsDir;
 }
@@ -50,7 +50,7 @@ CVSDir &CVSDir::operator=( const CVSDir &aCvsDir )
 {
     m_cvsDir = aCvsDir.m_cvsDir;
     m_cachedEntries = aCvsDir.m_cachedEntries;
-    QDir::operator=( aCvsDir );
+    TQDir::operator=( aCvsDir );
 
     return *this;
 }
@@ -66,54 +66,54 @@ CVSDir::~CVSDir()
 bool CVSDir::isValid() const
 {
     return exists() &&
-        QFile::exists( entriesFileName() ) &&
-        QFile::exists( rootFileName() ) &&
-        QFile::exists( repoFileName() );
+        TQFile::exists( entriesFileName() ) &&
+        TQFile::exists( rootFileName() ) &&
+        TQFile::exists( repoFileName() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSDir::entriesFileName() const
+TQString CVSDir::entriesFileName() const
 {
-    return m_cvsDir + QDir::separator()  + "Entries";
+    return m_cvsDir + TQDir::separator()  + "Entries";
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSDir::rootFileName() const
+TQString CVSDir::rootFileName() const
 {
-    return m_cvsDir + QDir::separator()  + "Root";
+    return m_cvsDir + TQDir::separator()  + "Root";
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSDir::repoFileName() const
+TQString CVSDir::repoFileName() const
 {
-    return m_cvsDir + QDir::separator()  + "Repository";
+    return m_cvsDir + TQDir::separator()  + "Repository";
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSDir::cvsIgnoreFileName() const
+TQString CVSDir::cvsIgnoreFileName() const
 {
-    return  absPath() + QDir::separator()  + ".cvsignore";
+    return  absPath() + TQDir::separator()  + ".cvsignore";
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSDir::repository() const
+TQString CVSDir::repository() const
 {
     // The content of CVS/Repository is a single line with the path into the
     // repository of the modules checked out in this directory (just like
     // "kdevelop/parts/cvsservice"): so we can read a single line of the file
     // and we are done!
-    QString content;
+    TQString content;
 
     if (!isValid())
-        return QString::null;
+        return TQString::null;
 
-    QByteArray bytes = cacheFile( repoFileName() );
-    QTextStream t( bytes, IO_ReadOnly );
+    TQByteArray bytes = cacheFile( repoFileName() );
+    TQTextStream t( bytes, IO_ReadOnly );
     content += t.readLine();
 
     return content;
@@ -121,18 +121,18 @@ QString CVSDir::repository() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSDir::root() const
+TQString CVSDir::root() const
 {
     // Same as CVSDir::repository() but CVS/Root contains the path of the
     // CVS server as used in "cvs -d " (in example:
     // ":pserver:marios@cvs.kde.org:/home/kde")
-    QString content;
+    TQString content;
 
     if (!isValid())
-        return QString::null;
+        return TQString::null;
 
-    QByteArray bytes = cacheFile( repoFileName() );
-    QTextStream t( bytes, IO_ReadOnly );
+    TQByteArray bytes = cacheFile( repoFileName() );
+    TQTextStream t( bytes, IO_ReadOnly );
     content += t.readLine();
 
     return content;
@@ -140,28 +140,28 @@ QString CVSDir::root() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QByteArray CVSDir::cacheFile( const QString &fileName )
+TQByteArray CVSDir::cacheFile( const TQString &fileName )
 {
-    QFile f( fileName );
+    TQFile f( fileName );
     if (!f.open( IO_ReadOnly ))
-        return QByteArray();
+        return TQByteArray();
     return f.readAll();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QStringList CVSDir::registeredEntryList() const
+TQStringList CVSDir::registeredEntryList() const
 {
-    QStringList l;
+    TQStringList l;
     if (!isValid())
         return l;
 
-    QByteArray bytes = cacheFile( entriesFileName() );
-    QTextStream t( bytes, IO_ReadOnly );
+    TQByteArray bytes = cacheFile( entriesFileName() );
+    TQTextStream t( bytes, IO_ReadOnly );
     CVSEntry entry;
     while (!t.eof())
     {
-        QString line = t.readLine();
+        TQString line = t.readLine();
         entry.parse( line, *this );
         if (entry.isValid())
             l.append( entry.fileName() );
@@ -171,7 +171,7 @@ QStringList CVSDir::registeredEntryList() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool CVSDir::isRegistered( const QString fileName ) const
+bool CVSDir::isRegistered( const TQString fileName ) const
 {
     CVSEntry entry = fileStatus( fileName );
     return entry.isValid() && entry.fileName() == fileName;
@@ -183,12 +183,12 @@ void CVSDir::refreshEntriesCache() const
 {
     m_cachedEntries.clear();
 
-    QByteArray bytes = cacheFile( entriesFileName() );
-    QTextStream t( bytes, IO_ReadOnly );
+    TQByteArray bytes = cacheFile( entriesFileName() );
+    TQTextStream t( bytes, IO_ReadOnly );
     CVSEntry entry;
     while (!t.eof())
     {
-        QString line = t.readLine();
+        TQString line = t.readLine();
         entry.parse( line, *this );
         if (entry.isValid())
             m_cachedEntries[ entry.fileName() ] = entry;
@@ -197,7 +197,7 @@ void CVSDir::refreshEntriesCache() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSEntry CVSDir::fileStatus( const QString &fileName, bool refreshCache ) const
+CVSEntry CVSDir::fileStatus( const TQString &fileName, bool refreshCache ) const
 {
     if (refreshCache)
         refreshEntriesCache();
@@ -212,19 +212,19 @@ CVSEntry CVSDir::fileStatus( const QString &fileName, bool refreshCache ) const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSDir::ignoreFile( const QString &fileName )
+void CVSDir::ignoreFile( const TQString &fileName )
 {
     if (!isValid())
         return;
 
-    QFile f( cvsIgnoreFileName() );
+    TQFile f( cvsIgnoreFileName() );
     if (!f.open( IO_ReadOnly))
         return;
 
-    QByteArray cachedFile = f.readAll();
-    QTextStream t( cachedFile, IO_ReadOnly | IO_WriteOnly );
+    TQByteArray cachedFile = f.readAll();
+    TQTextStream t( cachedFile, IO_ReadOnly | IO_WriteOnly );
 
-    QString readFileName;
+    TQString readFileName;
     bool found = false;
 
     while (!t.eof() && !found)
@@ -247,28 +247,28 @@ void CVSDir::ignoreFile( const QString &fileName )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSDir::doNotIgnoreFile( const QString &fileName )
+void CVSDir::doNotIgnoreFile( const TQString &fileName )
 {
     if (!isValid())
         return;
 
     // 1. Read all .ignore file in memory
-    QFile f( cvsIgnoreFileName() );
+    TQFile f( cvsIgnoreFileName() );
     if (!f.open( IO_ReadOnly ))
         return; // No .cvsignore file? Nothing to do then!
 
-    QByteArray cachedFile = f.readAll();
-    QTextIStream is( cachedFile );
+    TQByteArray cachedFile = f.readAll();
+    TQTextIStream is( cachedFile );
 
-    QByteArray cachedOutputFile;
-    QTextOStream os( cachedOutputFile );
+    TQByteArray cachedOutputFile;
+    TQTextOStream os( cachedOutputFile );
 
     bool removed = false;
     while (!is.eof())
     {
-        QString readLine = is.readLine();
+        TQString readLine = is.readLine();
         if (readLine != fileName)
-            os << readLine << "\n"; // QTextStream::readLine() eats the "\n" ...
+            os << readLine << "\n"; // TQTextStream::readLine() eats the "\n" ...
         else
             removed = true;
     }
@@ -288,11 +288,11 @@ VCSFileInfoMap CVSDir::dirStatus() const
 {
     VCSFileInfoMap vcsInfo;
     /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
-    QStringList entries = registeredEntryList();
-    QStringList::const_iterator it = entries.begin(), end = entries.end();
+    TQStringList entries = registeredEntryList();
+    TQStringList::const_iterator it = entries.begin(), end = entries.end();
     for ( ; it != end; ++it)
     {
-        const QString &fileName = (*it);
+        const TQString &fileName = (*it);
         const CVSEntry entry = fileStatus( fileName );
 
         vcsInfo.insert( fileName, entry.toVCSFileInfo() );
@@ -307,11 +307,11 @@ VCSFileInfoMap *CVSDir::cacheableDirStatus() const
 {
     VCSFileInfoMap *vcsInfo = new VCSFileInfoMap;
     /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
-    QStringList entries = registeredEntryList();
-    QStringList::const_iterator it = entries.begin(), end = entries.end();
+    TQStringList entries = registeredEntryList();
+    TQStringList::const_iterator it = entries.begin(), end = entries.end();
     for ( ; it != end; ++it)
     {
-        const QString &fileName = (*it);
+        const TQString &fileName = (*it);
         const CVSEntry entry = fileStatus( fileName );
 
         vcsInfo->insert( fileName, entry.toVCSFileInfo() );
diff --git a/vcs/cvsservice/cvsdir.h b/vcs/cvsservice/cvsdir.h
index 606f7507..bd745d3e 100644
--- a/vcs/cvsservice/cvsdir.h
+++ b/vcs/cvsservice/cvsdir.h
@@ -12,9 +12,9 @@
 #ifndef CVSDIR_H
 #define CVSDIR_H
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "cvsentry.h"
 
@@ -27,7 +27,7 @@ class CVSDir : public QDir
 {
 public:
     CVSDir();
-    CVSDir( const QDir &dir );
+    CVSDir( const TQDir &dir );
     explicit CVSDir( const CVSDir & );
     CVSDir &operator=( const CVSDir & );
     virtual ~CVSDir();
@@ -40,13 +40,13 @@ public:
     /**
     * Returns a list of all the files registered into repository
     */
-    QStringList registeredEntryList() const;
+    TQStringList registeredEntryList() const;
     /**
     * @param fileName is the file name (with no path info, just the file name!)
     * @param refreshCache update internal cache re-parsing "/CVS/Entries"
     * @return an empty CVSEntry if the file is not present
     */
-    CVSEntry fileStatus( const QString &fileName, bool refreshCache = false ) const;
+    CVSEntry fileStatus( const TQString &fileName, bool refreshCache = false ) const;
     /**
     */
     VCSFileInfoMap dirStatus() const;
@@ -54,49 +54,49 @@ public:
     /**
     * @return true if the file is registered into repository, false otherwise
     */
-    bool isRegistered( const QString fileName ) const;
+    bool isRegistered( const TQString fileName ) const;
     /**
     * Check if the specified @p fileName is in "/.cvsignore" and, if not,
     * append it.
     */
-    void ignoreFile( const QString &fileName );
+    void ignoreFile( const TQString &fileName );
     /**
     * Check if the specified @p fileName is in "/.cvsignore" and, if yes,
     * remove it.
     */
-    void doNotIgnoreFile( const QString &fileName );
+    void doNotIgnoreFile( const TQString &fileName );
     /**
     * @return the content of "/CVS/Repository"
     */
-    QString repository() const;
+    TQString repository() const;
     /**
     * @return the content of "/CVS/Root"
     */
-    QString root() const;
+    TQString root() const;
     /**
     * @return full path of "/CVS/Entries"
     */
-    QString entriesFileName() const;
+    TQString entriesFileName() const;
     /**
     * @return full path of "/CVS/Root"
     */
-    QString rootFileName() const;
+    TQString rootFileName() const;
     /**
     * @return full path of "/CVS/Repository"
     */
-    QString repoFileName() const;
+    TQString repoFileName() const;
     /**
     * @return full path of "/.cvsignore"
     */
-    QString cvsIgnoreFileName() const;
+    TQString cvsIgnoreFileName() const;
 
 private:
     void refreshEntriesCache() const;
-    static QByteArray cacheFile( const QString &fileName );
+    static TQByteArray cacheFile( const TQString &fileName );
 
-    QString m_cvsDir;
+    TQString m_cvsDir;
 
-    typedef QMap CVSEntriesCacheMap;
+    typedef TQMap CVSEntriesCacheMap;
     mutable CVSEntriesCacheMap m_cachedEntries;
 };
 
diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp
index ab8b2cc0..5db9710e 100644
--- a/vcs/cvsservice/cvsentry.cpp
+++ b/vcs/cvsservice/cvsentry.cpp
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
+#include 
+#include 
 
 #include "cvsentry.h"
 #include "cvsdir.h"
@@ -19,10 +19,10 @@
 // Static
 ///////////////////////////////////////////////////////////////////////////////
 
-const QString CVSEntry::invalidMarker = "";
-const QString CVSEntry::directoryMarker = "D";
-const QString CVSEntry::fileMarker = "";
-const QString CVSEntry::entrySeparator = "/";
+const TQString CVSEntry::invalidMarker = "";
+const TQString CVSEntry::directoryMarker = "D";
+const TQString CVSEntry::fileMarker = "";
+const TQString CVSEntry::entrySeparator = "/";
 
 ///////////////////////////////////////////////////////////////////////////////
 // class CVSEntry
@@ -35,7 +35,7 @@ CVSEntry::CVSEntry()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSEntry::CVSEntry( const QString &aLine, const CVSDir& dir )
+CVSEntry::CVSEntry( const TQString &aLine, const CVSDir& dir )
 {
     parse( aLine, dir );
 }
@@ -57,11 +57,11 @@ CVSEntry::EntryType CVSEntry::type() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSEntry::parse( const QString &aLine, const CVSDir& dir )
+void CVSEntry::parse( const TQString &aLine, const CVSDir& dir )
 {
     clean();
 
-    m_fields = QStringList::split( "/", aLine );
+    m_fields = TQStringList::split( "/", aLine );
 
     if (aLine.startsWith( entrySeparator )) // Is a file?
     {
@@ -70,7 +70,7 @@ void CVSEntry::parse( const QString &aLine, const CVSDir& dir )
     else if (aLine.startsWith( directoryMarker )) // Must be a directory then
     {
         m_type = directoryEntry; // Is a directory
-        m_fields.pop_front(); // QStringList::split() fills and empty item in head
+        m_fields.pop_front(); // TQStringList::split() fills and empty item in head
 	return;
     }
     else // What the hell is this? >:-)
@@ -80,9 +80,9 @@ void CVSEntry::parse( const QString &aLine, const CVSDir& dir )
     }
 
     //if we're a file, keep going
-    QDateTime entryFileDate(QDateTime::fromString(timeStamp()));
-    QDateTime realFileDate;
-    QFileInfo info(dir, m_fields[0]);
+    TQDateTime entryFileDate(TQDateTime::fromString(timeStamp()));
+    TQDateTime realFileDate;
+    TQFileInfo info(dir, m_fields[0]);
     realFileDate = info.lastModified();
 
     m_state = UpToDate;
@@ -95,9 +95,9 @@ void CVSEntry::parse( const QString &aLine, const CVSDir& dir )
         m_state = Conflict;
     else
     {
-        QDateTime date( QDateTime::fromString( timeStamp() ) );
-        QDateTime fileDateUTC;
-        fileDateUTC.setTime_t( QFileInfo(dir, fileName()).lastModified().toTime_t(), Qt::UTC );
+        TQDateTime date( TQDateTime::fromString( timeStamp() ) );
+        TQDateTime fileDateUTC;
+        fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), Qt::UTC );
         if ( date != fileDateUTC )
             m_state = Modified;
     }
@@ -105,52 +105,52 @@ void CVSEntry::parse( const QString &aLine, const CVSDir& dir )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSEntry::fileName() const
+TQString CVSEntry::fileName() const
 {
     if (type() != invalidEntry && m_fields.count() >= 1)
         return m_fields[0];
     else
-        return QString::null;
+        return TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSEntry::revision() const
+TQString CVSEntry::revision() const
 {
     if (type() != invalidEntry && m_fields.count() >= 2)
         return m_fields[1];
     else
-        return QString::null;
+        return TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSEntry::timeStamp() const
+TQString CVSEntry::timeStamp() const
 {
     if (type() != invalidEntry && m_fields.count() >= 3)
         return m_fields[2];
     else
-        return QString::null;
+        return TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSEntry::options() const
+TQString CVSEntry::options() const
 {
     if (type() != invalidEntry && m_fields.count() >= 4)
         return m_fields[3];
     else
-        return QString::null;
+        return TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSEntry::tag() const
+TQString CVSEntry::tag() const
 {
     if (type() != invalidEntry && m_fields.count() >= 5)
         return m_fields[4];
     else
-        return QString::null;
+        return TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/vcs/cvsservice/cvsentry.h b/vcs/cvsservice/cvsentry.h
index 1c3db926..9a2e4d6d 100644
--- a/vcs/cvsservice/cvsentry.h
+++ b/vcs/cvsservice/cvsentry.h
@@ -13,8 +13,8 @@
 #ifndef CVSENTRY_H
 #define CVSENTRY_H
 
-#include 
-#include 
+#include 
+#include 
 #include 
 
 class CVSDir;
@@ -25,32 +25,32 @@ public:
     enum EntryType { invalidEntry, fileEntry, directoryEntry };
     enum FileState { UpToDate, Modified, Added, Conflict, Removed, Unknown };
 
-    static const QString invalidMarker;
-    static const QString directoryMarker;
-    static const QString fileMarker;
-    static const QString entrySeparator;
+    static const TQString invalidMarker;
+    static const TQString directoryMarker;
+    static const TQString fileMarker;
+    static const TQString entrySeparator;
 
     CVSEntry();
-    CVSEntry( const QString &aLine, const CVSDir& dir );
+    CVSEntry( const TQString &aLine, const CVSDir& dir );
 
     void clean();
-    void parse( const QString &aLine, const CVSDir& dir );
+    void parse( const TQString &aLine, const CVSDir& dir );
     VCSFileInfo toVCSFileInfo() const;
     bool isValid() const { return type() != invalidEntry; }
     bool isDirectory() const { return type() == directoryEntry; }
 
     EntryType type() const;
     FileState state() const;
-    QString fileName() const;
-    QString revision() const;
-    QString timeStamp() const;
-    QString options() const;
-    QString tag() const;
+    TQString fileName() const;
+    TQString revision() const;
+    TQString timeStamp() const;
+    TQString options() const;
+    TQString tag() const;
 
 private:
     EntryType m_type;
     FileState m_state;
-    QStringList m_fields;
+    TQStringList m_fields;
 };
 
 #endif
diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp
index 1ac5bd76..cbfc726f 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.cpp
+++ b/vcs/cvsservice/cvsfileinfoprovider.cpp
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -35,7 +35,7 @@ CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stu
     : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ),
     m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 )
 {
-    connect( this, SIGNAL(needStatusUpdate(const CVSDir&)), this, SLOT(updateStatusFor(const CVSDir&)));
+    connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&)));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,14 +50,14 @@ CVSFileInfoProvider::~CVSFileInfoProvider()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const VCSFileInfoMap *CVSFileInfoProvider::status( const QString &dirPath )
+const VCSFileInfoMap *CVSFileInfoProvider::status( const TQString &dirPath )
 {
     // Same dir: we can do with cache ...
     if (dirPath != m_previousDirPath)
     {
         // ... different dir: flush old cache and cache new dir
         delete m_cachedDirEntries;
-        CVSDir cvsdir( projectDirectory() + QDir::separator() + dirPath );
+        CVSDir cvsdir( projectDirectory() + TQDir::separator() + dirPath );
         m_previousDirPath = dirPath;
         m_cachedDirEntries = cvsdir.cacheableDirStatus();
     }
@@ -66,7 +66,7 @@ const VCSFileInfoMap *CVSFileInfoProvider::status( const QString &dirPath )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool CVSFileInfoProvider::requestStatus( const QString &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)
@@ -85,7 +85,7 @@ bool CVSFileInfoProvider::requestStatus( const QString &dirPath, void *callerDat
 
     if (!checkRepos) {
         kdDebug(9006) << "No repo check reqested; Just read CVS/Entries from: " << dirPath << endl;
-        QDir qd(projectDirectory()+QDir::separator()+dirPath);
+        TQDir qd(projectDirectory()+TQDir::separator()+dirPath);
         CVSDir cdir(qd);
         if (cdir.isValid())
         {
@@ -100,7 +100,7 @@ bool CVSFileInfoProvider::requestStatus( const QString &dirPath, void *callerDat
     // When "cvs status" get's called nonrecursiv for a directory, it will
     // not print anything if the path ends with a slash. So we need to ensure
     // this here.
-    QString newPath = dirPath;
+    TQString newPath = dirPath;
     if (newPath.endsWith("/"))
         newPath.truncate( newPath.length()-1 );
 
@@ -111,11 +111,11 @@ bool CVSFileInfoProvider::requestStatus( const QString &dirPath, void *callerDat
 
     kdDebug(9006) << "Running command : " << m_requestStatusJob->cvsCommand() << endl;
     connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true );
-    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true );
+    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true );
     return m_requestStatusJob->execute();
     /*
     kdDebug(9006) << k_funcinfo << "Attempting to parse " << dirPath << " using CVS/Entries" << endl;
-    QDir qd(dirPath);
+    TQDir qd(dirPath);
     CVSDir cdir(qd);
     if (cdir.isValid())
     {
@@ -146,7 +146,7 @@ void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir)
      * item conains any childs. Therefor we need to give FileTree some time
      * to update the directory item before we give the status infos.
      */
-    QTimer::singleShot( 1000, this, SLOT(propagateUpdate()) );
+    TQTimer::singleShot( 1000, this, TQT_SLOT(propagateUpdate()) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -167,9 +167,9 @@ void CVSFileInfoProvider::slotJobExited( bool normalExit, int /*exitStatus*/ )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSFileInfoProvider::slotReceivedOutput( QString someOutput )
+void CVSFileInfoProvider::slotReceivedOutput( TQString someOutput )
 {
-    QStringList strings = m_bufferedReader.process( someOutput );
+    TQStringList strings = m_bufferedReader.process( someOutput );
     if (strings.count() > 0)
     {
         m_statusLines += strings;
@@ -178,32 +178,32 @@ void CVSFileInfoProvider::slotReceivedOutput( QString someOutput )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSFileInfoProvider::slotReceivedErrors( QString /*someErrors*/ )
+void CVSFileInfoProvider::slotReceivedErrors( TQString /*someErrors*/ )
 {
     /* Nothing to do */
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CVSFileInfoProvider::projectDirectory() const
+TQString CVSFileInfoProvider::projectDirectory() const
 {
     return owner()->project()->projectDirectory();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream )
+VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
 {
-    QRegExp rx_recordStart( "^=+$" );
-    QRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" );
-    QRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" );
-    QRegExp rx_fileWorkRev( "\\bWorking revision:" );
-    QRegExp rx_fileRepoRev( "\\bRepository revision:" );
-    //QRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" );
-    //QRegExp rx_stickyDate( "" ); // @todo but are they useful?? :-/
-    //QRegExp rx_stickyOptions( "" ); //@todo
-
-    QString fileName,
+    TQRegExp rx_recordStart( "^=+$" );
+    TQRegExp rx_fileName( "^File: (\\.|\\-|\\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\\)))" );
+    //TQRegExp rx_stickyDate( "" ); // @todo but are they useful?? :-/
+    //TQRegExp rx_stickyOptions( "" ); //@todo
+
+    TQString fileName,
         fileStatus,
         workingRevision,
         repositoryRevision,
@@ -217,9 +217,9 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream )
     const int lastAcceptableState = 4;
     // This is where the dirty parsing is done: from a string stream representing the
     // 'cvs log' output we build a map with more useful strunctured data ;-)
-    for (QStringList::const_iterator it=stringStream.begin(); it != stringStream.end(); ++it)
+    for (TQStringList::const_iterator it=stringStream.begin(); it != stringStream.end(); ++it)
     {
-        QString s = (*it).stripWhiteSpace();
+        TQString s = (*it).stripWhiteSpace();
         kdDebug(9006) << ">> Parsing: " << s << endl;
 
         if (rx_recordStart.exactMatch( s ))
@@ -235,7 +235,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream )
         {
             workingRevision = s.replace( "Working revision:", "" ).stripWhiteSpace();
 
-            QRegExp rx_revision( "\\b(((\\d)+\\.?)*|New file!)" );
+            TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|New file!)" );
             if (rx_revision.search( workingRevision ) >= 0)
             {
                 workingRevision = rx_revision.cap();
@@ -247,7 +247,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream )
         {
             repositoryRevision = s.replace( "Repository revision:", "" ).stripWhiteSpace();
 
-            QRegExp rx_revision( "\\b(((\\d)+\\.?)*|No revision control file)" );
+            TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|No revision control file)" );
             if (rx_revision.search( s ) >= 0)
             {
                 repositoryRevision = rx_revision.cap();
@@ -276,11 +276,11 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileInfo::FileState CVSFileInfoProvider::String2EnumState( QString stateAsString )
+VCSFileInfo::FileState CVSFileInfoProvider::String2EnumState( TQString stateAsString )
 {
     // @todo add more status as "Conflict" and "Sticky" (but I dunno how CVS writes it so I'm going
     // to await until I have a conflict or somebody else fix it ;-)
-    // @todo use QRegExp for better matching since it seems strings have changed between CVS releases :-(
+    // @todo use TQRegExp for better matching since it seems strings have changed between CVS releases :-(
     // @todo a new state for 'Needs patch'
     if (stateAsString == "Up-to-date")
         return VCSFileInfo::Uptodate;
diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h
index 2c0b5cf1..9b80dc8e 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.h
+++ b/vcs/cvsservice/cvsfileinfoprovider.h
@@ -12,7 +12,7 @@
 #ifndef CVSFILEINFOPROVIDER_H
 #define CVSFILEINFOPROVIDER_H
 
-#include 
+#include 
 
 #include 
 #include "cvsservicedcopIface.h"
@@ -36,10 +36,10 @@ public:
     virtual ~CVSFileInfoProvider();
 
 // -- Sync interface
-    virtual const VCSFileInfoMap *status( const QString &dirPath ) ;
+    virtual const VCSFileInfoMap *status( const TQString &dirPath ) ;
 
 // -- Async interface for requesting data
-    virtual bool requestStatus( const QString &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& );
@@ -52,26 +52,26 @@ signals:
 private:
     // DCOP Iface
     virtual void slotJobExited( bool normalExit, int exitStatus );
-    virtual void slotReceivedOutput( QString someOutput );
-    virtual void slotReceivedErrors( QString someErrors );
+    virtual void slotReceivedOutput( TQString someOutput );
+    virtual void slotReceivedErrors( TQString someErrors );
 
-    QString projectDirectory() const;
+    TQString projectDirectory() const;
 
-    static VCSFileInfoMap *parse( QStringList stringStream );
+    static VCSFileInfoMap *parse( TQStringList stringStream );
 
-    static VCSFileInfo::FileState String2EnumState( QString stateAsString );
+    static VCSFileInfo::FileState String2EnumState( TQString stateAsString );
 
     static void printOutFileInfoMap( const VCSFileInfoMap &map );
 
     BufferedStringReader m_bufferedReader;
-    QStringList m_statusLines;
+    TQStringList m_statusLines;
 
     mutable void *m_savedCallerData;
     mutable CvsJob_stub *m_requestStatusJob;
     CvsService_stub *m_cvsService;
 
     //! Caching
-    mutable QString m_previousDirPath;
+    mutable TQString m_previousDirPath;
     mutable VCSFileInfoMap *m_cachedDirEntries;
 };
 
diff --git a/vcs/cvsservice/cvsform.cpp b/vcs/cvsservice/cvsform.cpp
index a23a1df2..ef0521c8 100644
--- a/vcs/cvsservice/cvsform.cpp
+++ b/vcs/cvsservice/cvsform.cpp
@@ -10,8 +10,8 @@
  ***************************************************************************/
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include "cvsform.h"
 
@@ -19,7 +19,7 @@
 // class CvsForm
 ///////////////////////////////////////////////////////////////////////////////
 
-CvsForm::CvsForm( QWidget *parent, const char *name, WFlags f )
+CvsForm::CvsForm( TQWidget *parent, const char *name, WFlags f )
     : CvsFormBase( parent, name, f )
 {
     setWFlags( getWFlags() | WDestructiveClose );
@@ -33,42 +33,42 @@ CvsForm::~CvsForm()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsForm::module() const
+TQString CvsForm::module() const
 {
     return module_edit->text();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsForm::vendor() const
+TQString CvsForm::vendor() const
 {
     return vendor_edit->text();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsForm::message() const
+TQString CvsForm::message() const
 {
     return message_edit->text();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsForm::release() const
+TQString CvsForm::release() const
 {
     return release_edit->text();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsForm::location() const
+TQString CvsForm::location() const
 {
     return serverPathEdit->text();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsForm::cvsRsh() const
+TQString CvsForm::cvsRsh() const
 {
     return cvsRshComboBox->currentText();
 }
diff --git a/vcs/cvsservice/cvsform.h b/vcs/cvsservice/cvsform.h
index 471e10d6..a61e8473 100644
--- a/vcs/cvsservice/cvsform.h
+++ b/vcs/cvsservice/cvsform.h
@@ -22,15 +22,15 @@ class CvsForm : public CvsFormBase
 {
     Q_OBJECT
 public:
-    CvsForm( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    CvsForm( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     virtual ~CvsForm();
 
-    QString module() const;
-    QString vendor() const;
-    QString message() const;
-    QString release() const;
-    QString location() const;
-    QString cvsRsh() const;
+    TQString module() const;
+    TQString vendor() const;
+    TQString message() const;
+    TQString release() const;
+    TQString location() const;
+    TQString cvsRsh() const;
     bool mustInitRoot() const;
 };
 
diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp
index ac6fd97c..ff36c19d 100644
--- a/vcs/cvsservice/cvslogdialog.cpp
+++ b/vcs/cvsservice/cvslogdialog.cpp
@@ -9,10 +9,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -32,18 +32,18 @@
 // class CVSLogDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, QWidget *parent, const char *name, int )
+CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int )
     : KDialogBase( Tabbed, i18n("CVS Log & Diff Dialog"), Close, Close,
     parent, name? name : "logformdialog", false /*modal*/, true /*separator*/ ),
     m_cvsLogPage( 0 ), m_cvsService( cvsService )
 {
     setWFlags( getWFlags() | WDestructiveClose );
 
-    QVBox *vbox = addVBoxPage( i18n("Log From CVS") );
+    TQVBox *vbox = addVBoxPage( i18n("Log From CVS") );
     m_cvsLogPage = new CVSLogPage( m_cvsService, vbox );
 
-    connect( m_cvsLogPage, SIGNAL(diffRequested(const QString&, const QString&, const QString&)),
-        this, SLOT(slotDiffRequested(const QString&, const QString&, const QString&)) );
+    connect( m_cvsLogPage, TQT_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)),
+        this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -55,32 +55,32 @@ CVSLogDialog::~CVSLogDialog()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSLogDialog::startLog( const QString &workDir, const QString &pathName )
+void CVSLogDialog::startLog( const TQString &workDir, const TQString &pathName )
 {
     kdDebug(9006) << "CVSLogDialog::start() here! workDir = " << workDir <<
         ", pathName = " << pathName << endl;
 
 //    displayActionFeedback( true );
 /*
-    QVBox *vbox = addVBoxPage( i18n("Log From CVS: ") + pathName );
+    TQVBox *vbox = addVBoxPage( i18n("Log From CVS: ") + pathName );
     m_cvsLogPage = new CVSLogPage( m_cvsService, vbox );
     this->resize( m_cvsLogPage->size() );
 
-    connect( m_cvsLogPage, SIGNAL(linkClicked(const QString&, const QString&)),
-        this, SLOT(slotDiffRequested(const QString&, const QString&)) );
+    connect( m_cvsLogPage, TQT_SIGNAL(linkClicked(const TQString&, const TQString&)),
+        this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&)) );
 */
     m_cvsLogPage->startLog( workDir, pathName );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSLogDialog::slotDiffRequested( const QString &pathName, const QString &revA, const QString &revB )
+void CVSLogDialog::slotDiffRequested( const TQString &pathName, const TQString &revA, const TQString &revB )
 {
     kdDebug(9006) << "CVSLogDialog::slotDiffRequested()" << endl;
 
     // Create a new CVSDiffPage and start diffing process
-    QString diffTitle =  i18n("Diff between %1 and %2").arg( revA ).arg( revB );
-    QVBox *vbox = addVBoxPage( diffTitle );
+    TQString diffTitle =  i18n("Diff between %1 and %2").arg( revA ).arg( revB );
+    TQVBox *vbox = addVBoxPage( diffTitle );
     CVSDiffPage *diffPage = new CVSDiffPage( m_cvsService, vbox );
     diffPage->startDiff( pathName, revA, revB );
 }
diff --git a/vcs/cvsservice/cvslogdialog.h b/vcs/cvsservice/cvslogdialog.h
index 12a7a2eb..315fea40 100644
--- a/vcs/cvsservice/cvslogdialog.h
+++ b/vcs/cvsservice/cvslogdialog.h
@@ -27,21 +27,21 @@ class CVSLogDialog : public KDialogBase
 {
     Q_OBJECT
 public:
-    CVSLogDialog( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 );
+    CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
     virtual ~CVSLogDialog();
 
-    void startLog( const QString &workDir, const QString &pathName );
+    void startLog( const TQString &workDir, const TQString &pathName );
 
 private slots:
-    void slotDiffRequested( const QString &pathName, const QString &revA, const QString &revB );
+    void slotDiffRequested( const TQString &pathName, const TQString &revA, const TQString &revB );
     virtual void slotCancel();
 
 private:
-//    void parseLogContent( const QString& text );
+//    void parseLogContent( const TQString& text );
     void displayActionFeedback( bool working );
 
 private:
-    QString m_pathName;
+    TQString m_pathName;
 
     CVSLogPage *m_cvsLogPage;
     CvsService_stub *m_cvsService;
diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp
index cf8645e9..c0ade68e 100644
--- a/vcs/cvsservice/cvslogpage.cpp
+++ b/vcs/cvsservice/cvslogpage.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -32,21 +32,21 @@
 // class CVSLogPage
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSLogPage::CVSLogPage( CvsService_stub *cvsService, QWidget *parent, const char *name, int )
+CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int )
     : DCOPObject( "CvsLogPageDCOPIface" ),
-	QWidget( parent, name? name : "logformpage" ),
+	TQWidget( parent, name? name : "logformpage" ),
     m_cvsService( cvsService ), m_cvsLogJob( 0 )
 {
-    QLayout *thisLayout = new QVBoxLayout( this );
+    TQLayout *thisLayout = new TQVBoxLayout( this );
 
-    m_textBrowser = new QTextBrowser( this, "logbrowser" );
+    m_textBrowser = new TQTextBrowser( this, "logbrowser" );
     thisLayout->add( m_textBrowser );
 
     /// \FIXME a better way?
     m_textBrowser->setMinimumWidth(fontMetrics().width('X')*50);
     m_textBrowser->setMinimumHeight(fontMetrics().width('X')*43);
 
-    connect( m_textBrowser, SIGNAL(linkClicked( const QString& )), this, SLOT(slotLinkClicked( const QString& )) );
+    connect( m_textBrowser, TQT_SIGNAL(linkClicked( const TQString& )), this, TQT_SLOT(slotLinkClicked( const TQString& )) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -60,7 +60,7 @@ CVSLogPage::~CVSLogPage()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSLogPage::startLog( const QString &workDir, const QString &pathName )
+void CVSLogPage::startLog( const TQString &workDir, const TQString &pathName )
 {
     kdDebug(9006) << "CVSLogPage::start() here! workDir = " << workDir <<
         ", pathName = " << pathName << endl;
@@ -76,8 +76,8 @@ void CVSLogPage::startLog( const QString &workDir, const QString &pathName )
     // establish connections to the signals of the cvs m_job
     connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true );
     // We'll read the ouput directly from the job ...
-    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true );
-//    connectDCOPSignal( job.app(), job.obj(), "receivedStderr(QString)", "slotReceivedErrors(QString)", true );
+    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true );
+//    connectDCOPSignal( job.app(), job.obj(), "receivedStderr(TQString)", "slotReceivedErrors(TQString)", true );
 
     kdDebug(9006) << "Running: " << m_cvsLogJob->cvsCommand() << endl;
     m_cvsLogJob->execute();
@@ -85,19 +85,19 @@ void CVSLogPage::startLog( const QString &workDir, const QString &pathName )
 
 ///////////////////////////////////////////////////////////////////////////////
 /*
-void CVSLogPage::parseLogContent( const QString& text )
+void CVSLogPage::parseLogContent( const TQString& text )
 {
     kdDebug(9006) << "CVSLogPage::parseLogContent()" << endl;
 
     m_base->contents->clear();
 
-    QStringList l = QStringList::split( "----------------------------", text );
-    QString header = l.front();
+    TQStringList l = TQStringList::split( "----------------------------", text );
+    TQString header = l.front();
     l.pop_front();
 
-    for( QStringList::Iterator it=l.begin(); it!=l.end(); ++it )
+    for( TQStringList::Iterator it=l.begin(); it!=l.end(); ++it )
     {
-        const QString &s = *it;
+        const TQString &s = *it;
         if (s)
         {
             m_base->contents->append( s );
@@ -117,41 +117,41 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus )
         return;
     }
 
-    static QRegExp rx_sep( "\\-+" );
-    static QRegExp rx_sep2( "=+" );
-    static QRegExp rx_date( "date: .* author: .* state: .* lines: .*" );
+    static TQRegExp rx_sep( "\\-+" );
+    static TQRegExp rx_sep2( "=+" );
+    static TQRegExp rx_date( "date: .* author: .* state: .* lines: .*" );
     // "revision" followed by one or more decimals followed by a optional dot
-    static QRegExp rx_rev( "revision ((\\d+\\.?)+)" );
-    m_textBrowser->setTextFormat( QTextBrowser::PlainText );
+    static TQRegExp rx_rev( "revision ((\\d+\\.?)+)" );
+    m_textBrowser->setTextFormat( TQTextBrowser::PlainText );
 
     for (size_t i=0; i ";
+            TQString ver = rx_rev.cap( 1 );
+            TQString dstr = "" + s + " ";
             int lastVer = ver.section( '.', -1 ).toInt() - 1;
             if ( lastVer > 0 ) {
-                QString lv = ver.left( ver.findRev( "." ) + 1 ) + QString::number( lastVer );
+                TQString lv = ver.left( ver.findRev( "." ) + 1 ) + TQString::number( lastVer );
                 dstr += " [diff to " + lv + "]";
             }
-            m_textBrowser->setTextFormat( QTextBrowser::RichText );
+            m_textBrowser->setTextFormat( TQTextBrowser::RichText );
             m_textBrowser->append( dstr );
-            m_textBrowser->setTextFormat( QTextBrowser::PlainText );
+            m_textBrowser->setTextFormat( TQTextBrowser::PlainText );
         }
         else if ( rx_date.exactMatch(s) )
         {
-            m_textBrowser->setTextFormat( QTextBrowser::RichText );
+            m_textBrowser->setTextFormat( TQTextBrowser::RichText );
             m_textBrowser->append( "" + s + "" );
-            m_textBrowser->setTextFormat( QTextBrowser::PlainText );
+            m_textBrowser->setTextFormat( TQTextBrowser::PlainText );
         }
         else if ( rx_sep.exactMatch(s) || rx_sep2.exactMatch(s) )
         {
             m_textBrowser->append( "\n" );
-            m_textBrowser->setTextFormat( QTextBrowser::RichText );
+            m_textBrowser->setTextFormat( TQTextBrowser::RichText );
             m_textBrowser->append( "
        " );
-            m_textBrowser->setTextFormat( QTextBrowser::PlainText );
+            m_textBrowser->setTextFormat( TQTextBrowser::PlainText );
         } else
         {
             m_textBrowser->append( s );
@@ -164,7 +164,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSLogPage::slotLinkClicked( const QString &link )
+void CVSLogPage::slotLinkClicked( const TQString &link )
 {
     kdDebug(9006) << "CVSLogPage::slotLinkClicked()" << endl;
 
@@ -172,9 +172,9 @@ void CVSLogPage::slotLinkClicked( const QString &link )
     /// \FIXME in this way I lose the source
     m_textBrowser->setSource( m_logTextBackup );
 
-    QString ver = link.mid( link.findRev( "/" ) + 1 );
-    QString v1 = ver.section( '_', 0, 0 );
-    QString v2 = ver.section( '_', 1, 1 );
+    TQString ver = link.mid( link.findRev( "/" ) + 1 );
+    TQString v1 = ver.section( '_', 0, 0 );
+    TQString v2 = ver.section( '_', 1, 1 );
     if ( v1.isEmpty() || v2.isEmpty() )
     {
         m_textBrowser->append( i18n( "invalid link clicked" ) );
@@ -186,9 +186,9 @@ void CVSLogPage::slotLinkClicked( const QString &link )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSLogPage::slotReceivedOutput( QString someOutput )
+void CVSLogPage::slotReceivedOutput( TQString someOutput )
 {
-    kdDebug(9006) << "CVSLogPage::slotReceivedOutput(QString)" << endl;
+    kdDebug(9006) << "CVSLogPage::slotReceivedOutput(TQString)" << endl;
 
     kdDebug(9006) << "OUTPUT: " << someOutput << endl;
 	m_diffStrings += m_outputBuffer.process(someOutput);
@@ -196,7 +196,7 @@ void CVSLogPage::slotReceivedOutput( QString someOutput )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CVSLogPage::slotReceivedErrors( QString someErrors )
+void CVSLogPage::slotReceivedErrors( TQString someErrors )
 {
     kdDebug(9006) << "ERRORS: " << someErrors << endl;
 }
diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h
index a3480e91..d618500c 100644
--- a/vcs/cvsservice/cvslogpage.h
+++ b/vcs/cvsservice/cvslogpage.h
@@ -13,7 +13,7 @@
 #define CVSLOGPAGE_H
 
 #include "cvsservicedcopIface.h"
-#include 
+#include 
 #include "bufferedstringreader.h"
 
 class CvsJob_stub;
@@ -25,36 +25,36 @@ Implementation for the form displaying 'cvs log' output.
 
 @author KDevelop Authors
 */
-class CVSLogPage : public QWidget, virtual public CVSServiceDCOPIface
+class CVSLogPage : public TQWidget, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
 public:
-    CVSLogPage( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 );
+    CVSLogPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
     virtual ~CVSLogPage();
 
-    void startLog( const QString &workDir, const QString &pathName );
+    void startLog( const TQString &workDir, const TQString &pathName );
     void cancel();
 
 signals:
     // Emitted when the user click upon a link
-    void diffRequested( const QString &pathName, const QString &revA, const QString &revB );
+    void diffRequested( const TQString &pathName, const TQString &revA, const TQString &revB );
 
 private slots:
-    void slotLinkClicked( const QString &link );
+    void slotLinkClicked( const TQString &link );
     // DCOP Iface
     virtual void slotJobExited( bool normalExit, int exitStatus );
-    virtual void slotReceivedOutput( QString someOutput );
-    virtual void slotReceivedErrors( QString someErrors );
+    virtual void slotReceivedOutput( TQString someOutput );
+    virtual void slotReceivedErrors( TQString someErrors );
 
 //private:
-//    void parseLogContent( const QString& text );
+//    void parseLogContent( const TQString& text );
 
 private:
-    QString m_pathName;
-    QTextBrowser *m_textBrowser;
-    QString m_logTextBackup;
+    TQString m_pathName;
+    TQTextBrowser *m_textBrowser;
+    TQString m_logTextBackup;
 	BufferedStringReader m_outputBuffer;
-	QStringList m_diffStrings;
+	TQStringList m_diffStrings;
 
     CvsService_stub *m_cvsService;
     CvsJob_stub *m_cvsLogJob;
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index 448f4761..43add3be 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -24,9 +24,9 @@
 // Macros
 ///////////////////////////////////////////////////////////////////////////////
 
-#define default_revert          QString::fromLatin1("-C")
-#define default_diff            QString::fromLatin1("-p")
-#define default_rsh             QString::fromLatin1("")
+#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
 
@@ -35,7 +35,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 CvsOptions *CvsOptions::m_instance = 0;
-QString CvsOptions::invalidLocation( "ERROR-LOCATION-IS-NOT-SET-IN-PROJECT" );
+TQString CvsOptions::invalidLocation( "ERROR-LOCATION-IS-NOT-SET-IN-PROJECT" );
 
 ///////////////////////////////////////////////////////////////////////////////
 // class CvsOptions
@@ -85,7 +85,7 @@ void CvsOptions::save( KDevProject *project )
     kdDebug( 9006 ) << " **** CvsOptions::save( KDevProject* ) here" << endl;
     Q_ASSERT( project );
 
-    QDomDocument &dom = *project->projectDom();
+    TQDomDocument &dom = *project->projectDom();
 
     DomUtil::writeBoolEntry( dom, "/kdevcvsservice/recursivewhenupdate", recursiveWhenUpdate() );
     DomUtil::writeBoolEntry( dom, "/kdevcvsservice/prunedirswhenupdate", pruneEmptyDirsWhenUpdate() );
@@ -95,7 +95,7 @@ void CvsOptions::save( KDevProject *project )
 //    DomUtil::writeEntry( dom, "/kdevcvsservice/location", location() );
 
     // [Repository-:ext:anonymous@cvs.ogre.sourceforge.net:/cvsroot/ogrenew]
-    QString groupName = "Repository-" + guessLocation( project->projectDirectory() );
+    TQString groupName = "Repository-" + guessLocation( project->projectDirectory() );
     m_serviceConfig->setGroup( groupName );
 
     m_serviceConfig->writeEntry( "ContextLines", contextLines() );
@@ -109,7 +109,7 @@ void CvsOptions::load( KDevProject *project )
 {
     kdDebug( 9006 ) << " **** CvsOptions::load( KDevProject* ) here" << endl;
     Q_ASSERT( project );
-    QDomDocument &dom = *project->projectDom();
+    TQDomDocument &dom = *project->projectDom();
 
     m_recursiveWhenUpdate = DomUtil::readBoolEntry( dom, "/kdevcvsservice/recursivewhenupdate", true );
     m_pruneEmptyDirsWhenUpdate = DomUtil::readBoolEntry( dom, "/kdevcvsservice/prunedirswhenupdate", true );
@@ -118,7 +118,7 @@ void CvsOptions::load( KDevProject *project )
     m_revertOptions = DomUtil::readEntry( dom, "/kdevcvsservice/revertoptions", default_revert );
 //    m_location = DomUtil::readEntry( dom, "/kdevcvsservice/location", guessLocation( project->projectDirectory() ) );
 
-    QString groupName = "Repository-" + guessLocation( project->projectDirectory() );
+    TQString groupName = "Repository-" + guessLocation( project->projectDirectory() );
     m_serviceConfig->setGroup( groupName );
 
     m_contextLines = m_serviceConfig->readUnsignedNumEntry( "ContextLines", default_contextLines );
@@ -184,56 +184,56 @@ bool CvsOptions::createDirsWhenUpdate() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptions::setRevertOptions( const QString &p )
+void CvsOptions::setRevertOptions( const TQString &p )
 {
     this->m_revertOptions = p;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsOptions::revertOptions()
+TQString CvsOptions::revertOptions()
 {
     return this->m_revertOptions;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptions::setDiffOptions( const QString &p )
+void CvsOptions::setDiffOptions( const TQString &p )
 {
     this->m_diffOptions = p;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsOptions::diffOptions()
+TQString CvsOptions::diffOptions()
 {
     return this->m_diffOptions;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptions::setCvsRshEnvVar( const QString &p )
+void CvsOptions::setCvsRshEnvVar( const TQString &p )
 {
     this->m_cvsRshEnvVar = p;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsOptions::cvsRshEnvVar()
+TQString CvsOptions::cvsRshEnvVar()
 {
     return this->m_cvsRshEnvVar;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsOptions::location()
+TQString CvsOptions::location()
 {
     return m_location;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptions::setLocation( const QString &p )
+void CvsOptions::setLocation( const TQString &p )
 {
     m_location = p;
 }
@@ -268,15 +268,15 @@ unsigned int CvsOptions::compressionLevel() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsOptions::guessLocation( const QString &projectDir ) const
+TQString CvsOptions::guessLocation( const TQString &projectDir ) const
 {
-    QString rootFileName( projectDir + "/CVS/Root" );
+    TQString rootFileName( projectDir + "/CVS/Root" );
 
-    QFile f( rootFileName );
+    TQFile f( rootFileName );
     if (f.open( IO_ReadOnly ))
     {
-        QTextStream t( &f );
-        QString serverLocation = t.readLine();
+        TQTextStream t( &f );
+        TQString serverLocation = t.readLine();
         kdDebug(9000) << "===> Server location guessed: " << serverLocation << endl;
         return serverLocation;
     }
diff --git a/vcs/cvsservice/cvsoptions.h b/vcs/cvsservice/cvsoptions.h
index 222a34c7..857b47e4 100644
--- a/vcs/cvsservice/cvsoptions.h
+++ b/vcs/cvsservice/cvsoptions.h
@@ -12,8 +12,8 @@
 #ifndef CVSOPTIONS_H
 #define CVSOPTIONS_H
 
-#include 
-#include 
+#include 
+#include 
 
 class CvsServicePart;
 class KConfig;
@@ -28,7 +28,7 @@ class CvsOptions
 public:
     static CvsOptions *instance();
 
-    static QString invalidLocation;
+    static TQString invalidLocation;
 
     virtual ~CvsOptions();
 
@@ -48,30 +48,30 @@ public:
     void setCreateDirsWhenUpdate( bool b );
     bool createDirsWhenUpdate() const;
 
-    void setDiffOptions( const QString &p );
-    QString diffOptions();
+    void setDiffOptions( const TQString &p );
+    TQString diffOptions();
 
-    void setRevertOptions( const QString &p );
-    QString revertOptions();
+    void setRevertOptions( const TQString &p );
+    TQString revertOptions();
 
-    void setCvsRshEnvVar( const QString &p );
-    QString cvsRshEnvVar();
+    void setCvsRshEnvVar( const TQString &p );
+    TQString cvsRshEnvVar();
 
     /**
     * Will try to determine location by using CVS/Root file
     */
-    QString guessLocation( const QString &projectDir ) const;
+    TQString guessLocation( const TQString &projectDir ) const;
 
     /**
     * Set server path string (this should be called by the part when a new project
     * is created or imported)
     * @param p (i.e. :pserver:marios@cvs.kde.org:/home/kde)
     */
-    void setLocation( const QString &p );
+    void setLocation( const TQString &p );
     /**
     * @result remote path (i.e. :pserver:marios@cvs.kde.org:/home/kde)
     */
-    QString location();
+    TQString location();
 
     void setContextLines( unsigned int contextLines );
     unsigned int contextLines() const;
@@ -85,10 +85,10 @@ private:
     bool m_pruneEmptyDirsWhenUpdate;
     bool m_recursiveWhenUpdate;
     bool m_createDirsWhenUpdate;
-    QString m_revertOptions;
-    QString m_diffOptions;
-    QString m_cvsRshEnvVar;
-    QString m_location;
+    TQString m_revertOptions;
+    TQString m_diffOptions;
+    TQString m_cvsRshEnvVar;
+    TQString m_location;
     unsigned int m_compressionLevel;
     unsigned int m_contextLines;
     //! So we can access cvssservice configuration (repositories first of all)
diff --git a/vcs/cvsservice/cvsoptionswidget.cpp b/vcs/cvsservice/cvsoptionswidget.cpp
index aa7a98c1..32044dd3 100644
--- a/vcs/cvsservice/cvsoptionswidget.cpp
+++ b/vcs/cvsservice/cvsoptionswidget.cpp
@@ -11,7 +11,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -24,7 +24,7 @@
 // class DiffDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-CvsOptionsWidget::CvsOptionsWidget( QWidget *parent, const char *name )
+CvsOptionsWidget::CvsOptionsWidget( TQWidget *parent, const char *name )
     : CvsOptionsWidgetBase( parent, name )
 {
     readConfig();
@@ -112,28 +112,28 @@ void CvsOptionsWidget::setContextLines( unsigned int p )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptionsWidget::setDiffOptions( const QString &p )
+void CvsOptionsWidget::setDiffOptions( const TQString &p )
 {
     this->diffOptionsEdit->setText( p );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsOptionsWidget::diffOptions() const
+TQString CvsOptionsWidget::diffOptions() const
 {
     return this->diffOptionsEdit->text();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptionsWidget::setCvsRshEnvVar( const QString &p )
+void CvsOptionsWidget::setCvsRshEnvVar( const TQString &p )
 {
     this->cvsRshEnvVarEdit->setText( p );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptionsWidget::setServerLocation( const QString &p )
+void CvsOptionsWidget::setServerLocation( const TQString &p )
 {
     this->serverLocationEdit->setText( p );
 }
@@ -175,14 +175,14 @@ unsigned int CvsOptionsWidget::contextLines() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsOptionsWidget::cvsRshEnvVar() const
+TQString CvsOptionsWidget::cvsRshEnvVar() const
 {
     return cvsRshEnvVarEdit->text();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString CvsOptionsWidget::serverLocation() const
+TQString CvsOptionsWidget::serverLocation() const
 {
     return serverLocationEdit->text();
 }
diff --git a/vcs/cvsservice/cvsoptionswidget.h b/vcs/cvsservice/cvsoptionswidget.h
index 5df98d76..caf23619 100644
--- a/vcs/cvsservice/cvsoptionswidget.h
+++ b/vcs/cvsservice/cvsoptionswidget.h
@@ -14,7 +14,7 @@
 #ifndef _CVSOPTIONSWIDGET_H_
 #define _CVSOPTIONSWIDGET_H_
 
-#include 
+#include 
 #include "cvsoptionswidgetbase.h"
 
 class QLabel;
@@ -24,7 +24,7 @@ class CvsOptionsWidget : public CvsOptionsWidgetBase
 {
     Q_OBJECT
 public:
-    CvsOptionsWidget( QWidget *parent, const char *name=0 );
+    CvsOptionsWidget( TQWidget *parent, const char *name=0 );
     virtual ~CvsOptionsWidget();
 
     bool pruneEmptyDirWhenUpdating() const;
@@ -42,14 +42,14 @@ public:
     unsigned int contextLines() const;
     void setContextLines( unsigned int p );
 
-    QString diffOptions() const;
-    void setDiffOptions( const QString &p );
+    TQString diffOptions() const;
+    void setDiffOptions( const TQString &p );
 
-    QString cvsRshEnvVar() const;
-    void setCvsRshEnvVar( const QString &p );
+    TQString cvsRshEnvVar() const;
+    void setCvsRshEnvVar( const TQString &p );
 
-    QString serverLocation() const;
-    void setServerLocation( const QString &p );
+    TQString serverLocation() const;
+    void setServerLocation( const TQString &p );
 
 public slots:
     void accept();
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 9d885056..30a8a700 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -12,10 +12,10 @@
  ***************************************************************************/
 #include "cvspart.h"
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -65,7 +65,7 @@
 // Global vars
 ///////////////////////////////////////////////////////////////////////////////
 
-// See createNewProject( const QString &) and slotProjectOpened()
+// See createNewProject( const TQString &) and slotProjectOpened()
 bool g_projectWasJustCreated = false;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) )
 // class CvsServicePart
 ///////////////////////////////////////////////////////////////////////////////
 
-CvsServicePart::CvsServicePart( QObject *parent, const char *name, const QStringList & )
+CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & )
 	: KDevVersionControl( &data, parent,
 						  name ? name : "CvsService" ),
     actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ),
@@ -96,10 +96,10 @@ CvsServicePart::CvsServicePart( QObject *parent, const char *name, const QString
     m_impl = new CvsServicePartImpl( this );
 
     // Load / store project configuration every time project is opened/closed
-    connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
-    connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) );
+    connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
+    connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
 
-    QTimer::singleShot(0, this, SLOT(init()));
+    TQTimer::singleShot(0, this, TQT_SLOT(init()));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -119,18 +119,18 @@ void CvsServicePart::init()
     setupActions();
 
     // Re-route our implementation signal for when check-out finishes to the standard signal
-    connect( m_impl, SIGNAL(checkoutFinished(QString)), SIGNAL(finishedFetching(QString)) );
+    connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) );
 
     // Context menu
-    connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-        this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
-    connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)),
-        this, SLOT(projectConfigWidget(KDialogBase*)) );
-    connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)),
-        this, SLOT(slotStopButtonClicked(KDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+        this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+    connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
+        this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+        this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
 
     m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", KIcon::DefaultState, CvsFactory::instance()) );
-    QWhatsThis::add( m_impl->processWidget(), i18n("CVS
        Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") );
+    TQWhatsThis::add( m_impl->processWidget(), i18n("CVS
        Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") );
     m_impl->processWidget()->setCaption(i18n("CvsService Output"));
     mainWindow()->embedOutputView( m_impl->processWidget(), i18n("CvsService"), i18n("cvs output") );
     
@@ -144,92 +144,92 @@ void CvsServicePart::setupActions()
     // context at runtime. See CvsServicePart::contextMenu().
 
     actionCommit = new KAction( i18n("&Commit to Repository"), 0, this,
-        SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" );
+        TQT_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" );
     actionCommit->setToolTip( i18n("Commit file(s)") );
     actionCommit->setWhatsThis( i18n("Commit file(s)
        Commits file to repository if modified.") );
 
-    actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, SLOT(slotActionDiff()),
+    actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()),
         actionCollection(), "cvsservice_diff" );
     actionDiff->setToolTip( i18n("Build difference") );
     actionDiff->setWhatsThis( i18n("Build difference
        Builds difference between releases.") );
 
-    actionLog = new KAction( i18n("Generate &Log"), 0, this, SLOT(slotActionLog()),
+    actionLog = new KAction( i18n("Generate &Log"), 0, this, TQT_SLOT(slotActionLog()),
         actionCollection(), "cvsservice_log" );
     actionLog->setToolTip( i18n("Generate log") );
     actionLog->setWhatsThis( i18n("Generate log
        Produces log for this file.") );
 
-    actionAnnotate = new KAction( i18n("&Annotate"), 0, this, SLOT(slotActionAnnotate()),
+    actionAnnotate = new KAction( i18n("&Annotate"), 0, this, TQT_SLOT(slotActionAnnotate()),
         actionCollection(), "cvsservice_annotate" );
     actionAnnotate->setToolTip( i18n("Generate annotations") );
     actionAnnotate->setWhatsThis( i18n("Annotate
        Produces annotations for this file.") );
 
-    actionAdd = new KAction( i18n("&Add to Repository"), 0, this, SLOT(slotActionAdd()),
+    actionAdd = new KAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()),
         actionCollection(), "cvsservice_add" );
     actionAdd->setToolTip( i18n("Add file to repository") );
     actionAdd->setWhatsThis( i18n("Add to repository
        Adds file to repository.") );
 
-    actionEdit = new KAction( i18n("&Edit Files"), 0, this, SLOT(slotActionEdit()),
+    actionEdit = new KAction( i18n("&Edit Files"), 0, this, TQT_SLOT(slotActionEdit()),
         actionCollection(), "cvsservice_edit" );
     actionEdit->setToolTip( i18n("Mark as being edited") );
     actionEdit->setWhatsThis( i18n("Mark as being edited
        Mark the files as being edited.") );
 
-    actionUnEdit = new KAction( i18n("&Unedit Files"), 0, this, SLOT(slotActionUnEdit()),
+    actionUnEdit = new KAction( i18n("&Unedit Files"), 0, this, TQT_SLOT(slotActionUnEdit()),
         actionCollection(), "cvsservice_unedit" );
     actionUnEdit->setToolTip( i18n("Remove editing mark from files") );
     actionUnEdit->setWhatsThis( i18n("Remove editing mark
        Remove the editing mark from the files.") );
 
-    actionEditors = new KAction( i18n("&Show Editors"), 0, this, SLOT(slotActionEditors()),
+    actionEditors = new KAction( i18n("&Show Editors"), 0, this, TQT_SLOT(slotActionEditors()),
         actionCollection(), "cvsservice_editors" );
     actionEditors->setToolTip( i18n("Show editors") );
     actionEditors->setWhatsThis( i18n("Show editors
        Shows the list of users who are editing files.") );
 
     actionAddBinary = new KAction( i18n("Add to Repository as &Binary"), 0, this,
-        SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" );
+        TQT_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" );
     actionAddBinary->setToolTip( i18n("Add file to repository as binary") );
     actionAddBinary->setWhatsThis( i18n("Add to repository as binary
        Adds file to repository as binary (-kb option).") );
 
     actionRemove = new KAction( i18n("&Remove From Repository"), 0, this,
-        SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" );
+        TQT_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" );
     actionRemove->setToolTip( i18n("Remove from repository") );
     actionRemove->setWhatsThis( i18n("Remove from repository
        Removes file(s) from repository.") );
 
     actionUpdate = new KAction( i18n("&Update/Revert to Another Release"), 0, this,
-        SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" );
+        TQT_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" );
     actionUpdate->setToolTip( i18n("Update/revert") );
     actionUpdate->setWhatsThis( i18n("Update/revert to another release
        Updates/reverts file(s) to another release.") );
 
     actionRemoveSticky = new KAction( i18n("R&emove Sticky Flag"), 0,
-        this, SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" );
+        this, TQT_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" );
     actionRemoveSticky->setToolTip( i18n("Remove sticky flag") );
     actionRemoveSticky->setWhatsThis( i18n("Remove sticky flag
        Removes sticky flag from file(s).") );
 
     actionTag = new KAction( i18n("Make &Tag/Branch"), 0,
-        this, SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" );
+        this, TQT_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" );
     actionTag->setToolTip( i18n("Make tag/branch") );
     actionTag->setWhatsThis( i18n("Make tag/branch
        Tags/branches selected file(s).") );
 
     actionUnTag = new KAction( i18n("&Delete Tag"), 0,
-        this, SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" );
+        this, TQT_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" );
     actionUnTag->setToolTip( i18n("Delete tag") );
     actionUnTag->setWhatsThis( i18n("Delete tag
        Delete tag from selected file(s).") );
 
     actionAddToIgnoreList = new KAction( i18n("&Ignore in CVS Operations"), 0,
-        this, SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" );
+        this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" );
     actionAddToIgnoreList->setToolTip( i18n("Ignore in CVS operations") );
     actionAddToIgnoreList->setWhatsThis( i18n("Ignore in CVS operations
        Ignore file(s) by adding it to .cvsignore file.") );
 
     actionRemoveFromIgnoreList = new KAction( i18n("Do &Not Ignore in CVS Operations"), 0,
-        this, SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" );
+        this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" );
     actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in CVS operations") );
     actionRemoveFromIgnoreList->setWhatsThis( i18n("Do not ignore in CVS operations
        Do not ignore file(s) by removing\nit from .cvsignore file.") );
 
     actionLogin = new KAction( i18n("&Log to Server"), 0, this,
-        SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" );
+        TQT_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" );
     actionLogin->setToolTip( i18n("Login to server") );
     actionLogin->setWhatsThis( i18n("Login to server
        Logs in to the CVS server.") );
 
     actionLogout = new KAction( i18n("L&ogout From Server"), 0, this,
-        SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" );
+        TQT_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" );
     actionLogout->setToolTip( i18n("Logout from server") );
     actionLogout->setWhatsThis( i18n("Logout from server
        Logs out from the CVS server.") );
 }
@@ -250,9 +250,9 @@ KDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePart::createNewProject( const QString &dirName )
+void CvsServicePart::createNewProject( const TQString &dirName )
 {
-    kdDebug( 9006 ) << "====> CvsServicePart::createNewProject( const QString& )" << endl;
+    kdDebug( 9006 ) << "====> CvsServicePart::createNewProject( const TQString& )" << endl;
 
     if (!m_cvsConfigurationForm)
         return;
@@ -276,14 +276,14 @@ void CvsServicePart::createNewProject( const QString &dirName )
 
 void CvsServicePart::projectConfigWidget( KDialogBase *dlg )
 {
-	QVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), KIcon::SizeMedium) );
-    CvsOptionsWidget *w = new CvsOptionsWidget( (QWidget *)vbox, "cvs config widget" );
-    connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) );
+	TQVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), KIcon::SizeMedium) );
+    CvsOptionsWidget *w = new CvsOptionsWidget( (TQWidget *)vbox, "cvs config widget" );
+    connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QWidget* CvsServicePart::newProjectWidget( QWidget *parent )
+TQWidget* CvsServicePart::newProjectWidget( TQWidget *parent )
 {
     m_cvsConfigurationForm = new CvsForm( parent, "cvsform" );
     return m_cvsConfigurationForm;
@@ -291,7 +291,7 @@ QWidget* CvsServicePart::newProjectWidget( QWidget *parent )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePart::contextMenu( QPopupMenu *popup, const Context *context )
+void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context )
 {
     kdDebug(9006) << "contextMenu()" << endl;
     if (context->hasType( Context::FileContext ) ||
@@ -320,45 +320,45 @@ void CvsServicePart::contextMenu( QPopupMenu *popup, const Context *context )
         if (context->hasType( Context::FileContext ))
             popup->insertSeparator();
 
-        int id = subMenu->insertItem( actionCommit->text(), this, SLOT(slotCommit()) );
+        int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) );
         subMenu->setWhatsThis(id, i18n("Commit file(s)
        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, SLOT(slotDiff()) );
+            id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
             subMenu->setWhatsThis(id, i18n("Build difference
        Builds difference between releases."));
-            id = subMenu->insertItem( actionLog->text(), this, SLOT(slotLog()) );
+            id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
             subMenu->setWhatsThis(id, i18n("Generate log
        Produces log for this file."));
-            id = subMenu->insertItem( actionAnnotate->text(), this, SLOT(slotAnnotate()) );
+            id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) );
             subMenu->setWhatsThis(id, i18n("Generate Annotate
        Produces annotation output for this file."));
         }
-        id = subMenu->insertItem( actionEditors->text(), this, SLOT(slotEditors()) );
+        id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) );
         subMenu->setWhatsThis(id, i18n("Show editors
        Shows the list of users who are editing files."));
-        id = subMenu->insertItem( actionEdit->text(), this, SLOT(slotEdit()) );
+        id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) );
         subMenu->setWhatsThis(id, i18n("Mark as beeing edited
        Mark the files as beeing edited."));
-        id = subMenu->insertItem( actionUnEdit->text(), this, SLOT(slotUnEdit()) );
+        id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) );
         subMenu->setWhatsThis(id, i18n("Remove editing mark
        Remove the editing mark from the files."));
-        id = subMenu->insertItem( actionAdd->text(), this, SLOT(slotAdd()) );
+        id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
         subMenu->setWhatsThis(id, i18n("Add to repository
        Adds file to repository."));
-        id = subMenu->insertItem( actionAddBinary->text(), this, SLOT(slotAddBinary()) );
+        id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) );
         subMenu->setWhatsThis(id, i18n("Add to repository as binary
        Adds file to repository as binary (-kb option)."));
-        id = subMenu->insertItem( actionRemove->text(), this, SLOT(slotRemove()) );
+        id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) );
         subMenu->setWhatsThis(id, i18n("Remove from repository
        Removes file(s) from repository."));
 
         subMenu->insertSeparator();
-        id = subMenu->insertItem( actionTag->text(), this, SLOT(slotTag()) );
+        id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) );
         subMenu->setWhatsThis(id, i18n("Make tag/branch
        Tags/branches selected file(s)."));
-        id = subMenu->insertItem( actionUnTag->text(), this, SLOT(slotUnTag()) );
+        id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) );
         subMenu->setWhatsThis(id, i18n("Delete tag
        Delete tag from selected file(s)."));
-        id = subMenu->insertItem( actionUpdate->text(), this, SLOT(slotUpdate()) );
+        id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
         subMenu->setWhatsThis(id, i18n("Update/revert to another release
        Updates/reverts file(s) to another release."));
-        id = subMenu->insertItem( actionRemoveSticky->text(), this, SLOT(slotRemoveSticky()) );
+        id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) );
         subMenu->setWhatsThis(id, i18n("Remove sticky flag
        Removes sticky flag from file(s)."));
 
         subMenu->insertSeparator();
-        id = subMenu->insertItem( actionAddToIgnoreList->text(), this, SLOT(slotAddToIgnoreList()) );
+        id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
         subMenu->setWhatsThis(id, i18n("Ignore in CVS operations
        Ignore file(s) by adding it to .cvsignore file."));
-        id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, SLOT(slotRemoveFromIgnoreList()) );
+        id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
         subMenu->setWhatsThis(id, i18n("Do not ignore in CVS operations
        Do not ignore file(s) by removing\nit from .cvsignore file."));
 
         // Now insert in parent menu
@@ -396,7 +396,7 @@ bool CvsServicePart::urlFocusedDocument( KURL &url )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool CvsServicePart::isValidDirectory( const QString &dirPath ) const
+bool CvsServicePart::isValidDirectory( const TQString &dirPath ) const
 {
     return m_impl->isValidDirectory( dirPath );
 }
@@ -714,14 +714,14 @@ void CvsServicePart::slotStopButtonClicked( KDevPlugin* which )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePart::slotAddFilesToProject( const QStringList &filesToAdd )
+void CvsServicePart::slotAddFilesToProject( const TQStringList &filesToAdd )
 {
     m_impl->addFilesToProject( filesToAdd );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePart::slotRemovedFilesFromProject(const QStringList &fileToRemove)
+void CvsServicePart::slotRemovedFilesFromProject(const TQStringList &fileToRemove)
 {
     m_impl->removedFilesFromProject( fileToRemove );
 }
@@ -750,8 +750,8 @@ void CvsServicePart::slotProjectOpened()
     options->load( project() );
 
     // When files are added to project they may be added to/removed from repository too
-    connect( project(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) );
-    connect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) );
+    connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) );
+    connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -772,8 +772,8 @@ void CvsServicePart::slotProjectClosed()
     delete options;
 
     // We don't have a project anymore ...
-    disconnect( project(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) );
-    disconnect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) );
+    disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) );
+    disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) );
 }
 
 #include "cvspart.moc"
diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h
index e3513a98..da15dff2 100644
--- a/vcs/cvsservice/cvspart.h
+++ b/vcs/cvsservice/cvspart.h
@@ -14,8 +14,8 @@
 #ifndef _CVSPART_H_
 #define _CVSPART_H_
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include "kdevversioncontrol.h"
 
@@ -43,7 +43,7 @@ class CvsServicePart : public KDevVersionControl
 
 public:
     //! Standard constructor.
-    CvsServicePart( QObject *parent, const char *name, const QStringList & );
+    CvsServicePart( TQObject *parent, const char *name, const TQStringList & );
     //! Destructor.
     virtual ~CvsServicePart();
 
@@ -51,11 +51,11 @@ public:
     * Returns the configuration widget (for properly configuring the project to
     * use CVS), child of @p parent.
     */
-    virtual QWidget *newProjectWidget( QWidget *parent );
+    virtual TQWidget *newProjectWidget( TQWidget *parent );
     /**
     * Setup a directory tree for use with CVS.
     */
-    virtual void createNewProject( const QString& dir );
+    virtual void createNewProject( const TQString& dir );
     /**
     * Fetch a module from remote repository, so it can be used for importing
     */
@@ -68,7 +68,7 @@ public:
     * @param dirPath absolute path of the directory
     * @return true if the the directory is a valid CVS sandbox
     */
-    virtual bool isValidDirectory( const QString &dirPath ) const;
+    virtual bool isValidDirectory( const TQString &dirPath ) const;
 
 private slots:
     /** Add menu items binded to cvs operations' slots to @p popup, using
@@ -76,7 +76,7 @@ private slots:
      * Not that @p context _must_ be FileContext-type, otherwise will do
      * nothing.
      */
-    void contextMenu( QPopupMenu *popup, const Context *context );
+    void contextMenu( TQPopupMenu *popup, const Context *context );
 
     // Cvs operations (menubar)
     void slotActionLogin();
@@ -120,8 +120,8 @@ private slots:
     void slotProjectOpened();
     void slotProjectClosed();
 
-    void slotAddFilesToProject(const QStringList &);
-    void slotRemovedFilesFromProject(const QStringList &);
+    void slotAddFilesToProject(const TQStringList &);
+    void slotRemovedFilesFromProject(const TQStringList &);
 
     /** Adds a configuration widget (for properly configuring CVS command-line options)
      * and adds it to @p dlg.
@@ -145,7 +145,7 @@ private:
     /** This is a pointer to the d->form used for collecting data about CVS project creation (used
      * by the ApplicationWizard in example)
      */
-    QGuardedPtr m_cvsConfigurationForm;
+    TQGuardedPtr m_cvsConfigurationForm;
 
     // Actions
     KAction *actionCommit,
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index e6177739..ca66e610 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -9,10 +9,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include
+#include 
+#include 
+#include 
+#include
 
 #include 
 #include 
@@ -61,17 +61,17 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // Nice name (relative to projectDirectory()) ;-)
-const QString CvsServicePartImpl::changeLogFileName( "ChangeLog" );
+const TQString CvsServicePartImpl::changeLogFileName( "ChangeLog" );
 // Four spaces for every log line (except the first, which includes the
 // developers name)
-const QString CvsServicePartImpl::changeLogPrependString( "    " );
+const TQString CvsServicePartImpl::changeLogPrependString( "    " );
 
 ///////////////////////////////////////////////////////////////////////////////
 // class CvsServicePartImpl
 ///////////////////////////////////////////////////////////////////////////////
 
 CvsServicePartImpl::CvsServicePartImpl( CvsServicePart *part, const char *name )
-    : QObject( this, name? name : "cvspartimpl" ),
+    : TQObject( this, name? name : "cvspartimpl" ),
     m_scheduler( 0 ), m_part( part ), m_widget( 0 )
 {
     if (requestCvsService())
@@ -80,7 +80,7 @@ CvsServicePartImpl::CvsServicePartImpl( CvsServicePart *part, const char *name )
         m_scheduler = new DirectScheduler( m_widget );
         m_fileInfoProvider = new CVSFileInfoProvider( part, m_cvsService );
     
-        connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
+        connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
     }
     else
     {
@@ -178,7 +178,7 @@ const KURL::List &CvsServicePartImpl::urlList() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QStringList CvsServicePartImpl::fileList( bool relativeToProjectDir ) const
+TQStringList CvsServicePartImpl::fileList( bool relativeToProjectDir ) const
 {
     if (relativeToProjectDir)
         return URLUtil::toRelativePaths( projectDirectory(), urlList() );
@@ -188,7 +188,7 @@ QStringList CvsServicePartImpl::fileList( bool relativeToProjectDir ) const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool CvsServicePartImpl::isRegisteredInRepository( const QString &projectDirectory, const KURL &url )
+bool CvsServicePartImpl::isRegisteredInRepository( const TQString &projectDirectory, const KURL &url )
 {
     kdDebug(9006) << k_funcinfo << endl;
 
@@ -218,7 +218,7 @@ bool CvsServicePartImpl::isRegisteredInRepository( const QString &projectDirecto
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePartImpl::validateURLs( const QString &projectDirectory, KURL::List &urls, CvsOperation op )
+void CvsServicePartImpl::validateURLs( const TQString &projectDirectory, KURL::List &urls, CvsOperation op )
 {
     kdDebug(9006) << k_funcinfo << endl;
 
@@ -229,7 +229,7 @@ void CvsServicePartImpl::validateURLs( const QString &projectDirectory, KURL::Li
         kdDebug(9006) << "This is a Cvs Add operation and will not be checked against repository ;-)" << endl;
         return;
     }
-    QValueList::iterator it = urls.begin();
+    TQValueList::iterator it = urls.begin();
     while (it != urls.end())
     {
         if (!CvsServicePartImpl::isRegisteredInRepository( projectDirectory, (*it) ))
@@ -249,7 +249,7 @@ void CvsServicePartImpl::validateURLs( const QString &projectDirectory, KURL::Li
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePartImpl::addToIgnoreList( const QString &projectDirectory, const KURL &url )
+void CvsServicePartImpl::addToIgnoreList( const TQString &projectDirectory, const KURL &url )
 {
     kdDebug(9006) << k_funcinfo << endl;
 
@@ -263,7 +263,7 @@ void CvsServicePartImpl::addToIgnoreList( const QString &projectDirectory, const
     cvsdir.ignoreFile( url.fileName() );
 }
 
-void CvsServicePartImpl::addToIgnoreList( const QString &projectDirectory, const KURL::List &urls )
+void CvsServicePartImpl::addToIgnoreList( const TQString &projectDirectory, const KURL::List &urls )
 {
     for (size_t i=0; iproject() ? m_part->project()->projectDirectory() : QString::null;
+    return m_part->project() ? m_part->project()->projectDirectory() : TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -361,7 +361,7 @@ bool CvsServicePartImpl::checkout()
 
     CheckoutDialog dlg( m_cvsService, mainWindow()->main()->centralWidget() );
 
-    if ( dlg.exec() == QDialog::Accepted )
+    if ( dlg.exec() == TQDialog::Accepted )
     {
         DCOPRef job = m_cvsService->checkout( dlg.workDir(), dlg.serverPath(),
             dlg.module(), dlg.tag(), dlg.pruneDirs(), "", false
@@ -374,7 +374,7 @@ bool CvsServicePartImpl::checkout()
 			modulePath = dlg.workDir() + dlg.module();
 
         	m_scheduler->schedule( job );
-        	connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotCheckoutFinished(bool,int)) );
+        	connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) );
 			return true;
 		}
     }
@@ -392,11 +392,11 @@ void CvsServicePartImpl::commit( const KURL::List& urlList )
         return;
 
     CommitDialog dlg( projectDirectory() + "/ChangeLog" );
-    if (dlg.exec() == QDialog::Rejected)
+    if (dlg.exec() == TQDialog::Rejected)
         return;
 
     CvsOptions *options = CvsOptions::instance();
-    QString logString = dlg.logMessage().join( "\n" );
+    TQString logString = dlg.logMessage().join( "\n" );
 
     DCOPRef cvsJob = m_cvsService->commit( fileList(), logString, options->recursiveWhenCommitRemove() );
     if (!m_cvsService->ok())
@@ -406,7 +406,7 @@ void CvsServicePartImpl::commit( const KURL::List& urlList )
     }
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) );
 
     // 2. if requested to do so, add an entry to the Changelog too
     if (dlg.mustAddToChangeLog())
@@ -434,10 +434,10 @@ void CvsServicePartImpl::update( const KURL::List& urlList )
 
     CvsOptions *options = CvsOptions::instance();
     ReleaseInputDialog dlg( mainWindow()->main()->centralWidget() );
-    if (dlg.exec() == QDialog::Rejected)
+    if (dlg.exec() == TQDialog::Rejected)
         return;
 
-    QString additionalOptions = dlg.release();
+    TQString additionalOptions = dlg.release();
     if (dlg.isRevert())
         additionalOptions = additionalOptions + " " + options->revertOptions();
 
@@ -448,7 +448,7 @@ void CvsServicePartImpl::update( const KURL::List& urlList )
         additionalOptions );
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) );
 
     doneOperation();
 }
@@ -465,7 +465,7 @@ void CvsServicePartImpl::add( const KURL::List& urlList, bool binary )
     DCOPRef cvsJob = m_cvsService->add( fileList(), binary );
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) );
 
     doneOperation();
 }
@@ -480,18 +480,18 @@ void CvsServicePartImpl::annotate( const KURL::List& urlList )
         return;
 
     //get the directory of the file we want to annotate
-    QString tagFilename = URLUtil::directory(projectDirectory()+"/"+fileList()[0]);
+    TQString tagFilename = URLUtil::directory(projectDirectory()+"/"+fileList()[0]);
     //CVS stores tag information in the ./CVS/Tag file
     tagFilename += "/CVS/Tag";
 
 
     //Check if such a Tag file exists, and try to read the tag/branch from it
-    QFile fileTag(tagFilename);
-    QString strRev = "";  //default revision is empty ...
+    TQFile fileTag(tagFilename);
+    TQString strRev = "";  //default revision is empty ...
     if (fileTag.exists()) { //... but if there is a Tag file, we get the revision from there
         if ( fileTag.open( IO_ReadOnly ) ) {
-            QTextStream stream( &fileTag );
-            QString line;
+            TQTextStream stream( &fileTag );
+            TQString line;
             line = stream.readLine();
             if (line.startsWith("T")) { //the line always starts with a "T"...
                 strRev = line.right(line.length()-1); //...and after this there is the tag name
@@ -531,7 +531,7 @@ void CvsServicePartImpl::unedit( const KURL::List& urlList)
     DCOPRef cvsJob = m_cvsService->unedit( fileList() );
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) );
 
     doneOperation();
 }
@@ -548,7 +548,7 @@ void CvsServicePartImpl::edit( const KURL::List& urlList)
     DCOPRef cvsJob = m_cvsService->edit( fileList() );
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) );
 
     doneOperation();
 }
@@ -582,8 +582,8 @@ void CvsServicePartImpl::remove( const KURL::List& urlList )
     DCOPRef cvsJob = m_cvsService->remove( fileList(), true );
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)),
-        this, SLOT(slotJobFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)),
+        this, TQT_SLOT(slotJobFinished(bool,int)) );
 
     doneOperation();
 }
@@ -606,8 +606,8 @@ void CvsServicePartImpl::removeStickyFlag( const KURL::List& urlList )
         "-A" );
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)),
-        this, SLOT(slotJobFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)),
+        this, TQT_SLOT(slotJobFinished(bool,int)) );
 
     doneOperation();
 }
@@ -642,7 +642,7 @@ void CvsServicePartImpl::diff( const KURL::List& urlList )
     CVSEntry entry = cvsdir.fileStatus( urlList[0].fileName() );
 
     DiffDialog dlg(entry);
-    if (dlg.exec() != QDialog::Accepted)
+    if (dlg.exec() != TQDialog::Accepted)
         return;
 
     CvsOptions *options = CvsOptions::instance();
@@ -656,8 +656,8 @@ void CvsServicePartImpl::diff( const KURL::List& urlList )
     }
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)),
-        this, SLOT(slotDiffFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)),
+        this, TQT_SLOT(slotDiffFinished(bool,int)) );
 
     doneOperation();
 }
@@ -673,15 +673,15 @@ void CvsServicePartImpl::tag( const KURL::List& urlList )
 
     TagDialog dlg( i18n("Creating Tag/Branch for files ..."),
         mainWindow()->main()->centralWidget() );
-    if (dlg.exec() != QDialog::Accepted)
+    if (dlg.exec() != TQDialog::Accepted)
         return;
 
     DCOPRef cvsJob = m_cvsService->createTag( fileList(), dlg.tagName(),
         dlg.isBranch(), dlg.force() );
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)),
-        this, SLOT(slotJobFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)),
+        this, TQT_SLOT(slotJobFinished(bool,int)) );
 
     doneOperation();
 }
@@ -698,15 +698,15 @@ void CvsServicePartImpl::unTag( const KURL::List& urlList )
     TagDialog dlg( i18n("Removing Tag from files ..."),
         mainWindow()->main()->centralWidget() );
     dlg.tagAsBranchCheck->hide();
-    if (dlg.exec() != QDialog::Accepted)
+    if (dlg.exec() != TQDialog::Accepted)
         return;
 
     DCOPRef cvsJob = m_cvsService->deleteTag( fileList(), dlg.tagName(),
         dlg.isBranch(), dlg.force() );
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)),
-        this, SLOT(slotJobFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)),
+        this, TQT_SLOT(slotJobFinished(bool,int)) );
 
     doneOperation();
 }
@@ -731,34 +731,34 @@ void CvsServicePartImpl::removeFromIgnoreList( const KURL::List& urlList )
 * \FIXME Current implementation doesn't use CvsService :-( I just ported the
 * old code which relies on buildcvs.sh script. [marios]
 */
-void CvsServicePartImpl::createNewProject( const QString &dirName,
-    const QString &cvsRsh, const QString &location,
-    const QString &message, const QString &module, const QString &vendor,
-    const QString &release, bool mustInitRoot )
+void CvsServicePartImpl::createNewProject( const TQString &dirName,
+    const TQString &cvsRsh, const TQString &location,
+    const TQString &message, const TQString &module, const TQString &vendor,
+    const TQString &release, bool mustInitRoot )
 {
-    kdDebug( 9006 ) << "====> CvsServicePartImpl::createNewProject( const QString& )" << endl;
+    kdDebug( 9006 ) << "====> CvsServicePartImpl::createNewProject( const TQString& )" << endl;
 
     CvsOptions *options = CvsOptions::instance();
     options->setCvsRshEnvVar( cvsRsh );
     options->setLocation( location );
 /*
-	//virtual DCOPRef import( const QString& workingDir, const QString& repository, const QString& module, const QString& ignoreList, const QString& comment, const
-    QString filesToIgnore;
+	//virtual DCOPRef import( const TQString& workingDir, const TQString& repository, const TQString& module, const TQString& ignoreList, const TQString& comment, const
+    TQString filesToIgnore;
 	DCOPRef cvsJob = m_cvsService->import( dirName, location, module, filesToIgnore, message, vendor, release, false );
 
     m_scheduler->schedule( cvsJob );
-    connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotCheckoutFinished(bool,int)) );
+    connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) );
 */
-	QString rsh_preamble;
+	TQString rsh_preamble;
     if ( !options->cvsRshEnvVar().isEmpty() )
         rsh_preamble = "CVS_RSH=" + KShellProcess::quote( options->cvsRshEnvVar() );
 
-    QString init;
+    TQString init;
     if (mustInitRoot)
     {
         init = rsh_preamble + " cvs -d " + KShellProcess::quote( options->location() ) + " init && ";
     }
-    QString cmdLine = init + "cd " + KShellProcess::quote(dirName) +
+    TQString cmdLine = init + "cd " + KShellProcess::quote(dirName) +
         " && " + rsh_preamble +
         " cvs -d " + KShellProcess::quote(options->location()) +
         " import -m " + KShellProcess::quote(message) + " " +
@@ -782,13 +782,13 @@ void CvsServicePartImpl::createNewProject( const QString &dirName,
 
 bool CvsServicePartImpl::requestCvsService()
 {
-    QCString appId;
-    QString error;
+    TQCString appId;
+    TQString error;
 
     if (KApplication::startServiceByDesktopName( "cvsservice",
-        QStringList(), &error, &appId ))
+        TQStringList(), &error, &appId ))
     {
-        QString msg = i18n( "Unable to find the Cervisia KPart. \n"
+        TQString msg = i18n( "Unable to find the Cervisia KPart. \n"
             "Cervisia Integration will not be available. Please check your\n"
             "Cervisia installation and re-try. Reason was:\n" ) + error;
         KMessageBox::error( processWidget(), msg, "DCOP Error" );
@@ -825,11 +825,11 @@ void CvsServicePartImpl::flushJobs()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePartImpl::addFilesToProject( const QStringList &filesToAdd )
+void CvsServicePartImpl::addFilesToProject( const TQStringList &filesToAdd )
 {
     kdDebug( 9006 ) << k_funcinfo << " " << filesToAdd << endl;
 
-    QStringList filesInCVS = checkFileListAgainstCVS( filesToAdd );
+    TQStringList filesInCVS = checkFileListAgainstCVS( filesToAdd );
     if (filesInCVS.isEmpty())
         return;
 
@@ -853,11 +853,11 @@ void CvsServicePartImpl::addFilesToProject( const QStringList &filesToAdd )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePartImpl::removedFilesFromProject(const QStringList &filesToRemove)
+void CvsServicePartImpl::removedFilesFromProject(const TQStringList &filesToRemove)
 {
     kdDebug( 9006 ) << k_funcinfo << endl;
 
-    QStringList filesInCVS = checkFileListAgainstCVS( filesToRemove );
+    TQStringList filesInCVS = checkFileListAgainstCVS( filesToRemove );
     if (filesInCVS.isEmpty())
         return;
 
@@ -878,15 +878,15 @@ void CvsServicePartImpl::removedFilesFromProject(const QStringList &filesToRemov
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QStringList CvsServicePartImpl::checkFileListAgainstCVS( const QStringList &filesToCheck ) const
+TQStringList CvsServicePartImpl::checkFileListAgainstCVS( const TQStringList &filesToCheck ) const
 {
-    QStringList filesInCVS;
-    for (QStringList::const_iterator it = filesToCheck.begin(); it != filesToCheck.end(); ++it )
+    TQStringList filesInCVS;
+    for (TQStringList::const_iterator it = filesToCheck.begin(); it != filesToCheck.end(); ++it )
     {
-        const QString &fn = (*it);
-        QFileInfo fi( fn );
+        const TQString &fn = (*it);
+        TQFileInfo fi( fn );
         if (fi.isRelative())
-            fi = projectDirectory() + QDir::separator() + fn;
+            fi = projectDirectory() + TQDir::separator() + fn;
         if (isValidDirectory( fi.dirPath( true ) ))
             filesInCVS += ( fi.filePath() );
     }
@@ -915,7 +915,7 @@ void CvsServicePartImpl::slotDiffFinished( bool normalExit, int exitStatus )
 {
     core()->running( m_part, false );
 
-    QString diff = processWidget()->output().join("\n"),
+    TQString diff = processWidget()->output().join("\n"),
         err = processWidget()->errors().join("\n");
 
     kdDebug( 9006 ) << "diff = " << diff << endl;
@@ -946,7 +946,7 @@ void CvsServicePartImpl::slotDiffFinished( bool normalExit, int exitStatus )
     {
         int s = KMessageBox::warningContinueCancelList( 0,
             i18n("CVS output errors during diff. Do you still want to continue?"),
-            QStringList::split( "\n", err, false ), i18n("Errors During Diff")
+            TQStringList::split( "\n", err, false ), i18n("Errors During Diff")
         );
         if ( s != KMessageBox::Continue )
             return;
@@ -971,7 +971,7 @@ void CvsServicePartImpl::slotCheckoutFinished( bool exitStatus, int )
         << exitStatus << endl;
     // Return a null string if the operation was not succesfull
     if (!exitStatus)
-        modulePath = QString::null;
+        modulePath = TQString::null;
 
     kdDebug(9006) << "   I'll emit modulePath == " << modulePath << endl;
 
diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h
index e5087f68..638e4907 100644
--- a/vcs/cvsservice/cvspartimpl.h
+++ b/vcs/cvsservice/cvspartimpl.h
@@ -12,9 +12,9 @@
 #ifndef CVSPARTIMPL_H
 #define CVSPARTIMPL_H
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
 #include 
@@ -171,15 +171,15 @@ public:
     * @param release release tag
     * @param mustInitRoot if true will attempt to initialize $CVSROOT if not already prepared
     */
-    virtual void createNewProject( const QString &dirName,
-        const QString &cvsRsh, const QString &location,
-        const QString &message, const QString &module, const QString &vendor,
-        const QString &release, bool mustInitRoot );
+    virtual void createNewProject( const TQString &dirName,
+        const TQString &cvsRsh, const TQString &location,
+        const TQString &message, const TQString &module, const TQString &vendor,
+        const TQString &release, bool mustInitRoot );
 
     /**
     * @return true if the directory is valid as CVS directory (has the /CVS/ dir inside) (FORWARDER)
     */
-    virtual bool isValidDirectory( const QDir &dir ) const;
+    virtual bool isValidDirectory( const TQDir &dir ) const;
     /**
     * @return a reference to the custom FileInforProvider object (FORWARDER)
     */
@@ -201,13 +201,13 @@ public:
     CvsProcessWidget *processWidget() const;
 
 signals:
-    void warning( const QString &msg );
+    void warning( const TQString &msg );
     /**
     * Emitted when the component has terminated checkout operation
     * @param checkedDir directory where the module has been checked out
     *        (will be empty if the operation failed)
     */
-    void checkoutFinished( QString checkedDir );
+    void checkoutFinished( TQString checkedDir );
 
 private slots:
     void slotJobFinished( bool normalExit, int exitStatus );
@@ -237,7 +237,7 @@ private:
     /**
     *   @return true if the @p url is present in CVS/Entry file
     */
-    static bool isRegisteredInRepository( const QString &projectDirectory, const KURL &url );
+    static bool isRegisteredInRepository( const TQString &projectDirectory, const KURL &url );
     /**
     * Ideally this function will take a bunch of URLs and validate them (they are valid files,
     * are files registered in CVS, are on a supported filesystem, ...). Currently checks
@@ -246,7 +246,7 @@ private:
     * @param urls list of KURL to check (the list can be modified during the operation)
     * @param op type of cvs operation, as pecified in @see CvsOperation enum
     */
-    static void validateURLs( const QString &projectDirectory, KURL::List &urls, CvsOperation op );
+    static void validateURLs( const TQString &projectDirectory, KURL::List &urls, CvsOperation op );
 
     /**
     * Add file to it's respective ignore list. This means that, for example, if you
@@ -255,7 +255,7 @@ private:
     * @param projectDirectory
     * @param url url to be added to the check list.
     */
-    static void addToIgnoreList( const QString &projectDirectory, const KURL &url );
+    static void addToIgnoreList( const TQString &projectDirectory, const KURL &url );
 
     /**
     * Add files to their respective ignore list. This means that, for example, if you
@@ -264,7 +264,7 @@ private:
     * @param projectDirectory
     * @param urls list of urls to be added to the check list.
     */
-    static void addToIgnoreList( const QString &projectDirectory, const KURL::List &urls );
+    static void addToIgnoreList( const TQString &projectDirectory, const KURL::List &urls );
 
     /**
     * Remove file from it's respective .ignore files. As specified for @see addToIgnoreList
@@ -275,7 +275,7 @@ private:
     * @param projectDirectory
     * @param url url to be removed from the check list.
     */
-    static void removeFromIgnoreList( const QString &projectDirectory, const KURL &url );
+    static void removeFromIgnoreList( const TQString &projectDirectory, const KURL &url );
 
     /**
     * Remove files from their respective .ignore files. As specified for @see addToIgnoreList
@@ -286,32 +286,32 @@ private:
     * @param projectDirectory
     * @param urls list of urls to be removed from the check list.
     */
-    static void removeFromIgnoreList( const QString &projectDirectory, const KURL::List &urls );
+    static void removeFromIgnoreList( const TQString &projectDirectory, const KURL::List &urls );
     /**
     * Implementation for requesting user input when files are added to project
     */
-    void addFilesToProject( const QStringList &filesToAdd );
+    void addFilesToProject( const TQStringList &filesToAdd );
     /**
     * Implementation for requesting user input when files are removed from project
     */
-    void removedFilesFromProject(const QStringList &filesToRemove);
+    void removedFilesFromProject(const TQStringList &filesToRemove);
     /**
     * Check each file in the list against CVS and returns a new list with the files
     * currently registered in the repository: if none is registered the returned list
     * is (quite rightly) empty.
     */
-    QStringList checkFileListAgainstCVS( const QStringList &filesToCheck ) const;
+    TQStringList checkFileListAgainstCVS( const TQStringList &filesToCheck ) const;
 
     //! Changelog filename (currently "CHANGELOG" )
-    static const QString changeLogFileName;
+    static const TQString changeLogFileName;
     //! Four spaces for every log line (except the first which includes the
     //! developers name)
-    static const QString changeLogPrependString;
+    static const TQString changeLogPrependString;
 
     // Internal short-cuts
     KDevMainWindow *mainWindow() const;
     KDevCore *core() const;
-    QString projectDirectory() const;
+    TQString projectDirectory() const;
     KDevDiffFrontend *diffFrontend() const;
 
     /** Locate and setup DCOP CvsService */
@@ -323,7 +323,7 @@ private:
     Repository_stub *m_repository;
 
     /** Used for storing module path between start and ending of check-out */
-    QString modulePath;
+    TQString modulePath;
 
     CVSFileInfoProvider *m_fileInfoProvider;
     JobScheduler *m_scheduler;
@@ -332,7 +332,7 @@ private:
 
     //! Reference to widget integrated in the "bottom tabbar" (IDEAL)
     //! (_Must_ be initialized by derived class)
-    QGuardedPtr m_widget;
+    TQGuardedPtr m_widget;
 
     //! Urls which to work upon
     const KURL::List &urlList() const;
@@ -342,7 +342,7 @@ private:
     * @return These are the file path contained in the urls provided for convenience
     * has been requested for.
     */
-    QStringList fileList( bool relativeToProjectDir = true ) const;
+    TQStringList fileList( bool relativeToProjectDir = true ) const;
     /** Last operation type: we save it so we can retrieve and use in slot*Exited() */
     CvsOperation lastOperation() const;
 
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index 2d41a356..d2e78da6 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -43,41 +43,41 @@ int g_dcopErrCounter = 0;
 #endif
 
 
-CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, QWidget *parent, const char *name )
+CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *parent, const char *name )
     : DCOPObject( "CvsProcessWidgetDCOPIface" ),
-    QTextEdit( parent, name ),
+    TQTextEdit( parent, name ),
 	m_part( part ), m_service( service ), m_job( 0 )
 {
     setReadOnly( true );
     setTextFormat( Qt::LogText );
 
-    QStyleSheetItem *style = 0;
-    style = new QStyleSheetItem( styleSheet(), "goodtag" );
+    TQStyleSheetItem *style = 0;
+    style = new TQStyleSheetItem( styleSheet(), "goodtag" );
     style->setColor( "black" );
 
-    style = new QStyleSheetItem( styleSheet(), "errortag" );
+    style = new TQStyleSheetItem( styleSheet(), "errortag" );
     style->setColor( "red" );
-    style->setFontWeight( QFont::Bold );
+    style->setFontWeight( TQFont::Bold );
 
-    style = new QStyleSheetItem( styleSheet(), "infotag" );
+    style = new TQStyleSheetItem( styleSheet(), "infotag" );
     style->setColor( "blue" );
 
-    style = new QStyleSheetItem( styleSheet(), "cvs_conflict" );
+    style = new TQStyleSheetItem( styleSheet(), "cvs_conflict" );
     style->setColor( "red" );
 
-    style = new QStyleSheetItem( styleSheet(), "cvs_added" );
+    style = new TQStyleSheetItem( styleSheet(), "cvs_added" );
     style->setColor( "green" );
 
-    style = new QStyleSheetItem( styleSheet(), "cvs_removed" );
+    style = new TQStyleSheetItem( styleSheet(), "cvs_removed" );
     style->setColor( "yellow" );
 
-    style = new QStyleSheetItem( styleSheet(), "cvs_updated" );
+    style = new TQStyleSheetItem( styleSheet(), "cvs_updated" );
     style->setColor( "lightblue" );
 
-    style = new QStyleSheetItem( styleSheet(), "cvs_modified" );
+    style = new TQStyleSheetItem( styleSheet(), "cvs_modified" );
     style->setColor( "darkgreen" );
 
-    style = new QStyleSheetItem( styleSheet(), "cvs_unknown" );
+    style = new TQStyleSheetItem( styleSheet(), "cvs_unknown" );
     style->setColor( "gray" );
 }
 
@@ -105,9 +105,9 @@ bool CvsProcessWidget::isAlreadyWorking() const
 
 void CvsProcessWidget::clear()
 {
-    QTextEdit::clear();
-    this->m_errors = QString::null;
-    this->m_output = QString::null;
+    TQTextEdit::clear();
+    this->m_errors = TQString::null;
+    this->m_output = TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -130,17 +130,17 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob )
 
     // establish connections to the signals of the cvs m_job
     connectDCOPSignal( m_job->app(), m_job->obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true );
-    connectDCOPSignal( m_job->app(), m_job->obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true );
-    connectDCOPSignal( m_job->app(), m_job->obj(), "receivedStderr(QString)", "slotReceivedErrors(QString)", true );
+    connectDCOPSignal( m_job->app(), m_job->obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true );
+    connectDCOPSignal( m_job->app(), m_job->obj(), "receivedStderr(TQString)", "slotReceivedErrors(TQString)", true );
 
     // get command line and add it to output buffer
-    QString cmdLine = m_job->cvsCommand();
+    TQString cmdLine = m_job->cvsCommand();
     m_part->mainWindow()->statusBar()->message( cmdLine );
 
     kdDebug(9006) << "Running: " << cmdLine << endl;
 
     // disconnect 3rd party slots from our signals
-    disconnect( SIGNAL(jobFinished(bool, int)) );
+    disconnect( TQT_SIGNAL(jobFinished(bool, int)) );
 
     showInfo( i18n("Started job: %1").arg( cmdLine ) );
 
@@ -181,12 +181,12 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus )
     if (m_job)
     {
         disconnectDCOPSignal( m_job->app(), m_job->obj(), "jobExited(bool, int)", "slotJobExited(bool, int)" );
-        disconnectDCOPSignal( m_job->app(), m_job->obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)" );
-        disconnectDCOPSignal( m_job->app(), m_job->obj(), "receivedStderr(QString)", "slotReceivedErrors(QString)" );
+        disconnectDCOPSignal( m_job->app(), m_job->obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)" );
+        disconnectDCOPSignal( m_job->app(), m_job->obj(), "receivedStderr(TQString)", "slotReceivedErrors(TQString)" );
         delete m_job;
         m_job = 0;
     }
-    QString exitMsg = i18n("Job finished with exitCode == %1");
+    TQString exitMsg = i18n("Job finished with exitCode == %1");
     showInfo( exitMsg.arg( exitStatus) );
 
     m_part->core()->running( m_part, false );
@@ -197,15 +197,15 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsProcessWidget::slotReceivedOutput( QString someOutput )
+void CvsProcessWidget::slotReceivedOutput( TQString someOutput )
 {
-    kdDebug(9006) << "CvsProcessWidget::slotReceivedOutput(QString)  here!" << endl;
+    kdDebug(9006) << "CvsProcessWidget::slotReceivedOutput(TQString)  here!" << endl;
 #ifdef MYDCOPDEBUG
     g_dcopOutCounter++;
     kdDebug(9006) << "MYDCOPDEBUG: dcopOutCounter == " << g_dcopOutCounter << endl;
 #endif
 
-    QStringList strings = m_outputBuffer.process( someOutput );
+    TQStringList strings = m_outputBuffer.process( someOutput );
     if (strings.count() > 0)
     {
         m_output += strings;
@@ -216,15 +216,15 @@ void CvsProcessWidget::slotReceivedOutput( QString someOutput )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsProcessWidget::slotReceivedErrors( QString someErrors )
+void CvsProcessWidget::slotReceivedErrors( TQString someErrors )
 {
-    kdDebug(9006) << "CvsProcessWidget::slotReceivedErrors(QString)  here!" << endl;
+    kdDebug(9006) << "CvsProcessWidget::slotReceivedErrors(TQString)  here!" << endl;
 #ifdef MYDCOPDEBUG
     g_dcopErrCounter++;
     kdDebug(9006) << "MYDCOPDEBUG: dcopErrCounter == " << g_dcopErrCounter << endl;
 #endif
 
-    QStringList strings = m_errorBuffer.process( someErrors );
+    TQStringList strings = m_errorBuffer.process( someErrors );
     if (strings.count() > 0)
     {
         m_errors += strings;
@@ -235,35 +235,35 @@ void CvsProcessWidget::slotReceivedErrors( QString someErrors )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsProcessWidget::showInfo( const QStringList &msg )
+void CvsProcessWidget::showInfo( const TQStringList &msg )
 {
-    for (QStringList::const_iterator it = msg.begin(); it != msg.end(); ++it)
+    for (TQStringList::const_iterator it = msg.begin(); it != msg.end(); ++it)
         append( "" + (*it) + "" );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsProcessWidget::showError( const QStringList &msg )
+void CvsProcessWidget::showError( const TQStringList &msg )
 {
-    for (QStringList::const_iterator it = msg.begin(); it != msg.end(); ++it)
+    for (TQStringList::const_iterator it = msg.begin(); it != msg.end(); ++it)
         append( "" + (*it) + "" );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsProcessWidget::showOutput( const QStringList &msg )
+void CvsProcessWidget::showOutput( const TQStringList &msg )
 {
-    for (QStringList::const_iterator it = msg.begin(); it != msg.end(); ++it)
+    for (TQStringList::const_iterator it = msg.begin(); it != msg.end(); ++it)
     {
         // @todo here we can interpret lines as [C], [M], ...
-        const QString &line = (*it);
+        const TQString &line = (*it);
         
         //If the line already contains tags we need to replace the 
         //delimiters with the corresponding HTML code so that they are no longer 
         //recognized as tags.
-        //This will prevent QTextEdit from crashing on trying to parse the tags.
+        //This will prevent TQTextEdit from crashing on trying to parse the tags.
         //This should fix BUG:99590
-        QString lineNew(line);
+        TQString lineNew(line);
         lineNew.replace("<", "<");
         lineNew.replace(">", ">");
         lineNew.replace("&", "&");
diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h
index cb55205c..3a229a45 100644
--- a/vcs/cvsservice/cvsprocesswidget.h
+++ b/vcs/cvsservice/cvsprocesswidget.h
@@ -12,8 +12,8 @@
 #ifndef _CVSPROCESSWIDGET_H_
 #define _CVSPROCESSWIDGET_H_
 
-#include 
-#include 
+#include 
+#include 
 
 #include "cvsservicedcopIface.h"
 #include "bufferedstringreader.h"
@@ -24,12 +24,12 @@ class CvsJob_stub;
 class CvsService_stub;
 class QStyleSheetItem;
 
-class CvsProcessWidget : public QTextEdit, virtual public CVSServiceDCOPIface
+class CvsProcessWidget : public TQTextEdit, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
 public:
     CvsProcessWidget( CvsService_stub *service, CvsServicePart *part,
-        QWidget *parent, const char *name );
+        TQWidget *parent, const char *name );
     virtual ~CvsProcessWidget();
 
     bool startJob( const DCOPRef &aJob );
@@ -43,22 +43,22 @@ public:
 
     virtual void clear();
 
-    QStringList output() const { return m_output; }
-    QStringList errors() const { return m_errors; }
+    TQStringList output() const { return m_output; }
+    TQStringList errors() const { return m_errors; }
 
 //private slots:
     //! DCOP Iface
     virtual void slotJobExited( bool normalExit, int exitStatus );
-    virtual void slotReceivedOutput( QString someOutput );
-    virtual void slotReceivedErrors( QString someErrors );
+    virtual void slotReceivedOutput( TQString someOutput );
+    virtual void slotReceivedErrors( TQString someErrors );
 
 signals:
     void jobFinished( bool normalExit, int exitStatus );
 
 private:
-    void showInfo( const QStringList &msg );
-    void showError( const QStringList &msg  );
-    void showOutput( const QStringList &msg  );
+    void showInfo( const TQStringList &msg );
+    void showError( const TQStringList &msg  );
+    void showOutput( const TQStringList &msg  );
 
     CvsServicePart *m_part;
     CvsService_stub *m_service;
@@ -69,7 +69,7 @@ private:
     BufferedStringReader m_outputBuffer,
         m_errorBuffer;
 
-    QStringList m_output,
+    TQStringList m_output,
         m_errors;
 };
 
diff --git a/vcs/cvsservice/cvsservicedcopIface.h b/vcs/cvsservice/cvsservicedcopIface.h
index 14cd8629..2f62964b 100644
--- a/vcs/cvsservice/cvsservicedcopIface.h
+++ b/vcs/cvsservice/cvsservicedcopIface.h
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
+#include 
 #include 
 
 #ifndef __CVSSERVICEDCOPIFACE_H_
@@ -22,8 +22,8 @@ class CVSServiceDCOPIface : virtual public DCOPObject
     K_DCOP
 k_dcop:
     virtual void slotJobExited( bool normalExit, int exitStatus ) = 0;
-    virtual void slotReceivedOutput( QString someOutput ) = 0;
-    virtual void slotReceivedErrors( QString someErrors ) = 0;
+    virtual void slotReceivedOutput( TQString someOutput ) = 0;
+    virtual void slotReceivedErrors( TQString someErrors ) = 0;
 };
 
 #endif
diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp
index 37ba79fc..9d592c8b 100644
--- a/vcs/cvsservice/diffdialog.cpp
+++ b/vcs/cvsservice/diffdialog.cpp
@@ -10,21 +10,21 @@
  ***************************************************************************/
 
 #include 
-#include 
+#include 
 
 #include "diffdialog.h"
 #include 
-#include 
+#include 
 
 ///////////////////////////////////////////////////////////////////////////////
 // class DiffDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-DiffDialog::DiffDialog( const CVSEntry &entry, QWidget *parent, const char *name, WFlags f )
+DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *parent, const char *name, WFlags f )
     : DiffDialogBase( parent, name, true, f)
 {
     m_entry = entry;
-    QString currentRevision = entry.revision();
+    TQString currentRevision = entry.revision();
     revaEdit->setText(currentRevision);
     revbEdit->setText(currentRevision);
     revOtherEdit->setText(currentRevision);
@@ -53,7 +53,7 @@ DiffDialog::DiffType DiffDialog::requestedDiff() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString DiffDialog::revA() const
+TQString DiffDialog::revA() const
 {
     if (requestedDiff() == diffArbitrary)
         return revaEdit->text();
@@ -62,17 +62,17 @@ QString DiffDialog::revA() const
     else  if (requestedDiff() == diffLocalHEAD)
         return "HEAD";
     else
-        return QString::null;
+        return TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString DiffDialog::revB() const
+TQString DiffDialog::revB() const
 {
     if (requestedDiff())
         return this->revbEdit->text();
     else
-        return QString::null;
+        return TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/vcs/cvsservice/diffdialog.h b/vcs/cvsservice/diffdialog.h
index 12bfc88a..3caa66cf 100644
--- a/vcs/cvsservice/diffdialog.h
+++ b/vcs/cvsservice/diffdialog.h
@@ -24,11 +24,11 @@ class DiffDialog : public DiffDialogBase
 {
     Q_OBJECT
 public:
-    DiffDialog(const CVSEntry &entry, QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    DiffDialog(const CVSEntry &entry, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     virtual ~DiffDialog();
 
-    QString revA() const;
-    QString revB() const;
+    TQString revA() const;
+    TQString revB() const;
 
 private:
     enum  DiffType { diffLocalBASE, diffLocalHEAD, diffLocalOther, diffArbitrary };
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index c51c16b0..87f8494f 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -9,11 +9,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -36,10 +36,10 @@
 // yup, magic value for the popupmenu-id
 static const int POPUP_BASE = 130977;
 
-QStringList KDiffTextEdit::extParts;
-QStringList KDiffTextEdit::extPartsTranslated;
+TQStringList KDiffTextEdit::extParts;
+TQStringList KDiffTextEdit::extPartsTranslated;
 
-KDiffTextEdit::KDiffTextEdit( QWidget* parent, const char* name ): QTextEdit( parent, name )
+KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name )
 {
   KConfig* config = kapp->config();
   config->setGroup( "Diff" );
@@ -56,33 +56,33 @@ KDiffTextEdit::~KDiffTextEdit()
   config->writeEntry( "Highlight", _highlight );
 }
 
-QPopupMenu* KDiffTextEdit::createPopupMenu()
+TQPopupMenu* KDiffTextEdit::createPopupMenu()
 {
-  return createPopupMenu( QPoint() );
+  return createPopupMenu( TQPoint() );
 }
 
-QPopupMenu* KDiffTextEdit::createPopupMenu( const QPoint& p )
+TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
 {
-  QPopupMenu* popup = QTextEdit::createPopupMenu( p );
+  TQPopupMenu* popup = TQTextEdit::createPopupMenu( p );
   if ( !popup )
-    popup = new QPopupMenu( this );
+    popup = new TQPopupMenu( this );
 
   int i = 0;
 
-  for ( QStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
+  for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
     popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i );
     i++;
   }
   if ( !extPartsTranslated.isEmpty() )
     popup->insertSeparator( i );
-  connect( popup, SIGNAL(activated(int)), this, SLOT(popupActivated(int)) );
+  connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) );
 
-  popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 );
+  popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 );
   popup->setItemEnabled( POPUP_BASE - 2, length() > 0 );
 
   popup->insertSeparator( 1 );
 
-  popup->insertItem( i18n( "Highlight Syntax" ), this, SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 );
+  popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 );
   popup->setItemChecked( POPUP_BASE - 1, _highlight );
   popup->insertSeparator( 3 );
 
@@ -91,13 +91,13 @@ QPopupMenu* KDiffTextEdit::createPopupMenu( const QPoint& p )
 
 void KDiffTextEdit::saveAs()
 {
-  QString fName = KFileDialog::getSaveFileName();
+  TQString fName = KFileDialog::getSaveFileName();
   if ( fName.isEmpty() )
     return;
 
-  QFile f( fName );
+  TQFile f( fName );
   if ( f.open( IO_WriteOnly ) ) {
-    QTextStream stream( &f );
+    TQTextStream stream( &f );
     int pCount = paragraphs();
     for ( int i = 0; i < pCount; ++i )
       stream << text( i ) << "\n";
@@ -119,15 +119,15 @@ void KDiffTextEdit::toggleSyntaxHighlight()
 void KDiffTextEdit::applySyntaxHighlight()
 {
   // the diff has been loaded so we apply a simple highlighting
-  static QColor cAdded( 190, 190, 237);
-  static QColor cRemoved( 190, 237, 190 );
+  static TQColor cAdded( 190, 190, 237);
+  static TQColor cRemoved( 190, 237, 190 );
 
   if ( !_highlight )
     return;
 
   int paragCount = paragraphs();
   for ( int i = 0; i < paragCount; ++i ) {
-    QString txt = text( i );
+    TQString txt = text( i );
     if ( txt.length() > 0 ) {
       if ( txt.startsWith( "+" ) || txt.startsWith( ">" ) ) {
         setParagraphBackgroundColor( i, cAdded );
@@ -174,19 +174,19 @@ void KDiffTextEdit::popupActivated( int id )
   emit externalPartRequested( extParts[ id ] );
 }
 
-DiffWidget::DiffWidget( QWidget *parent, const char *name, WFlags f ):
-    QWidget( parent, name, f ), tempFile( 0 )
+DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ):
+    TQWidget( parent, name, f ), tempFile( 0 )
 {
   job = 0;
   extPart = 0;
 
   te = new KDiffTextEdit( this, "Main Diff Viewer" );
   te->setReadOnly( true );
-  te->setTextFormat( QTextEdit::PlainText );
+  te->setTextFormat( TQTextEdit::PlainText );
 //  te->setMinimumSize( 300, 200 );
-  connect( te, SIGNAL(externalPartRequested(const QString&)), this, SLOT(loadExtPart(const QString&)) );
+  connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
 
-  QVBoxLayout* layout = new QVBoxLayout( this );
+  TQVBoxLayout* layout = new TQVBoxLayout( this );
   layout->addWidget( te );
 }
 
@@ -210,7 +210,7 @@ void DiffWidget::setExtPartVisible( bool visible )
   }
 }
 
-void DiffWidget::loadExtPart( const QString& partName )
+void DiffWidget::loadExtPart( const TQString& partName )
 {
   if ( extPart ) {
     setExtPartVisible( false );
@@ -242,15 +242,15 @@ void DiffWidget::slotClear()
 }
 
 // internally for the TextEdit only!
-void DiffWidget::slotAppend( const QString& str )
+void DiffWidget::slotAppend( const TQString& str )
 {
   te->append( str );
 }
 
 // internally for the TextEdit only!
-void DiffWidget::slotAppend( KIO::Job*, const QByteArray& ba )
+void DiffWidget::slotAppend( KIO::Job*, const TQByteArray& ba )
 {
-  slotAppend( QString( ba ) );
+  slotAppend( TQString( ba ) );
 }
 
 void DiffWidget::populateExtPart()
@@ -285,7 +285,7 @@ void DiffWidget::slotFinished()
     populateExtPart();
 }
 
-void DiffWidget::setDiff( const QString& diff )
+void DiffWidget::setDiff( const TQString& diff )
 {
   slotClear();
   slotAppend( diff );
@@ -301,20 +301,20 @@ void DiffWidget::openURL( const KURL& url )
   if ( !job )
     return;
 
-  connect( job, SIGNAL(data( KIO::Job *, const QByteArray & )),
-           this, SLOT(slotAppend( KIO::Job*, const QByteArray& )) );
-  connect( job, SIGNAL(result( KIO::Job * )),
-           this, SLOT(slotFinished()) );
+  connect( job, TQT_SIGNAL(data( KIO::Job *, const TQByteArray & )),
+           this, TQT_SLOT(slotAppend( KIO::Job*, const TQByteArray& )) );
+  connect( job, TQT_SIGNAL(result( KIO::Job * )),
+           this, TQT_SLOT(slotFinished()) );
 }
 
-void DiffWidget::contextMenuEvent( QContextMenuEvent* /* e */ )
+void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ )
 {
-  QPopupMenu* popup = new QPopupMenu( this );
+  TQPopupMenu* popup = new TQPopupMenu( this );
 
   if ( !te->isVisible() )
-    popup->insertItem( i18n("Display &Raw Output"), this, SLOT(showTextEdit()) );
+    popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) );
 
-  popup->exec( QCursor::pos() );
+  popup->exec( TQCursor::pos() );
   delete popup;
 }
 
diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h
index d7aaf48c..37bed7ea 100644
--- a/vcs/cvsservice/diffwidget.h
+++ b/vcs/cvsservice/diffwidget.h
@@ -12,9 +12,9 @@
 #ifndef _DIFFWIDGET_H_
 #define _DIFFWIDGET_H_
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -33,17 +33,17 @@ class KDiffTextEdit: public QTextEdit
 {
   Q_OBJECT
 public:
-  KDiffTextEdit( QWidget* parent = 0, const char* name = 0 );
+  KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 );
   virtual ~KDiffTextEdit();
   void applySyntaxHighlight();
   void clearSyntaxHighlight();
 
 signals:
-  void externalPartRequested( const QString& partName );
+  void externalPartRequested( const TQString& partName );
 
 protected:
-  virtual QPopupMenu* createPopupMenu( const QPoint& );
-  virtual QPopupMenu* createPopupMenu();
+  virtual TQPopupMenu* createPopupMenu( const TQPoint& );
+  virtual TQPopupMenu* createPopupMenu();
 
 private slots:
   void popupActivated( int );
@@ -52,8 +52,8 @@ private slots:
 
 private:
   static void searchExtParts();
-  static QStringList extParts;
-  static QStringList extPartsTranslated;
+  static TQStringList extParts;
+  static TQStringList extPartsTranslated;
   bool _highlight;
 };
 
@@ -62,32 +62,32 @@ class DiffWidget : public QWidget
     Q_OBJECT
 
 public:
-    DiffWidget( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    DiffWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     virtual ~DiffWidget();
 
 public slots:
     /** The URL has to point to a diff file */
     void openURL( const KURL& url );
     /** Pass a diff file in here */
-    void setDiff( const QString& diff );
+    void setDiff( const TQString& diff );
     /** clears the difference viewer */
     void slotClear();
 
 private slots:
     /** appends a piece of "diff" */
-    void slotAppend( const QString& str );
+    void slotAppend( const TQString& str );
     /** overloaded for convenience */
-    void slotAppend( KIO::Job*, const QByteArray& ba );
+    void slotAppend( KIO::Job*, const TQByteArray& ba );
     /** call this when the whole "diff" has been sent.
      *  Don't call slotAppend afterwards!
      */
     void slotFinished();
     void showExtPart();
     void showTextEdit();
-    void loadExtPart( const QString& partName );
+    void loadExtPart( const TQString& partName );
 
 protected:
-    void contextMenuEvent( QContextMenuEvent* e );
+    void contextMenuEvent( TQContextMenuEvent* e );
 
 private:
     void setExtPartVisible( bool visible );
diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp
index 12319102..5f26d100 100644
--- a/vcs/cvsservice/editorsdialog.cpp
+++ b/vcs/cvsservice/editorsdialog.cpp
@@ -15,8 +15,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "editorsdialog.h"
 
@@ -24,7 +24,7 @@
 #include 
 #include 
 
-EditorsDialog::EditorsDialog(CvsService_stub *cvsService, QWidget *parent, const char *name)
+EditorsDialog::EditorsDialog(CvsService_stub *cvsService, TQWidget *parent, const char *name)
     : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(parent, name, TRUE, Qt::WDestructiveClose),
       m_cvsService(cvsService), m_cvsJob(0)
 {
@@ -41,7 +41,7 @@ EditorsDialog::~EditorsDialog()
         delete m_cvsJob;
 }
 
-void EditorsDialog::startjob(QString strDir)
+void EditorsDialog::startjob(TQString strDir)
 {
     kdDebug(9006) << "EditorsDialog::start() workDir = " << strDir << endl;
 
@@ -51,7 +51,7 @@ void EditorsDialog::startjob(QString strDir)
     // establish connections to the signals of the cvs m_job
     connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true );
     // We'll read the ouput directly from the job ...
-    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true );
+    connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true );
 
     kdDebug(9006) << "Running: " << m_cvsJob->cvsCommand() << endl;
     m_cvsJob->execute();
@@ -65,23 +65,23 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus )
         return;
     }
 
-    static QRegExp re("([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s"
+    static TQRegExp re("([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s"
                         "([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s(.*)");
-    static QRegExp subre("([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s"
+    static TQRegExp subre("([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s"
                         "([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s(.*)");
-	QString lastfilename;
+	TQString lastfilename;
 
-    QStringList lines = QStringList::split( "\n", m_output );
+    TQStringList lines = TQStringList::split( "\n", m_output );
     int found = 0;
     for (size_t i=0; iappend( ""+i18n("File")+": "+file+"" );
             m_textBrowser->append( ""+i18n("User")+": "+locker );
@@ -92,9 +92,9 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus )
             lastfilename = file;
         } else {
 	        if (subre.exactMatch(s)) {
-				QString file = lastfilename;
-				QString locker = subre.cap( 1 );
-				QString date = subre.cap(4)+" "+subre.cap(3)+" "+subre.cap(6)+" "+subre.cap(5);
+				TQString file = lastfilename;
+				TQString locker = subre.cap( 1 );
+				TQString date = subre.cap(4)+" "+subre.cap(3)+" "+subre.cap(6)+" "+subre.cap(5);
 				
 				m_textBrowser->append( ""+i18n("File")+": "+file+"" );
 				m_textBrowser->append( ""+i18n("User")+": "+locker );
@@ -117,7 +117,7 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus )
     }
 }
 
-void EditorsDialog::slotReceivedOutput( QString someOutput )
+void EditorsDialog::slotReceivedOutput( TQString someOutput )
 {
     kdDebug(9006) << "OUTPUT: " << someOutput << endl;
 
@@ -126,7 +126,7 @@ void EditorsDialog::slotReceivedOutput( QString someOutput )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void EditorsDialog::slotReceivedErrors( QString someErrors )
+void EditorsDialog::slotReceivedErrors( TQString someErrors )
 {
     kdDebug(9006) << "ERRORS: " << someErrors << endl;
 }
diff --git a/vcs/cvsservice/editorsdialog.h b/vcs/cvsservice/editorsdialog.h
index 1aedbc64..8feecfaf 100644
--- a/vcs/cvsservice/editorsdialog.h
+++ b/vcs/cvsservice/editorsdialog.h
@@ -23,21 +23,21 @@ class EditorsDialog: public EditorsDialogBase, virtual public CVSServiceDCOPIfac
 {
 Q_OBJECT
 public:
-    EditorsDialog(CvsService_stub *cvsService, QWidget *parent = 0, const char *name = 0);
+    EditorsDialog(CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0);
     virtual ~EditorsDialog();
     
-    void startjob(QString strDir);
+    void startjob(TQString strDir);
 
 private slots:
     // DCOP Iface
     virtual void slotJobExited( bool normalExit, int exitStatus );
-    virtual void slotReceivedOutput( QString someOutput );
-    virtual void slotReceivedErrors( QString someErrors );
+    virtual void slotReceivedOutput( TQString someOutput );
+    virtual void slotReceivedErrors( TQString someErrors );
 
 private:    
     CvsService_stub *m_cvsService;
     CvsJob_stub *m_cvsJob;
-    QString m_output;
+    TQString m_output;
 };
 
 #endif
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
index 617e66a3..1bbc3b11 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
@@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevcvsserviceintegrator");
 typedef KDevGenericFactory CVSIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) )
 
-CVSServiceIntegrator::CVSServiceIntegrator(QObject* parent, const char* name, 
-    const QStringList args)
+CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, 
+    const TQStringList args)
     :KDevVCSIntegrator(parent, name)
 {
 }
@@ -38,12 +38,12 @@ CVSServiceIntegrator::~CVSServiceIntegrator( )
 {
 }
 
-VCSDialog* CVSServiceIntegrator::fetcher(QWidget* parent)
+VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* parent)
 {
     return 0;
 }
 
-VCSDialog* CVSServiceIntegrator::integrator(QWidget* parent)
+VCSDialog* CVSServiceIntegrator::integrator(TQWidget* parent)
 {
     IntegratorDlg *dlg = new IntegratorDlg(this, parent);
     return dlg;
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h
index 12ba8ef8..c02547a4 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.h
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h
@@ -22,16 +22,16 @@
 
 #include 
 
-#include 
+#include 
 
 class CVSServiceIntegrator: public KDevVCSIntegrator {
 Q_OBJECT
 public:
-    CVSServiceIntegrator(QObject* parent, const char* name, const QStringList args = QStringList());
+    CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     virtual ~CVSServiceIntegrator();
 
-    virtual VCSDialog* fetcher(QWidget* parent);
-    virtual VCSDialog* integrator(QWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* parent);
+    virtual VCSDialog* integrator(TQWidget* parent);
     
 };
 
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index b85b9984..32184c45 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -19,13 +19,13 @@
  ***************************************************************************/
 #include "integratordlg.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -40,17 +40,17 @@
 
 #include "initdlg.h"
 
-IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, QWidget *parent, const char *name)
+IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent, const char *name)
     :IntegratorDlgBase(parent, name), m_integrator(integrator)
 {
-    QFile cvspass(QDir::homeDirPath() + "/.cvspass");
+    TQFile cvspass(TQDir::homeDirPath() + "/.cvspass");
     if (cvspass.open(IO_ReadOnly))
     {
-        QTextStream stream(&cvspass);
+        TQTextStream stream(&cvspass);
         while (!stream.atEnd())
         {
-            QString line = stream.readLine();
-            QStringList recs = QStringList::split(" ", line, false);
+            TQString line = stream.readLine();
+            TQStringList recs = TQStringList::split(" ", line, false);
             repository->insertItem(recs[1]);
         }
         cvspass.close();
@@ -61,19 +61,19 @@ void IntegratorDlg::init_clicked()
 {
     KDialogBase dlg(KDialogBase::Plain, i18n("Init CVS Repository"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok);
     dlg.plainPage()->setMargin(0);
-    (new QVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true);
+    (new TQVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true);
     InitDlg *initDlg = new InitDlg(dlg.plainPage());
     initDlg->show();
 
     initDlg->location->setFocus();
     initDlg->location->setMode(KFile::Directory);
-    QRegExp localrep(":local:(.*)");
+    TQRegExp localrep(":local:(.*)");
     if (localrep.search(repository->currentText()) != -1)
         initDlg->location->setURL(localrep.cap(1));
 
-    if (dlg.exec() == QDialog::Accepted)
+    if (dlg.exec() == TQDialog::Accepted)
     {
-        QString url = initDlg->location->url();
+        TQString url = initDlg->location->url();
         KProcess *proc = new KProcess();
         *proc << "cvs";
         *proc << "-d" << url << "init";
@@ -84,21 +84,21 @@ void IntegratorDlg::init_clicked()
             KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
         else
         {
-            repository->insertItem(QString(":local:%1").arg(url));
-            repository->setCurrentText(QString(":local:%1").arg(url));
+            repository->insertItem(TQString(":local:%1").arg(url));
+            repository->setCurrentText(TQString(":local:%1").arg(url));
         }
     }
 }
 
 void IntegratorDlg::login_clicked()
 {
-    QCString appId;
-    QString error;
+    TQCString appId;
+    TQString error;
 
     if (KApplication::startServiceByDesktopName("cvsservice",
-        QStringList(), &error, &appId))
+        TQStringList(), &error, &appId))
     {
-        QString msg = i18n("Unable to find the Cervisia KPart. \n"
+        TQString msg = i18n("Unable to find the Cervisia KPart. \n"
             "Cervisia Integration will not be available. Please check your\n"
             "Cervisia installation and re-try. Reason was:\n") + error;
         KMessageBox::error(this, msg, "DCOP Error");
@@ -122,7 +122,7 @@ void IntegratorDlg::accept()
     proc->setWorkingDirectory(m_projectLocation);
     *proc << "cvs";
     *proc << "-d" << repository->currentText() << "import"
-        << "-m" << QString("\"%1\"").arg(comment->text()) << module->text()
+        << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text()
         << vendorTag->text() << releaseTag->text();
     proc->start(KProcess::Block);
     if (!proc->normalExit())
@@ -134,7 +134,7 @@ void IntegratorDlg::accept()
         kdDebug() << "Project is in: " << m_projectLocation << endl;
 
         KURL url = KURL::fromPathOrURL(m_projectLocation);
-        QString up = url.upURL().path();
+        TQString up = url.upURL().path();
         kdDebug() << "Up is: " << up << endl;
 
         //delete sources in project dir
@@ -151,13 +151,13 @@ void IntegratorDlg::accept()
         coproc->start(KProcess::Block);
     }
 
-/*    QCString appId;
-    QString error;
+/*    TQCString appId;
+    TQString error;
 
     if (KApplication::startServiceByDesktopName("cvsservice",
-        QStringList(), &error, &appId))
+        TQStringList(), &error, &appId))
     {
-        QString msg = i18n("Unable to find the Cervisia KPart. \n"
+        TQString msg = i18n("Unable to find the Cervisia KPart. \n"
             "Cervisia Integration will not be available. Please check your\n"
             "Cervisia installation and re-try. Reason was:\n") + error;
         KMessageBox::error(this, msg, "DCOP Error");
@@ -175,12 +175,12 @@ void IntegratorDlg::createModule_clicked()
 {
 }
 
-QWidget *IntegratorDlg::self()
+TQWidget *IntegratorDlg::self()
 {
     return const_cast(this);
 }
 
-void IntegratorDlg::init(const QString &projectName, const QString &projectLocation)
+void IntegratorDlg::init(const TQString &projectName, const TQString &projectLocation)
 {
     if( m_projectName != projectName )
         module->setText(projectName);
diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h
index f262be18..a69a7a91 100644
--- a/vcs/cvsservice/integrator/integratordlg.h
+++ b/vcs/cvsservice/integrator/integratordlg.h
@@ -28,10 +28,10 @@ class QDomDocument;
 class IntegratorDlg: public IntegratorDlgBase, public VCSDialog {
 Q_OBJECT
 public:
-    IntegratorDlg(CVSServiceIntegrator *integrator, QWidget *parent = 0, const char *name = 0);
+    IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent = 0, const char *name = 0);
 
-    virtual QWidget *self();
-    virtual void init(const QString &projectName, const QString &projectLocation);
+    virtual TQWidget *self();
+    virtual void init(const TQString &projectName, const TQString &projectLocation);
 
 public slots:
     virtual void login_clicked();
@@ -41,8 +41,8 @@ public slots:
 
 private:
     CVSServiceIntegrator *m_integrator;
-    QString m_projectLocation;
-    QString m_projectName;
+    TQString m_projectLocation;
+    TQString m_projectName;
 };
 
 #endif
diff --git a/vcs/cvsservice/releaseinputdialog.cpp b/vcs/cvsservice/releaseinputdialog.cpp
index 31907769..91685a29 100644
--- a/vcs/cvsservice/releaseinputdialog.cpp
+++ b/vcs/cvsservice/releaseinputdialog.cpp
@@ -9,10 +9,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include 
+#include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include "releaseinputdialog.h"
 
@@ -20,7 +20,7 @@
 // class ReleaseInputDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-ReleaseInputDialog::ReleaseInputDialog( QWidget* parent)
+ReleaseInputDialog::ReleaseInputDialog( TQWidget* parent)
     : ReleaseInputDialogBase( parent, "releaseinputdialog", true, 0 )
 {
 }
@@ -40,14 +40,14 @@ bool ReleaseInputDialog::isRevert() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString ReleaseInputDialog::release() const
+TQString ReleaseInputDialog::release() const
 {
     if (type() == byRevision)
         return " -r " + revisionEdit->text();
     else if (type() == byDate)
         return " -D " + dateEdit->text();
     else
-        return QString::null;
+        return TQString::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/vcs/cvsservice/releaseinputdialog.h b/vcs/cvsservice/releaseinputdialog.h
index 5de2c3e6..e00b0b04 100644
--- a/vcs/cvsservice/releaseinputdialog.h
+++ b/vcs/cvsservice/releaseinputdialog.h
@@ -27,17 +27,17 @@ public:
     * C-tor
     * @param parent
     */
-    ReleaseInputDialog( QWidget* parent = 0 );
+    ReleaseInputDialog( TQWidget* parent = 0 );
     /**
     * Destructor
     */
     virtual ~ReleaseInputDialog();
 
     /**
-    * @return a QString formatted as "-r  " or "-D  "
+    * @return a TQString formatted as "-r  " or "-D  "
     *         so it can be embedded in the command line.
     */
-    QString release() const;
+    TQString release() const;
 
     /**
     * @return true if the user has checked "rever": enforce operation then even
diff --git a/vcs/cvsservice/tagdialog.cpp b/vcs/cvsservice/tagdialog.cpp
index 846cfce9..33aca057 100644
--- a/vcs/cvsservice/tagdialog.cpp
+++ b/vcs/cvsservice/tagdialog.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include 
-#include 
+#include 
 
 #include "tagdialog.h"
 
@@ -18,7 +18,7 @@
 // class TagDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-TagDialog::TagDialog( const QString &caption, QWidget *parent, const char *name )
+TagDialog::TagDialog( const TQString &caption, TQWidget *parent, const char *name )
     : TagDialogBase( parent, name ? name : "tagdialog", true )
 {
     if (!caption.isEmpty())
@@ -45,14 +45,14 @@ void TagDialog::accept()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString TagDialog::tagName() const
+TQString TagDialog::tagName() const
 {
     return tagBranchEdit->text();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-QString TagDialog::branchName() const
+TQString TagDialog::branchName() const
 {
     return tagName();
 }
diff --git a/vcs/cvsservice/tagdialog.h b/vcs/cvsservice/tagdialog.h
index 86b63010..6c34cfe9 100644
--- a/vcs/cvsservice/tagdialog.h
+++ b/vcs/cvsservice/tagdialog.h
@@ -24,17 +24,17 @@ class TagDialog : public TagDialogBase
 {
     Q_OBJECT
 public:
-    TagDialog( const QString &caption, QWidget *parent = 0, const char *name = 0 );
+    TagDialog( const TQString &caption, TQWidget *parent = 0, const char *name = 0 );
     virtual ~TagDialog();
 
     /**
     * @return the tag name selected by the user
     */
-    QString tagName() const;
+    TQString tagName() const;
     /**
     * @return the branch name selected by the user
     */
-    QString branchName() const;
+    TQString branchName() const;
     /**
     * @return true if the user want to branch the selected files
     */
diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp
index 8a9be561..a6aa98b9 100644
--- a/vcs/perforce/commitdlg.cpp
+++ b/vcs/perforce/commitdlg.cpp
@@ -12,11 +12,11 @@
 
 #include "commitdlg.h"
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -28,38 +28,38 @@
 
 #include "execcommand.h"
 
-CommitDialog::CommitDialog( QWidget *parent, const char *name )
+CommitDialog::CommitDialog( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true, i18n("Perforce Submit"), Ok|Cancel|Details )
 {
-    QWidget *w = new QWidget( this, "main widget" );
+    TQWidget *w = new TQWidget( this, "main widget" );
     setMainWidget( w );
 
-    edit = new QTextEdit( w );
-    QFontMetrics fm(edit->fontMetrics());
+    edit = new TQTextEdit( w );
+    TQFontMetrics fm(edit->fontMetrics());
     edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3);
 
-    QVBoxLayout *layout = new QVBoxLayout( w, 0, spacingHint() );
-    QLabel *editLabel = new QLabel(i18n("&Enter description:"), w);
+    TQVBoxLayout *layout = new TQVBoxLayout( w, 0, spacingHint() );
+    TQLabel *editLabel = new TQLabel(i18n("&Enter description:"), w);
     editLabel->setBuddy(edit);
     layout->addWidget(editLabel);
     layout->addWidget(edit);
 
-    w = new QWidget( this, "details widget" );
+    w = new TQWidget( this, "details widget" );
 
     clientEdit = new KLineEdit( w );
     userEdit = new KLineEdit( w );
     filesBox = new KListBox( w );
 
-    layout = new QVBoxLayout( w, 0, spacingHint() );
-    QLabel *clientLabel = new QLabel(i18n("C&lient:"), w);
+    layout = new TQVBoxLayout( w, 0, spacingHint() );
+    TQLabel *clientLabel = new TQLabel(i18n("C&lient:"), w);
     clientLabel->setBuddy(clientEdit);
     layout->addWidget(clientLabel);
     layout->addWidget( clientEdit );
-    QLabel *userLabel = new QLabel(i18n("&User:"), w);
+    TQLabel *userLabel = new TQLabel(i18n("&User:"), w);
     userLabel->setBuddy(userEdit);
     layout->addWidget( userLabel );
     layout->addWidget( userEdit );
-    QLabel *filesLabel = new QLabel(i18n("&File(s):"), w);
+    TQLabel *filesLabel = new TQLabel(i18n("&File(s):"), w);
     filesLabel->setBuddy(filesBox);
     layout->addWidget( filesLabel );
     layout->addWidget( filesBox );
@@ -79,49 +79,49 @@ void CommitDialog::autoGuess()
 
     cenv = getenv( "P4USER" );
     if ( cenv ) {
-        setUser( QString::fromLocal8Bit( cenv ) );
+        setUser( TQString::fromLocal8Bit( cenv ) );
     }
 
     cenv = getenv( "P4CLIENT" );
     if ( cenv ) {
-        setClient( QString::fromLocal8Bit( cenv ) );
+        setClient( TQString::fromLocal8Bit( cenv ) );
     }
 }
 
-void CommitDialog::setFiles( const QStringList& lst )
+void CommitDialog::setFiles( const TQStringList& lst )
 {
     filesBox->clear();
     setDepotFiles( lst );
 }
 
-void CommitDialog::setDepotFiles( const QStringList& lst )
+void CommitDialog::setDepotFiles( const TQStringList& lst )
 {
-    QStringList args;
+    TQStringList args;
 
     args << "files";
-    for ( QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+    for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         args << (*it);
     }
 
-    ExecCommand* cmd = new ExecCommand( "p4", args, QString::null, QStringList(), this );
-    connect( cmd, SIGNAL(finished( const QString&, const QString& )),
-	     this, SLOT(getFilesFinished( const QString&, const QString& )) );
+    ExecCommand* cmd = new ExecCommand( "p4", args, TQString::null, TQStringList(), this );
+    connect( cmd, TQT_SIGNAL(finished( const TQString&, const TQString& )),
+	     this, TQT_SLOT(getFilesFinished( const TQString&, const TQString& )) );
 }
 
-void CommitDialog::getFilesFinished( const QString& out, const QString& /* err */ )
+void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err */ )
 {
-    QStringList lst = QStringList::split( QChar('\n'), out );
-    for ( QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
-        int pos = (*it).find( QChar('#') );
+    TQStringList lst = TQStringList::split( TQChar('\n'), out );
+    for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+        int pos = (*it).find( TQChar('#') );
         if ( pos > 1 && (*it).startsWith( "//" ) ) {
             filesBox->insertItem( (*it).left( pos ) );
         }
     }
 }
 
-QString CommitDialog::changeList() const
+TQString CommitDialog::changeList() const
 {
-    QString lst;
+    TQString lst;
 
     lst += "Change: new\n"
            "Client: " + client() + "\n"
@@ -129,7 +129,7 @@ QString CommitDialog::changeList() const
            "Status: new\n"
            "Description:\n        ";
 
-    lst += logMessage().replace(QRegExp("\n"), "\n        ") + "\n\n";
+    lst += logMessage().replace(TQRegExp("\n"), "\n        ") + "\n\n";
 
     lst += "Files:\n";
 
diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h
index 390681fd..09a9c72f 100644
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@@ -13,8 +13,8 @@
 #ifndef _COMMITDIALOG_H_
 #define _COMMITDIALOG_H_
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -25,17 +25,17 @@ class CommitDialog : public KDialogBase
 {
     Q_OBJECT
 public:
-    CommitDialog( QWidget *parent = 0, const char *name = 0 );
+    CommitDialog( TQWidget *parent = 0, const char *name = 0 );
     ~CommitDialog();
 
-    QString logMessage() const { return edit->text(); }
-    QString user() const { return userEdit->text(); }
-    QString client() const { return clientEdit->text(); }
-    QString changeList() const;
+    TQString logMessage() const { return edit->text(); }
+    TQString user() const { return userEdit->text(); }
+    TQString client() const { return clientEdit->text(); }
+    TQString changeList() const;
     
-    void setUser( const QString& usr ) { userEdit->setText( usr ); }
-    void setClient( const QString& clnt ) { clientEdit->setText( clnt ); }
-    void setFiles( const QStringList& lst ); 
+    void setUser( const TQString& usr ) { userEdit->setText( usr ); }
+    void setClient( const TQString& clnt ) { clientEdit->setText( clnt ); }
+    void setFiles( const TQStringList& lst ); 
 
     /** tries to fill out user and client */
     void autoGuess();    
@@ -44,11 +44,11 @@ protected slots:
     void accept();
 
 private slots:
-    void getFilesFinished( const QString& out, const QString& err );
+    void getFilesFinished( const TQString& out, const TQString& err );
 
 private:
-    void setDepotFiles( const QStringList& lst );
-    QTextEdit *edit;
+    void setDepotFiles( const TQStringList& lst );
+    TQTextEdit *edit;
     KLineEdit *clientEdit, *userEdit;
     KListBox  *filesBox;
 };
diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp
index 74964edb..bc7c0988 100644
--- a/vcs/perforce/integrator/perforceintegrator.cpp
+++ b/vcs/perforce/integrator/perforceintegrator.cpp
@@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevperforceintegrator");
 typedef KDevGenericFactory PerforceIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) )
 
-PerforceIntegrator::PerforceIntegrator(QObject* parent, const char* name,
-    const QStringList // args
+PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name,
+    const TQStringList // args
                                        )
     :KDevVCSIntegrator(parent, name)
 {
@@ -39,13 +39,13 @@ PerforceIntegrator::~PerforceIntegrator()
 {
 }
 
-VCSDialog* PerforceIntegrator::fetcher(QWidget* // parent
+VCSDialog* PerforceIntegrator::fetcher(TQWidget* // parent
                                        )
 {
     return 0;
 }
 
-VCSDialog* PerforceIntegrator::integrator(QWidget* parent)
+VCSDialog* PerforceIntegrator::integrator(TQWidget* parent)
 {
     PFIntegratorDlg *dlg = new PFIntegratorDlg(parent);
     return dlg;
diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h
index a47c7ee7..1d047826 100644
--- a/vcs/perforce/integrator/perforceintegrator.h
+++ b/vcs/perforce/integrator/perforceintegrator.h
@@ -22,17 +22,17 @@
 
 #include 
 
-#include 
+#include 
 
 class PerforceIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
 public:
-    PerforceIntegrator(QObject* parent, const char* name, const QStringList args = QStringList());
+    PerforceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~PerforceIntegrator();
 
-    virtual VCSDialog* fetcher(QWidget* parent);
-    virtual VCSDialog* integrator(QWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* parent);
+    virtual VCSDialog* integrator(TQWidget* parent);
 
 };
 
diff --git a/vcs/perforce/integrator/pfintegratordlg.cpp b/vcs/perforce/integrator/pfintegratordlg.cpp
index e93e8b3e..8685b2f4 100644
--- a/vcs/perforce/integrator/pfintegratordlg.cpp
+++ b/vcs/perforce/integrator/pfintegratordlg.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "pfintegratordlg.h"
 
-PFIntegratorDlg::PFIntegratorDlg(QWidget *parent, const char *name)
+PFIntegratorDlg::PFIntegratorDlg(TQWidget *parent, const char *name)
     :PFIntegratorDlgBase(parent, name)
 {
 }
@@ -28,11 +28,11 @@ void PFIntegratorDlg::accept()
 {
 }
 
-void PFIntegratorDlg::init(const QString &/*projectName*/, const QString &/*projectLocation*/)
+void PFIntegratorDlg::init(const TQString &/*projectName*/, const TQString &/*projectLocation*/)
 {
 }
 
-QWidget *PFIntegratorDlg::self()
+TQWidget *PFIntegratorDlg::self()
 {
     return const_cast(this);
 }
diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h
index 2389c826..750795b6 100644
--- a/vcs/perforce/integrator/pfintegratordlg.h
+++ b/vcs/perforce/integrator/pfintegratordlg.h
@@ -26,11 +26,11 @@
 class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
 public:
-    PFIntegratorDlg(QWidget *parent = 0, const char *name = 0);
+    PFIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
     
     virtual void accept();
-    virtual void init(const QString &projectName, const QString &projectLocation);
-    virtual QWidget *self();
+    virtual void init(const TQString &projectName, const TQString &projectLocation);
+    virtual TQWidget *self();
 };
 
 #endif
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 9aeadc6f..cb3d7ba9 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -12,9 +12,9 @@
 
 #include "perforcepart.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -38,14 +38,14 @@ static const KDevPluginInfo data("kdevperforce");
 typedef KDevGenericFactory PerforceFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) )
 
-PerforcePart::PerforcePart( QObject *parent, const char *name, const QStringList & )
+PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & )
     : KDevVersionControl( &data, parent, name ? name : "PerforcePart" )
 {
     setInstance(PerforceFactory::instance());
     setupActions();
 
-    connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)),
-             this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
+    connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+             this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 }
 
 
@@ -54,88 +54,88 @@ PerforcePart::~PerforcePart()
 
 void PerforcePart::setupActions()
 {
-    actionEdit = new KAction( i18n("Edit"), 0, this, SLOT(slotActionEdit()),
+    actionEdit = new KAction( i18n("Edit"), 0, this, TQT_SLOT(slotActionEdit()),
                 actionCollection(), "perforce_edit" );
     actionEdit->setToolTip(i18n("Edit"));
     actionEdit->setWhatsThis(i18n("Edit
        Opens file(s) in a client workspace for edit."));
-    actionRevert = new KAction( i18n("Revert"), 0, this, SLOT(slotActionRevert()),
+    actionRevert = new KAction( i18n("Revert"), 0, this, TQT_SLOT(slotActionRevert()),
                 actionCollection(), "perforce_revert" );
     actionRevert->setToolTip(i18n("Revert"));
     actionRevert->setWhatsThis(i18n("Revert
        Discards changes made to open files."));
-    actionSubmit = new KAction( i18n("Submit"), 0, this, SLOT(slotActionCommit()),
+    actionSubmit = new KAction( i18n("Submit"), 0, this, TQT_SLOT(slotActionCommit()),
                 actionCollection(), "perforce_submit" );
     actionSubmit->setToolTip(i18n("Submit"));
     actionSubmit->setWhatsThis(i18n("Submit
        Sends changes made to open files to the depot."));
-    actionSync = new KAction( i18n("Sync"), 0, this, SLOT(slotActionUpdate()),
+    actionSync = new KAction( i18n("Sync"), 0, this, TQT_SLOT(slotActionUpdate()),
                 actionCollection(), "perforce_sync" );
     actionSync->setToolTip(i18n("Sync"));
     actionSync->setWhatsThis(i18n("Sync
        Copies files from the depot into the workspace."));
-    actionDiff = new KAction( i18n("Diff Against Repository"), 0, this, SLOT(slotActionDiff()),
+    actionDiff = new KAction( i18n("Diff Against Repository"), 0, this, TQT_SLOT(slotActionDiff()),
                 actionCollection(), "perforce_diff" );
     actionDiff->setToolTip(i18n("Diff against repository"));
     actionDiff->setWhatsThis(i18n("Diff against repository
        Compares a client workspace file to a revision in the depot."));
-    actionAdd = new KAction( i18n("Add to Repository"), 0, this, SLOT(slotActionAdd()),
+    actionAdd = new KAction( i18n("Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()),
                 actionCollection(), "perforce_add" );
     actionAdd->setToolTip(i18n("Add to repository"));
     actionAdd->setWhatsThis(i18n("Add to repository
        Open file(s) in a client workspace for addition to the depot."));
-    actionRemove = new KAction( i18n("Remove From Repository"), 0, this, SLOT(slotActionRemove()),
+    actionRemove = new KAction( i18n("Remove From Repository"), 0, this, TQT_SLOT(slotActionRemove()),
                 actionCollection(), "perforce_remove" );
     actionRemove->setToolTip(i18n("Remove from repository"));
     actionRemove->setWhatsThis(i18n("Remove from repository
        Open file(s) in a client workspace for deletion from the depot."));
 }
 
-void PerforcePart::contextMenu(QPopupMenu *popup, const Context *context)
+void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context)
 {
     if (context->hasType( Context::FileContext )) {
         const FileContext *fcontext = static_cast(context);
         popupfile = fcontext->urls().first().path();
-        QFileInfo fi( popupfile );
+        TQFileInfo fi( popupfile );
         popup->insertSeparator();
 
         KPopupMenu *sub = new KPopupMenu(popup);
-        QString name = fi.fileName();
+        TQString name = fi.fileName();
         sub->insertTitle( i18n("Actions for %1").arg(name) );
 
         int id = sub->insertItem( i18n("Edit"),
-                           this, SLOT(slotEdit()) );
+                           this, TQT_SLOT(slotEdit()) );
         sub->setWhatsThis(id, i18n("Edit
        Opens file(s) in a client workspace for edit."));
         id = sub->insertItem( i18n("Revert"),
-                           this, SLOT(slotRevert()) );
+                           this, TQT_SLOT(slotRevert()) );
         sub->setWhatsThis(id, i18n("Revert
        Discards changes made to open files."));
         id = sub->insertItem( i18n("Submit"),
-                           this, SLOT(slotCommit()) );
+                           this, TQT_SLOT(slotCommit()) );
         sub->setWhatsThis(id, i18n("Submit
        Sends changes made to open files to the depot."));
         id = sub->insertItem( i18n("Sync"),
-                           this, SLOT(slotUpdate()) );
+                           this, TQT_SLOT(slotUpdate()) );
         sub->setWhatsThis(id, i18n("Sync
        Copies files from the depot into the workspace."));
         sub->insertSeparator();
         id = sub->insertItem( i18n("Diff Against Repository"),
-                          this, SLOT(slotDiff()) );
+                          this, TQT_SLOT(slotDiff()) );
         sub->setWhatsThis(id, i18n("Diff against repository
        Compares a client workspace file to a revision in the depot."));
         id = sub->insertItem( i18n("Add to Repository"),
-                           this, SLOT(slotAdd()) );
+                           this, TQT_SLOT(slotAdd()) );
         sub->setWhatsThis(id, i18n("Add to repository
        Open file(s) in a client workspace for addition to the depot."));
         id = sub->insertItem( i18n("Remove From Repository"),
-                           this, SLOT(slotRemove()) );
+                           this, TQT_SLOT(slotRemove()) );
         sub->setWhatsThis(id, i18n("Remove from repository
        Open file(s) in a client workspace for deletion from the depot."));
         id = popup->insertItem(i18n("Perforce"), sub);
     }
 }
 
-void PerforcePart::execCommand( const QString& cmd, const QString& filename )
+void PerforcePart::execCommand( const TQString& cmd, const TQString& filename )
 {
     if ( filename.isEmpty() )
         return;
 
-    QFileInfo fi( filename );
+    TQFileInfo fi( filename );
     if (fi.isDir()) {
         KMessageBox::error( 0, i18n("Cannot handle directories, please select single files") );
         return;
     }
-    QString dir = fi.dirPath();
-    QString name = fi.fileName();
+    TQString dir = fi.dirPath();
+    TQString name = fi.fileName();
 
-    QString command("cd ");
+    TQString command("cd ");
     command += KProcess::quote(dir);
     command += " && p4 " + cmd + " ";
     command += name;
@@ -144,43 +144,43 @@ void PerforcePart::execCommand( const QString& cmd, const QString& filename )
         makeFrontend->queueCommand(dir, command);
 }
 
-void PerforcePart::edit( const QString& filename )
+void PerforcePart::edit( const TQString& filename )
 {
     execCommand( "edit", filename );
 }
 
-void PerforcePart::revert( const QString& filename )
+void PerforcePart::revert( const TQString& filename )
 {
     if ( KMessageBox::questionYesNo( 0,
             i18n("Do you really want to revert "
-                 "the file %1 and lose all your changes?").arg( filename ), QString::null, i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
+                 "the file %1 and lose all your changes?").arg( filename ), TQString::null, i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
         execCommand( "revert", filename );
     }
 }
 
-void PerforcePart::commit( const QString& filename )
+void PerforcePart::commit( const TQString& filename )
 {
     if ( filename.isEmpty() )
         return;
 
-    QFileInfo fi( filename );
+    TQFileInfo fi( filename );
     if ( fi.isDir() ) {
         KMessageBox::error( 0, i18n("Submitting of subdirectories is not supported") );
         return;
     }
 
     CommitDialog d;
-    QStringList lst;
+    TQStringList lst;
     lst << filename;
     d.setFiles( lst );
-    if (d.exec() == QDialog::Rejected)
+    if (d.exec() == TQDialog::Rejected)
         return;
 
-    QString message = d.changeList();
+    TQString message = d.changeList();
     if (!message.isEmpty())
      message = KShellProcess::quote(message);
 
-    QString command("echo " + message);
+    TQString command("echo " + message);
     command += " | p4 submit -i";
 
     if (KDevMakeFrontend *makeFrontend = extension("KDevelop/MakeFrontend"))
@@ -188,13 +188,13 @@ void PerforcePart::commit( const QString& filename )
 }
 
 
-void PerforcePart::update( const QString& filename )
+void PerforcePart::update( const TQString& filename )
 {
     if ( filename.isEmpty() )
         return;
 
-    QString dir, name;
-    QFileInfo fi( filename );
+    TQString dir, name;
+    TQFileInfo fi( filename );
     if (fi.isDir()) {
         dir = fi.absFilePath();
         name = "..."; // three dots means "recoursive"
@@ -203,7 +203,7 @@ void PerforcePart::update( const QString& filename )
         name = fi.fileName();
     }
 
-    QString command("cd ");
+    TQString command("cd ");
     command += KProcess::quote(dir);
     command += " && p4 sync ";
     command += name;
@@ -213,41 +213,41 @@ void PerforcePart::update( const QString& filename )
 }
 
 
-void PerforcePart::add( const QString& filename )
+void PerforcePart::add( const TQString& filename )
 {
     execCommand( "add", filename );
 }
 
 
-void PerforcePart::remove( const QString& filename )
+void PerforcePart::remove( const TQString& filename )
 {
     execCommand( "delete", filename );
 }
 
-void PerforcePart::diff( const QString& filename )
+void PerforcePart::diff( const TQString& filename )
 {
     if ( filename.isEmpty() )
         return;
 
-    QString name;
-    QFileInfo fi( filename );
+    TQString name;
+    TQFileInfo fi( filename );
 
     if ( fi.isDir() ) {
 	name = fi.absFilePath() + "...";
     } else {
 	name = filename;
     }
-    QStringList args;
+    TQStringList args;
 
     args << "diff";
     args << "-du";
     args << name;
-    ExecCommand* cmv = new ExecCommand( "p4", args, QString::null, QStringList(), this );
-    connect( cmv, SIGNAL(finished( const QString&, const QString& )),
-             this, SLOT(slotDiffFinished( const QString&, const QString& )) );
+    ExecCommand* cmv = new ExecCommand( "p4", args, TQString::null, TQStringList(), this );
+    connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )),
+             this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) );
 }
 
-void PerforcePart::slotDiffFinished( const QString& diff, const QString& err )
+void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err )
 {
     if ( diff.isNull() && err.isNull() ) {
         kdDebug(9000) << "p4 diff cancelled" << endl;
@@ -261,7 +261,7 @@ void PerforcePart::slotDiffFinished( const QString& diff, const QString& err )
 
     if ( !err.isEmpty() ) {
         int s = KMessageBox::warningContinueCancelList( 0, i18n("P4 output errors during diff. Do you still want to continue?"),
-                        QStringList::split( "\n", err, false ), i18n("Errors During Diff") );
+                        TQStringList::split( "\n", err, false ), i18n("Errors During Diff") );
         if ( s != KMessageBox::Continue )
             return;
     }
@@ -272,16 +272,16 @@ void PerforcePart::slotDiffFinished( const QString& diff, const QString& err )
     }
 
     // strip the ==== headers
-    static QRegExp rx( "(^|\\n)==== ([^ ]+) -.*====\\n" );
+    static TQRegExp rx( "(^|\\n)==== ([^ ]+) -.*====\\n" );
     rx.setMinimal( true );
-    QString strippedDiff = diff;
+    TQString strippedDiff = diff;
     strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" );
 
     if (KDevDiffFrontend *diffFrontend = extension("KDevelop/DiffFrontend"))
         diffFrontend->showDiff( strippedDiff );
 }
 
-QString PerforcePart::currentFile()
+TQString PerforcePart::currentFile()
 {
     KParts::ReadOnlyPart *part = dynamic_cast( partController()->activePart() );
     if ( part ) {
@@ -289,7 +289,7 @@ QString PerforcePart::currentFile()
         if ( url.isLocalFile() )
             return url.path();
     }
-    return QString::null;
+    return TQString::null;
 }
 
 void PerforcePart::slotActionCommit()
diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h
index 5a50871c..073a14ce 100644
--- a/vcs/perforce/perforcepart.h
+++ b/vcs/perforce/perforcepart.h
@@ -25,20 +25,20 @@ class PerforcePart : public KDevVersionControl
     Q_OBJECT
 
 public:
-    PerforcePart( QObject *parent, const char *name, const QStringList & );
+    PerforcePart( TQObject *parent, const char *name, const TQStringList & );
     ~PerforcePart();
 
-    virtual QString shortDescription() const
+    virtual TQString shortDescription() const
     { return i18n( "Perforce is a version control system" ); }
 
-    virtual void createNewProject(const QString& /* dir */) {}
+    virtual void createNewProject(const TQString& /* dir */) {}
     virtual bool fetchFromRepository() { return true; }
     virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return 0; }
-    virtual bool isValidDirectory(const QString& /* dirPath*/) const
+    virtual bool isValidDirectory(const TQString& /* dirPath*/) const
     { return true; }
 
 private slots:
-    void contextMenu(QPopupMenu *popup, const Context *context);
+    void contextMenu(TQPopupMenu *popup, const Context *context);
     void slotCommit();
     void slotUpdate();
     void slotAdd();
@@ -55,22 +55,22 @@ private slots:
     void slotActionRevert();
     void slotActionDiff();
 
-    void slotDiffFinished( const QString&, const QString& );
+    void slotDiffFinished( const TQString&, const TQString& );
 
 private:
-    void commit( const QString& filename );
-    void update( const QString& filename );
-    void add( const QString& filename );
-    void remove( const QString& filename );
-    void edit( const QString& filename );
-    void revert( const QString& filename );
-    void diff( const QString& filename );
-    QString currentFile();
+    void commit( const TQString& filename );
+    void update( const TQString& filename );
+    void add( const TQString& filename );
+    void remove( const TQString& filename );
+    void edit( const TQString& filename );
+    void revert( const TQString& filename );
+    void diff( const TQString& filename );
+    TQString currentFile();
 
     /** calls p4 with the command cmd and appends the filename */
-    void execCommand( const QString& cmd, const QString& filename );
+    void execCommand( const TQString& cmd, const TQString& filename );
     void setupActions();
-    QString popupfile;
+    TQString popupfile;
     KAction *actionEdit, *actionRevert,
             *actionSubmit, *actionSync,
             *actionDiff, *actionAdd, *actionRemove;
diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp
index e227dd67..c456f7c2 100644
--- a/vcs/subversion/commitdlg.cpp
+++ b/vcs/subversion/commitdlg.cpp
@@ -19,20 +19,20 @@
  ***************************************************************************/
 
 #include "commitdlg.h"
-#include 
+#include 
 #include 
 
-CommitDlg::CommitDlg( QWidget* parent )
+CommitDlg::CommitDlg( TQWidget* parent )
     : CommitDlgBase( parent )
 {
     textMessage->installEventFilter(this);
 }
 
-bool CommitDlg::eventFilter( QObject* obj, QEvent* ev )
+bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev )
 {
-    if( ev->type() == QEvent::KeyPress )
+    if( ev->type() == TQEvent::KeyPress )
     {
-        QKeyEvent* k = static_cast(ev);
+        TQKeyEvent* k = static_cast(ev);
         if( ( k->key() == Qt::Key_Return || k->key() == Qt::Key_Enter ) && k->state() == Qt::ControlButton )
         {
             accept();
diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h
index 4ac54054..da63e2f5 100644
--- a/vcs/subversion/commitdlg.h
+++ b/vcs/subversion/commitdlg.h
@@ -27,9 +27,9 @@ class CommitDlg : public CommitDlgBase
 {
     Q_OBJECT
 public:
-    CommitDlg( QWidget* = 0 );
+    CommitDlg( TQWidget* = 0 );
 protected:
-    bool eventFilter( QObject* o, QEvent* e );
+    bool eventFilter( TQObject* o, TQEvent* e );
 };
 
 #endif
diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp
index a620deaf..32d28d27 100644
--- a/vcs/subversion/integrator/subversionintegrator.cpp
+++ b/vcs/subversion/integrator/subversionintegrator.cpp
@@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevsubversionintegrator");
 typedef KDevGenericFactory SubversionIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) )
 
-SubversionIntegrator::SubversionIntegrator(QObject* parent, const char* name,
-    const QStringList // args
+SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name,
+    const TQStringList // args
                                            )
     :KDevVCSIntegrator(parent, name)
 {
@@ -39,13 +39,13 @@ SubversionIntegrator::~SubversionIntegrator()
 {
 }
 
-VCSDialog* SubversionIntegrator::fetcher(QWidget* // parent
+VCSDialog* SubversionIntegrator::fetcher(TQWidget* // parent
                                          )
 {
     return 0;
 }
 
-VCSDialog* SubversionIntegrator::integrator(QWidget* parent)
+VCSDialog* SubversionIntegrator::integrator(TQWidget* parent)
 {
     SvnIntegratorDlg *dlg = new SvnIntegratorDlg(parent);
     return dlg;
diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h
index 546bdc5c..e9b62d70 100644
--- a/vcs/subversion/integrator/subversionintegrator.h
+++ b/vcs/subversion/integrator/subversionintegrator.h
@@ -22,17 +22,17 @@
 
 #include 
 
-#include 
+#include 
 
 class SubversionIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
 public:
-    SubversionIntegrator(QObject* parent, const char* name, const QStringList args = QStringList());
+    SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
     ~SubversionIntegrator();
 
-    virtual VCSDialog* fetcher(QWidget* parent);
-    virtual VCSDialog* integrator(QWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* parent);
+    virtual VCSDialog* integrator(TQWidget* parent);
 
 };
 
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp
index afed1d3e..05572278 100644
--- a/vcs/subversion/integrator/svnintegratordlg.cpp
+++ b/vcs/subversion/integrator/svnintegratordlg.cpp
@@ -26,7 +26,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -38,7 +38,7 @@
 
 using namespace KIO;
 
-SvnIntegratorDlg::SvnIntegratorDlg( QWidget *parent, const char *name )
+SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name )
         : SvnIntegratorDlgBase( parent, name )
 {
     repos1->setMode( KFile::Directory );
@@ -64,8 +64,8 @@ void SvnIntegratorDlg::accept()
         miscURL.setPath( servURL.path() + "/trunk/" );
         list << miscURL;
 
-        QByteArray parms;
-        QDataStream s( parms, IO_WriteOnly );
+        TQByteArray parms;
+        TQDataStream s( parms, IO_WriteOnly );
         int cmd = 10; // MKDIR(list)
         s << cmd << list;
         KIO::SimpleJob* job = KIO::special( protocolUrl, parms, true );
@@ -74,8 +74,8 @@ void SvnIntegratorDlg::accept()
             return;
         }
 
-        QByteArray parms2;
-        QDataStream s2( parms2, IO_WriteOnly );
+        TQByteArray parms2;
+        TQDataStream s2( parms2, IO_WriteOnly );
         cmd = 5; //IMPORT
         servURL.setPath( servURL.path() + "/trunk/" );
         s2 << cmd << servURL << KURL::fromPathOrURL( m_projectLocation );
@@ -94,12 +94,12 @@ void SvnIntegratorDlg::accept()
     delete rmproc;
     rmproc = NULL;
 
-    QByteArray parms3;
-    QDataStream s3( parms3, IO_WriteOnly );
+    TQByteArray parms3;
+    TQDataStream s3( parms3, IO_WriteOnly );
     int cmd2 = 1; //CHECKOUT
     int rev = -1;
     
-    s3 << cmd2 << servURL << KURL::fromPathOrURL( m_projectLocation ) << rev << QString( "HEAD" );
+    s3 << cmd2 << servURL << KURL::fromPathOrURL( m_projectLocation ) << rev << TQString( "HEAD" );
     SimpleJob *job2 = KIO::special( protocolUrl, parms3, true );
     if( ! NetAccess::synchronousRun( job2, 0 ) ){
         // Checkout failed
@@ -108,13 +108,13 @@ void SvnIntegratorDlg::accept()
     }
 }
 
-void SvnIntegratorDlg::init( const QString &projectName, const QString &projectLocation )
+void SvnIntegratorDlg::init( const TQString &projectName, const TQString &projectLocation )
 {
     m_name = projectName;
     m_projectLocation = projectLocation;
 }
 
-QWidget *SvnIntegratorDlg::self()
+TQWidget *SvnIntegratorDlg::self()
 {
     return const_cast( this );
 }
diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h
index 96736023..f76cf95f 100644
--- a/vcs/subversion/integrator/svnintegratordlg.h
+++ b/vcs/subversion/integrator/svnintegratordlg.h
@@ -26,14 +26,14 @@
 class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
 public:
-    SvnIntegratorDlg(QWidget *parent = 0, const char *name = 0);
+    SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
     
     virtual void accept();
-    virtual void init(const QString &projectName, const QString &projectLocation);
-    virtual QWidget *self();
+    virtual void init(const TQString &projectName, const TQString &projectLocation);
+    virtual TQWidget *self();
 private:
-	QString m_name;
-	QString m_projectLocation;
+	TQString m_name;
+	TQString m_projectLocation;
 };
 
 #endif
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index 9195c24c..7b4a42d3 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -25,8 +25,8 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include "config.h"
 
@@ -36,71 +36,71 @@
 #include "commitdlg.h"
 
 extern "C" {
-    KDE_EXPORT KDEDModule *create_kdevsvnd(const QCString &name) {
+    KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) {
        return new KDevSvnd(name);
     }
 }
 
-KDevSvnd::KDevSvnd(const QCString &name)
+KDevSvnd::KDevSvnd(const TQCString &name)
  : KDEDModule(name) {
 }
 KDevSvnd::~KDevSvnd()
 {}
 
-QString KDevSvnd::commitDialog(QString modifiedFiles) {
+TQString KDevSvnd::commitDialog(TQString modifiedFiles) {
 	CommitDlg commitDlg;
 	commitDlg.setCaption(i18n("Enter Commit Log Message:"));
 	commitDlg.listMessage->setText( modifiedFiles );
 	int result = commitDlg.exec();
-	if ( result == QDialog::Accepted ) {
+	if ( result == TQDialog::Accepted ) {
 		return commitDlg.textMessage->text();
 	} else
-		return QString::null;
+		return TQString::null;
 }
-int KDevSvnd::sslServerTrustPrompt( QString errmsg, QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert )
+int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert )
 {
 	SvnSSLTrustPrompt dlg;
 	dlg.setupCertInfo( hostname, fingerPrint, validfrom, validuntil, issuerName, ascii_cert );
 	dlg.setupFailedReasonMsg( errmsg );
 	int result = dlg.exec();
-	if ( result == QDialog::Accepted ){
+	if ( result == TQDialog::Accepted ){
 		return dlg.code();
 	} else{
 		return -1;
 	}
 }
-QString KDevSvnd::sslCertFile()
+TQString KDevSvnd::sslCertFile()
 {
-	QString fileName = KFileDialog::getOpenFileName(QString::null,QString::null,0, i18n("Open SSL certificate file"));
+	TQString fileName = KFileDialog::getOpenFileName(TQString::null,TQString::null,0, i18n("Open SSL certificate file"));
 	return fileName;
 }
-QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
+TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 {
-	QCString passwd;
+	TQCString passwd;
 	int ret = KPasswordDialog::getPassword( passwd,promptMsg );
 	if( ret == KPasswordDialog::Accepted ){
-		QCString retstr;
+		TQCString retstr;
 		retstr.setNum(1);
 		return retstr + passwd;
 	} else{
-		QCString nullstr;
+		TQCString nullstr;
 		nullstr.setNum(-1);
 		return nullstr;
 	}
 }
 
 
-// void KDevSvnd::registerMe(const QCString &app)
+// void KDevSvnd::registerMe(const TQCString &app)
 // {
 // 	insert(app, "test", new TestObject(app));
 //    // When 'app' unregisters with DCOP, the TestObject will get deleted.
 // }
 
 // bool KSvnd::AreAnyFilesInSvn( const KURL::List& wclist ) {
-// 	for ( QValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
+// 	for ( TQValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
 // 		kdDebug( 9036 ) << "Checking file " << ( *it ) << endl;
-// 		QDir bdir ( ( *it ).path() );
-// 		if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
+// 		TQDir bdir ( ( *it ).path() );
+// 		if ( bdir.exists() && TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
 // 			return true;
 // 		} else if ( !bdir.exists() ) {
 // 			if ( isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + "/.svn/entries" ) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) )
@@ -111,10 +111,10 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // }
 //
 // bool KSvnd::AreAnyFilesNotInSvn( const KURL::List& wclist ) {
-// 	for ( QValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
+// 	for ( TQValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
 // 		kdDebug( 9036 ) << "Checking file " << ( *it ) << endl;
-// 		QDir bdir ( ( *it ).path() );
-// 		if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
+// 		TQDir bdir ( ( *it ).path() );
+// 		if ( bdir.exists() && !TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
 // 			return true;
 // 		} else if ( !bdir.exists() ) {
 // 			if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) )
@@ -125,10 +125,10 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // }
 //
 // bool KSvnd::AreAllFilesInSvn( const KURL::List& wclist ) {
-// 	for ( QValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
+// 	for ( TQValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
 // 		kdDebug( 9036 ) << "Checking file " << ( *it ) << endl;
-// 		QDir bdir ( ( *it ).path() );
-// 		if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
+// 		TQDir bdir ( ( *it ).path() );
+// 		if ( bdir.exists() && !TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
 // 			return false;
 // 		} else if ( !bdir.exists() ) {
 // 			if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" )  )
@@ -139,10 +139,10 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // }
 //
 // bool KSvnd::AreAllFilesNotInSvn( const KURL::List& wclist ) {
-// 	for ( QValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
+// 	for ( TQValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
 // 		kdDebug( 9036 ) << "Checking file " << ( *it ) << endl;
-// 		QDir bdir ( ( *it ).path() );
-// 		if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
+// 		TQDir bdir ( ( *it ).path() );
+// 		if ( bdir.exists() && TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
 // 			return false;
 // 		} else if ( !bdir.exists() ) {
 // 			if ( isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) )
@@ -152,11 +152,11 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // 	return true;
 // }
 //
-// bool KSvnd::isFileInSvnEntries ( const QString filename, const QString entfile ) {
-// 	QFile file( entfile );
+// bool KSvnd::isFileInSvnEntries ( const TQString filename, const TQString entfile ) {
+// 	TQFile file( entfile );
 // 	if ( file.open( IO_ReadOnly ) ) {
-// 		QTextStream stream( &file );
-// 		QString line;
+// 		TQTextStream stream( &file );
+// 		TQString line;
 // 		while ( !stream.atEnd() ) {
 // 			line = stream.readLine().simplifyWhiteSpace();
 // 			if ( line == "name=\""+ filename + "\"" ) {
@@ -169,11 +169,11 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // 	return false;
 // }
 //
-// bool KSvnd::isFileInExternals ( const QString filename, const QString propfile ) {
-// 	QFile file( propfile );
+// bool KSvnd::isFileInExternals ( const TQString filename, const TQString propfile ) {
+// 	TQFile file( propfile );
 // 	if ( file.open( IO_ReadOnly ) ) {
-// 		QTextStream stream( &file );
-// 		QStringList line;
+// 		TQTextStream stream( &file );
+// 		TQStringList line;
 // 		while ( !stream.atEnd() )
 // 			line << stream.readLine().simplifyWhiteSpace();
 // 		for ( uint i = 0 ; i < line.count(); i++ ) {
@@ -202,38 +202,38 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 //
 // bool KSvnd::anyNotValidWorkingCopy( const KURL::List& wclist ) {
 // 	bool result = true; //one negative match is enough
-// 	for ( QValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
+// 	for ( TQValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
 // 		//exception for .svn dirs
 // 		if ( ( *it ).path(-1).endsWith( "/.svn" ) )
 // 			return true;
 // 		//if is a directory check whether it contains a .svn/entries file
-// 		QDir dir( ( *it ).path() );
+// 		TQDir dir( ( *it ).path() );
 // 		if ( dir.exists() ) { //it's a dir
-// 			if ( !QFile::exists( ( *it ).path() + "/.svn/entries" ) )
+// 			if ( !TQFile::exists( ( *it ).path() + "/.svn/entries" ) )
 // 				result = false;
 // 		}
 //
 // 		//else check if ./.svn/entries exists
-// 		if ( !QFile::exists( ( *it ).directory() + "/.svn/entries" ) )
+// 		if ( !TQFile::exists( ( *it ).directory() + "/.svn/entries" ) )
 // 			result = false;
 // 	}
 // 	return result;
 // }
 //
 // bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) {
-// 	for ( QValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
+// 	for ( TQValueListConstIterator it = wclist.begin(); it != wclist.end() ; ++it ) {
 // 		//skip .svn dirs
 // 		if ( ( *it ).path(-1).endsWith( "/.svn" ) )
 // 			continue;
 // 		//if is a directory check whether it contains a .svn/entries file
-// 		QDir dir( ( *it ).path() );
+// 		TQDir dir( ( *it ).path() );
 // 		if ( dir.exists() ) { //it's a dir
-// 			if ( QFile::exists( ( *it ).path() + "/.svn/entries" ) )
+// 			if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) )
 // 				return true;
 // 		}
 //
 // 		//else check if ./.svn/entries exists
-// 		if ( QFile::exists( ( *it ).directory() + "/.svn/entries" ) )
+// 		if ( TQFile::exists( ( *it ).directory() + "/.svn/entries" ) )
 // 			return true;
 // 	}
 // 	return false;
@@ -242,7 +242,7 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // int KSvnd::getStatus( const KURL::List& list ) {
 // 	int result = 0;
 // 	uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
-// 	for ( QValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
+// 	for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
 // 		if ( isFolder ( ( *it ) ) ) {
 // 			folders++;
 // 		} else {
@@ -251,13 +251,13 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // 		if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy
 // 			parentsentries++;
 // 		} else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all)
-// 			if ( QFile::exists( ( *it ).path() + "/.svn/entries" ) )
+// 			if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) )
 // 				subdirhavesvn++;
 // 			if ( isFileInExternals( (*it).filename(), ( *it ).directory() + "/.svn/dir-props" ) ) {
 // 				external++;
 // 			}
 // 		}
-// 		if ( ( isFolder( ( *it ) ) && QFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || QFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ?
+// 		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ?
 // 			parentshavesvn++;
 // 	}
 // 	if ( files > 0 )
@@ -293,12 +293,12 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // }
 //
 // bool KSvnd::isFolder( const KURL& url ) {
-// 	QDir d( url.path() );
+// 	TQDir d( url.path() );
 // 	return d.exists();
 // }
 //
-// QStringList KSvnd::getActionMenu ( const KURL::List &list ) {
-// 	QStringList result;
+// TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
+// 	TQStringList result;
 // 	int listStatus = getStatus( list );
 //
 // 	if ( !(listStatus & SomeAreInParentsEntries) &&
@@ -347,8 +347,8 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // 	return result;
 // }
 //
-// QStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
-// 	QStringList result;
+// TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
+// 	TQStringList result;
 // 	int listStatus = getStatus( list );
 //
 //
@@ -364,28 +364,28 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg)
 // }
 //
 // #if 0
-// void KSvnd::notify(const QString& path, int action, int kind, const QString& mime_type, int content_state, int prop_state, long int revision, const QString& userstring) {
+// void KSvnd::notify(const TQString& path, int action, int kind, const TQString& mime_type, int content_state, int prop_state, long int revision, const TQString& userstring) {
 // 	kdDebug(9036) << "KDED/Subversion : notify " << path << " action : " << action << " mime_type : " << mime_type << " content_state : " << content_state << " prop_state : " << prop_state << " revision : " << revision << " userstring : " << userstring << endl;
-// 	QByteArray params;
+// 	TQByteArray params;
 //
-// 	QDataStream stream(params, IO_WriteOnly);
+// 	TQDataStream stream(params, IO_WriteOnly);
 // 	stream << path << action << kind << mime_type << content_state << prop_state << revision << userstring;
 //
-// 	emitDCOPSignal( "subversionNotify(QString,int,int,QString,int,int,long int,QString)", params );
+// 	emitDCOPSignal( "subversionNotify(TQString,int,int,TQString,int,int,long int,TQString)", params );
 // }
 //
-// void KSvnd::status(const QString& path, int text_status, int prop_status, int repos_text_status, int repos_prop_status, long int rev ) {
+// void KSvnd::status(const TQString& path, int text_status, int prop_status, int repos_text_status, int repos_prop_status, long int rev ) {
 // 	kdDebug(9036) << "KDED/Subversion : status " << path << " " << text_status << " " << prop_status << " "
 // 			<< repos_text_status << " " << repos_prop_status << " " << rev << endl;
-// 	QByteArray params;
+// 	TQByteArray params;
 //
-// 	QDataStream stream(params, IO_WriteOnly);
+// 	TQDataStream stream(params, IO_WriteOnly);
 // 	stream << path << text_status << prop_status << repos_text_status << repos_prop_status << rev;
 //
-// 	emitDCOPSignal( "subversionStatus(QString,int,int,int,int,long int)", params );
+// 	emitDCOPSignal( "subversionStatus(TQString,int,int,int,int,long int)", params );
 // }
 //
-// void KSvnd::popupMessage( const QString& message ) {
+// void KSvnd::popupMessage( const TQString& message ) {
 // 	kdDebug(9036) << "KDED/Subversion : popupMessage" << message << endl;
 // 	KMessageBox::information(0, message, i18n( "Subversion" ) );
 // }
diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h
index 831ebfdb..07943c18 100644
--- a/vcs/subversion/kdevsvnd.h
+++ b/vcs/subversion/kdevsvnd.h
@@ -24,7 +24,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 class KDevSvnd : public KDEDModule
 {
@@ -35,15 +35,15 @@ K_DCOP
   //note: InSVN means parent is added.  InRepos  means itself is added
 	enum { SomeAreFiles = 1, SomeAreFolders = 2,  SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 };
 public:
-	KDevSvnd(const QCString &);
+	KDevSvnd(const TQCString &);
 	~KDevSvnd();
 
 k_dcop:
 //  void addAuthInfo(KIO::AuthInfo, long);
-	QString commitDialog(QString);
-	int sslServerTrustPrompt(QString certFailMsg, QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert );
-	QString sslCertFile();
-	QCString sslPasswdDlg(QString promptMsg);
+	TQString commitDialog(TQString);
+	int sslServerTrustPrompt(TQString certFailMsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert );
+	TQString sslCertFile();
+	TQCString sslPasswdDlg(TQString promptMsg);
 
 };
 
diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp
index 16e35ce3..8fd05950 100644
--- a/vcs/subversion/kdevsvnd_widgets.cpp
+++ b/vcs/subversion/kdevsvnd_widgets.cpp
@@ -13,12 +13,12 @@
  */
  
 #include "kdevsvnd_widgets.h"
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
-SvnSSLTrustPrompt::SvnSSLTrustPrompt( QWidget* parent, const char* name, bool modal, WFlags f )
+SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f )
 	:SvnSSLTrustPromptBase( parent, name, modal, f )
 	, m_code(-1)
 {
@@ -27,24 +27,24 @@ SvnSSLTrustPrompt::SvnSSLTrustPrompt( QWidget* parent, const char* name, bool mo
 	btnPermanent->setText(i18n("Accept Permanently"));
 	btnTemporary->setText(i18n("Accept Temporarily"));
 	btnReject->setText(i18n("Reject"));
-	connect( btnPermanent, SIGNAL(clicked()), this, SLOT(setPermanent()) );
-	connect( btnTemporary, SIGNAL(clicked()), this, SLOT(setTemporary()) );
-	connect( btnReject,    SIGNAL(clicked()), this, SLOT(setRejected ()) );
+	connect( btnPermanent, TQT_SIGNAL(clicked()), this, TQT_SLOT(setPermanent()) );
+	connect( btnTemporary, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTemporary()) );
+	connect( btnReject,    TQT_SIGNAL(clicked()), this, TQT_SLOT(setRejected ()) );
 }
 SvnSSLTrustPrompt::~SvnSSLTrustPrompt()
 {}
 
-void SvnSSLTrustPrompt::setupCertInfo( QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert )
+void SvnSSLTrustPrompt::setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert )
 {
 	// setup texts
-	QListViewItem *host= new QListViewItem(listView1, i18n("Hostname"), hostname );
-	QListViewItem *finger = new QListViewItem(listView1, i18n("FingerPrint"), fingerPrint );
-	QListViewItem *validFrom = new QListViewItem(listView1, i18n("Valid From"), validfrom );
-	QListViewItem *validUntil = new QListViewItem(listView1, i18n("Valid Until"), validuntil );
-	QListViewItem *issName = new QListViewItem(listView1, i18n("Issuer"), issuerName );
-	QListViewItem *cert = new QListViewItem(listView1, i18n("Cert"), ascii_cert );
+	TQListViewItem *host= new TQListViewItem(listView1, i18n("Hostname"), hostname );
+	TQListViewItem *finger = new TQListViewItem(listView1, i18n("FingerPrint"), fingerPrint );
+	TQListViewItem *validFrom = new TQListViewItem(listView1, i18n("Valid From"), validfrom );
+	TQListViewItem *validUntil = new TQListViewItem(listView1, i18n("Valid Until"), validuntil );
+	TQListViewItem *issName = new TQListViewItem(listView1, i18n("Issuer"), issuerName );
+	TQListViewItem *cert = new TQListViewItem(listView1, i18n("Cert"), ascii_cert );
 }
-void SvnSSLTrustPrompt::setupFailedReasonMsg( QString msg )
+void SvnSSLTrustPrompt::setupFailedReasonMsg( TQString msg )
 {
 	errMsgLabel->setText( msg );
 }
diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h
index c69fdb14..b0a2bec1 100644
--- a/vcs/subversion/kdevsvnd_widgets.h
+++ b/vcs/subversion/kdevsvnd_widgets.h
@@ -20,10 +20,10 @@
 class SvnSSLTrustPrompt : public SvnSSLTrustPromptBase{
 Q_OBJECT
 public:
-	SvnSSLTrustPrompt( QWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 );
+	SvnSSLTrustPrompt( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 );
 	~SvnSSLTrustPrompt();
-	void setupCertInfo( QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert );
-	void setupFailedReasonMsg( QString msg );
+	void setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert );
+	void setupFailedReasonMsg( TQString msg );
 	int code();
 
 public slots:
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index 85dcd883..4b16e68f 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -40,12 +40,12 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -55,13 +55,13 @@ using namespace KIO;
 using namespace SvnGlobal;
 
 subversionCore::subversionCore(subversionPart *part)
-// 	: QObject(NULL, "subversion core"), DCOPObject("subversion") {
-	: QObject(NULL, "subversion core") {
+// 	: TQObject(NULL, "subversion core"), DCOPObject("subversion") {
+	: TQObject(NULL, "subversion core") {
 		m_part = part;
 		m_widget = new subversionWidget(part, 0 , "subversionprocesswidget");
 // 		m_logViewWidget = new SvnLogViewWidget( part, 0 );
 // 		m_part->mainWindow()->embedOutputView( m_logViewWidget, i18n( "Subversion Log" ), i18n( "Subversion Log" ) );
-//		if ( ! connectDCOPSignal("kded", "ksvnd", "subversionNotify(QString,int,int,QString,int,int,long int,QString)", "notification(QString,int,int,QString,int,int,long int,QString)", false ) )
+//		if ( ! connectDCOPSignal("kded", "ksvnd", "subversionNotify(TQString,int,int,TQString,int,int,long int,TQString)", "notification(TQString,int,int,TQString,int,int,long int,TQString)", false ) )
 //			kdWarning() << "Failed to connect to kded dcop signal ! Notifications won't work..." << endl;
 
         m_fileInfoProvider = new SVNFileInfoProvider( part );
@@ -87,7 +87,7 @@ KDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const {
 }
 
 //not used anymore
-// void subversionCore::notification( const QString& path, int action, int kind, const QString& mime_type, int content_state ,int prop_state ,long int revision, const QString& userstring ) {
+// void subversionCore::notification( const TQString& path, int action, int kind, const TQString& mime_type, int content_state ,int prop_state ,long int revision, const TQString& userstring ) {
 // 	kdDebug(9036) << "Subversion Notification : "
 // 		<< "path : " << path
 // 		<< "action: " << action
@@ -118,16 +118,16 @@ void subversionCore::resolve( const KURL::List& list ) {
 		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
-	for ( QValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
+	for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
 		kdDebug(9036) << "resolving: " << (*it).prettyURL() << endl;
-		QByteArray parms;
-		QDataStream s( parms, IO_WriteOnly );
+		TQByteArray parms;
+		TQDataStream s( parms, IO_WriteOnly );
 		int cmd = 11;
 		bool recurse = true;
 		s << cmd << *it << recurse;
 		SimpleJob * job = KIO::special(servURL, parms, true);
 		job->setWindow( m_part->mainWindow()->main() );
-		connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 	}
 }
 
@@ -135,32 +135,32 @@ void subversionCore::update( const KURL::List& list ) {
 	KURL servURL = "kdevsvn+svn://blah/";
 	kdDebug(9036) << "Updating. servURL : " << servURL.prettyURL() << endl;
 	
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	int cmd = 2;
 	int rev = -1;
-	s << cmd << list << rev << QString( "HEAD" );
+	s << cmd << list << rev << TQString( "HEAD" );
 	
 	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 	initProcessDlg( (KIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") );
 }
 
-void subversionCore::diff( const KURL::List& list, const QString& where){
+void subversionCore::diff( const KURL::List& list, const TQString& where){
 	kdDebug(9036) << "diff " << list << endl;
 	KURL servURL = "kdevsvn+svn://this_is_a_fake_URL_and_this_is_normal/";
-	for ( QValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
-		QByteArray parms;
-		QDataStream s( parms, IO_WriteOnly );
+	for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
+		TQByteArray parms;
+		TQDataStream s( parms, IO_WriteOnly );
 		int cmd = 13;
 		kdDebug(9036) << "diffing : " << (*it).prettyURL() << endl;
 		int rev1=-1;
 		int rev2=-1;
-		QString revkind1 = where;
-		QString revkind2 = "WORKING";
+		TQString revkind1 = where;
+		TQString revkind2 = "WORKING";
 		s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ;
 		KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-		connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 		KIO::NetAccess::synchronousRun( job, 0 );
 		if ( diffresult.count() > 0 ) {
 			//check kompare is available
@@ -171,14 +171,14 @@ void subversionCore::diff( const KURL::List& list, const QString& where){
 					KTempFile tmpPatch = KTempFile(tmpDir.name());
 
 					// write the patch
-					QTextStream *stream = tmpPatch.textStream();
-					stream->setCodec( QTextCodec::codecForName( "utf8" ) );
-					for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) {
+					TQTextStream *stream = tmpPatch.textStream();
+					stream->setCodec( TQTextCodec::codecForName( "utf8" ) );
+					for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) {
 						( *stream ) << ( *it2 ) << "\n";
 					}
 					tmpPatch.close();
 
-					QString ourCopy = tmpDir.name()+(*it).fileName();
+					TQString ourCopy = tmpDir.name()+(*it).fileName();
 
 					KProcess copy;
 					copy << "cp" << (*it).prettyURL(0,KURL::StripFileProtocol) <<  tmpDir.name();
@@ -197,9 +197,9 @@ void subversionCore::diff( const KURL::List& list, const QString& where){
 					// only diff
 					KTempFile *tmp = new KTempFile;
 					tmp->setAutoDelete(true);
-					QTextStream *stream = tmp->textStream();
-					stream->setCodec( QTextCodec::codecForName( "utf8" ) );
-					for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) {
+					TQTextStream *stream = tmp->textStream();
+					stream->setCodec( TQTextCodec::codecForName( "utf8" ) );
+					for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) {
 						( *stream ) << ( *it2 ) << "\n";
 					}
 					tmp->close();
@@ -209,17 +209,17 @@ void subversionCore::diff( const KURL::List& list, const QString& where){
 				}
 			} else { //else do it with message box
 				Subversion_Diff df;
-				for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) {
+				for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) {
 					df.text->append( *it2 );
 				}
-				QFont f = df.font();
+				TQFont f = df.font();
 				f.setFixedPitch( true );
 				df.text->setFont( f );
 				df.exec();
 			}
 		}
 		else{
-			QString diffTo = i18n("the local disk checked out copy.");
+			TQString diffTo = i18n("the local disk checked out copy.");
 			if ( where=="HEAD"){
 				diffTo=i18n("the current svn HEAD version.");
 			}
@@ -230,18 +230,18 @@ void subversionCore::diff( const KURL::List& list, const QString& where){
 }
 
 void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2,
-							int rev1, QString revKind1, int rev2, QString revKind2,
+							int rev1, TQString revKind1, int rev2, TQString revKind2,
 							bool recurse, bool pegdiff )
 {
 	KURL servURL = "kdevsvn+svn://blah/";
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	int cmd = 13;
 	kdDebug(9036) << "diffing async : " << pathOrUrl1 << " and " << pathOrUrl2 << endl;
 	s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse;
 	s << pegdiff;
 	KIO::SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotDiffResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotDiffResult( KIO::Job * ) ) );
 	initProcessDlg( (KIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() );
 }
 
@@ -252,16 +252,16 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock
 		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	int cmd = 103;
  	s << cmd << recurse << keeplocks;
-	for ( QValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
+	for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
 		kdDebug(9036) << "adding to list: " << (*it).prettyURL() << endl;
 		s << *it;
 	}
 	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 	if( list.count() == 1 )
 		initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") );
 	else if( list.count() > 1 )
@@ -269,7 +269,7 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock
 }
 // Right now, only one item for each action.
 void subversionCore::svnLog( const KURL::List& list,
-		int revstart, QString revKindStart, int revend, QString revKindEnd,
+		int revstart, TQString revKindStart, int revend, TQString revKindEnd,
 		bool discorverChangedPath, bool strictNodeHistory )
 {
 	// ensure that part has repository information. This info is used to retrieve root repository URL
@@ -281,26 +281,26 @@ void subversionCore::svnLog( const KURL::List& list,
 		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	// prepare arguments
 	int cmd = 4;
 // 	int revstart = -1, revend = 0;
-// 	QString revKindStart = "HEAD", revKindEnd = "";
+// 	TQString revKindStart = "HEAD", revKindEnd = "";
 // 	bool repositLog = true, discorverChangedPath = true, strictNodeHistory = true;
 	s << cmd << revstart << revKindStart << revend << revKindEnd;
 	s << discorverChangedPath << strictNodeHistory;
-	for ( QValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
+	for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
 		kdDebug(9036) << "svnCore: adding to list: " << (*it).prettyURL() << endl;
 		s << *it;
 	}
 	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotLogResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotLogResult( KIO::Job * ) ) );
 	//  progress info. LogView is allowed and meaninful only for one url in KDev3.4
 	initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") );
 }
 
-void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, QString revKindStart, int revend, QString revKindEnd )
+void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd )
 {
 	KURL servURL = m_part->baseURL();
 	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/";
@@ -308,15 +308,15 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, QString
 		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	// prepare arguments
 	int cmd = 14;
 	s << cmd << url << (int)mode ;
 	s << revstart << revKindStart << revend << revKindEnd ;
 
 	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotBlameResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotBlameResult( KIO::Job * ) ) );
 	initProcessDlg( (KIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") );
 }
 
@@ -325,75 +325,75 @@ void subversionCore::add( const KURL::List& list ) {
 	KURL servURL = "kdevsvn+svn://blah/";
 	kdDebug(9036) << "Deleting servURL : " << servURL.prettyURL() << endl;
 	
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	int cmd = 6;
 	s << cmd << list;
 	// add/delete/revert works on local copy. Don't need to show progress dialog
 	SimpleJob * job = KIO::special(servURL, parms, false); 
 	job->setWindow( m_part->mainWindow()->main() );
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 }
 
 void subversionCore::del( const KURL::List& list ) {
 	KURL servURL = "kdevsvn+svn://blah/";
 	kdDebug(9036) << "Deleting servURL : " << servURL.prettyURL() << endl;
 	
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	int cmd = 7;
 	s << cmd << list;
 	// add/delete/revert works on local copy. Don't need to show progress dialog
 	SimpleJob * job = KIO::special(servURL, parms, false);
 	job->setWindow( m_part->mainWindow()->main() );
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 }
 
 void subversionCore::revert( const KURL::List& list ) {
 	KURL servURL = "kdevsvn+svn://blah/";
 	kdDebug(9036) << "Reverting servURL : " << servURL.prettyURL() << endl;
 	
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	int cmd = 8;
 	s << cmd << list;
 	SimpleJob * job = KIO::special(servURL, parms, false);
 	job->setWindow( m_part->mainWindow()->main() );
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 }
 
 void subversionCore::checkout() {
 	svn_co checkoutDlg;
 
-	if ( checkoutDlg.exec() == QDialog::Accepted ) {
+	if ( checkoutDlg.exec() == TQDialog::Accepted ) {
 		//checkout :)
-		QByteArray parms;
-		QDataStream s( parms, IO_WriteOnly );
+		TQByteArray parms;
+		TQDataStream s( parms, IO_WriteOnly );
 		KURL servURL ( checkoutDlg.serverURL->url() );
 		wcPath = checkoutDlg.localDir->url() + "/" + checkoutDlg.newDir->text();
 		int cmd = 1;
 		int rev = -1;
-		s << cmd << servURL << KURL( wcPath ) << rev << QString( "HEAD" );
+		s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" );
 		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 		SimpleJob * job = KIO::special(servURL,parms, true);
 		job->setWindow( m_part->mainWindow()->main() );
-		connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotEndCheckout( KIO::Job * ) ) );
+		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( KIO::Job * ) ) );
 	}
 }
 
 void subversionCore::switchTree( const KURL &path, const KURL &repositUrl,
-								int revNum, const QString &revKind, bool recurse )
+								int revNum, const TQString &revKind, bool recurse )
 {
 	KURL servURL = "kdevsvn+svn://blah/";
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	// prepare arguments
 	int cmd = 12;
 	s << cmd << path << repositUrl ;
 	s << recurse << revNum << revKind;
 
 	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 	initProcessDlg( (KIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() );
 }
 
@@ -401,66 +401,66 @@ void subversionCore::switchRelocate( const KURL &path,
 									 const KURL ¤tUrl, const KURL &newUrl, bool recurse )
 {
 	KURL servURL = "kdevsvn+svn://blah/";
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	// prepare arguments
 	int cmd = 16;
 	s << cmd << path << currentUrl << newUrl << recurse;
 
 	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 	// this doesn't contact repository
 }
 
-void subversionCore::svnCopy( const KURL &src, int srcRev, const QString &srcRevKind,
+void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRevKind,
 							  const KURL &dest )
 {
 	KURL servURL = "kdevsvn+svn://blah/";
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	// prepare arguments
 	int cmd = 17;
 	s << cmd << src << srcRev << srcRevKind << dest;
 
 	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 	initProcessDlg( (KIO::Job*)job, src.prettyURL(), dest.prettyURL() );
 }
 
-void subversionCore::merge( const KURL &src1, int rev1, QString revKind1,
-							const KURL &src2, int rev2, QString revKind2, const KURL &wc_path,
+void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1,
+							const KURL &src2, int rev2, TQString revKind2, const KURL &wc_path,
 							bool recurse, bool ignore_ancestry, bool force, bool dry_run )
 {
 	KURL servURL = "kdevsvn+svn://blah/";
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	// prepare arguments
 	int cmd = 18;
 	s << cmd << src1 << rev1 << revKind1 << src2 << rev2 << revKind2 << wc_path;
 	s << recurse << ignore_ancestry << force << dry_run;
 
 	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 	initProcessDlg( (KIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() ,
 					wc_path.prettyURL() );
 }
 
-bool subversionCore::clientInfo( KURL path_or_url, bool recurse, QMap< KURL, SvnInfoHolder> &holderMap )
+bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnInfoHolder> &holderMap )
 {
     KURL servURL = "kdevsvn+svn://blah/";
-    QByteArray parms;
-    QDataStream s( parms, IO_WriteOnly );
+    TQByteArray parms;
+    TQDataStream s( parms, IO_WriteOnly );
     int cmd = 15;
-    s << cmd << path_or_url << -1 << QString("UNSPECIFIED") << -1 << QString("UNSPECIFIED") << recurse;
+    s << cmd << path_or_url << -1 << TQString("UNSPECIFIED") << -1 << TQString("UNSPECIFIED") << recurse;
     SimpleJob *job = KIO::special( servURL, parms, false );
 
-    QMap ma;
+    TQMap ma;
     KIO::NetAccess::synchronousRun(job, 0, 0, 0, &ma ); // synchronize
 
-    QValueList keys = ma.keys();
-    QValueList::Iterator begin = keys.begin(), end = keys.end(), it;
+    TQValueList keys = ma.keys();
+    TQValueList::Iterator begin = keys.begin(), end = keys.end(), it;
     int curIdx, lastIdx;
-    QRegExp rx( "([0-9]*)(.*)" );
+    TQRegExp rx( "([0-9]*)(.*)" );
     
     for ( it = begin; it != end; /*++it*/) {
         kdDebug(9036) << "METADATA key: " << *it << " value: " << ma[ *it ] << endl;
@@ -496,7 +496,7 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, QMap< KURL, Svn
 void subversionCore::slotEndCheckout( KIO::Job * job ) {
 	if ( job->error() ) {
 		job->showErrorDialog( m_part->mainWindow()->main() );
-		emit checkoutFinished( QString::null );
+		emit checkoutFinished( TQString::null );
 	} else
 		emit checkoutFinished(wcPath);
 }
@@ -513,9 +513,9 @@ void subversionCore::slotResult( KIO::Job * job ) {
         return;
     }
     KIO::MetaData ma = job->metaData();
-	QValueList keys = ma.keys();
+	TQValueList keys = ma.keys();
 	qHeapSort( keys );
-	QValueList::Iterator begin = keys.begin(), end = keys.end(), it;
+	TQValueList::Iterator begin = keys.begin(), end = keys.end(), it;
 
 	for ( it = begin; it != end; ++it ) {
 // 		kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl;
@@ -542,15 +542,15 @@ void subversionCore::slotLogResult( KIO::Job * job )
 		return;
 	}
 
-	QValueList holderList;
+	TQValueList holderList;
 
 	KIO::MetaData ma = job->metaData();
-	QValueList keys = ma.keys();
-	QRegExp rx( "([0-9]*)(.*)" );
+	TQValueList keys = ma.keys();
+	TQRegExp rx( "([0-9]*)(.*)" );
 	int curIdx, lastIdx;
-	QString requestedUrl;
+	TQString requestedUrl;
 
-	for (QValueList::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){
+	for (TQValueList::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){
 		if ( rx.search( *it ) == -1 ){
 			kdDebug(9036) << " Exiting loop at line " << __LINE__ < blameList;
+	TQValueList blameList;
 
 	KIO::MetaData ma = job->metaData();
-	QValueList keys = ma.keys();
-	QRegExp rx( "([0-9]*)(.*)" );
+	TQValueList keys = ma.keys();
+	TQRegExp rx( "([0-9]*)(.*)" );
 	int curIdx, lastIdx;
 
-	for (QValueList::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){
+	for (TQValueList::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){
 		if ( rx.search( *it ) == -1 ){
 			kdDebug(9036) << " Exiting loop at line " << __LINE__ <metaData();
-	QValueList keys = ma.keys();
+	TQValueList keys = ma.keys();
 	qHeapSort( keys );
-	QValueList::Iterator begin = keys.begin(), end = keys.end(), it;
-	QStringList diffList;
+	TQValueList::Iterator begin = keys.begin(), end = keys.end(), it;
+	TQStringList diffList;
 	
 	for ( it = begin; it != end; ++it ) {
 // 		kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl;
@@ -689,9 +689,9 @@ void subversionCore::slotDiffResult( KIO::Job * job )
 		if ( !KStandardDirs::findExe( "kompare" ).isNull() ) {
 			KTempFile *tmp = new KTempFile;
 			tmp->setAutoDelete(true);
-			QTextStream *stream = tmp->textStream();
-			stream->setCodec( QTextCodec::codecForName( "utf8" ) );
-			for ( QStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) {
+			TQTextStream *stream = tmp->textStream();
+			stream->setCodec( TQTextCodec::codecForName( "utf8" ) );
+			for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) {
 				( *stream ) << ( *it2 ) << "\n";
 			}
 			tmp->close();
@@ -700,12 +700,12 @@ void subversionCore::slotDiffResult( KIO::Job * job )
 			p->start();
 			
 		} else { //else do it with message box
-			KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , QString::null , "userDoesNotWantKompare" );
+			KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , TQString::null , "userDoesNotWantKompare" );
 			Subversion_Diff df;
-			for ( QStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) {
+			for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) {
 				df.text->append( *it2 );
 			}
-			QFont f = df.font();
+			TQFont f = df.font();
 			f.setFixedPitch( true );
 			df.text->setFont( f );
 			df.exec();
@@ -716,19 +716,19 @@ void subversionCore::slotDiffResult( KIO::Job * job )
 	}
 }
 
-void subversionCore::initProcessDlg( KIO::Job *job, const QString &src, const QString &dest )
+void subversionCore::initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest )
 {
 	SvnProgressDlg *progress = new SvnProgressDlg( true );
 	progress->setSourceUrl( src );
 	progress->setDestUrl( dest );
 	progress->setJob( job );
-	connect( job, SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ),
-			 progress, SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) );
-	connect( job, SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ),
-			 progress, SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) );
+	connect( job, TQT_SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ),
+			 progress, TQT_SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) );
+	connect( job, TQT_SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ),
+			 progress, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) );
 }
 
-void subversionCore::createNewProject( const QString& // dirName
+void subversionCore::createNewProject( const TQString& // dirName
                                        , const KURL& // importURL
                                        , bool // init
                                        ) {
diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h
index 7cf86a28..1c9611c8 100644
--- a/vcs/subversion/subversion_core.h
+++ b/vcs/subversion/subversion_core.h
@@ -21,8 +21,8 @@
 #ifndef __SUBVERSION_CORE_H__
 #define __SUBVERSION_CORE_H__
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -37,8 +37,8 @@ class SvnBlameHolder;
 class SvnLogHolder;
 class SvnLogViewWidget;
 
-// class subversionCore : public QObject, public DCOPObject
-class subversionCore : public QObject {
+// class subversionCore : public TQObject, public DCOPObject
+class subversionCore : public TQObject {
   Q_OBJECT
 //   K_DCOP
 
@@ -51,35 +51,35 @@ public:
 	void update( const KURL::List&);
 	void commit( const KURL::List&, bool recurse, bool keeplocks );
 	void svnLog( const KURL::List& list,
-			int revstart, QString revKindStart, int revend, QString revKindEnd, 
+			int revstart, TQString revKindStart, int revend, TQString revKindEnd, 
 			bool discorverChangedPath, bool strictNodeHistory );
-	void blame( const KURL &url, SvnGlobal::UrlMode mode, int revstart, QString revKindStart, int revend, QString revKindEnd );
+	void blame( const KURL &url, SvnGlobal::UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd );
 	void add( const KURL::List&);
 	void del( const KURL::List&);
-	void diff( const KURL::List&, const QString& where);
+	void diff( const KURL::List&, const TQString& where);
 	void diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2,
-					int rev1, QString revKind1, int rev2, QString revKind2,
+					int rev1, TQString revKind1, int rev2, TQString revKind2,
 					bool recurse, bool pegdiff = false );
 	void revert( const KURL::List&);
 	void resolve( const KURL::List&);
 	void checkout();
 	void switchTree( const KURL &path, const KURL &repositUrl,
-					 int revNum, const QString &revKind, bool recurse );
+					 int revNum, const TQString &revKind, bool recurse );
 	void switchRelocate( const KURL &path, const KURL ¤tUrl, const KURL &newUrl, bool recurse );
-	void svnCopy( const KURL &src, int srcRev, const QString &srcRevKind, const KURL &dest );
-	void merge( const KURL &src1, int rev1, QString revKind1, const KURL &src2, int rev2, QString revKind2, const KURL &wc_path,
+	void svnCopy( const KURL &src, int srcRev, const TQString &srcRevKind, const KURL &dest );
+	void merge( const KURL &src1, int rev1, TQString revKind1, const KURL &src2, int rev2, TQString revKind2, const KURL &wc_path,
 				   bool recurse, bool ignore_ancestry, bool force, bool dry_run );
     // This is blocking function. But the GUI is not blocked.
     // Information will be pulled solely from the working copy.Thus no network connections will be made.
     // Parameter holderMap is the map to be filled out by this method. Callers should preallocate this object.
     // Return true on success. Otherwise return false.
-    bool clientInfo( KURL path_or_url, bool recurse, QMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap );
-	void createNewProject( const QString& dirName, const KURL& importURL, bool init );
+    bool clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap );
+	void createNewProject( const TQString& dirName, const KURL& importURL, bool init );
     KDevVCSFileInfoProvider *fileInfoProvider() const;
 	
-	void initProcessDlg( KIO::Job *job, const QString &src, const QString &dest );
+	void initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest );
 // k_dcop:
-// 	void notification( const QString&, int,int, const QString&, int,int ,long int, const QString& );
+// 	void notification( const TQString&, int,int, const TQString&, int,int ,long int, const TQString& );
 
 private slots:
 	void slotEndCheckout( KIO::Job * job );
@@ -89,14 +89,14 @@ private slots:
 	void slotDiffResult( KIO::Job * job );
 
 signals:
-	void checkoutFinished( QString dir );
+	void checkoutFinished( TQString dir );
 
 private:
-	QGuardedPtr m_widget;
+	TQGuardedPtr m_widget;
 	subversionPart *m_part;
-	QString wcPath;
+	TQString wcPath;
 	SVNFileInfoProvider *m_fileInfoProvider;
-	QStringList diffresult; //for diff commands ;)
+	TQStringList diffresult; //for diff commands ;)
 	// be nice about tmp diff files: delete all of them when exiting.
 	KTempDir* diffTmpDir;
 
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index ee68575c..be0a4411 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -20,14 +20,14 @@
 #include "subversion_fileinfo.h"
 #include "subversion_core.h"
 #include 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -47,7 +47,7 @@ SVNFileInfoProvider::~SVNFileInfoProvider() {
 }
 
 //synchronous
-const VCSFileInfoMap *SVNFileInfoProvider::status( const QString &dirPath ) {
+const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) {
 	if ( !m_cachedDirEntries )
 		m_cachedDirEntries = new VCSFileInfoMap;
 //	return m_cachedDirEntries;
@@ -57,38 +57,38 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const QString &dirPath ) {
 	if ( dirPath != m_previousDirPath ) {
 		m_previousDirPath = dirPath;
 		KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/";
-		QByteArray parms;
-		QDataStream s( parms, IO_WriteOnly );
+		TQByteArray parms;
+		TQDataStream s( parms, IO_WriteOnly );
 		int cmd = 9;
-		QString rPath = projectDirectory( );
-		rPath += QDir::separator() + dirPath;
-		kdDebug(9036) << "DIR : " << rPath << " " << KURL( QFileInfo( rPath ).absFilePath() ) << endl;
+		TQString rPath = projectDirectory( );
+		rPath += TQDir::separator() + dirPath;
+		kdDebug(9036) << "DIR : " << rPath << " " << KURL( TQFileInfo( rPath ).absFilePath() ) << endl;
 
-// 		s << cmd << KURL( QFileInfo( rPath ).absFilePath() ) << true << true; //original line
+// 		s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << true << true; //original line
 
 		// Dukju Ahn: if checkRepos is set, status() accesses remote repository,
 		// which causes significant delaym_owner especially when network speed is not fast enough.
 		// Of course, the user cannot get information about the out-of-dateness of his local copy.
-		s << cmd << KURL( QFileInfo( rPath ).absFilePath() ) << false/*checkRepos*/ << false /*fullRecurse*/;
+		s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << false/*checkRepos*/ << false /*fullRecurse*/;
 
 		KIO::SimpleJob *job2 = KIO::special(servURL, parms, false);
 		job2->setWindow( m_part->mainWindow()->main() );
 
 
-        QMap ma;
+        TQMap ma;
 
 		KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma );
 
-		QValueList keys = ma.keys();
+		TQValueList keys = ma.keys();
 		qHeapSort( keys );
-		QValueList::Iterator begin = keys.begin(), end = keys.end(), it;
+		TQValueList::Iterator begin = keys.begin(), end = keys.end(), it;
 
-		QString path;
+		TQString path;
 		int text_status = 0, prop_status = 0, repos_text_status = 0, repos_prop_status = 0;
 		long int rev = 0;
 		int curIdx, lastIdx;
 
-		QRegExp rx( "([0-9]*)(.*)" );
+		TQRegExp rx( "([0-9]*)(.*)" );
 		for ( it = begin; it != end; ) {
 			kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl;
 			if ( rx.search( *it ) == -1 ) return m_cachedDirEntries; // something is wrong ! :)
@@ -130,7 +130,7 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const QString &dirPath ) {
     return m_cachedDirEntries;
 }
 
-bool SVNFileInfoProvider::requestStatus( const QString &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
@@ -141,21 +141,21 @@ bool SVNFileInfoProvider::requestStatus( const QString &dirPath, void *callerDat
         m_previousDirPath = dirPath;
     }
 
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	int cmd = 9;
-	QString rPath = projectDirectory( );
-	rPath += QDir::separator() + dirPath;
+	TQString rPath = projectDirectory( );
+	rPath += TQDir::separator() + dirPath;
     
     if( ! m_part->isValidDirectory( rPath ) ){
         return false;
     }
     
-	kdDebug(9036) << "DIR : " << rPath << " " << QFileInfo( rPath ).absFilePath() << endl;
-	s << cmd << KURL( QFileInfo( rPath ).absFilePath() ) << checkRepos << recursive;
+	kdDebug(9036) << "DIR : " << rPath << " " << TQFileInfo( rPath ).absFilePath() << endl;
+	s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive;
 	KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/";
 	job = KIO::special(servURL, parms, false);
-	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 	if( checkRepos )
 		m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") );
     return true;
@@ -166,16 +166,16 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) {
 		j->showErrorDialog( m_part->mainWindow()->main() );
 
 	KIO::MetaData ma = j->metaData();
-	QValueList keys = ma.keys();
+	TQValueList keys = ma.keys();
 	qHeapSort( keys );
-	QValueList::Iterator begin = keys.begin(), end = keys.end(), it;
+	TQValueList::Iterator begin = keys.begin(), end = keys.end(), it;
 
-	QString path;
+	TQString path;
 	int text_status = 0, prop_status = 0, repos_text_status = 0, repos_prop_status = 0;
 	long int rev = 0;
 	int curIdx, lastIdx;
 
-	QRegExp rx( "([0-9]*)(.*)" );
+	TQRegExp rx( "([0-9]*)(.*)" );
 	for ( it = begin; it != end; ) {
 		kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl;
 		if ( rx.search( *it ) == -1 ) return; // something is wrong ! :)
@@ -217,7 +217,7 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) {
 		emit statusReady(*m_cachedDirEntries, m_savedCallerData);
 }
 
-void SVNFileInfoProvider::slotStatus( const QString& 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
@@ -226,8 +226,8 @@ void SVNFileInfoProvider::slotStatus( const QString& path,int text_status, int p
 	if ( !m_cachedDirEntries )
 		m_cachedDirEntries = new VCSFileInfoMap;
 
-	QString wRev = QString::number( rev ); //work rev
-	QString rRev = QString::number( rev );// repo rev
+	TQString wRev = TQString::number( rev ); //work rev
+	TQString rRev = TQString::number( rev );// repo rev
 	VCSFileInfo::FileState state = VCSFileInfo::Unknown;
 
 	switch ( text_status ) {
@@ -303,16 +303,16 @@ void SVNFileInfoProvider::slotStatus( const QString& path,int text_status, int p
 			break;
 	}
 
-	VCSFileInfo info(QFileInfo( path ).fileName(),wRev,rRev,state);
+	VCSFileInfo info(TQFileInfo( path ).fileName(),wRev,rRev,state);
 	kdDebug(9036) << "Inserting " << info.toString() << endl;
-	m_cachedDirEntries->insert( QFileInfo( path ).fileName(), info);
+	m_cachedDirEntries->insert( TQFileInfo( path ).fileName(), info);
 }
 
-QString SVNFileInfoProvider::projectDirectory() const {
+TQString SVNFileInfoProvider::projectDirectory() const {
 	return owner()->project()->projectDirectory();
 }
 
-const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const QString &dirPath,
+const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const TQString &dirPath,
 	bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore )
 {
 	if ( !m_recursiveDirEntries )
@@ -322,30 +322,30 @@ const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const QString &dirPath,
 	m_recursiveDirEntries->clear();
 	m_recursivePreviousDirPath = dirPath;
 	KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/";
-	QByteArray parms;
-	QDataStream s( parms, IO_WriteOnly );
+	TQByteArray parms;
+	TQDataStream s( parms, IO_WriteOnly );
 	int cmd = 109;
-	QString rPath = projectDirectory( );
-	rPath += QDir::separator() + dirPath;
-	kdDebug(9036) << "DIR : " << rPath << " " << KURL( QFileInfo( rPath ).absFilePath() ) << endl;
-	s << cmd << checkRepos << fullRecurse << getAll << noIgnore << -1 << "WORKING" << KURL( QFileInfo( rPath ).absFilePath() );
+	TQString rPath = projectDirectory( );
+	rPath += TQDir::separator() + dirPath;
+	kdDebug(9036) << "DIR : " << rPath << " " << KURL( TQFileInfo( rPath ).absFilePath() ) << endl;
+	s << cmd << checkRepos << fullRecurse << getAll << noIgnore << -1 << "WORKING" << KURL( TQFileInfo( rPath ).absFilePath() );
 	KIO::SimpleJob *job2 = KIO::special(servURL, parms, false);
 	job2->setWindow( m_part->mainWindow()->main() );
 
 
-	QMap ma;
+	TQMap ma;
 	KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma );
 
-	QValueList keys = ma.keys();
+	TQValueList keys = ma.keys();
 	qHeapSort( keys );
-	QValueList::Iterator begin = keys.begin(), end = keys.end(), it;
+	TQValueList::Iterator begin = keys.begin(), end = keys.end(), it;
 
-	QString path;
+	TQString path;
 	int text_status = 0, prop_status = 0, repos_text_status = 0, repos_prop_status = 0;
 	long int rev = 0;
 	int curIdx, lastIdx;
 
-	QRegExp rx( "([0-9]*)(.*)" );
+	TQRegExp rx( "([0-9]*)(.*)" );
 	for ( it = begin; it != end; ) {
 		kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl;
 		if ( rx.search( *it ) == -1 ) return m_recursiveDirEntries; // something is wrong ! :)
@@ -389,14 +389,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const QString &dirPath,
 }
 
 void SVNFileInfoProvider::slotStatusExt(
-	const QString& reqPath, const QString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev)
+	const TQString& reqPath, const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev)
 {
 
 	if ( !m_recursiveDirEntries )
 		m_recursiveDirEntries = new VCSFileInfoMap;
 
-	QString wRev = QString::number( rev ); //work rev
-	QString rRev = QString::number( rev );// repo rev
+	TQString wRev = TQString::number( rev ); //work rev
+	TQString rRev = TQString::number( rev );// repo rev
 	VCSFileInfo::FileState state = VCSFileInfo::Unknown;
 
 	switch ( text_status ) {
@@ -472,10 +472,10 @@ void SVNFileInfoProvider::slotStatusExt(
 			break;
 	}
 
-	QString relativeReqPath;
+	TQString relativeReqPath;
 	if (reqPath == "./"){
 		// case of project top directory
-		QString reqAbsPath = projectDirectory();
+		TQString reqAbsPath = projectDirectory();
 
         if( path == reqAbsPath ){
             //key of VCSInfo is project directory itself. So it is set to .
@@ -486,7 +486,7 @@ void SVNFileInfoProvider::slotStatusExt(
         }
 	}
 	else {
-		QString reqAbsPath = projectDirectory() + QDir::separator() + reqPath;
+		TQString reqAbsPath = projectDirectory() + TQDir::separator() + reqPath;
 		relativeReqPath = path.right( path.length() - reqAbsPath.length() - 1 );
 
 		if (relativeReqPath == reqAbsPath){
@@ -498,9 +498,9 @@ void SVNFileInfoProvider::slotStatusExt(
 	VCSFileInfo info(relativeReqPath, wRev, rRev, state);
 	m_recursiveDirEntries->insert( relativeReqPath, info );
 
-// 	VCSFileInfo info(QFileInfo( path ).fileName(),wRev,rRev,state);
+// 	VCSFileInfo info(TQFileInfo( path ).fileName(),wRev,rRev,state);
  	kdDebug(9036) << "Inserting " << info.toString() << endl;
-// 	m_recursiveDirEntries->insert( QFileInfo( path ).fileName(), info);
+// 	m_recursiveDirEntries->insert( TQFileInfo( path ).fileName(), info);
 }
 
 #include "subversion_fileinfo.moc"
diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h
index 791d5e65..c78dfed6 100644
--- a/vcs/subversion/subversion_fileinfo.h
+++ b/vcs/subversion/subversion_fileinfo.h
@@ -21,7 +21,7 @@
 #ifndef SVNFILEINFOPROVIDER_H
 #define SVNFILEINFOPROVIDER_H
 
-#include 
+#include 
 
 #include 
 #include 
@@ -44,26 +44,26 @@ public:
     virtual ~SVNFileInfoProvider();
 
 // -- Sync interface
-    virtual const VCSFileInfoMap *status( const QString &dirPath );
+    virtual const VCSFileInfoMap *status( const TQString &dirPath );
 // -- These two are used for subversionPart and subversionCore. Of couruse, others can use it.
-	const VCSFileInfoMap* statusExt( const QString &dirPath, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore );
-	void slotStatusExt( const QString&, const QString& , int, int, int, int, long int ) ;
+	const VCSFileInfoMap* statusExt( const TQString &dirPath, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore );
+	void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ;
 	
 // -- Async interface for requesting data
-    virtual bool requestStatus( const QString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+    virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
 
-	QString projectDirectory() const;
+	TQString projectDirectory() const;
 
 k_dcop:
-	void slotStatus( const QString& , int, int, int, int, long int ) ;
+	void slotStatus( const TQString& , int, int, int, int, long int ) ;
 
 public slots:
 	void slotResult( KIO::Job * );
 
 private:
     mutable void *m_savedCallerData;
-	mutable QString m_previousDirPath;
-	mutable QString m_recursivePreviousDirPath;
+	mutable TQString m_previousDirPath;
+	mutable TQString m_recursivePreviousDirPath;
 	mutable VCSFileInfoMap *m_cachedDirEntries;
 	mutable VCSFileInfoMap *m_recursiveDirEntries;
 	KIO::SimpleJob *job;
diff --git a/vcs/subversion/subversion_global.h b/vcs/subversion/subversion_global.h
index 062d7fe9..620ed8df 100644
--- a/vcs/subversion/subversion_global.h
+++ b/vcs/subversion/subversion_global.h
@@ -16,7 +16,7 @@
 #define SUBVERSION_GLOBAL_H
 
 #include 
-#include 
+#include 
 
 namespace SvnGlobal
 {
@@ -42,14 +42,14 @@ public:
     int kind;
     /* The root URL of the repository. */
     KURL reposRootUrl;
-    QString reposUuid;
+    TQString reposUuid;
 };
 
 class SvnRevision{
 public:
 	int revNum;
-	QString revKind;
-	QDateTime revDate;
+	TQString revKind;
+	TQDateTime revDate;
 };
 
 } // end of namespace SvnGlobal
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index b5201b16..af58f7c8 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -18,7 +18,7 @@
 	 */
 #include "subversion_part.h"
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -40,16 +40,16 @@
 #include "svn_mergewidget.h"
 
 #include "urlutil.h"
-#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
@@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) )
 
 //bool g_projectWasJustCreated = false;
 
-subversionPart::subversionPart(QObject *parent, const char *name, const QStringList& )
+subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& )
 	: KDevVersionControl(&data, parent, name ? name : "Subversion" ) {
 	setInstance(subversionFactory::instance());
 	m_projWidget = 0;
@@ -74,18 +74,18 @@ subversionPart::subversionPart(QObject *parent, const char *name, const QStringL
 
 	setupActions();
 
-	connect( m_impl, SIGNAL(checkoutFinished(QString)), SIGNAL(finishedFetching(QString)) );
+	connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) );
 
 	// Context menu
-	connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *)) );
-	connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(projectConfigWidget(KDialogBase*)) );
-	connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), this, SLOT(slotStopButtonClicked(KDevPlugin*)) );
-	connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
-	connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) );
+	connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+	connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
+	connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+	connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
+	connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
 
 	m_impl->processWidget()->setCaption(i18n( "Subversion Output" ));
-	mainWindow()->embedOutputView( (QWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) );
-    QWhatsThis::add((QWidget*)m_impl->processWidget(), i18n("Subversion
        Subversion operations window."));
+	mainWindow()->embedOutputView( (TQWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) );
+    TQWhatsThis::add((TQWidget*)m_impl->processWidget(), i18n("Subversion
        Subversion operations window."));
 
 }
 
@@ -98,74 +98,74 @@ subversionPart::~subversionPart() {
 }
 
 void subversionPart::setupActions() {
-	actionCommit = new KAction( i18n("&Commit to Repository..."), 0, this, SLOT(slotActionCommit()), actionCollection(), "subversion_commit" );
+	actionCommit = new KAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" );
 	actionCommit->setToolTip( i18n("Commit file(s)") );
 	actionCommit->setWhatsThis( i18n("Commit file(s)
        Commits file to repository if modified.") );
 
-	/*    actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, SLOT(slotActionDiff()),
+	/*    actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()),
 				actionCollection(), "subversion_diff" );
 				actionDiff->setToolTip( i18n("Build difference") );
 				actionDiff->setWhatsThis( i18n("Build difference
        Builds difference between releases.") );
 				*/
-	actionAdd = new KAction( i18n("&Add to Repository"), 0, this, SLOT(slotActionAdd()), actionCollection(), "subversion_add" );
+	actionAdd = new KAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" );
 	actionAdd->setToolTip( i18n("Add file to repository") );
 	actionAdd->setWhatsThis( i18n("Add file to repository
        Adds file to repository.") );
 	
-	actionLog = new KAction( i18n("Show logs..."), 0, this, SLOT(slotLog()), actionCollection(), "subversion_log" );
-	actionBlame = new KAction( i18n("Blame..."), 0, this, SLOT(slotBlame()), actionCollection(), "subversion_blame");
+	actionLog = new KAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" );
+	actionBlame = new KAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame");
 
-	actionRemove = new KAction( i18n("&Remove From Repository"), 0, this, SLOT(slotActionDel()), actionCollection(), "subversion_remove" );
+	actionRemove = new KAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" );
 	actionRemove->setToolTip( i18n("Remove from repository") );
 	actionRemove->setWhatsThis( i18n("Remove from repository
        Removes file(s) from repository.") );
 
-	actionUpdate = new KAction( i18n("&Update"), 0, this, SLOT(slotActionUpdate()), actionCollection(), "subversion_update" );
+	actionUpdate = new KAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" );
 	actionUpdate->setToolTip( i18n("Update") );
 	actionUpdate->setWhatsThis( i18n("Update
        Updates file(s) from repository.") );
 
-	actionDiffLocal = new KAction( i18n("&Diff to BASE"), 0, this, SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" );
+	actionDiffLocal = new KAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" );
 	actionDiffLocal->setToolTip( i18n("Diff to BASE") );
 	actionDiffLocal->setWhatsThis( i18n("Diff to disk
        Diff current file to the BASE checked out copy.") );
 
-	actionDiffHead = new KAction( i18n("&Diff to HEAD"), 0, this, SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" );
+	actionDiffHead = new KAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" );
 	actionDiffHead->setToolTip( i18n("Diff to HEAD") );
 	actionDiffHead->setWhatsThis( i18n("Diff HEAD
        Diff the current file to HEAD in svn.") );
 
 
-	actionRevert = new KAction( i18n("&Revert"), 0, this, SLOT(slotActionRevert()), actionCollection(), "subversion_revert" );
+	actionRevert = new KAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" );
 	actionRevert->setToolTip( i18n("Revert") );
 	actionRevert->setWhatsThis( i18n("Revert
        Undo local changes.") );
 
 	/*
 	actionAddToIgnoreList = new KAction( i18n("&Ignore in Subversion Operations"), 0,
-			this, SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" );
+			this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" );
 	actionAddToIgnoreList->setToolTip( i18n("Ignore in Subversion operations") );
 	actionAddToIgnoreList->setWhatsThis( i18n("Ignore in Subversion operations
        Ignores file(s).") );
 
 	actionRemoveFromIgnoreList = new KAction( i18n("Do &Not Ignore in Subversion Operations"), 0,
-			this, SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" );
+			this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" );
 	actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in Subversion operations") );
 	actionRemoveFromIgnoreList->setWhatsThis( i18n("Do not ignore in Subversion operations
        Do not ignore file(s).") );
 	*/
 	actionResolve = new KAction( i18n("Re&solve Conflicting State"), 0,
-			this, SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" );
+			this, TQT_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" );
 	actionResolve->setToolTip( i18n("Resolve the conflicting state of a file after a merge") );
 	actionResolve->setWhatsThis( i18n("Resolve the conflicting state
        Remove the conflict state that can be set on a file after a merge failed.") );
 	actionSwitch = new KAction( i18n("Switch this working copy to URL.."), 0,
-			this, SLOT(slotSwitch()), actionCollection(), "subversion_switch" );
+			this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" );
 	// warn slogCopy(), slotMerge only works on context menu. There is no main-menu action
 	actionCopy = new KAction( i18n("Copy this working copy to URL.."), 0,
-								this, SLOT(slotCopy()), actionCollection(), "subversion_copy" );
+								this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" );
 	actionMerge = new KAction( i18n("Merge difference to working copy"), 0,
-							  this, SLOT(slotMerge()), actionCollection(), "subversion_merge" );
+							  this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" );
 }
 
-QWidget* subversionPart::newProjectWidget( QWidget* parent ) {
+TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) {
 	if ( !m_projWidget )
 		m_projWidget = new subversionProjectWidget(parent,"projectwidget");
 	return m_projWidget;
 }
 
-void subversionPart::createNewProject( const QString& dirname ) {
+void subversionPart::createNewProject( const TQString& dirname ) {
 	if ( !m_projWidget ) return;
 
 	m_impl->createNewProject( dirname, KURL( m_projWidget->importURL->url() ), m_projWidget->yes->isChecked() );
@@ -181,7 +181,7 @@ KDevVCSFileInfoProvider * subversionPart::fileInfoProvider() const {
 	return m_impl->fileInfoProvider();
 }
 
-void subversionPart::contextMenu( QPopupMenu *popup, const Context *context ) {
+void subversionPart::contextMenu( TQPopupMenu *popup, const Context *context ) {
   //no project, no subversion. Don't test on projectDirectory() here. If the user wants this project to have subversion support
   //give it to him. e.g. for out of root subprojects like with qmake
 if(!project())
@@ -213,48 +213,48 @@ if(!project())
                 if (context->hasType( Context::FileContext ))
 		    popup->insertSeparator();
 
-		int id = subMenu->insertItem( actionCommit->text(), this, SLOT(slotCommit()) );
+		int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) );
 		// CvsService let to do log and diff operations only on one file (or directory) at time
 		/*        if (m_urls.count() == 1)
 							{
-							subMenu->insertItem( actionDiff->text(), this, SLOT(slotDiff()) );
-							subMenu->insertItem( actionLog->text(), this, SLOT(slotLog()) );
+							subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
+							subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
 							}*/
         subMenu->setWhatsThis(id, i18n("Commit file(s)
        Commits file to repository if modified."));
-		id = subMenu->insertItem( actionAdd->text(), this, SLOT(slotAdd()) );
+		id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
         subMenu->setWhatsThis(id, i18n("Add file to repository
        Adds file to repository."));
-		id = subMenu->insertItem( actionRemove->text(), this, SLOT(slotDel()) );
+		id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) );
         subMenu->setWhatsThis(id, i18n("Remove from repository
        Removes file(s) from repository."));
-		id = subMenu->insertItem( actionLog->text(), this, SLOT(slotLog()) );
+		id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
 		subMenu->setWhatsThis(id, i18n("Show logs..
        View Logs"));
-		id = subMenu->insertItem( actionBlame->text(), this, SLOT(slotBlame()) );
+		id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) );
 		subMenu->setWhatsThis(id, i18n("Blame 0:HEAD 
        Show Annotate"));
 		
 		subMenu->insertSeparator();
-		id = subMenu->insertItem( actionDiffLocal->text(), this, SLOT(slotDiffLocal()) );
+		id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) );
 		subMenu->setWhatsThis(id, i18n("Diff
        Diff file to local disk."));
 
-		id = subMenu->insertItem( actionDiffHead->text(), this, SLOT(slotDiffHead()) );
+		id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) );
 		subMenu->setWhatsThis(id, i18n("Diff
        Diff file to repository."));
 
-		id = subMenu->insertItem( actionUpdate->text(), this, SLOT(slotUpdate()) );
+		id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
         subMenu->setWhatsThis(id, i18n("Update
        Updates file(s) from repository."));
-		id = subMenu->insertItem( actionRevert->text(), this, SLOT(slotRevert()) );
+		id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) );
 		subMenu->setWhatsThis(id, i18n("Revert
        Undo local changes.") );
-		id = subMenu->insertItem( actionResolve->text(), this, SLOT(slotResolve()) );
+		id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) );
 		subMenu->setWhatsThis(id, i18n("Resolve
        Resolve conflicting state.") );
-		id = subMenu->insertItem( actionSwitch->text(), this, SLOT(slotSwitch()) );
+		id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) );
 		subMenu->setWhatsThis(id, i18n("Switch
        Switch working tree.") );
-		id = subMenu->insertItem( actionCopy->text(), this, SLOT(slotCopy()) );
+		id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) );
 		subMenu->setWhatsThis(id, i18n("Copy
        Copy from/between path/URLs") );
-		id = subMenu->insertItem( actionMerge->text(), this, SLOT(slotMerge()) );
+		id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) );
 		subMenu->setWhatsThis(id, i18n("Merge
        Merge difference to working copy") );
 
 		/*
 		subMenu->insertSeparator();
-		id = subMenu->insertItem( actionAddToIgnoreList->text(), this, SLOT(slotAddToIgnoreList()) );
+		id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
         subMenu->setWhatsThis(id, i18n("Ignore in Subversion operations
        Ignores file(s)."));
-		id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, SLOT(slotRemoveFromIgnoreList()) );
+		id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
         subMenu->setWhatsThis(id, i18n("Do not ignore in Subversion operations
        Do not ignore file(s)."));
 */
 		// Now insert in parent menu
@@ -300,7 +300,7 @@ void subversionPart::slotResolve() {
 void subversionPart::slotSwitch()
 {
 	if( m_urls.count() > 1 ){
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							i18n("Please select only one item for subversion switch") );
 		return;
 	}
@@ -308,22 +308,22 @@ void subversionPart::slotSwitch()
 	
 	// retrieve repository info from local-copy metadata which will be displayed in dialog box
 	KURL wcPath = m_urls.first();
-	QMap< KURL, SvnGlobal::SvnInfoHolder> holderMap;
+	TQMap< KURL, SvnGlobal::SvnInfoHolder> holderMap;
 	SvnGlobal::SvnInfoHolder holder;
 			
 	m_impl->clientInfo( wcPath, false, holderMap );
-	QValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values();
+	TQValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values();
 	holder = holderList.first();
 	// invoke dialog box
-	SvnSwitchDlg dlg( &holder, wcPath.path(), (QWidget*)project()->mainWindow()->main() );
+	SvnSwitchDlg dlg( &holder, wcPath.path(), (TQWidget*)project()->mainWindow()->main() );
 	
-	if( dlg.exec() != QDialog::Accepted ){
+	if( dlg.exec() != TQDialog::Accepted ){
 		return;
 	}
 	// check target url's validity
 	KURL repositUrl = KURL( dlg.destUrl() );
 	if( !repositUrl.isValid() ){
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							 i18n("The destination URL is invalid") );
 		return;
 	}
@@ -333,7 +333,7 @@ void subversionPart::slotSwitch()
 	else if( dlg.relocation() )
 		m_impl->switchRelocate( wcPath, dlg.currentUrl(), repositUrl, dlg.recursive() );
 	else
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							i18n("Fail to conduct subversion switch. No action was selected") );
 }
 
@@ -341,7 +341,7 @@ void subversionPart::slotCopy()
 {
 	// error check
 	if( m_urls.count() > 1 ){
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							 i18n("Please select only one item for subversion switch") );
 		return;
 	}
@@ -349,22 +349,22 @@ void subversionPart::slotCopy()
 
 	// retrieve repository info from local-copy metadata which will be displayed in dialog box
 	KURL wcPath = m_urls.first();
-	QMap< KURL, SvnGlobal::SvnInfoHolder> holderMap;
+	TQMap< KURL, SvnGlobal::SvnInfoHolder> holderMap;
 	SvnGlobal::SvnInfoHolder holder;
 	m_impl->clientInfo( wcPath, false, holderMap );
-	QValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values();
+	TQValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values();
 	holder = holderList.first();
 	// start input dialog
 	SvnCopyDialog dlg( wcPath.prettyURL(),
 					   &holder,
-					   (QWidget*)project()->mainWindow()->main());
+					   (TQWidget*)project()->mainWindow()->main());
 	
-	if( dlg.exec() != QDialog::Accepted )
+	if( dlg.exec() != TQDialog::Accepted )
 		return;
 	// retrieve user input
 	KURL srcUrl = dlg.sourceUrl();
     int rev = dlg.revision();
-    QString revKind = dlg.revKind();
+    TQString revKind = dlg.revKind();
     KURL dest = dlg.destUrl();
 
 	kdDebug(9036) << " SRC: " << srcUrl << " DEST: " << dest << " Revnum: " << rev << " RevKind: " << revKind << endl;
@@ -376,15 +376,15 @@ void subversionPart::slotMerge()
 {
 	// error check
 	if( m_urls.count() > 1 ){
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							 i18n("Please select only one item for subversion merge") );
 		return;
 	}
 	if( m_urls.count() < 1 ) return;
 
 	KURL wcTarget= m_urls.first();
-	SvnMergeDialog dlg( wcTarget, (QWidget*)project()->mainWindow()->main() );
-	if( dlg.exec() != QDialog::Accepted ) return;
+	SvnMergeDialog dlg( wcTarget, (TQWidget*)project()->mainWindow()->main() );
+	if( dlg.exec() != TQDialog::Accepted ) return;
 
 	KURL src1 = dlg.source1();
 	SvnRevision rev1 = dlg.rev1();
@@ -444,7 +444,7 @@ void subversionPart::slotActionDiffHead() {
 void subversionPart::slotCommit()
 {
 	SVNFileSelectDlgCommit dialog( m_urls, this, 0 );
-	if( dialog.exec() == QDialog::Accepted ){
+	if( dialog.exec() == TQDialog::Accepted ){
 		KURL::List tobeCommittedUrls = dialog.checkedUrls();
 		bool recursive = dialog.recursive();
 		bool keepLocks = dialog.keepLocks();
@@ -458,16 +458,16 @@ void subversionPart::slotAdd() {
 void subversionPart::slotLog()
 {
 	if (m_urls.count() > 1){
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							i18n("Please select only one item for subversion log") );
 		return;
 	}
 	SvnLogViewOptionDlg dlg;
 	if( dlg.exec() ){
 		int revstart = dlg.revstart();
-		QString revkindstart = dlg.revKindStart();
+		TQString revkindstart = dlg.revKindStart();
 		int revend = dlg.revend();
-		QString revkindend = dlg.revKindEnd();
+		TQString revkindend = dlg.revKindEnd();
 		bool strictNode = dlg.strictNode();
 		m_impl->svnLog (m_urls, revstart, revkindstart, revend, revkindend, true/*changedPath*/, strictNode);
 	} else{
@@ -477,12 +477,12 @@ void subversionPart::slotLog()
 void subversionPart::slotBlame()
 {
 	if (m_urls.count() > 1){
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							 i18n("Please select only one item to see annotate") );
 		return;
 	}
 	if (m_urls.count() < 1){
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							 i18n("Select file to see blame") );
 		return;
 	}
@@ -500,7 +500,7 @@ void subversionPart::slotDiffLocal() {
 // 	m_impl->diff (m_urls, "BASE");
 	if( m_urls.count() < 1 ){
 		// Impossible to reach here but..
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							 i18n("Select file or directory to see diff") );
 		return;
 	}
@@ -510,7 +510,7 @@ void subversionPart::slotDiffHead() {
 // 	m_impl->diff (m_urls, "HEAD");
 	if( m_urls.count() < 1 ){
 		// Impossible to reach here but..
-		KMessageBox::error( (QWidget*)project()->mainWindow()->main(),
+		KMessageBox::error( (TQWidget*)project()->mainWindow()->main(),
 							 i18n("Select file or directory to see diff") );
 		return;
 	}
@@ -529,41 +529,41 @@ void subversionPart::slotProjectOpened() {
 	}	*/
 	//loadOptions();
 	/// \FIXME slots
-	//connect( project(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) );
-	//connect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) );
+	//connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) );
+	//connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) );
 }
 
 void subversionPart::slotProjectClosed() {
 	kdDebug(9036) << "subversion :projectClosed" << endl;
 	//saveOptions();
 	/// \FIXME slots
-	//disconnect( project(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) );
-	//disconnect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) );
+	//disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) );
+	//disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) );
 }
 
-void subversionPart::savePartialProjectSession(QDomElement* dom) {
+void subversionPart::savePartialProjectSession(TQDomElement* dom) {
 	kdDebug(9036) << "subversion : savePartialProjectSession" << endl;
-	QDomDocument doc = dom->ownerDocument();
-	QDomElement svn = doc.createElement( "subversion" );
+	TQDomDocument doc = dom->ownerDocument();
+	TQDomElement svn = doc.createElement( "subversion" );
 	svn.setAttribute( "base", base.url() );
 	dom->appendChild( svn );
 }
 
-void subversionPart::restorePartialProjectSession(const QDomElement* dom) {
+void subversionPart::restorePartialProjectSession(const TQDomElement* dom) {
 	kdDebug(9036) << "subversion : restorePartialProjectSession" << endl;
-	QDomElement svn = dom->namedItem("subversion").toElement();
+	TQDomElement svn = dom->namedItem("subversion").toElement();
 	base = svn.attribute( "base", "" );
 }
 
-bool subversionPart::isValidDirectory( const QString &dirPath) const {
-    QString svn = "/.svn/";
-    QDir svndir( dirPath + svn );
-    QString entriesFileName = dirPath + svn + "entries";
+bool subversionPart::isValidDirectory( const TQString &dirPath) const {
+    TQString svn = "/.svn/";
+    TQDir svndir( dirPath + svn );
+    TQString entriesFileName = dirPath + svn + "entries";
 
 	kdDebug(9036) << "dirpath " << dirPath+"/.svn/" << " exists:" << svndir.exists() << endl;
-	kdDebug(9036) << "entries " << entriesFileName << " exists:" << QFile::exists( entriesFileName ) << endl;
+	kdDebug(9036) << "entries " << entriesFileName << " exists:" << TQFile::exists( entriesFileName ) << endl;
     return svndir.exists() &&
-        QFile::exists( entriesFileName );
+        TQFile::exists( entriesFileName );
 }
 
 #include "subversion_part.moc"
diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h
index a4717772..7ce9e0cd 100644
--- a/vcs/subversion/subversion_part.h
+++ b/vcs/subversion/subversion_part.h
@@ -20,10 +20,10 @@
 #define __KDEVPART_SUBVERSION_H__
 
 
-#include 
+#include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include "kdevversioncontrol.h"
 
@@ -41,28 +41,28 @@ class subversionPart : public KDevVersionControl
 	Q_OBJECT
 
 public:
-		subversionPart(QObject *parent, const char *name, const QStringList &);
+		subversionPart(TQObject *parent, const char *name, const TQStringList &);
 		virtual ~subversionPart();
 
 		void setupActions();
-		QWidget* newProjectWidget( QWidget* parent );
-		void createNewProject( const QString& dirname );
+		TQWidget* newProjectWidget( TQWidget* parent );
+		void createNewProject( const TQString& dirname );
 		bool fetchFromRepository();
 		KDevVCSFileInfoProvider * fileInfoProvider() const;
 		bool urlFocusedDocument( KURL &url );
-		void restorePartialProjectSession(const QDomElement* );
-		void savePartialProjectSession(QDomElement* );
+		void restorePartialProjectSession(const TQDomElement* );
+		void savePartialProjectSession(TQDomElement* );
 		void setBaseURL(const KURL& url ) { base = url; }
 		KURL baseURL() { return base; }
-		virtual bool isValidDirectory( const QString &dirPath ) const;
+		virtual bool isValidDirectory( const TQString &dirPath ) const;
 		KURL::List urls() { return m_urls; }
         subversionCore* svncore() { return m_impl; }
 
 signals:
-//		void finishedFetching( QString destinationDir );
+//		void finishedFetching( TQString destinationDir );
 
 private slots:
-		void contextMenu( QPopupMenu *popup, const Context *context );
+		void contextMenu( TQPopupMenu *popup, const Context *context );
 		void slotActionUpdate();
 		void slotActionRevert();
 		void slotActionCommit();
@@ -88,7 +88,7 @@ private slots:
 		void slotProjectOpened();
 
 private:
-		QGuardedPtr m_impl;
+		TQGuardedPtr m_impl;
 		KURL::List m_urls;
 
 		KAction *actionCommit,
@@ -107,11 +107,11 @@ private:
 		*actionCopy,
 		*actionMerge;
 
-		QGuardedPtr m_projWidget;
+		TQGuardedPtr m_projWidget;
 		KURL base;
 
 public:
-        QMap< KURL, SvnGlobal::SvnInfoHolder > m_prjInfoMap;
+        TQMap< KURL, SvnGlobal::SvnInfoHolder > m_prjInfoMap;
 
 };
 
diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp
index acc2db0c..c27f845e 100644
--- a/vcs/subversion/subversion_widget.cpp
+++ b/vcs/subversion/subversion_widget.cpp
@@ -26,26 +26,26 @@
 #include "subversion_widget.h"
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
-subversionWidget::subversionWidget( subversionPart *part, QWidget *parent, const char* name )
+subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, const char* name )
     : KTabWidget(parent)
 {
 	m_part = part;
     m_edit = new KTextEdit( this );
     m_edit->setReadOnly( TRUE );
     tab()->addTab( m_edit, i18n("Notification") );
-    m_closeButton = new QPushButton( tab() );
+    m_closeButton = new TQPushButton( tab() );
     m_closeButton->setText( i18n("Close") );
     tab()->setCornerWidget(m_closeButton);
-    connect( m_closeButton, SIGNAL(clicked()), this, SLOT(closeCurrentTab()) );
+    connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentTab()) );
 }
 
 subversionWidget::~subversionWidget()
 {}
 
-void subversionWidget::append( QString notifications )
+void subversionWidget::append( TQString notifications )
 {
     if( !m_edit ){
         // should not happen
@@ -55,7 +55,7 @@ void subversionWidget::append( QString notifications )
     showPage( m_edit );
 }
 
-void subversionWidget::showLogResult( QValueList *holderList, QString reqUrl )
+void subversionWidget::showLogResult( TQValueList *holderList, TQString reqUrl )
 {
     SvnLogViewWidget *widget = new SvnLogViewWidget( m_part, this );
     widget->setLogResult( holderList );
@@ -65,7 +65,7 @@ void subversionWidget::showLogResult( QValueList *holderList, QStr
     tab()->showPage( widget );
 }
 
-void subversionWidget::showBlameResult( QValueList *blamelist )
+void subversionWidget::showBlameResult( TQValueList *blamelist )
 {
     SvnBlameWidget *widget = new SvnBlameWidget( this );
     widget->copyBlameData( blamelist );
@@ -75,7 +75,7 @@ void subversionWidget::showBlameResult( QValueList *blamelist )
 }
 void subversionWidget::closeCurrentTab()
 {
-    QWidget *current = tab()->currentPage();
+    TQWidget *current = tab()->currentPage();
     KTextEdit *edit = static_cast(current);
     if( edit ){
         if( edit == m_edit ) // main notification output should not be deleted
@@ -87,13 +87,13 @@ void subversionWidget::closeCurrentTab()
 
 ////////////////////////////////////////////////////////////////////////
 
-SvnIntSortListItem::SvnIntSortListItem( QListView* parent )
-	:QListViewItem(parent)
+SvnIntSortListItem::SvnIntSortListItem( TQListView* parent )
+	:TQListViewItem(parent)
 {}
 SvnIntSortListItem::~SvnIntSortListItem()
 {}
 
-int SvnIntSortListItem::compare( QListViewItem *item, int col, bool ascending ) const
+int SvnIntSortListItem::compare( TQListViewItem *item, int col, bool ascending ) const
 {
 	
 	unsigned int myVal = this->text(col).toUInt();
@@ -103,7 +103,7 @@ int SvnIntSortListItem::compare( QListViewItem *item, int col, bool ascending )
 	return 0;
 }
 
-SvnLogViewItem::SvnLogViewItem( QListView * parent )
+SvnLogViewItem::SvnLogViewItem( TQListView * parent )
     :SvnIntSortListItem( parent )
 {
     m_pathList = "";
@@ -124,11 +124,11 @@ SvnProgressDlg::SvnProgressDlg( bool showNow )
 SvnProgressDlg::~SvnProgressDlg()
 {}
 
-void SvnProgressDlg::setSourceUrl( const QString &src )
+void SvnProgressDlg::setSourceUrl( const TQString &src )
 {
 	sourceEdit->setText( src );
 }
-void SvnProgressDlg::setDestUrl( const QString &dest )
+void SvnProgressDlg::setDestUrl( const TQString &dest )
 {
 	destEdit->setText( dest );
 }
diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h
index 53d806d7..c2ff7e62 100644
--- a/vcs/subversion/subversion_widget.h
+++ b/vcs/subversion/subversion_widget.h
@@ -20,15 +20,15 @@
 #ifndef __SUBVERSION_WIDGET_H__
 #define __SUBVERSION_WIDGET_H__
 
-#include 
+#include 
 #include "svn_blamewidget.h"
 #include "svn_logviewwidget.h"
-#include 
+#include 
 
 class subversionPart;
 #include 
 #include 
-#include 
+#include 
 class KTextEdit;
 class SvnLogHolder;
 class SvnBlameHolder;
@@ -42,13 +42,13 @@ class subversionWidget : public KTabWidget
 {
     Q_OBJECT
 public:
-    subversionWidget(subversionPart *part, QWidget *parent, const char* name);
+    subversionWidget(subversionPart *part, TQWidget *parent, const char* name);
     ~subversionWidget();
 
     // append what?. Append any text status outputs
-    void append( QString notifications );
-    void showLogResult( QValueList *holderList, QString reqUrl );
-    void showBlameResult( QValueList *blamelist );
+    void append( TQString notifications );
+    void showLogResult( TQValueList *holderList, TQString reqUrl );
+    void showBlameResult( TQValueList *blamelist );
 
 protected slots:
     void closeCurrentTab();
@@ -57,29 +57,29 @@ private:
     KTabWidget* tab(){ return this; }
 	subversionPart *m_part;
     
-    QGuardedPtr m_edit;
-    QPushButton *m_closeButton;
+    TQGuardedPtr m_edit;
+    TQPushButton *m_closeButton;
 
 };
 /**
  * reimplement compare(), to be able to sort any item by integer
  */
-class SvnIntSortListItem : public QListViewItem {
+class SvnIntSortListItem : public TQListViewItem {
 public:
-	SvnIntSortListItem ( QListView* parent=0 );
+	SvnIntSortListItem ( TQListView* parent=0 );
 	~SvnIntSortListItem ();
 	/** Returns < 0 if this item is less than i, 0 if they are equal and > 0 if this item is greater than i. 
 	 */
-	virtual int compare( QListViewItem* i, int col, bool ascending ) const;
+	virtual int compare( TQListViewItem* i, int col, bool ascending ) const;
 };
 
 class SvnLogViewItem : public SvnIntSortListItem {
     public:
-        SvnLogViewItem( QListView* parent );
+        SvnLogViewItem( TQListView* parent );
         ~SvnLogViewItem();
 
-        QString m_pathList;
-        QString m_message;
+        TQString m_pathList;
+        TQString m_message;
 };
 
 /////////////////////////////////////////////////////////////
@@ -88,8 +88,8 @@ class SvnProgressDlg : public KIO::DefaultProgress {
 public:
 	SvnProgressDlg( bool showNow = true );
 	~SvnProgressDlg();
-	void setSourceUrl( const QString & );
-	void setDestUrl( const QString & );
+	void setSourceUrl( const TQString & );
+	void setDestUrl( const TQString & );
 };
 
 #endif
diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp
index 5d186177..b4095389 100644
--- a/vcs/subversion/svn_blamewidget.cpp
+++ b/vcs/subversion/svn_blamewidget.cpp
@@ -14,23 +14,23 @@
 
 #include "svn_blamewidget.h"
 #include "subversion_widget.h"
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
 
-SvnBlameWidget::SvnBlameWidget( QWidget *parent, const char* name, bool modal, WFlags f )
-	:QWidget( parent )
+SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f )
+	:TQWidget( parent )
 {
-    m_layout = new QVBoxLayout( this, 1, 1 );
+    m_layout = new TQVBoxLayout( this, 1, 1 );
     m_layout->setMargin(1);
     
-    m_listView = new QListView( this );
+    m_listView = new TQListView( this );
     outView()->setAllColumnsShowFocus( TRUE );
     outView()->addColumn( i18n("Line") );
     outView()->addColumn( i18n("Rev") );
@@ -43,7 +43,7 @@ SvnBlameWidget::SvnBlameWidget( QWidget *parent, const char* name, bool modal, W
 SvnBlameWidget::~SvnBlameWidget()
 {}
 
-void SvnBlameWidget::copyBlameData( QValueList *blamelist )
+void SvnBlameWidget::copyBlameData( TQValueList *blamelist )
 {
 	m_blamelist = *blamelist;
 }
@@ -53,66 +53,66 @@ void SvnBlameWidget::show()
 	outView()->clear();
 	outView()->setSortColumn(0);
 	
-	QFont f = outView()->font();
+	TQFont f = outView()->font();
 	f.setFixedPitch( true );
 	outView()->setFont( f );
 
-	QValueList::Iterator it;
+	TQValueList::Iterator it;
 	
 	for( it = m_blamelist.begin(); it != m_blamelist.end(); ++it ){
 		
 		SvnBlameHolder holder = *it;
 		SvnIntSortListItem *item = new SvnIntSortListItem(outView());
 		
-		QString prettyDate = holder.date.left(16).replace(10, 1, ' ');
+		TQString prettyDate = holder.date.left(16).replace(10, 1, ' ');
 		
-		item->setText(0, QString::number( holder.line+1 ) ); 
-		item->setText(1, QString::number(holder.rev) );
+		item->setText(0, TQString::number( holder.line+1 ) ); 
+		item->setText(1, TQString::number(holder.rev) );
 		item->setText(2, prettyDate );
 		item->setText(3, holder.author );
 		item->setText(4, holder.content );
 		
 	}
 	outView()->sort();
-	QWidget::show();
+	TQWidget::show();
 }
 
-QListView* SvnBlameWidget::outView()
+TQListView* SvnBlameWidget::outView()
 {
     return m_listView;
 }
 
 /////////////////////////////////////////////////////////////
 
-SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( QWidget *parent )
-    : QDialog( parent )
+SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent )
+    : TQDialog( parent )
 {
     m_selected = "";
     setCaption( i18n("Select one file to view annotation") );
     
-    m_layout = new QGridLayout( this, 2, 2 );
-    m_view = new QListView( this );
+    m_layout = new TQGridLayout( this, 2, 2 );
+    m_view = new TQListView( this );
     m_view->addColumn( i18n("files") );
-    m_okBtn = new QPushButton( i18n("OK"), this );
-    m_cancelBtn = new QPushButton( i18n("Cancel"), this );
+    m_okBtn = new TQPushButton( i18n("OK"), this );
+    m_cancelBtn = new TQPushButton( i18n("Cancel"), this );
     m_layout->addMultiCellWidget( m_view, 0, 0, 0, 1 );
     m_layout->addWidget( m_okBtn, 1, 0 );
     m_layout->addWidget( m_cancelBtn, 1, 1 );
     
-    connect( m_okBtn, SIGNAL(clicked()), this, SLOT(accept()) );
-    connect( m_cancelBtn, SIGNAL(clicked()), this, SLOT(reject()) );
+    connect( m_okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
+    connect( m_cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
 }
 SvnBlameFileSelectDlg::~SvnBlameFileSelectDlg()
 {}
 
-void SvnBlameFileSelectDlg::setCandidate( QStringList *list )
+void SvnBlameFileSelectDlg::setCandidate( TQStringList *list )
 {
-    for( QValueList::iterator it = list->begin(); it != list->end(); ++it ){
-        QListViewItem *item = new QListViewItem( m_view, *it );
+    for( TQValueList::iterator it = list->begin(); it != list->end(); ++it ){
+        TQListViewItem *item = new TQListViewItem( m_view, *it );
     }
 }
 
-QString SvnBlameFileSelectDlg::selected()
+TQString SvnBlameFileSelectDlg::selected()
 {
     return m_selected;
 }
@@ -120,7 +120,7 @@ QString SvnBlameFileSelectDlg::selected()
 void SvnBlameFileSelectDlg::accept()
 {
     while( true ){
-        QListViewItem *item = m_view->currentItem();
+        TQListViewItem *item = m_view->currentItem();
         if( item ){
             m_selected = item->text(0);
             break;
@@ -129,7 +129,7 @@ void SvnBlameFileSelectDlg::accept()
             KMessageBox::error( this, i18n("Select file from list to view annotation") );
         }
     }
-    QDialog::accept();
+    TQDialog::accept();
 }
 
 #include "svn_blamewidget.moc"
diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h
index 26bd0fa2..b0d01e12 100644
--- a/vcs/subversion/svn_blamewidget.h
+++ b/vcs/subversion/svn_blamewidget.h
@@ -16,9 +16,9 @@
 #ifndef SVN_BLAMEWIDGET_H
 #define SVN_BLAMEWIDGET_H
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 class QVBoxLayout;
 class QListView;
 class QGridLayout;
@@ -31,47 +31,47 @@ public:
 // 	~SvnBlameHolder(){};
 	unsigned int line;
 	long int rev;
-	QString date;
-	QString author;
-	QString content;	
+	TQString date;
+	TQString author;
+	TQString content;	
 };	
 
 class QListView;
 
-class SvnBlameWidget : public QWidget {
+class SvnBlameWidget : public TQWidget {
 	Q_OBJECT
 public:
-	SvnBlameWidget( QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 );
+	SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 );
 	virtual ~SvnBlameWidget();
-	void copyBlameData( QValueList *blamelist );
+	void copyBlameData( TQValueList *blamelist );
 	void show();
-	QListView* outView();
+	TQListView* outView();
 protected:
-    QValueList  m_blamelist;
+    TQValueList  m_blamelist;
     
-    QVBoxLayout *m_layout;
-    QListView *m_listView;
+    TQVBoxLayout *m_layout;
+    TQListView *m_listView;
 };
 
-class SvnBlameFileSelectDlg : public QDialog {
+class SvnBlameFileSelectDlg : public TQDialog {
     Q_OBJECT
 public:
-    SvnBlameFileSelectDlg( QWidget *parent = 0L );
+    SvnBlameFileSelectDlg( TQWidget *parent = 0L );
     virtual ~SvnBlameFileSelectDlg();
-    void setCandidate( QStringList *modifies );
-    QString selected();
+    void setCandidate( TQStringList *modifies );
+    TQString selected();
     
 protected:
     virtual void accept();
     
 private:
-    QGridLayout *m_layout;
-    QListView *m_view;
-    QPushButton *m_okBtn;
-    QPushButton *m_cancelBtn;
+    TQGridLayout *m_layout;
+    TQListView *m_view;
+    TQPushButton *m_okBtn;
+    TQPushButton *m_cancelBtn;
     
-    QStringList *m_candidates;
-    QString m_selected;
+    TQStringList *m_candidates;
+    TQString m_selected;
 };
 
 #endif
diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp
index a5d74bcb..30b25fd7 100644
--- a/vcs/subversion/svn_copywidget.cpp
+++ b/vcs/subversion/svn_copywidget.cpp
@@ -5,18 +5,18 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
-SvnCopyDialog::SvnCopyDialog( const QString &reqPath, SvnGlobal::SvnInfoHolder *holder, QWidget *parent )
+SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent )
 	: SvnCopyDialogBase( parent )
 	, m_holder(holder)
 {
 	reqEdit->setText( reqPath );
 
-	connect( urlRadio, SIGNAL(clicked()), this, SLOT(setSourceAsUrl()) );
-	connect( pathRadio, SIGNAL(clicked()), this, SLOT(setSourceAsLocalPath()) );
-	connect( revnumRadio, SIGNAL(toggled(bool)), revnumInput, SLOT(setEnabled(bool)) );
-	connect( revnumRadio, SIGNAL(toggled(bool)), revkindCombo, SLOT(setDisabled(bool)) );
+	connect( urlRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsUrl()) );
+	connect( pathRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsLocalPath()) );
+	connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revnumInput, TQT_SLOT(setEnabled(bool)) );
+	connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revkindCombo, TQT_SLOT(setDisabled(bool)) );
 	
 	// In many cases, users copy from reository to repository. This is for making tag/branche.
 	// The case where copying from local path to repository may be lesser than the above one.
@@ -45,12 +45,12 @@ int SvnCopyDialog::revision()
 		return -1;
 }
 
-QString SvnCopyDialog::revKind()
+TQString SvnCopyDialog::revKind()
 {
 	if( revkindRadio->isChecked() )
 		return revkindCombo->currentText();
 	else
-		return QString("");
+		return TQString("");
 }
 
 KURL SvnCopyDialog::destUrl()
diff --git a/vcs/subversion/svn_copywidget.h b/vcs/subversion/svn_copywidget.h
index cc00636d..8b80807e 100644
--- a/vcs/subversion/svn_copywidget.h
+++ b/vcs/subversion/svn_copywidget.h
@@ -13,12 +13,12 @@ class SvnCopyDialog : public SvnCopyDialogBase
 {
 	Q_OBJECT
 public:
-	SvnCopyDialog( const QString &reqPath, SvnGlobal::SvnInfoHolder *holder, QWidget *parent );
+	SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent );
 	~SvnCopyDialog();
 
 	KURL sourceUrl();
 	int revision();
-	QString revKind();
+	TQString revKind();
 	KURL destUrl();
 
 public slots:
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index 6217db56..0c014a9d 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -23,10 +23,10 @@
 #include "subversion_fileinfo.h"
 #include "subversion_part.h"
 #include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include "kdevmainwindow.h"
@@ -34,7 +34,7 @@
 
 #include 
 
-SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, QWidget* parent)
+SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent)
 	:SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true )
 	,m_part(part)
 {
@@ -43,7 +43,7 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart
 	listView()->setColumnText(0, i18n("select") );  //col 0
 	listView()->addColumn( i18n("status") );        //col 1
 	listView()->addColumn( i18n("URL to commit") ); //col 2
-	listView()->setColumnWidthMode( 2, QListView::Maximum );
+	listView()->setColumnWidthMode( 2, TQListView::Maximum );
 	listView()->setSorting( 2, true );
 	recursiveChk->setChecked(false);
 	keepLocksChk->setChecked(false);
@@ -53,14 +53,14 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart
 	VCSFileInfo     vcsInfo;
 	KURL::List tobeCommittedUrls;
 
-	for( QValueListConstIterator it = urls.begin(); it != urls.end(); ++it ){
+	for( TQValueListConstIterator it = urls.begin(); it != urls.end(); ++it ){
 		KURL oneUrl(*it);
-		QFileInfo fileInfo(oneUrl.path());
+		TQFileInfo fileInfo(oneUrl.path());
 		//fileInfo.convertToAbs();
 		
 		if (fileInfo.isFile()){
 			KURL base_url( part->project()->projectDirectory()+"/" );
-			QString dirPath = KURL::relativeURL( base_url, fileInfo.dirPath(TRUE) );
+			TQString dirPath = KURL::relativeURL( base_url, fileInfo.dirPath(TRUE) );
 			vcsMap = ((SVNFileInfoProvider*)part->fileInfoProvider()) ->
                     statusExt(dirPath, false/*repository access*/, true/*recurse*/, false/*getall*/, true/*noIgnore*/);
 			vcsInfo = (*vcsMap)[fileInfo.fileName()];
@@ -78,14 +78,14 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart
 		}
 		else if (fileInfo.isDir()){
 			KURL base_url( part->project()->projectDirectory()+"/" );
-			QString dirPath = KURL::relativeURL( base_url, fileInfo.absFilePath() );
+			TQString dirPath = KURL::relativeURL( base_url, fileInfo.absFilePath() );
             vcsMap = ((SVNFileInfoProvider*)part->fileInfoProvider()) ->
                     statusExt(dirPath, false/*repository access*/, true/*recurse*/, false/*getall*/, true/*noIgnore*/);
 			for (VCSFileInfoMap::ConstIterator it=vcsMap->begin(); it!=vcsMap->end(); ++it){
 				
 				vcsInfo = it.data();
-//				QString absPathStr( fileInfo.absFilePath() + "/" + it.key() );
-				QString absPathStr( fileInfo.filePath() + "/" + it.key() );
+//				TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() );
+				TQString absPathStr( fileInfo.filePath() + "/" + it.key() );
 				KURL urlFromStatus( absPathStr );
 				if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified ||
                     vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){
@@ -116,28 +116,28 @@ int SVNFileSelectDlgCommit::exec()
 {
 	if (listView()->childCount() <= 0){
 		//TODO if klauncher fails, this spot is also reached. We should show correct error message to user
-		KMessageBox::information( (QWidget*)m_part->project()->mainWindow()->main(), i18n("No added/modified/deleted file(s) to commit") );
-		return QDialog::Rejected;
+		KMessageBox::information( (TQWidget*)m_part->project()->mainWindow()->main(), i18n("No added/modified/deleted file(s) to commit") );
+		return TQDialog::Rejected;
 	}
 	else{
 		return SvnCommitDlgBase::exec();
 	}
 }
-void SVNFileSelectDlgCommit::insertItem( QString status, KURL url )
+void SVNFileSelectDlgCommit::insertItem( TQString status, KURL url )
 {
-	QCheckListItem *item = new QCheckListItem( listView(), "", QCheckListItem::CheckBox );
+	TQCheckListItem *item = new TQCheckListItem( listView(), "", TQCheckListItem::CheckBox );
 	item->setText( 1, status );
 	item->setText( 2, url.path() );
 	item->setOn(true);
 }
 KURL::List SVNFileSelectDlgCommit::checkedUrls()
 {
-	QPtrList lst;
-	QListViewItemIterator it( listView() );
+	TQPtrList lst;
+	TQListViewItemIterator it( listView() );
 	KURL::List tobeCommittedUrls;
 	
 	for ( ; it.current() ; ++it ) {
-		if ( ((QCheckListItem*)(it.current()))->isOn() ){
+		if ( ((TQCheckListItem*)(it.current()))->isOn() ){
 			KURL tmpurl( it.current()->text(2) );
 			tobeCommittedUrls.push_back( tmpurl );
 		}
@@ -145,7 +145,7 @@ KURL::List SVNFileSelectDlgCommit::checkedUrls()
 	return tobeCommittedUrls;
     
 }
-QListView* SVNFileSelectDlgCommit::listView()
+TQListView* SVNFileSelectDlgCommit::listView()
 {
 	return listView1;
 }
diff --git a/vcs/subversion/svn_fileselectdlg_commit.h b/vcs/subversion/svn_fileselectdlg_commit.h
index 1ce53e48..5789d15d 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.h
+++ b/vcs/subversion/svn_fileselectdlg_commit.h
@@ -22,7 +22,7 @@
 #define _svnfileselectdlgcommit_
 
 #include "svn_commitdlgbase.h"
-#include 
+#include 
 #include 
 
 class QString;
@@ -35,9 +35,9 @@ class SVNFileSelectDlgCommit : public SvnCommitDlgBase{
 Q_OBJECT
 		
 public:
-	SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, QWidget* parent = 0 );
+	SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* parent = 0 );
 	~SVNFileSelectDlgCommit();
-	void insertItem( QString status, KURL url );
+	void insertItem( TQString status, KURL url );
 	KURL::List checkedUrls();
 	bool recursive();
 	bool keepLocks();
@@ -45,7 +45,7 @@ public:
 public slots:
 	int exec();	
 protected:
-	QListView* listView();
+	TQListView* listView();
 	subversionPart *m_part;
 };
 
diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp
index 16eccd14..3a39d33c 100644
--- a/vcs/subversion/svn_kio.cpp
+++ b/vcs/subversion/svn_kio.cpp
@@ -17,10 +17,10 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -39,7 +39,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -49,7 +49,7 @@
 #include 
 
 #include 
-#include 
+#include 
 
 #include "svn_kio.h"
 #include 
@@ -115,7 +115,7 @@ compare_items_as_paths (const svn_sort__item_t*a, const svn_sort__item_t*b) {
   return svn_path_compare_paths ((const char *)a->key, (const char *)b->key);
 }
 
-kio_svnProtocol::kio_svnProtocol(const QCString &pool_socket, const QCString &app_socket)
+kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket)
 	: SlaveBase("kio_svn", pool_socket, app_socket) {
 		kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol()" << endl;
 
@@ -245,7 +245,7 @@ void kio_svnProtocol::recordCurrentURL(const KURL& url) {
 void kio_svnProtocol::get(const KURL& url ){
 	kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ;
 
-	QString remoteServer = url.host();
+	TQString remoteServer = url.host();
 	infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
 
 	apr_pool_t *subpool = svn_pool_create (pool);
@@ -254,7 +254,7 @@ void kio_svnProtocol::get(const KURL& url ){
 	bt->string_stream = svn_stream_create(bt,subpool);
 	svn_stream_set_write(bt->string_stream,write_to_string);
 
-	QString target = makeSvnURL( url );
+	TQString target = makeSvnURL( url );
 	kdDebug(9036) << "SvnURL: " << target << endl;
 	recordCurrentURL( KURL( target ) );
 
@@ -263,7 +263,7 @@ void kio_svnProtocol::get(const KURL& url ){
 	svn_opt_revision_t endrev;
 	int idx = target.findRev( "?rev=" );
 	if ( idx != -1 ) {
-		QString revstr = target.mid( idx+5 );
+		TQString revstr = target.mid( idx+5 );
 #if 0
 		kdDebug(9036) << "revision string found " << revstr  << endl;
 		if ( revstr == "HEAD" ) {
@@ -292,7 +292,7 @@ void kio_svnProtocol::get(const KURL& url ){
 	}
 
 	// Send the mimeType as soon as it is known
-	QByteArray *cp = new QByteArray();
+	TQByteArray *cp = new TQByteArray();
 	cp->setRawData( bt->target_string->data, bt->target_string->len );
 	KMimeType::Ptr mt = KMimeType::findByContent(*cp);
 	kdDebug(9036) << "KMimeType returned : " << mt->name() << endl;
@@ -303,7 +303,7 @@ void kio_svnProtocol::get(const KURL& url ){
 	//send data
 	data(*cp);
 
-	data(QByteArray()); // empty array means we're done sending the data
+	data(TQByteArray()); // empty array means we're done sending the data
 	finished();
 	svn_pool_destroy (subpool);
 }
@@ -316,7 +316,7 @@ void kio_svnProtocol::stat(const KURL & url){
 	svn_node_kind_t kind;
 	apr_pool_t *subpool = svn_pool_create (pool);
 
-	QString target = makeSvnURL( url);
+	TQString target = makeSvnURL( url);
 	kdDebug(9036) << "SvnURL: " << target << endl;
 	recordCurrentURL( KURL( target ) );
 
@@ -325,7 +325,7 @@ void kio_svnProtocol::stat(const KURL & url){
 	svn_opt_revision_t endrev;
 	int idx = target.findRev( "?rev=" );
 	if ( idx != -1 ) {
-		QString revstr = target.mid( idx+5 );
+		TQString revstr = target.mid( idx+5 );
 #if 0
 		kdDebug(9036) << "revision string found " << revstr  << endl;
 		if ( revstr == "HEAD" ) {
@@ -421,7 +421,7 @@ void kio_svnProtocol::listDir(const KURL& url){
 	apr_pool_t *subpool = svn_pool_create (pool);
 	apr_hash_t *dirents;
 
-	QString target = makeSvnURL( url);
+	TQString target = makeSvnURL( url);
 	kdDebug(9036) << "SvnURL: " << target << endl;
 	recordCurrentURL( KURL( target ) );
 
@@ -430,7 +430,7 @@ void kio_svnProtocol::listDir(const KURL& url){
 	svn_opt_revision_t endrev;
 	int idx = target.findRev( "?rev=" );
 	if ( idx != -1 ) {
-		QString revstr = target.mid( idx+5 );
+		TQString revstr = target.mid( idx+5 );
 		svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool );
 #if 0
 		kdDebug(9036) << "revision string found " << revstr  << endl;
@@ -490,7 +490,7 @@ void kio_svnProtocol::listDir(const KURL& url){
 			if (dirent->last_author)
 				svn_utf_cstring_from_utf8 (&native_author, dirent->last_author, subpool);
 
-			if ( createUDSEntry(QString( native_entryname ), QString( native_author ), dirent->size,
+			if ( createUDSEntry(TQString( native_entryname ), TQString( native_author ), dirent->size,
 						dirent->kind==svn_node_dir ? true : false, 0, entry) )
 				listEntry( entry, false );
 	}
@@ -500,7 +500,7 @@ void kio_svnProtocol::listDir(const KURL& url){
 	svn_pool_destroy (subpool);
 }
 
-bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) {
+bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) {
 	kdDebug(9036) << "MTime : " << ( long )mtime << endl;
 	kdDebug(9036) << "UDS filename : " << filename << endl;
 	UDSAtom atom;
@@ -538,8 +538,8 @@ bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& us
 // 	KURL ndest = dest;
 // 	nsrc.setProtocol( chooseProtocol( src.protocol() ) );
 // 	ndest.setProtocol( chooseProtocol( dest.protocol() ) );
-// 	QString srcsvn = nsrc.url();
-// 	QString destsvn = ndest.url();
+// 	TQString srcsvn = nsrc.url();
+// 	TQString destsvn = ndest.url();
 // 
 // 	recordCurrentURL( nsrc );
 // 
@@ -547,7 +547,7 @@ bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& us
 // 	svn_opt_revision_t rev;
 // 	int idx = srcsvn.findRev( "?rev=" );
 // 	if ( idx != -1 ) {
-// 		QString revstr = srcsvn.mid( idx+5 );
+// 		TQString revstr = srcsvn.mid( idx+5 );
 // 		kdDebug(9036) << "revision string found " << revstr  << endl;
 // 		if ( revstr == "HEAD" ) {
 // 			rev.kind = svn_opt_revision_head;
@@ -587,7 +587,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) {
 
 	KURL::List::const_iterator it = list.begin(), end = list.end();
 	for ( ; it != end; ++it ) {
-		QString cur = makeSvnURL( *it );
+		TQString cur = makeSvnURL( *it );
 		kdDebug( 9036 ) << "kio_svnProtocol::mkdir raw url for subversion : " << cur << endl;
 		const char *_target = apr_pstrdup( subpool, svn_path_canonicalize( apr_pstrdup( subpool, cur.utf8() ), subpool ) );
 		(*(( const char ** )apr_array_push(( apr_array_header_t* )targets)) ) = _target;
@@ -596,7 +596,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool);
 	if ( err ) {
-		error( KIO::ERR_COULD_NOT_MKDIR, QString::fromLocal8Bit(err->message) );
+		error( KIO::ERR_COULD_NOT_MKDIR, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -611,7 +611,7 @@ void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) {
 	apr_pool_t *subpool = svn_pool_create (pool);
 	svn_client_commit_info_t *commit_info = NULL;
 
-	QString target = makeSvnURL( url);
+	TQString target = makeSvnURL( url);
 	kdDebug(9036) << "SvnURL: " << target << endl;
 	recordCurrentURL( KURL( target ) );
 
@@ -636,7 +636,7 @@ void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) {
 	apr_pool_t *subpool = svn_pool_create (pool);
 	svn_client_commit_info_t *commit_info = NULL;
 
-	QString target = makeSvnURL(url);
+	TQString target = makeSvnURL(url);
 	kdDebug(9036) << "SvnURL: " << target << endl;
 	recordCurrentURL( KURL( target ) );
 
@@ -665,8 +665,8 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
 	KURL ndest = dest;
 	nsrc.setProtocol( chooseProtocol( src.protocol() ) );
 	ndest.setProtocol( chooseProtocol( dest.protocol() ) );
-	QString srcsvn = nsrc.url();
-	QString destsvn = ndest.url();
+	TQString srcsvn = nsrc.url();
+	TQString destsvn = ndest.url();
 
 	recordCurrentURL( nsrc );
 
@@ -674,7 +674,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
 	svn_opt_revision_t rev;
 	int idx = srcsvn.findRev( "?rev=" );
 	if ( idx != -1 ) {
-		QString revstr = srcsvn.mid( idx+5 );
+		TQString revstr = srcsvn.mid( idx+5 );
 		kdDebug(9036) << "revision string found " << revstr  << endl;
 		if ( revstr == "HEAD" ) {
 			rev.kind = svn_opt_revision_head;
@@ -703,10 +703,10 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
 	svn_pool_destroy (subpool);
 }
 
-void kio_svnProtocol::special( const QByteArray& data ) {
+void kio_svnProtocol::special( const TQByteArray& data ) {
 // 	kdDebug(9036) << "kio_svnProtocol::special" << endl;
 
-	QDataStream stream(data, IO_ReadOnly);
+	TQDataStream stream(data, IO_ReadOnly);
 	int tmp;
 
 	stream >> tmp;
@@ -717,7 +717,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 			{
 				KURL repository, wc;
 				int revnumber;
-				QString revkind;
+				TQString revkind;
 				stream >> repository;
 				stream >> wc;
 				stream >> revnumber;
@@ -730,7 +730,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 			{
 				KURL::List list;
 				int revnumber;
-				QString revkind;
+				TQString revkind;
 				stream >> list;
 				stream >> revnumber;
 				stream >> revkind;
@@ -769,7 +769,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 			{
 				kdDebug(9036) << "kio_svnProtocol LOG" << endl;
 				int revstart, revend;
-				QString revkindstart, revkindend;
+				TQString revkindstart, revkindend;
                 bool discorverChangedPath, strictNodeHistory;
 				KURL::List targets;
 
@@ -835,7 +835,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 		case SVN_STATUS_2:
 			{
 				KURL wc;
-				QString revkind;
+				TQString revkind;
 				int revnumber;
 				bool checkRepos, fullRecurse, getAll, noIgnore;
 				stream >> checkRepos;
@@ -871,7 +871,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 				KURL wc,url;
 				bool recurse;
 				int revnumber;
-				QString revkind;
+				TQString revkind;
 				stream >> wc;
 				stream >> url;
 				stream >> recurse;
@@ -897,7 +897,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 				KURL url1,url2;
 				int rev1, rev2;
 				bool recurse, pegdiff;
-				QString revkind1, revkind2;
+				TQString revkind1, revkind2;
 				stream >> url1;
 				stream >> url2;
 				stream >> rev1;
@@ -914,7 +914,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 				KURL url;
 				int urlMode;
 				int pegRev, startRev, endRev;
-				QString pegRevKind, startRevKind, endRevKind;
+				TQString pegRevKind, startRevKind, endRevKind;
 				stream >> url;
 				stream >> urlMode;
 // 				stream >> pegRev;
@@ -931,7 +931,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
             {
                 KURL pathOrUrl;
                 int pegRev, rev;
-                QString pegRevKind, revKind;
+                TQString pegRevKind, revKind;
                 bool recurse = false;
                 stream >> pathOrUrl;
                 stream >> pegRev;
@@ -946,7 +946,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 			{
 				KURL src, dest;
 				int srcRev;
-				QString srcRevKind;
+				TQString srcRevKind;
 				stream >> src;
 				stream >> srcRev;
 				stream >> srcRevKind;
@@ -958,7 +958,7 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 			{
 				KURL src1, src2, wc_target;
 				int rev1, rev2;
-				QString revKind1, revKind2;
+				TQString revKind1, revKind2;
 				bool recurse, ignore_ancestry, force, dry_run;
 				stream >> src1 >> rev1 >> revKind1;
 				stream >> src2 >> rev2 >> revKind2;
@@ -978,16 +978,16 @@ void kio_svnProtocol::special( const QByteArray& data ) {
 /**
  * not used anywhere, anymore
 */
-void kio_svnProtocol::popupMessage( const QString& message ) {
-// 	QByteArray params;
-// 	QDataStream stream(params, IO_WriteOnly);
+void kio_svnProtocol::popupMessage( const TQString& message ) {
+// 	TQByteArray params;
+// 	TQDataStream stream(params, IO_WriteOnly);
 // 	stream << message;
 //
-// 	if ( !dcopClient()->send( "kded","ksvnd","popupMessage(QString)", params ) )
+// 	if ( !dcopClient()->send( "kded","ksvnd","popupMessage(TQString)", params ) )
 // 		kdWarning() << "Communication with KDED:KSvnd failed" << endl;
 }
 
-void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString pegRevKind,*/ int startRev, QString startRevKind, int endRev, QString endRevKind )
+void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind )
 {
 	kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
 // 	kdDebug(9036) << " PegRev " << pegRev << pegRevKind << endl;
@@ -1005,7 +1005,7 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString p
 	svn_client_blame_receiver_t receiver = kio_svnProtocol::blameReceiver;
 	svn_error_t *err = svn_client_blame( path_or_url, &rev1, &rev2, receiver, (void*)this, ctx, subpool );
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 	finished();
 	svn_pool_destroy (subpool);
 
@@ -1014,11 +1014,11 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString p
 svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool )
 {
 	kio_svnProtocol *p = (kio_svnProtocol*)baton;
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", QString::number(line_no) );
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", QString::number(rev) );
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author );
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "DATE", date );
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "CONTENT", QString::fromLocal8Bit(line) );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", TQString::number(line_no) );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number(rev) );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "DATE", date );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "CONTENT", TQString::fromLocal8Bit(line) );
 
 	p->incCounter();
 	return SVN_NO_ERROR;
@@ -1029,7 +1029,7 @@ svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, s
 	Thus retreiving URL from WC should be done here, using subversion native API.
 	Thus, svn_log should get another flag (bool repositHistory )specifying between file:/// or URL
 */
-void kio_svnProtocol::svn_log( int revstart, const QString& revkindstart, int revend, const QString& revkindend,
+void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int revend, const TQString& revkindend,
 							bool discorverChangedPaths, bool strictNodeHistory,
 							const KURL::List& urls )
 {
@@ -1045,21 +1045,21 @@ void kio_svnProtocol::svn_log( int revstart, const QString& revkindstart, int re
 	m_counter = 0;
 	apr_array_header_t *targets = apr_array_make(subpool, 1+urls.count(), sizeof(const char *));
 
-	for ( QValueListConstIterator it = urls.begin(); it != urls.end() ; ++it ) {
+	for ( TQValueListConstIterator it = urls.begin(); it != urls.end() ; ++it ) {
 		KURL nurl = *it;
 		const char *path =
 				apr_pstrdup( subpool, svn_path_canonicalize( nurl.pathOrURL().utf8(), subpool ) );
 		kdDebug(9036) << path << endl;
 		*(( const char ** )apr_array_push(( apr_array_header_t* )targets)) = path;
 
-		setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "requrl", nurl.pathOrURL() );
+		setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "requrl", nurl.pathOrURL() );
 		incCounter();
 	}
 
 	svn_log_message_receiver_t receiver = kio_svnProtocol::receiveLogMessage;
 	svn_error_t *err = svn_client_log2(targets, &rev1, &rev2, 0, discorverChangedPaths, strictNodeHistory, receiver, this, ctx, subpool);
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -1073,12 +1073,12 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed
         const char *author, const char *date, const char *message, apr_pool_t *pool )
 {
 	kio_svnProtocol *p = (kio_svnProtocol*)baton;
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number(revision) );
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author );
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date );
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "logmsg", QString::fromLocal8Bit(message) );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number(revision) );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "logmsg", TQString::fromLocal8Bit(message) );
 	if( changed_paths != NULL ){
-		QString pathlist;
+		TQString pathlist;
 		void *onePath;
 		const char *pathkey;
 		apr_hash_index_t *hi;
@@ -1093,13 +1093,13 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed
 			pathlist += "\n";
 		}
 		kdDebug(9036) << "pathlist: " << pathlist <setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "pathlist", pathlist );
+		p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "pathlist", pathlist );
 	}
 	p->incCounter();
 	return SVN_NO_ERROR;
 }
 
-svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const QString& revkind, apr_pool_t *pool ) {
+svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const TQString& revkind, apr_pool_t *pool ) {
 	svn_opt_revision_t result;//,endrev;
 	// TODO support svn_opt_revision_date
 	if ( revision != -1 ) {
@@ -1127,7 +1127,7 @@ svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const QString&
 	return result;
 }
 
-void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const QString& revkind1,const QString& revkind2,bool recurse, bool pegdiff )
+void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const TQString& revkind1,const TQString& revkind2,bool recurse, bool pegdiff )
 {
 	kdDebug(9036) << "kio_svn::diff : " << url1.path() << " at revision " << rev1 << " or " << revkind1 << " with "
 		<< url2.path() << " at revision " << rev2 << " or " << revkind2
@@ -1141,8 +1141,8 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
 // 	nurl1.setProtocol( chooseProtocol( url1.protocol() ) ); //svn+https -> https for eg
 // 	nurl2.setProtocol( chooseProtocol( url2.protocol() ) );
 // 	recordCurrentURL( nurl1 );
-// 	QString source = makeSvnURL( nurl1 );
-// 	QString target = makeSvnURL( nurl2 );
+// 	TQString source = makeSvnURL( nurl1 );
+// 	TQString target = makeSvnURL( nurl2 );
 
 // 	const char *path1 = svn_path_canonicalize( apr_pstrdup( subpool, source.utf8() ), subpool );
 // 	const char *path2 = svn_path_canonicalize( apr_pstrdup( subpool, target.utf8() ), subpool );
@@ -1183,25 +1183,25 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
 	}
 
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
 		return;
 	}
 	//read the content of the outfile now
-	QStringList tmp;
+	TQStringList tmp;
 	apr_file_close(outfile);
-	QFile file(templ);
+	TQFile file(templ);
 	if ( file.open(  IO_ReadOnly ) ) {
-		QTextStream stream(  &file );
-		QString line;
+		TQTextStream stream(  &file );
+		TQString line;
 		while ( !stream.atEnd() ) {
 			line = stream.readLine();
 			tmp << line;
 		}
 		file.close();
 	}
-	for ( QStringList::Iterator itt = tmp.begin(); itt != tmp.end(); itt++ ) {
-		setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "diffresult", ( *itt ) );
+	for ( TQStringList::Iterator itt = tmp.begin(); itt != tmp.end(); itt++ ) {
+		setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "diffresult", ( *itt ) );
 		m_counter++;
 	}
 	//delete temp file
@@ -1211,7 +1211,7 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
 	svn_pool_destroy (subpool);
 }
 
-void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const QString& revkind, bool recurse) {
+void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const TQString& revkind, bool recurse) {
 	kdDebug(9036) << "kio_svn::switch : " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ;
 
 	apr_pool_t *subpool = svn_pool_create (pool);
@@ -1221,8 +1221,8 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb
 	nurl.setProtocol( chooseProtocol( repos.protocol() ) );
 	dest.setProtocol( "file" );
 // 	recordCurrentURL( nurl );
-// 	QString source = dest.path();
-// 	QString target = makeSvnURL( repos );
+// 	TQString source = dest.path();
+// 	TQString target = makeSvnURL( repos );
 
 	const char *path = svn_path_canonicalize( apr_pstrdup( subpool, dest.path().utf8() ), subpool );
 	const char *url = svn_path_canonicalize( apr_pstrdup( subpool, nurl.url().utf8() ), subpool );
@@ -1233,7 +1233,7 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_switch (NULL/*result revision*/, path, url, &rev, recurse, ctx, subpool);
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -1255,18 +1255,18 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl,
 	svn_error_t *err = svn_client_relocate( wcPath, fromUrl, toUrl, recurse, ctx, pool );
 	
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
 		svn_pool_destroy (subpool);
         return;
 	}
 	m_counter = 0L;
-	setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string",
-				QString("switched to %1").arg( toUrl ) );
+	setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
+				TQString("switched to %1").arg( toUrl ) );
 	finished();
 	svn_pool_destroy( subpool );
 }
 
-void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QString& revkind ) {
+void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQString& revkind ) {
 	kdDebug(9036) << "kio_svn::update : __TIME__" << __TIME__ << endl;
 
 	apr_pool_t *subpool = svn_pool_create (pool);
@@ -1274,7 +1274,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QStri
 	apr_array_header_t *targets = apr_array_make(subpool, 1+list.count(), sizeof(const char *));
 	svn_opt_revision_t rev = createRevision( revnumber, revkind, subpool );
 
-	for( QValueList::ConstIterator it = list.begin(); it != list.end(); ++it ){
+	for( TQValueList::ConstIterator it = list.begin(); it != list.end(); ++it ){
 		KURL nurl = *it;
 		*( const char ** )apr_array_push(targets) = svn_path_canonicalize( nurl.path().utf8(), subpool );
 	}
@@ -1284,7 +1284,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QStri
 										   true/*recurse*/, false/*ignore_external*/,
 										   ctx, subpool);
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1310,7 +1310,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
 	
 	svn_error_t *err = svn_client_import2(&commit_info, path, url, nonrecursive, false, ctx, subpool);
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1319,7 +1319,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
 	finished();
 }
 
-void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const QString& revkind ) {
+void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ) {
 	kdDebug(9036) << "kio_svn::checkout : " << repos.url() << " into " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ;
 
 	apr_pool_t *subpool = svn_pool_create (pool);
@@ -1327,9 +1327,9 @@ void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber
 	KURL dest = wc;
 	nurl.setProtocol( chooseProtocol( repos.protocol() ) );
 	dest.setProtocol( "file" );
-	QString target = makeSvnURL( repos );
+	TQString target = makeSvnURL( repos );
 	recordCurrentURL( nurl );
-	QString dpath = dest.path();
+	TQString dpath = dest.path();
 
 	//find the requested revision
 	svn_opt_revision_t rev = createRevision( revnumber, revkind, subpool );
@@ -1358,7 +1358,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
 
 	apr_array_header_t *targets = apr_array_make(subpool, 1+wc.count(), sizeof(const char *));
 
-	for ( QValueListConstIterator it = wc.begin(); it != wc.end() ; ++it ) {
+	for ( TQValueListConstIterator it = wc.begin(); it != wc.end() ; ++it ) {
 		KURL nurl = *it;
 		nurl.setProtocol( "file" );
 		recordCurrentURL( nurl );
@@ -1372,27 +1372,27 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
 	if ( err ){
 		char errbuf[512];
 		svn_strerror(err->apr_err, errbuf, 512);
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) + "\n: " +  QString::fromLocal8Bit(errbuf) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) + "\n: " +  TQString::fromLocal8Bit(errbuf) );
 		svn_pool_destroy (subpool);
 		return;
 	}
 
 	if ( commit_info ) {
-		for ( QValueListConstIterator it = wc.begin(); it != wc.end() ; ++it ) {
+		for ( TQValueListConstIterator it = wc.begin(); it != wc.end() ; ++it ) {
 			KURL nurl = *it;
 			nurl.setProtocol( "file" );
 
-			QString userstring = i18n ( "Nothing to commit." );
+			TQString userstring = i18n ( "Nothing to commit." );
 			if ( SVN_IS_VALID_REVNUM( commit_info->revision ) )
 				userstring = i18n( "Committed revision %1." ).arg(commit_info->revision);
-			setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
-			setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" );
-			setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
-			setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "mime_t", "" );
-			setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "content", "0" );
-			setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "prop", "0" );
-			setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "rev" , QString::number( commit_info->revision ) );
-			setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "string", userstring );
+			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
+			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" );
+			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
+			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "mime_t", "" );
+			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "content", "0" );
+			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "prop", "0" );
+			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "rev" , TQString::number( commit_info->revision ) );
+			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "string", userstring );
 			m_counter++;
 		}
 	}
@@ -1409,7 +1409,7 @@ void kio_svnProtocol::add(const KURL::List& list) {
 	initNotifier(false, false, false, subpool);
 
 	svn_error_t *err = NULL;
-	for( QValueList::ConstIterator it = list.begin(); it != list.end(); ++it ){
+	for( TQValueList::ConstIterator it = list.begin(); it != list.end(); ++it ){
 		
 		KURL nurl = (*it);
 		nurl.setProtocol( "file" );
@@ -1420,7 +1420,7 @@ void kio_svnProtocol::add(const KURL::List& list) {
 		if( err ) break;
 	}
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1438,7 +1438,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) {
 	
 	apr_array_header_t *targets = apr_array_make(subpool, 1+wc.count(), sizeof(const char *));
 
-	for ( QValueListConstIterator it = wc.begin(); it != wc.end() ; ++it ) {
+	for ( TQValueListConstIterator it = wc.begin(); it != wc.end() ; ++it ) {
 		KURL nurl = *it;
 		nurl.setProtocol( "file" );
 		recordCurrentURL( nurl );
@@ -1449,7 +1449,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) {
 	svn_error_t *err = svn_client_delete(&commit_info,targets,force,ctx,subpool);
 	
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 
 	finished();
 	svn_pool_destroy (subpool);
@@ -1463,7 +1463,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) {
 
 	apr_array_header_t *targets = apr_array_make(subpool, 1 + wc.count(), sizeof(const char *));
 
-	for ( QValueListConstIterator it = wc.begin(); it != wc.end() ; ++it ) {
+	for ( TQValueListConstIterator it = wc.begin(); it != wc.end() ; ++it ) {
 		KURL nurl = *it;
 		nurl.setProtocol( "file" );
 		recordCurrentURL( nurl );
@@ -1473,7 +1473,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_revert(targets,nonrecursive,ctx,subpool);
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1482,13 +1482,13 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) {
 	svn_pool_destroy (subpool);
 }
 
-void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const QString& revkind) {
+void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const TQString& revkind) {
 	kdDebug(9036) << "kio_svnProtocol::wc_status() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << endl;
 
 	wc_status2( wc, checkRepos, fullRecurse, getAll, false, revnumber, revkind );
 }
 
-void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const QString& revkind) {
+void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const TQString& revkind) {
 	kdDebug(9036) << "kio_svnProtocol::wc_status2() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << " noIgnore " << noIgnore << " revnumber " << revnumber << " revkind " << revkind << endl;
 	kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
 
@@ -1506,7 +1506,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur
 	svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, noIgnore, ctx, subpool);
 
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -1515,7 +1515,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur
 	svn_pool_destroy (subpool);
 }
 
-void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, int rev, QString revKind, bool recurse )
+void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse )
 {
     kdDebug(9036) << " kio_svnProtocol::svn_info(): pegRev " << pegRev << " pegKind " << pegRevKind << " rev " << rev << " revKind " << revKind << " recurse " << recurse << endl;
 
@@ -1531,7 +1531,7 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind,
                                         ctx, pool );
 
     if ( err ){
-        error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) );
+        error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
         return;
     }
@@ -1546,18 +1546,18 @@ svn_error_t* kio_svnProtocol::infoReceiver( void *baton, const char *path,
     if( !p )
         return SVN_NO_ERROR;
     
-    p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "PATH", QString::fromUtf8( path ));
-    p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "URL", QString( info->URL ) );
-    p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", QString::number( info->rev ));
-    p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "KIND", QString::number( info->kind ));
-    p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_ROOT_URL", QString( info->repos_root_URL ) );
-    p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_UUID", QString(info->repos_UUID) );
+    p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "PATH", TQString::fromUtf8( path ));
+    p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "URL", TQString( info->URL ) );
+    p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number( info->rev ));
+    p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "KIND", TQString::number( info->kind ));
+    p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_ROOT_URL", TQString( info->repos_root_URL ) );
+    p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_UUID", TQString(info->repos_UUID) );
     p->incCounter();
 
     return SVN_NO_ERROR;
 }
 
-void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &srcRevKind,
+void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind,
 								const KURL &destUrl )
 {
 	kdDebug(9036) << " kio: svn_copy src: " << srcUrl << " Dest Url: " << destUrl << " revnum: " << srcRev << " revKind: " << srcRevKind << endl;
@@ -1577,16 +1577,16 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &s
 		apr_status_t errcode = err->apr_err;
 		char buf[512];
 		svn_strerror(errcode, buf, 512);
-		error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(buf) );
+		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(buf) );
 		svn_pool_destroy (subpool);
 		return;
 	}
 	
 	if( commit_info ){
-		setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string",
+		setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
 					i18n("Copied Revision %1").arg( commit_info->revision) );
 	} else {
-		setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string",
+		setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
 					i18n("Copied") );
 	}
 	
@@ -1594,8 +1594,8 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &s
 	svn_pool_destroy (subpool);
 }
 
-void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1,
-								const KURL &src2, int revNum2, QString revKind2,
+void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1,
+								const KURL &src2, int revNum2, TQString revKind2,
 								const KURL &target_wc,
 								bool recurse, bool ignore_ancestry, bool force, bool dry_run )
 {
@@ -1616,7 +1616,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1,
 		char buf[512];
 		svn_strerror(errcode, buf, 512);
 		error( KIO::ERR_SLAVE_DEFINED,
-			   QString::fromLocal8Bit(err->message) + "\n "+ QString::fromLocal8Bit(buf) );
+			   TQString::fromLocal8Bit(err->message) + "\n "+ TQString::fromLocal8Bit(buf) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1627,11 +1627,11 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1,
 
 //change the proto and remove trailing /
 //remove double / also
-QString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
-	QString kproto = url.protocol();
+TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
+	TQString kproto = url.protocol();
 	KURL tpURL = url;
 	tpURL.cleanPath( true );
-	QString svnUrl;
+	TQString svnUrl;
 	if ( kproto == "kdevsvn+http" ) {
 		kdDebug(9036) << "http:/ " << url.url() << endl;
 		tpURL.setProtocol("http");
@@ -1668,12 +1668,12 @@ QString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
 	return tpURL.url(-1);
 }
 
-QString kio_svnProtocol::chooseProtocol ( const QString& kproto ) const {
-	if ( kproto == "svn+http" ) return QString( "http" );
-	else if ( kproto == "svn+https" ) return QString( "https" );
-	else if ( kproto == "svn+ssh" ) return QString( "svn+ssh" );
-	else if ( kproto == "svn" ) return QString( "svn" );
-	else if ( kproto == "svn+file" ) return QString( "file" );
+TQString kio_svnProtocol::chooseProtocol ( const TQString& kproto ) const {
+	if ( kproto == "svn+http" ) return TQString( "http" );
+	else if ( kproto == "svn+https" ) return TQString( "https" );
+	else if ( kproto == "svn+ssh" ) return TQString( "svn+ssh" );
+	else if ( kproto == "svn" ) return TQString( "svn" );
+	else if ( kproto == "svn+file" ) return TQString( "file" );
 	return kproto;
 }
 /** Certificate is not yet valid. */
@@ -1691,18 +1691,18 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **
 {
 	kio_svnProtocol *p = (kio_svnProtocol*)baton;
 	// prepare params.
-	QByteArray params, replyData;
-	QCString replyType;
-	QDataStream arg(params, IO_WriteOnly);
+	TQByteArray params, replyData;
+	TQCString replyType;
+	TQDataStream arg(params, IO_WriteOnly);
 
 	arg << i18n( "The certificate from the server could not be trusted automatically.  Do you want to trust this certificate? " );
-	arg << QString::fromLocal8Bit(ci->hostname);
-	arg << QString::fromLocal8Bit(ci->fingerprint);
-	arg << QString::fromLocal8Bit(ci->valid_from) << QString::fromLocal8Bit(ci->valid_until);
-	arg << QString::fromLocal8Bit(ci->issuer_dname) << QString::fromLocal8Bit(ci->ascii_cert) ;
+	arg << TQString::fromLocal8Bit(ci->hostname);
+	arg << TQString::fromLocal8Bit(ci->fingerprint);
+	arg << TQString::fromLocal8Bit(ci->valid_from) << TQString::fromLocal8Bit(ci->valid_until);
+	arg << TQString::fromLocal8Bit(ci->issuer_dname) << TQString::fromLocal8Bit(ci->ascii_cert) ;
 	// call dcop
 	int ret = p->dcopClient()->call( "kded", "kdevsvnd",
-			"sslServerTrustPrompt(QString, QString, QString, QString, QString, QString, QString)",
+			"sslServerTrustPrompt(TQString, TQString, TQString, TQString, TQString, TQString, TQString)",
 			params, replyType, replyData );
 	if (!ret){
 		kdWarning() << " failed to prompt SSL_Server_Trust_Prompt " << endl;
@@ -1713,7 +1713,7 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **
 		return SVN_NO_ERROR;
 	}
 	int resultCode;
-	QDataStream replyStream( replyData, IO_ReadOnly );
+	TQDataStream replyStream( replyData, IO_ReadOnly );
 	replyStream >> resultCode;
 
 	if( resultCode == -1 ){
@@ -1742,21 +1742,21 @@ svn_error_t *kio_svnProtocol::clientCertSSLPrompt(
 {
 	kdDebug(9036) << " clientCertSSLPrompt " << endl;
 // 	kio_svnProtocol *p = (kio_svnProtocol*)baton;
-// 	QByteArray reply;
-// 	QByteArray params;
-// 	QCString replyType;
+// 	TQByteArray reply;
+// 	TQByteArray params;
+// 	TQCString replyType;
 // 	call dcop
 // 	if (!p->dcopClient()->call("kded","kdevsvnd", "sslCertFile()",params,replyType,reply)) {
 // 		kdWarning()<<" Communication with dcop failed - fail to get certfile "<> fileName;
 // 	allocate memory
 // 	*cred_p = (svn_auth_cred_ssl_client_cert_t*) apr_palloc (pool, sizeof(svn_auth_cred_ssl_client_cert_t));
@@ -1773,23 +1773,23 @@ svn_error_t *kio_svnProtocol::clientCertPasswdPrompt(
 	kdDebug(9036) << " realm " << realm << " <--realm " << endl;
 // 	kio_svnProtocol *p = ( kio_svnProtocol* )baton;
 // 	// prepare dcop
-// 	QByteArray reply;
-// 	QByteArray params;
-// 	QCString replyType;
-// 	QDataStream arg( params, IO_WriteOnly );
-// 	arg << i18n( "Enter password for subversion repository access" ) + "\n" + QString(realm);
+// 	TQByteArray reply;
+// 	TQByteArray params;
+// 	TQCString replyType;
+// 	TQDataStream arg( params, IO_WriteOnly );
+// 	arg << i18n( "Enter password for subversion repository access" ) + "\n" + TQString(realm);
 // 	// call dcop
-// 	if (!p->dcopClient()->call("kded","kdevsvnd", "sslPasswdDlg(QString)",params,replyType,reply)) {
+// 	if (!p->dcopClient()->call("kded","kdevsvnd", "sslPasswdDlg(TQString)",params,replyType,reply)) {
 // 		kdWarning()<<" Communication with dcop failed - fail to show passwd dlg"<> retstr;
 //
 // 	if( retstr.left(1) == "-1" ){
@@ -1813,16 +1813,16 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char
                     apr_array_header_t *commit_items, void *baton, apr_pool_t *pool )
 {
 	*file = NULL; // if omitting this, it will segfault at import operation.
-	QCString replyType;
-	QByteArray params;
-	QByteArray reply;
-	QString result;// slist;
-	QStringList slist;
+	TQCString replyType;
+	TQByteArray params;
+	TQByteArray reply;
+	TQString result;// slist;
+	TQStringList slist;
 	kio_svnProtocol *p = ( kio_svnProtocol* )baton;
 	svn_stringbuf_t *message = NULL;
 
 	for (int i = 0; i < commit_items->nelts; i++) {
-		QString list;
+		TQString list;
 		svn_client_commit_item_t *item = ((svn_client_commit_item_t **) commit_items->elts)[i];
 		const char *path = item->path;
 		char text_mod = '_', prop_mod = ' ';
@@ -1856,25 +1856,25 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char
 // 		slist += list;
 	}
 
-	QDataStream stream(params, IO_WriteOnly);
+	TQDataStream stream(params, IO_WriteOnly);
 	stream << slist.join("\n");
 
 	kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
-	if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(QString)", params, replyType, reply ) ) {
+	if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(TQString)", params, replyType, reply ) ) {
 		kdWarning() << "Communication with KDED:KDevSvnd failed" << endl;
 		svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL,
 											 apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP. If this is your first problem, try to restart KDE" ) );
 		return err;
 	}
 
-	if ( replyType != "QString" ) {
+	if ( replyType != "TQString" ) {
 		kdWarning() << "Unexpected reply type" << endl;
 		svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL,
 											 apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP." ) );
 		return err;
 	}
 
-	QDataStream stream2 ( reply, IO_ReadOnly );
+	TQDataStream stream2 ( reply, IO_ReadOnly );
 	stream2 >> result;
 
 	if ( result.isNull() ) { //cancelled
@@ -1893,7 +1893,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char
 void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action_t action, svn_node_kind_t kind, const char *mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision) {
 	kdDebug(9036) << "NOTIFY : " << path << " updated at revision " << revision << " action : " << action << ", kind : " << kind << " , content_state : " << content_state << ", prop_state : " << prop_state << endl;
 
-	QString userstring;
+	TQString userstring;
 	struct notify_baton *nb = ( struct notify_baton* ) baton;
 
 	//// Convert notification to a user readable string
@@ -1970,7 +1970,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 									|| content_state == svn_wc_notify_state_unknown)
 								&& (prop_state == svn_wc_notify_state_unchanged
 									|| prop_state == svn_wc_notify_state_unknown)))
-						userstring += QString( " " ) + path;
+						userstring += TQString( " " ) + path;
 				}
 				break;
 			}
@@ -2071,14 +2071,14 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 	kio_svnProtocol *p = ( kio_svnProtocol* )nb->master;
 	if (!p) kdDebug(9036) << " Null Pointer at Line " << __LINE__ << endl;
 
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , QString::fromUtf8( path )); 
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "action", QString::number( action ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "kind", QString::number( kind ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "mime_t", QString::fromUtf8( mime_type ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "content", QString::number( content_state ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", QString::number( prop_state ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number( revision ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring );
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , TQString::fromUtf8( path )); 
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "action", TQString::number( action ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "kind", TQString::number( kind ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "mime_t", TQString::fromUtf8( mime_type ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "content", TQString::number( content_state ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( prop_state ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( revision ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring );
 	kdDebug(9036) << " kio_svnProtocol::notify() userstring " << userstring << endl;
 	p->incCounter();
 }
@@ -2090,19 +2090,19 @@ void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *sta
 									 << ", repos prop status : " << status->repos_prop_status
 									 << endl;
 
-	QByteArray params;
+	TQByteArray params;
 	kio_svnProtocol *p = ( kio_svnProtocol* )baton;
 
-	QDataStream stream(params, IO_WriteOnly);
+	TQDataStream stream(params, IO_WriteOnly);
 	long int rev = status->entry ? status->entry->revision : 0;
-	stream << QString::fromUtf8( path ) << status->text_status << status->prop_status << status->repos_text_status << status->repos_prop_status << rev;
-
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "path", QString::fromUtf8( path ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "text", QString::number( status->text_status ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", QString::number( status->prop_status ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "reptxt", QString::number( status->repos_text_status ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "repprop", QString::number( status->repos_prop_status ));
-	p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number( rev ));
+	stream << TQString::fromUtf8( path ) << status->text_status << status->prop_status << status->repos_text_status << status->repos_prop_status << rev;
+
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path", TQString::fromUtf8( path ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "text", TQString::number( status->text_status ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( status->prop_status ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "reptxt", TQString::number( status->repos_text_status ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "repprop", TQString::number( status->repos_prop_status ));
+	p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( rev ));
 	p->incCounter();
 }
 
diff --git a/vcs/subversion/svn_kio.h b/vcs/subversion/svn_kio.h
index 332a11a9..a66064d0 100644
--- a/vcs/subversion/svn_kio.h
+++ b/vcs/subversion/svn_kio.h
@@ -20,8 +20,8 @@
 #ifndef _svn_H_
 #define _svn_H_
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -31,7 +31,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include "subversion_global.h"
 
@@ -68,9 +68,9 @@ typedef struct notify_baton {
 class kio_svnProtocol : public KIO::SlaveBase
 {
 	public:
-		kio_svnProtocol(const QCString &pool_socket, const QCString &app_socket);
+		kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket);
 		virtual ~kio_svnProtocol();
-		virtual void special( const QByteArray& data );
+		virtual void special( const TQByteArray& data );
 		virtual void get(const KURL& url);
 		virtual void listDir(const KURL& url);
 		virtual void stat(const KURL& url);
@@ -79,31 +79,31 @@ class kio_svnProtocol : public KIO::SlaveBase
 		virtual void del( const KURL& url, bool isfile );
 // 		virtual void copy(const KURL & src, const KURL& dest, int permissions, bool overwrite);
 		virtual void rename(const KURL& src, const KURL& dest, bool overwrite);
-		void checkout( const KURL& repos, const KURL& wc, int revnumber, const QString& revkind );
+		void checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind );
 		void import( const KURL& repos, const KURL& wc );
-		void svn_switch( const KURL& wc, const KURL& url, int revnumber, const QString& revkind, bool recurse);
+		void svn_switch( const KURL& wc, const KURL& url, int revnumber, const TQString& revkind, bool recurse);
 		void svn_switch_relocate( const KURL &wc, const KURL &origUrl, const KURL &newUrl,
 				                  bool recurse );
-		void svn_diff( const KURL& url1, const KURL& url2, int rev1, int rev2, const QString& revkind1, const QString& revkind2, bool recurse, bool pegdiff);
+		void svn_diff( const KURL& url1, const KURL& url2, int rev1, int rev2, const TQString& revkind1, const TQString& revkind2, bool recurse, bool pegdiff);
 		//TODO fix with svn 1.2 : support a KURL::List -> svn_client_update2()
-		void update( const KURL::List &list, int revnumber, const QString& revkind );
+		void update( const KURL::List &list, int revnumber, const TQString& revkind );
 		void commit( const KURL::List& wc );
 		void commit2( bool recurse, bool keeplocks, const KURL::List& wc );
-		void blame( KURL url, SvnGlobal::UrlMode mode, /*int pegRev, QString pegRevKind,*/ int startRev, QString startRevKind, int endRev, QString endRevKind );
+		void blame( KURL url, SvnGlobal::UrlMode mode, /*int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind );
 		static svn_error_t* blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool );
-		void svn_log( int revstart, const QString &revkindstart, int revend, const QString &revkindend, bool discorverChangedPath, bool strictNodeHistory, const KURL::List& targets );
+		void svn_log( int revstart, const TQString &revkindstart, int revend, const TQString &revkindend, bool discorverChangedPath, bool strictNodeHistory, const KURL::List& targets );
 		static svn_error_t* receiveLogMessage(void *baton, apr_hash_t *changed_paths, svn_revnum_t revision, const char *author, const char *date, const char *message, apr_pool_t *pool );
 		void add( const KURL::List& wcList );
 		//these work using the working copy
 		void wc_resolve( const KURL& wc, bool recurse = true );
 		void wc_delete( const KURL::List& wc );
 		void wc_revert( const KURL::List& wc );
-		void wc_status(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, int revnumber=-1, const QString& revkind="HEAD");
-		void wc_status2(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, bool noIgnore=false, int revnumber=-1, const QString& revkind="WORKING");
-        void svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, int rev, QString revKind, bool recurse );
+		void wc_status(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, int revnumber=-1, const TQString& revkind="HEAD");
+		void wc_status2(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, bool noIgnore=false, int revnumber=-1, const TQString& revkind="WORKING");
+        void svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse );
         static svn_error_t* infoReceiver( void *baton, const char *path, const svn_info_t *info, apr_pool_t *pool);
-		void svn_copy( const KURL &srcUrl, int srcRev, const QString &srcRevKind, const KURL &destUrl );
-		void svn_merge( const KURL &src1, int rev1, QString revKind1, const KURL &src2, int rev2, QString revKind2,
+		void svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind, const KURL &destUrl );
+		void svn_merge( const KURL &src1, int rev1, TQString revKind1, const KURL &src2, int rev2, TQString revKind2,
 						const KURL &target_wc,
 						bool recurse, bool ignore_ancestry, bool force, bool dry_run );
 
@@ -116,23 +116,23 @@ class kio_svnProtocol : public KIO::SlaveBase
 		static void status(void *baton, const char *path, svn_wc_status_t *status);
 		static void progressCallback( apr_off_t progress, apr_off_t total, void *baton, apr_pool_t *pool);
 
-		QString chooseProtocol ( const QString& kproto ) const; 
-		QString makeSvnURL ( const KURL& url ) const;
+		TQString chooseProtocol ( const TQString& kproto ) const; 
+		TQString makeSvnURL ( const KURL& url ) const;
 		void initNotifier(bool is_checkout, bool is_export, bool suppress_final_line, apr_pool_t *spool);
 			
 		void recordCurrentURL(const KURL& url);
-		void popupMessage( const QString& message );
+		void popupMessage( const TQString& message );
 		int counter() { return m_counter; }
 		void incCounter() { m_counter++; }
-		svn_opt_revision_t createRevision( int revision, const QString& revkind, apr_pool_t *pool );
+		svn_opt_revision_t createRevision( int revision, const TQString& revkind, apr_pool_t *pool );
 
 		KURL myURL;
 		svn_client_ctx_t *ctx;
 		KIO::AuthInfo info;
 
 		enum SVN_METHOD { 
-			SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, QString revkind(HEAD, ...) //revnumber==-1 => use of revkind
-			SVN_UPDATE=2, // KURL wc (svn:///tmp/test, int revnumber=-1, QString revkind(HEAD, ...) // revnumber==-1 => use of revkind
+			SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, TQString revkind(HEAD, ...) //revnumber==-1 => use of revkind
+			SVN_UPDATE=2, // KURL wc (svn:///tmp/test, int revnumber=-1, TQString revkind(HEAD, ...) // revnumber==-1 => use of revkind
 			SVN_COMMIT=3,
 			SVN_LOG=4, 
 			SVN_IMPORT=5,
@@ -155,7 +155,7 @@ class kio_svnProtocol : public KIO::SlaveBase
 		};
 
 	private:
-		bool createUDSEntry( const QString& filename, const QString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry);
+		bool createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry);
 		apr_pool_t *pool;
 		unsigned long int m_counter;
 };
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index ec35200e..e098eab0 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -27,72 +27,72 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 #include 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
-SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, QWidget *parent)
-	:QWidget(parent), m_part(part)
+SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
+	:TQWidget(parent), m_part(part)
 {
-    m_layout = new QGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout");
+    m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout");
 
-    splitter1 = new QSplitter( this, "splitter1" );
-    splitter1->setOrientation( QSplitter::Horizontal );
+    splitter1 = new TQSplitter( this, "splitter1" );
+    splitter1->setOrientation( TQSplitter::Horizontal );
     splitter1->setMargin(1);
 
-    listView1 = new QListView( splitter1, "listView1" );
+    listView1 = new TQListView( splitter1, "listView1" );
     listView1->addColumn( i18n( "Rev" ) );
     listView1->addColumn( i18n( "Date" ) );
     listView1->addColumn( i18n( "Author" ) );
     listView1->addColumn( i18n( "Comment" ) );
-    listView1->resize( QSize(1, 1).expandedTo(minimumSizeHint()) );
-    QFont listView1_font(  listView1->font() );
+    listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
+    TQFont listView1_font(  listView1->font() );
     listView1_font.setPointSize( 9 );
     listView1->setFont( listView1_font );
     listView1->setAllColumnsShowFocus( TRUE );
     listView1->setShowSortIndicator( TRUE );
 
     textEdit1 = new KTextEdit( splitter1, "textEdit1" );
-    textEdit1->resize( QSize(1, 1).expandedTo(minimumSizeHint()) );
-    QFont textEdit1_font(  textEdit1->font() );
+    textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
+    TQFont textEdit1_font(  textEdit1->font() );
     textEdit1_font.setPointSize( 9 );
     textEdit1->setFont( textEdit1_font );
-    textEdit1->setFocusPolicy( QTextEdit::WheelFocus );
+    textEdit1->setFocusPolicy( TQTextEdit::WheelFocus );
     textEdit1->setReadOnly( TRUE );
 
     m_layout->addWidget( splitter1, 0, 0 );
     m_layout->setMargin(1);
 
-    resize( QSize(692, 343).expandedTo(minimumSizeHint()) );
+    resize( TQSize(692, 343).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
     
-	connect( listView1, SIGNAL(clicked( QListViewItem *)), this, SLOT(slotClicked(QListViewItem*)) );
-    connect( listView1, SIGNAL(contextMenuRequested( QListViewItem*, const QPoint&, int )),
-             this, SLOT(contextMenuRequested(QListViewItem*, const QPoint&, int)) );
+	connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) );
+    connect( listView1, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
+             this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) );
 }
 SvnLogViewWidget::~SvnLogViewWidget()
 {
 }
 
-void SvnLogViewWidget::setLogResult( QValueList *loglist )
+void SvnLogViewWidget::setLogResult( TQValueList *loglist )
 {
 	this->listView1->clear();
 	this->textEdit1->clear();
 	this->listView1->setSorting( 1, false );
 	
-	for( QValueList::Iterator it=loglist->begin(); it!=loglist->end(); ++it ){
+	for( TQValueList::Iterator it=loglist->begin(); it!=loglist->end(); ++it ){
 		
 		SvnLogHolder holder = *it;
 		SvnLogViewItem *item = new SvnLogViewItem(this->listView1);
 		
-		QString prettyDate = holder.date.left(16).replace(10, 1, ' ');
+		TQString prettyDate = holder.date.left(16).replace(10, 1, ' ');
 		
 		item->setText(0, holder.rev );
 		item->setText(1, prettyDate );
@@ -105,12 +105,12 @@ void SvnLogViewWidget::setLogResult( QValueList *loglist )
 // 	this->listView1->show();
 }
 
-void SvnLogViewWidget::setRequestedUrl( QString reqUrl )
+void SvnLogViewWidget::setRequestedUrl( TQString reqUrl )
 {
 	m_reqUrl = reqUrl;
 }
 
-void SvnLogViewWidget::slotClicked( QListViewItem *oneItem )
+void SvnLogViewWidget::slotClicked( TQListViewItem *oneItem )
 {
 	if( !oneItem ) return;
 	SvnLogViewItem *item = dynamic_cast( oneItem );
@@ -120,16 +120,16 @@ void SvnLogViewWidget::slotClicked( QListViewItem *oneItem )
 	textEdit1->append( "\n\n" );
 	textEdit1->append( item->m_message + "\n" );
 }
-void SvnLogViewWidget::contextMenuRequested( QListViewItem *item, const QPoint & pos, int col )
+void SvnLogViewWidget::contextMenuRequested( TQListViewItem *item, const TQPoint & pos, int col )
 {
     if( !item || col == -1 )
         return;
     m_ctxLogItem = dynamic_cast(item);
     if( !m_ctxLogItem )
         return;
-    QPopupMenu *menu = new QPopupMenu(this);
-    menu->insertItem( i18n("Blame this revision"), this, SLOT(blameThis()) );
-    menu->insertItem( i18n("Difference to previous revision"), this, SLOT(diffToPrevious()) );
+    TQPopupMenu *menu = new TQPopupMenu(this);
+    menu->insertItem( i18n("Blame this revision"), this, TQT_SLOT(blameThis()) );
+    menu->insertItem( i18n("Difference to previous revision"), this, TQT_SLOT(diffToPrevious()) );
     menu->exec( pos );
 }
 void SvnLogViewWidget::blameThis()
@@ -139,12 +139,12 @@ void SvnLogViewWidget::blameThis()
 		return;
 	}
 	// note that blame is done on single file.
-	QStringList modifies = QStringList::split( "\n", m_ctxLogItem->m_pathList, false );
-	QString selectedPath;
+	TQStringList modifies = TQStringList::split( "\n", m_ctxLogItem->m_pathList, false );
+	TQString selectedPath;
 	if( modifies.count() > 1 ){
 		SvnBlameFileSelectDlg dlg(this);
 		dlg.setCandidate( &modifies );
-		if( dlg.exec() == QDialog::Accepted ){
+		if( dlg.exec() == TQDialog::Accepted ){
 			selectedPath = dlg.selected();
 		} else{
 			return;
@@ -156,14 +156,14 @@ void SvnLogViewWidget::blameThis()
 		return;
 	}
 	
-	QString relPath = selectedPath.section( '/', 1 );
+	TQString relPath = selectedPath.section( '/', 1 );
 	
-	QValueList< SvnGlobal::SvnInfoHolder > holderList = m_part->m_prjInfoMap.values();
+	TQValueList< SvnGlobal::SvnInfoHolder > holderList = m_part->m_prjInfoMap.values();
 	SvnGlobal::SvnInfoHolder holder;
 	if( holderList.count() > 0 ){
 		// get full Url
 		holder = holderList.first();
-		QString absPath =  holder.reposRootUrl.url(-1) + '/' + relPath;
+		TQString absPath =  holder.reposRootUrl.url(-1) + '/' + relPath;
 		kdDebug(9036) << " Blame requested on path " << absPath << endl;
 		// get revision
 		int revEnd = m_ctxLogItem->text(0).toInt();
@@ -188,17 +188,17 @@ void SvnLogViewWidget::diffToPrevious()
 	 				true/*recurse*/, true/*peg_diff*/ );
 }
 
-SvnLogViewOptionDlg::SvnLogViewOptionDlg( QWidget *parent, const char* name, bool modal, WFlags f )
+SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bool modal, WFlags f )
 : SvnLogViewOptionDlgBase( parent, name, modal,f )
 {
 // 	radio1->setChecked(true); //repository log
 	radio4->setChecked(true); //start revistion by revision keyword
 	radio5->setChecked(true); //end revision by revision number
 	reinstallRevisionSpecifiers();
-	connect( intInput1, SIGNAL(valueChanged(int)), this, SLOT(setStartRevnumRadio()) );
-	connect( comboBox1, SIGNAL(activated(const QString&)), this, SLOT(setStartRevkindRadio()) );
-	connect( intInput2, SIGNAL(valueChanged(int)), this, SLOT(setEndRevnumRadio()) );
-	connect( comboBox2, SIGNAL(activated(const QString&)), this, SLOT(setEndRevkindRadio()) );
+	connect( intInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartRevnumRadio()) );
+	connect( comboBox1, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setStartRevkindRadio()) );
+	connect( intInput2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndRevnumRadio()) );
+	connect( comboBox2, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setEndRevkindRadio()) );
 }
 SvnLogViewOptionDlg::~SvnLogViewOptionDlg()
 {}
@@ -207,7 +207,7 @@ void SvnLogViewOptionDlg::reinstallRevisionSpecifiers()
 	comboBox1->clear();
 	comboBox2->clear();
 
-	QStringList items;
+	TQStringList items;
 	items << "HEAD" << "BASE" << "PREV" << "COMMITTED";
 	comboBox1->insertStringList( items );
 	comboBox2->insertStringList( items );
@@ -220,10 +220,10 @@ int SvnLogViewOptionDlg::revstart()
 		return intInput1->value();
 	}
 }
-QString SvnLogViewOptionDlg::revKindStart()
+TQString SvnLogViewOptionDlg::revKindStart()
 {
 	if( !radio4->isChecked() ){
-		return QString("");
+		return TQString("");
 	} else{
 		return comboBox1->currentText();
 	}
@@ -236,10 +236,10 @@ int SvnLogViewOptionDlg::revend()
 		return intInput2->value();
 	}
 }
-QString SvnLogViewOptionDlg::revKindEnd()
+TQString SvnLogViewOptionDlg::revKindEnd()
 {
 	if( !radio6->isChecked() ){
-		return QString("");
+		return TQString("");
 	} else{
 		return comboBox2->currentText();
 	}
diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h
index e1738195..7f9a6d4d 100644
--- a/vcs/subversion/svn_logviewwidget.h
+++ b/vcs/subversion/svn_logviewwidget.h
@@ -24,11 +24,11 @@
 #include "subversion_widget.h"
 #include "svn_logviewoptiondlgbase.h"
 // #include "subversion_part.h"
-#include 
-#include 
+#include 
+#include 
 class subversionPart;
 // class QWidget;
-#include 
+#include 
 class KTextEdit;
 class QSplitter;
 class QGridLayout;
@@ -38,48 +38,48 @@ class SvnLogHolder{
 	public:
 		SvnLogHolder(){};
 		~SvnLogHolder(){};
-		QString author;
-		QString date;
-		QString logMsg;
-		QString pathList;
-		QString rev;
+		TQString author;
+		TQString date;
+		TQString logMsg;
+		TQString pathList;
+		TQString rev;
 };
 
-class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ QWidget {
+class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ TQWidget {
 	Q_OBJECT
 public:
-	SvnLogViewWidget(subversionPart *part, QWidget *parent);
+	SvnLogViewWidget(subversionPart *part, TQWidget *parent);
 	virtual ~SvnLogViewWidget();
-	void setLogResult( QValueList *loglist );
-	void setRequestedUrl( QString url );
+	void setLogResult( TQValueList *loglist );
+	void setRequestedUrl( TQString url );
 
 protected slots:
-	void slotClicked( QListViewItem* item );
-    void contextMenuRequested( QListViewItem *item, const QPoint & pos, int col );
+	void slotClicked( TQListViewItem* item );
+    void contextMenuRequested( TQListViewItem *item, const TQPoint & pos, int col );
     void blameThis();
     void diffToPrevious();
     
 private:
-	QString m_reqUrl;
+	TQString m_reqUrl;
 	subversionPart *m_part;
     SvnLogViewItem* m_ctxLogItem;
 
-    QSplitter* splitter1;
-    QListView* listView1;
+    TQSplitter* splitter1;
+    TQListView* listView1;
     KTextEdit* textEdit1;
-    QGridLayout* m_layout;
+    TQGridLayout* m_layout;
     
 };
 
 class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase {
 	Q_OBJECT
 public:
-	SvnLogViewOptionDlg(QWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0);
+	SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0);
 	~SvnLogViewOptionDlg();
 	int revstart();
-	QString revKindStart();
+	TQString revKindStart();
 	int revend();
-	QString revKindEnd();
+	TQString revKindEnd();
 	bool strictNode();
 public slots:
 	void reinstallRevisionSpecifiers();
diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp
index fe9a0064..50731690 100644
--- a/vcs/subversion/svn_mergewidget.cpp
+++ b/vcs/subversion/svn_mergewidget.cpp
@@ -21,22 +21,22 @@
 #include "svn_mergewidget.h"
 #include "subversion_global.h"
 #include 
-#include 
+#include 
 #include 
-#include 
+#include 
 #include 
 
 using namespace SvnGlobal;
 
-SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, QWidget *parent )
+SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent )
 	: SvnMergeOptionDialogBase( parent )
 {
 	dest->setURL( wcTarget.prettyURL() );
 	
-	connect( revnumbtn1, SIGNAL(toggled(bool)), revnum1,  SLOT(setEnabled(bool)) );
-	connect( revnumbtn1, SIGNAL(toggled(bool)), revkind1, SLOT(setDisabled(bool)) );
-	connect( revnumbtn2, SIGNAL(toggled(bool)), revnum2,  SLOT(setEnabled(bool)) );
-	connect( revnumbtn2, SIGNAL(toggled(bool)), revkind2, SLOT(setDisabled(bool)) );
+	connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revnum1,  TQT_SLOT(setEnabled(bool)) );
+	connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revkind1, TQT_SLOT(setDisabled(bool)) );
+	connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revnum2,  TQT_SLOT(setEnabled(bool)) );
+	connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revkind2, TQT_SLOT(setDisabled(bool)) );
 	revkind1->setDisabled(true);
 	revnum2->setDisabled(true);
 }
diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h
index db905626..abaaea88 100644
--- a/vcs/subversion/svn_mergewidget.h
+++ b/vcs/subversion/svn_mergewidget.h
@@ -33,7 +33,7 @@ class SvnMergeDialog : public SvnMergeOptionDialogBase
 {
 	Q_OBJECT
 public:
-	SvnMergeDialog( const KURL &wcTarget, QWidget *parent = NULL );
+	SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL );
 	virtual ~SvnMergeDialog();
 
 	KURL source1();
diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp
index ec1b603c..7149cce2 100644
--- a/vcs/subversion/svn_switchwidget.cpp
+++ b/vcs/subversion/svn_switchwidget.cpp
@@ -1,18 +1,18 @@
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include "svn_switchwidget.h"
 #include "subversion_global.h"
 
 SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder,
-							const QString &wcPath, QWidget *parent )
+							const TQString &wcPath, TQWidget *parent )
 	: SvnSwitchDlgBase( parent )
 	, m_info( holder )
 {
-	connect( switchOnlyRadio, SIGNAL(clicked()), this, SLOT(resetCurrentRepositoryUrlEdit()) );
-	connect( relocationRadio , SIGNAL(clicked()), this, SLOT(resetCurrentRepositoryUrlEdit()) );
+	connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) );
+	connect( relocationRadio , TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) );
 	// set switch only
 	switchOnlyRadio->setChecked( true );
 	wcUrlEdit->setText( wcPath );
@@ -22,11 +22,11 @@ SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder,
 SvnSwitchDlg::~SvnSwitchDlg()
 {}
 
-const QString SvnSwitchDlg::currentUrl()
+const TQString SvnSwitchDlg::currentUrl()
 {
 	return currentUrlEdit->text();
 }
-const QString SvnSwitchDlg::destUrl()
+const TQString SvnSwitchDlg::destUrl()
 {
 	return destUrlEdit->text();
 }
diff --git a/vcs/subversion/svn_switchwidget.h b/vcs/subversion/svn_switchwidget.h
index 643fb4b9..a38ca0ff 100644
--- a/vcs/subversion/svn_switchwidget.h
+++ b/vcs/subversion/svn_switchwidget.h
@@ -13,11 +13,11 @@ class SvnSwitchDlg : public SvnSwitchDlgBase
 	Q_OBJECT
 public:
 	SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder,
-				  const QString &wcPath, QWidget *parent = NULL );
+				  const TQString &wcPath, TQWidget *parent = NULL );
 	virtual ~SvnSwitchDlg();
 
-	const QString currentUrl();
-	const QString destUrl();
+	const TQString currentUrl();
+	const TQString destUrl();
 	bool recursive();
 	bool switchOnly();
 	bool relocation();
-- 
cgit v1.2.1